@rancher/shell 0.1.2 → 0.1.3

package/core/plugins.js

@@ -12,10 +12,12 @@ export default function({
   redirect
 }, inject) {
   const dynamic = {};
+  const validators = {};
   let _lastLoaded = 0;
 
   // Track which plugin loaded what, so we can unload stuff
   const plugins = {};
+
   const pluginRoutes = new PluginRoutes(app.router);
 
   inject('plugin', {
@@ -43,44 +45,69 @@ export default function({
         element.type = 'text/javascript';
         element.async = true;
 
-        element.onload = () => {
-          element.parentElement.removeChild(element);
+        // id is `<product>-<version>`.
+        const oldPlugin = Object.values(plugins).find(p => id.startsWith(p.name));
 
-          if (!window[id]) {
-            return reject(new Error('Could not load plugin code'));
-          }
+        let removed = Promise.resolve();
+
+        if (oldPlugin) {
+          // Uninstall existing plugin if there is one. This ensures that last loaded plugin is not always used
+          // (nav harv1-->harv2-->harv1 and harv2 would be shown)
+          removed = this.removePlugin(oldPlugin.name).then(() => {
+            delete window[oldPlugin.id];
+
+            delete plugins[oldPlugin.id];
+          });
+        }
+
+        removed.then(() => {
+          element.onload = () => {
+            element.parentElement.removeChild(element);
+
+            if (!window[id]) {
+              return reject(new Error('Could not load plugin code'));
+            }
+
+            // Update the timestamp that new plugins were loaded - may be needed
+            // to update caches when new plugins are loaded
+            _lastLoaded = new Date().getTime();
+
+            // name is the name of the plugin, including the version number
+            const plugin = new Plugin(id);
 
-          // Update the timestamp that new plugins were loaded - may be needed
-          // to update caches when new plugins are loaded
-          _lastLoaded = new Date().getTime();
+            plugins[id] = plugin;
 
-          // TODO: Error if we are loading a plugin already loaded?
-          // name is the name of the plugin, including the version number
-          const plugin = new Plugin(id);
+            // Initialize the plugin
+            window[id].default(plugin, this.internal());
 
-          plugins[id] = plugin;
+            // Uninstall existing plugin if there is one
+            this.removePlugin(plugin.name); // Removing this causes the plugin to not load on refresh
 
-          // Initialize the plugin
-          window[id].default(plugin, this.internal());
+            // Load all of the types etc from the plugin
+            this.applyPlugin(plugin);
 
-          // Uninstall existing plugin if there is one
-          this.removePlugin(plugin.name);
+            // Add the plugin to the store
+            store.dispatch('uiplugins/addPlugin', plugin);
 
-          // Load all of the types etc from the plugin
-          this.applyPlugin(plugin);
+            resolve();
+          };
 
-          // Add the plugin to the store
-          store.dispatch('uiplugins/addPlugin', plugin);
+          element.onerror = (e) => {
+            element.parentElement.removeChild(element);
+            // Massage the error into something useful
+            const errorMessage = `Failed to load script from '${ e.target.src }'`;
 
-          resolve();
-        };
+            console.error(errorMessage, e); // eslint-disable-line no-console
+            reject(new Error(errorMessage)); // This is more useful where it's used
+          };
 
-        element.onerror = (e) => {
-          element.parentElement.removeChild(element);
-          reject(e);
-        };
+          document.head.appendChild(element);
+        }).catch((e) => {
+          const errorMessage = `Failed to unload old plugin${ oldPlugin?.id }`;
 
-        document.head.appendChild(element);
+          console.error(errorMessage, e); // eslint-disable-line no-console
+          reject(new Error(errorMessage)); // This is more useful where it's used
+        });
       });
     },
 
@@ -114,15 +141,17 @@ export default function({
     },
 
     // Remove the plugin
-    removePlugin(name) {
+    async removePlugin(name) {
       const plugin = Object.values(plugins).find(p => p.name === name);
 
       if (!plugin) {
         return;
       }
 
+      const promises = [];
+
       plugin.productNames.forEach((product) => {
-        store.dispatch('type-map/removeProduct', { product, plugin });
+        promises.push(store.dispatch('type-map/removeProduct', { product, plugin }));
       });
 
       // Remove all of the types
@@ -138,13 +167,13 @@ export default function({
 
       // Remove locales
       plugin.locales.forEach((localeObj) => {
-        store.dispatch('i18n/removeLocale', localeObj);
+        promises.push(store.dispatch('i18n/removeLocale', localeObj));
       });
 
       if (plugin.types.models) {
         // Ask the Steve stores to forget any data it has for models that we are removing
-        this.removeTypeFromStore(store, 'rancher', Object.keys(plugin.types.models));
-        this.removeTypeFromStore(store, 'management', Object.keys(plugin.types.models));
+        promises.push(...this.removeTypeFromStore(store, 'rancher', Object.keys(plugin.types.models)));
+        promises.push(...this.removeTypeFromStore(store, 'management', Object.keys(plugin.types.models)));
       }
 
       // Uninstall routes
@@ -154,19 +183,24 @@ export default function({
       plugin.uninstallHooks.forEach(fn => fn(plugin, this.internal()));
 
       // Remove the plugin itself
-      store.dispatch('uiplugins/removePlugin', name);
+      promises.push( store.dispatch('uiplugins/removePlugin', name));
 
       // Unregister vuex stores
       plugin.stores.forEach(pStore => pStore.unregister(store));
 
+      // Remove validators
+      Object.keys(plugin.validators).forEach((key) => {
+        delete validators[key];
+      });
+
+      await Promise.all(promises);
+
       // Update last load since we removed a plugin
       _lastLoaded = new Date().getTime();
     },
 
     removeTypeFromStore(store, storeName, types) {
-      (types || []).forEach((type) => {
-        store.commit(`${ storeName }/forgetType`, type);
-      });
+      return (types || []).map(type => store.commit(`${ storeName }/forgetType`, type));
     },
 
     // Apply the plugin based on its metadata
@@ -200,6 +234,11 @@ export default function({
 
       // Routes
       pluginRoutes.addRoutes(plugin, plugin.routes);
+
+      // Validators
+      Object.keys(plugin.validators).forEach((key) => {
+        validators[key] = plugin.validators[key];
+      });
     },
 
     /**
@@ -252,6 +291,10 @@ export default function({
       return dynamic[typeName]?.[name];
     },
 
+    getValidator(name) {
+      return validators[name];
+    },
+
     // Timestamp that a UI package was last loaded
     // Typically used to invalidate caches (e.g. i18n) when new plugins are loaded
     get lastLoad() {

package/core/types.ts

@@ -18,6 +18,7 @@ export interface PackageMetadata {
 export type VuexStoreObject = { [key: string]: any }
 export type CoreStoreSpecifics = { state: () => VuexStoreObject, getters: VuexStoreObject, mutations: VuexStoreObject, actions: VuexStoreObject }
 export type CoreStoreConfig = { namespace: string, baseUrl?: string, modelBaseClass?: string, supportsStream?: boolean, isClusterStore?: boolean }
+export type CoreStoreInit = (store: any, ctx: any) => void;
 export type RegisterStore = () => (store: any) => void
 export type UnregisterStore = (store: any) => void
 
@@ -56,6 +57,11 @@ export interface IPlugin {
    */
   metadata: PackageMetadata;
 
+  /**
+   * Validators used in the same manner as shell/utils/custom-validators
+   */
+  validators: {[key: string]: Function};
+
   /**
    * Add a module contains localisations for a specific locale
    */
@@ -91,7 +97,7 @@ export interface IPlugin {
    * actions, will eventually call a `request` action which will make the raw http request. This is a pkg specific feature so needs the
    * `request` action needs to be supplied in the `storeSpecifics`
    */
-  addDashboardStore(storeName: string, storeSpecifics: CoreStoreSpecifics, config: CoreStoreConfig): void;
+  addDashboardStore(storeName: string, storeSpecifics: CoreStoreSpecifics, config: CoreStoreConfig, init?: CoreStoreInit): void;
 
   /**
    * Add hooks that will execute when a user navigates

package/detail/provisioning.cattle.io.cluster.vue

@@ -321,6 +321,18 @@ export default {
       return false;
     },
 
+    showEksNodeGroupWarning() {
+      if ( this.value.isEKS ) {
+        const desiredTotal = this.value.eksNodeGroups.filter(g => g.desiredSize === 0);
+
+        if ( desiredTotal.length === this.value.eksNodeGroups.length ) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+
     machineHeaders() {
       return [
         STATE,
@@ -585,6 +597,7 @@ export default {
   <Loading v-if="$fetchState.pending" />
   <div v-else>
     <Banner v-if="showWindowsWarning" color="error" :label="t('cluster.banner.os', { newOS: 'Windows', existingOS: 'Linux' })" />
+    <Banner v-if="showEksNodeGroupWarning" color="error" :label="t('cluster.banner.desiredNodeGroupWarning')" />
 
     <Banner v-if="$fetchState.error" color="error" :label="$fetchState.error" />
     <ResourceTabs v-model="value" :default-tab="defaultTab">

package/detail/workload/index.vue

@@ -120,6 +120,10 @@ export default {
       return this.value.type === WORKLOAD_TYPES.CRON_JOB;
     },
 
+    isPod() {
+      return this.value.type === WORKLOAD_TYPES.POD;
+    },
+
     podSchema() {
       return this.$store.getters['cluster/schemaFor'](POD);
     },
@@ -133,13 +137,15 @@ export default {
     },
 
     podTemplateSpec() {
-      const isCronJob = this.value.type === WORKLOAD_TYPES.CRON_JOB;
-
-      if ( isCronJob ) {
+      if ( this.value.type === WORKLOAD_TYPES.CRON_JOB ) {
         return this.value.spec.jobTemplate.spec.template.spec;
-      } else {
-        return this.value.spec?.template?.spec;
       }
+
+      if ( this.value.type === WORKLOAD_TYPES.POD ) {
+        return this.value;
+      }
+
+      return this.value.spec?.template?.spec;
     },
 
     container() {

package/edit/auth/azuread.vue

@@ -67,6 +67,10 @@ export default {
 
   async fetch() {
     await this.reloadModel();
+
+    if ( this.value?.graphEndpoint ) {
+      this.setInitialEndpoint(this.value.graphEndpoint);
+    }
   },
 
   data() {
@@ -171,6 +175,16 @@ export default {
       }
     },
 
+    setInitialEndpoint(endpoint) {
+      const endpointKey = Object.keys(ENDPOINT_MAPPING).find(key => ENDPOINT_MAPPING[key].graphEndpoint === endpoint);
+
+      if ( endpointKey ) {
+        this.endpoint = endpointKey;
+      } else {
+        this.endpoint = 'custom';
+      }
+    },
+
     getNewApplicationSecret() {
       const applicationSecretOrId =
         this.model.applicationSecret || this.applicationSecret;
@@ -291,7 +305,7 @@ export default {
         <InfoBox v-if="!model.enabled" id="reply-info" class="mt-20 mb-20 p-10">
           {{ t('authConfig.azuread.reply.info') }}
           <br />
-          <label>{{ t('authConfig.azuread.reply.label') }} </label>
+          <label class="reply-url">{{ t('authConfig.azuread.reply.label') }} </label>
           <CopyToClipboardText :plain="true" :text="replyUrl" />
         </InfoBox>
 
@@ -387,4 +401,9 @@ export default {
 #reply-info {
   flex-grow: 0;
 }
+
+.reply-url {
+  color: inherit;
+  font-weight: 700;
+}
 </style>

package/edit/management.cattle.io.project.vue

@@ -16,7 +16,7 @@ import { NAME } from '@shell/config/product/explorer';
 import { PROJECT_ID, _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
 import ProjectMembershipEditor from '@shell/components/form/Members/ProjectMembershipEditor';
 import { canViewProjectMembershipEditor } from '@shell/components/form/Members/ProjectMembershipEditor.vue';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 import { Banner } from '@components/Banner';
 
 export default {
@@ -188,7 +188,7 @@ export default {
 <template>
   <CruResource
     class="project"
-    :done-route="'c-cluster-product-projectsnamespaces'"
+    :done-route="value.listLocation"
     :errors="fvUnreportedValidationErrors"
     :mode="mode"
     :resource="value"

package/edit/namespace.vue

@@ -15,7 +15,7 @@ import MoveModal from '@shell/components/MoveModal';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Namespace';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_TYPES, RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 
 export default {
   components: {
@@ -34,9 +34,11 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
+    if (this.$store.getters['management/schemaFor'](MANAGEMENT.PROJECT)) {
+      this.projects = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PROJECT });
 
-    this.project = this.projects.find(p => p.id.includes(this.projectName));
+      this.project = this.projects.find(p => p.id.includes(this.projectName));
+    }
   },
 
   data() {
@@ -62,8 +64,9 @@ export default {
 
   computed: {
     ...mapGetters(['isSingleProduct']),
-    isHarvester() {
-      return this.$store.getters['currentProduct'].inStore === HARVESTER;
+
+    isSingleHarvester() {
+      return this.$store.getters['currentProduct'].inStore === HARVESTER && this.isSingleProduct;
     },
 
     projectOpts() {
@@ -93,7 +96,11 @@ export default {
     },
 
     showResourceQuota() {
-      return Object.keys(this.project?.spec?.resourceQuota?.limit || {}).length > 0;
+      return !this.isSingleHarvester && Object.keys(this.project?.spec?.resourceQuota?.limit || {}).length > 0;
+    },
+
+    showContainerResourceLimit() {
+      return !this.isSingleHarvester;
     }
   },
 
@@ -160,13 +167,13 @@ export default {
       :namespaced="false"
       :mode="mode"
     >
-      <template v-if="!isSingleProduct" #project-col>
+      <template v-if="project" #project-col>
         <LabeledSelect v-model="projectName" :label="t('namespace.project.label')" :options="projectOpts" />
       </template>
     </NameNsDescription>
 
     <Tabbed :side-tabs="true">
-      <Tab v-if="!isSingleProduct && showResourceQuota" :weight="1" name="container-resource-quotas" :label="t('namespace.resourceQuotas')">
+      <Tab v-if="showResourceQuota" :weight="1" name="container-resource-quotas" :label="t('namespace.resourceQuotas')">
         <div class="row">
           <div class="col span-12">
             <p class="helper-text mb-10">
@@ -177,7 +184,7 @@ export default {
         </div>
         <ResourceQuota v-model="value" :mode="mode" :project="project" :types="isHarvester ? HARVESTER_TYPES : RANCHER_TYPES" />
       </Tab>
-      <Tab v-if="!isSingleProduct" :weight="0" name="container-resource-limit" :label="t('namespace.containerResourceLimit')">
+      <Tab v-if="showContainerResourceLimit" :weight="0" name="container-resource-limit" :label="t('namespace.containerResourceLimit')">
         <ContainerResourceLimit
           :key="JSON.stringify(containerResourceLimits)"
           :value="containerResourceLimits"
@@ -200,6 +207,6 @@ export default {
         />
       </Tab>
     </Tabbed>
-    <MoveModal />
+    <MoveModal v-if="projects" />
   </CruResource>
 </template>

package/edit/persistentvolumeclaim.vue

@@ -269,6 +269,7 @@ export default {
                   :output-modifier="true"
                   :increment="1024"
                   :min="1"
+                  :required="true"
                 />
                 <Banner v-if="isEdit && !value.expandable" color="info" class="mt-10">
                   {{ t('persistentVolumeClaim.expand.notSupported') }}

package/edit/provisioning.cattle.io.cluster/CustomCommand.vue

@@ -71,7 +71,7 @@ export default {
         const e = sanitizeValue(t.effect);
 
         if ( k && v && e ) {
-          out.push(`--taint ${ k }=${ v }:${ e }`);
+          out.push(`--taints ${ k }=${ v }:${ e }`);
         }
       }
 

package/edit/provisioning.cattle.io.cluster/MachinePool.vue

@@ -1,5 +1,4 @@
 <script>
-
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { Checkbox } from '@components/Form/Checkbox';
 import { _EDIT } from '@shell/config/query-params';
@@ -64,11 +63,40 @@ export default {
 
   data() {
     const parseDuration = (duration) => {
-      // The back end stores the timeout in Duration format, for example, "10m".
-      // Here we convert that string to an integer.
-      const numberString = duration.split('m')[0];
+      // The back end stores the timeout in Duration format, for example, "42d31h10m30s".
+      // Here we convert that string to an integer and return the duration as seconds.
+      const splitStr = duration.split(/([a-z])/);
+
+      const durationsAsSeconds = splitStr.reduce((old, neu, idx) => {
+        const parsed = parseInt(neu);
+
+        if ( isNaN(parsed) ) {
+          return old;
+        }
+
+        const interval = splitStr[(idx + 1)];
+
+        switch (interval) {
+        case 'd':
+          old.push(parsed * 24 * 60 * 60);
+          break;
+        case 'h':
+          old.push(parsed * 60 * 60);
+          break;
+        case 'm':
+          old.push(parsed * 60);
+          break;
+        case 's':
+          old.push(parsed);
+          break;
+        default:
+          break;
+        }
+
+        return old;
+      }, []);
 
-      return parseInt(numberString, 10);
+      return durationsAsSeconds.reduce((old, neu) => old + neu);
     };
 
     return {

package/edit/service.vue

@@ -22,7 +22,7 @@ import HarvesterServiceAddOnConfig from '@shell/components/HarvesterServiceAddOn
 import { clone } from '@shell/utils/object';
 import { POD, CAPI } from '@shell/config/types';
 import { matching } from '@shell/utils/selector';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 import { allHash } from '@shell/utils/promise';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
 import { Port } from '@shell/utils/validators/formRules';