From 92766e71e4aed744139ac5c496da6361cbca9be6 Mon Sep 17 00:00:00 2001
From: Roman
Date: Tue, 28 Sep 2021 17:01:16 +0300
Subject: [PATCH] monaco editor implemented right
Signed-off-by: Roman
---
package.json | 1 +
src/common/user-store/preferences-helpers.ts | 8 +-
src/common/user-store/user-store.ts | 32 +----
src/renderer/bootstrap.tsx | 8 --
.../components/+add-cluster/add-cluster.tsx | 16 +--
.../+apps-releases/release-details.tsx | 13 +-
.../+custom-resources/crd-details.scss | 2 +-
.../+custom-resources/crd-details.tsx | 13 +-
.../components/+preferences/editor.tsx | 18 +--
.../pod-details-affinities.tsx | 17 +--
.../components/dock/create-resource.tsx | 46 +++---
src/renderer/components/dock/dock.store.ts | 24 ----
.../components/dock/edit-resource.store.ts | 2 -
.../components/dock/edit-resource.tsx | 20 +--
src/renderer/components/dock/editor-panel.tsx | 111 ---------------
.../components/dock/install-chart.store.ts | 6 -
.../components/dock/install-chart.tsx | 48 +++----
.../components/dock/upgrade-chart.store.ts | 7 +-
.../components/dock/upgrade-chart.tsx | 20 +--
.../kubeconfig-dialog/kubeconfig-dialog.tsx | 14 +-
.../index.ts} | 41 +-----
.../monaco-editor/monaco-editor.tsx | 131 ++++++++++++++++++
.../monaco-themes/Clouds Midnight.json | 127 -----------------
src/renderer/theme.store.ts | 24 +---
src/renderer/themes/lens-dark.json | 2 +-
webpack.renderer.ts | 8 +-
yarn.lock | 7 +
27 files changed, 265 insertions(+), 501 deletions(-)
delete mode 100644 src/renderer/components/dock/editor-panel.tsx
rename src/renderer/components/{dock/monaco-model-manager.ts => monaco-editor/index.ts} (51%)
create mode 100644 src/renderer/components/monaco-editor/monaco-editor.tsx
delete mode 100644 src/renderer/monaco-themes/Clouds Midnight.json
diff --git a/package.json b/package.json
index 6b19e77edc..29443c28e0 100644
--- a/package.json
+++ b/package.json
@@ -221,6 +221,7 @@
"moment": "^2.29.1",
"moment-timezone": "^0.5.33",
"monaco-editor": "^0.26.1",
+ "monaco-editor-webpack-plugin": "^4.2.0",
"node-fetch": "^2.6.1",
"node-pty": "^0.10.1",
"npm": "^6.14.15",
diff --git a/src/common/user-store/preferences-helpers.ts b/src/common/user-store/preferences-helpers.ts
index 59f201f55f..3c36911949 100644
--- a/src/common/user-store/preferences-helpers.ts
+++ b/src/common/user-store/preferences-helpers.ts
@@ -24,7 +24,7 @@ import path from "path";
import os from "os";
import { ThemeStore } from "../../renderer/theme.store";
import { ObservableToggleSet } from "../utils";
-import type {monaco} from "react-monaco-editor";
+import type * as monaco from "monaco-editor";
import merge from "lodash/merge";
export interface KubeconfigSyncEntry extends KubeconfigSyncValue {
@@ -34,9 +34,9 @@ export interface KubeconfigSyncEntry extends KubeconfigSyncValue {
export interface KubeconfigSyncValue { }
export interface EditorConfiguration {
- miniMap?: monaco.editor.IEditorMinimapOptions;
- lineNumbers?: monaco.editor.LineNumbersType;
- tabSize?: number;
+ miniMap: monaco.editor.IEditorMinimapOptions;
+ lineNumbers: monaco.editor.LineNumbersType;
+ tabSize: number;
}
export const defaultEditorConfig: EditorConfiguration = {
diff --git a/src/common/user-store/user-store.ts b/src/common/user-store/user-store.ts
index ee0022da1b..44aa209fdc 100644
--- a/src/common/user-store/user-store.ts
+++ b/src/common/user-store/user-store.ts
@@ -21,18 +21,16 @@
import { app } from "electron";
import semver from "semver";
-import { action, computed, observable, reaction, makeObservable } from "mobx";
+import { action, computed, makeObservable, observable, reaction } from "mobx";
import { BaseStore } from "../base-store";
-import migrations from "../../migrations/user-store";
+import migrations, { fileNameMigration } from "../../migrations/user-store";
import { getAppVersion } from "../utils/app-version";
import { kubeConfigDefaultPath } from "../kube-helpers";
import { appEventBus } from "../event-bus";
import path from "path";
-import { fileNameMigration } from "../../migrations/user-store";
import { ObservableToggleSet, toJS } from "../../renderer/utils";
-import { DESCRIPTORS, KubeconfigSyncValue, UserPreferencesModel, EditorConfiguration } from "./preferences-helpers";
+import { defaultEditorConfig, DESCRIPTORS, EditorConfiguration, KubeconfigSyncValue, UserPreferencesModel } from "./preferences-helpers";
import logger from "../../main/logger";
-import type { monaco } from "react-monaco-editor";
import { getPath } from "../utils/getPath";
export interface UserStoreModel {
@@ -86,7 +84,7 @@ export class UserStore extends BaseStore /* implements UserStore
/**
* Monaco editor configs
*/
- @observable editorConfiguration:EditorConfiguration = {tabSize: null, miniMap: null, lineNumbers: null};
+ @observable editorConfiguration: EditorConfiguration = defaultEditorConfig;
/**
* The set of file/folder paths to be synced
@@ -119,28 +117,6 @@ export class UserStore extends BaseStore /* implements UserStore
});
}
- // Returns monaco editor options for selected editor type (the place, where a particular instance of the editor is mounted)
- getEditorOptions(): monaco.editor.IStandaloneEditorConstructionOptions {
- return {
- automaticLayout: true,
- tabSize: this.editorConfiguration.tabSize,
- minimap: this.editorConfiguration.miniMap,
- lineNumbers: this.editorConfiguration.lineNumbers
- };
- }
-
- setEditorLineNumbers(lineNumbers: monaco.editor.LineNumbersType) {
- this.editorConfiguration.lineNumbers = lineNumbers;
- }
-
- setEditorTabSize(tabSize: number) {
- this.editorConfiguration.tabSize = tabSize;
- }
-
- enableEditorMinimap(miniMap: boolean ) {
- this.editorConfiguration.miniMap.enabled = miniMap;
- }
-
/**
* Checks if a column (by ID) for a table (by ID) is configured to be hidden
* @param tableId The ID of the table to be checked against
diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx
index b6b97cfc6b..3e7daa5404 100644
--- a/src/renderer/bootstrap.tsx
+++ b/src/renderer/bootstrap.tsx
@@ -28,7 +28,6 @@ import * as ReactRouter from "react-router";
import * as ReactRouterDom from "react-router-dom";
import * as LensExtensionsCommonApi from "../extensions/common-api";
import * as LensExtensionsRendererApi from "../extensions/renderer-api";
-import { monaco } from "react-monaco-editor";
import { render, unmountComponentAtNode } from "react-dom";
import { delay } from "../common/utils";
import { isMac, isDevelopment } from "../common/vars";
@@ -50,7 +49,6 @@ import { FilesystemProvisionerStore } from "../main/extension-filesystem";
import { ThemeStore } from "./theme.store";
import { SentryInit } from "../common/sentry";
import { TerminalStore } from "./components/dock/terminal.store";
-import cloudsMidnight from "./monaco-themes/Clouds Midnight.json";
configurePackages();
@@ -104,12 +102,6 @@ export async function bootstrap(App: AppComponent) {
ExtensionsStore.createInstance();
FilesystemProvisionerStore.createInstance();
- // define Monaco Editor themes
- const { base, ...params } = cloudsMidnight;
- const baseTheme = base as monaco.editor.BuiltinTheme;
-
- monaco.editor.defineTheme("clouds-midnight", {base: baseTheme, ...params});
-
// ThemeStore depends on: UserStore
ThemeStore.createInstance();
diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx
index 81a75019fa..ac6a2de5cd 100644
--- a/src/renderer/components/+add-cluster/add-cluster.tsx
+++ b/src/renderer/components/+add-cluster/add-cluster.tsx
@@ -24,7 +24,7 @@ import "./add-cluster.scss";
import type { KubeConfig } from "@kubernetes/client-node";
import fse from "fs-extra";
import { debounce } from "lodash";
-import { action, computed, observable, makeObservable } from "mobx";
+import { action, computed, makeObservable, observable } from "mobx";
import { observer } from "mobx-react";
import path from "path";
import React from "react";
@@ -34,13 +34,11 @@ import { appEventBus } from "../../../common/event-bus";
import { loadConfigFromString, splitConfig } from "../../../common/kube-helpers";
import { docsUrl } from "../../../common/vars";
import { navigate } from "../../navigation";
-import { getCustomKubeConfigPath, cssNames, iter } from "../../utils";
+import { getCustomKubeConfigPath, iter } from "../../utils";
import { Button } from "../button";
import { Notifications } from "../notifications";
import { SettingLayout } from "../layout/setting-layout";
-import MonacoEditor from "react-monaco-editor";
-import { ThemeStore } from "../../theme.store";
-import { UserStore } from "../../../common/user-store";
+import { MonacoEditor } from "../monaco-editor";
interface Option {
config: KubeConfig;
@@ -85,7 +83,7 @@ export class AddCluster extends React.Component {
const { config, error } = loadConfigFromString(this.customConfig.trim() || "{}");
this.kubeContexts.replace(getContexts(config));
-
+
if (error) {
this.errors.push(error.toString());
}
@@ -124,12 +122,8 @@ export class AddCluster extends React.Component {
{
+ onChange={(value: string) => {
this.customConfig = value;
this.errors.length = 0;
this.refreshContexts();
diff --git a/src/renderer/components/+apps-releases/release-details.tsx b/src/renderer/components/+apps-releases/release-details.tsx
index 4e93136c03..5e17ca1cdd 100644
--- a/src/renderer/components/+apps-releases/release-details.tsx
+++ b/src/renderer/components/+apps-releases/release-details.tsx
@@ -24,7 +24,7 @@ import "./release-details.scss";
import React, { Component } from "react";
import groupBy from "lodash/groupBy";
import isEqual from "lodash/isEqual";
-import { observable, reaction, makeObservable } from "mobx";
+import { makeObservable, observable, reaction } from "mobx";
import { Link } from "react-router-dom";
import kebabCase from "lodash/kebabCase";
import { getRelease, getReleaseValues, HelmRelease, IReleaseDetails } from "../../../common/k8s-api/endpoints/helm-releases.api";
@@ -46,8 +46,7 @@ import { secretsStore } from "../+config-secrets/secrets.store";
import { Secret } from "../../../common/k8s-api/endpoints";
import { getDetailsUrl } from "../kube-detail-params";
import { Checkbox } from "../checkbox";
-import MonacoEditor from "react-monaco-editor";
-import { UserStore } from "../../../common/user-store";
+import { MonacoEditor } from "../monaco-editor";
interface Props {
release: HelmRelease;
@@ -160,14 +159,12 @@ export class ReleaseDetails extends Component {
disabled={valuesLoading}
/>
this.values = text}
- theme={ThemeStore.getInstance().activeTheme.monacoTheme}
- className={cssNames("MonacoEditor", {loading: valuesLoading})}
- options={{readOnly: valuesLoading || this.showOnlyUserSuppliedValues, ...UserStore.getInstance().getEditorOptions()}}
>
- {valuesLoading && }
+ {valuesLoading && }
diff --git a/src/renderer/components/+preferences/editor.tsx b/src/renderer/components/+preferences/editor.tsx
index 707bb14428..a9d4ac3abf 100644
--- a/src/renderer/components/+preferences/editor.tsx
+++ b/src/renderer/components/+preferences/editor.tsx
@@ -25,7 +25,7 @@ import { FormSwitch, Switcher } from "../switch";
import { SubTitle } from "../layout/sub-title";
import { Input } from "../input";
import { isNumber } from "../input/input_validators";
-import { Select, SelectOption } from "../select";
+import { Select } from "../select";
enum EditorLineNumbersStyles {
on = "On",
@@ -35,6 +35,7 @@ enum EditorLineNumbersStyles {
}
export const Editor = observer(() => {
+ const editorConfiguration = UserStore.getInstance().editorConfiguration;
return (
@@ -43,8 +44,8 @@ export const Editor = observer(() => {
UserStore.getInstance().enableEditorMinimap(v.target.checked)}
+ checked={editorConfiguration.miniMap.enabled}
+ onChange={(evt, checked: boolean) => editorConfiguration.miniMap.enabled = checked}
name="minimap"
/>
}
@@ -54,9 +55,9 @@ export const Editor = observer(() => {
@@ -66,9 +67,10 @@ export const Editor = observer(() => {
theme="round-black"
min={1}
max={10}
+ type="number"
validators={[isNumber]}
- value={UserStore.getInstance().editorConfiguration.tabSize?.toString()}
- onChange={(value) => {(Number(value) || value=="") && UserStore.getInstance().setEditorTabSize(Number(value));}}
+ value={editorConfiguration.tabSize.toString()}
+ onChange={value => editorConfiguration.tabSize = Number(value)}
/>
diff --git a/src/renderer/components/+workloads-pods/pod-details-affinities.tsx b/src/renderer/components/+workloads-pods/pod-details-affinities.tsx
index 01cd5ea0b4..9695804f0e 100644
--- a/src/renderer/components/+workloads-pods/pod-details-affinities.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details-affinities.tsx
@@ -22,12 +22,9 @@
import "./pod-details-affinities.scss";
import React from "react";
import jsYaml from "js-yaml";
-import { DrawerParamToggler, DrawerItem } from "../drawer";
-import type { Pod, Deployment, DaemonSet, StatefulSet, ReplicaSet, Job } from "../../../common/k8s-api/endpoints";
-import MonacoEditor from "react-monaco-editor";
-import { cssNames } from "../../utils";
-import { ThemeStore } from "../../theme.store";
-import { UserStore } from "../../../common/user-store";
+import { DrawerItem, DrawerParamToggler } from "../drawer";
+import type { DaemonSet, Deployment, Job, Pod, ReplicaSet, StatefulSet } from "../../../common/k8s-api/endpoints";
+import { MonacoEditor } from "../monaco-editor";
interface Props {
workload: Pod | Deployment | DaemonSet | StatefulSet | ReplicaSet | Job;
@@ -45,13 +42,7 @@ export class PodDetailsAffinities extends React.Component {
-
+
diff --git a/src/renderer/components/dock/create-resource.tsx b/src/renderer/components/dock/create-resource.tsx
index a357d0dc62..e6e2176f9e 100644
--- a/src/renderer/components/dock/create-resource.tsx
+++ b/src/renderer/components/dock/create-resource.tsx
@@ -24,19 +24,18 @@ import "./create-resource.scss";
import React from "react";
import path from "path";
import fs from "fs-extra";
-import {Select, GroupSelectOption, SelectOption} from "../select";
+import { GroupSelectOption, Select, SelectOption } from "../select";
import jsYaml from "js-yaml";
-import { observable, makeObservable } from "mobx";
+import { makeObservable, observable } from "mobx";
import { observer } from "mobx-react";
import { cssNames } from "../../utils";
import { createResourceStore } from "./create-resource.store";
import type { DockTab } from "./dock.store";
-import { EditorPanel } from "./editor-panel";
+import { MonacoEditor } from "../monaco-editor";
import { InfoPanel } from "./info-panel";
import { resourceApplierApi } from "../../../common/k8s-api/endpoints/resource-applier.api";
import type { JsonApiErrorParsed } from "../../../common/k8s-api/json-api";
import { Notifications } from "../notifications";
-import { monacoModelsManager } from "./monaco-model-manager";
interface Props {
className?: string;
@@ -45,9 +44,9 @@ interface Props {
@observer
export class CreateResource extends React.Component {
- @observable currentTemplates:Map = new Map();
+ @observable currentTemplates: Map = new Map();
@observable error = "";
- @observable templates:GroupSelectOption[] = [];
+ @observable templates: GroupSelectOption[] = [];
constructor(props: Props) {
super(props);
@@ -59,15 +58,15 @@ export class CreateResource extends React.Component {
createResourceStore.watchUserTemplates(() => createResourceStore.getMergedTemplates().then(v => this.updateGroupSelectOptions(v)));
}
- updateGroupSelectOptions(templates :Record) {
+ updateGroupSelectOptions(templates: Record) {
this.templates = Object.entries(templates)
.map(([name, grouping]) => this.convertToGroup(name, grouping));
}
- convertToGroup(group:string, items:string[]):GroupSelectOption {
- const options = items.map(v => ({label: path.parse(v).name, value: v}));
+ convertToGroup(group: string, items: string[]): GroupSelectOption {
+ const options = items.map(v => ({ label: path.parse(v).name, value: v }));
- return {label: group, options};
+ return { label: group, options };
}
get tabId() {
@@ -82,16 +81,19 @@ export class CreateResource extends React.Component {
return this.currentTemplates.get(this.tabId) ?? null;
}
- onChange = (value: string, error?: string) => {
+ onChange = (value: string) => {
createResourceStore.setData(this.tabId, value);
+ };
+
+ onError = (error: string) => {
this.error = error;
};
onSelectTemplate = (item: SelectOption) => {
this.currentTemplates.set(this.tabId, item);
- fs.readFile(item.value,"utf8").then(v => {
- createResourceStore.setData(this.tabId,v);
- monacoModelsManager.getModel(this.tabId).setValue(v ?? "");
+
+ fs.readFile(item.value, "utf8").then(value => {
+ createResourceStore.setData(this.tabId, value);
});
};
@@ -130,26 +132,25 @@ export class CreateResource extends React.Component {
return successMessage;
};
- renderControls(){
+ renderControls() {
return (
);
}
-
render() {
- const { tabId, data, error, create, onChange } = this;
+ const { tabId, data, error, create } = this;
const { className } = this.props;
return (
@@ -162,10 +163,11 @@ export class CreateResource extends React.Component {
submitLabel="Create"
showNotifications={false}
/>
-
);
diff --git a/src/renderer/components/dock/dock.store.ts b/src/renderer/components/dock/dock.store.ts
index 7551de1a2f..167b3de273 100644
--- a/src/renderer/components/dock/dock.store.ts
+++ b/src/renderer/components/dock/dock.store.ts
@@ -23,7 +23,6 @@ import * as uuid from "uuid";
import { action, computed, IReactionOptions, makeObservable, observable, reaction } from "mobx";
import { autoBind, createStorage } from "../../utils";
import throttle from "lodash/throttle";
-import {monacoModelsManager} from "./monaco-model-manager";
export type TabId = string;
@@ -158,12 +157,6 @@ export class DockStore implements DockStorageState {
private init() {
// adjust terminal height if window size changes
window.addEventListener("resize", throttle(this.adjustHeight, 250));
- // create monaco models
- this.whenReady.then(() => {this.tabs.forEach(tab => {
- if (this.usesMonacoEditor(tab)) {
- monacoModelsManager.addModel(tab.id);
- }
- });});
}
get maxHeight() {
@@ -193,13 +186,6 @@ export class DockStore implements DockStorageState {
return this.tabs.length > 0;
}
- usesMonacoEditor(tab: DockTab): boolean {
- return [TabKind.CREATE_RESOURCE,
- TabKind.EDIT_RESOURCE,
- TabKind.INSTALL_CHART,
- TabKind.UPGRADE_CHART].includes(tab.kind);
- }
-
@action
open(fullSize?: boolean) {
this.isOpen = true;
@@ -274,11 +260,6 @@ export class DockStore implements DockStorageState {
title
};
- // add monaco model
- if (this.usesMonacoEditor(tab)) {
- monacoModelsManager.addModel(id);
- }
-
this.tabs.push(tab);
this.selectTab(tab.id);
this.open();
@@ -294,11 +275,6 @@ export class DockStore implements DockStorageState {
return;
}
- // remove monaco model
- if (this.usesMonacoEditor(tab)) {
- monacoModelsManager.removeModel(tabId);
- }
-
this.tabs = this.tabs.filter(tab => tab.id !== tabId);
if (this.selectedTabId === tab.id) {
diff --git a/src/renderer/components/dock/edit-resource.store.ts b/src/renderer/components/dock/edit-resource.store.ts
index b5be580313..2c8d26bbb9 100644
--- a/src/renderer/components/dock/edit-resource.store.ts
+++ b/src/renderer/components/dock/edit-resource.store.ts
@@ -26,7 +26,6 @@ import { dockStore, DockTab, DockTabCreateSpecific, TabId, TabKind } from "./doc
import type { KubeObject } from "../../../common/k8s-api/kube-object";
import { apiManager } from "../../../common/k8s-api/api-manager";
import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
-import {monacoModelsManager} from "./monaco-model-manager";
export interface EditingResource {
resource: string; // resource path, e.g. /api/v1/namespaces/default
@@ -62,7 +61,6 @@ export class EditResourceStore extends DockTabStore {
// preload resource for editing
if (!obj && !store.isLoaded && !store.isLoading && isActiveTab) {
store.loadFromPath(resource).catch(noop);
- monacoModelsManager.getModel(tabId).setValue(resource);
}
// auto-close tab when resource removed from store
else if (!obj && store.isLoaded) {
diff --git a/src/renderer/components/dock/edit-resource.tsx b/src/renderer/components/dock/edit-resource.tsx
index 19a238ab30..8c67780cf2 100644
--- a/src/renderer/components/dock/edit-resource.tsx
+++ b/src/renderer/components/dock/edit-resource.tsx
@@ -30,7 +30,7 @@ import { cssNames } from "../../utils";
import { editResourceStore } from "./edit-resource.store";
import { InfoPanel } from "./info-panel";
import { Badge } from "../badge";
-import { EditorPanel } from "./editor-panel";
+import { MonacoEditor } from "../monaco-editor";
import { Spinner } from "../spinner";
import type { KubeObject } from "../../../common/k8s-api/kube-object";
@@ -86,11 +86,14 @@ export class EditResource extends React.Component {
});
}
- onChange = (draft: string, error?: string) => {
- this.error = error;
+ onChange = (draft: string) => {
this.saveDraft(draft);
};
+ onError = (error: string) => {
+ this.error = error;
+ };
+
save = async () => {
if (this.error) {
return null;
@@ -110,7 +113,7 @@ export class EditResource extends React.Component {
};
render() {
- const { tabId, error, onChange, save, draft, isReadyForEditing, resource } = this;
+ const { tabId, error, draft, isReadyForEditing, resource } = this;
if (!isReadyForEditing) {
return ;
@@ -121,7 +124,7 @@ export class EditResource extends React.Component {
{
)}
/>
-
);
diff --git a/src/renderer/components/dock/editor-panel.tsx b/src/renderer/components/dock/editor-panel.tsx
deleted file mode 100644
index 31ccc5b2e2..0000000000
--- a/src/renderer/components/dock/editor-panel.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) 2021 OpenLens Authors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-import MonacoEditor, {monaco} from "react-monaco-editor";
-import React from "react";
-import jsYaml from "js-yaml";
-import { observable, makeObservable } from "mobx";
-import { disposeOnUnmount, observer } from "mobx-react";
-import { dockStore, TabId } from "./dock.store";
-import { monacoModelsManager } from "./monaco-model-manager";
-import { ThemeStore } from "../../theme.store";
-import { UserStore } from "../../../common/user-store";
-
-import "monaco-editor";
-
-interface Props {
- className?: string;
- tabId: TabId;
- value?: string;
- onChange(value: string, error?: string): void;
-}
-
-
-@observer
-export class EditorPanel extends React.Component {
- model: monaco.editor.ITextModel;
- public editor: monaco.editor.IStandaloneCodeEditor;
- @observable yamlError = "";
-
- constructor(props: Props) {
- super(props);
- makeObservable(this);
- }
-
- componentDidMount() {
- // validate and run callback with optional error
- this.onChange(this.props.value || "");
-
- disposeOnUnmount(this, [
- dockStore.onTabChange(this.onTabChange, { delay: 250 }),
- dockStore.onResize(this.onResize, { delay: 250 }),
- ]);
- }
-
- editorDidMount = (editor: monaco.editor.IStandaloneCodeEditor) => {
- this.editor = editor;
- const model = monacoModelsManager.getModel(this.props.tabId);
-
- model.setValue(this.props.value ?? "");
- this.editor.setModel(model);
- };
-
- validate(value: string) {
- try {
- jsYaml.safeLoadAll(value);
- this.yamlError = "";
- } catch (err) {
- this.yamlError = err.toString();
- }
- }
-
- onTabChange = () => {
- this.editor.focus();
- const model = monacoModelsManager.getModel(this.props.tabId);
-
- model.setValue(this.props.value ?? "");
- this.editor.setModel(model);
- };
-
- onResize = () => {
- this.editor.focus();
- };
-
- onChange = (value: string) => {
- this.validate(value);
-
- if (this.props.onChange) {
- this.props.onChange(value, this.yamlError);
- }
- };
-
- render() {
- return (
-
- );
- }
-}
diff --git a/src/renderer/components/dock/install-chart.store.ts b/src/renderer/components/dock/install-chart.store.ts
index 4f02629353..fb185ffb52 100644
--- a/src/renderer/components/dock/install-chart.store.ts
+++ b/src/renderer/components/dock/install-chart.store.ts
@@ -25,7 +25,6 @@ import { DockTabStore } from "./dock-tab.store";
import { getChartDetails, getChartValues, HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
import type { IReleaseUpdateDetails } from "../../../common/k8s-api/endpoints/helm-releases.api";
import { Notifications } from "../notifications";
-import { monacoModelsManager } from "./monaco-model-manager";
export interface IChartInstallData {
name: string;
@@ -91,15 +90,10 @@ export class InstallChartStore extends DockTabStore {
if (values) {
this.setData(tabId, { ...data, values });
- monacoModelsManager.getModel(tabId).setValue(values);
} else if (attempt < 4) {
return this.loadValues(tabId, attempt + 1);
}
}
-
- setData(tabId: TabId, data: IChartInstallData){
- super.setData(tabId, data);
- }
}
export const installChartStore = new InstallChartStore();
diff --git a/src/renderer/components/dock/install-chart.tsx b/src/renderer/components/dock/install-chart.tsx
index b0113018ea..2eabf49e4b 100644
--- a/src/renderer/components/dock/install-chart.tsx
+++ b/src/renderer/components/dock/install-chart.tsx
@@ -22,13 +22,13 @@
import "./install-chart.scss";
import React, { Component } from "react";
-import { observable, makeObservable } from "mobx";
+import { makeObservable, observable } from "mobx";
import { observer } from "mobx-react";
import { dockStore, DockTab } from "./dock.store";
import { InfoPanel } from "./info-panel";
import { Badge } from "../badge";
import { NamespaceSelect } from "../+namespaces/namespace-select";
-import { boundMethod, prevDefault } from "../../utils";
+import { prevDefault } from "../../utils";
import { IChartInstallData, installChartStore } from "./install-chart.store";
import { Spinner } from "../spinner";
import { Icon } from "../icon";
@@ -37,7 +37,7 @@ import { releaseStore } from "../+apps-releases/release.store";
import { LogsDialog } from "../dialog/logs-dialog";
import { Select, SelectOption } from "../select";
import { Input } from "../input";
-import { EditorPanel } from "./editor-panel";
+import { MonacoEditor } from "../monaco-editor";
import { navigate } from "../../navigation";
import { releaseURL } from "../../../common/routes";
@@ -75,8 +75,7 @@ export class InstallChart extends Component {
return installChartStore.details.getData(this.tabId);
}
- @boundMethod
- viewRelease() {
+ viewRelease = () => {
const { release } = this.releaseDetails;
navigate(releaseURL({
@@ -86,38 +85,32 @@ export class InstallChart extends Component {
}
}));
dockStore.closeTab(this.tabId);
- }
+ };
- @boundMethod
- save(data: Partial) {
+ save = (data: Partial) => {
const chart = { ...this.chartData, ...data };
installChartStore.setData(this.tabId, chart);
- }
+ };
- @boundMethod
- onVersionChange(option: SelectOption) {
+ onVersionChange = (option: SelectOption) => {
const version = option.value;
this.save({ version, values: "" });
installChartStore.loadValues(this.tabId);
- }
+ };
- @boundMethod
- onValuesChange(values: string, error?: string) {
- this.error = error;
+ onValuesChange = (values: string) => {
this.save({ values });
- }
+ };
- @boundMethod
- onNamespaceChange(opt: SelectOption) {
+ onNamespaceChange = (opt: SelectOption) => {
this.save({ namespace: opt.value });
- }
+ };
- @boundMethod
- onReleaseNameChange(name: string) {
+ onReleaseNameChange = (name: string) => {
this.save({ releaseName: name });
- }
+ };
install = async () => {
const { repo, name, version, namespace, values, releaseName } = this.chartData;
@@ -138,14 +131,14 @@ export class InstallChart extends Component {
const { tabId, chartData, values, versions, install } = this;
if (chartData?.values === undefined || !versions) {
- return ;
+ return ;
}
if (this.releaseDetails) {
return (
-
+
Installation complete!
@@ -174,7 +167,7 @@ export class InstallChart extends Component
{
const panelControls = (
Chart
-
+
Version
);
diff --git a/src/renderer/components/dock/upgrade-chart.store.ts b/src/renderer/components/dock/upgrade-chart.store.ts
index dfbfc2bc47..0f26bf3952 100644
--- a/src/renderer/components/dock/upgrade-chart.store.ts
+++ b/src/renderer/components/dock/upgrade-chart.store.ts
@@ -19,13 +19,12 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-import { action, autorun, computed, IReactionDisposer, reaction, makeObservable } from "mobx";
+import { action, autorun, computed, IReactionDisposer, makeObservable, reaction } from "mobx";
import { dockStore, DockTab, DockTabCreateSpecific, TabId, TabKind } from "./dock.store";
import { DockTabStore } from "./dock-tab.store";
import { getReleaseValues, HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api";
import { releaseStore } from "../+apps-releases/release.store";
import { iter } from "../../utils";
-import { monacoModelsManager } from "./monaco-model-manager";
export interface IChartUpgradeData {
releaseName: string;
@@ -37,7 +36,8 @@ export class UpgradeChartStore extends DockTabStore {
values = new DockTabStore();
- @computed private get releaseNameReverseLookup(): Map {
+ @computed
+ private get releaseNameReverseLookup(): Map {
return new Map(iter.map(this.data, ([id, { releaseName }]) => [releaseName, id]));
}
@@ -119,7 +119,6 @@ export class UpgradeChartStore extends DockTabStore {
const values = await getReleaseValues(releaseName, releaseNamespace, true);
this.values.setData(tabId, values);
- monacoModelsManager.getModel(tabId).setValue(values);
}
getTabByRelease(releaseName: string): DockTab {
diff --git a/src/renderer/components/dock/upgrade-chart.tsx b/src/renderer/components/dock/upgrade-chart.tsx
index 582bd6b8e0..5ef94938b7 100644
--- a/src/renderer/components/dock/upgrade-chart.tsx
+++ b/src/renderer/components/dock/upgrade-chart.tsx
@@ -22,7 +22,7 @@
import "./upgrade-chart.scss";
import React from "react";
-import { observable, reaction, makeObservable } from "mobx";
+import { makeObservable, observable, reaction } from "mobx";
import { disposeOnUnmount, observer } from "mobx-react";
import { cssNames } from "../../utils";
import type { DockTab } from "./dock.store";
@@ -31,7 +31,7 @@ import { upgradeChartStore } from "./upgrade-chart.store";
import { Spinner } from "../spinner";
import { releaseStore } from "../+apps-releases/release.store";
import { Badge } from "../badge";
-import { EditorPanel } from "./editor-panel";
+import { MonacoEditor } from "../monaco-editor";
import { helmChartStore, IChartVersion } from "../+apps-helm-charts/helm-chart.store";
import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api";
import { Select, SelectOption } from "../select";
@@ -86,8 +86,11 @@ export class UpgradeChart extends React.Component {
this.version = this.versions[0];
}
- onChange = (value: string, error?: string) => {
+ onChange = (value: string) => {
upgradeChartStore.values.setData(this.tabId, value);
+ };
+
+ onError = (error: string) => {
this.error = error;
};
@@ -118,7 +121,7 @@ export class UpgradeChart extends React.Component {
};
render() {
- const { tabId, release, value, error, onChange, upgrade, versions, version } = this;
+ const { tabId, release, value, error, versions, version } = this;
const { className } = this.props;
if (!release || upgradeChartStore.isLoading() || !version) {
@@ -148,15 +151,16 @@ export class UpgradeChart extends React.Component {
-
);
diff --git a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
index 2eb4298b47..bf505a80a2 100644
--- a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
+++ b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
@@ -22,7 +22,7 @@
import "./kubeconfig-dialog.scss";
import React from "react";
-import { observable, makeObservable } from "mobx";
+import { makeObservable, observable } from "mobx";
import { observer } from "mobx-react";
import jsYaml from "js-yaml";
import type { ServiceAccount } from "../../../common/k8s-api/endpoints";
@@ -33,9 +33,7 @@ import { Icon } from "../icon";
import { Notifications } from "../notifications";
import { Wizard, WizardStep } from "../wizard";
import { apiBase } from "../../api";
-import MonacoEditor from "react-monaco-editor";
-import { ThemeStore } from "../../theme.store";
-import { UserStore } from "../../../common/user-store";
+import { MonacoEditor } from "../monaco-editor";
interface IKubeconfigDialogData {
title?: React.ReactNode;
@@ -129,13 +127,7 @@ export class KubeConfigDialog extends React.Component
{
>
-
+