@rancher/shell 3.0.8-rc.8 → 3.0.8

package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts

@@ -112,8 +112,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) }
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) }
         },
 
         stubs: defaultStubs,
@@ -143,8 +143,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
 
         stubs: defaultStubs,
@@ -174,8 +174,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
 
         stubs: defaultStubs,
@@ -231,7 +231,7 @@ describe('component: rke2', () => {
             },
             getters: defaultGetters
           },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
 
         stubs: defaultStubs,
@@ -275,7 +275,7 @@ describe('component: rke2', () => {
                 'management/findAll': () => ([]),
               }
             },
-            $plugin: { getDynamic: jest.fn(() => undefined ) },
+            $extension: { getDynamic: jest.fn(() => undefined ) },
           },
 
           stubs: defaultStubs,
@@ -324,7 +324,7 @@ describe('component: rke2', () => {
                 'management/findAll': () => ([]),
               }
             },
-            $plugin: { getDynamic: jest.fn(() => undefined ) },
+            $extension: { getDynamic: jest.fn(() => undefined ) },
           },
 
           stubs: defaultStubs,
@@ -369,8 +369,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
         stubs: defaultStubs
       }
@@ -409,8 +409,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
         stubs: defaultStubs
       }
@@ -441,8 +441,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
         stubs: defaultStubs
       }
@@ -489,8 +489,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
         stubs: defaultStubs
       }
@@ -536,8 +536,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
         stubs: defaultStubs
       }
@@ -600,8 +600,8 @@ describe('component: rke2', () => {
       global: {
         mocks: {
           ...defaultMocks,
-          $store:  { dispatch: () => jest.fn(), getters: defaultGetters },
-          $plugin: { getDynamic: jest.fn(() => undefined ) },
+          $store:     { dispatch: () => jest.fn(), getters: defaultGetters },
+          $extension: { getDynamic: jest.fn(() => undefined ) },
         },
 
         stubs: defaultStubs,

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

@@ -332,9 +332,9 @@ export default {
       // Keeping this for non Rancher-managed kontainer drivers
       this.kontainerDrivers.filter((x) => (isImport ? x.showImport : x.showCreate)).forEach((obj) => {
         if ( vueKontainerTypes.includes(obj.driverName) ) {
-          addType(this.$plugin, obj.driverName, 'hosted', false);
+          addType(this.$extension, obj.driverName, 'hosted', false);
         } else {
-          addType(this.$plugin, obj.driverName, 'hosted', false, (isImport ? obj.emberImportPath : obj.emberCreatePath));
+          addType(this.$extension, obj.driverName, 'hosted', false, (isImport ? obj.emberImportPath : obj.emberCreatePath));
         }
       });
       if (!isImport) {
@@ -351,7 +351,7 @@ export default {
 
         // If Elemental is installed, then add the elemental cluster provider
         if (isElementalActive) {
-          addType(this.$plugin, ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
+          addType(this.$extension, ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
         }
 
         // Only add the RKE2 options if RKE2 is enabled
@@ -359,10 +359,10 @@ export default {
           machineTypes.forEach((type) => {
             const id = type.spec.displayName || type.id;
 
-            addType(this.$plugin, id, _RKE2, false, null, undefined, type);
+            addType(this.$extension, id, _RKE2, false, null, undefined, type);
           });
 
-          addType(this.$plugin, 'custom', 'custom2', false);
+          addType(this.$extension, 'custom', 'custom2', false);
         }
       }
       // Add from extensions

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

@@ -502,7 +502,7 @@ export default {
      * 2) Override via hardcoded setting
      */
     cloudCredentialsOverride() {
-      const cloudCredential = this.$plugin.getDynamic('cloud-credential', this.provider);
+      const cloudCredential = this.$extension.getDynamic('cloud-credential', this.provider);
 
       if (cloudCredential === undefined) {
         return CLOUD_CREDENTIAL_OVERRIDE[this.provider];
@@ -527,16 +527,16 @@ export default {
      * Extension provider where being provisioned by an extension
      */
     extensionProvider() {
-      const extClass = this.$plugin.getDynamic('provisioner', this.provider);
+      const extClass = this.$extension.getDynamic('provisioner', this.provider);
 
       if (extClass) {
         return new extClass({
-          dispatch: this.$store.dispatch,
-          getters:  this.$store.getters,
-          axios:    this.$store.$axios,
-          $plugin:  this.$store.app.$plugin,
-          $t:       this.t,
-          isCreate: this.isCreate
+          dispatch:   this.$store.dispatch,
+          getters:    this.$store.getters,
+          axios:      this.$store.$axios,
+          $extension: this.$store.app.$extension,
+          $t:         this.t,
+          isCreate:   this.isCreate
         });
       }
 
@@ -2440,6 +2440,7 @@ export default {
           :side-tabs="true"
           class="min-height"
           :use-hash="useTabbedHash"
+          :default-tab="defaultTab"
           @changed="handleTabChange"
         >
           <Tab

package/edit/resources.cattle.io.restore.vue

@@ -310,7 +310,7 @@ export default {
             <template #label>
               <label
                 v-clean-tooltip="t('backupRestoreOperator.deleteTimeout.tip')"
-                class="v-popper--has-tooltip"
+                class="has-clean-tooltip"
               >
                 {{ t('backupRestoreOperator.deleteTimeout.label') }} <i class="icon icon-info" />
               </label>

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/Job.vue

@@ -261,7 +261,7 @@ export default {
           >
             <template #label>
               <label
-                class="v-popper--has-tooltip"
+                class="has-clean-tooltip"
                 :style="{'color':'var(--input-label)'}"
               >
                 {{ t('workload.upgrading.terminationGracePeriodSeconds.label') }}
@@ -322,7 +322,7 @@ export default {
         >
           <template #label>
             <label
-              class="v-popper--has-tooltip"
+              class="has-clean-tooltip"
               :style="{'color':'var(--input-label)'}"
             >
               {{ t('workload.upgrading.terminationGracePeriodSeconds.label') }}

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"
+        :showExtensionTabs="false"
         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,15 +17,14 @@ 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';
 import replaceAll from '@shell/plugins/replaceall';
 import steveCreateWorker from '@shell/plugins/steve-create-worker';
 import emberCookie from '@shell/plugins/ember-cookie';
 import ShortKey from '@shell/plugins/shortkey';
-import internalApiPlugin from '@shell/plugins/internal-api';
+import { initUiApis } from '@shell/apis/impl/apis';
 
 import 'floating-vue/dist/style.css';
 import { floatingVueOptions } from '@shell/plugins/floating-vue';
@@ -48,13 +47,28 @@ 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,
+    initUiApis,
+    pluginsLoader,
+    axiosShell,
+    intNumber,
+    codeMirror,
+    dashboardClientInit,
+    replaceAll,
+    plugin,
+    steveCreateWorker,
+    emberCookie,
+    dynamicContent,
+  ];
 
   const installations = pluginDefinitions.map(async(pluginDefinition) => {
     if (typeof pluginDefinition === 'function') {
       await pluginDefinition(
         app.context,
-        (key, value) => inject(key, value, app.context, vueApp)
+        (key, value) => inject(key, value, app.context, vueApp),
+        vueApp
       );
     }
   });

package/machine-config/azure.vue

@@ -37,7 +37,7 @@ const defaultConfig = {
   faultDomainCount:      '3',
   image:                 'canonical:ubuntu-24_04-lts:server-gen1:latest',
   location:              'westus',
-  managedDisks:          false,
+  managedDisks:          true,
   noPublicIp:            false,
   nsg:                   null,
   privateIpAddress:      null,

package/machine-config/components/GCEImage.vue

@@ -8,7 +8,7 @@ import { getGKEImageFamilies, getGKEFamiliesFromProject } from '@shell/component
 import debounce from 'lodash/debounce';
 import { mapGetters } from 'vuex';
 
-const DEFAULT_PROJECTS = 'suse-cloud, ubuntu-os-cloud, rhel-cloud';
+const DEFAULT_PROJECTS = 'ubuntu-os-cloud';
 const DEFAULT_MIN_DISK = 10;
 
 export default {

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
     }
   },
 });

package/models/__tests__/provisioning.cattle.io.cluster.test.ts

@@ -1,24 +1,28 @@
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
-
+jest.mock('@shell/utils/provider', () => ({
+  isHostedProvider: jest.fn().mockImplementation((context, provider) => {
+    return ['GKE', 'EKS', 'AKS'].includes(provider);
+  })
+}));
 describe('class ProvCluster', () => {
   const gkeClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'GKE',
-    spec:        { rkeConfig: {} },
+    spec:        { },
     mgmt:        { spec: { gkeConfig: { privateClusterConfig: { enablePrivateEndpoint: true } } } }
   };
 
   const eksClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'EKS',
-    spec:        { rkeConfig: {} },
+    spec:        { },
     mgmt:        { spec: { eksConfig: { privateAccess: true } } }
   };
 
   const aksClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'AKS',
-    spec:        { rkeConfig: {} },
+    spec:        { },
     mgmt:        { spec: { aksConfig: { privateCluster: true } } }
   };
 
@@ -44,12 +48,131 @@ describe('class ProvCluster', () => {
         clusterData.provisioner
       );
 
-      expect(cluster.isRke2).toBe(expected);
+      expect(cluster.isRke2).toBe(false);
       expect(cluster.isHostedKubernetesProvider).toBe(expected);
       expect(cluster.isPrivateHostedProvider).toBe(expected);
       resetMocks();
     });
   });
+  describe('isImported', () => {
+    const testCases = [
+      {
+        description: 'should return false for a local cluster',
+        clusterData: { isLocal: true },
+        expected:    false
+      },
+      {
+        description: 'should return true for an imported k3s cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'k3s', driver: 'k3s' } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return true for an imported k3s cluster in waiting state',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: undefined, driver: 'k3s' } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return true for an imported rke2 cluster in waiting state',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: undefined, driver: 'rke2' } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a provisioned k3s cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'k3s', driver: 'imported' } }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true for an imported rke2 cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'rke2', driver: 'rke2' } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a provisioned rke2 cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'rke2', driver: 'imported' } }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true for an imported hosted cluster',
+        clusterData: {
+          isLocal:                    false,
+          isHostedKubernetesProvider: true,
+          providerConfig:             { imported: true }
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a provisioned hosted cluster',
+        clusterData: {
+          isLocal:                    false,
+          isHostedKubernetesProvider: true,
+          providerConfig:             { imported: false }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true for a generic imported cluster',
+        clusterData: {
+          isLocal:     false,
+          provisioner: 'imported'
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a generic provisioned cluster',
+        clusterData: {
+          isLocal:     false,
+          provisioner: 'rke2'
+        },
+        expected: false
+      }
+    ];
+    const resetMocks = () => {
+      // Clear all mock function calls:
+      jest.clearAllMocks();
+    };
+
+    it.each(testCases)('$description', ({ clusterData, expected }) => {
+      const cluster = new ProvCluster({});
+
+      // Mock getters
+      jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(
+        clusterData.mgmt
+      );
+      if (clusterData.isLocal !== undefined) {
+        jest.spyOn(cluster, 'isLocal', 'get').mockReturnValue(clusterData.isLocal);
+      }
+      if (clusterData.isHostedKubernetesProvider !== undefined) {
+        jest.spyOn(cluster, 'isHostedKubernetesProvider', 'get').mockReturnValue(clusterData.isHostedKubernetesProvider);
+      }
+      if (clusterData.providerConfig !== undefined) {
+        jest.spyOn(cluster, 'providerConfig', 'get').mockReturnValue(clusterData.providerConfig);
+      }
+      if (clusterData.provisioner !== undefined) {
+        jest.spyOn(cluster, 'provisioner', 'get').mockReturnValue(clusterData.provisioner);
+      }
+
+      expect(cluster.isImported).toBe(expected);
+      resetMocks();
+    });
+  });
 
   describe('hasError', () => {
     const conditionsWithoutError = [