From eb3f49d7f696a3aa21cc35c640c3636122129595 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Thu, 29 Dec 2022 12:31:22 +0300
Subject: [PATCH] Clean up

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../components/+config-maps/config-map-details.tsx         | 4 ++--
 .../get-editor-height-from-lines-number.injectable.ts      | 2 --
 src/renderer/components/monaco-editor/monaco-editor.tsx    | 7 +++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/+config-maps/config-map-details.tsx b/src/renderer/components/+config-maps/config-map-details.tsx
index 377e0874ba..b03cdda2c9 100644
--- a/src/renderer/components/+config-maps/config-map-details.tsx
+++ b/src/renderer/components/+config-maps/config-map-details.tsx
@@ -99,7 +99,7 @@ class NonInjectedConfigMapDetails extends React.Component<ConfigMapDetailsProps
             <>
               <DrawerTitle>Data</DrawerTitle>
               {
-                data.map(([name, value]) => (
+                data.map(([name, value = ""]) => (
                   <div key={name} className="data">
                     <div className="name">{name}</div>
                     <MonacoEditor
@@ -110,7 +110,7 @@ class NonInjectedConfigMapDetails extends React.Component<ConfigMapDetailsProps
                         border: "1px solid var(--borderFaintColor)",
                         borderRadius: "4px",
                       }}
-                      value={value || ""}
+                      value={value}
                       onChange={v => this.data.set(name, v)}
                       setInitialHeight
                     />
diff --git a/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.injectable.ts b/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.injectable.ts
index 0136910952..b093640e7c 100644
--- a/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.injectable.ts
+++ b/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.injectable.ts
@@ -5,8 +5,6 @@
 
 import { getInjectable } from "@ogre-tools/injectable";
 
-export type MonacoEditorSize = (linesCount: number) => number;
-
 const getEditorHeightFromLinesCountInjectable = getInjectable({
   id: "get-editor-height-from-lines-number",
 
diff --git a/src/renderer/components/monaco-editor/monaco-editor.tsx b/src/renderer/components/monaco-editor/monaco-editor.tsx
index 2aa7b1259d..b5cf17d0a4 100644
--- a/src/renderer/components/monaco-editor/monaco-editor.tsx
+++ b/src/renderer/components/monaco-editor/monaco-editor.tsx
@@ -18,7 +18,6 @@ import type { LensTheme } from "../../themes/lens-theme";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import userStoreInjectable from "../../../common/user-store/user-store.injectable";
 import activeThemeInjectable from "../../themes/active.injectable";
-import type { MonacoEditorSize } from "./get-editor-height-from-lines-number.injectable";
 import getEditorHeightFromLinesCountInjectable from "./get-editor-height-from-lines-number.injectable";
 
 export type MonacoEditorId = string;
@@ -45,7 +44,7 @@ export interface MonacoEditorProps {
 interface Dependencies {
   userStore: UserStore;
   activeTheme: IComputedValue<LensTheme>;
-  getEditorHeightFromLinesCount: MonacoEditorSize;
+  getEditorHeightFromLinesCount: (linesCount: number) => number;
 }
 
 export function createMonacoUri(id: MonacoEditorId): Uri {
@@ -297,11 +296,11 @@ class NonInjectedMonacoEditor extends React.Component<MonacoEditorProps & Depend
   }
 
   render() {
-    const { className, style, setInitialHeight } = this.props;
+    const { className, style } = this.props;
 
     const css: React.CSSProperties = {
       ...style,
-      height: setInitialHeight ? this.initialHeight : style?.height,
+      height: style?.height ?? this.initialHeight,
     };
 
     return (