@rancher/shell 0.5.2 → 1.2.0

package/components/nav/WindowManager/index.vue

@@ -20,6 +20,10 @@ export default {
 
     height: {
       get() {
+        if ( process.server ) {
+          return 0;
+        }
+
         if ( this.userHeight ) {
           return this.userHeight;
         }
@@ -48,6 +52,10 @@ export default {
 
     width: {
       get() {
+        if ( process.server ) {
+          return 0;
+        }
+
         if (this.userWidth) {
           return this.userWidth;
         }
@@ -334,8 +342,7 @@ export default {
         />
         <span class="tab-label"> {{ tab.label }}</span>
         <i
-          data-testid="wm-tab-close-button"
-          class="closer icon icon-fw icon-x wm-closer-button"
+          class="closer icon icon-fw icon-x"
           @click.stop="close(tab.id)"
         />
       </div>
@@ -433,16 +440,9 @@ export default {
           margin-left: 5px;
           border: 1px solid var(--body-text);
           border-radius: var(--border-radius);
-          line-height: 12px;
-          font-size: 10px;
-          width: 14px;
-          align-self: center;
-          display: flex;
-          justify-content: center;
 
           &:hover {
-            border-color: var(--link-border);
-            color: var(--link-border);
+            background-color: var(--wm-closer-hover-bg);
           }
         }
       }
@@ -502,5 +502,4 @@ export default {
       border-right: var(--nav-border-size) solid var(--nav-border);
     }
   }
-
 </style>

package/components/nav/__tests__/TopLevelMenu.test.ts

@@ -1,6 +1,5 @@
 import { mount, Wrapper } from '@vue/test-utils';
 import TopLevelMenu from '@shell/components/nav/TopLevelMenu';
-import { SETTING } from '@shell/config/settings';
 
 // DISCLAIMER: This should not be added here, although we have several store requests which are irrelevant
 const defaultStore = {
@@ -33,38 +32,6 @@ describe('topLevelMenu', () => {
     expect(cluster.exists()).toBe(true);
   });
 
-  it('should not "crash" the component if the structure of banner settings is in an old format', () => {
-    const wrapper: Wrapper<InstanceType<typeof TopLevelMenu>> = mount(TopLevelMenu, {
-      mocks: {
-        $store: {
-          getters: {
-            'management/all': () => [{ name: 'whatever' },
-              // object based on https://github.com/rancher/dashboard/issues/10140#issuecomment-1883252402
-              {
-                id:    SETTING.BANNERS,
-                value: JSON.stringify({
-                  banner: {
-                    color:      '#78c9cf',
-                    background: '#27292e',
-                    text:       'Hello World!'
-                  },
-                  showHeader: 'true',
-                  showFooter: 'true'
-                })
-              }],
-            ...defaultStore
-          },
-        },
-      },
-      stubs: ['BrandImage', 'nuxt-link']
-    });
-
-    expect(wrapper.vm.globalBannerSettings).toStrictEqual({
-      headerFont: '2em',
-      footerFont: '2em'
-    });
-  });
-
   describe('searching a term', () => {
     describe('should displays a no results message if have clusters but', () => {
       it('given no matching clusters', () => {

package/components/nav/__tests__/Type.test.ts

@@ -5,7 +5,7 @@ import Type from '@shell/components/nav/Type.vue';
 jest.mock('vue-router');
 
 // Configuration text
-const className = 'router-link-active';
+const className = 'nuxt-link-active';
 
 describe('component: Type', () => {
   describe('should not use highlight class', () => {

package/components/nuxt/nuxt-child.js

@@ -18,8 +18,10 @@ export default {
 
     data.nuxtChild = true
     const _parent = parent
-    let depth = 0
+    const transitions = parent.$nuxt.nuxt.transitions
+    const defaultTransition = parent.$nuxt.nuxt.defaultTransition
 
+    let depth = 0
     while (parent) {
       if (parent.$vnode && parent.$vnode.data.nuxtChild) {
         depth++
@@ -27,18 +29,48 @@ export default {
       parent = parent.$parent
     }
     data.nuxtChildDepth = depth
+    const transition = transitions[depth] || defaultTransition
+    const transitionProps = {}
+    transitionsKeys.forEach((key) => {
+      if (typeof transition[key] !== 'undefined') {
+        transitionProps[key] = transition[key]
+      }
+    })
 
     const listeners = {}
-    
-    // Add triggerScroll event on beforeEnter (fix #1376)
-    const beforeEnter = listeners.beforeEnter
-    listeners.beforeEnter = (el) => {
-      // Ensure to trigger scroll event after calling scrollBehavior
-      window.$nuxt.$nextTick(() => {
-        window.$nuxt.$emit('triggerScroll')
-      })
-      if (beforeEnter) {
-        return beforeEnter.call(_parent, el)
+    listenersKeys.forEach((key) => {
+      if (typeof transition[key] === 'function') {
+        listeners[key] = transition[key].bind(_parent)
+      }
+    })
+    if (process.client) {
+      // Add triggerScroll event on beforeEnter (fix #1376)
+      const beforeEnter = listeners.beforeEnter
+      listeners.beforeEnter = (el) => {
+        // Ensure to trigger scroll event after calling scrollBehavior
+        window.$nuxt.$nextTick(() => {
+          window.$nuxt.$emit('triggerScroll')
+        })
+        if (beforeEnter) {
+          return beforeEnter.call(_parent, el)
+        }
+      }
+    }
+
+    // make sure that leave is called asynchronous (fix #5703)
+    if (transition.css === false) {
+      const leave = listeners.leave
+
+      // only add leave listener when user didnt provide one
+      // or when it misses the done argument
+      if (!leave || leave.length < 2) {
+        listeners.leave = (el, done) => {
+          if (leave) {
+            leave.call(_parent, el)
+          }
+
+          _parent.$nextTick(done)
+        }
       }
     }
 
@@ -48,11 +80,43 @@ export default {
       routerView = h('keep-alive', { props: props.keepAliveProps }, [routerView])
     }
 
-    // this needs to be a "transition" or another non-rendering component, 
-    // otherwise we will break pages like the charts wizard or the extensions main screen (DOM would render an additional element and break CSS)
-    // we can deal with this later once we remove this component and <nuxt /> component
     return h('transition', {
+      props: transitionProps,
       on: listeners
     }, [routerView])
   }
 }
+
+const transitionsKeys = [
+  'name',
+  'mode',
+  'appear',
+  'css',
+  'type',
+  'duration',
+  'enterClass',
+  'leaveClass',
+  'appearClass',
+  'enterActiveClass',
+  'enterActiveClass',
+  'leaveActiveClass',
+  'appearActiveClass',
+  'enterToClass',
+  'leaveToClass',
+  'appearToClass'
+]
+
+const listenersKeys = [
+  'beforeEnter',
+  'enter',
+  'afterEnter',
+  'enterCancelled',
+  'beforeLeave',
+  'leave',
+  'afterLeave',
+  'leaveCancelled',
+  'beforeAppear',
+  'appear',
+  'afterAppear',
+  'appearCancelled'
+]

package/components/nuxt/nuxt.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { compile } from '../../utils/nuxt'
 
-import NuxtError from '../../components/templates/error.vue'
+import NuxtError from '../../layouts/error.vue'
 
 import NuxtChild from './nuxt-child'
 

package/components/user.retention/user-retention-header.vue

@@ -0,0 +1,34 @@
+<script lang="ts" setup>
+import TabTitle from '@shell/components/TabTitle';
+</script>
+
+<template>
+  <div>
+    <header>
+      <div class="title">
+        <h1
+          data-testid="charts-header-title"
+          class="m-0"
+        >
+          <TabTitle :show-child="false">
+            {{ t('user.retention.edit.title.header') }}
+          </TabTitle>
+          <router-link
+            :to="{
+              name: 'c-cluster-product-resource',
+              params: {
+                cluster: '_',
+                product: 'auth',
+                resource: 'management.cattle.io.user',
+              }
+            }"
+          >
+            {{ t('user.retention.edit.title.pre') }}
+          </router-link>
+          {{ t('user.retention.edit.title.post') }}
+        </h1>
+      </div>
+    </header>
+    <h2>{{ t('user.retention.edit.title.subTitle') }}</h2>
+  </div>
+</template>

package/composables/useI18n.ts

@@ -0,0 +1,26 @@
+import { Store } from 'vuex';
+
+import { stringFor } from '@shell/plugins/i18n';
+
+let store: Store<any> | null = null;
+
+export const useI18n = (vuexStore: Store<any>): { t: typeof t } => {
+  store = vuexStore;
+
+  if (!store) {
+    throw new Error('usI18n() must be called from setup()');
+  }
+
+  return { t };
+};
+
+/**
+ * Allows for consuming i18n strings with the Vue composition API.
+ * @param key - The key for the i18n string to translate.
+ * @param args - An object or array containing arguments for the translation function.
+ * @param raw - A boolean determining if the string returned is a raw representation.
+ * @returns A translated string or the raw value if the raw parameter is set to true.
+ */
+const t = (key: string, args?: unknown, raw?: boolean): unknown => {
+  return stringFor(store, key, args, raw);
+};

package/composables/useStore.ts

@@ -0,0 +1,16 @@
+import { getCurrentInstance } from 'vue';
+import { Store } from 'vuex';
+
+/**
+ * useStore allows for accessing Vuex stores from within a setup function. This is a temporary measure for working with
+ * Vuex in Vue2.
+ *
+ * TODO: #9541 Remove for Vue 3 migration
+ */
+export const useStore = ():Store<any> => {
+  const vm = getCurrentInstance();
+
+  if (!vm) throw new Error('useStore() must be called from setup()');
+
+  return vm.proxy.$store;
+};

package/config/harvester-manager-types.js

@@ -1,3 +1 @@
 export const NAME = 'harvesterManager';
-
-export const KIND = { MACHINE_TEMPLATE: 'HarvesterMachineTemplate' };

package/config/home-links.js

@@ -2,6 +2,7 @@ import { DOCS_BASE } from '@shell/config/private-label';
 import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { allHash } from '@shell/utils/promise';
+import { isRancherPrime } from '@shell/config/version';
 
 const DEFAULT_LINKS = [
   {
@@ -26,11 +27,17 @@ const DEFAULT_LINKS = [
   },
   {
     key:     'getStarted',
-    value:   `${ DOCS_BASE }/getting-started/overview`,
+    value:   'https://ranchermanager.docs.rancher.com/getting-started/overview',
     enabled: true,
   },
 ];
 
+const COLLECTIVE_LINK = {
+  key:     'suseCollective',
+  value:   'https://susecollective.suse.com/join/prime',
+  enabled: true,
+};
+
 const SUPPORT_LINK = {
   key:      'commercialSupport',
   value:    '/support',
@@ -47,6 +54,9 @@ const CN_FORUMS_LINK = {
 // We add a version attribute to the setting so we know what has been migrated and which version of the setting we have
 export const CUSTOM_LINKS_VERSION = 'v1';
 
+// Version with collective added (Prime)
+export const CUSTOM_LINKS_COLLECTIVE_VERSION = 'v1.1';
+
 // Fetch the settings required for the links, taking into account legacy settings if we have not migrated
 export async function fetchLinks(store, hasSupport, isSupportPage, t) {
   let uiLinks = {};
@@ -63,11 +73,26 @@ export async function fetchLinks(store, hasSupport, isSupportPage, t) {
   }
 
   // If uiLinks is set and has the correct version, then we are okay, otherwise we need to migrate from the old settings
-  if (uiLinks?.version === CUSTOM_LINKS_VERSION) {
+  if (uiLinks?.version?.startsWith(CUSTOM_LINKS_VERSION)) {
+    // v1 > v1.1 migration
+    if (uiLinks?.version === CUSTOM_LINKS_VERSION) {
+      uiLinks.version = CUSTOM_LINKS_COLLECTIVE_VERSION;
+
+      // Add collective link so that it is enabled by default
+      if (!uiLinks.defaults.includes(COLLECTIVE_LINK.key)) {
+        uiLinks.defaults.push(COLLECTIVE_LINK.key);
+      }
+    }
+
     // Map out the default settings, as we only store keys of the ones to show
     if (uiLinks.defaults) {
       const defaults = [...DEFAULT_LINKS];
 
+      // Add prime link if necessary
+      if (isRancherPrime()) {
+        defaults.push(COLLECTIVE_LINK);
+      }
+
       // Map the link name stored to the default link, if it exists
       defaults.forEach((link) => {
         const enabled = uiLinks.defaults.find((linkName) => linkName === link.key);
@@ -89,6 +114,11 @@ export async function fetchLinks(store, hasSupport, isSupportPage, t) {
     custom:   []
   };
 
+  // Add prime link if necessary
+  if (isRancherPrime()) {
+    links.defaults.push(COLLECTIVE_LINK);
+  }
+
   // There are two legacy settings:
   // SETTING.ISSUES - can specify a custom link to use for 'File an issue'
   // SETTING.COMMUNITY_LINKS - can specify whether to hide all of the default links (other than 'File an issue')

package/config/private-label.js

@@ -23,7 +23,6 @@ export function setMode(m) {
 
 export function setVendor(v) {
   vendor = v;
-  setTitle();
 }
 
 export function setProduct(p) {
@@ -72,24 +71,3 @@ export function getVendor() {
 export function getProduct() {
   return product;
 }
-
-export function setTitle() {
-  const v = getVendor();
-
-  if (v === 'Harvester') {
-    const ico = require(`~shell/assets/images/pl/harvester.png`);
-
-    document.title = 'Harvester';
-    const link = document.createElement('link');
-
-    link.hid = 'icon';
-    link.rel = 'icon';
-    link.type = 'image/x-icon';
-    link.hrefv = ico;
-    const head = document.getElementsByTagName('head')[0];
-
-    head.appendChild(link);
-  } else {
-    document.title = v;
-  }
-}

package/config/product/explorer.js

@@ -7,7 +7,6 @@ import {
   MANAGEMENT,
   NAMESPACE,
   NORMAN,
-  SNAPSHOT,
   VIRTUAL_TYPES,
 } from '@shell/config/types';
 
@@ -15,7 +14,7 @@ import {
   STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, KEYS,
   INGRESS_DEFAULT_BACKEND, INGRESS_TARGET, INGRESS_CLASS,
   SPEC_TYPE, TARGET_PORT, SELECTOR, NODE as NODE_COL, TYPE, WORKLOAD_IMAGES, POD_IMAGES,
-  USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
+  USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, USER_LAST_LOGIN, USER_DISABLED_IN, USER_DELETED_IN, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT,
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
   ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
@@ -163,8 +162,6 @@ export function init(store) {
   configureType(MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING, { isEditable: false, depaginate: true });
   configureType(MANAGEMENT.PROJECT, { displayName: store.getters['i18n/t']('namespace.project.label') });
   configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: true });
-  configureType(SNAPSHOT, { depaginate: true });
-  configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
 
   configureType(EVENT, { limit: 500 });
   weightType(EVENT, -1, true);
@@ -262,6 +259,9 @@ export function init(store) {
     USER_DISPLAY_NAME,
     USER_PROVIDER,
     USERNAME,
+    USER_LAST_LOGIN,
+    USER_DISABLED_IN,
+    USER_DELETED_IN,
     AGE
   ]);
 

package/config/product/fleet.js

@@ -3,7 +3,6 @@ import { FLEET } from '@shell/config/types';
 import { STATE, NAME as NAME_COL, AGE } from '@shell/config/table-headers';
 import { FLEET as FLEET_FEATURE } from '@shell/store/features';
 import { gitRepoGraphConfig } from '@shell/pages/c/_cluster/fleet/GitRepoGraphConfig';
-import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export const NAME = 'fleet';
 export const CHART_NAME = 'fleet';
@@ -27,10 +26,6 @@ export function init(store) {
     removable:             false,
     showClusterSwitcher:   false,
     showWorkspaceSwitcher: true,
-    to:                    {
-      name:   'c-cluster-fleet',
-      params: { resource: FLEET.DASHBOARD, cluster: BLANK_CLUSTER }
-    },
   });
 
   virtualType({
@@ -42,7 +37,7 @@ export function init(store) {
     weight:     110,
     route:      {
       name:   'c-cluster-fleet',
-      params: { resource: FLEET.DASHBOARD, cluster: BLANK_CLUSTER }
+      params: { resource: FLEET.DASHBOARD }
     },
     exact: true,
   });

package/config/product/legacy.js

@@ -16,36 +16,6 @@ export function init(store) {
     showNamespaceFilter: true,
   });
 
-  virtualType({
-    labelKey:   'legacy.alerts',
-    name:       'v1-alerts',
-    group:      'Root',
-    namespaced: true,
-    weight:     111,
-    route:      { name: 'c-cluster-legacy-pages-page', params: { page: 'alerts' } },
-    exact:      true
-  });
-
-  virtualType({
-    labelKey:   'legacy.catalogs',
-    name:       'v1-catalogs',
-    group:      'Root',
-    namespaced: true,
-    weight:     111,
-    route:      { name: 'c-cluster-legacy-pages-page', params: { page: 'catalogs' } },
-    exact:      true
-  });
-
-  virtualType({
-    labelKey:   'legacy.notifiers',
-    name:       'v1-notifiers',
-    group:      'Root',
-    namespaced: true,
-    weight:     111,
-    route:      { name: 'c-cluster-legacy-pages-page', params: { page: 'notifiers' } },
-    exact:      true
-  });
-
   virtualType({
     ifHave:     IF_HAVE.PROJECT,
     labelKey:   'legacy.project.label',
@@ -68,59 +38,10 @@ export function init(store) {
     overview:   false,
   });
 
-  basicType([
-    'v1-alerts',
-    'v1-catalogs',
-    'v1-notifiers',
-    'v1-project-overview'
-  ]);
+  basicType(['v1-project-overview']);
 
   // Project Pages
 
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.alerts',
-    namespaced: true,
-    name:       'project-alerts',
-    weight:     105,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'alerts' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.apps',
-    namespaced: true,
-    name:       'project-apps',
-    weight:     110,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'apps' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.catalogs',
-    namespaced: true,
-    name:       'project-catalogs',
-    weight:     105,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'catalogs' } },
-    exact:      true,
-    overview:   false,
-  });
-
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.monitoring',
-    namespaced: true,
-    name:       'project-monitoring',
-    weight:     105,
-    route:      { name: 'c-cluster-legacy-project-page', params: { page: 'monitoring' } },
-    exact:      true,
-    overview:   false,
-  });
-
   virtualType({
     ifHave:     IF_HAVE.PROJECT,
     labelKey:   'legacy.secrets',
@@ -144,11 +65,7 @@ export function init(store) {
   });
 
   basicType([
-    'project-apps',
-    'project-alerts',
-    'project-catalogs',
     'project-config-maps',
-    'project-monitoring',
     'project-secrets',
   ], 'Project');
 }

package/config/product/manager.js

@@ -4,10 +4,9 @@ import {
   CATALOG,
   NORMAN,
   HCI,
-  MANAGEMENT,
-  SNAPSHOT
+  MANAGEMENT
 } from '@shell/config/types';
-import { MULTI_CLUSTER, RKE1_UI } from '@shell/store/features';
+import { MULTI_CLUSTER } from '@shell/store/features';
 import { DSL } from '@shell/store/type-map';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
@@ -55,15 +54,24 @@ export function init(store) {
     route:      { name: 'c-cluster-manager-cloudCredential' },
   });
 
+  virtualType({
+    labelKey:   'legacy.psps',
+    name:       'pod-security-policies',
+    group:      'Root',
+    namespaced: false,
+    weight:     5,
+    icon:       'folder',
+    route:      { name: 'c-cluster-manager-pages-page', params: { cluster: 'local', page: 'pod-security-policies' } },
+    exact:      true
+  });
+
   basicType([
     CAPI.RANCHER_CLUSTER,
     'cloud-credentials',
     'drivers',
+    'pod-security-policies',
   ]);
 
-  configureType(SNAPSHOT, { depaginate: true });
-  configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
-
   configureType(CAPI.RANCHER_CLUSTER, {
     showListMasthead: false, namespaced: false, alias: [HCI.CLUSTER]
   });
@@ -88,7 +96,6 @@ export function init(store) {
   });
 
   virtualType({
-    ifFeature:  RKE1_UI,
     labelKey:   'manager.rkeTemplates.label',
     name:       'rke-templates',
     group:      'Root',
@@ -99,7 +106,6 @@ export function init(store) {
   });
 
   virtualType({
-    ifFeature:  RKE1_UI,
     labelKey:   'manager.nodeTemplates.label',
     name:       'rke-node-templates',
     group:      'Root',
@@ -125,6 +131,7 @@ export function init(store) {
     CAPI.MACHINE_SET,
     CAPI.MACHINE,
     CATALOG.CLUSTER_REPO,
+    'pod-security-policies',
     MANAGEMENT.PSA
   ], 'advanced');
 

package/config/query-params.js

@@ -50,7 +50,6 @@ export const _SPLIT = 'split';
 
 // CruResource
 export const SUB_TYPE = 'type';
-export const RKE_TYPE = 'rkeType';
 
 // App launch
 export const REPO_TYPE = 'repo-type';