1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

merge:fixes, lint:fixes

Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2021-04-21 17:35:46 +03:00
parent a0193a2cda
commit c0db9e3bef
8 changed files with 18 additions and 30 deletions

View File

@ -42,6 +42,8 @@ export class ExtensionLoader extends Singleton {
whenLoaded = when(() => this.isLoaded);
constructor() {
super();
makeObservable(this);
}

View File

@ -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 && <div id="draggable-top" />}
<App />
{isMac && <div id="draggable-top"/>}
<App/>
</>, rootElem);
}

View File

@ -30,9 +30,6 @@ export class HelmChartStore extends ItemStore<HelmChart> {
throw error;
}
loadAll() {
return this.loadItems(() => helmChartsApi.list());
}
getByName(name: string, repo: string) {

View File

@ -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";

View File

@ -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<ExtensionStateStore>();
}
@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
? <p>No search results found</p>
: <p>There are no installed extensions. See list of <a href="https://github.com/lensapp/lens-extensions/blob/main/README.md" target="_blank" rel="noreferrer">available extensions</a>.</p>
: <p>There are no installed extensions. See list of <a href="https://github.com/lensapp/lens-extensions/blob/main/README.md" target="_blank" rel="noreferrer">available extensions</a>.
</p>
}
</div>
</div>
@ -502,7 +499,8 @@ export class Extensions extends React.Component {
<h2>Lens Extensions</h2>
<div>
Add new features and functionality via Lens Extensions.
Check out documentation to <a href={`${docsUrl}/latest/extensions/usage/`} target="_blank" rel="noreferrer">learn more</a> or see the list of <a href="https://github.com/lensapp/lens-extensions/blob/main/README.md" target="_blank" rel="noreferrer">available extensions</a>.
Check out documentation to <a href={`${docsUrl}/latest/extensions/usage/`} target="_blank" rel="noreferrer">learn more</a> or see the list of <a
href="https://github.com/lensapp/lens-extensions/blob/main/README.md" target="_blank" rel="noreferrer">available extensions</a>.
</div>
<div className="install-extension flex column gaps">

View File

@ -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";

View File

@ -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 {

View File

@ -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;