@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.3

package/core/types.ts

@@ -4,7 +4,8 @@ import type { ExtensionManager } from '@shell/types/extension-manager';
 import { PaginationSettingsStores } from '@shell/types/resources/settings';
 import type {
   ProductMetadata, ProductSinglePage,
-  StandardProductName, RouteRecordRawWithParams, ProductChildGroup,
+  StandardProductName, RouteRecordRawWithParams, ProductChild,
+  ProductChildGroup,
   ProductChildPage
 } from './plugin-types';
 
@@ -552,7 +553,7 @@ export interface DSLReturnType {
    * @param headers {@link HeaderOptions[]}
    * @returns {@link void}
    */
-  headers: (type: string, headers: HeaderOptions[]) => void;
+  headers: (type: string, headers?: HeaderOptions[], paginationHeaders?: PaginationHeaderOptions[]) => void;
 
   /**
    * Create and register a new product
@@ -562,12 +563,30 @@ export interface DSLReturnType {
   product: (options: ProductOptions) => void;
 
   /**
-   * Create and label a group. The group will show up in navigation
-   * @param groupNane Name of the group
-   * @param label Label in navigation
+   /**
+   * Remap group display names in the side-menu navigation.
+   *
+   * Each entry matches a group's internal ID (via string or regex) and replaces its display label
+   * with a new name. This only changes how the group is labelled in the UI — it does not move
+   * resources between groups.
+   *
+   * @param match String, string for a regex or a regex object to match against group names
+   * @param replace Replacement string or function for the display name
+   * @param weight Priority for applying this mapping (higher numbers applied first, default 5)
+   * @param continueOnMatch If true, continue matching other rules after this one matches
+   * @returns {@link void}
+   */
+  mapGroup: (match: string | RegExp, replace: string | Function, weight?: number, continueOnMatch?: boolean) => void;
+
+  /**
+   * Remap a type ID to a display name
+   * @param match String, string for a regex or a regex object to match against type IDs
+   * @param replace Replacement string or function for the display name
+   * @param weight Priority for applying this mapping (higher numbers applied first, default 5)
+   * @param continueOnMatch If true, continue matching other rules after this one matches
    * @returns {@link void}
    */
-  mapGroup: (groupName: string, label: string) => void;
+  mapType: (match: string | RegExp, replace: string | Function, weight?: number, continueOnMatch?: boolean) => void;
 
   /**
    * Create and configure a myriad of options for a type
@@ -595,18 +614,36 @@ export interface DSLReturnType {
   weightType: (input: string, weight: number, forBasic: boolean) => void;
 
   /**
-   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   * Never show the specified type in the navigation
+   * @param regexOrString String, string for a regex or a regex object to match against type names
+   * @returns {@link void}
+   */
+  ignoreType: (regexOrString: string | RegExp) => void;
+
+  /**
+   * Never show the specified group or any types in it
+   * @param regexOrString String, string for a regex or a regex object to match against group names
+   * @param fn Conditional function that accepts getters and returns true if the group should be ignored
+   * @returns {@link void}
    */
-  // componentForType: (type: string, replacementType: string)
-  // groupBy: (type: string, field: string)
-  // hideBulkActions: (type: string, field)
-  // ignoreGroup: (regexOrString)
-  // ignoreType: (regexOrString)
-  //
-  // mapType: (match, replace)
-  // moveType: (match, group)
-  // setGroupDefaultType: (input, defaultType)
-  // spoofedType: (obj)
+  ignoreGroup: (regexOrString: string | RegExp, fn?: (getters: any) => boolean) => void;
+
+  /**
+   * Move a resource type into a different navigation group
+   * @param match String or regex to match against resource type names
+   * @param group Target group name to move the matched types into
+   * @param weight Ordering weight for the mapping (default: 5)
+   * @returns {@link void}
+   */
+  moveType: (match: string | RegExp, group: string, weight?: number) => void;
+
+  /**
+   * Control visibility of bulk actions (e.g. delete) in the list view toolbar for a specific resource type
+   * @param type The resource type to configure
+   * @param hide Whether to hide bulk actions. Set to `true` to hide them
+   * @returns {@link void}
+   */
+  hideBulkActions: (type: string, hide: boolean) => void;
 
   labelGroup: (group: string, label: string | undefined, labelKey?: string) => void;
 
@@ -663,8 +700,9 @@ export interface IExtension {
    * @param name
    * @param config
    */
-  addProduct(product: ProductMetadata, config: ProductChildGroup[]): void;
   addProduct(product: ProductMetadata, config: ProductChildPage[]): void;
+  addProduct(product: ProductMetadata, config: ProductChildGroup[]): void;
+  addProduct(product: ProductMetadata, config: ProductChild[]): void;
 
   /**
    * Add a product to the sidebar, without children (no side menu, single page only)
@@ -693,8 +731,9 @@ export interface IExtension {
    * @param product Product to be extended
    * @param config Product extension configuration
    */
-  extendProduct(product: StandardProductName | string, config: ProductChildGroup[]): void;
   extendProduct(product: StandardProductName | string, config: ProductChildPage[]): void;
+  extendProduct(product: StandardProductName | string, config: ProductChildGroup[]): void;
+  extendProduct(product: StandardProductName | string, config: ProductChild[]): void;
 
   /**
    * Add a locale to the i18n store

package/detail/__tests__/management.cattle.io.fleetworkspace.test.ts

@@ -0,0 +1,128 @@
+import { shallowMount } from '@vue/test-utils';
+import DetailWorkspace from '@shell/detail/management.cattle.io.fleetworkspace.vue';
+import { FLEET } from '@shell/config/types';
+import { NAME as FLEET_NAME } from '@shell/config/product/fleet';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+
+describe('component: DetailWorkspace', () => {
+  const mockValue = {
+    id:     'fleet-default',
+    counts: {
+      gitRepos:      3,
+      helmOps:       2,
+      clusters:      5,
+      cluster:       5,
+      clusterGroup:  1,
+      clusterGroups: 1,
+    },
+  };
+
+  const mockRouter = { push: jest.fn() };
+
+  const defaultStore = {
+    commit:   jest.fn(),
+    dispatch: jest.fn(),
+    getters:  {
+      'i18n/t':       (key: string) => key,
+      'i18n/exists':  () => true,
+      currentProduct: { name: FLEET_NAME },
+    },
+  };
+
+  const createWrapper = (props = {}) => {
+    return shallowMount(DetailWorkspace, {
+      props:  { value: mockValue, ...props },
+      global: {
+        mocks: {
+          $store:  defaultStore,
+          $route:  { params: {} },
+          $router: mockRouter,
+        },
+        stubs: {
+          CountBox:     { template: '<div />', props: ['clickable', 'count', 'name', 'primaryColorVar'] },
+          ResourceTabs: { template: '<div />' },
+        },
+      },
+    });
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('applicationRoute', () => {
+    it('should return the fleet application route', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.applicationRoute).toStrictEqual({
+        name:   'c-cluster-fleet-application',
+        params: { cluster: BLANK_CLUSTER },
+      });
+    });
+  });
+
+  describe('clustersRoute', () => {
+    it('should return the fleet clusters list route', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.clustersRoute).toStrictEqual({
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER,
+        },
+      });
+    });
+  });
+
+  describe('clusterGroupsRoute', () => {
+    it('should return the fleet cluster groups list route', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.clusterGroupsRoute).toStrictEqual({
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER_GROUP,
+        },
+      });
+    });
+  });
+
+  describe('setWorkspaceAndNavigate', () => {
+    it('should commit updateWorkspace with the workspace id', () => {
+      const wrapper = createWrapper();
+      const route = wrapper.vm.applicationRoute;
+
+      wrapper.vm.setWorkspaceAndNavigate(route);
+
+      expect(defaultStore.commit).toHaveBeenCalledWith('updateWorkspace', {
+        value:   'fleet-default',
+        getters: defaultStore.getters,
+      });
+    });
+
+    it('should dispatch prefs/set with the workspace id', () => {
+      const wrapper = createWrapper();
+      const route = wrapper.vm.applicationRoute;
+
+      wrapper.vm.setWorkspaceAndNavigate(route);
+
+      expect(defaultStore.dispatch).toHaveBeenCalledWith('prefs/set', {
+        key:   expect.any(String),
+        value: 'fleet-default',
+      });
+    });
+
+    it('should navigate to the given route', () => {
+      const wrapper = createWrapper();
+      const route = wrapper.vm.clustersRoute;
+
+      wrapper.vm.setWorkspaceAndNavigate(route);
+
+      expect(mockRouter.push).toHaveBeenCalledWith(route);
+    });
+  });
+});

package/detail/__tests__/pod.test.ts

@@ -0,0 +1,41 @@
+import podDetail from '@shell/detail/pod.vue';
+
+const { containers } = podDetail.computed;
+
+describe('view: pod', () => {
+  it('should not use 2x icon sizing in init container column', () => {
+    const initContainer = { name: 'init', image: 'init:latest' };
+    const appContainer = { name: 'app', image: 'app:latest' };
+
+    const rows = containers.call({
+      allContainers: [appContainer, initContainer],
+      allStatuses:   [{
+        name:      'app',
+        ready:     true,
+        state:     {},
+        lastState: {}
+      }, {
+        name:      'init',
+        ready:     false,
+        state:     {},
+        lastState: {}
+      }],
+      dateTimeFormat: () => '',
+      t:              () => '',
+      value:          {
+        containerActions:      [],
+        containerIsInit:       (container: { name: string }) => container.name === 'init',
+        containerStateColor:   () => 'text-success',
+        containerStateDisplay: () => 'running',
+        openLogs:              jest.fn(),
+        openShell:             jest.fn(),
+      },
+    });
+
+    const initRow = rows.find((row: { name: string }) => row.name === 'init');
+    const appRow = rows.find((row: { name: string }) => row.name === 'app');
+
+    expect(initRow.initIcon).toBe('icon-checkmark text-success ml-5');
+    expect(appRow.initIcon).toBe('icon-minus text-muted ml-5');
+  });
+});

package/detail/harvesterhci.io.management.cluster.vue

@@ -5,6 +5,12 @@ import CopyCode from '@shell/components/CopyCode';
 import Tab from '@shell/components/Tabbed/Tab';
 import { allHash } from '@shell/utils/promise';
 
+// Couple of things wrong here
+// 1. It should be in pkg/harvester-manager extension
+// 2. It's not used when the harvester-ui extension is loaded
+// - extension has it's own detail/harvesterhci.io.management.cluster.vue which supersedes this
+// - unless harvester standalone uses it, it should not exist in the harvester-ui extension
+
 export default {
   emits: ['input'],
 
@@ -31,8 +37,6 @@ export default {
 
     const res = await allHash(hash);
 
-    this.allNodes = res.allNodes || [];
-    this.allNodePools = res.allNodePools || [];
     this.clusterToken = res.clusterToken;
   },
 

package/detail/management.cattle.io.fleetworkspace.vue

@@ -4,6 +4,8 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import { SCOPE_NAMESPACE, SCOPE_CLUSTER } from '@shell/components/RoleBindings.vue';
 import { NAME as FLEET_NAME } from '@shell/config/product/fleet';
 import { FLEET } from '@shell/config/types';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { WORKSPACE } from '@shell/store/prefs';
 
 export default {
   name: 'DetailWorkspace',
@@ -34,6 +36,35 @@ export default {
       return this.t(`typeLabel."${ FLEET.HELM_OP }"`, { count: this.value.counts.helmOps });
     },
 
+    applicationRoute() {
+      return {
+        name:   'c-cluster-fleet-application',
+        params: { cluster: BLANK_CLUSTER }
+      };
+    },
+
+    clustersRoute() {
+      return {
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER,
+        }
+      };
+    },
+
+    clusterGroupsRoute() {
+      return {
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  BLANK_CLUSTER,
+          product:  FLEET_NAME,
+          resource: FLEET.CLUSTER_GROUP,
+        }
+      };
+    },
+
     SCOPE_NAMESPACE() {
       return SCOPE_NAMESPACE;
     },
@@ -46,6 +77,16 @@ export default {
       return FLEET_NAME;
     }
   },
+
+  methods: {
+    setWorkspaceAndNavigate(route) {
+      const workspaceId = this.value.id;
+
+      this.$store.commit('updateWorkspace', { value: workspaceId, getters: this.$store.getters });
+      this.$store.dispatch('prefs/set', { key: WORKSPACE, value: workspaceId });
+      this.$router.push(route);
+    }
+  }
 };
 </script>
 
@@ -58,6 +99,8 @@ export default {
             :count="value.counts.gitRepos"
             :name="gitRepoLabel"
             :primary-color-var="'--sizzle-3'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(applicationRoute)"
           />
         </div>
         <div class="col span-3">
@@ -65,6 +108,8 @@ export default {
             :count="value.counts.helmOps"
             :name="helmOpsLabel"
             :primary-color-var="'--sizzle-3'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(applicationRoute)"
           />
         </div>
         <div class="col span-3">
@@ -72,6 +117,8 @@ export default {
             :count="value.counts.clusters"
             :name="clustersLabel"
             :primary-color-var="'--sizzle-1'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(clustersRoute)"
           />
         </div>
         <div class="col span-3">
@@ -79,6 +126,8 @@ export default {
             :count="value.counts.clusterGroups"
             :name="clusterGroupsLabel"
             :primary-color-var="'--sizzle-2'"
+            :clickable="true"
+            @click="setWorkspaceAndNavigate(clusterGroupsRoute)"
           />
         </div>
       </div>

package/detail/pod.vue

@@ -106,7 +106,7 @@ export default {
           availableActions: this.value.containerActions,
           stateObj:         status, // Required if there's a description
           stateDescription: descriptions.join(' | '), // Required to display the description
-          initIcon:         this.value.containerIsInit(container) ? 'icon-checkmark icon-2x text-success ml-5' : 'icon-minus icon-2x text-muted ml-5',
+          initIcon:         this.value.containerIsInit(container) ? 'icon-checkmark text-success ml-5' : 'icon-minus text-muted ml-5',
 
           // Call openShell here so that opening the shell
           // at the container level still has 'this' in scope.

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

@@ -147,10 +147,6 @@ export default {
       fetchOne.normanClusters = this.$store.dispatch('rancher/findAll', { type: NORMAN.CLUSTER });
     }
 
-    if ( this.value.isRke1 && this.$store.getters['isRancher'] ) {
-      fetchOne.normanNodePools = this.$store.dispatch('rancher/findAll', { type: NORMAN.NODE_POOL });
-    }
-
     const fetchOneRes = await allHash(fetchOne);
 
     this.allMachines = fetchOneRes.machines || [];
@@ -203,10 +199,6 @@ export default {
     if ( this.$store.getters['management/canList'](MANAGEMENT.RKE_TEMPLATE) ) {
       this.$store.dispatch('management/findAll', { type: MANAGEMENT.RKE_TEMPLATE });
     }
-
-    if ( this.$store.getters['management/canList'](MANAGEMENT.RKE_TEMPLATE_REVISION) ) {
-      this.$store.dispatch('management/findAll', { type: MANAGEMENT.RKE_TEMPLATE_REVISION });
-    }
   },
 
   created() {
@@ -284,9 +276,11 @@ export default {
       extCustomParams: null,
       extDetailTabs:   {
         machines:     true, // in this component
+        nodes:        true, // in this component
         logs:         true, // in this component
         registration: true, // in this component
         snapshots:    true, // in this component
+        autoscaler:   true, // in this component
         related:      true, // in ResourceTabs
         events:       true, // in ResourceTabs
         conditions:   true, // in ResourceTabs
@@ -451,7 +445,7 @@ export default {
     },
 
     showNodes() {
-      return !this.showMachines && this.haveNodes && !!this.nodes.length && this.extDetailTabs.machines;
+      return !this.showMachines && this.haveNodes && !!this.nodes.length && this.extDetailTabs.nodes;
     },
 
     showSnapshots() {
@@ -628,7 +622,7 @@ export default {
     },
 
     showAutoScalerTab() {
-      return isAutoscalerFeatureFlagEnabled(this.$store) && this.value.hasAccessToAutoscalerConfigMap;
+      return isAutoscalerFeatureFlagEnabled(this.$store) && this.value.hasAccessToAutoscalerConfigMap && this.extDetailTabs.autoscaler;
     }
   },
 

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

@@ -4,6 +4,7 @@ import HelmOp from '@shell/models/fleet.cattle.io.helmop';
 import HelmOpComponent from '@shell/edit/fleet.cattle.io.helmop.vue';
 import FleetSecretSelector from '@shell/components/fleet/FleetSecretSelector.vue';
 import FleetConfigMapSelector from '@shell/components/fleet/FleetConfigMapSelector.vue';
+import { createStore } from 'vuex';
 
 const mockStore = {
   dispatch: jest.fn(),
@@ -85,6 +86,14 @@ const initHelmOp = (props: any, options = {}) => {
       value,
       ...props
     },
+    provide: {
+      store: createStore({
+        getters: {
+          currentStore:                   () => 'current_store',
+          'management/paginationEnabled': () => () => false
+        }
+      })
+    },
     computed: mockComputed,
     global:   { mocks },
   };

package/edit/__tests__/kontainerDriver.test.ts

@@ -30,7 +30,6 @@ describe('view: kontainerdriver should', () => {
           active:           true,
           checksum:         '',
           url:              '',
-          uiUrl:            '',
           whitelistDomains: []
         }
       },
@@ -65,32 +64,22 @@ describe('view: kontainerdriver should', () => {
 
   it('have "Create" button enabled and disabled depending on validation results', async() => {
     const urlField = wrapper.find('[data-testid="driver-create-url-field"]');
-    const uiurlField = wrapper.find('[data-testid="driver-create-uiurl-field"]');
     const checksumField = wrapper.find('[data-testid="driver-create-checksum-field"]');
     const saveButton = wrapper.find('[data-testid="kontainer-driver-edit-save"]').element as HTMLInputElement;
 
     const testCases = [
       {
         url:      '1111',
-        uiurl:    'http://test.com',
         checksum: 'aaaaaBBBBdddd',
         result:   true
       },
       {
         url:      'http://test.com',
-        uiurl:    '1111',
-        checksum: 'aaaaaBBBBdddd',
-        result:   true
-      },
-      {
-        url:      'http://test.com',
-        uiurl:    'http://test.com',
         checksum: '!!!',
         result:   true
       },
       {
         url:      'http://test.com',
-        uiurl:    'http://test.com',
         checksum: 'aaaaaBBBBdddd',
         result:   false
       }
@@ -99,8 +88,6 @@ describe('view: kontainerdriver should', () => {
     for (const testCase of testCases) {
       urlField.setValue(testCase.url);
       await nextTick();
-      uiurlField.setValue(testCase.uiurl);
-      await nextTick();
       checksumField.setValue(testCase.checksum);
       await nextTick();
 

package/edit/__tests__/nodeDriver.test.ts

@@ -31,7 +31,6 @@ describe('view: nodedriver should', () => {
           active:           true,
           checksum:         '',
           url:              '',
-          uiUrl:            '',
           whitelistDomains: []
         }
       },
@@ -65,21 +64,16 @@ describe('view: nodedriver should', () => {
   });
 
   it.each`
-    url                    | uiurl                  | checksum             | expected
-    ${ '1111' }            | ${ 'http://test.com' } | ${ 'aaaaaBBBBdddd' } | ${ true }
-    ${ 'http://test.com' } | ${ '1111' }            | ${ 'aaaaaBBBBdddd' } | ${ true }
-    ${ 'http://test.com' } | ${ 'http://test.com' } | ${ '!!!' }           | ${ true }
-    ${ 'http://test.com' } | ${ 'http://test.com' } | ${ 'aaaaaBBBBdddd' } | ${ false }
-  `('have "Create" button enabled and disabled depending on validation results', async({
-    url, uiurl, checksum, expected
-  }) => {
+    url                    | checksum             | expected
+    ${ '1111' }            | ${ 'aaaaaBBBBdddd' } | ${ true }
+    ${ 'http://test.com' } | ${ '!!!' }           | ${ true }
+    ${ 'http://test.com' } | ${ 'aaaaaBBBBdddd' } | ${ false }
+  `('have "Create" button enabled and disabled depending on validation results', async({ url, checksum, expected }) => {
     const urlField = wrapper.find('[data-testid="driver-create-url-field"]');
-    const uiurlField = wrapper.find('[data-testid="driver-create-uiurl-field"]');
     const checksumField = wrapper.find('[data-testid="driver-create-checksum-field"]');
     const saveButton = wrapper.find('[data-testid="node-driver-edit-save"]').element as HTMLInputElement;
 
     urlField.setValue(url);
-    uiurlField.setValue(uiurl);
     checksumField.setValue(checksum);
 
     await nextTick();

package/edit/__tests__/resources.cattle.io.restore.test.ts

@@ -2,6 +2,7 @@ import { nextTick } from 'vue';
 import { mount } from '@vue/test-utils';
 import RestoreComponent from '@shell/edit/resources.cattle.io.restore.vue';
 import { _CREATE } from '@shell/config/query-params';
+import { createStore } from 'vuex';
 
 describe('view: restore storage source switching', () => {
   let wrapper: any;
@@ -30,6 +31,14 @@ describe('view: restore storage source switching', () => {
     };
 
     return mount(RestoreComponent, {
+      provide: {
+        store: createStore({
+          getters: {
+            currentStore:                () => 'current_store',
+            'cluster/paginationEnabled': () => () => false
+          }
+        })
+      },
       global: {
         mocks: {
           $store:      mockStore,

package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/General.test.ts.snap

@@ -65,7 +65,9 @@ exports[`component: General rendering & initial state should render with default
               clearable="false"
               closeonselect="true"
               disabled="false"
+              filterable="true"
               hovertooltip="true"
+              instore="cluster"
               label="auditPolicy.general.verbosity.level.label"
               loading="false"
               localizedlabel="false"
@@ -73,8 +75,12 @@ exports[`component: General rendering & initial state should render with default
               nooptionslabelkey="labelSelect.noOptions.empty"
               optionlabel="label"
               options="[object Object],[object Object],[object Object],[object Object]"
+              placeholder=""
               reduce="[Function]"
               required="false"
+              requiredirty="true"
+              rules=""
+              searchable="false"
               selectable="[Function]"
               value="0"
             />