@rancher/shell 3.0.8-rc.8 → 3.0.8

package/rancher-components/RcIcon/types.ts

@@ -0,0 +1,160 @@
+import { Status } from '../utils/status';
+
+export const RcIconType = {
+  actions:                 'icon-actions',
+  ai:                      'icon-ai',
+  'alert-alt':             'icon-alert-alt',
+  alert:                   'icon-alert',
+  anchor:                  'icon-anchor',
+  apple:                   'icon-apple',
+  application:             'icon-application',
+  apps:                    'icon-apps',
+  archive:                 'icon-archive',
+  'backup-restore':        'icon-backup-restore',
+  backup:                  'icon-backup',
+  'brush-icon':            'icon-brush-icon',
+  'category-alt':          'icon-category-alt',
+  checkmark:               'icon-checkmark',
+  'chevron-beginning':     'icon-chevron-beginning',
+  'chevron-down':          'icon-chevron-down',
+  'chevron-end':           'icon-chevron-end',
+  'chevron-left':          'icon-chevron-left',
+  'chevron-right':         'icon-chevron-right',
+  'chevron-up':            'icon-chevron-up',
+  'circle-plus':           'icon-circle-plus',
+  cis:                     'icon-cis',
+  close:                   'icon-close',
+  'cluster-management':    'icon-cluster-management',
+  cluster:                 'icon-cluster',
+  code:                    'icon-code',
+  comment:                 'icon-comment',
+  commit:                  'icon-commit',
+  compass:                 'icon-compass',
+  'confirmation-alt':      'icon-confirmation-alt',
+  copy:                    'icon-copy',
+  dashboard:               'icon-dashboard',
+  dock:                    'icon-dock',
+  docker:                  'icon-docker',
+  document:                'icon-document',
+  'dot-half':              'icon-dot-half',
+  'dot-open':              'icon-dot-open',
+  dot:                     'icon-dot',
+  'downgrade-alt':         'icon-downgrade-alt',
+  download:                'icon-download',
+  edit:                    'icon-edit',
+  elemental:               'icon-elemental',
+  endpoints_connected:     'icon-endpoints_connected',
+  endpoints_disconnected:  'icon-endpoints_disconnected',
+  epinio:                  'icon-epinio',
+  error:                   'icon-error',
+  explore:                 'icon-explore',
+  extension:               'icon-extension',
+  'external-link':         'icon-external-link',
+  file:                    'icon-file',
+  filter_alt:              'icon-filter_alt',
+  flask:                   'icon-flask',
+  fleet:                   'icon-fleet',
+  folder:                  'icon-folder',
+  fork:                    'icon-fork',
+  gatekeeper:              'icon-gatekeeper',
+  gear:                    'icon-gear',
+  gemini:                  'icon-gemini',
+  git:                     'icon-git',
+  github:                  'icon-github',
+  gitlab:                  'icon-gitlab',
+  globe:                   'icon-globe',
+  groups:                  'icon-groups',
+  harvester:               'icon-harvester',
+  helm:                    'icon-helm',
+  hide:                    'icon-hide',
+  history:                 'icon-history',
+  home:                    'icon-home',
+  'info-circle':           'icon-info-circle',
+  info:                    'icon-info',
+  init_container:          'icon-init_container',
+  istio:                   'icon-istio',
+  keyboard:                'icon-keyboard',
+  keyboard_tab:            'icon-keyboard_tab',
+  linux:                   'icon-linux',
+  'list-flat':             'icon-list-flat',
+  'list-grouped':          'icon-list-grouped',
+  lock:                    'icon-lock',
+  logging:                 'icon-logging',
+  longhorn:                'icon-longhorn',
+  marketplace:             'icon-marketplace',
+  menu:                    'icon-menu',
+  minus:                   'icon-minus',
+  monitoring:              'icon-monitoring',
+  more:                    'icon-more',
+  namespace:               'icon-namespace',
+  notifier:                'icon-notifier',
+  'notify-announcement':   'icon-notify-announcement',
+  'notify-bell':           'icon-notify-bell',
+  'notify-busy':           'icon-notify-busy',
+  'notify-error':          'icon-notify-error',
+  'notify-info':           'icon-notify-info',
+  'notify-tick':           'icon-notify-tick',
+  'notify-warning':        'icon-notify-warning',
+  ollama:                  'icon-ollama',
+  openai:                  'icon-openai',
+  'os-management':         'icon-os-management',
+  pause:                   'icon-pause',
+  'pin-outlined':          'icon-pin-outlined',
+  pin:                     'icon-pin',
+  pipeline:                'icon-pipeline',
+  play:                    'icon-play',
+  plus:                    'icon-plus',
+  pod_security:            'icon-pod_security',
+  print:                   'icon-print',
+  'question-mark':         'icon-question-mark',
+  'quick-action':          'icon-quick-action',
+  'rancher-desktop':       'icon-rancher-desktop',
+  'rancher-observability': 'icon-rancher-observability',
+  'refresh-alt':           'icon-refresh-alt',
+  refresh:                 'icon-refresh',
+  'repository-alt':        'icon-repository-alt',
+  repository:              'icon-repository',
+  rio:                     'icon-rio',
+  'role-binding':          'icon-role-binding',
+  search:                  'icon-search',
+  send:                    'icon-send',
+  service:                 'icon-service',
+  show:                    'icon-show',
+  snapshot:                'icon-snapshot',
+  'sort-down':             'icon-sort-down',
+  'sort-up':               'icon-sort-up',
+  sort:                    'icon-sort',
+  sources:                 'icon-sources',
+  spinner:                 'icon-spinner',
+  stackstate:              'icon-stackstate',
+  'star-open':             'icon-star-open',
+  star:                    'icon-star',
+  storage:                 'icon-storage',
+  'tag-alt':               'icon-tag-alt',
+  terminal:                'icon-terminal',
+  'thinking-process':      'icon-thinking-process',
+  trash:                   'icon-trash',
+  unlock:                  'icon-unlock',
+  'upgrade-alt':           'icon-upgrade-alt',
+  upload:                  'icon-upload',
+  'user-check':            'icon-user-check',
+  'user-xmark':            'icon-user-xmark',
+  user:                    'icon-user',
+  'version-alt':           'icon-version-alt',
+  warning:                 'icon-warning',
+  windows:                 'icon-windows',
+};
+
+export const RcIconSize = {
+  large:  '25px',
+  medium: '18px',
+  small:  '14px',
+  none:   undefined
+};
+
+export interface RcIconProps {
+  size: keyof typeof RcIconSize;
+  type: keyof typeof RcIconType;
+  ariaHidden?: boolean;
+  status?: Status | 'inherit';
+}

package/rancher-components/RcItemCard/RcItemCard.vue

@@ -72,7 +72,7 @@ interface RcItemCardProps {
   id: string;
 
   /** Any object value associated with this card */
-  value: ItemValue;
+  value?: ItemValue;
 
   /** Card title, status icons and action menu. Image will be included in the header in small variant too */
   header: Header;

package/rancher-components/utils/status.test.ts

@@ -0,0 +1,67 @@
+
+import { reactive } from 'vue';
+import { wrapIfVar, useStatusColors, Status } from './status';
+
+describe('utils: status', () => {
+  describe('wrapIfVar', () => {
+    it('should wrap a CSS variable', () => {
+      const result = wrapIfVar('--rc-info');
+
+      expect(result).toBe('var(--rc-info)');
+    });
+
+    it('should not wrap a normal color', () => {
+      const result = wrapIfVar('red');
+
+      expect(result).toBe('red');
+    });
+  });
+
+  describe('useStatusColors', () => {
+    it.each([
+      'info',
+      'success',
+      'warning',
+      'error',
+      'unknown',
+      'none'
+    ])('solid: should return the correct colors for status: %p', (status: Status) => {
+      const props = reactive({ status });
+      const {
+        borderColor,
+        backgroundColor,
+        textColor
+      } = useStatusColors(props, 'solid');
+
+      expect(borderColor.value).toBe(`var(--rc-${ status })`);
+      if (status !== 'none') {
+        // eslint-disable-next-line jest/no-conditional-expect
+        expect(backgroundColor.value).toBe(`var(--rc-${ status })`);
+      }
+      expect(textColor.value).toBe(`var(--rc-${ status }-secondary)`);
+    });
+
+    it.each([
+      'info',
+      'success',
+      'warning',
+      'error',
+      'unknown',
+      'none'
+    ])('outlined: should return the correct colors for status: %p', (status: Status) => {
+      const props = reactive({ status });
+      const {
+        borderColor,
+        backgroundColor,
+        textColor
+      } = useStatusColors(props, 'outlined');
+
+      expect(borderColor.value).toBe(`var(--rc-${ status }-secondary)`);
+      if (status !== 'none') {
+        // eslint-disable-next-line jest/no-conditional-expect
+        expect(backgroundColor.value).toBe(`var(--rc-${ status }-secondary)`);
+      }
+      expect(textColor.value).toBe(`var(--rc-${ status })`);
+    });
+  });
+});

package/rancher-components/utils/status.ts

@@ -0,0 +1,77 @@
+import { computed } from 'vue';
+
+export const StatusDefinitions = {
+  info: {
+    primary:   '--rc-info',
+    secondary: '--rc-info-secondary'
+  },
+  success: {
+    primary:   '--rc-success',
+    secondary: '--rc-success-secondary'
+  },
+  warning: {
+    primary:   '--rc-warning',
+    secondary: '--rc-warning-secondary'
+  },
+  error: {
+    primary:   '--rc-error',
+    secondary: '--rc-error-secondary'
+  },
+  unknown: {
+    primary:   '--rc-unknown',
+    secondary: '--rc-unknown-secondary'
+  },
+  none: {
+    primary:   '--rc-none',
+    secondary: '--rc-none-secondary'
+  },
+};
+
+export type Status = keyof typeof StatusDefinitions;
+export type StatusObject = { status: Status };
+export type Style = 'solid' | 'outlined';
+
+export function wrapIfVar(colorVar: string) {
+  return colorVar.startsWith('--') ? `var(${ colorVar })` : colorVar;
+}
+
+/**
+ * A composable to make it easier to use status colors in multiple components
+ *
+ * @param propsWithStatus The props which contain a `status: Status` property. Ideally I'd prefer to just pass status but doing so either forces the consumer to wrap the values in a Ref or this code is no longer reactive.
+ * @param style {@link Style} Will the block of code being using the solid or outlined styling
+ * @returns An object containing the relevant style colors
+ */
+export function useStatusColors(propsWithStatus: StatusObject, style: Style) {
+  const statusColors = computed(() => {
+    return StatusDefinitions[propsWithStatus.status];
+  });
+  const isOutlined = style === 'outlined';
+
+  const borderColor = computed(() => {
+    const colorVar = isOutlined ? statusColors.value.secondary : statusColors.value.primary;
+
+    return wrapIfVar(colorVar);
+  });
+
+  const backgroundColor = computed(() => {
+    if (propsWithStatus.status === 'none') {
+      return 'none';
+    }
+    const colorVar = isOutlined ? statusColors.value.secondary : statusColors.value.primary;
+
+    return wrapIfVar(colorVar);
+  });
+
+  const textColor = computed(() => {
+    const colorVar = isOutlined ? statusColors.value.primary : statusColors.value.secondary;
+
+    return wrapIfVar(colorVar);
+  });
+
+  return {
+    borderColor,
+    backgroundColor,
+    textColor
+  };
+}

package/scripts/publish-shell.sh

@@ -8,6 +8,7 @@ SHELL_DIR=$BASE_DIR/shell/
 CREATORS_DIR=$BASE_DIR/creators/extension
 FORCE_PUBLISH_TO_NPM="false"
 DEFAULT_NPM_REGISTRY="https://registry.npmjs.org"
+DUMMY_VERSION="99.99.99"
 
 # if TAG doesn't exist, we can exit as it's needed for any type of publish.
 if [ -z "$TAG" ]; then
@@ -84,6 +85,14 @@ function publish() {
   fi
 }
 
+update_version_in_package_json() {
+  local package_json_path="$1"
+  local version="$2"
+
+  sed -i.bak -e "s/\"version\": \"[0-9]*.[0-9]*.[0-9]*\(-alpha\.[0-9]*\|-release[0-9]*.[0-9]*.[0-9]*\|-rc\.[0-9]*\)\{0,1\}\",/\"version\": \"${version}\",/g" "$package_json_path"
+  rm "${package_json_path}.bak"
+}
+
 echo "TAG ${TAG}"
   
   # let's get the package name and version from the tag
@@ -102,10 +111,26 @@ fi
 case $PKG_NAME in
   "shell")
     echo "Publishing only Shell pkg via tagged release"
+
+    # with the changes in https://github.com/rancher/dashboard/pull/16166/files#diff-d954ab41ef46f7fdbaaf6d8c2bc715ad2cc823a829317b6ff93a3c94a92811f1
+    #  with NPM 11.3 --dry--run now does additional checks, one of them is the version number
+    #  so for dry runs we need to provide a valid version number here (not something published before)
+    if [ ${DRY_RUN} == "true" ]; then
+      update_version_in_package_json "${SHELL_DIR}/package.json" "${DUMMY_VERSION}"
+    fi
+
     publish "Shell" ${SHELL_DIR} ${PKG_V}
     ;;
   "creators")
     echo "Publishing only Creators pkg via tagged release"
+
+    # with the changes in https://github.com/rancher/dashboard/pull/16166/files#diff-d954ab41ef46f7fdbaaf6d8c2bc715ad2cc823a829317b6ff93a3c94a92811f1
+    #  with NPM 11.3 --dry--run now does additional checks, one of them is the version number
+    #  so for dry runs we need to provide a valid version number here (not something published before)
+    if [ ${DRY_RUN} == "true" ]; then
+      update_version_in_package_json "${CREATORS_DIR}/package.json" "${DUMMY_VERSION}"
+    fi
+
     publish "Extension creator" ${CREATORS_DIR} ${PKG_V}
     ;;
   *)

package/scripts/typegen.sh

@@ -29,6 +29,7 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/prefs.js --declaration --al
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/plugins.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
 
 # # plugins
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/i18n.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/normalize.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/resource-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/classify.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null

package/store/__tests__/catalog.test.ts

@@ -88,7 +88,7 @@ describe('catalog', () => {
           }
         },
         state: {
-          $plugin:            { getDynamic: () => require(`@shell/models/chart`) },
+          $extension:         { getDynamic: () => require(`@shell/models/chart`) },
           [catalogStoreName]: { } as { [key: string]: any},
         },
         getters: {

package/store/__tests__/type-map.test.ts

@@ -1116,7 +1116,169 @@ describe('type-map', () => {
         });
       });
     });
+
+    describe('activeProducts', () => {
+      // Basic schemas for product filtering tests
+      const productSchemas = {
+        myType: {
+          id:     'mytype',
+          _id:    'mytype',
+          type:   SCHEMA,
+          _group: 'mygroup',
+        },
+        anotherType: {
+          id:     'anothertype',
+          _id:    'anothertype',
+          type:   SCHEMA,
+          _group: 'anothergroup',
+        },
+      };
+
+      const createProductState = (products) => ({
+        products,
+        schemaGeneration: 1,
+      });
+
+      const createProductRootGetters = (moduleSchemas = [], moduleName = 'cluster') => ({
+        'prefs/get':             () => false,
+        [`${ moduleName }/all`]: (resource) => {
+          if (resource === SCHEMA) {
+            return moduleSchemas;
+          }
+
+          return [];
+        },
+      });
+
+      describe('ifHaveType', () => {
+        it('should show product when matching type exists', () => {
+          const state = createProductState([{
+            name:       'test-product',
+            inStore:    'cluster',
+            ifHaveType: 'mytype',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(1);
+          expect(active[0].name).toBe('test-product');
+        });
+
+        it('should hide product when matching type does not exist', () => {
+          const state = createProductState([{
+            name:       'test-product',
+            inStore:    'cluster',
+            ifHaveType: 'missingtype',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(0);
+        });
+      });
+
+      describe('ifNotHaveType', () => {
+        it('should show product when matching type does NOT exist', () => {
+          const state = createProductState([{
+            name:          'test-product',
+            inStore:       'cluster',
+            ifNotHaveType: 'missingtype',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(1);
+          expect(active[0].name).toBe('test-product');
+        });
+
+        it('should hide product when matching type exists', () => {
+          const state = createProductState([{
+            name:          'test-product',
+            inStore:       'cluster',
+            ifNotHaveType: 'mytype',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(0);
+        });
+
+        it('should support regex pattern in ifNotHaveType', () => {
+          const state = createProductState([{
+            name:          'test-product',
+            inStore:       'cluster',
+            ifNotHaveType: 'my.*',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(0);
+        });
+
+        it('should show product when regex pattern does not match any type', () => {
+          const state = createProductState([{
+            name:          'test-product',
+            inStore:       'cluster',
+            ifNotHaveType: 'nomatch.*',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(1);
+          expect(active[0].name).toBe('test-product');
+        });
+      });
+
+      describe('combined ifHaveType and ifNotHaveType', () => {
+        it('should show product when ifHaveType matches and ifNotHaveType does not match', () => {
+          const state = createProductState([{
+            name:          'test-product',
+            inStore:       'cluster',
+            ifHaveType:    'mytype',
+            ifNotHaveType: 'missingtype',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(1);
+          expect(active[0].name).toBe('test-product');
+        });
+
+        it('should hide product when ifHaveType matches but ifNotHaveType also matches', () => {
+          const state = createProductState([{
+            name:          'test-product',
+            inStore:       'cluster',
+            ifHaveType:    'mytype',
+            ifNotHaveType: 'anothertype',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType, productSchemas.anotherType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(0);
+        });
+
+        it('should hide product when ifHaveType does not match', () => {
+          const state = createProductState([{
+            name:          'test-product',
+            inStore:       'cluster',
+            ifHaveType:    'missingtype',
+            ifNotHaveType: 'anothermissingtype',
+          }]);
+          const rootGetters = createProductRootGetters([productSchemas.myType]);
+
+          const active = getters.activeProducts(state, {}, {}, rootGetters);
+
+          expect(active).toHaveLength(0);
+        });
+      });
+    });
   });
 });
-
-// getTree - Remove ignored schemas, not-applicable to ns filter

package/store/action-menu.js

@@ -111,6 +111,14 @@ export const mutations = {
     state.modalData = data;
   },
 
+  updateModalData(state, data) {
+    state.modalData = state.modalData || {};
+
+    data.forEach(({ key, value }) => {
+      state.modalData[key] = value;
+    });
+  },
+
   clearCallbackData(state) {
     state.performCallbackData = undefined;
   },

package/store/auth.js

@@ -149,12 +149,16 @@ export const actions = {
       force = true;
     }
 
-    return dispatch('rancher/findAll', {
+    const providers = dispatch('rancher/findAll', {
       type: 'authProvider',
       opt:  {
-        url: `/v3-public/authProviders`, watch: false, force
+        url:   `/v1-public/authproviders`,
+        watch: false,
+        force
       }
     }, { root: true });
+
+    return providers;
   },
 
   getAuthConfigs({ dispatch }) {
@@ -349,13 +353,21 @@ export const actions = {
     const driver = await dispatch('getAuthProvider', provider);
 
     try {
-      const res = await driver.doAction('login', {
-        description:  'UI session',
-        responseType: 'cookie',
-        ...body
-      }, { redirectUnauthorized: false });
-
-      return res;
+      return await dispatch(
+        'management/request',
+        {
+          url:    `/v1-public/login`,
+          method: 'post',
+          data:   {
+            type:         driver.type,
+            description:  'UI session',
+            responseType: 'cookie',
+            ...body
+          },
+          redirectUnauthorized: false,
+        },
+        { root: true }
+      );
     } catch (err) {
       if (err._status === 401) {
         return Promise.reject(LOGIN_ERRORS.CLIENT_UNAUTHORIZED);
@@ -402,20 +414,20 @@ export const actions = {
     }
 
     // Unload plugins - we will load again on login
-    await rootState.$plugin.logout();
+    await rootState.$extension.logout();
 
-    let logoutAction = 'logout';
+    let logoutAction = '';
     const data = {};
 
     // SLO - Single-sign logout - will logout auth provider from all places where it's logged in
     if (options.slo) {
-      logoutAction = 'logoutAll';
+      logoutAction = '?all';
       data.finalRedirectUrl = returnTo({ isSlo: true }, this);
     }
 
     try {
       const res = await dispatch('rancher/request', {
-        url:                  `/v3/tokens?action=${ logoutAction }`,
+        url:                  `/v1/logout${ logoutAction }`,
         method:               'post',
         data,
         headers:              { 'Content-Type': 'application/json' },

package/store/catalog.js

@@ -504,11 +504,16 @@ function addChart(ctx, map, chart, repo) {
 
   if ( !obj ) {
     if ( ctx ) { }
+
+    const primeOnly = chart.annotations?.[CATALOG_ANNOTATIONS.PRIME_ONLY] === 'true';
     const experimental = !!chart.annotations?.[CATALOG_ANNOTATIONS.EXPERIMENTAL];
     const windowsIncompatible = !(chart.annotations?.[CATALOG_ANNOTATIONS.PERMITTED_OS] || '').includes('windows');
     const deploysOnWindows = (chart.annotations?.[CATALOG_ANNOTATIONS.DEPLOYED_OS] || '').includes('windows');
     const tags = [];
 
+    if (primeOnly) {
+      tags.push(ctx.rootGetters['i18n/withFallback']('generic.primeOnly'));
+    }
     if (experimental) {
       tags.push(ctx.rootGetters['i18n/withFallback']('generic.experimental'));
     }
@@ -542,6 +547,7 @@ function addChart(ctx, map, chart, repo) {
       keywords:         chart.keywords || [],
       categories:       filterCategories(chart.keywords),
       deprecated:       !!chart.deprecated,
+      primeOnly,
       experimental,
       hidden:           !!chart.annotations?.[CATALOG_ANNOTATIONS.HIDDEN],
       targetNamespace:  chart.annotations?.[CATALOG_ANNOTATIONS.NAMESPACE],