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>

src/renderer/bootstrap.tsx

@@ -31,16 +31,12 @@ import * as LensExtensionsRendererApi from "../extensions/renderer-api";
 import { render, unmountComponentAtNode } from "react-dom";
 import { delay } from "../common/utils";
 import { isMac, isDevelopment } from "../common/vars";
-import { HotbarStore } from "../common/hotbar-store";
 import { ClusterStore } from "../common/cluster-store";
 import { UserStore } from "../common/user-store";
 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 { App } from "./components/app";
 import { LensApp } from "./lens-app";
-import { ThemeStore } from "./theme.store";
 import { HelmRepoManager } from "../main/helm/helm-repo-manager";
 import { ExtensionInstallationStateStore } from "./components/+extensions/extension-install.store";
 import { DefaultProps } from "./mui-base-theme";
@@ -77,33 +73,19 @@ export async function bootstrap(App: AppComponent) {
   initializers.intiKubeObjectDetailRegistry();
   initializers.initWelcomeMenuRegistry();
   initializers.initWorkloadsOverviewDetailRegistry();
+  initializers.initCatalog();
   initializers.initIpcRendererListeners();
 
   ExtensionLoader.createInstance().init();
   ExtensionDiscovery.createInstance().init();
 
-  const userStore = UserStore.createInstance();
-  const clusterStore = ClusterStore.createInstance();
-  const extensionsStore = ExtensionsStore.createInstance();
-  const filesystemStore = FilesystemProvisionerStore.createInstance();
-  const themeStore = ThemeStore.createInstance();
-  const hotbarStore = HotbarStore.createInstance();
+  await initializers.initStores();
 
   ExtensionInstallationStateStore.bindIpcListeners();
   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
-  clusterStore.registerIpcListener();
+  ClusterStore.getInstance().registerIpcListener();
 
   // init app's dependencies if any
   if (App.init) {

src/renderer/components/+catalog/catalog.module.css

@@ -40,11 +40,11 @@
   max-width: 100px;
 }
 
-.connected {
+.connected, .available {
   color: var(--colorSuccess);
 }
 
-.disconnected, .deleting {
+.disconnected, .deleting, .unavailable {
   color: var(--halfGray);
 }
 

src/renderer/components/catalog-entities/weblink-add-command.tsx

@@ -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 &quot;Enter&quot; to continue or &quot;Escape&quot; 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 &quot;Enter&quot; to confirm or &quot;Escape&quot; to cancel)
+            </small>
+          </>
+        )}
+      </>
+    );
+  }
+}

src/renderer/components/input/input.tsx

@@ -261,7 +261,7 @@ export class Input extends React.Component<InputProps, State> {
 
     switch (evt.key) {
       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);
 
           if (this.isUncontrolled) {

src/renderer/initializers/catalog.tsx

@@ -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();
+}

src/renderer/initializers/index.ts

@@ -26,4 +26,6 @@ export * from "./kube-object-menu-registry";
 export * from "./registries";
 export * from "./welcome-menu-registry";
 export * from "./workloads-overview-detail-registry";
+export * from "./catalog";
+export * from "./stores";
 export * from "./ipc";

src/renderer/initializers/stores.ts

@@ -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()
+  ]);
+}