@rancher/shell 3.0.8-rc.8 → 3.0.8-rc.9

package/edit/persistentvolume/plugins/hostPath.vue

@@ -14,47 +14,48 @@ export default {
       required: true,
     },
   },
-  data() {
-    const mustBeOptions = [
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.anything'),
-        value: ''
-      },
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.directory'),
-        value: 'DirectoryOrCreate'
-      },
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.file'),
-        value: 'FileOrCreate'
-      },
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.existingDirectory'),
-        value: 'Directory'
-      },
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.existingFile'),
-        value: 'File'
-      },
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.existingSocket'),
-        value: 'Socket'
-      },
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.existingCharacter'),
-        value: 'CharDevice'
-      },
-      {
-        label: this.t('persistentVolume.hostPath.mustBe.existingBlock'),
-        value: 'BlockDevice'
-      },
-    ];
-
+  created() {
     this.value.spec['hostPath'] = this.value.spec.hostPath || {};
-    this.value.spec.hostPath['type'] = this.value.spec.hostPath.type || mustBeOptions[0].value;
-
-    return { mustBeOptions };
+    this.value.spec.hostPath['type'] = this.value.spec.hostPath.type || this.mustBeOptions[0].value;
   },
+  computed: {
+    mustBeOptions() {
+      return [
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.anything'),
+          value: ''
+        },
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.directory'),
+          value: 'DirectoryOrCreate'
+        },
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.file'),
+          value: 'FileOrCreate'
+        },
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.existingDirectory'),
+          value: 'Directory'
+        },
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.existingFile'),
+          value: 'File'
+        },
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.existingSocket'),
+          value: 'Socket'
+        },
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.existingCharacter'),
+          value: 'CharDevice'
+        },
+        {
+          label: this.t('persistentVolume.hostPath.mustBe.existingBlock'),
+          value: 'BlockDevice'
+        },
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/iscsi.vue

@@ -17,27 +17,26 @@ export default {
       required: true,
     },
   },
-  data() {
-    const yesNoOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['iscsi'] = this.value.spec.iscsi || {};
     this.value.spec.iscsi['readOnly'] = this.value.spec.iscsi.readOnly || false;
     this.value.spec.iscsi['secretRef'] = this.value.spec.iscsi.secretRef || {};
     this.value.spec.iscsi['chapAuthDiscovery'] = this.value.spec.iscsi.chapAuthDiscovery || false;
     this.value.spec.iscsi['chapAuthSession'] = this.value.spec.iscsi.chapAuthSession || false;
-
-    return { yesNoOptions };
   },
   computed: {
+    yesNoOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    },
     lun: {
       get() {
         return this.value.spec.iscsi.lun;

package/edit/persistentvolume/plugins/local.vue

@@ -13,10 +13,8 @@ export default {
       required: true,
     },
   },
-  data() {
+  created() {
     this.value.spec['local'] = this.value.spec.local || {};
-
-    return { };
   },
 };
 </script>

package/edit/persistentvolume/plugins/longhorn.vue

@@ -5,6 +5,13 @@ import { RadioGroup } from '@components/Form/Radio';
 import { _CREATE } from '@shell/config/query-params';
 import { LONGHORN_DRIVER } from '@shell/config/types';
 
+const DEFAULT_VOLUME_ATTRIBUTES = {
+  size:                '2Gi',
+  numberOfReplicas:    '3',
+  staleReplicaTimeout: '20',
+  fromBackup:          ''
+};
+
 export default {
   components: {
     LabeledInput, KeyValue, RadioGroup
@@ -19,33 +26,27 @@ export default {
       required: true,
     },
   },
-  data() {
-    const defaultVolumeAttributes = {
-      size:                '2Gi',
-      numberOfReplicas:    '3',
-      staleReplicaTimeout: '20',
-      fromBackup:          ''
-    };
-
+  created() {
     if (this.mode === _CREATE) {
       this.value.spec['csi'] = this.value.spec.csi || {};
       this.value.spec.csi['driver'] = LONGHORN_DRIVER;
       this.value.spec.csi['readOnly'] = this.value.spec.csi.readOnly || false;
-      this.value.spec.csi['volumeAttributes'] = this.value.spec.csi.volumeAttributes || defaultVolumeAttributes;
+      this.value.spec.csi['volumeAttributes'] = this.value.spec.csi.volumeAttributes || DEFAULT_VOLUME_ATTRIBUTES;
+    }
+  },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
     }
-
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
-    return { readOnlyOptions };
   },
 };
 </script>

package/edit/persistentvolume/plugins/nfs.vue

@@ -14,23 +14,24 @@ export default {
       required: true,
     },
   },
-  data() {
+  created() {
     this.value.spec['nfs'] = this.value.spec.nfs || {};
     this.value.spec.nfs['readOnly'] = this.value.spec.nfs.readOnly || false;
-
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
-    return { readOnlyOptions };
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/photonPersistentDisk.vue

@@ -13,23 +13,10 @@ export default {
       required: true,
     },
   },
-  data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['photonPersistentDisk'] = this.value.spec.photonPersistentDisk || {};
     this.value.spec.photonPersistentDisk['readOnly'] = this.value.spec.photonPersistentDisk.readOnly || false;
     this.value.spec.photonPersistentDisk['secretRef'] = this.value.spec.photonPersistentDisk.secretRef || {};
-
-    return { readOnlyOptions };
   },
 };
 </script>

package/edit/persistentvolume/plugins/portworxVolume.vue

@@ -14,24 +14,25 @@ export default {
       required: true,
     },
   },
-  data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['portworxVolume'] = this.value.spec.portworxVolume || {};
     this.value.spec.portworxVolume['readOnly'] = this.value.spec.portworxVolume.readOnly || false;
     this.value.spec.portworxVolume['secretRef'] = this.value.spec.portworxVolume.secretRef || {};
-
-    return { readOnlyOptions };
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/quobyte.vue

@@ -14,23 +14,24 @@ export default {
       required: true,
     },
   },
-  data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['quobyte'] = this.value.spec.quobyte || {};
     this.value.spec.quobyte['readOnly'] = this.value.spec.quobyte.readOnly || false;
-
-    return { readOnlyOptions };
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/rbd.vue

@@ -17,24 +17,25 @@ export default {
       required: true,
     },
   },
-  data() {
-    const readOnlyOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['rbd'] = this.value.spec.rbd || {};
     this.value.spec.rbd['readOnly'] = this.value.spec.rbd.readOnly || false;
     this.value.spec.rbd['secretRef'] = this.value.spec.rbd.secretRef || {};
-
-    return { readOnlyOptions };
   },
+  computed: {
+    readOnlyOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/scaleIO.vue

@@ -14,25 +14,26 @@ export default {
       required: true,
     },
   },
-  data() {
-    const yesNoOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['scaleIO'] = this.value.spec.scaleIO || {};
     this.value.spec.scaleIO['readOnly'] = this.value.spec.scaleIO.readOnly || false;
     this.value.spec.scaleIO['secretRef'] = this.value.spec.scaleIO.secretRef || {};
     this.value.spec.scaleIO['sslEnabled'] = this.value.spec.scaleIO.sslEnabled || false;
-
-    return { yesNoOptions };
   },
+  computed: {
+    yesNoOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/storageos.vue

@@ -14,24 +14,25 @@ export default {
       required: true,
     },
   },
-  data() {
-    const yesNoOptions = [
-      {
-        label: this.t('generic.yes'),
-        value: true
-      },
-      {
-        label: this.t('generic.no'),
-        value: false
-      }
-    ];
-
+  created() {
     this.value.spec['storageos'] = this.value.spec.storageos || {};
     this.value.spec.storageos['readOnly'] = this.value.spec.storageos.readOnly || false;
     this.value.spec.storageos['secretRef'] = this.value.spec.storageos.secretRef || {};
-
-    return { yesNoOptions };
   },
+  computed: {
+    yesNoOptions() {
+      return [
+        {
+          label: this.t('generic.yes'),
+          value: true
+        },
+        {
+          label: this.t('generic.no'),
+          value: false
+        }
+      ];
+    }
+  }
 };
 </script>
 

package/edit/persistentvolume/plugins/vsphereVolume.vue

@@ -13,10 +13,8 @@ export default {
       required: true,
     },
   },
-  data() {
+  created() {
     this.value.spec['vsphereVolume'] = this.value.spec.vsphereVolume || {};
-
-    return { };
   },
 };
 </script>

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

@@ -2440,6 +2440,7 @@ export default {
           :side-tabs="true"
           class="min-height"
           :use-hash="useTabbedHash"
+          :default-tab="defaultTab"
           @changed="handleTabChange"
         >
           <Tab

package/edit/secret/index.vue

@@ -485,7 +485,7 @@ export default {
         v-else
         :side-tabs="true"
         :use-hash="useTabbedHash"
-        default-tab="data"
+        :default-tab="defaultTab || 'data'"
       >
         <Tab
           name="data"

package/edit/service.vue

@@ -351,6 +351,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
     >
       <Tab
         v-if="checkTypeIs('ExternalName')"

package/edit/serviceaccount.vue

@@ -145,6 +145,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
     >
       <Tab
         name="data"

package/edit/storage.k8s.io.storageclass/index.vue

@@ -240,6 +240,7 @@ export default {
     <Tabbed
       :side-tabs="true"
       :use-hash="useTabbedHash"
+      :default-tab="defaultTab"
     >
       <Tab
         name="parameters"

package/edit/workload/index.vue

@@ -152,9 +152,10 @@ export default {
         ref="containersTabbed"
         class="deployment-tabs"
         :show-tabs-add-remove="true"
-        :default-tab="defaultTab"
+        :default-tab="defaultTab || defaultWorkloadTab"
         :flat="true"
         :use-hash="useTabbedHash"
+
         data-testid="workload-horizontal-tabs"
         @changed="changed"
       >

package/edit/workload/mixins/workload.js

@@ -292,7 +292,7 @@ export default {
       return { general: this.fvGetPathErrors(['image'])?.length > 0 };
     },
 
-    defaultTab() {
+    defaultWorkloadTab() {
       if (!!this.$route.query.sidecar || this.$route.query.init || this.mode === _CREATE) {
         const container = this.allContainers.find((c) => c.__active);
 

package/initialize/App.vue

@@ -1,5 +1,5 @@
 <script>
-import NuxtLoading from '@shell/components/nav/GlobalLoading.vue';
+import GlobalLoading from '@shell/components/nav/GlobalLoading.vue';
 
 import '@shell/assets/styles/app.scss';
 
@@ -55,12 +55,12 @@ export default {
     },
   },
 
-  components: { NuxtLoading }
+  components: { GlobalLoading }
 };
 </script>
 <template>
-  <div id="__nuxt">
-    <NuxtLoading ref="loading" />
+  <div id="__root">
+    <GlobalLoading ref="loading" />
     <div
       id="__layout"
     >

package/initialize/install-plugins.js

@@ -17,7 +17,7 @@ import axiosShell from '@shell/plugins/axios';
 import codeMirror from '@shell/plugins/codemirror-loader';
 import { InstallCodeMirror } from 'codemirror-editor-vue3';
 import * as intNumber from '@shell/directives/int-number';
-import nuxtClientInit from '@shell/plugins/nuxt-client-init';
+import dashboardClientInit from '@shell/plugins/dashboard-client-init';
 import plugin from '@shell/plugins/plugin';
 import plugins from '@shell/core/plugins.js';
 import pluginsLoader from '@shell/core/plugins-loader.js';
@@ -48,7 +48,22 @@ export async function installPlugins(vueApp) {
 }
 
 export async function installInjectedPlugins(app, vueApp) {
-  const pluginDefinitions = [config, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie, internalApiPlugin, dynamicContent];
+  const pluginDefinitions = [
+    config,
+    axios,
+    plugins,
+    pluginsLoader,
+    axiosShell,
+    intNumber,
+    codeMirror,
+    dashboardClientInit,
+    replaceAll,
+    plugin,
+    steveCreateWorker,
+    emberCookie,
+    internalApiPlugin,
+    dynamicContent,
+  ];
 
   const installations = pluginDefinitions.map(async(pluginDefinition) => {
     if (typeof pluginDefinition === 'function') {

package/mixins/__tests__/brand.spec.ts

@@ -99,9 +99,9 @@ describe('brandMixin', () => {
             filters: [{
               equals: true,
               fields: [{
-                equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-adapter'
+                equality: '=', equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-adapter'
               }, {
-                equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-billing-adapter'
+                equality: '=', equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-billing-adapter'
               }],
               param: 'filter'
             }],

package/mixins/brand.js

@@ -36,7 +36,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters({ loggedIn: 'auth/loggedIn' }),
+    ...mapGetters({ loggedIn: 'auth/loggedIn', brand: 'management/brand' }),
 
     // added to fix https://github.com/rancher/dashboard/issues/10788
     // because on logout the brand mixin is mounted, but then a management store reset happens
@@ -46,12 +46,6 @@ export default {
       return this.$store.getters['management/all'](MANAGEMENT.SETTING);
     },
 
-    brand() {
-      const setting = this.globalSettings?.find((gs) => gs.id === SETTING.BRAND);
-
-      return setting?.value;
-    },
-
     color() {
       const setting = this.globalSettings?.find((gs) => gs.id === SETTING.PRIMARY_COLOR);
 

package/mixins/create-edit-view/index.js

@@ -48,6 +48,11 @@ export default defineComponent({
     useTabbedHash: {
       type:    Boolean,
       default: undefined
+    },
+
+    defaultTab: {
+      type:    String,
+      default: undefined
     }
   },
 });