@rancher/shell 0.3.26 → 0.3.28

package/utils/validators/setting.js

@@ -1,13 +1,9 @@
-const httpsKeys = [
-  'server-url'
-];
+import isUrl from 'is-url';
 
-export function isHttps(value, getters, errors, validatorArgs, displayKey) {
-  const key = validatorArgs[0];
+export const isServerUrl = (value) => value === 'server-url';
 
-  if (httpsKeys.includes(key) && !value.toLowerCase().startsWith('https://')) {
-    errors.push(getters['i18n/t']('validation.setting.serverUrl.https'));
-  }
+export const isHttps = (value) => value.toLowerCase().startsWith('https://');
 
-  return errors;
-}
+export const isLocalhost = (value) => (/^(?:https?:\/\/)?(?:localhost|127\.0\.0\.1)/i).test(value);
+
+export const hasTrailingForwardSlash = (value) => isUrl(value) && value?.toLowerCase().endsWith('/');

package/utils/version.js

@@ -125,16 +125,3 @@ export async function markReadReleaseNotes(store) {
     await store.dispatch('prefs/set', { key: READ_WHATS_NEW, value: getVersionInfo(store).fullVersion });
   }
 }
-
-export function generateSupportLink(version) {
-  const defaultSupportURL = 'https://rancher.com/support-maintenance-terms';
-
-  if (!version || isDevBuild(version)) {
-    return defaultSupportURL;
-  }
-
-  const baseUrl = 'https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-';
-  const formattedVersion = version.split('.').join('-');
-
-  return baseUrl + formattedVersion;
-}

package/components/ChartPsp.vue

@@ -1,76 +0,0 @@
-<script>
-import { Checkbox } from '@components/Form/Checkbox';
-import { mapGetters } from 'vuex';
-
-export default {
-  components: { Checkbox },
-  props:      {
-    value: {
-      type:    Object,
-      default: () => {
-        return {};
-      }
-    },
-    mode: {
-      type:    String,
-      default: 'edit'
-    },
-
-    /**
-     * Optional title section prior checkbox
-     */
-    title: {
-      type:    String,
-      default: null
-    },
-
-    /**
-     * Cluster information
-     */
-    cluster: {
-      type:    Object,
-      default: null
-    }
-  },
-  created() {
-    if (!this.value.global.cattle) {
-      this.$set(this.value.global, 'cattle', { psp: { enabled: false } });
-    }
-    if (!this.value.global.cattle.psp) {
-      this.$set(this.value.global.cattle, 'psp', { enabled: false });
-    }
-  },
-  computed: {
-    ...mapGetters({ t: 'i18n/t' }),
-
-    /**
-     * Display checkbox only if contains PSP or K8S version is less than 1.25
-     */
-    hasCheckbox() {
-      const clusterVersion = this.cluster?.kubernetesVersion || '';
-      const version = clusterVersion.match(/\d+/g);
-      const isRequiredVersion = version?.length ? +version[0] === 1 && +version[1] < 25 : false;
-
-      return isRequiredVersion;
-    }
-  }
-};
-</script>
-
-<template>
-  <div
-    v-if="hasCheckbox"
-    class="mt-10 mb-10"
-  >
-    <h3 v-if="title">
-      {{ title }}
-    </h3>
-
-    <Checkbox
-      v-model="value.global.cattle.psp.enabled"
-      data-testid="psp-checkbox"
-      :mode="mode"
-      :label="t('catalog.chart.enablePSP')"
-    />
-  </div>
-</template>

package/components/__tests__/ChartPsp.test.ts

@@ -1,75 +0,0 @@
-import { shallowMount, mount } from '@vue/test-utils';
-import ChartPsp from '@shell/components/ChartPsp.vue';
-
-describe('component: ChartPsp', () => {
-  it.each([
-    true, false
-  ])('should render checkbox referencing value.global.cattle.psp.enabled as %p', (value) => {
-    const version = 'v1.24.11+rke2r1';
-    const wrapper = shallowMount(ChartPsp, {
-      propsData: {
-        value:   { global: { cattle: { psp: { enabled: value } } } },
-        cluster: { kubernetesVersion: version }
-      }
-    });
-
-    expect(wrapper.findComponent({ name: 'Checkbox' }).props().value).toBe(value);
-  });
-
-  it.each([
-    ['v1.24.11+rke2r1'],
-  ])('should display the checkbox for cluster with k8s version %p', (version) => {
-    const wrapper = shallowMount(ChartPsp, {
-      propsData: {
-        value:   { global: { cattle: { psp: { enabled: false } } } },
-        cluster: { kubernetesVersion: version }
-      }
-    });
-
-    const input = wrapper.find(`[data-testid="psp-checkbox"]`).element as HTMLInputElement;
-
-    expect(input).toBeDefined();
-  });
-
-  it.each([
-    ['v1.25.11+rke2r1'],
-  ])('should not display the checkbox for cluster with k8s version %p', (version) => {
-    const wrapper = shallowMount(ChartPsp, {
-      propsData: {
-        value:   { global: { cattle: { psp: { enabled: false } } } },
-        cluster: { kubernetesVersion: version }
-      }
-    });
-
-    const input = wrapper.find(`[data-testid="psp-checkbox"]`).element as HTMLInputElement;
-
-    expect(input).toBeUndefined();
-  });
-
-  it('should update value.global.cattle.psp.enabled when checkbox is toggled', async() => {
-    const chartValues = { global: {} } as any;
-    const version = 'v1.24.11+rke2r1';
-    const wrapper = mount(ChartPsp, {
-      propsData: {
-        value:   chartValues,
-        cluster: { kubernetesVersion: version }
-      }
-    });
-
-    await wrapper.find('.checkbox-container').trigger('click');
-
-    expect(chartValues.global.cattle.psp.enabled).toBe(true);
-
-    await wrapper.find('.checkbox-container').trigger('click');
-    expect(chartValues.global.cattle.psp.enabled).toBe(false);
-  });
-
-  it.each([
-    { global: {} } as any,
-    { global: { cattle: {} } } as any,
-  ])('should define cattle.psp.enabled and set to false', (chartValues) => {
-    shallowMount(ChartPsp, { propsData: { value: chartValues } });
-
-    expect(chartValues.global.cattle.psp.enabled).toBe(false);
-  });
-});

package/components/formatter/__tests__/ClusterProvider.test.ts

@@ -1,28 +0,0 @@
-import { mount } from '@vue/test-utils';
-import ClusterProvider from '@shell/components/formatter/ClusterProvider.vue';
-
-describe('component: ClusterProvider', () => {
-  const importedGkeClusterInfo = { mgmt: { spec: { gkeConfig: { imported: true } } } };
-  const importedAksClusterInfo = { mgmt: { spec: { aksConfig: { imported: true } } } };
-  const importedEksClusterInfo = { mgmt: { spec: { eksConfig: { imported: true } } } };
-  const notImportedGkeClusterInfo = { mgmt: { spec: { gkeConfig: { imported: false } } } };
-  const importedClusterInfoWithProviderForEmberParam = { mgmt: { providerForEmberParam: 'import' } };
-
-  describe('isImported', () => {
-    const testCases = [
-      [importedGkeClusterInfo, true],
-      [importedAksClusterInfo, true],
-      [importedEksClusterInfo, true],
-      [notImportedGkeClusterInfo, false],
-      [importedClusterInfoWithProviderForEmberParam, true],
-      [{}, false],
-    ];
-
-    it.each(testCases)('should return the isImported value properly based on the props data', (row, expected) => {
-      const wrapper = mount(ClusterProvider, { propsData: { row } });
-
-      expect(wrapper.vm.$data.isImported).toBe(expected);
-    }
-    );
-  });
-});

package/rancher-components/Card/Card.test.ts

@@ -1,37 +0,0 @@
-import { mount } from '@vue/test-utils';
-import { Card } from './index';
-
-describe('component: Card', () => {
-  const title = 'Card title';
-  const body = 'Card body';
-
-  it('should have a card title', () => {
-    const wrapper = mount(Card, {
-      propsData: { title },
-      slots:     { title: '<div>Card title</div>' }
-    });
-
-    const element = wrapper.find('[data-testid="card-title-slot"]');
-
-    expect(element.exists()).toBe(true);
-    expect(element.text()).toBe(title);
-  });
-
-  it('should have a card body', () => {
-    const wrapper = mount(Card, {
-      propsData: { body },
-      slots:     { body: '<div>Card body</div>' }
-    });
-    const element = wrapper.find('[data-testid="card-body-slot"]');
-
-    expect(element.exists()).toBe(true);
-    expect(element.text()).toBe(body);
-  });
-
-  it('should display the default card actions', () => {
-    const wrapper = mount(Card);
-    const element = wrapper.find('[data-testid="card-actions-slot"]');
-
-    expect(element.exists()).toBe(true);
-  });
-});

package/rancher-components/Form/Radio/RadioButton.test.ts

@@ -1,31 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import { RadioButton } from './index';
-import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
-
-describe('radioButton.vue', () => {
-  it('renders label slot contents', () => {
-    const wrapper = shallowMount(RadioButton, { slots: { label: 'Test Label' } });
-
-    expect(wrapper.find('.radio-label').text()).toBe('Test Label');
-  });
-
-  it('renders label prop contents', () => {
-    const wrapper = shallowMount(
-      RadioButton,
-      {
-        directives: { cleanHtmlDirective },
-        propsData:  { label: 'Test Label' }
-      });
-
-    expect(wrapper.find('.radio-label').text()).toBe('Test Label');
-  });
-
-  it('renders slot contents when both slot and label prop are provided', () => {
-    const wrapper = shallowMount(RadioButton, {
-      slots:     { label: 'Test Label - Slot' },
-      propsData: { label: 'Test Label - Props' },
-    });
-
-    expect(wrapper.find('.radio-label').text()).toBe('Test Label - Slot');
-  });
-});

package/yarn-error.log

@@ -1,200 +0,0 @@
-Arguments: 
-  /Users/aalves/.nvm/versions/node/v16.19.1/bin/node /Users/aalves/.nvm/versions/node/v16.19.1/bin/yarn publish . --new-version 0.3.22 --no-git-tag-version --access public
-
-PATH: 
-  /Users/aalves/.rd/bin:/Users/aalves/.nvm/versions/node/v16.19.1/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/aalves/.rd/bin:/Users/aalves/.nvm/versions/node/v16.19.1/bin:/opt/homebrew/bin:/opt/homebrew/sbin
-
-Yarn version: 
-  1.22.19
-
-Node version: 
-  16.19.1
-
-Platform: 
-  darwin arm64
-
-Trace: 
-  Error: https://registry.yarnpkg.com/-/user/org.couchdb.user:aalves08: failed to authenticate: Could not authenticate aalves08: bad password
-      at Request.params.callback [as _callback] (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:66145:18)
-      at Request.self.callback (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:140890:22)
-      at Request.emit (node:events:513:28)
-      at Request.<anonymous> (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:141862:10)
-      at Request.emit (node:events:513:28)
-      at IncomingMessage.<anonymous> (/Users/aalves/.nvm/versions/node/v16.19.1/lib/node_modules/yarn/lib/cli.js:141784:12)
-      at Object.onceWrapper (node:events:627:28)
-      at IncomingMessage.emit (node:events:525:35)
-      at endReadableNT (node:internal/streams/readable:1358:12)
-      at processTicksAndRejections (node:internal/process/task_queues:83:21)
-
-npm manifest: 
-  {
-    "name": "@rancher/shell",
-    "version": "0.3.22",
-    "description": "Rancher Dashboard Shell",
-    "repository": "https://github.com/rancherlabs/dashboard",
-    "license": "Apache-2.0",
-    "author": "SUSE",
-    "private": false,
-    "engines": {
-      "node": ">=12"
-    },
-    "files": [
-      "**/*"
-    ],
-    "scripts": {
-      "clean": "./scripts/clean",
-      "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .ts,.js,.vue .",
-      "test": "./node_modules/.bin/nyc ava --serial --verbose",
-      "dev": "./node_modules/.bin/vue-cli-service dev",
-      "docker-dev": "docker run --rm --name dashboard-dev -p 8005:8005 -e API=$API -v $(pwd):/src -v dashboard_node:/src/node_modules rancher/dashboard: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"
-    },
-    "dependencies": {
-      "@aws-sdk/client-ec2": "3.1.0",
-      "@aws-sdk/client-eks": "3.1.0",
-      "@aws-sdk/client-kms": "3.8.1",
-      "@babel/plugin-proposal-optional-chaining": "7.14.5",
-      "@babel/plugin-proposal-private-property-in-object": "7.14.5",
-      "@babel/preset-typescript": "7.16.7",
-      "@innologica/vue-dropdown-menu": "0.1.3",
-      "@novnc/novnc": "1.2.0",
-      "@nuxt/types": "2.14.6",
-      "@nuxt/typescript-build": "2.1.0",
-      "@nuxtjs/axios": "5.12.0",
-      "@nuxtjs/eslint-config-typescript": "6.0.1",
-      "@nuxtjs/webpack-profile": "0.1.0",
-      "@popperjs/core": "2.4.4",
-      "@types/node": "16.4.3",
-      "@typescript-eslint/eslint-plugin": "4.33.0",
-      "@typescript-eslint/parser": "4.33.0",
-      "@vue/cli-plugin-babel": "4.5.18",
-      "@vue/cli-plugin-typescript": "4.5.18",
-      "@vue/cli-service": "4.5.18",
-      "@vue/test-utils": "1.2.1",
-      "@vue/vue2-jest": "27.0.0",
-      "add": "2.0.6",
-      "ansi_up": "5.0.0",
-      "babel-eslint": "10.1.0",
-      "babel-plugin-module-resolver": "4.0.0",
-      "babel-preset-vue": "2.0.2",
-      "browser-env": "3.3.0",
-      "cookie": "0.5.0",
-      "cookie-universal-nuxt": "2.1.4",
-      "core-js": "3.21.1",
-      "cron-validator": "1.2.0",
-      "cronstrue": "1.95.0",
-      "cross-env": "6.0.3",
-      "css-loader": "6.7.3",
-      "csv-loader": "3.0.3",
-      "cypress": "10.3.1",
-      "d3": "7.3.0",
-      "d3-selection": "1.4.1",
-      "dagre-d3": "0.6.4",
-      "dayjs": "1.8.29",
-      "diff2html": "3.4.24",
-      "dompurify": "2.4.5",
-      "eslint": "7.32.0",
-      "eslint-config-standard": "16.0.3",
-      "eslint-import-resolver-node": "0.3.4",
-      "eslint-module-utils": "2.6.1",
-      "eslint-plugin-cypress": "2.12.1",
-      "eslint-plugin-import": "2.23.4",
-      "eslint-plugin-jest": "24.4.0",
-      "eslint-plugin-n": "15.2.0",
-      "eslint-plugin-vue": "9.10.0",
-      "event-target-shim": "5.0.1",
-      "express": "4.17.1",
-      "file-saver": "2.0.2",
-      "frontmatter-markdown-loader": "3.7.0",
-      "identicon.js": "2.3.3",
-      "intl-messageformat": "7.8.4",
-      "is-url": "1.2.4",
-      "jest": "27.5.1",
-      "jest-serializer-vue": "2.0.2",
-      "jexl": "2.2.2",
-      "jquery": "3.5.1",
-      "js-cookie": "2.2.1",
-      "js-yaml": "4.1.0",
-      "js-yaml-loader": "1.2.2",
-      "jsdiff": "1.1.1",
-      "jsdom-global": "3.0.2",
-      "jsonpath-plus": "6.0.1",
-      "jsrsasign": "10.5.25",
-      "jszip": "3.8.0",
-      "lodash": "4.17.21",
-      "marked": "4.0.17",
-      "nodemon": "2.0.22",
-      "nuxt": "2.15.8",
-      "nyc": "15.1.0",
-      "papaparse": "5.3.0",
-      "portal-vue": "2.1.7",
-      "rancher-icons": "rancher/icons#v2.0.16",
-      "require-extension-hooks": "0.3.3",
-      "require-extension-hooks-babel": "1.0.0",
-      "require-extension-hooks-vue": "3.0.0",
-      "sass": "1.51.0",
-      "sass-loader": "10.2.1",
-      "serve-static": "1.14.1",
-      "set-cookie-parser": "2.4.6",
-      "shell-quote": "1.7.3",
-      "sinon": "8.1.1",
-      "start-server-and-test": "1.13.1",
-      "style-loader": "1.2.1",
-      "ts-node": "8.10.2",
-      "typescript": "4.1.6",
-      "url-parse": "1.5.10",
-      "v-tooltip": "2.0.3",
-      "vue": "2.7.14",
-      "vue-clipboard2": "0.3.1",
-      "vue-codemirror": "4.0.6",
-      "vue-js-modal": "1.3.35",
-      "vue-resize": "0.4.5",
-      "vue-select": "3.18.3",
-      "vue-server-renderer": "2.7.14",
-      "vue-shortkey": "3.1.7",
-      "vue-template-compiler": "2.7.14",
-      "vue-virtual-scroll-list": "^2.3.4",
-      "vue2-transitions": "0.3.0",
-      "vuedraggable": "2.24.3",
-      "vuex": "3.6.2",
-      "webpack-bundle-analyzer": "4.5.0",
-      "webpack-virtual-modules": "0.4.3",
-      "xterm": "5.0.0",
-      "xterm-addon-fit": "0.6.0",
-      "xterm-addon-search": "0.10.0",
-      "xterm-addon-web-links": "0.7.0",
-      "xterm-addon-webgl": "0.13.0",
-      "worker-loader": "3.0.8",
-      "yarn": "1.22.18"
-    },
-    "resolutions": {
-      "ejs": "^3.1.7",
-      "json5": ">=2.2.2",
-      "d3-color": ">=3.1.0",
-      "glob-parent": ">=5.1.2",
-      "node-forge": ">=1.3.0",
-      "qs": ">=6.7.3",
-      "nth-check": ">=2.0.1",
-      "follow-redirects": ">=1.14.7",
-      "merge": ">=2.1.1"
-    },
-    "nyc": {
-      "extension": [
-        ".js",
-        ".vue"
-      ]
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile