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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.12-rc.1",
+  "version": "3.0.12-rc.3",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",
@@ -20,26 +20,21 @@
     "dev": "./node_modules/.bin/vue-cli-service dev",
     "build": "./node_modules/.bin/vue-cli-service build",
     "analyze": "./node_modules/.bin/vue-cli-service build --report",
-    "start": "./node_modules/.bin/vue-cli-service start",
-    "cy:run": "cypress run",
-    "cy:open": "cypress open",
-    "e2e:pre": "NODE_ENV=dev yarn build",
-    "e2e:run": "NODE_ENV=dev START_SERVER_AND_TEST_INSECURE=1 start-server-and-test start  https://localhost:8005/ cy:run",
-    "e2e:dev": "start-server-and-test dev https://localhost:8005 cy:open"
+    "start": "./node_modules/.bin/vue-cli-service start"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "3.863.0",
-    "@aws-sdk/client-eks": "3.879.0",
-    "@aws-sdk/client-iam": "3.863.0",
-    "@aws-sdk/client-kms": "3.863.0",
-    "@smithy/fetch-http-handler": "5.1.1",
+    "@aws-sdk/client-ec2": "3.1041.0",
+    "@aws-sdk/client-eks": "3.1041.0",
+    "@aws-sdk/client-iam": "3.1041.0",
+    "@aws-sdk/client-kms": "3.1041.0",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-proposal-private-methods": "7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
     "@babel/preset-typescript": "7.16.7",
     "@novnc/novnc": "1.2.0",
     "@popperjs/core": "2.11.8",
-    "@rancher/icons": "2.0.55",
+    "@rancher/icons": "2.0.60",
+    "@smithy/fetch-http-handler": "5.1.1",
     "@types/is-url": "1.2.30",
     "@types/node": "25.3.3",
     "@types/semver": "^7.5.8",
@@ -52,43 +47,38 @@
     "@vue/vue3-jest": "27.0.0",
     "add": "2.0.6",
     "ansi_up": "5.0.0",
+    "axios": "1.15.2",
     "axios-retry": "3.1.9",
-    "axios": "1.13.5",
     "babel-eslint": "10.1.0",
-    "babel-plugin-module-resolver": "5.0.2",
     "babel-preset-vue": "2.0.2",
     "cache-loader": "4.1.0",
     "chart.js": "4.5.1",
     "clipboard-polyfill": "4.0.1",
-    "codemirror-editor-vue3": "2.8.0",
     "codemirror": ">=5.64.0 <6",
+    "codemirror-editor-vue3": "2.8.0",
     "color": "5.0.3",
     "cookie-universal": "2.2.2",
-    "cookie": "0.7.0",
     "core-js": "3.48.0",
     "cron-validator": "1.4.0",
     "cronstrue": "3.9.0",
-    "cross-env": "7.0.3",
     "css-loader": "6.7.3",
     "csv-loader": "3.0.3",
     "custom-event-polyfill": "^1.0.7",
-    "cypress": "11.1.0",
-    "d3-selection": "3.0.0",
     "d3": "7.3.0",
     "dayjs": "1.11.18",
+    "diff": "9.0.0",
     "diff2html": "3.4.24",
-    "dompurify": "3.2.5",
+    "dompurify": "3.3.2",
     "element-matches": "^0.1.2",
     "entities": "4.5.0",
+    "eslint": "7.32.0",
     "eslint-config-standard": "16.0.3",
     "eslint-import-resolver-node": "0.3.9",
     "eslint-module-utils": "2.6.1",
-    "eslint-plugin-cypress": "2.12.1",
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-n": "15.2.0",
     "eslint-plugin-vue": "9.32.0",
-    "eslint": "7.32.0",
     "event-target-shim": "5.0.1",
     "express": "4.17.1",
     "file-saver": "2.0.2",
@@ -99,14 +89,12 @@
     "intl-messageformat": "7.8.4",
     "ip": "2.0.1",
     "is-url": "1.2.4",
+    "jest": "27.5.1",
     "jest-serializer-vue": "2.0.2",
     "jexl": "2.3.0",
-    "jest": "27.5.1",
     "jquery": "3.5.1",
-    "js-cookie": "3.0.5",
-    "js-yaml-loader": "1.2.2",
     "js-yaml": "4.1.1",
-    "jsdiff": "1.1.1",
+    "js-yaml-loader": "1.2.2",
     "jsonpath-plus": "10.3.0",
     "jsrsasign": "11.1.1",
     "jszip": "3.10.1",
@@ -117,23 +105,17 @@
     "nyc": "17.1.0",
     "papaparse": "5.3.0",
     "portal-vue": "~3.0.0",
-    "sass-loader": "12.6.0",
     "sass": "1.97.3",
+    "sass-loader": "12.6.0",
     "serve-static": "1.14.1",
-    "set-cookie-parser": "2.4.6",
-    "shell-quote": "1.7.3",
-    "sinon": "8.1.1",
-    "start-server-and-test": "2.0.10",
     "style-loader": "1.2.1",
-    "ts-node": "8.10.2",
     "typescript": "5.6.3",
     "ufo": "0.7.11",
     "unfetch": "4.2.0",
-    "url-parse": "1.5.10",
+    "vee-validate": "^4.15.1",
+    "vue": "3.5.29",
     "vue-router": "4.6.4",
     "vue-select": "4.0.0-beta.6",
-    "vue-server-renderer": "2.7.16",
-    "vue": "3.5.29",
     "vue3-resize": "0.2.0",
     "vue3-virtual-scroll-list": "0.2.1",
     "vuedraggable": "4.1.0",
@@ -141,12 +123,13 @@
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-virtual-modules": "0.6.2",
     "worker-loader": "3.0.8",
+    "xmlbuilder2": "4.0.1",
+    "xterm": "5.2.1",
     "xterm-addon-canvas": "0.5.0",
     "xterm-addon-fit": "0.8.0",
     "xterm-addon-search": "0.13.0",
     "xterm-addon-web-links": "0.9.0",
     "xterm-addon-webgl": "0.16.0",
-    "xterm": "5.2.1",
     "yarn": "1.22.22"
   },
   "resolutions": {

package/pages/__tests__/readme.test.ts

@@ -0,0 +1,49 @@
+import Readme from '@shell/pages/readme.vue';
+
+describe('page: Readme', () => {
+  describe('computed', () => {
+    it('showAppReadme defaults to false', () => {
+      const thisContext = { $route: { query: {} } };
+
+      const result = (Readme.computed!.showAppReadme as () => boolean).call(thisContext);
+
+      expect(result).toBe(false);
+    });
+
+    it('hideReadmeFirstTitle defaults to false', () => {
+      const thisContext = { $route: { query: {} } };
+
+      const result = (Readme.computed!.hideReadmeFirstTitle as () => boolean).call(thisContext);
+
+      expect(result).toBe(false);
+    });
+
+    it('parses showAppReadme and hideReadmeFirstTitle from query', () => {
+      const thisContext = {
+        $route: {
+          query: {
+            showAppReadme:        'true',
+            hideReadmeFirstTitle: 'true',
+          }
+        }
+      };
+
+      const showAppReadme = (Readme.computed!.showAppReadme as () => boolean).call(thisContext);
+      const hideReadmeFirstTitle = (Readme.computed!.hideReadmeFirstTitle as () => boolean).call(thisContext);
+
+      expect(showAppReadme).toBe(true);
+      expect(hideReadmeFirstTitle).toBe(true);
+    });
+  });
+
+  describe('fetch', () => {
+    it('calls fetchChart', async() => {
+      const fetchChart = jest.fn();
+      const thisContext = { fetchChart };
+
+      await (Readme.fetch as () => Promise<void>).call(thisContext);
+
+      expect(fetchChart).toHaveBeenCalledWith();
+    });
+  });
+});

package/pages/auth/setup.vue

@@ -17,8 +17,7 @@ import BrandImage from '@shell/components/BrandImage';
 import { waitFor } from '@shell/utils/async';
 import { Banner } from '@components/Banner';
 import FormValidation from '@shell/mixins/form-validation';
-import isUrl from 'is-url';
-import { isLocalhost } from '@shell/utils/validators/setting';
+import { isLocalhost, isValidUrl } from '@shell/utils/validators/setting';
 import Loading from '@shell/components/Loading';
 import { getBrandMeta } from '@shell/utils/brand';
 
@@ -171,7 +170,7 @@ export default {
         }
       }
 
-      if (!isUrl(this.serverUrl) || this.fvGetPathErrors(['serverUrl']).length > 0) {
+      if (!isValidUrl(this.serverUrl) || this.fvGetPathErrors(['serverUrl']).length > 0) {
         return false;
       }
 

package/pages/c/_cluster/apps/charts/__tests__/chart.test.ts

@@ -1,4 +1,8 @@
 import Chart from '@shell/pages/c/_cluster/apps/charts/chart.vue';
+import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
+import {
+  CHART, REPO, REPO_TYPE, VERSION, DEPRECATED
+} from '@shell/config/query-params';
 
 jest.mock('clipboard-polyfill', () => ({ writeText: () => {} }));
 
@@ -132,4 +136,265 @@ describe('page: Chart Detail', () => {
       });
     });
   });
+
+  describe('methods: computeSelectedAppStatuses', () => {
+    const defaultStatuses = [
+      {
+        icon: 'icon-alert-alt', color: 'error', tooltip: { key: 'generic.deprecated' }
+      },
+      {
+        icon: 'icon-upgrade-alt', color: 'info', tooltip: { key: 'generic.upgradeable' }
+      },
+      {
+        icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: 'generic.installed (1.0.0)' }
+      }
+    ];
+
+    it('returns only deprecated status when no app is selected', () => {
+      const thisContext = {
+        selectedInstalledApp: null,
+        t:                    (key: string) => key
+      };
+
+      const result = (Chart.methods!.computeSelectedAppStatuses as (statuses: any[]) => any[]).call(thisContext, defaultStatuses);
+
+      expect(result).toHaveLength(1);
+      expect(result[0].icon).toBe('icon-alert-alt');
+    });
+
+    it('returns empty array when no app is selected and chart is not deprecated', () => {
+      const thisContext = {
+        selectedInstalledApp: null,
+        t:                    (key: string) => key
+      };
+
+      const statusesWithoutDeprecated = [
+        {
+          icon: 'icon-upgrade-alt', color: 'info', tooltip: { key: 'generic.upgradeable' }
+        },
+        {
+          icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: 'generic.installed (1.0.0)' }
+        }
+      ];
+
+      const result = (Chart.methods!.computeSelectedAppStatuses as (statuses: any[]) => any[]).call(thisContext, statusesWithoutDeprecated);
+
+      expect(result).toHaveLength(0);
+    });
+
+    it('returns installed status with version for selected app', () => {
+      const thisContext = {
+        selectedInstalledApp: {
+          upgradeAvailable: APP_UPGRADE_STATUS.NO_UPGRADE,
+          spec:             { chart: { metadata: { version: '2.0.0' } } }
+        },
+        t: (key: string) => key
+      };
+
+      const result = (Chart.methods!.computeSelectedAppStatuses as (statuses: any[]) => any[]).call(thisContext, defaultStatuses);
+
+      const installedStatus = result.find((s: any) => s.icon === 'icon-confirmation-alt');
+
+      expect(installedStatus).toBeDefined();
+      expect(installedStatus.tooltip.text).toContain('2.0.0');
+    });
+
+    it('returns upgradeable status when selected app is upgradeable', () => {
+      const thisContext = {
+        selectedInstalledApp: {
+          upgradeAvailable: APP_UPGRADE_STATUS.SINGLE_UPGRADE,
+          spec:             { chart: { metadata: { version: '1.5.0' } } }
+        },
+        t: (key: string) => key
+      };
+
+      const result = (Chart.methods!.computeSelectedAppStatuses as (statuses: any[]) => any[]).call(thisContext, defaultStatuses);
+
+      const upgradeableStatus = result.find((s: any) => s.icon === 'icon-upgrade-alt');
+
+      expect(upgradeableStatus).toBeDefined();
+    });
+
+    it('does not include upgradeable status when selected app is not upgradeable', () => {
+      const thisContext = {
+        selectedInstalledApp: {
+          upgradeAvailable: APP_UPGRADE_STATUS.NO_UPGRADE,
+          spec:             { chart: { metadata: { version: '1.5.0' } } }
+        },
+        t: (key: string) => key
+      };
+
+      const result = (Chart.methods!.computeSelectedAppStatuses as (statuses: any[]) => any[]).call(thisContext, defaultStatuses);
+
+      const upgradeableStatus = result.find((s: any) => s.icon === 'icon-upgrade-alt');
+
+      expect(upgradeableStatus).toBeUndefined();
+    });
+
+    it('includes all relevant statuses: deprecated, upgradeable, and installed', () => {
+      const thisContext = {
+        selectedInstalledApp: {
+          upgradeAvailable: APP_UPGRADE_STATUS.SINGLE_UPGRADE,
+          spec:             { chart: { metadata: { version: '1.5.0' } } }
+        },
+        t: (key: string) => key
+      };
+
+      const result = (Chart.methods!.computeSelectedAppStatuses as (statuses: any[]) => any[]).call(thisContext, defaultStatuses);
+
+      expect(result).toHaveLength(3);
+
+      const hasDeprecated = result.some((s: any) => s.icon === 'icon-alert-alt');
+      const hasUpgradeable = result.some((s: any) => s.icon === 'icon-upgrade-alt');
+      const hasInstalled = result.some((s: any) => s.icon === 'icon-confirmation-alt');
+
+      expect(hasDeprecated).toBe(true);
+      expect(hasUpgradeable).toBe(true);
+      expect(hasInstalled).toBe(true);
+    });
+  });
+
+  describe('computed: installedAppOptions', () => {
+    const makeApp = (namespace: string, name: string, upgradeStatus: string) => ({
+      id:               `${ namespace }/${ name }`,
+      metadata:         { namespace, name },
+      upgradeAvailable: upgradeStatus
+    });
+
+    it('returns empty array when no installed instances', () => {
+      const thisContext = {
+        installedInstances: [],
+        t:                  (key: string) => key
+      };
+
+      const result = (Chart.computed!.installedAppOptions as () => any[]).call(thisContext);
+
+      expect(result).toStrictEqual([]);
+    });
+
+    it('returns options without upgradeable suffix for non-upgradeable apps', () => {
+      const thisContext = {
+        installedInstances: [
+          makeApp('default', 'my-app', APP_UPGRADE_STATUS.NO_UPGRADE)
+        ],
+        t: (key: string) => key
+      };
+
+      const result = (Chart.computed!.installedAppOptions as () => any[]).call(thisContext);
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toStrictEqual({
+        value: 'default/my-app',
+        label: 'default/my-app'
+      });
+    });
+
+    it('adds upgradeable suffix for apps with available upgrade', () => {
+      const thisContext = {
+        installedInstances: [
+          makeApp('cattle-system', 'rancher-app', APP_UPGRADE_STATUS.SINGLE_UPGRADE)
+        ],
+        t: (key: string) => key
+      };
+
+      const result = (Chart.computed!.installedAppOptions as () => any[]).call(thisContext);
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toStrictEqual({
+        value: 'cattle-system/rancher-app',
+        label: 'cattle-system/rancher-app (generic.upgradeable)'
+      });
+    });
+
+    it('correctly labels mixed upgradeable and non-upgradeable apps', () => {
+      const thisContext = {
+        installedInstances: [
+          makeApp('default', 'app-one', APP_UPGRADE_STATUS.NO_UPGRADE),
+          makeApp('kube-system', 'app-two', APP_UPGRADE_STATUS.SINGLE_UPGRADE),
+          makeApp('monitoring', 'app-three', APP_UPGRADE_STATUS.NOT_APPLICABLE)
+        ],
+        t: (key: string) => key
+      };
+
+      const result = (Chart.computed!.installedAppOptions as () => any[]).call(thisContext);
+
+      expect(result).toHaveLength(3);
+      expect(result[0].label).toBe('default/app-one');
+      expect(result[1].label).toBe('kube-system/app-two (generic.upgradeable)');
+      expect(result[2].label).toBe('monitoring/app-three');
+    });
+  });
+
+  describe('methods: openReadme', () => {
+    it('opens standalone readme URL with chart context and without theme query', () => {
+      const openSpy = jest.spyOn(window, 'open').mockImplementation(() => null);
+      const resolve = jest.fn(() => ({ href: '/c/local/readme?x=y' }));
+      const thisContext = {
+        $router: { resolve },
+        $route:  { params: { cluster: 'local' } },
+        query:   {
+          repoType:    'cluster',
+          repoName:    'rancher-charts',
+          chartName:   'test-chart',
+          versionName: '',
+          deprecated:  'false',
+        },
+        targetVersion: '1.2.3'
+      };
+
+      (Chart.methods!.openReadme as () => void).call(thisContext);
+
+      expect(resolve).toHaveBeenCalledWith({
+        name:   'readme',
+        params: { cluster: 'local' },
+        query:  {
+          [REPO_TYPE]:          'cluster',
+          [REPO]:               'rancher-charts',
+          [CHART]:              'test-chart',
+          [VERSION]:            '1.2.3',
+          [DEPRECATED]:         'false',
+          showAppReadme:        'false',
+          hideReadmeFirstTitle: 'false',
+        }
+      });
+      expect(openSpy).toHaveBeenCalledWith('/c/local/readme?x=y', '_blank');
+      openSpy.mockRestore();
+    });
+  });
+
+  describe('methods: installNewInstance', () => {
+    it('should navigate to install page with correct query parameters', () => {
+      const mockRouterPush = jest.fn();
+      const thisContext = {
+        $router: { push: mockRouterPush },
+        $route:  { params: { cluster: 'local' } },
+        $store:  { getters: { productId: 'explorer' } },
+        query:   {
+          repoType:    'cluster',
+          repoName:    'rancher-charts',
+          chartName:   'my-chart',
+          versionName: '1.2.3',
+          deprecated:  'false'
+        }
+      };
+
+      (Chart.methods!.installNewInstance as () => void).call(thisContext);
+
+      expect(mockRouterPush).toHaveBeenCalledWith({
+        name:   'c-cluster-apps-charts-install',
+        params: {
+          cluster: 'local',
+          product: 'explorer',
+        },
+        query: {
+          'repo-type':    'cluster',
+          repo:           'rancher-charts',
+          chart:          'my-chart',
+          version:        '1.2.3',
+          deprecated:     'false',
+          'new-instance': null
+        }
+      });
+    });
+  });
 });

package/pages/c/_cluster/apps/charts/__tests__/index.test.ts

@@ -0,0 +1,55 @@
+import Charts from '@shell/pages/c/_cluster/apps/charts/index.vue';
+import { UI_PLUGIN_ANNOTATION } from '@shell/config/uiplugins';
+
+describe('page: Charts Index', () => {
+  describe('computed: tagOptions', () => {
+    it('should gather tags exclusively from enabledCharts, omitting tags from hidden or extension charts present in allCharts (e.g., primeOnly)', () => {
+      const thisContext = {
+        // allCharts contains a UI plugin/extension chart with the 'primeOnly' tag.
+        allCharts: [
+          { tags: ['appTag1'] },
+          { tags: ['primeOnly'], annotations: { [UI_PLUGIN_ANNOTATION.NAME]: UI_PLUGIN_ANNOTATION.VALUE } },
+        ],
+        // enabledCharts has already filtered out the extension chart.
+        enabledCharts: [
+          { tags: ['appTag1'] },
+        ]
+      };
+
+      const result = (Charts.computed!.tagOptions as () => any[]).call(thisContext);
+
+      expect(result).toStrictEqual([
+        { value: 'apptag1', label: 'appTag1' },
+      ]);
+
+      const hasPrimeOnly = result.some((tag) => tag.value === 'primeonly');
+
+      expect(hasPrimeOnly).toBe(false);
+    });
+  });
+
+  describe('computed: categoryOptions', () => {
+    it('should gather categories exclusively from enabledCharts, omitting categories from hidden or extension charts present in allCharts', () => {
+      const thisContext = {
+        allCharts: [
+          { categories: ['category1'] },
+          { categories: ['categoryFromExtension1'], annotations: { [UI_PLUGIN_ANNOTATION.NAME]: UI_PLUGIN_ANNOTATION.VALUE } },
+        ],
+        enabledCharts: [
+          { categories: ['category1'] },
+        ],
+        $store: { getters: { 'i18n/withFallback': (key: string, fallback: any, c: string) => c } }
+      };
+
+      const result = (Charts.computed!.categoryOptions as () => any[]).call(thisContext);
+
+      expect(result).toStrictEqual([
+        { value: 'category1', label: 'category1' },
+      ]);
+
+      const hasExtensionCategory = result.some((cat) => cat.value === 'categoryFromExtension1');
+
+      expect(hasExtensionCategory).toBe(false);
+    });
+  });
+});

package/pages/c/_cluster/apps/charts/__tests__/install.test.ts

@@ -91,4 +91,57 @@ describe('page: Install', () => {
     expect(wrapper.vm.forceNamespace).toBe('custom-ns');
     expect(wrapper.vm.value.metadata.name).toBe('custom-name');
   });
+
+  describe('cancel()', () => {
+    it('should route to appLocation if chart is not defined and specific query flags are absent', () => {
+      const mockReplace = jest.fn();
+      const expectedLocation = { name: 'app-location' };
+
+      const wrapper = mount(Install, {
+        global: {
+          mocks: {
+            $store: {
+              getters: {
+                'i18n/t':     (key: string) => key,
+                'cluster/id': 'cluster-id',
+              }
+            },
+            $route:      { query: {} },
+            $router:     { replace: mockReplace },
+            $fetchState: { pending: false },
+          },
+          stubs: {
+            Loading:             true,
+            Wizard:              true,
+            Banner:              true,
+            Checkbox:            true,
+            LabeledInput:        true,
+            LabeledSelect:       true,
+            NameNsDescription:   true,
+            Tabbed:              true,
+            Questions:           true,
+            YamlEditor:          true,
+            ResourceCancelModal: true,
+            UnitInput:           true,
+            TypeDescription:     true,
+            LazyImage:           true,
+            ChartReadme:         true,
+            ButtonGroup:         true,
+          }
+        },
+        data() {
+          return {
+            existing: false,
+            chart:    null,
+          };
+        }
+      });
+
+      jest.spyOn((wrapper.vm as any), 'appLocation').mockReturnValue(expectedLocation);
+
+      (wrapper.vm as any).cancel();
+
+      expect(mockReplace).toHaveBeenCalledWith(expectedLocation);
+    });
+  });
 });