@rancher/shell 3.0.8-rc.1 → 3.0.8-rc.12

package/rancher-components/Form/Checkbox/Checkbox.vue

@@ -445,7 +445,7 @@ $fontColor: var(--input-label);
     -ms-transform: rotate(0deg) scale(1);
     transform: rotate(0deg) scale(1);
     opacity:1;
-    border: 1px solid var(--active, var(--primary));
+    border: 1px solid var(--checkbox-border, var(--primary));
   }
 
   // Custom Checkbox tick

package/rancher-components/Pill/RcStatusBadge/RcStatusBadge.vue

@@ -1,7 +1,10 @@
 <script setup lang="ts">
 import { RcStatusBadgeProps } from './types';
+import { useStatusColors } from '@components/utils/status';
 
 const props = defineProps<RcStatusBadgeProps>();
+
+const { backgroundColor, borderColor, textColor } = useStatusColors(props, 'outlined');
 </script>
 
 <template>
@@ -27,39 +30,8 @@ const props = defineProps<RcStatusBadgeProps>();
     font-size: 12px;
     line-height: 19px;
 
-    &.info {
-        background-color: var(--rc-info-secondary);
-        border-color: var(--rc-info-secondary);
-        color: var(--rc-info);
-    }
-
-    &.success {
-        background-color: var(--rc-success-secondary);
-        border-color: var(--rc-success-secondary);
-        color: var(--rc-success);
-    }
-
-    &.warning {
-        background-color: var(--rc-warning);
-        border-color: var(--rc-warning);
-        color: var(--rc-warning-secondary);
-    }
-
-    &.error {
-        background-color: var(--rc-error);
-        border-color: var(--rc-error);
-        color: var(--rc-error-secondary);
-    }
-
-    &.unknown {
-        background-color: var(--rc-unknown);
-        border-color: var(--rc-unknown);
-        color: var(--rc-unknown-secondary);
-    }
-
-    &.none {
-        border-color: var(--rc-none);
-        color: var(--rc-none-secondary);
-    }
+    background-color: v-bind(backgroundColor);
+    border-color: v-bind(borderColor);
+    color: v-bind(textColor);
 }
 </style>

package/rancher-components/Pill/RcStatusBadge/index.ts

@@ -1,2 +1 @@
 export { default } from './RcStatusBadge.vue';
-export type { Status } from '../types';

package/rancher-components/Pill/RcStatusBadge/types.ts

@@ -1,4 +1,4 @@
-import { Status } from '@components/Pill/types';
+import { Status } from '@components/utils/status';
 
 export interface RcStatusBadgeProps {
   status: Status;

package/rancher-components/Pill/RcStatusIndicator/RcStatusIndicator.vue

@@ -1,7 +1,10 @@
 <script setup lang="ts">
 import { RcStatusIndicatorProps } from './types';
+import { useStatusColors } from '@components/utils/status';
 
 const props = defineProps<RcStatusIndicatorProps>();
+
+const { backgroundColor, borderColor } = useStatusColors(props, 'solid');
 </script>
 
 <template>
@@ -42,34 +45,8 @@ const props = defineProps<RcStatusIndicatorProps>();
             border-radius: 2px;
         }
 
-        &.info {
-            background-color: var(--rc-info);
-            border-color: var(--rc-info);
-        }
-
-        &.success {
-            background-color: var(--rc-success);
-            border-color: var(--rc-success);
-        }
-
-        &.warning {
-            background-color: var(--rc-warning);
-            border-color: var(--rc-warning);
-        }
-
-        &.error {
-            background-color: var(--rc-error);
-            border-color: var(--rc-error);
-        }
-
-        &.unknown {
-            background-color: var(--rc-unknown);
-            border-color: var(--rc-unknown);
-        }
-
-        &.none {
-            border-color: var(--rc-none);
-        }
+        background-color: v-bind(backgroundColor);
+        border-color: v-bind(borderColor);
     }
 }
 </style>

package/rancher-components/Pill/RcStatusIndicator/types.ts

@@ -1,4 +1,5 @@
-import { Status } from '../types';
+import { Status } from '@components/utils/status';
+
 export type Shape = 'disc' | 'horizontal-bar' | 'vertical-bar';
 
 export interface RcStatusIndicatorProps {

package/rancher-components/Pill/types.ts

@@ -1,3 +1,2 @@
 export type Shape = 'disc' | 'horizontal-bar' | 'vertical-bar';
-export type Status = 'info' | 'success' | 'warning' | 'error' | 'unknown' | 'none';
 export type Type = 'active' | 'inactive';

package/rancher-components/RcDropdown/RcDropdownItem.vue

@@ -36,6 +36,7 @@ const handleClick = (e: MouseEvent) => {
     @click.stop="handleClick"
     @keydown.enter.space="handleActivate"
     @keydown.up.down.prevent.stop="handleKeydown"
+    @mousedown.prevent="() => {/*We use this to prevent clicks from triggering the @focusin below. When we scroll on a click it prevents the action from occurring on the first click.*/}"
     @focusin="scrollIntoView"
   >
     <slot name="before">

package/rancher-components/RcDropdown/RcDropdownItemSelect.vue

@@ -22,6 +22,10 @@ defineProps({
       return [];
     }
   },
+  label: {
+    type:    String,
+    default: ''
+  }
 });
 const emits = defineEmits(['click', 'select']);
 
@@ -55,7 +59,7 @@ const focusMenuItem = () => {
     <LabeledSelect
       ref="menuItemSelect"
       :value="modelValue"
-      :label="t('wm.containerLogs.range.label')"
+      :label="label"
       :options="options"
       :clearable="false"
       placement="top"

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

@@ -0,0 +1,51 @@
+import { shallowMount } from '@vue/test-utils';
+import RcIcon from './RcIcon.vue';
+
+describe('rcIcon.vue', () => {
+  it('renders with the correct type class and size classes', () => {
+    const wrapper = shallowMount(RcIcon, {
+      props: {
+        size: 'medium',
+        type: 'search',
+      },
+    });
+
+    expect(wrapper.classes()).toContain('icon-search');
+    expect(wrapper.classes()).toContain('medium');
+  });
+
+  it('sets aria-hidden to true by default', () => {
+    const wrapper = shallowMount(RcIcon, {
+      props: {
+        size: 'medium',
+        type: 'search',
+      },
+    });
+
+    expect(wrapper.attributes('aria-hidden')).toBe('true');
+  });
+
+  it('sets aria-hidden to false when explicitly provided', () => {
+    const wrapper = shallowMount(RcIcon, {
+      props: {
+        size:       'medium',
+        type:       'search',
+        ariaHidden: false,
+      },
+    });
+
+    expect(wrapper.attributes('aria-hidden')).toBe('false');
+  });
+
+  it('sets aria-hidden to true when explicitly provided', () => {
+    const wrapper = shallowMount(RcIcon, {
+      props: {
+        size:       'medium',
+        type:       'search',
+        ariaHidden: true,
+      },
+    });
+
+    expect(wrapper.attributes('aria-hidden')).toBe('true');
+  });
+});

package/rancher-components/RcIcon/RcIcon.vue

@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import { RcIconProps, RcIconType, RcIconSize } from '@components/RcIcon/types';
+import { computed } from 'vue';
+import { useStatusColors } from '@components/utils/status';
+const props = withDefaults(defineProps<RcIconProps>(), { size: 'small', ariaHidden: true });
+const fontSize = computed(() => {
+  return RcIconSize[props.size];
+});
+
+const iconClass = computed(() => {
+  return RcIconType[props.type];
+});
+
+const status = computed(() => {
+  if (props.status && props.status !== 'inherit') {
+    return props.status;
+  }
+
+  return 'none';
+});
+
+const { textColor } = useStatusColors({ status: status.value }, 'outlined');
+
+const color = computed(() => {
+  if (props.status === 'inherit') {
+    return 'inherit';
+  }
+
+  return textColor.value;
+});
+</script>
+
+<template>
+  <i
+    class="rc-icon"
+    :class="{[props.size]: true, [iconClass]: true}"
+    :aria-hidden="props.ariaHidden"
+  />
+</template>
+
+<style lang="scss" scoped>
+.rc-icon {
+  font-size: v-bind(fontSize);
+  color: v-bind(color);
+}
+</style>

package/rancher-components/RcIcon/index.ts

@@ -0,0 +1 @@
+export { default as RcIcon } from './RcIcon.vue';

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/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/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/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

@@ -402,20 +402,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 = '?logoutAll';
       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],

package/store/features.js

@@ -38,6 +38,7 @@ export const UIEXTENSION = create('uiextension', true);
 export const PROVISIONING_PRE_BOOTSTRAP = create('provisioningprebootstrap', false);
 export const SCHEDULING_CUSTOMIZATION = create(SCHEDULING_CUSTOMIZATION_FEATURE, false);
 export const SCC = create('rancher-scc-registration-extension', true);
+export const AUTOSCALER = create('cluster-autoscaling', false);
 
 // Not currently used.. no point defining ones we don't use
 // export const EMBEDDED_CLUSTER_API = create('embedded-cluster-api', true);