From c0db9e3beff710b8c8f65e67f8c0591f3b97dd6b Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 21 Apr 2021 17:35:46 +0300 Subject: [PATCH] merge:fixes, lint:fixes Signed-off-by: Roman --- src/extensions/extension-loader.ts | 2 ++ src/renderer/bootstrap.tsx | 12 +++--------- .../+apps-helm-charts/helm-chart.store.ts | 3 --- .../components/+apps-releases/release.store.ts | 4 +--- .../components/+extensions/extensions.tsx | 16 +++++++--------- src/renderer/components/dock/terminal.store.ts | 2 +- .../notifications/notifications.store.tsx | 5 ++--- src/renderer/theme.store.ts | 4 ++-- 8 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts index acbfb75a95..03e6335806 100644 --- a/src/extensions/extension-loader.ts +++ b/src/extensions/extension-loader.ts @@ -42,6 +42,8 @@ export class ExtensionLoader extends Singleton { whenLoaded = when(() => this.isLoaded); constructor() { + super(); + makeObservable(this); } diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx index 674c947d59..10a129ae63 100644 --- a/src/renderer/bootstrap.tsx +++ b/src/renderer/bootstrap.tsx @@ -8,20 +8,14 @@ import * as ReactRouterDom from "react-router-dom"; import * as LensExtensions from "../extensions/extension-api"; import { render, unmountComponentAtNode } from "react-dom"; import { delay } from "../common/utils"; -import { isMac, isDevelopment } from "../common/vars"; +import { isDevelopment, isMac } from "../common/vars"; import { HotbarStore } from "../common/hotbar-store"; import { ClusterStore } from "../common/cluster-store"; import { UserStore } from "../common/user-store"; -import * as LensExtensions from "../extensions/extension-api"; import { ExtensionDiscovery } from "../extensions/extension-discovery"; import { ExtensionLoader } from "../extensions/extension-loader"; import { ExtensionsStore } from "../extensions/extensions-store"; import { FilesystemProvisionerStore } from "../main/extension-filesystem"; -import { extensionDiscovery } from "../extensions/extension-discovery"; -import { extensionLoader } from "../extensions/extension-loader"; -import { extensionsStore } from "../extensions/extensions-store"; -import { hotbarStore } from "../common/hotbar-store"; -import { filesystemProvisionerStore } from "../main/extension-filesystem"; import { App } from "./components/app"; import { LensApp } from "./lens-app"; import { ThemeStore } from "./theme.store"; @@ -95,8 +89,8 @@ export async function bootstrap(App: AppComponent) { } }); render(<> - {isMac &&
} - + {isMac &&
} + , rootElem); } diff --git a/src/renderer/components/+apps-helm-charts/helm-chart.store.ts b/src/renderer/components/+apps-helm-charts/helm-chart.store.ts index d3b925ebdc..678bda72e9 100644 --- a/src/renderer/components/+apps-helm-charts/helm-chart.store.ts +++ b/src/renderer/components/+apps-helm-charts/helm-chart.store.ts @@ -30,9 +30,6 @@ export class HelmChartStore extends ItemStore { throw error; } - - loadAll() { - return this.loadItems(() => helmChartsApi.list()); } getByName(name: string, repo: string) { diff --git a/src/renderer/components/+apps-releases/release.store.ts b/src/renderer/components/+apps-releases/release.store.ts index 75632b1b0e..582151e14d 100644 --- a/src/renderer/components/+apps-releases/release.store.ts +++ b/src/renderer/components/+apps-releases/release.store.ts @@ -1,7 +1,5 @@ import isEqual from "lodash/isEqual"; -import { action, IReactionDisposer, makeObservable, observable, reaction, toJS, when, } from "mobx"; -import { HelmRelease, helmReleasesApi, IReleaseCreatePayload, IReleaseUpdatePayload } from "../../api/endpoints/helm-releases.api"; -import { action, observable, reaction, when } from "mobx"; +import { action, makeObservable, observable, reaction, toJS, when, } from "mobx"; import { createRelease, deleteRelease, HelmRelease, IReleaseCreatePayload, IReleaseUpdatePayload, listReleases, rollbackRelease, updateRelease } from "../../api/endpoints/helm-releases.api"; import { ItemStore } from "../../item.store"; import { Secret } from "../../api/endpoints"; diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx index 011ddea586..4b1e6b2112 100644 --- a/src/renderer/components/+extensions/extensions.tsx +++ b/src/renderer/components/+extensions/extensions.tsx @@ -1,6 +1,6 @@ import { remote, shell } from "electron"; import fse from "fs-extra"; -import { computed, observable, reaction, makeObservable } from "mobx"; +import { computed, makeObservable, observable, reaction } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import os from "os"; import path from "path"; @@ -62,10 +62,6 @@ export class Extensions extends React.Component { makeObservable(this); } - get extensionStateStore() { - return ExtensionStateStore.getInstance(); - } - @observable search = ""; @observable installPath = ""; @@ -130,7 +126,7 @@ export class Extensions extends React.Component { const searchText = this.search.toLowerCase(); return Array.from(ExtensionLoader.getInstance().userExtensions.values()) - .filter(({ manifest: { name, description }}) => ( + .filter(({ manifest: { name, description } }) => ( name.toLowerCase().includes(searchText) || description?.toLowerCase().includes(searchText) )); @@ -224,7 +220,7 @@ export class Extensions extends React.Component { preloadedRequests.push(request); return request; - } catch(error) { + } catch (error) { if (showError) { Notifications.error(`Error while reading "${request.filePath}": ${String(error)}`); } @@ -447,7 +443,8 @@ export class Extensions extends React.Component { { search ?

No search results found

- :

There are no installed extensions. See list of available extensions.

+ :

There are no installed extensions. See list of available extensions. +

}
@@ -502,7 +499,8 @@ export class Extensions extends React.Component {

Lens Extensions

Add new features and functionality via Lens Extensions. - Check out documentation to learn more or see the list of available extensions. + Check out documentation to learn more or see the list of available extensions.
diff --git a/src/renderer/components/dock/terminal.store.ts b/src/renderer/components/dock/terminal.store.ts index cc0236a5db..dd3f41bfcc 100644 --- a/src/renderer/components/dock/terminal.store.ts +++ b/src/renderer/components/dock/terminal.store.ts @@ -1,4 +1,4 @@ -import { autorun, makeObservable, observable } from "mobx"; +import { autorun, observable } from "mobx"; import { Terminal } from "./terminal"; import { TerminalApi } from "../../api/terminal-api"; import { dockStore, IDockTab, TabId, TabKind } from "./dock.store"; diff --git a/src/renderer/components/notifications/notifications.store.tsx b/src/renderer/components/notifications/notifications.store.tsx index de50589095..93ccc8b0c0 100644 --- a/src/renderer/components/notifications/notifications.store.tsx +++ b/src/renderer/components/notifications/notifications.store.tsx @@ -1,6 +1,5 @@ import React from "react"; import { action, observable, makeObservable } from "mobx"; -import { autobind } from "../../utils"; import uniqueId from "lodash/uniqueId"; import { JsonApiErrorParsed } from "../../api/json-api"; @@ -45,14 +44,14 @@ export class NotificationsStore { this.autoHideTimers.set(id, timer); } - } + }; removeAutoHideTimer = (id: NotificationId) => { if (this.autoHideTimers.has(id)) { clearTimeout(this.autoHideTimers.get(id)); this.autoHideTimers.delete(id); } - } + }; @action.bound add(notification: Notification): () => void { diff --git a/src/renderer/theme.store.ts b/src/renderer/theme.store.ts index b842b9a7ec..c642fb8d17 100644 --- a/src/renderer/theme.store.ts +++ b/src/renderer/theme.store.ts @@ -1,4 +1,4 @@ -import { computed, observable, reaction } from "mobx"; +import { computed, makeObservable, observable, reaction } from "mobx"; import { autobind, Singleton } from "./utils"; import { UserStore } from "../common/user-store"; import logger from "../main/logger"; @@ -85,7 +85,7 @@ export class ThemeStore extends Singleton { const theme = await import( /* webpackChunkName: "themes/[name]" */ `./themes/${themeId}.json` - ); + ); existingTheme.author = theme.author; existingTheme.colors = theme.colors;