@rancher/shell 0.1.4 → 0.1.21

package/pages/c/_cluster/uiplugins/UninstallDialog.vue

@@ -26,6 +26,8 @@ export default {
 
       const plugin = this.plugin;
 
+      this.$emit('update', plugin.name, 'uninstall');
+
       // Delete the CR if this is a developer plugin (there is no Helm App, so need to remove the CRD ourselves)
       if (plugin.uiplugin?.isDeveloper) {
         // Delete the custom resource
@@ -40,14 +42,19 @@ export default {
       });
 
       if (pluginApp) {
-        await pluginApp.remove();
+        try {
+          await pluginApp.remove();
+        } catch (e) {
+          this.$store.dispatch('growl/error', {
+            title:   this.t('plugins.error.generic'),
+            message: e.message ? e.message : e,
+            timeout: 10000
+          }, { root: true });
+        }
 
         await this.$store.dispatch('management/findAll', { type: CATALOG.OPERATION });
       }
 
-      // Unload the plugin code
-      this.$plugin.removePlugin(plugin.name);
-
       this.closeDialog(plugin);
     }
   }

package/pages/c/_cluster/uiplugins/index.vue

@@ -1,11 +1,10 @@
 <script>
 import Vue from 'vue';
 import { mapGetters } from 'vuex';
-
 import { mapPref, PLUGIN_DEVELOPER } from '@shell/store/prefs';
 import { sortBy } from '@shell/utils/sort';
 import { allHash } from '@shell/utils/promise';
-import { CATALOG, UI_PLUGIN, SCHEMA } from '@shell/config/types';
+import { CATALOG, UI_PLUGIN, SERVICE } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 
 import ActionMenu from '@shell/components/ActionMenu';
@@ -19,7 +18,9 @@ import DeveloperInstallDialog from './DeveloperInstallDialog.vue';
 import PluginInfoPanel from './PluginInfoPanel.vue';
 import SetupUIPlugins from './SetupUIPlugins';
 import RemoveUIPlugins from './RemoveUIPlugins';
-import { isUIPlugin, uiPluginHasAnnotation, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
+import { isUIPlugin, uiPluginHasAnnotation, isSupportedChartVersion, UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
+
+const MAX_DESCRIPTION_LENGTH = 200;
 
 export default {
   components: {
@@ -48,7 +49,9 @@ export default {
       menuTargetElement: null,
       menuTargetEvent:   null,
       menuOpen:          false,
+      hasService:        false,
       defaultIcon:       require('~shell/assets/images/generic-plugin.svg'),
+      reloadRequired:    false,
     };
   },
 
@@ -57,8 +60,12 @@ export default {
   async fetch() {
     const hash = {};
 
-    if (this.hasPluginCRD) {
-      hash.plugins = this.$store.dispatch('management/findAll', { type: UI_PLUGIN });
+    const isSetup = await this.updateInstallStatus();
+
+    if (isSetup) {
+      if (this.$store.getters['management/schemaFor'](UI_PLUGIN)) {
+        hash.plugins = this.$store.dispatch('management/findAll', { type: UI_PLUGIN });
+      }
     }
 
     hash.load = await this.$store.dispatch('catalog/load');
@@ -76,8 +83,14 @@ export default {
 
     this.charts = Object.values(c);
 
+    // If there are no plugins installed, default to the catalog view
+    if (this.plugins.length === 0) {
+      this.$refs.tabs?.select('available');
+    }
+
     this.loading = false;
   },
+
   computed: {
     pluginDeveloper: mapPref(PLUGIN_DEVELOPER),
 
@@ -97,7 +110,7 @@ export default {
         menuActions.push( { divider: true });
       }
 
-      if (this.hasPluginCRD) {
+      if (this.hasService) {
         menuActions.push({
           action:  'removePluginSupport',
           label:   this.t('plugins.setup.remove.label'),
@@ -108,14 +121,6 @@ export default {
       return menuActions;
     },
 
-    // Is the Plugin CRD available ?
-    hasPluginCRD() {
-      const schemas = this.$store.getters[`management/all`](SCHEMA);
-      const crd = schemas.find(s => s.id === UI_PLUGIN);
-
-      return !!crd;
-    },
-
     list() {
       const all = this.available;
 
@@ -167,6 +172,9 @@ export default {
         item.versions = [...chart.versions];
         item.chart = chart;
 
+        // Filter the versions, leaving only those that are compatible with this Rancher
+        item.versions = item.versions.filter(version => isSupportedChartVersion(version));
+
         if (this.latest) {
           item.icon = chart.icon || this.latest.annotations['catalog.cattle.io/ui-icon'];
         }
@@ -178,6 +186,9 @@ export default {
         return item;
       });
 
+      // Remove charts with no installable versions
+      all = all.filter(c => c.versions.length > 0);
+
       // Check that all of the loaded plugins are represented
       this.uiplugins.forEach((p) => {
         const chart = all.find(c => c.name === p.name);
@@ -200,22 +211,35 @@ export default {
 
       // Go through the CRs for the plugins and wire them into the catalog
       this.plugins.forEach((p) => {
-        if (!p.removed) {
-          const chart = all.find(c => c.name === p.name);
+        const chart = all.find(c => c.name === p.name);
 
-          if (chart) {
-            chart.installed = true;
-            chart.uiplugin = p;
-            chart.displayVersion = p.version;
+        if (chart) {
+          chart.installed = true;
+          chart.uiplugin = p;
+          chart.displayVersion = p.version;
 
-            // Can't do this here
-            chart.installing = this.installing[chart.name];
+          // Can't do this here
+          chart.installing = this.installing[chart.name];
 
-            // Check for upgrade
-            if (chart.versions.length && p.version !== chart.versions[0].version) {
-              chart.upgrade = chart.versions[0].version;
-            }
+          // Check for upgrade
+          if (chart.versions.length && p.version !== chart.versions[0].version) {
+            chart.upgrade = chart.versions[0].version;
           }
+        } else {
+          // No chart, so add a card for the plugin based on its Custom resource being present
+          const item = {
+            name:           p.name,
+            description:    p.description || '-',
+            id:             `${ p.name }-${ p.version }`,
+            versions:       [],
+            displayVersion: p.version || '-',
+            installed:      true,
+            installing:     false,
+            builtin:        false,
+            uiplugin:       p,
+          };
+
+          all.push(item);
         }
       });
 
@@ -224,7 +248,13 @@ export default {
         const chart = all.find(c => c.name === e);
 
         if (chart) {
-          chart.error = !!this.uiErrors[e];
+          const error = this.uiErrors[e];
+
+          if (error && typeof error === 'string') {
+            chart.error = this.t(this.uiErrors[e]);
+          } else {
+            chart.error = false;
+          }
         }
       });
 
@@ -237,6 +267,13 @@ export default {
         }
       });
 
+      // Clamp the lengths of the descriptions
+      all.forEach((plugin) => {
+        if (plugin.description && plugin.description.length > MAX_DESCRIPTION_LENGTH) {
+          plugin.description = `${ plugin.description.substr(0, MAX_DESCRIPTION_LENGTH) } ...`;
+        }
+      });
+
       // Sort by name
       return sortBy(all, 'name', false);
     },
@@ -262,7 +299,10 @@ export default {
           Vue.set(this.errors, plugin.name, error);
 
           if (active) {
-            this.updatePluginInstallStatus(plugin.name, op.status.action);
+            // Can use the status directly, apart from upgrade, which maps to install
+            const status = op.status.action === 'upgrade' ? 'install' : op.status.action;
+
+            this.updatePluginInstallStatus(plugin.name, status);
           } else if (op.status.action === 'uninstall') {
             // Uninstall has finished
             this.updatePluginInstallStatus(plugin.name, false);
@@ -275,32 +315,61 @@ export default {
       });
     },
 
-    plugins(neu) {
+    plugins(neu, old) {
       const installed = this.$store.getters['uiplugins/plugins'];
 
+      let changes = 0;
+
+      // Did the user remove an extension
+      if (neu?.length < installed.length) {
+        changes++;
+      }
+
       neu.forEach((plugin) => {
-        const existing = installed.find(p => !p.removed && p.name === plugin.name);
+        const existing = installed.find(p => !p.removed && p.name === plugin.name && p.version === plugin.version);
 
         if (!existing && plugin.isCached) {
-          this.$plugin.loadAsyncByNameAndVersion(plugin.name, plugin.version).catch((e) => {
-            console.error(`Failed to load plugin ${ plugin.name } (${ plugin.version })`); // eslint-disable-line no-console
-          });
+          changes++;
 
           this.updatePluginInstallStatus(plugin.name, false);
         }
       });
+
+      if (changes > 0 ) {
+        Vue.set(this, 'reloadRequired', true);
+      }
     },
   },
 
   // Forget the types when we leave the page
   beforeDestroy() {
-    this.$store.dispatch('cluster/forgetType', UI_PLUGIN);
-    this.$store.dispatch('cluster/forgetType', CATALOG.OPERATION);
-    this.$store.dispatch('cluster/forgetType', CATALOG.APP);
-    this.$store.dispatch('cluster/forgetType', CATALOG.CLUSTER_REPO);
+    this.$store.dispatch('management/forgetType', UI_PLUGIN);
+    this.$store.dispatch('management/forgetType', CATALOG.OPERATION);
+    this.$store.dispatch('management/forgetType', CATALOG.APP);
+    this.$store.dispatch('management/forgetType', CATALOG.CLUSTER_REPO);
   },
 
   methods:    {
+    async updateInstallStatus() {
+      let hasService;
+
+      try {
+        const service = await this.$store.dispatch('management/find', {
+          type:  SERVICE,
+          id:   `${ UI_PLUGIN_NAMESPACE }/ui-plugin-operator`,
+          opt:  { force: true },
+        });
+
+        hasService = !!service;
+      } catch (e) {
+        hasService = false;
+      }
+
+      Vue.set(this, 'hasService', hasService);
+
+      return hasService;
+    },
+
     filterChanged(f) {
       this.view = f.selectedName;
     },
@@ -368,6 +437,10 @@ export default {
         this.menuTargetElement = undefined;
         this.menuTargetEvent = undefined;
       }
+    },
+
+    reload() {
+      this.$router.go();
     }
   }
 };
@@ -377,18 +450,27 @@ export default {
   <div class="plugins">
     <div class="plugin-header">
       <h2>{{ t('plugins.title') }}</h2>
+      <div v-if="reloadRequired" class="plugin-reload-banner mr-20">
+        <i class="icon icon-checkmark mr-10" />
+        <span>
+          {{ t('plugins.reload') }}
+        </span>
+        <button class="ml-10 btn btn-sm role-primary" @click="reload()">
+          {{ t('generic.reload') }}
+        </button>
+      </div>
       <button
-        v-if="hasPluginCRD && hasMenuActions"
+        v-if="hasService && hasMenuActions"
         ref="actions"
         aria-haspopup="true"
         type="button"
-        class="btn actions"
+        class="btn actions role-secondary"
         @click="setMenu"
       >
         <i class="icon icon-actions" />
       </button>
       <ActionMenu
-        v-if="hasPluginCRD && hasMenuActions"
+        v-if="hasService && hasMenuActions"
         :custom-actions="menuActions"
         :open="menuOpen"
         :use-custom-target-element="true"
@@ -402,12 +484,12 @@ export default {
 
     <PluginInfoPanel ref="infoPanel" />
 
-    <div v-if="!hasPluginCRD">
+    <div v-if="!hasService">
       <div v-if="loading" class="data-loading">
         <i class="icon-spin icon icon-spinner" />
         <t k="generic.loading" :raw="true" />
       </div>
-      <SetupUIPlugins v-else class="setup-message" />
+      <SetupUIPlugins v-else class="setup-message" @done="updateInstallStatus" />
     </div>
     <div v-else>
       <Tabbed ref="tabs" :tabs-only="true" @changed="filterChanged">
@@ -425,7 +507,7 @@ export default {
           v-if="list.length === 0"
           :vertical="true"
           :subtle="true"
-          icon="icon-gear"
+          icon="icon-extension"
           :message="emptyMessage"
         />
         <template v-else>
@@ -453,15 +535,9 @@ export default {
                 {{ t('plugins.labels.builtin') }}
               </div>
               <div class="plugin-version">
-                <div v-if="plugin.installing" class="plugin-installing">
-                  <i class="version-busy icon icon-spin icon-spinner" />
-                  <div v-if="plugin.installing='install'">
-                    {{ t('plugins.labels.installing') }}
-                  </div>
-                  <div v-else>
-                    {{ t('plugins.labels.uninstalling') }}
-                  </div>
-                </div>
+                <span v-if="plugin.installing === 'uninstall'" class="plugin-installing">
+                  -
+                </span>
                 <span v-else>
                   <span>{{ plugin.displayVersion }}</span>
                   <span v-if="plugin.upgrade" v-tooltip="t('plugins.upgradeAvailable')"> -> {{ plugin.upgrade }}</span>
@@ -477,17 +553,25 @@ export default {
               </div>
               <div class="plugin-spacer" />
               <div class="plugin-actions">
-                <div v-if="plugin.error" v-tooltip="t('plugins.loadError')" class="plugin-error">
-                  <i class="icon icon-warning" />
-                </div>
+                <template v-if="plugin.error">
+                  <div v-tooltip="plugin.error" class="plugin-error">
+                    <i class="icon icon-warning" />
+                  </div>
+                </template>
                 <div v-if="plugin.helmError" v-tooltip="t('plugins.helmError')" class="plugin-error">
                   <i class="icon icon-warning" />
                 </div>
 
                 <div class="plugin-spacer" />
 
-                <div v-if="plugin.installing">
-                  <!-- Don't show any buttons -->
+                <div v-if="plugin.installing" class="plugin-installing">
+                  <i class="version-busy icon icon-spin icon-spinner" />
+                  <div v-if="plugin.installing ==='install'">
+                    {{ t('plugins.labels.installing') }}
+                  </div>
+                  <div v-else>
+                    {{ t('plugins.labels.uninstalling') }}
+                  </div>
                 </div>
                 <div v-else-if="plugin.installed" class="plugin-buttons">
                   <button v-if="!plugin.builtin" class="btn role-secondary" @click="showUninstallDialog(plugin, $event)">
@@ -515,7 +599,7 @@ export default {
     <InstallDialog ref="installDialog" @closed="didInstall" @update="updatePluginInstallStatus" />
     <UninstallDialog ref="uninstallDialog" @closed="didUninstall" @update="updatePluginInstallStatus" />
     <DeveloperInstallDialog ref="developerInstallDialog" @closed="didInstall" />
-    <RemoveUIPlugins ref="removeUIPlugins" />
+    <RemoveUIPlugins ref="removeUIPlugins" @done="updateInstallStatus" />
   </div>
 </template>
 
@@ -535,6 +619,30 @@ export default {
     }
   }
 
+  .plugin-reload-banner {
+    align-items: center;
+    background-color: var(--success-banner-bg);
+    display: flex;
+    padding: 0 10px;
+    border-radius: 5px;
+    min-height: 36px;
+
+    > i {
+      color: var(--success);
+      font-size: 20px;
+      font-weight: bold;
+    }
+
+    > button {
+      line-height: 30px;
+      min-height: 30px;
+    }
+  }
+
+  .plugin-complete {
+    font-size: 18px;
+  }
+
   .plugin-list {
     display: flex;
     flex-wrap: wrap;
@@ -560,6 +668,12 @@ export default {
       flex: 1;
       margin-bottom: 0;
     }
+
+    .btn.actions {
+      line-height: 36px;
+      min-height: 36px;
+      padding: 0 10px;
+    }
   }
 
   .plugin {
@@ -636,15 +750,15 @@ export default {
         height: 16px;
         width: 16px;
       }
+    }
 
-      .plugin-installing {
-        align-items: center;
-        display: flex;
+    .plugin-installing {
+      align-items: center;
+      display: flex;
 
-        > div {
-          font-size: 14px;
-          margin-left: 5px;
-        }
+      > div {
+        font-size: 14px;
+        margin-left: 5px;
       }
     }