mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Implement missing weblink add/remove (#3092)
* implement weblink add/remove Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * cleanup Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * refactor Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * css fix Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * fix tests Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
parent
74624b1fdf
commit
7ba93c9c70
@ -19,11 +19,13 @@
|
|||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { CatalogCategory, CatalogEntity, CatalogEntityMetadata, CatalogEntityStatus } from "../catalog";
|
import { CatalogCategory, CatalogEntity, CatalogEntityAddMenuContext, CatalogEntityContextMenuContext, CatalogEntityMetadata, CatalogEntityStatus } from "../catalog";
|
||||||
import { catalogCategoryRegistry } from "../catalog/catalog-category-registry";
|
import { catalogCategoryRegistry } from "../catalog/catalog-category-registry";
|
||||||
|
import { productName } from "../vars";
|
||||||
|
import { WeblinkStore } from "../weblink-store";
|
||||||
|
|
||||||
export interface WebLinkStatus extends CatalogEntityStatus {
|
export interface WebLinkStatus extends CatalogEntityStatus {
|
||||||
phase: "valid" | "invalid";
|
phase: "available" | "unavailable";
|
||||||
}
|
}
|
||||||
|
|
||||||
export type WebLinkSpec = {
|
export type WebLinkSpec = {
|
||||||
@ -42,12 +44,17 @@ export class WebLink extends CatalogEntity<CatalogEntityMetadata, WebLinkStatus,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
public onDetailsOpen(): void {
|
async onContextMenuOpen(context: CatalogEntityContextMenuContext) {
|
||||||
return;
|
if (this.metadata.source === "local") {
|
||||||
|
context.menuItems.push({
|
||||||
|
title: "Delete",
|
||||||
|
icon: "delete",
|
||||||
|
onClick: async () => WeblinkStore.getInstance().removeById(this.metadata.uid),
|
||||||
|
confirm: {
|
||||||
|
message: `Remove Web Link "${this.metadata.name}" from ${productName}?`
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public onContextMenuOpen(): void {
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,7 +63,7 @@ export class WebLinkCategory extends CatalogCategory {
|
|||||||
public readonly kind = "CatalogCategory";
|
public readonly kind = "CatalogCategory";
|
||||||
public metadata = {
|
public metadata = {
|
||||||
name: "Web Links",
|
name: "Web Links",
|
||||||
icon: "link"
|
icon: "public"
|
||||||
};
|
};
|
||||||
public spec = {
|
public spec = {
|
||||||
group: "entity.k8slens.dev",
|
group: "entity.k8slens.dev",
|
||||||
@ -70,6 +77,21 @@ export class WebLinkCategory extends CatalogCategory {
|
|||||||
kind: "WebLink"
|
kind: "WebLink"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
public static onAdd?: () => void;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
super();
|
||||||
|
|
||||||
|
this.on("catalogAddMenu", (ctx: CatalogEntityAddMenuContext) => {
|
||||||
|
ctx.menuItems.push({
|
||||||
|
icon: "public",
|
||||||
|
title: "Add web link",
|
||||||
|
onClick: () => {
|
||||||
|
WebLinkCategory.onAdd();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
catalogCategoryRegistry.add(new WebLinkCategory());
|
catalogCategoryRegistry.add(new WebLinkCategory());
|
||||||
|
|||||||
90
src/common/weblink-store.ts
Normal file
90
src/common/weblink-store.ts
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
/**
|
||||||
|
* 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 { action, comparer, observable, makeObservable } from "mobx";
|
||||||
|
import { BaseStore } from "./base-store";
|
||||||
|
import migrations from "../migrations/hotbar-store";
|
||||||
|
import * as uuid from "uuid";
|
||||||
|
import { toJS } from "./utils";
|
||||||
|
|
||||||
|
export interface WeblinkData {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
url: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface WeblinkCreateOptions {
|
||||||
|
id?: string;
|
||||||
|
name: string;
|
||||||
|
url: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export interface WeblinkStoreModel {
|
||||||
|
weblinks: WeblinkData[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export class WeblinkStore extends BaseStore<WeblinkStoreModel> {
|
||||||
|
@observable weblinks: WeblinkData[] = [];
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
super({
|
||||||
|
configName: "lens-weblink-store",
|
||||||
|
accessPropertiesByDotNotation: false, // To make dots safe in cluster context names
|
||||||
|
syncOptions: {
|
||||||
|
equals: comparer.structural,
|
||||||
|
},
|
||||||
|
migrations,
|
||||||
|
});
|
||||||
|
makeObservable(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@action protected async fromStore(data: Partial<WeblinkStoreModel> = {}) {
|
||||||
|
this.weblinks = data.weblinks || [];
|
||||||
|
}
|
||||||
|
|
||||||
|
add(data: WeblinkCreateOptions) {
|
||||||
|
const {
|
||||||
|
id = uuid.v4(),
|
||||||
|
name,
|
||||||
|
url
|
||||||
|
} = data;
|
||||||
|
|
||||||
|
const weblink = { id, name, url };
|
||||||
|
|
||||||
|
this.weblinks.push(weblink as WeblinkData);
|
||||||
|
|
||||||
|
return weblink as WeblinkData;
|
||||||
|
}
|
||||||
|
|
||||||
|
@action
|
||||||
|
removeById(id: string) {
|
||||||
|
this.weblinks = this.weblinks.filter((w) => w.id !== id);
|
||||||
|
}
|
||||||
|
|
||||||
|
toJSON(): WeblinkStoreModel {
|
||||||
|
const model: WeblinkStoreModel = {
|
||||||
|
weblinks: this.weblinks
|
||||||
|
};
|
||||||
|
|
||||||
|
return toJS(model);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -19,4 +19,5 @@
|
|||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
export { initializeWeblinks } from "./weblinks";
|
||||||
export { KubeconfigSyncManager } from "./kubeconfig-sync";
|
export { KubeconfigSyncManager } from "./kubeconfig-sync";
|
||||||
|
|||||||
102
src/main/catalog-sources/weblinks.ts
Normal file
102
src/main/catalog-sources/weblinks.ts
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
/**
|
||||||
|
* 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 { observable, reaction } from "mobx";
|
||||||
|
import { WeblinkStore } from "../../common/weblink-store";
|
||||||
|
import { WebLink } from "../../common/catalog-entities";
|
||||||
|
import { catalogEntityRegistry } from "../catalog";
|
||||||
|
import got from "got";
|
||||||
|
import logger from "../logger";
|
||||||
|
import { docsUrl, slackUrl } from "../../common/vars";
|
||||||
|
|
||||||
|
const defaultLinks = [
|
||||||
|
{ title: "Lens Website", url: "https://k8slens.dev" },
|
||||||
|
{ title: "Lens Documentation", url: docsUrl },
|
||||||
|
{ title: "Lens Community Slack", url: slackUrl },
|
||||||
|
{ title: "Kubernetes Documentation", url: "https://kubernetes.io/docs/home/" },
|
||||||
|
{ title: "Lens on Twitter", url: "https://twitter.com/k8slens" },
|
||||||
|
{ title: "Lens Official Blog", url: "https://medium.com/k8slens" }
|
||||||
|
].map((link) => (
|
||||||
|
new WebLink({
|
||||||
|
metadata: {
|
||||||
|
uid: link.url,
|
||||||
|
name: link.title,
|
||||||
|
source: "app",
|
||||||
|
labels: {}
|
||||||
|
},
|
||||||
|
spec: {
|
||||||
|
url: link.url
|
||||||
|
},
|
||||||
|
status: {
|
||||||
|
phase: "available",
|
||||||
|
active: true
|
||||||
|
}
|
||||||
|
})
|
||||||
|
));
|
||||||
|
|
||||||
|
async function validateLink(link: WebLink) {
|
||||||
|
try {
|
||||||
|
const response = await got.get(link.spec.url, {
|
||||||
|
throwHttpErrors: false
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.statusCode >= 200 && response.statusCode < 500) {
|
||||||
|
link.status.phase = "available";
|
||||||
|
} else {
|
||||||
|
link.status.phase = "unavailable";
|
||||||
|
}
|
||||||
|
} catch(error) {
|
||||||
|
link.status.phase = "unavailable";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export function initializeWeblinks() {
|
||||||
|
const weblinkStore = WeblinkStore.getInstance();
|
||||||
|
const weblinks = observable.array(defaultLinks);
|
||||||
|
|
||||||
|
reaction(() => weblinkStore.weblinks, (links) => {
|
||||||
|
weblinks.replace(links.map((data) => new WebLink({
|
||||||
|
metadata: {
|
||||||
|
uid: data.id,
|
||||||
|
name: data.name,
|
||||||
|
source: "local",
|
||||||
|
labels: {}
|
||||||
|
},
|
||||||
|
spec: {
|
||||||
|
url: data.url
|
||||||
|
},
|
||||||
|
status: {
|
||||||
|
phase: "available",
|
||||||
|
active: true
|
||||||
|
}
|
||||||
|
})));
|
||||||
|
weblinks.push(...defaultLinks);
|
||||||
|
|
||||||
|
for (const link of weblinks) {
|
||||||
|
validateLink(link).catch((error) => {
|
||||||
|
logger.error(`failed to validate link ${link.spec.url}: %s`, error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, {fireImmediately: true});
|
||||||
|
|
||||||
|
catalogEntityRegistry.addObservableSource("weblinks", weblinks);
|
||||||
|
}
|
||||||
@ -58,7 +58,7 @@ describe("CatalogEntityRegistry", () => {
|
|||||||
url: "https://k8slens.dev"
|
url: "https://k8slens.dev"
|
||||||
},
|
},
|
||||||
status: {
|
status: {
|
||||||
phase: "valid"
|
phase: "available"
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const invalidEntity = new InvalidEntity({
|
const invalidEntity = new InvalidEntity({
|
||||||
@ -72,7 +72,7 @@ describe("CatalogEntityRegistry", () => {
|
|||||||
url: "https://k8slens.dev"
|
url: "https://k8slens.dev"
|
||||||
},
|
},
|
||||||
status: {
|
status: {
|
||||||
phase: "valid"
|
phase: "available"
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -35,14 +35,10 @@ import { shellSync } from "./shell-sync";
|
|||||||
import { mangleProxyEnv } from "./proxy-env";
|
import { mangleProxyEnv } from "./proxy-env";
|
||||||
import { registerFileProtocol } from "../common/register-protocol";
|
import { registerFileProtocol } from "../common/register-protocol";
|
||||||
import logger from "./logger";
|
import logger from "./logger";
|
||||||
import { ClusterStore } from "../common/cluster-store";
|
|
||||||
import { UserStore } from "../common/user-store";
|
|
||||||
import { appEventBus } from "../common/event-bus";
|
import { appEventBus } from "../common/event-bus";
|
||||||
import { ExtensionLoader } from "../extensions/extension-loader";
|
import { ExtensionLoader } from "../extensions/extension-loader";
|
||||||
import { ExtensionsStore } from "../extensions/extensions-store";
|
|
||||||
import { InstalledExtension, ExtensionDiscovery } from "../extensions/extension-discovery";
|
import { InstalledExtension, ExtensionDiscovery } from "../extensions/extension-discovery";
|
||||||
import type { LensExtensionId } from "../extensions/lens-extension";
|
import type { LensExtensionId } from "../extensions/lens-extension";
|
||||||
import { FilesystemProvisionerStore } from "./extension-filesystem";
|
|
||||||
import { installDeveloperTools } from "./developer-tools";
|
import { installDeveloperTools } from "./developer-tools";
|
||||||
import { LensProtocolRouterMain } from "./protocol-handler";
|
import { LensProtocolRouterMain } from "./protocol-handler";
|
||||||
import { disposer, getAppVersion, getAppVersionFromProxyServer } from "../common/utils";
|
import { disposer, getAppVersion, getAppVersionFromProxyServer } from "../common/utils";
|
||||||
@ -51,7 +47,6 @@ import { startUpdateChecking } from "./app-updater";
|
|||||||
import { IpcRendererNavigationEvents } from "../renderer/navigation/events";
|
import { IpcRendererNavigationEvents } from "../renderer/navigation/events";
|
||||||
import { pushCatalogToRenderer } from "./catalog-pusher";
|
import { pushCatalogToRenderer } from "./catalog-pusher";
|
||||||
import { catalogEntityRegistry } from "./catalog";
|
import { catalogEntityRegistry } from "./catalog";
|
||||||
import { HotbarStore } from "../common/hotbar-store";
|
|
||||||
import { HelmRepoManager } from "./helm/helm-repo-manager";
|
import { HelmRepoManager } from "./helm/helm-repo-manager";
|
||||||
import { KubeconfigSyncManager } from "./catalog-sources";
|
import { KubeconfigSyncManager } from "./catalog-sources";
|
||||||
import { handleWsUpgrade } from "./proxy/ws-upgrade";
|
import { handleWsUpgrade } from "./proxy/ws-upgrade";
|
||||||
@ -128,24 +123,11 @@ app.on("ready", async () => {
|
|||||||
PrometheusProviderRegistry.createInstance();
|
PrometheusProviderRegistry.createInstance();
|
||||||
initializers.initPrometheusProviderRegistry();
|
initializers.initPrometheusProviderRegistry();
|
||||||
|
|
||||||
const userStore = UserStore.createInstance();
|
await initializers.initializeStores();
|
||||||
const clusterStore = ClusterStore.createInstance();
|
initializers.initializeWeblinks();
|
||||||
const hotbarStore = HotbarStore.createInstance();
|
|
||||||
const extensionsStore = ExtensionsStore.createInstance();
|
|
||||||
const filesystemStore = FilesystemProvisionerStore.createInstance();
|
|
||||||
|
|
||||||
HelmRepoManager.createInstance(); // create the instance
|
HelmRepoManager.createInstance(); // create the instance
|
||||||
|
|
||||||
logger.info("💾 Loading stores");
|
|
||||||
// preload
|
|
||||||
await Promise.all([
|
|
||||||
userStore.load(),
|
|
||||||
clusterStore.load(),
|
|
||||||
hotbarStore.load(),
|
|
||||||
extensionsStore.load(),
|
|
||||||
filesystemStore.load(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const lensProxy = LensProxy.createInstance(
|
const lensProxy = LensProxy.createInstance(
|
||||||
handleWsUpgrade,
|
handleWsUpgrade,
|
||||||
req => ClusterManager.getInstance().getClusterForRequest(req),
|
req => ClusterManager.getInstance().getClusterForRequest(req),
|
||||||
|
|||||||
@ -22,3 +22,5 @@
|
|||||||
export * from "./registries";
|
export * from "./registries";
|
||||||
export * from "./metrics-providers";
|
export * from "./metrics-providers";
|
||||||
export * from "./ipc";
|
export * from "./ipc";
|
||||||
|
export * from "./weblinks";
|
||||||
|
export * from "./stores";
|
||||||
|
|||||||
48
src/main/initializers/stores.ts
Normal file
48
src/main/initializers/stores.ts
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
/**
|
||||||
|
* 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 { HotbarStore } from "../../common/hotbar-store";
|
||||||
|
import { ClusterStore } from "../../common/cluster-store";
|
||||||
|
import { UserStore } from "../../common/user-store";
|
||||||
|
import { ExtensionsStore } from "../../extensions/extensions-store";
|
||||||
|
import { FilesystemProvisionerStore } from "../extension-filesystem";
|
||||||
|
import { WeblinkStore } from "../../common/weblink-store";
|
||||||
|
import logger from "../logger";
|
||||||
|
|
||||||
|
export async function initializeStores() {
|
||||||
|
const userStore = UserStore.createInstance();
|
||||||
|
const clusterStore = ClusterStore.createInstance();
|
||||||
|
const hotbarStore = HotbarStore.createInstance();
|
||||||
|
const extensionsStore = ExtensionsStore.createInstance();
|
||||||
|
const filesystemStore = FilesystemProvisionerStore.createInstance();
|
||||||
|
const weblinkStore = WeblinkStore.createInstance();
|
||||||
|
|
||||||
|
logger.info("💾 Loading stores");
|
||||||
|
// preload
|
||||||
|
await Promise.all([
|
||||||
|
userStore.load(),
|
||||||
|
clusterStore.load(),
|
||||||
|
hotbarStore.load(),
|
||||||
|
extensionsStore.load(),
|
||||||
|
filesystemStore.load(),
|
||||||
|
weblinkStore.load()
|
||||||
|
]);
|
||||||
|
}
|
||||||
22
src/main/initializers/weblinks.ts
Normal file
22
src/main/initializers/weblinks.ts
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
/**
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export { initializeWeblinks } from "../catalog-sources";
|
||||||
@ -31,16 +31,12 @@ import * as LensExtensionsRendererApi from "../extensions/renderer-api";
|
|||||||
import { render, unmountComponentAtNode } from "react-dom";
|
import { render, unmountComponentAtNode } from "react-dom";
|
||||||
import { delay } from "../common/utils";
|
import { delay } from "../common/utils";
|
||||||
import { isMac, isDevelopment } from "../common/vars";
|
import { isMac, isDevelopment } from "../common/vars";
|
||||||
import { HotbarStore } from "../common/hotbar-store";
|
|
||||||
import { ClusterStore } from "../common/cluster-store";
|
import { ClusterStore } from "../common/cluster-store";
|
||||||
import { UserStore } from "../common/user-store";
|
import { UserStore } from "../common/user-store";
|
||||||
import { ExtensionDiscovery } from "../extensions/extension-discovery";
|
import { ExtensionDiscovery } from "../extensions/extension-discovery";
|
||||||
import { ExtensionLoader } from "../extensions/extension-loader";
|
import { ExtensionLoader } from "../extensions/extension-loader";
|
||||||
import { ExtensionsStore } from "../extensions/extensions-store";
|
|
||||||
import { FilesystemProvisionerStore } from "../main/extension-filesystem";
|
|
||||||
import { App } from "./components/app";
|
import { App } from "./components/app";
|
||||||
import { LensApp } from "./lens-app";
|
import { LensApp } from "./lens-app";
|
||||||
import { ThemeStore } from "./theme.store";
|
|
||||||
import { HelmRepoManager } from "../main/helm/helm-repo-manager";
|
import { HelmRepoManager } from "../main/helm/helm-repo-manager";
|
||||||
import { ExtensionInstallationStateStore } from "./components/+extensions/extension-install.store";
|
import { ExtensionInstallationStateStore } from "./components/+extensions/extension-install.store";
|
||||||
import { DefaultProps } from "./mui-base-theme";
|
import { DefaultProps } from "./mui-base-theme";
|
||||||
@ -77,33 +73,19 @@ export async function bootstrap(App: AppComponent) {
|
|||||||
initializers.intiKubeObjectDetailRegistry();
|
initializers.intiKubeObjectDetailRegistry();
|
||||||
initializers.initWelcomeMenuRegistry();
|
initializers.initWelcomeMenuRegistry();
|
||||||
initializers.initWorkloadsOverviewDetailRegistry();
|
initializers.initWorkloadsOverviewDetailRegistry();
|
||||||
|
initializers.initCatalog();
|
||||||
initializers.initIpcRendererListeners();
|
initializers.initIpcRendererListeners();
|
||||||
|
|
||||||
ExtensionLoader.createInstance().init();
|
ExtensionLoader.createInstance().init();
|
||||||
ExtensionDiscovery.createInstance().init();
|
ExtensionDiscovery.createInstance().init();
|
||||||
|
|
||||||
const userStore = UserStore.createInstance();
|
await initializers.initStores();
|
||||||
const clusterStore = ClusterStore.createInstance();
|
|
||||||
const extensionsStore = ExtensionsStore.createInstance();
|
|
||||||
const filesystemStore = FilesystemProvisionerStore.createInstance();
|
|
||||||
const themeStore = ThemeStore.createInstance();
|
|
||||||
const hotbarStore = HotbarStore.createInstance();
|
|
||||||
|
|
||||||
ExtensionInstallationStateStore.bindIpcListeners();
|
ExtensionInstallationStateStore.bindIpcListeners();
|
||||||
HelmRepoManager.createInstance(); // initialize the manager
|
HelmRepoManager.createInstance(); // initialize the manager
|
||||||
|
|
||||||
// preload common stores
|
|
||||||
await Promise.all([
|
|
||||||
userStore.load(),
|
|
||||||
hotbarStore.load(),
|
|
||||||
clusterStore.load(),
|
|
||||||
extensionsStore.load(),
|
|
||||||
filesystemStore.load(),
|
|
||||||
themeStore.init(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Register additional store listeners
|
// Register additional store listeners
|
||||||
clusterStore.registerIpcListener();
|
ClusterStore.getInstance().registerIpcListener();
|
||||||
|
|
||||||
// init app's dependencies if any
|
// init app's dependencies if any
|
||||||
if (App.init) {
|
if (App.init) {
|
||||||
|
|||||||
@ -40,11 +40,11 @@
|
|||||||
max-width: 100px;
|
max-width: 100px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.connected {
|
.connected, .available {
|
||||||
color: var(--colorSuccess);
|
color: var(--colorSuccess);
|
||||||
}
|
}
|
||||||
|
|
||||||
.disconnected, .deleting {
|
.disconnected, .deleting, .unavailable {
|
||||||
color: var(--halfGray);
|
color: var(--halfGray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
102
src/renderer/components/catalog-entities/weblink-add-command.tsx
Normal file
102
src/renderer/components/catalog-entities/weblink-add-command.tsx
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
/**
|
||||||
|
* 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 React from "react";
|
||||||
|
import { observer } from "mobx-react";
|
||||||
|
import { CommandOverlay } from "../command-palette";
|
||||||
|
import { Input } from "../input";
|
||||||
|
import { isUrl } from "../input/input_validators";
|
||||||
|
import { WeblinkStore } from "../../../common/weblink-store";
|
||||||
|
import { computed, makeObservable, observable } from "mobx";
|
||||||
|
|
||||||
|
@observer
|
||||||
|
export class WeblinkAddCommand extends React.Component {
|
||||||
|
@observable url = "";
|
||||||
|
@observable nameHidden = true;
|
||||||
|
@observable dirty = false;
|
||||||
|
|
||||||
|
constructor(props: {}) {
|
||||||
|
super(props);
|
||||||
|
|
||||||
|
makeObservable(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
onChangeUrl(url: string) {
|
||||||
|
this.dirty = true;
|
||||||
|
this.url = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmitUrl(url: string) {
|
||||||
|
this.dirty = true;
|
||||||
|
this.url = url;
|
||||||
|
this.nameHidden = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmit(name: string) {
|
||||||
|
WeblinkStore.getInstance().add({
|
||||||
|
name: name || this.url,
|
||||||
|
url: this.url
|
||||||
|
});
|
||||||
|
|
||||||
|
CommandOverlay.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
@computed get showValidation() {
|
||||||
|
return this.url?.length > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Input
|
||||||
|
placeholder="Link URL"
|
||||||
|
autoFocus={this.nameHidden}
|
||||||
|
theme="round-black"
|
||||||
|
data-test-id="command-palette-weblink-add-url"
|
||||||
|
validators={[isUrl]}
|
||||||
|
dirty={this.dirty}
|
||||||
|
value={this.url}
|
||||||
|
onChange={(v) => this.onChangeUrl(v)}
|
||||||
|
onSubmit={(v) => this.onSubmitUrl(v)}
|
||||||
|
showValidationLine={true} />
|
||||||
|
{ this.nameHidden && (
|
||||||
|
<small className="hint">
|
||||||
|
Please provide a web link URL (Press "Enter" to continue or "Escape" to cancel)
|
||||||
|
</small>
|
||||||
|
)}
|
||||||
|
{ !this.nameHidden && (
|
||||||
|
<>
|
||||||
|
<Input
|
||||||
|
placeholder="Name (optional)"
|
||||||
|
autoFocus={true}
|
||||||
|
theme="round-black"
|
||||||
|
data-test-id="command-palette-weblink-add-name"
|
||||||
|
onSubmit={(v) => this.onSubmit(v)}
|
||||||
|
dirty={true}/>
|
||||||
|
<small className="hint">
|
||||||
|
Please provide a name for the web link (Press "Enter" to confirm or "Escape" to cancel)
|
||||||
|
</small>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -261,7 +261,7 @@ export class Input extends React.Component<InputProps, State> {
|
|||||||
|
|
||||||
switch (evt.key) {
|
switch (evt.key) {
|
||||||
case "Enter":
|
case "Enter":
|
||||||
if (this.props.onSubmit && !modified && !evt.repeat && this.isValid) {
|
if (this.props.onSubmit && !modified && !evt.repeat && this.isValid()) {
|
||||||
this.props.onSubmit(this.getValue(), evt);
|
this.props.onSubmit(this.getValue(), evt);
|
||||||
|
|
||||||
if (this.isUncontrolled) {
|
if (this.isUncontrolled) {
|
||||||
|
|||||||
33
src/renderer/initializers/catalog.tsx
Normal file
33
src/renderer/initializers/catalog.tsx
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
/**
|
||||||
|
* 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 React from "react";
|
||||||
|
import { WebLinkCategory } from "../../common/catalog-entities";
|
||||||
|
import { WeblinkAddCommand } from "../components/catalog-entities/weblink-add-command";
|
||||||
|
import { CommandOverlay } from "../components/command-palette";
|
||||||
|
|
||||||
|
function initWebLinks() {
|
||||||
|
WebLinkCategory.onAdd = () => CommandOverlay.open(<WeblinkAddCommand />);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function initCatalog() {
|
||||||
|
initWebLinks();
|
||||||
|
}
|
||||||
@ -26,4 +26,6 @@ export * from "./kube-object-menu-registry";
|
|||||||
export * from "./registries";
|
export * from "./registries";
|
||||||
export * from "./welcome-menu-registry";
|
export * from "./welcome-menu-registry";
|
||||||
export * from "./workloads-overview-detail-registry";
|
export * from "./workloads-overview-detail-registry";
|
||||||
|
export * from "./catalog";
|
||||||
|
export * from "./stores";
|
||||||
export * from "./ipc";
|
export * from "./ipc";
|
||||||
|
|||||||
50
src/renderer/initializers/stores.ts
Normal file
50
src/renderer/initializers/stores.ts
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
/**
|
||||||
|
* 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 { HotbarStore } from "../../common/hotbar-store";
|
||||||
|
import { ClusterStore } from "../../common/cluster-store";
|
||||||
|
import { UserStore } from "../../common/user-store";
|
||||||
|
import { ExtensionsStore } from "../../extensions/extensions-store";
|
||||||
|
import { FilesystemProvisionerStore } from "../../main/extension-filesystem";
|
||||||
|
|
||||||
|
import { ThemeStore } from "../theme.store";
|
||||||
|
import { WeblinkStore } from "../../common/weblink-store";
|
||||||
|
|
||||||
|
export async function initStores() {
|
||||||
|
const userStore = UserStore.createInstance();
|
||||||
|
const clusterStore = ClusterStore.createInstance();
|
||||||
|
const extensionsStore = ExtensionsStore.createInstance();
|
||||||
|
const filesystemStore = FilesystemProvisionerStore.createInstance();
|
||||||
|
const themeStore = ThemeStore.createInstance();
|
||||||
|
const hotbarStore = HotbarStore.createInstance();
|
||||||
|
const weblinkStore = WeblinkStore.createInstance();
|
||||||
|
|
||||||
|
// preload common stores
|
||||||
|
await Promise.all([
|
||||||
|
userStore.load(),
|
||||||
|
hotbarStore.load(),
|
||||||
|
clusterStore.load(),
|
||||||
|
extensionsStore.load(),
|
||||||
|
filesystemStore.load(),
|
||||||
|
themeStore.init(),
|
||||||
|
weblinkStore.load()
|
||||||
|
]);
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user