@rancher/shell 0.3.24 → 0.3.25

package/types/shell/index.d.ts

@@ -2049,8 +2049,8 @@ declare namespace _default {
     namespace methods {
         function done(): any;
         function done(): any;
-        function conflict(): any;
-        function conflict(): any;
+        function conflict(): Promise<any>;
+        function conflict(): Promise<any>;
         function save(buttonDone: any, url: any, depth?: number): any;
         function save(buttonDone: any, url: any, depth?: number): any;
         function actuallySave(url: any): Promise<void>;
@@ -2069,7 +2069,7 @@ declare var _default: import("vue/types/vue").ExtendedVue<Vue<Record<string, any
     errors: any[];
 }, {
     done(): any;
-    conflict(): any;
+    conflict(): Promise<any>;
     save(buttonDone: any, url: any, depth?: number): any;
     actuallySave(url: any): Promise<void>;
     setErrors(errors: any): void;
@@ -2407,7 +2407,7 @@ export const SELF: "__[[SELF]]__";
 declare module '@shell/plugins/dashboard-store/normalize' {
 export function keyFieldFor(type: any): string;
 export function normalizeType(type: any): any;
-export function handleConflict(initialValueJSON: any, value: any, liveValue: any, rootGetters: any, store: any): false | any[];
+export function handleConflict(initialValueJSON: any, value: any, liveValue: any, rootGetters: any, store: any, storeNamespace: any): Promise<false | any[]>;
 export const KEY_FIELD_FOR: {
     [x: number]: string;
     default: string;
@@ -2836,6 +2836,7 @@ export const NAMESPACE_FILTERS: any;
 export const WORKSPACE: any;
 export const EXPANDED_GROUPS: any;
 export const FAVORITE_TYPES: any;
+export const PINNED_CLUSTERS: any;
 export const GROUP_RESOURCES: any;
 export const DIFF: any;
 export const THEME: any;
@@ -3052,6 +3053,14 @@ export function filterOnlyKubernetesClusters(mgmtClusters: any, store: any): any
 export function isHarvesterCluster(mgmtCluster: any): boolean;
 export function isHarvesterSatisfiesVersion(version?: string): any;
 export function filterHiddenLocalCluster(mgmtClusters: any, store: any): any;
+/**
+ * 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: string): string;
 }
 
 // @shell/utils/color

package/utils/__tests__/cluster.test.ts

@@ -0,0 +1,55 @@
+import { abbreviateClusterName } from '@shell/utils/cluster';
+
+describe('fx: abbreviateClusterName', () => {
+  it.each([
+    ['local', 'lcl'],
+    ['world-wide-web', 'www'],
+    ['a', 'a'],
+    ['ab', 'ab'],
+    ['abc', 'abc'],
+    ['', ''],
+    ['1', '1'],
+    ['12', '12'],
+    ['123', '123'],
+    ['a1', 'a1'],
+    ['aa1', 'aa1'],
+    ['aaa1', 'aa1'],
+    ['a-b', 'a-b'],
+    ['1-2', '1-2'],
+    ['a-b-c', 'abc'],
+    ['abc-def-ghi', 'adg'],
+    ['abcd-efgh', 'adh'],
+    ['a-bc', 'abc'],
+    ['ab-c', 'abc'],
+    ['ab-cd', 'abd'],
+    ['a-bcd', 'abd'],
+    ['abc-d', 'acd'],
+    ['0123-4567-89ab-cdef', '048'],
+    ['0123-4567-89ab-cdef-ghij', '048'],
+    ['0123-4567-8901-2345', '048'],
+    ['0123-4567-8901-2345-6789', '048'],
+    ['a1b', 'a1b'],
+    ['a1b2', 'a1b'],
+    ['ab12cd34', 'a1c'],
+    ['test-cluster-one', 'tco'],
+    ['test-cluster-1', 'tc1'],
+    ['customer-support-team-1', 'cst'],
+    ['customer-support-team-one', 'cst'],
+    ['customer-support-team-prod', 'cst'],
+    ['customer-support-team-dev', 'cst'],
+    ['customer-support-team-prod-1', 'cst'],
+    ['customer-support-team-dev-1', 'cst'],
+    ['customer-support-team-prod-2', 'cst'],
+    ['customer-support-team-dev-2', 'cst'],
+
+    ['s322', 's32'],
+    ['sowmya2', 'sa2'],
+    ['sowmya4', 'sa4'],
+    ['sowmya', 'sma'],
+    ['sowmyatest4', 'st4'],
+  ])('should evaluate %p as %p', (value, expected) => {
+    const result = abbreviateClusterName(value);
+
+    expect(result).toStrictEqual(expected);
+  });
+});

package/utils/__tests__/object.test.ts

@@ -1,5 +1,5 @@
 import {
-  clone, get, getter, isEmpty, toDictionary
+  clone, get, getter, isEmpty, toDictionary, remove
 } from '@shell/utils/object';
 
 describe('fx: get', () => {
@@ -129,7 +129,7 @@ describe('fx: isEmpty', () => {
   });
 });
 
-describe('fX: toDictionary', () => {
+describe('fx: toDictionary', () => {
   it('should return a dictionary from an array', () => {
     const array = ['a', 'b', 'c'];
     const asd = (value: string) => value.toUpperCase();
@@ -142,3 +142,22 @@ describe('fX: toDictionary', () => {
     expect(result).toStrictEqual(expectation);
   });
 });
+
+describe('fx: remove', () => {
+  it.each([
+    [{}, '', {}],
+    [{}, 'not_there', {}],
+    [{}, 'not.there.again', {}],
+    [{ level1: true }, 'level1', {}],
+    [{ level1: true }, 'not_there', { level1: true }],
+    [{ level1: { level2: true } }, 'level1.level2', { level1: { } }],
+    [{ level1: { level2: true, other: true } }, 'level1.level2', { level1: { other: true } }],
+    [{ level1: { level2: true }, other: true }, 'level1.level2', { level1: { }, other: true }],
+    [{ level1: { level2: true }, other: true }, 'not_there.level1.level2', { level1: { level2: true }, other: true }],
+    [{ level1: { level2: true }, other: true }, 'level1', { other: true }],
+  ])('should evaluate %p as %p', (obj, path, expected) => {
+    const result = remove(obj, path);
+
+    expect(result).toStrictEqual(expected);
+  });
+});

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/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/yarn-error.log

@@ -1,35 +1,35 @@
 Arguments: 
-  /usr/local/bin/node /usr/local/bin/yarn publish . --new-version 0.3.24 --no-git-tag-version --access public
+  /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/nwm/.gem/ruby/3.1.2/bin:/Users/nwm/.rubies/ruby-3.1.2/lib/ruby/gems/3.1.0/bin:/Users/nwm/.rubies/ruby-3.1.2/bin:/Users/nwm/.deno/bin:/usr/local/sbin:/Users/nwm/google-cloud-sdk/bin:/opt/local/bin:/opt/local/sbin:/Users/nwm/.rd/bin:/Users/nwm/go/bin:/usr/local/bin:/Users/nwm/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin:/usr/local/MacGPG2/bin:/Library/Apple/usr/bin:/Applications/Utilities/kdiff3.app/Contents/MacOS/:/Applications/Visual Studio Code.app/Contents/Resources/app/bin
+  /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.16.0
+  16.19.1
 
 Platform: 
-  darwin x64
+  darwin arm64
 
 Trace: 
-  Error: canceled
-      at Interface.<anonymous> (/usr/local/lib/node_modules/yarn/lib/cli.js:137150:13)
-      at Interface.emit (node:events:527:28)
-      at Interface._ttyWrite (node:readline:1081:16)
-      at ReadStream.onkeypress (node:readline:288:10)
-      at ReadStream.emit (node:events:527:28)
-      at emitKeys (node:internal/readline/utils:358:14)
-      at emitKeys.next (<anonymous>)
-      at ReadStream.onData (node:internal/readline/emitKeypressEvents:61:36)
-      at ReadStream.emit (node:events:527:28)
-      at addChunk (node:internal/streams/readable:315:12)
+  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.24",
+    "version": "0.3.22",
     "description": "Rancher Dashboard Shell",
     "repository": "https://github.com/rancherlabs/dashboard",
     "license": "Apache-2.0",

package/components/ClusterProviderIconMenu.vue

@@ -1,161 +0,0 @@
-<script>
-export default {
-  props: {
-    cluster: {
-      type:     Object,
-      required: true,
-    },
-  },
-  computed: {
-    isEnabled() {
-      return !!this.cluster?.ready;
-    },
-  },
-  methods: {
-    /**
-     * 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'
-     */
-    smallIdentifier(input) {
-      if (this.cluster.badge?.iconText) {
-        return this.cluster.badge?.iconText;
-      }
-
-      if (!input) {
-        return '';
-      }
-
-      if (input.length <= 3) {
-        return input;
-      }
-
-      const segments = input.match(/([A-Za-z]+|\d+)/g);
-
-      if (!segments) return ''; // In case no valid segments are found
-
-      let result = '';
-
-      switch (segments.length) {
-      case 1:
-        // eslint-disable-next-line no-case-declarations
-        const word = segments[0];
-
-        result = `${ word[0] }${ word[Math.floor(word.length / 2)] }${ word[word.length - 1] }`;
-        break;
-      case 2:
-        result = `${ segments[0][0] }${ segments[1][0] }${ segments[1][segments[1].length - 1] }`;
-        break;
-      default:
-        result = segments.slice(0, 3).map((segment) => segment[0]).join('');
-      }
-
-      return result;
-    },
-
-  }
-};
-</script>
-
-<template>
-  <div
-    v-if="cluster"
-    class="cluster-icon-menu"
-  >
-    <div
-      class="cluster-badge-logo"
-      :class="{ 'disabled': !isEnabled }"
-      :style="{borderBottom: cluster.badge?.color ? `4px solid ${cluster.badge?.color}` : ''}"
-    >
-      <span
-        class="cluster-badge-logo-text"
-      >
-        {{ smallIdentifier(cluster.label) }}
-      </span>
-      <!-- {{ cluster.badge.iconText }} -->
-    </div>
-    <!-- eslint-enable -->
-    <svg
-      v-if="cluster.isLocal && !cluster.isHarvester"
-      id="local-cluster-icon-menu"
-      class="cluster-os-logo"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      viewBox="0 0 100 100"
-      style="enable-background:new 0 0 100 100;"
-    >
-      <g>
-        <g>
-          <path
-            class="rancher-icon-fill"
-            d="M26.0862026,44.4953918H8.6165142c-5.5818157,0-9.3979139-4.6252708-8.4802637-10.1311035l2.858391-17.210701
-            C3.912292,11.6477556,6.1382647,7.1128125,7.8419709,7.1128125s3.1788611,4.5368752,3.1788611,10.1186218v4.4837742
-            c0,5.5817471,4.4044495,9.5409164,9.9862652,9.5409164h5.0791054V44.4953918z"
-          />
-        </g>
-        <path
-          class="rancher-icon-fill"
-          d="M63.0214729,92.8871841H37.0862045c-6.0751343,0-11.0000019-4.9248657-11.0000019-11V30.3864384
-          c0-6.0751324,4.9248676-11,11.0000019-11h25.9352684c6.0751305,0,11.0000038,4.9248676,11.0000038,11v51.5007477
-          C74.0214767,87.9623184,69.0966034,92.8871841,63.0214729,92.8871841z"
-        />
-        <g>
-          <path
-            class="rancher-icon-fill"
-            d="M73.9137955,44.4953918h17.4696884c5.5818176,0,9.3979187-4.6252708,8.4802628-10.1311035
-            l-2.8583908-17.210701c-0.9176483-5.5058317-3.1436234-10.0407753-4.8473282-10.0407753
-            s-3.1788635,4.5368752-3.1788635,10.1186218v4.4837742c0,5.5817471-4.4044418,9.5409164-9.9862595,9.5409164h-5.0791092
-            V44.4953918z"
-          />
-        </g>
-      </g>
-    </svg>
-    <img
-      v-else
-      class="cluster-os-logo"
-      :src="cluster.providerNavLogo"
-    >
-  </div>
-</template>
-
-<style lang="scss" scoped>
-
-  .cluster-icon-menu {
-    position: relative;
-    align-items: center;
-    display: flex;
-    height: 28px;
-    justify-content: center;
-    width: 42px;
-  }
-  .cluster-os-logo {
-    position: absolute;
-    top: -6px;
-    right: -4px;
-    width: 14px;
-  }
-
-  .cluster-badge-logo {
-    width: 42px;
-    height: 28px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: var(--default-active-text);
-    font-weight: bold;
-    background: var(--nav-icon-badge-bg);
-    border: 1px solid var(--default-border);
-    border-radius: 5px;
-    padding-top: 2px;
-    font-size: 12px;
-    text-transform: uppercase;
-
-    &.disabled {
-      filter: grayscale(1);
-      color: var(--muted);
-    }
-  }
-</style>