@rancher/shell 3.0.8-rc.9 → 3.0.8

package/directives/clean-tooltip.ts

@@ -0,0 +1,234 @@
+import { DirectiveBinding, Directive } from 'vue';
+import { destroyTooltip, createTooltip } from 'floating-vue';
+import { purifyHTML } from '@shell/plugins/clean-html';
+
+// This is a singleton tooltip implementation that improves performance on pages with many tooltips.
+// Instead of instantiating a Vue component for every tooltip on the page, this directive attaches lightweight event listeners.
+// It then imperatively creates and destroys a single tooltip instance as needed, avoiding the high upfront memory and processing cost of many Vue components.
+let singleton: ReturnType<typeof createTooltip> | null = null;
+let currentTarget: HTMLElement | null = null;
+
+interface TooltipDelay {
+  show: number;
+  hide: number;
+}
+
+// Options are optional, to be handled by floating-vue's defaults
+interface TooltipOptions {
+  content?: string;
+  placement?: string;
+  popperClass?: string;
+  delay?: TooltipDelay;
+  triggers?: string[];
+}
+
+interface TooltipHTMLElement extends HTMLElement {
+  // Store the whole options object for the tooltip
+  __tooltipOptions__: TooltipOptions;
+}
+
+/**
+ * Shows a singleton tooltip for the given target element.
+ * If a tooltip is already active, it is hidden before showing the new one.
+ * @param {HTMLElement} target The element to which the tooltip is attached.
+ * @param {TooltipOptions} options The options for the tooltip.
+ */
+function showSingletonTooltip(target: HTMLElement, options: TooltipOptions) {
+  // If a tooltip is already active, it should be hidden before showing the new one.
+  if (singleton) {
+    destroyTooltip(currentTarget);
+    singleton = null;
+  }
+
+  const purifiedContent = options.content ? purifyContent(options.content) : '';
+
+  // Don't show the tooltip if the content is empty.
+  if (!purifiedContent) {
+    return;
+  }
+
+  const tooltipConfig = {
+    ...options,
+    content: purifiedContent,
+  };
+
+  // Create a new tooltip instance.
+  singleton = createTooltip(target, tooltipConfig, {});
+
+  singleton.show();
+  currentTarget = target;
+}
+
+/**
+ * Hides the singleton tooltip if it is currently shown for the given target element.
+ * @param {HTMLElement} target The element from which the tooltip should be hidden.
+ */
+function hideSingletonTooltip(target: HTMLElement) {
+  if (!singleton) {
+    return;
+  }
+
+  if (currentTarget === target) {
+    destroyTooltip(target);
+    singleton = null;
+    currentTarget = null;
+  }
+}
+
+/**
+ * Purifies and trims the HTML content of the tooltip to prevent XSS attacks.
+ * @param {string} rawValue The raw content string to be purified and trimmed.
+ * @returns {string} The purified and trimmed content string.
+ */
+function purifyContent(rawValue: string): string {
+  const purified = purifyHTML(rawValue);
+
+  return purified.trim();
+}
+
+/**
+ * A Vue directive that provides a clean singleton tooltip using floating-vue.
+ */
+const cleanTooltipDirective: Directive = {
+  /**
+   * Called when the directive is mounted to an element.
+   * It sets up the tooltip options and adds event listeners.
+   * @param {HTMLElement} el The element the directive is bound to.
+   * @param {object} binding The directive binding object.
+   */
+  mounted(el: TooltipHTMLElement, binding: DirectiveBinding) {
+    el.__tooltipOptions__ = getTooltipOptions(binding.value, binding.modifiers);
+
+    const triggers = el.__tooltipOptions__.triggers || ['hover'];
+
+    if (triggers.includes('hover')) {
+      el.addEventListener('mouseenter', onMouseEnter);
+      el.addEventListener('mouseleave', onMouseLeave);
+    }
+    if (triggers.includes('focus')) {
+      el.addEventListener('focus', onMouseEnter);
+      el.addEventListener('blur', onMouseLeave);
+    }
+    if (triggers.includes('click')) {
+      el.addEventListener('click', onMouseClick);
+    }
+
+    if (el.__tooltipOptions__.content) {
+      // Add a class to the element to indicate that it has a clean tooltip.
+      el.classList.add('has-clean-tooltip');
+    }
+  },
+  /**
+   * Called when the directive's binding value is updated.
+   * It updates the tooltip options and shows the tooltip if it is already active.
+   * @param {HTMLElement} el The element the directive is bound to.
+   * @param {object} binding The directive binding object.
+   */
+  updated(el: TooltipHTMLElement, binding: DirectiveBinding) {
+    el.__tooltipOptions__ = getTooltipOptions(binding.value, binding.modifiers);
+
+    // doing this here too because the tooltip content may change after mount.
+    if (el.__tooltipOptions__.content) {
+      el.classList.add('has-clean-tooltip');
+    } else {
+      el.classList.remove('has-clean-tooltip');
+    }
+
+    // If this element's tooltip is currently shown, update it
+    if (currentTarget === el) {
+      showSingletonTooltip(el, el.__tooltipOptions__);
+    }
+  },
+  /**
+   * Called when the directive is unmounted from an element.
+   * It removes the event listeners and hides the tooltip if it is active.
+   * @param {HTMLElement} el The element the directive is bound to.
+   */
+  unmounted(el: TooltipHTMLElement) {
+    el.removeEventListener('mouseenter', onMouseEnter);
+    el.removeEventListener('mouseleave', onMouseLeave);
+    el.removeEventListener('focus', onMouseEnter);
+    el.removeEventListener('blur', onMouseLeave);
+    el.removeEventListener('click', onMouseClick);
+    el.classList.remove('has-clean-tooltip');
+
+    // If this element's tooltip is currently shown, hide it
+    if (currentTarget === el) {
+      hideSingletonTooltip(el);
+    }
+  },
+};
+
+/**
+ * Event handler for mouseenter and focus events.
+ * @param {Event} e The event object.
+ */
+function onMouseEnter(e: MouseEvent | FocusEvent) {
+  const el = e.currentTarget as TooltipHTMLElement;
+
+  showSingletonTooltip(el, el.__tooltipOptions__);
+}
+
+/**
+ * Event handler for mouseleave and blur events.
+ * @param {Event} e The event object.
+ */
+function onMouseLeave(e: MouseEvent | FocusEvent) {
+  const el = e.currentTarget as TooltipHTMLElement;
+
+  hideSingletonTooltip(el);
+}
+
+/**
+ * Event handler for click events.
+ * @param {Event} e The event object.
+ */
+function onMouseClick(e: MouseEvent) {
+  const el = e.currentTarget as TooltipHTMLElement;
+
+  if (currentTarget === el) {
+    hideSingletonTooltip(el);
+  } else {
+    showSingletonTooltip(el, el.__tooltipOptions__);
+  }
+}
+
+/**
+ * Parses the tooltip options from the directive's value and modifiers.
+ * @param {string|object} value The value of the directive.
+ * @param {object} modifiers The modifiers of the directive.
+ * @returns {object} The parsed tooltip options.
+ */
+function getTooltipOptions(value: string | TooltipOptions, modifiers: Partial<Record<string, boolean>>): TooltipOptions {
+  let options: TooltipOptions;
+
+  if (typeof value === 'string') {
+    options = { content: value };
+  } else if (value && typeof value === 'object') {
+    options = { ...value };
+  } else {
+    options = {};
+  }
+
+  // Modifiers can also specify placement (e.g., v-clean-tooltip.bottom)
+  if (modifiers.top) {
+    options.placement = 'top';
+  } else if (modifiers.bottom) {
+    options.placement = 'bottom';
+  } else if (modifiers.left) {
+    options.placement = 'left';
+  } else if (modifiers.right) {
+    options.placement = 'right';
+  }
+
+  return options;
+}
+
+export default cleanTooltipDirective;
+
+// Exporting for unit testing purposes
+export {
+  onMouseEnter,
+  onMouseLeave,
+  onMouseClick
+};

package/edit/__tests__/fleet.cattle.io.gitrepo.test.ts

@@ -109,7 +109,7 @@ describe.each([
     const correctDriftCheckbox = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
     const tooltip = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
 
-    expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
+    expect(tooltip.element.classList).toContain('has-clean-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });
@@ -118,7 +118,7 @@ describe.each([
     const correctDriftCheckbox = wrapper.find('[data-testid="gitRepo-keepResources-checkbox"]');
     const tooltip = wrapper.find('[data-testid="gitRepo-keepResources-checkbox"]');
 
-    expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
+    expect(tooltip.element.classList).toContain('has-clean-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });

package/edit/__tests__/fleet.cattle.io.helmop.test.ts

@@ -100,6 +100,49 @@ describe('view: fleet.cattle.io.helmop, mode: view', () => {
   });
 });
 
+describe('helmOp component lifecycle', () => {
+  it('should have registerBeforeHook method available and call updateBeforeSave', () => {
+    const helmOpOptions = {
+      metadata: {
+        name:      'test-helmop',
+        namespace: 'test-namespace',
+        labels:    {}
+      }
+    };
+
+    const wrapper = mount(HelmOpComponent, initHelmOp({ mode: _CREATE }, helmOpOptions));
+
+    // Mock registerBeforeHook to spy on calls
+    const mockRegisterBeforeHook = jest.fn();
+
+    wrapper.vm.registerBeforeHook = mockRegisterBeforeHook;
+
+    // Verify updateBeforeSave method exists
+    expect(typeof wrapper.vm.updateBeforeSave).toBe('function');
+
+    // Call the method that would be called during created lifecycle
+    wrapper.vm.registerBeforeHook(wrapper.vm.updateBeforeSave);
+
+    // Verify that registerBeforeHook was called with updateBeforeSave function
+    expect(mockRegisterBeforeHook).toHaveBeenCalledWith(wrapper.vm.updateBeforeSave);
+  });
+
+  it('should have doCreateSecrets method available for registerBeforeHook', () => {
+    const helmOpOptions = {
+      metadata: {
+        name:      'test-helmop',
+        namespace: 'test-namespace',
+        labels:    {}
+      }
+    };
+
+    const wrapper = mount(HelmOpComponent, initHelmOp({ mode: _CREATE }, helmOpOptions));
+
+    // Verify doCreateSecrets method exists
+    expect(typeof wrapper.vm.doCreateSecrets).toBe('function');
+  });
+});
+
 describe.each([
   _CREATE,
   _EDIT,
@@ -174,7 +217,7 @@ describe.each([
 
     expect(pollingCheckbox.exists()).toBe(true);
     expect(pollingCheckbox.vm.value).toBe(enabled);
-    expect(pollingCheckbox.element.classList.value.includes('v-popper--has-tooltip')).toBe(!enabled);
+    expect(pollingCheckbox.element.classList.value.includes('has-clean-tooltip')).toBe(!enabled);
     expect(pollingIntervalInput.exists()).toBe(enabled);
     expect(pollingIntervalMinimumValueWarning.exists()).toBe(minValueWarnVisible);
   });
@@ -262,4 +305,58 @@ describe.each([
 
     expect(wrapper.vm.value.spec.downstreamResources).toStrictEqual([{ name: 'configMap2', kind: 'ConfigMap' }, { name: 'configMap3', kind: 'ConfigMap' }]);
   });
+
+  if (mode === _CREATE) {
+    it('should set created-by-user-id label when updateBeforeSave is called in CREATE mode', () => {
+      const mockCurrentUser = { id: 'user-123' };
+      const helmOpOptions = {
+        metadata: {
+          name:      'test-helmop',
+          namespace: 'test-namespace',
+          labels:    {}
+        }
+      };
+      const wrapper = mount(HelmOpComponent, initHelmOp({ mode, realMode: mode }, helmOpOptions));
+
+      // Ensure metadata.labels exists
+      if (!wrapper.vm.value.metadata.labels) {
+        wrapper.vm.value.metadata.labels = {};
+      }
+
+      // Mock the currentUser
+      (wrapper.vm as any).currentUser = mockCurrentUser;
+
+      // Call updateBeforeSave method
+      wrapper.vm.updateBeforeSave();
+
+      // Should set the created-by-user-id label in CREATE mode
+      expect(wrapper.vm.value.metadata.labels['fleet.cattle.io/created-by-user-id']).toBe('user-123');
+    });
+  } else {
+    it('should not set created-by-user-id label when updateBeforeSave is called in EDIT mode', () => {
+      const mockCurrentUser = { id: 'user-123' };
+      const helmOpOptions = {
+        metadata: {
+          name:      'test-helmop',
+          namespace: 'test-namespace',
+          labels:    {}
+        }
+      };
+      const wrapper = mount(HelmOpComponent, initHelmOp({ mode, realMode: mode }, helmOpOptions));
+
+      // Ensure metadata.labels exists
+      if (!wrapper.vm.value.metadata.labels) {
+        wrapper.vm.value.metadata.labels = {};
+      }
+
+      // Mock the currentUser
+      (wrapper.vm as any).currentUser = mockCurrentUser;
+
+      // Call updateBeforeSave method
+      wrapper.vm.updateBeforeSave();
+
+      // Should not set the label in EDIT mode
+      expect(wrapper.vm.value.metadata.labels['fleet.cattle.io/created-by-user-id']).toBeUndefined();
+    });
+  }
 });

package/edit/fleet.cattle.io.helmop.vue

@@ -80,6 +80,7 @@ export default {
         type:        CONFIG_MAP
       }
     }, this.$store);
+    this.currentUser = await this.value.getCurrentUser();
   },
 
   data() {
@@ -405,6 +406,10 @@ export default {
 
     updateBeforeSave() {
       this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
+
+      if (this.mode === _CREATE) {
+        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = this.currentUser.id;
+      }
     },
 
     durationSeconds(value) {

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/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/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

@@ -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/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 {