From edc78493076f2e28bd1bfcece7eb1bb6db71285e Mon Sep 17 00:00:00 2001
From: Jim Ehrismann <40840436+jim-docker@users.noreply.github.com>
Date: Thu, 23 Sep 2021 12:33:27 -0400
Subject: [PATCH] Release/v5.2.4 (#3876)

* Fix long name layout in Cluster Settings (#3854)

* Fix long name layout in Cluster Settings

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Clean up

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* fix missing query parameter (#3875)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* Disable log file writing on renderer (#3874)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* release v5.2.4

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>

Co-authored-by: Alex Andreev <alex.andreev.email@gmail.com>
Co-authored-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 package.json                                  |  2 +-
 src/common/k8s-api/kube-object.store.ts       |  2 +-
 src/common/logger.ts                          | 28 ++++++++--------
 ...ttings.scss => entity-settings.module.css} | 32 ++++++-------------
 .../+entity-settings/entity-settings.tsx      |  7 ++--
 5 files changed, 29 insertions(+), 42 deletions(-)
 rename src/renderer/components/+entity-settings/{entity-settings.scss => entity-settings.module.css} (76%)

diff --git a/package.json b/package.json
index ffcbbcee0a..41842da7a3 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "OpenLens",
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "main": "static/build/main.js",
   "copyright": "© 2021 OpenLens Authors",
   "license": "MIT",
diff --git a/src/common/k8s-api/kube-object.store.ts b/src/common/k8s-api/kube-object.store.ts
index dc428eb08b..f90eaab8e5 100644
--- a/src/common/k8s-api/kube-object.store.ts
+++ b/src/common/k8s-api/kube-object.store.ts
@@ -159,7 +159,7 @@ export abstract class KubeObjectStore<T extends KubeObject> extends ItemStore<T>
         this.loadedNamespaces = namespaces;
 
         return Promise // load resources per namespace
-          .all(namespaces.map(namespace => api.list({ namespace, reqInit })))
+          .all(namespaces.map(namespace => api.list({ namespace, reqInit }, this.query)))
           .then(items => items.flat().filter(Boolean));
       }
     }
diff --git a/src/common/logger.ts b/src/common/logger.ts
index 825fa2493b..ca975871b8 100644
--- a/src/common/logger.ts
+++ b/src/common/logger.ts
@@ -59,24 +59,24 @@ if (ipcMain) {
       ),
     })
   );
+
+  if (!isTestEnv) {
+    transports.push(
+      new winston.transports.File({
+        handleExceptions: false,
+        level: logLevel,
+        filename: "lens.log",
+        dirname: getPath("logs"),
+        maxsize: 16 * 1024,
+        maxFiles: 16,
+        tailable: true,
+      })
+    );
+  }
 } else {
   transports.push(new BrowserConsole());
 }
 
-if (!isTestEnv) {
-  transports.push(
-    new winston.transports.File({
-      handleExceptions: false,
-      level: logLevel,
-      filename: "lens.log",
-      dirname: getPath("logs"),
-      maxsize: 16 * 1024,
-      maxFiles: 16,
-      tailable: true,
-    })
-  );
-}
-
 export default winston.createLogger({
   format: format.simple(),
   transports,
diff --git a/src/renderer/components/+entity-settings/entity-settings.scss b/src/renderer/components/+entity-settings/entity-settings.module.css
similarity index 76%
rename from src/renderer/components/+entity-settings/entity-settings.scss
rename to src/renderer/components/+entity-settings/entity-settings.module.css
index 30c01b8a67..604ecd5c5b 100644
--- a/src/renderer/components/+entity-settings/entity-settings.scss
+++ b/src/renderer/components/+entity-settings/entity-settings.module.css
@@ -19,26 +19,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-.EntitySettings {
-  $spacing: $padding * 3;
-
-
-  // TODO: move sub-component styles to separate files
-  .admin-note {
-    font-size: small;
-    opacity: 0.5;
-    margin-left: $margin;
-  }
-
-  .button-area {
-    margin-top: $margin * 2;
-  }
-
-  .file-loader {
-    margin-top: $margin * 2;
-  }
-
-  .Input, .Select {
-    margin-top: $padding;
-  }
-}
+.entityName {
+  @apply font-bold overflow-hidden;
+  word-break: break-word;
+  color: var(--textColorAccent);
+  display: -webkit-box;
+  /* Simulate text-overflow:ellipsis styles but for multiple text lines */
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
\ No newline at end of file
diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx
index f656b6fa9d..bcb5895413 100644
--- a/src/renderer/components/+entity-settings/entity-settings.tsx
+++ b/src/renderer/components/+entity-settings/entity-settings.tsx
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import "./entity-settings.scss";
+import styles from "./entity-settings.module.css";
 
 import React from "react";
 import { observable, makeObservable } from "mobx";
@@ -98,7 +98,9 @@ export class EntitySettings extends React.Component<Props> {
             source={this.entity.metadata.source}
             src={this.entity.spec.icon?.src}
           />
-          <h2>{this.entity.metadata.name}</h2>
+          <div className={styles.entityName}>
+            {this.entity.metadata.name}
+          </div>
         </div>
         <Tabs className="flex column" scrollable={false} onChange={this.onTabChange} value={this.activeTab}>
           { groups.map((group, groupIndex) => (
@@ -138,7 +140,6 @@ export class EntitySettings extends React.Component<Props> {
 
     return (
       <SettingLayout
-        className="CatalogEntitySettings"
         navigation={this.renderNavigation()}
         contentGaps={false}
       >