@rancher/shell 3.0.8-rc.10 → 3.0.8-rc.13

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

package/edit/workload/index.vue

@@ -155,7 +155,7 @@ export default {
         :default-tab="defaultTab || defaultWorkloadTab"
         :flat="true"
         :use-hash="useTabbedHash"
-
+        :showExtensionTabs="false"
         data-testid="workload-horizontal-tabs"
         @changed="changed"
       >

package/initialize/install-plugins.js

@@ -19,13 +19,12 @@ import { InstallCodeMirror } from 'codemirror-editor-vue3';
 import * as intNumber from '@shell/directives/int-number';
 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';
@@ -51,7 +50,7 @@ export async function installInjectedPlugins(app, vueApp) {
   const pluginDefinitions = [
     config,
     axios,
-    plugins,
+    initUiApis,
     pluginsLoader,
     axiosShell,
     intNumber,
@@ -61,7 +60,6 @@ export async function installInjectedPlugins(app, vueApp) {
     plugin,
     steveCreateWorker,
     emberCookie,
-    internalApiPlugin,
     dynamicContent,
   ];
 
@@ -69,7 +67,8 @@ export async function installInjectedPlugins(app, vueApp) {
     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/models/management.cattle.io.cluster.js

@@ -255,7 +255,7 @@ export default class MgmtCluster extends SteveModel {
       dispatch:   this.$dispatch,
       getters:    this.$getters,
       axios:      this.$axios,
-      $extension: this.$plugin,
+      $extension: this.$extension,
       t:          (...args) => this.t.apply(this, args),
     };
 

package/models/provisioning.cattle.io.cluster.js

@@ -277,7 +277,7 @@ export default class ProvCluster extends SteveModel {
       dispatch:   this.$dispatch,
       getters:    this.$getters,
       axios:      this.$axios,
-      $extension: this.$plugin,
+      $extension: this.$extension,
       t:          (...args) => this.t.apply(this, args),
     };
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.8-rc.10",
+  "version": "3.0.8-rc.13",
   "description": "Rancher Dashboard Shell",
-  "repository": "https://github.com/rancherlabs/dashboard",
+  "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",
   "author": "SUSE",
   "private": false,
@@ -140,7 +140,7 @@
     "vuedraggable": "4.1.0",
     "vuex": "4.1.0",
     "webpack-bundle-analyzer": "4.10.2",
-    "webpack-virtual-modules": "0.4.3",
+    "webpack-virtual-modules": "0.6.2",
     "worker-loader": "3.0.8",
     "xterm-addon-canvas": "0.5.0",
     "xterm-addon-fit": "0.8.0",

package/pages/auth/login.vue

@@ -315,9 +315,9 @@ export default {
         // so we manually load them here - other SSO auth providers bounce out and back to the Dashboard, so on the bounce-back
         // the plugins will load via the boot-time plugin
         await loadPlugins({
-          app:     this.$store.app,
-          store:   this.$store,
-          $plugin: this.$store.$plugin
+          app:        this.$store.app,
+          store:      this.$store,
+          $extension: this.$store.$extension,
         });
 
         if (this.firstLogin || user[0]?.mustChangePassword) {

package/pages/auth/setup.vue

@@ -209,7 +209,7 @@ export default {
       const promises = [];
 
       try {
-        await applyProducts(this.$store, this.$plugin);
+        await applyProducts(this.$store, this.$extension);
         await this.$store.dispatch('loadManagement');
 
         if ( this.mustChangePassword ) {

package/pages/auth/verify.vue

@@ -119,9 +119,9 @@ export default {
 
         // Load plugins
         await loadPlugins({
-          app:     this.$store.app,
-          store:   this.$store,
-          $plugin: this.$store.$plugin
+          app:        this.$store.app,
+          store:      this.$store,
+          $extension: this.$store.$extension,
         });
 
         this.$router.replace(backTo);

package/pages/c/_cluster/apps/charts/install.vue

@@ -310,6 +310,7 @@ export default {
           two different Helm chart versions is a "user value," or
           a user-selected customization.
         */
+        this.preserveCustomRegistryValue();
         userValues = diff(this.loadedVersionValues, this.chartValues);
       } else if ( this.existing ) {
         await this.existing.fetchValues(); // In theory this has already been called, but do again to be safe
@@ -824,6 +825,35 @@ export default {
   },
 
   methods: {
+    /**
+     * The custom registry UI fields (checkbox and input) are not directly bound to chartValues.
+     * Before calculating the diff to carry over user customizations, we must
+     * first synchronize the state of these UI fields with chartValues. This
+     * ensures any user changes to the custom registry settings are
+     * included in the diff and preserved when changing versions.
+     */
+    preserveCustomRegistryValue() {
+      if (!this.showCustomRegistry) {
+        return;
+      }
+
+      if (this.showCustomRegistryInput) {
+        set(this.chartValues, 'global.systemDefaultRegistry', this.customRegistrySetting);
+        set(this.chartValues, 'global.cattle.systemDefaultRegistry', this.customRegistrySetting);
+      } else {
+        // Note: Using `delete` here is safe because this is not a reactive property update
+        // that the UI needs to track. This is a one-time mutation before a diff.
+        if (get(this.chartValues, 'global.systemDefaultRegistry')) {
+          delete this.chartValues.global.systemDefaultRegistry;
+        }
+        if (get(this.chartValues, 'global.cattle.systemDefaultRegistry')) {
+          // It's possible `this.chartValues.global.cattle` doesn't exist,
+          // but `get` ensures we only proceed if the full path exists.
+          delete this.chartValues.global.cattle.systemDefaultRegistry;
+        }
+      }
+    },
+
     async getClusterRegistry() {
       const hasPermissionToSeeProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
 
@@ -1367,6 +1397,7 @@ export default {
               <!-- We have a chart for the app, let the user select a new version -->
               <LabeledSelect
                 v-if="chart"
+                data-testid="chart-version-selector"
                 :label="t('catalog.install.version')"
                 :value="query.versionName"
                 :options="filteredVersions"
@@ -1435,6 +1466,7 @@ export default {
             v-if="showCustomRegistry"
             v-model:value="showCustomRegistryInput"
             class="mb-20"
+            data-testid="custom-registry-checkbox"
             :label="t('catalog.chart.registry.custom.checkBoxLabel')"
             :tooltip="t('catalog.chart.registry.tooltip')"
           />
@@ -1443,6 +1475,7 @@ export default {
               <LabeledInput
                 v-if="showCustomRegistryInput"
                 v-model:value="customRegistrySetting"
+                data-testid="custom-registry-input"
                 label-key="catalog.chart.registry.custom.inputLabel"
                 placeholder-key="catalog.chart.registry.custom.placeholder"
                 :min-height="30"

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

@@ -321,16 +321,13 @@ export default {
 
       this.selectedCard = selected;
 
-      this.$shell.slideInPanel({
-        component:      ResourceDetails,
+      this.$shell.slideIn.open(ResourceDetails, {
         componentProps: {
+          showHeader: false,
+          width:      window.innerWidth / 3 > 530 ? `${ window.innerWidth / 3 }px` : '530px',
           value,
           statePanel,
-          workspace,
-          showHeader:          false,
-          width:               window.innerWidth / 3 > 530 ? `${ window.innerWidth / 3 }px` : '530px',
-          triggerFocusTrap:    true,
-          returnFocusSelector: `[data-testid="resource-card-${ value.id }"]`
+          workspace
         }
       });
     },

package/pkg/auto-import.js

@@ -15,7 +15,7 @@ function registerFile(file, type, pkg, f) {
   const importType = (f === 'models') ? 'require' : 'import';
   const chunkName = (f === 'l10n') ? '' : `/* webpackChunkName: "${ f }" */`;
 
-  return `  $plugin.register('${ f }', '${ type }', () => ${ importType }(${ chunkName }'${ pkg }/${ f }/${ file }'));\n`;
+  return `  $extension.register('${ f }', '${ type }', () => ${ importType }(${ chunkName }'${ pkg }/${ f }/${ file }'));\n`;
 }
 
 function register(file, pkg, f) {
@@ -29,7 +29,7 @@ function register(file, pkg, f) {
 // This ensures that the webpackChunkName is respected (require.context does not support this) - so when build as a library
 // the code splitting will be respected
 function generateTypeImport(pkg, dir) {
-  let content = 'export function importTypes($plugin) { \n';
+  let content = 'export function importTypes($extension) { \n';
 
   // Auto-import if the folder exists
   contextFolders.forEach((f) => {
@@ -77,7 +77,7 @@ function generateTypeImport(pkg, dir) {
 // and then restart the dev server for it to be picked up.
 function generateDynamicTypeImport(pkg, dir) {
   const template = fs.readFileSync(path.join(__dirname, 'import.js'), { encoding: 'utf8' });
-  let content = 'export function importTypes($plugin) { \n';
+  let content = 'export function importTypes($extension) { \n';
 
   // Auto-import if the folder exists
   contextFolders.forEach((f) => {

package/pkg/dynamic-importer.lib.js

@@ -41,7 +41,7 @@ export function listProducts() {
   return [];
 }
 
-export function loadProduct(name, $plugin) {
+export function loadProduct(name, $extension) {
   return () => undefined;
 }
 

package/pkg/import.js

@@ -6,5 +6,5 @@ _NAME.forEach((f) => {
 
   name = name.substr(0, ext);
 
-  $plugin.register('DIR', name, () => REQUIRE(CHUNK`BASE/DIR/${ name }EXT`)); // eslint-disable-line no-undef
+  $extension.register('DIR', name, () => REQUIRE(CHUNK`BASE/DIR/${ name }EXT`)); // eslint-disable-line no-undef
 });

package/plugins/dashboard-store/getters.js

@@ -543,7 +543,7 @@ export default {
     const store = state.config.namespace;
     const resource = id || context ? { id, context } : null;
 
-    return paginationUtils.isEnabled({ rootGetters, $plugin: rootState.$plugin }, { store, resource });
+    return paginationUtils.isEnabled({ rootGetters, $extension: rootState.$extension }, { store, resource });
   },
 
   /**

package/plugins/dashboard-store/model-loader.js

@@ -13,7 +13,7 @@ function find(cache, type, rootState) {
   }
 
   try {
-    const pluginModel = rootState.$plugin.getDynamic('models', type);
+    const pluginModel = rootState.$extension.getDynamic('models', type);
     let base;
 
     if (!pluginModel) {

package/plugins/dashboard-store/resource-class.js

@@ -610,7 +610,11 @@ export default class Resource {
   }
 
   get '$plugin'() {
-    return this.$ctx.rootState?.$plugin;
+    return this.$ctx.rootState?.$extension;
+  }
+
+  get '$extension'() {
+    return this.$ctx.rootState?.$extension;
   }
 
   get customValidationRules() {
@@ -1777,7 +1781,7 @@ export default class Resource {
             CustomValidators[validatorName](pathValue, this.$rootGetters, errors, validatorArgs, displayKey, data);
           } else if (!isEmpty(validatorName) && !validatorExists) {
             // Check if validator is imported from plugin
-            const pluginValidator = this.$rootState.$plugin?.getValidator(validatorName);
+            const pluginValidator = this.$rootState.$extension?.getValidator(validatorName);
 
             if (pluginValidator) {
               pluginValidator(pathValue, this.$rootGetters, errors, validatorArgs, displayKey, data);

package/plugins/plugin.js

@@ -44,7 +44,7 @@ export default async function(context) {
     const res = await allHashSettled(fetches);
 
     // Initialize the built-in extensions now - this is now done here so that built-in extensions get the same, correct environment data (version etc)
-    context.$plugin.loadBuiltinExtensions();
+    context.$extension.loadBuiltinExtensions();
 
     if (res.plugins?.status === 'rejected') {
       throw new Error(res.reason);
@@ -60,7 +60,7 @@ export default async function(context) {
       const shouldNotLoad = shouldNotLoadPlugin(plugin, { rancherVersion, kubeVersion }, context.store.getters['uiplugins/plugins'] || []); // Error key string or boolean
 
       if (!shouldNotLoad) {
-        hash[plugin.name] = context.$plugin.loadPluginAsync(plugin);
+        hash[plugin.name] = context.$extension.loadPluginAsync(plugin);
       } else {
         context.store.dispatch('uiplugins/setError', { name: plugin.name, error: shouldNotLoad });
       }