@rancher/shell 0.3.23 → 0.3.25

package/utils/__tests__/sort.test.ts

@@ -0,0 +1,61 @@
+import { sortBy } from '@shell/utils/sort';
+
+describe('fx: sort', () => {
+  describe('sortBy', () => {
+    const testSortBy = <T = object[]>(ary: T[], key: string[], expected: T[], desc?: boolean) => {
+      const result = sortBy(ary, key, desc);
+
+      expect(result).toStrictEqual(expected);
+    };
+
+    it.each([
+      [[{ a: 1 }, { a: 9 }], ['a'], [{ a: 1 }, { a: 9 }]],
+      [[{ a: 2 }, { a: 1 }], ['a'], [{ a: 1 }, { a: 2 }]],
+    ])('should sort by single property', (ary, key, expected) => {
+      testSortBy(ary, key, expected);
+    });
+
+    it.each([
+      [[{ a: 1, b: 1 }, { a: 9, b: 9 }], ['a', 'b'], [{ a: 1, b: 1 }, { a: 9, b: 9 }]],
+      [[{ a: 2, b: 2 }, { a: 1, b: 1 }], ['a', 'b'], [{ a: 1, b: 1 }, { a: 2, b: 2 }]],
+      [[{ a: 2, b: 1 }, { a: 1, b: 9 }], ['a', 'b'], [{ a: 1, b: 9 }, { a: 2, b: 1 }]],
+      [[{ a: 1, b: 2 }, { a: 9, b: 1 }], ['a', 'b'], [{ a: 1, b: 2 }, { a: 9, b: 1 }]],
+      [[{ a: 1, b: 1 }, { a: 9, b: 9 }], ['a', 'b'], [{ a: 1, b: 1 }, { a: 9, b: 9 }]],
+    ])('should sort by two properties (primary property always first)', (ary, key, expected) => {
+      testSortBy(ary, key, expected);
+    });
+
+    it.each([
+      [[{ a: 1, b: 1 }, { a: 1, b: 9 }], ['a', 'b'], [{ a: 1, b: 1 }, { a: 1, b: 9 }]],
+      [[{ a: 1, b: 2 }, { a: 1, b: 1 }], ['a', 'b'], [{ a: 1, b: 1 }, { a: 1, b: 2 }]],
+    ])('should sort by two properties (primary property the same)', (ary, key, expected) => {
+      testSortBy(ary, key, expected);
+    });
+
+    describe('descending', () => {
+      it.each([
+        [[{ a: 1 }, { a: 9 }], ['a'], [{ a: 9 }, { a: 1 }]],
+        [[{ a: 2 }, { a: 1 }], ['a'], [{ a: 2 }, { a: 1 }]],
+      ])('should sort by single property', (ary, key, expected) => {
+        testSortBy(ary, key, expected, true);
+      });
+
+      it.each([
+        [[{ a: 1, b: 1 }, { a: 9, b: 9 }], ['a', 'b'], [{ a: 9, b: 9 }, { a: 1, b: 1 }]],
+        [[{ a: 2, b: 2 }, { a: 1, b: 1 }], ['a', 'b'], [{ a: 2, b: 2 }, { a: 1, b: 1 }]],
+        [[{ a: 2, b: 1 }, { a: 1, b: 9 }], ['a', 'b'], [{ a: 2, b: 1 }, { a: 1, b: 9 }]],
+        [[{ a: 1, b: 2 }, { a: 9, b: 1 }], ['a', 'b'], [{ a: 9, b: 1 }, { a: 1, b: 2 }]],
+        [[{ a: 1, b: 1 }, { a: 9, b: 9 }], ['a', 'b'], [{ a: 9, b: 9 }, { a: 1, b: 1 }]],
+      ])('should sort by two properties', (ary, key, expected) => {
+        testSortBy(ary, key, expected, true);
+      });
+
+      it.each([
+        [[{ a: 1, b: 1 }, { a: 1, b: 9 }], ['a', 'b'], [{ a: 1, b: 9 }, { a: 1, b: 1 }]],
+        [[{ a: 1, b: 2 }, { a: 1, b: 1 }], ['a', 'b'], [{ a: 1, b: 2 }, { a: 1, b: 1 }]],
+      ])('should sort by two properties (primary property the same)', (ary, key, expected) => {
+        testSortBy(ary, key, expected, true);
+      });
+    });
+  });
+});

package/utils/cluster.js

@@ -8,7 +8,7 @@ export function filterOnlyKubernetesClusters(mgmtClusters, store) {
   const openHarvesterContainerWorkload = store.getters['features/get']('harvester-baremetal-container-workload');
 
   return mgmtClusters.filter((c) => {
-    return openHarvesterContainerWorkload ? true : !c.isHarvester;
+    return openHarvesterContainerWorkload ? true : !isHarvesterCluster(c);
   });
 }
 
@@ -44,3 +44,49 @@ export function filterHiddenLocalCluster(mgmtClusters, store) {
     return !target.isLocal;
   });
 }
+
+const clusterNameSegments = /([A-Za-z]+|\d+)/g;
+
+/**
+ * Shortens an input string based on the number of segments it contains.
+ * @param {string} input - The input string to be shortened.
+ * @returns {string} - The shortened string.
+ * @example smallIdentifier('local') => 'lcl'
+ * @example smallIdentifier('word-wide-web') => 'www'
+ */
+export function abbreviateClusterName(input) {
+  if (!input) {
+    return '';
+  }
+
+  if (input.length <= 3) {
+    return input;
+  }
+
+  const segments = input.match(clusterNameSegments);
+
+  if (!segments) return ''; // In case no valid segments are found
+
+  let result = '';
+
+  switch (segments.length) {
+  case 1: {
+    const word = segments[0];
+
+    result = `${ word[0] }${ word[Math.floor(word.length / 2)] }${ word[word.length - 1] }`;
+    break;
+  }
+  case 2: {
+    const w1 = `${ segments[0][0] }`;
+    const w2 = `${ segments[0].length >= 2 ? segments[0][segments[0].length - 1] : segments[1][0] }`;
+    const w3 = `${ segments[1][segments[1].length - 1] }`;
+
+    result = w1 + w2 + w3;
+    break;
+  }
+  default:
+    result = segments.slice(0, 3).map((segment) => segment[0]).join('');
+  }
+
+  return result;
+}

package/utils/object.js

@@ -91,13 +91,20 @@ export function get(obj, path) {
 
 export function remove(obj, path) {
   const parentAry = splitObjectPath(path);
-  const leafKey = parentAry.pop();
 
-  const parent = get(obj, joinObjectPath(parentAry));
+  // Remove the very last part of the path
 
-  if ( parent ) {
-    Vue.set(parent, leafKey, undefined);
-    delete parent[leafKey];
+  if (parentAry.length === 1) {
+    Vue.set(obj, path, undefined);
+    delete obj[path];
+  } else {
+    const leafKey = parentAry.pop();
+    const parent = get(obj, joinObjectPath(parentAry));
+
+    if ( parent ) {
+      Vue.set(parent, leafKey, undefined);
+      delete parent[leafKey];
+    }
   }
 
   return obj;

package/utils/string.js

@@ -309,3 +309,15 @@ export function isIpv4(ip) {
 
   return reg.test(ip);
 }
+
+export function sanitizeKey(k) {
+  return (k || '').replace(/[^a-z0-9./_-]/ig, '');
+}
+
+export function sanitizeValue(v) {
+  return (v || '').replace(/[^a-z0-9._-]/ig, '');
+}
+
+export function sanitizeIP(v) {
+  return (v || '').replace(/[^a-z0-9.:_-]/ig, '');
+}

package/utils/validators/formRules/__tests__/index.test.ts

@@ -393,6 +393,18 @@ describe('formRules', () => {
     expect(formRuleResult).toStrictEqual(expectedResult);
   });
 
+  it('"roleTemplateRules" : returns correct message when type is RBAC role rule defines both resources and nonResourceURLs', () => {
+    const testValue: [{}] = [
+      {
+        verbs: ['verb1'], resources: ['resource1'], apiGroups: ['apiGroup1'], nonResourceURLs: ['nonResourceUrl1']
+      }
+    ];
+    const formRuleResult = formRules.roleTemplateRules('rbac.authorization.k8s.io.role')(testValue);
+    const expectedResult = JSON.stringify({ message: 'validation.roleTemplate.roleTemplateRules.noResourceAndNonResource' });
+
+    expect(formRuleResult).toStrictEqual(expectedResult);
+  });
+
   it('"roleTemplateRules" : returns correct message when type is RBAC role and value is missing apiGroups', () => {
     const testValue: [{}] = [
       {
@@ -408,7 +420,7 @@ describe('formRules', () => {
   it('"roleTemplateRules" : returns undefined when type is not RBAC role and value contains valid rules', () => {
     const testValue: [{}] = [
       {
-        verbs: ['verb1'], nonResourceURLs: ['nonResourceURL1'], resources: ['resource1'], apiGroups: ['apiGroup1']
+        verbs: ['verb1'], resources: ['resource1'], apiGroups: ['apiGroup1']
       }
     ];
     const formRuleResult = formRules.roleTemplateRules('nonrbactype')(testValue);

package/utils/validators/formRules/index.ts

@@ -370,6 +370,10 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
       return t('validation.roleTemplate.roleTemplateRules.missingVerb');
     }
 
+    if (val.some((rule: any) => rule.resources?.length && rule.nonResourceURLs?.length)) {
+      return t('validation.roleTemplate.roleTemplateRules.noResourceAndNonResource');
+    }
+
     if (type === RBAC.ROLE) {
       if (val.some((rule: any) => isEmpty(rule.resources))) {
         return t('validation.roleTemplate.roleTemplateRules.missingResource');

package/utils/validators/role-template.js

@@ -6,6 +6,10 @@ export function roleTemplateRules(rules = [], getters, errors, validatorArgs = [
     errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingVerb'));
   }
 
+  if (rules.some((rule) => rule.resources?.length && rule.nonResourceURLs?.length)) {
+    errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.noResourceAndNonResource'));
+  }
+
   if (validatorArgs[0] === RBAC.ROLE) {
     if (rules.some((rule) => isEmpty(rule.resources))) {
       errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingResource'));
@@ -13,7 +17,11 @@ export function roleTemplateRules(rules = [], getters, errors, validatorArgs = [
     if (rules.some((rule) => isEmpty(rule.apiGroups))) {
       errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingApiGroup'));
     }
-  } else if (rules.some((rule) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) {
+  } else if (rules.some((rule) => rule.resources?.length && rule.nonResourceUrls?.length)) {
+    errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.noResourceAndNonResource'));
+  }
+
+  if (rules.some((rule) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) {
     errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingOneResource'));
   }
 }

package/utils/version.js

@@ -74,7 +74,7 @@ export function isPrerelease(version) {
 }
 
 export function isDevBuild(version) {
-  if ( ['dev', 'master', 'head'].includes(version) || version.endsWith('-head') || version.match(/-rc\d+$/) ) {
+  if ( ['dev', 'master', 'head'].includes(version) || version.endsWith('-head') || version.match(/-rc\d+$/) || version.match(/-alpha\d+$/) ) {
     return true;
   }
 

package/vue.config.js

@@ -250,10 +250,6 @@ module.exports = function(dir, _appConfig) {
     console.log(`Version: ${ dashboardVersion }`); // eslint-disable-line no-console
   }
 
-  if ( !dev ) {
-    console.log(`Version: ${ dashboardVersion }`); // eslint-disable-line no-console
-  }
-
   if ( resourceBase ) {
     console.log(`Resource Base URL: ${ resourceBase }`); // eslint-disable-line no-console
   }
@@ -410,6 +406,7 @@ module.exports = function(dir, _appConfig) {
           rancherEnv,
           dashboardVersion
         }),
+
       }));
 
       // The static assets need to be in the built assets directory in order to get served (primarily the favicon)

package/yarn-error.log

@@ -0,0 +1,200 @@
+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