@rancher/shell 3.0.5-rc.3 → 3.0.5-rc.6

package/components/fleet/__tests__/FleetGitRepoPaths.test.ts

@@ -0,0 +1,265 @@
+import { mount } from '@vue/test-utils';
+import { _EDIT } from '@shell/config/query-params';
+import FleetGitRepoPaths, { Subpath, getRelevantPrefixes } from '@shell/components/fleet/FleetGitRepoPaths.vue';
+
+describe('fx: getRelevantPrefixes', () => {
+  it('should return an empty array for an empty input array', () => {
+    const paths: string[] = [];
+
+    expect(getRelevantPrefixes(paths)).toStrictEqual([]);
+  });
+
+  it('should return the single path if only one is provided', () => {
+    const paths: string[] = ['aaa'];
+
+    expect(getRelevantPrefixes(paths)).toStrictEqual(['aaa']);
+  });
+
+  it('should return only 2nd level prefixes', () => {
+    const paths: string[] = [
+      'folderA/aaa',
+      'folderA/subfolderB/bbb',
+      'folderC/ccc'
+    ];
+
+    const res = getRelevantPrefixes(paths);
+
+    expect(res).toStrictEqual([
+      'folderC',
+      'folderA/subfolderB',
+      'folderA'
+    ]);
+  });
+
+  it('should return common prefix between 2 paths with same prefix', () => {
+    const paths: string[] = [
+      'level1/level2',
+      'level1/level2/aaa'
+    ];
+
+    const res = getRelevantPrefixes(paths);
+
+    expect(res).toStrictEqual([
+      'level1/level2'
+    ]);
+  });
+
+  it('should return common prefix between 2 paths with same low level prefix', () => {
+    const paths: string[] = [
+      'aaa/bbb/ccc',
+      'aaa/bbb/eee/fff'
+    ];
+
+    const res = getRelevantPrefixes(paths);
+
+    expect(res).toStrictEqual([
+      'aaa/bbb/eee',
+      'aaa/bbb'
+    ]);
+  });
+
+  it('should return all original paths if they are leaves or satisfy the one-child condition', () => {
+    const paths: string[] = [
+      'aaa',
+      'bbb',
+      'ccc'
+    ];
+
+    const res = getRelevantPrefixes(paths);
+
+    expect(res).toStrictEqual(['ccc', 'bbb', 'aaa']);
+  });
+
+  it('should handle multiple prefixes', () => {
+    const paths: string[] = [
+      'root/file1.txt',
+      'root/file2.txt',
+      'root/file3.txt'
+    ];
+
+    const res = getRelevantPrefixes(paths);
+
+    expect(res).toStrictEqual([
+      'root'
+    ]);
+  });
+
+  it('should add leaf nodes and single-child original paths, not grouping parents', () => {
+    const paths: string[] = [
+      'driven/kustomize/path1',
+      'driven/kustomize/path2',
+      'driven/kustomize',
+      'driven/simple',
+      'driven/helm'
+    ];
+
+    const res = getRelevantPrefixes(paths);
+
+    expect(res).toStrictEqual([
+      'driven/kustomize',
+      'driven',
+    ].sort((a, b) => b.localeCompare(a)));
+  });
+});
+
+describe('decode spec.targets to build UI source data', () => {
+  describe('mode: edit', () => {
+    const mode = _EDIT;
+
+    it('should build empty rows from empty paths and empty bundles', async() => {
+      const paths: string[] = [];
+      const bundles: Subpath[] = [];
+
+      const wrapper = mount(FleetGitRepoPaths, {
+        props: {
+          value:   { paths, bundles },
+          mode,
+          touched: {}
+        },
+      });
+
+      const { rows } = wrapper.vm;
+
+      expect(rows).toStrictEqual([]);
+    });
+
+    it('should build 1 row from 1 path', async() => {
+      const paths: string[] = ['path1'];
+      const bundles: Subpath[] = [];
+
+      const wrapper = mount(FleetGitRepoPaths, {
+        props: {
+          value:   { paths, bundles },
+          mode,
+          touched: {}
+        },
+      });
+
+      const { rows } = wrapper.vm;
+
+      expect(rows).toStrictEqual([{ path: 'path1' }]);
+    });
+
+    it('should build empty rows from empty subpaths', async() => {
+      const paths: string[] = [];
+      const bundles: any[] = [{}];
+
+      const wrapper = mount(FleetGitRepoPaths, {
+        props: {
+          value:   { paths, bundles },
+          mode,
+          touched: {}
+        },
+      });
+
+      const { rows } = wrapper.vm;
+
+      expect(rows).toStrictEqual([]);
+    });
+
+    it('should build empty rows from bundles with empty key', async() => {
+      const paths: string[] = [];
+      const bundles: Subpath[] = [{ base: '', options: 'dev.yaml' }];
+
+      const wrapper = mount(FleetGitRepoPaths, {
+        props: {
+          value:   { paths, bundles },
+          mode,
+          touched: {}
+        },
+      });
+
+      const { rows } = wrapper.vm;
+
+      expect(rows).toStrictEqual([]);
+    });
+
+    it('should build 1 path from bundles with empty options', async() => {
+      const paths: string[] = [];
+      const bundles: Subpath[] = [{ base: 'aaa', options: '' }];
+
+      const wrapper = mount(FleetGitRepoPaths, {
+        props: {
+          value:   { paths, bundles },
+          mode,
+          touched: {}
+        },
+      });
+
+      const { rows } = wrapper.vm;
+
+      expect(rows).toStrictEqual([{
+        isBundles: true,
+        path:      'aaa',
+        subpaths:  []
+      }]);
+    });
+
+    it('should build 1 row from bundles', async() => {
+      const paths: string[] = [];
+      const bundles: Subpath[] = [{ base: 'dev', options: 'dev.yaml' }];
+
+      const wrapper = mount(FleetGitRepoPaths, {
+        props: {
+          value:   { paths, bundles },
+          mode,
+          touched: {}
+        },
+      });
+
+      const { rows } = wrapper.vm;
+
+      expect(rows).toStrictEqual([{
+        isBundles: true,
+        path:      'dev',
+        subpaths:  [{
+          base:    '',
+          options: 'dev.yaml'
+        }]
+      }]);
+    });
+
+    it('should build rows from mixed paths and bundles', async() => {
+      const paths: string[] = ['folderC', 'folderA/subfolderB', 'folderA'];
+      const bundles: Subpath[] = [{
+        base:    'folderA',
+        options: 'dev.yaml'
+      }, {
+        base:    'vvv',
+        options: 'vvv.yaml'
+      }];
+
+      const wrapper = mount(FleetGitRepoPaths, {
+        props: {
+          value:   { paths, bundles },
+          mode,
+          touched: {}
+        },
+      });
+
+      const { rows } = wrapper.vm;
+
+      expect(rows).toStrictEqual([
+        {
+          path:     'vvv',
+          subpaths: [{
+            base:    '',
+            options: 'vvv.yaml'
+          }],
+          isBundles: true
+        },
+        {
+          path:     'folderA',
+          subpaths: [{
+            base:    '',
+            options: 'dev.yaml'
+          }],
+          isBundles: true
+        },
+        { path: 'folderC' },
+        { path: 'folderA/subfolderB' },
+        { path: 'folderA' }
+      ]);
+    });
+  });
+});

package/components/fleet/__tests__/FleetOCIStorageSecret.test.ts

@@ -0,0 +1,213 @@
+import { mount } from '@vue/test-utils';
+import flushPromises from 'flush-promises';
+import { SECRET_TYPES } from '@shell/config/secret';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
+import FleetOCIStorageSecret from '@shell/components/fleet/FleetOCIStorageSecret.vue';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
+
+const workspaces = [
+  {
+    id:       'fleet-local',
+    metadata: { annotations: { [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_DEFAULT]: 'secret-1' } }
+  },
+  {
+    id:       'fleet-default',
+    metadata: { annotations: { } }
+  },
+  {
+    id:       'fleet-custom-workspace',
+    metadata: { annotations: { [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_DEFAULT]: 'secret-6' } }
+  },
+];
+
+const secrets = [
+  {
+    id:       'fleet-local/secret-1',
+    name:     'secret-1',
+    _type:    SECRET_TYPES.FLEET_OCI_STORAGE,
+    metadata: {
+      namespace:   'fleet-local',
+      annotations: { [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_GENERATED]: false }
+    }
+  },
+  {
+    id:       'fleet-local/secret-2',
+    name:     'secret-2',
+    _type:    SECRET_TYPES.FLEET_OCI_STORAGE,
+    metadata: {
+      namespace:   'fleet-local',
+      annotations: { [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_GENERATED]: 'true' }
+    }
+  },
+  {
+    id:       'fleet-default/secret-3',
+    name:     'secret-3',
+    _type:    SECRET_TYPES.FLEET_OCI_STORAGE,
+    metadata: {
+      namespace:   'fleet-default',
+      annotations: { [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_GENERATED]: false }
+    }
+  },
+  {
+    id:       'fleet-default/secret-4',
+    name:     'secret-4',
+    _type:    SECRET_TYPES.FLEET_OCI_STORAGE,
+    metadata: {
+      namespace:   'fleet-default',
+      annotations: { [FLEET_ANNOTATIONS.OCI_STORAGE_SECRET_GENERATED]: 'true' }
+    }
+  },
+  {
+    id:       'fleet-custom-workspace/secret-5',
+    name:     'secret-5',
+    _type:    SECRET_TYPES.FLEET_OCI_STORAGE,
+    metadata: { namespace: 'fleet-custom-workspace' }
+  },
+  {
+    id:       'fleet-custom-workspace/secret-6',
+    name:     'secret-6',
+    _type:    SECRET_TYPES.FLEET_OCI_STORAGE,
+    metadata: { namespace: 'fleet-custom-workspace' }
+  }
+];
+
+describe('component: FleetOCIStorageSecret', () => {
+  describe('mode: create', () => {
+    const mode = _CREATE;
+
+    it('displays empty options', () => {
+      const wrapper = mount(FleetOCIStorageSecret, {
+        props: {
+          workspace: 'fleet-local',
+          secret:    '',
+          mode,
+        },
+        data() {
+          return { secrets: [], workspaces } as any;
+        },
+      });
+
+      expect(wrapper.vm.options).toHaveLength(1);
+      expect(wrapper.vm.options[0].label).toContain('none');
+    });
+
+    it('displays default and None options', () => {
+      const wrapper = mount(FleetOCIStorageSecret, {
+        props: {
+          workspace: 'fleet-local',
+          secret:    '',
+          mode,
+        },
+        data() {
+          return { secrets, workspaces } as any;
+        },
+      });
+
+      expect(wrapper.vm.options).toHaveLength(2);
+      expect(wrapper.vm.options[0].label).toContain('none');
+
+      expect(wrapper.vm.options[1].label).toContain('secret-1');
+      expect(wrapper.vm.options[1].label).toContain('default');
+    });
+
+    it('displays custom secrets options', () => {
+      const wrapper = mount(FleetOCIStorageSecret, {
+        props: {
+          workspace: 'fleet-default',
+          secret:    '',
+          mode,
+        },
+        data() {
+          return { secrets, workspaces } as any;
+        },
+      });
+
+      expect(wrapper.vm.options).toHaveLength(3);
+      expect(wrapper.vm.options[0].label).toContain('none');
+
+      expect(wrapper.vm.options[1].label).toContain('chooseCustom');
+      expect(wrapper.vm.options[2].label).toContain('secret-3');
+      expect(wrapper.vm.options[2].label).not.toContain('default');
+    });
+
+    it('displays all options', () => {
+      const wrapper = mount(FleetOCIStorageSecret, {
+        props: {
+          workspace: 'fleet-custom-workspace',
+          secret:    '',
+          mode,
+        },
+        data() {
+          return { secrets, workspaces } as any;
+        },
+      });
+
+      expect(wrapper.vm.options).toHaveLength(4);
+      expect(wrapper.vm.options[0].label).toContain('none');
+
+      expect(wrapper.vm.options[1].label).toContain('secret-6');
+      expect(wrapper.vm.options[1].label).toContain('default');
+
+      expect(wrapper.vm.options[2].label).toContain('chooseCustom');
+      expect(wrapper.vm.options[3].label).toContain('secret-5');
+    });
+
+    it('select default if default secret exists', async() => {
+      const wrapper = mount(FleetOCIStorageSecret, {
+        props: {
+          workspace: '',
+          secret:    '',
+          mode,
+        },
+        data() {
+          return { secrets, workspaces } as any;
+        },
+      });
+
+      wrapper.setProps({ workspace: 'fleet-local' });
+      await flushPromises();
+
+      expect(wrapper.emitted('update:value')?.[0][0]).toBe('secret-1');
+    });
+
+    it('select none if default secret not exists', async() => {
+      const wrapper = mount(FleetOCIStorageSecret, {
+        props: {
+          workspace: '',
+          secret:    '',
+          mode,
+        },
+        data() {
+          return { secrets, workspaces } as any;
+        },
+      });
+
+      wrapper.setProps({ workspace: 'fleet-default' });
+      await flushPromises();
+
+      expect(wrapper.emitted('update:value')).toBeUndefined();
+    });
+  });
+
+  describe('mode: edit', () => {
+    const mode = _EDIT;
+
+    it('displays selected secret', async() => {
+      const wrapper = mount(FleetOCIStorageSecret, {
+        props: {
+          workspace: 'fleet-local',
+          secret:    'test',
+          mode,
+        },
+        data() {
+          return { secrets, workspaces } as any;
+        },
+      });
+
+      const secretSelector = wrapper.find('[data-testid="fleet-oci-storage-secret-list"]');
+
+      expect(wrapper.vm.selected).toBe('test');
+      expect(secretSelector.element.textContent).toContain('test');
+    });
+  });
+});

package/components/fleet/__tests__/FleetSummary.test.ts

@@ -9,13 +9,13 @@ const REPO_NAME_VARIANT = 'testrepo-again';
 const CLUSTER_NAME = 'testcluster';
 
 const mockedBundlesInRepo = [{
-  id:         `fleet-default/${ REPO_NAME }-${ CLUSTER_NAME }-1234`,
-  type:       'fleet.cattle.io.bundle',
-  apiVersion: 'fleet.cattle.io/v1alpha1',
-  kind:       'Bundle',
-  repoName:   REPO_NAME,
-  namespace:  'fleet-default',
-  metadata:   {
+  id:            `fleet-default/${ REPO_NAME }-${ CLUSTER_NAME }-1234`,
+  type:          'fleet.cattle.io.bundle',
+  apiVersion:    'fleet.cattle.io/v1alpha1',
+  kind:          'Bundle',
+  appSourceName: REPO_NAME,
+  namespace:     'fleet-default',
+  metadata:      {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME
@@ -49,13 +49,13 @@ const mockedBundlesInRepo = [{
   }
 },
 {
-  id:         `fleet-default/${ REPO_NAME }-${ CLUSTER_NAME }-5678`,
-  type:       'fleet.cattle.io.bundle',
-  apiVersion: 'fleet.cattle.io/v1alpha1',
-  kind:       'Bundle',
-  repoName:   REPO_NAME,
-  namespace:  'fleet-default',
-  metadata:   {
+  id:            `fleet-default/${ REPO_NAME }-${ CLUSTER_NAME }-5678`,
+  type:          'fleet.cattle.io.bundle',
+  apiVersion:    'fleet.cattle.io/v1alpha1',
+  kind:          'Bundle',
+  appSourceName: REPO_NAME,
+  namespace:     'fleet-default',
+  metadata:      {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME
@@ -90,13 +90,13 @@ const mockedBundlesInRepo = [{
 }];
 
 const mockedBundlesOutOfRepo = [{
-  id:         `fleet-default/${ REPO_NAME_VARIANT }-${ CLUSTER_NAME }-1234`,
-  type:       'fleet.cattle.io.bundle',
-  apiVersion: 'fleet.cattle.io/v1alpha1',
-  kind:       'Bundle',
-  repoName:   REPO_NAME_VARIANT,
-  namespace:  'custom-namespace',
-  metadata:   {
+  id:            `fleet-default/${ REPO_NAME_VARIANT }-${ CLUSTER_NAME }-1234`,
+  type:          'fleet.cattle.io.bundle',
+  apiVersion:    'fleet.cattle.io/v1alpha1',
+  kind:          'Bundle',
+  appSourceName: REPO_NAME_VARIANT,
+  namespace:     'custom-namespace',
+  metadata:      {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME_VARIANT
@@ -130,13 +130,13 @@ const mockedBundlesOutOfRepo = [{
   }
 },
 {
-  id:         `fleet-default/${ REPO_NAME }-${ CLUSTER_NAME }-1234`,
-  type:       'fleet.cattle.io.bundle',
-  apiVersion: 'fleet.cattle.io/v1alpha1',
-  kind:       'Bundle',
-  repoName:   REPO_NAME,
-  namespace:  'custom-namespace',
-  metadata:   {
+  id:            `fleet-default/${ REPO_NAME }-${ CLUSTER_NAME }-1234`,
+  type:          'fleet.cattle.io.bundle',
+  apiVersion:    'fleet.cattle.io/v1alpha1',
+  kind:          'Bundle',
+  appSourceName: REPO_NAME,
+  namespace:     'custom-namespace',
+  metadata:      {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME
@@ -170,13 +170,13 @@ const mockedBundlesOutOfRepo = [{
   }
 },
 {
-  id:         `fleet-default/${ REPO_NAME_VARIANT }-${ CLUSTER_NAME }-5678`,
-  type:       'fleet.cattle.io.bundle',
-  apiVersion: 'fleet.cattle.io/v1alpha1',
-  kind:       'Bundle',
-  repoName:   REPO_NAME_VARIANT,
-  namespace:  'custom-namespace',
-  metadata:   {
+  id:            `fleet-default/${ REPO_NAME_VARIANT }-${ CLUSTER_NAME }-5678`,
+  type:          'fleet.cattle.io.bundle',
+  apiVersion:    'fleet.cattle.io/v1alpha1',
+  kind:          'Bundle',
+  appSourceName: REPO_NAME_VARIANT,
+  namespace:     'custom-namespace',
+  metadata:      {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME_VARIANT
@@ -337,10 +337,10 @@ describe('component: FleetSummary', () => {
   ])('displays the number of bundles associated with the current gitrepo', (bundles: any[], bundleCount: string) => {
     const wrapper = mount(FleetSummary, {
       props:  { bundles, value: new GitRepo(mockRepo) },
-      global: { mocks: { $store: mockStore } }
+      global: { mocks: { $store: mockStore }, directives: { 'trim-whitespace': (id: any) => id } },
     });
 
-    const bundleCountEl = wrapper.find('[data-testid="gitrepo-bundle-summary"] .count');
+    const bundleCountEl = wrapper.find('[data-testid="resource-bundle-summary"] .count');
 
     expect(bundleCountEl.text()).toBe(bundleCount);
   });
@@ -352,10 +352,10 @@ describe('component: FleetSummary', () => {
   ])('displays the number of deployments associated with the current gitrepo', (bundles: any[], bundleCount: string) => {
     const wrapper = mount(FleetSummary, {
       props:  { bundles, value: new GitRepo(mockRepo) },
-      global: { mocks: { $store: mockStore } }
+      global: { mocks: { $store: mockStore }, directives: { 'trim-whitespace': (id: any) => id } }
     });
 
-    const bundleCountEl = wrapper.find('[data-testid="gitrepo-deployment-summary"] .count');
+    const bundleCountEl = wrapper.find('[data-testid="resource-deployment-summary"] .count');
 
     expect(bundleCountEl.text()).toBe(bundleCount);
   });