@rancher/shell 0.1.4 → 0.2.1

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

@@ -83,7 +83,7 @@ export default {
   <div class="plugin-info-panel">
     <div v-if="showSlideIn" class="glass" @click="hide()" />
     <div class="slideIn" :class="{'hide': false, 'slideIn__show': showSlideIn}">
-      <div v-if="info">
+      <div v-if="info" class="plugin-info-content">
         <div class="plugin-header">
           <div class="plugin-icon">
             <LazyImage
@@ -116,11 +116,15 @@ export default {
           </div>
         </div>
         <div>
-          <Banner v-if="!info.certified" color="warning" :label="t('plugins.descriptions.third-party')" class="mt-10" />
-          <Banner v-if="info.experimental" color="warning" :label="t('plugins.descriptions.experimental')" class="mt-10" />
+          <Banner v-if="info.error" color="error" :label="info.error" class="mt-10" />
+          <Banner v-if="info.builtin" color="warning" :label="t('plugins.descriptions.built-in')" class="mt-10" />
+          <template v-else>
+            <Banner v-if="!info.certified" color="warning" :label="t('plugins.descriptions.third-party')" class="mt-10" />
+            <Banner v-if="info.experimental" color="warning" :label="t('plugins.descriptions.experimental')" class="mt-10" />
+          </template>
         </div>
 
-        <h3 v-if="info.versions">
+        <h3 v-if="info.versions.length">
           {{ t('plugins.info.versions') }}
         </h3>
         <div class="plugin-versions mb-10">
@@ -138,11 +142,16 @@ export default {
         <div v-if="versionError">
           {{ t('plugins.info.versionError') }}
         </div>
-        <div v-else>
+        <h3 v-if="versionInfo">
+          {{ t('plugins.info.detail') }}
+        </h3>
+        <div v-if="versionInfo" class="plugin-info-detail">
+          <ChartReadme v-if="versionInfo" :version-info="versionInfo" />
+        </div>
+        <div v-if="!info.versions.length">
           <h3>
-            {{ t('plugins.info.detail') }}
+            {{ t('plugins.version', { version: info.displayVersion }) }}
           </h3>
-          <ChartReadme v-if="versionInfo" :version-info="versionInfo" />
         </div>
       </div>
     </div>
@@ -186,6 +195,16 @@ export default {
 
       transition: right .5s ease;
 
+      .plugin-info-content {
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+
+        .plugin-info-detail {
+          overflow: auto;
+        }
+      }
+
       h3 {
         font-size: 14px;
         margin: 15px 0 10px 0;

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

@@ -79,14 +79,9 @@ export default {
 
       await new Promise(resolve => setTimeout(resolve, 5000));
 
-      btnCb(true);
+      this.$emit('done');
 
-      this.$router.push(
-        {
-          path:  this.$route.path,
-          force: true,
-        },
-      );
+      btnCb(true);
     },
   }
 };

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

@@ -1,7 +1,7 @@
 <script>
 import AsyncButton from '@shell/components/AsyncButton';
 import IconMessage from '@shell/components/IconMessage.vue';
-import { CATALOG, UI_PLUGIN } from '@shell/config/types';
+import { CATALOG, MANAGEMENT } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import Dialog from '@shell/components/Dialog.vue';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
@@ -47,17 +47,23 @@ export default {
       }
     }
 
+    this.defaultRegistrySetting = await this.$store.dispatch('management/find', {
+      type: MANAGEMENT.SETTING,
+      id:   'system-default-registry'
+    });
+
     this.loading = false;
   },
 
   data() {
     return {
-      loading:                 true,
-      haveCharts:              false,
-      installCharts:           [],
-      errors:                  [],
-      addRepo:                 true,
-      buttonState:             ASYNC_BUTTON_STATES.ACTION,
+      loading:                true,
+      haveCharts:             false,
+      installCharts:          [],
+      errors:                 [],
+      addRepo:                true,
+      buttonState:            ASYNC_BUTTON_STATES.ACTION,
+      defaultRegistrySetting: null,
     };
   },
 
@@ -88,6 +94,15 @@ export default {
         values: {}
       };
 
+      // Pass in the system default registry property if set
+      const defaultRegistry = this.defaultRegistrySetting?.value || '';
+
+      if (defaultRegistry) {
+        chart.values.global = chart.values.global || {};
+        chart.values.global.cattle = chart.values.global.cattle || {};
+        chart.values.global.cattle.systemDefaultRegistry = defaultRegistry;
+      }
+
       const input = {
         charts:    [chart],
         wait:      true,
@@ -130,16 +145,9 @@ export default {
 
         await new Promise(resolve => setTimeout(resolve, 5000));
 
-        this.$store.dispatch('management/forgetType', UI_PLUGIN);
-
         this.buttonState = this.errors.length > 0 ? ASYNC_BUTTON_STATES.ERROR : ASYNC_BUTTON_STATES.ACTION;
 
-        this.$router.push(
-          {
-            path:  this.$route.path,
-            force: true,
-          },
-        );
+        this.$emit('done');
       }
     },
 

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);
     }
   }
@@ -62,7 +69,7 @@ export default {
   >
     <div v-if="plugin" class="plugin-install-dialog">
       <h4 class="mt-10">
-        {{ t('plugins.uninstall.title', { name: plugin.name }) }}
+        {{ t('plugins.uninstall.title', { name: plugin.label }) }}
       </h4>
       <div class="mt-10 dialog-panel">
         <div class="dialog-info">