@rancher/shell 3.0.9-rc.3 → 3.0.9-rc.5

package/rancher-components/RcItemCard/RcItemCard.vue

@@ -112,6 +112,8 @@ interface RcItemCardProps {
 
   /** Makes the card clickable and emits 'card-click' on click/enter/space */
   clickable?: boolean;
+
+  role?: 'link' | 'button' | undefined;
 }
 
 const props = defineProps<RcItemCardProps>();
@@ -161,27 +163,23 @@ const statusTooltips = computed(() => props.header.statuses?.map((status) => lab
 const cardMeta = computed(() => ({
   ariaLabel:       props.clickable ? t('itemCard.ariaLabel.clickable', { cardTitle: labelText(props.header.title) }) : undefined,
   tabIndex:        props.clickable ? '0' : undefined,
-  role:            props.clickable ? 'button' : undefined,
-  actionMenuLabel: props.actions && t('itemCard.actionMenu.label', { cardTitle: labelText(props.header.title) })
+  role:            props.role ?? (props.clickable ? 'button' : undefined),
+  actionMenuLabel: props.actions && t('itemCard.actionMenu.label', { cardTitle: labelText(props.header.title) }),
 }));
 
+const cursorValue = computed(() => props.clickable ? 'pointer' : 'auto');
 </script>
 
 <template>
   <div
     ref="cardEl"
     class="item-card"
+    :data-testid="`item-card-${id}`"
     :class="{
       'clickable':
         clickable
     }"
-    :role="cardMeta.role"
-    :tabindex="cardMeta.tabIndex"
-    :aria-label="cardMeta.ariaLabel"
-    :data-testid="`item-card-${id}`"
     @click="_handleCardClick"
-    @keydown.enter="_handleCardClick"
-    @keydown.space.prevent="_handleCardClick"
   >
     <div :class="['item-card-body', variant]">
       <template v-if="variant !== 'small'">
@@ -214,7 +212,16 @@ const cardMeta = computed(() => ({
 
       <div :class="['item-card-body-details', variant]">
         <div :class="['item-card-header', variant]">
-          <div class="item-card-header-left">
+          <div
+            class="item-card-header-left"
+            :data-testid="`card-header-left`"
+            :role="cardMeta.role"
+            :tabindex="cardMeta.tabIndex"
+            :aria-label="cardMeta.ariaLabel"
+            @click.self="_handleCardClick"
+            @keydown.enter="_handleCardClick"
+            @keydown.space.prevent="_handleCardClick"
+          >
             <template v-if="variant === 'small'">
               <slot name="item-card-image">
                 <div
@@ -315,16 +322,22 @@ $image-medium-box-width: 48px;
   border-radius: var(--border-radius-md);
   border: 1px solid var(--border);
   background: var(--body-bg);
+  cursor: v-bind(cursorValue);
 
   &.clickable:hover {
     border-color: var(--primary);
   }
 
-  &:focus-visible {
+  &:has(.item-card-header-left:focus-visible) {
+    border-color: var(--primary);
     @include focus-outline;
     outline-offset: -2px;
   }
 
+  &:focus-visible {
+    outline: none;
+  }
+
   &-image {
     width: $image-medium-box-width;
     height: $image-medium-box-width;
@@ -358,6 +371,10 @@ $image-medium-box-width: 48px;
     &-left {
       flex-grow: 1;
       min-width: 0;
+
+      &:focus-visible {
+        outline: none;
+      }
     }
 
     &-title {

package/store/auth.js

@@ -1,6 +1,5 @@
 import { GITHUB_NONCE, GITHUB_REDIRECT, GITHUB_SCOPE } from '@shell/config/query-params';
-import { NORMAN } from '@shell/config/types';
-import { _MULTI } from '@shell/plugins/dashboard-store/actions';
+import { MANAGEMENT, EXT } from '@shell/config/types';
 import { addObjects, findBy, joinStringList } from '@shell/utils/array';
 import { openAuthPopup, returnTo } from '@shell/utils/auth';
 import { base64Encode } from '@shell/utils/crypto';
@@ -41,8 +40,9 @@ export const state = function() {
     hasAuth:     null,
     loggedIn:    false,
     principalId: null,
-    v3User:      null,
+    user:        null,
     initialPass: null,
+    selfUser:    null,
   };
 };
 
@@ -63,8 +63,8 @@ export const getters = {
     return state.principalId;
   },
 
-  v3User(state) {
-    return state.v3User;
+  user(state) {
+    return state.user;
   },
 
   initialPass(state) {
@@ -73,6 +73,10 @@ export const getters = {
 
   isGithub(state) {
     return state.principalId && state.principalId.startsWith('github_user://');
+  },
+
+  selfUser(state) {
+    return state.selfUser;
   }
 };
 
@@ -81,9 +85,13 @@ export const mutations = {
     state.fromHeader = fromHeader;
   },
 
-  gotUser(state, v3User) {
+  gotUser(state, user) {
     // Always deference to avoid race condition when setting `mustChangePassword`
-    state.v3User = { ...v3User };
+    state.user = { ...user };
+  },
+
+  gotSelfUser(state, selfUser) {
+    state.selfUser = selfUser;
   },
 
   hasAuth(state, hasAuth) {
@@ -101,7 +109,8 @@ export const mutations = {
 
     state.loggedIn = false;
     state.principalId = null;
-    state.v3User = null;
+    state.user = null;
+    state.selfUser = null;
     state.initialPass = null;
   },
 
@@ -115,22 +124,42 @@ export const actions = {
     commit('gotHeader', fromHeader);
   },
 
+  async updateSelfUser({ dispatch, commit }, selfUser) {
+    const classifiedSelfUser = await dispatch('management/create', selfUser, { root: true });
+
+    commit('gotSelfUser', classifiedSelfUser);
+  },
+
+  async getSelfUser({ commit, dispatch, getters }) {
+    if (getters.selfUser) {
+      return Promise.resolve(getters.selfUser);
+    }
+
+    const selfUser = await dispatch('management/request', {
+      url:    `/v1/${ EXT.SELFUSER }`,
+      method: 'POST',
+      data:   {},
+    }, { root: true });
+
+    await dispatch('updateSelfUser', selfUser);
+  },
+
   async getUser({ dispatch, commit, getters }) {
-    if (getters.v3User) {
+    if (getters.user) {
       return;
     }
 
     try {
-      const user = await dispatch('rancher/findAll', {
-        type: NORMAN.USER,
-        opt:  {
-          url:    '/v3/users',
-          filter: { me: true },
-          load:   _MULTI
-        }
-      }, { root: true });
+      let mgmtUser;
 
-      commit('gotUser', user?.[0]);
+      await dispatch('getSelfUser');
+      const selfUser = getters.selfUser;
+
+      if (selfUser) {
+        mgmtUser = await dispatch('management/request', { url: `/v1/${ MANAGEMENT.USER }/${ selfUser.status?.userID }` }, { root: true });
+      }
+
+      commit('gotUser', mgmtUser);
     } catch { }
   },
 
@@ -266,7 +295,16 @@ export const actions = {
     }
 
     if (driver?.scopes) {
-      scopes = [joinStringList(scopes[0], driver.scopes)];
+      // In some cases, driver scopes can be an array. We need to convert this
+      // to a string that can be parsed by `joinStringList()`
+      try {
+        const driverScopes = Array.isArray(driver.scopes) ? driver.scopes.join(' ') : driver.scopes;
+
+        scopes = [joinStringList(scopes[0], driverScopes)];
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error('Failed to join driver scopes', error);
+      }
     }
 
     let url = removeParam(redirectUrl, GITHUB_SCOPE);

package/store/notifications.ts

@@ -387,7 +387,7 @@ export const actions = {
    */
   async init({ commit, getters } : any, userData: any) {
     const userKey = userData.id;
-    const userId = userData.v3User?.uuid;
+    const userId = userData.user?.metadata?.uid;
 
     if (!userKey || !userId) {
       console.error('Unable to initialize notifications - required user info not available'); // eslint-disable-line no-console

package/store/type-map.js

@@ -189,7 +189,7 @@ export const TYPE_MODES = {
    */
   FAVORITE: 'favorite',
   /**
-   * Represents no virtual or spoofed types that have a count.
+   * Represents types that have a count and are not virtual or spoofed.
    *
    * For example the `More Resource` in the cluster explorer
    *
@@ -1586,6 +1586,17 @@ export const mutations = {
         collection: `/${ SPOOFED_PREFIX }/${ schema.id }`,
         ...(schema.links || {})
       };
+
+      const verbs = schema.attributes?.verbs || [];
+
+      if ( !verbs.includes('list') ) {
+        verbs.push('list');
+      }
+
+      schema.attributes = {
+        ...schema?.attributes,
+        verbs
+      };
     });
 
     const existing = findBy(state.spoofedTypes[product], 'type', copy.type);

package/types/shell/index.d.ts

@@ -2077,6 +2077,7 @@ export const POD_DISRUPTION_BUDGET: "policy.poddisruptionbudget";
 export const PV: "persistentvolume";
 export const PVC: "persistentvolumeclaim";
 export const RESOURCE_QUOTA: "resourcequota";
+export const AUDIT_POLICY: "auditlog.cattle.io.auditpolicy";
 export const SCHEMA: "schema";
 export const SERVICE: "service";
 export const SECRET: "secret";
@@ -2246,6 +2247,9 @@ export namespace BRAND {
 }
 export namespace EXT {
     let USER_ACTIVITY: string;
+    let SELFUSER: string;
+    let GROUP_MEMBERSHIP_REFRESH_REQUESTS: string;
+    let PASSWORD_CHANGE_REQUESTS: string;
     let KUBECONFIG: string;
 }
 export namespace CAPI {
@@ -2378,6 +2382,9 @@ export const DEPRECATED: "Deprecated";
 export const EXPERIMENTAL: "Experimental";
 export const AUTOSCALER_CONFIG_MAP_ID: "kube-system/cluster-autoscaler-status";
 export const HOSTED_PROVIDER: "hostedprovider";
+export namespace SAVED_COUNTS {
+    let K8S_CLUSTERS: string;
+}
 }
 
 // @shell/config/version
@@ -3732,20 +3739,8 @@ export default class Resource {
             rows: any[];
         };
     };
-    get _cards(): {
-        component: any;
-        props: {
-            title: any;
-            rows: any[];
-        };
-    }[];
-    get cards(): {
-        component: any;
-        props: {
-            title: any;
-            rows: any[];
-        };
-    }[];
+    get _cards(): any[];
+    get cards(): any[];
 }
 }
 
@@ -3804,6 +3799,7 @@ export default class SteveModel extends HybridModel {
     get modelExtensions(): any;
     cleanForSave(data: any, forNew: any): any;
     paginationEnabled(): any;
+    processSaveResponse(res: any): void;
 }
 import HybridModel from './hybrid-class';
 }
@@ -4089,6 +4085,20 @@ export function overlayIndividualBanners(parsedBanner: any, banners: any): void;
 // @shell/utils/chart
 
 declare module '@shell/utils/chart' {
+/**
+ * Compares two chart versions using SemVer logic, with special handling for Rancher's "up" build metadata.
+ *
+ * It uses `semver.compare` for the primary comparison. If versions are considered equal (SemVer ignores build metadata),
+ * it checks if both versions have build metadata starting with "up". If so, it strips the "up" prefix and compares the remaining strings as versions.
+ *
+ * If the "up" logic doesn't apply or results in equality, it falls back to `semver.compareBuild` to handle
+ * other build metadata differences (e.g. sorting alphabetically).
+ *
+ * @param {string} v1 - The first version string.
+ * @param {string} v2 - The second version string.
+ * @returns {number} - 0 if equal, -1 if v1 < v2, 1 if v1 > v2.
+ */
+export function compareChartVersions(v1: string, v2: string): number;
 /**
  * Get the latest chart version that is compatible with the cluster's OS and user's pre-release preference.
  * @param {Object} chart - The chart object.
@@ -5408,7 +5418,6 @@ export function parse(str: any): any;
 export function sortable(str: any): any;
 export function compare(in1: any, in2: any): any;
 export function isPrerelease(version?: string): boolean;
-export function isUpgradeFromPreToStable(currentVersion: any, targetVersion: any): any;
 export function isDevBuild(version: any): boolean;
 export function getVersionInfo(store: any): {
     displayVersion: any;

package/types/store/dashboard-store.types.ts

@@ -46,6 +46,10 @@ export interface ActionFindAllArgs extends ActionCoreFindArgs {
    * This is done via the native kube pagination api, not steve
    */
   depaginate?: boolean,
+  /**
+   * Specifies the name to use if we should save the count returned in the paginated request
+   */
+  saveCountAs?: string,
 }
 
 /**
@@ -76,6 +80,9 @@ export interface ActionFindPageArgs extends ActionCoreFindArgs {
    * If true don't persist the http response to the store, just pass it back
    */
   transient?: boolean,
+
+  saveCountAs?: string,
+
   /**
    * The target minimum revision for the resource.
    *

package/utils/__tests__/chart.test.ts

@@ -0,0 +1,96 @@
+import { compareChartVersions } from '@shell/utils/chart';
+
+describe('compareChartVersions', () => {
+  describe('standard SemVer Comparison', () => {
+    it('should correctly compare standard versions', () => {
+      expect(compareChartVersions('1.0.0', '2.0.0')).toBe(-1);
+      expect(compareChartVersions('2.0.0', '1.0.0')).toBe(1);
+      expect(compareChartVersions('1.0.0', '1.0.0')).toBe(0);
+    });
+
+    it('should compare minor and patch versions correctly', () => {
+      expect(compareChartVersions('1.0.0', '1.1.0')).toBe(-1);
+      expect(compareChartVersions('1.0.0', '1.0.1')).toBe(-1);
+      expect(compareChartVersions('1.1.0', '1.0.1')).toBe(1);
+    });
+
+    it('should handle loose parsing (v-prefix)', () => {
+      expect(compareChartVersions('v1.0.0', '1.0.0')).toBe(0);
+      expect(compareChartVersions('v1.0.0', 'v2.0.0')).toBe(-1);
+    });
+  });
+
+  describe('rancher "up" Build Metadata Logic', () => {
+    it('should compare inner versions when both have "up" prefix', () => {
+      // 1.0.0 vs 2.0.0 inside the metadata
+      expect(compareChartVersions('1.0.0+up1.0.0', '1.0.0+up2.0.0')).toBe(-1);
+      expect(compareChartVersions('1.0.0+up2.0.0', '1.0.0+up1.0.0')).toBe(1);
+      // Equal inner versions
+      expect(compareChartVersions('1.0.0+up1.0.0', '1.0.0+up1.0.0')).toBe(0);
+    });
+
+    it('should handle pre-releases within "up" metadata correctly', () => {
+      // Crucial test: semver logic ensures 1.0.0-rc.1 < 1.0.0
+      // Standard string sort would often fail here depending on the string
+      expect(compareChartVersions('1.0.0+up1.0.0-rc.1', '1.0.0+up1.0.0')).toBe(-1);
+      expect(compareChartVersions('1.0.0+up1.0.0', '1.0.0+up1.0.0-rc.1')).toBe(1);
+    });
+
+    it('should compare different inner major/minor/patch versions', () => {
+      expect(compareChartVersions('0.0.1+up1.0.0', '0.0.1+up0.1.0')).toBe(1);
+      expect(compareChartVersions('0.0.1+up0.1.0', '0.0.1+up1.0.0')).toBe(-1);
+    });
+
+    it('should prioritize valid inner semver over invalid inner semver', () => {
+      // Valid "up" version > Invalid "up" version
+      expect(compareChartVersions('1.0.0+up1.0.0', '1.0.0+upInvalid')).toBe(1);
+      expect(compareChartVersions('1.0.0+upInvalid', '1.0.0+up1.0.0')).toBe(-1);
+    });
+
+    it('should fall back to lexical sort if both "up" suffixes are invalid semver', () => {
+      // Both are "up..." but not valid semver, so it falls back to semver.compareBuild (lexical)
+      expect(compareChartVersions('1.0.0+upA', '1.0.0+upB')).toBe(-1);
+      expect(compareChartVersions('1.0.0+upB', '1.0.0+upA')).toBe(1);
+    });
+  });
+
+  describe('standard Build Metadata Fallback', () => {
+    it('should correctly compare versions with standard build metadata (lexicographical)', () => {
+      // 1.0.0+a vs 1.0.0+b -> -1
+      expect(compareChartVersions('1.0.0+a', '1.0.0+b')).toBe(-1);
+      expect(compareChartVersions('1.0.0+b', '1.0.0+a')).toBe(1);
+      // 1.0.0+1 vs 1.0.0+2 -> -1
+      expect(compareChartVersions('1.0.0+1', '1.0.0+2')).toBe(-1);
+    });
+
+    it('should use standard comparison if only one has "up" prefix', () => {
+      // "up" comes after "foo" lexically
+      expect(compareChartVersions('1.0.0+foo', '1.0.0+up1.0.0')).toBe(-1);
+      expect(compareChartVersions('1.0.0+up1.0.0', '1.0.0+foo')).toBe(1);
+    });
+  });
+
+  describe('edge Cases and Invalid Inputs', () => {
+    it('should handle null or undefined inputs safely', () => {
+      // Implementation behavior: fallback to utils/version compare
+      // which treats falsy as "high" (return 1) if first arg is null?
+      // Checking implementation of `compare` in shell/utils/version.js:
+      // if (!in1) return 1; if (!in2) return -1;
+      expect(compareChartVersions(null, '1.0.0')).toBe(1);
+      expect(compareChartVersions('1.0.0', null)).toBe(-1);
+      expect(compareChartVersions(undefined, '1.0.0')).toBe(1);
+      expect(compareChartVersions('1.0.0', undefined)).toBe(-1);
+      expect(compareChartVersions(null, null)).toBe(1); // First check is !in1 -> 1
+    });
+
+    it('should handle completely invalid strings', () => {
+      // "invalid" is not valid semver, so it falls back to utils/version compare (string/numeric comparison)
+      // "invalid" vs "1.0.0"
+      // "invalid" is treated as string, "1.0.0" parsed as parts
+      // Effectively tests the fallback logic stability
+      expect(compareChartVersions('invalid', '1.0.0')).not.toBe(0);
+      expect(compareChartVersions('a', 'b')).toBe(-1);
+      expect(compareChartVersions('b', 'a')).toBe(1);
+    });
+  });
+});

package/utils/__tests__/version.test.ts

@@ -1,4 +1,4 @@
-import { isDevBuild, isUpgradeFromPreToStable, getReleaseNotesURL } from '@shell/utils/version';
+import { isDevBuild, getReleaseNotesURL } from '@shell/utils/version';
 
 describe('fx: isDevBuild', () => {
   it.each([
@@ -17,24 +17,6 @@ describe('fx: isDevBuild', () => {
   );
 });
 
-describe('fx: isUpgradeFromPreToStable', () => {
-  it('should be true when going from pre-release to stable of same version', () => {
-    expect(isUpgradeFromPreToStable('1.0.0-rc1', '1.0.0')).toBe(true);
-  });
-
-  it('should be false when going from stable to pre-release', () => {
-    expect(isUpgradeFromPreToStable('1.0.0', '1.0.0-rc1')).toBe(false );
-  });
-
-  it('should be false for stable to stable', () => {
-    expect(isUpgradeFromPreToStable('1.0.0', '1.1.0')).toBe(false);
-  });
-
-  it('should be false for pre-release to pre-release', () => {
-    expect(isUpgradeFromPreToStable('1.0.0-rc1', '1.0.0-rc2')).toBe(false);
-  });
-});
-
 describe('fx: getReleaseNotesURL', () => {
   describe('when version is not provided', () => {
     it('should return the community dev URL', () => {

package/utils/chart.js

@@ -1,5 +1,69 @@
+import semver from 'semver';
+import { compare } from '@shell/utils/version';
 import { compatibleVersionsFor } from '@shell/store/catalog';
 
+/**
+ * Compares two chart versions using SemVer logic, with special handling for Rancher's "up" build metadata.
+ *
+ * It uses `semver.compare` for the primary comparison. If versions are considered equal (SemVer ignores build metadata),
+ * it checks if both versions have build metadata starting with "up". If so, it strips the "up" prefix and compares the remaining strings as versions.
+ *
+ * If the "up" logic doesn't apply or results in equality, it falls back to `semver.compareBuild` to handle
+ * other build metadata differences (e.g. sorting alphabetically).
+ *
+ * @param {string} v1 - The first version string.
+ * @param {string} v2 - The second version string.
+ * @returns {number} - 0 if equal, -1 if v1 < v2, 1 if v1 > v2.
+ */
+export function compareChartVersions(v1, v2) {
+  const v1Valid = semver.valid(v1, { loose: true });
+  const v2Valid = semver.valid(v2, { loose: true });
+
+  if (!v1Valid || !v2Valid) {
+    return compare(v1, v2);
+  }
+
+  // semver.compare ignores build metadata (e.g., 1.0.0+1 == 1.0.0+2)
+  let diff = semver.compare(v1, v2, { loose: true });
+
+  if (diff === 0) {
+    const parsedV1 = semver.parse(v1, { loose: true });
+    const parsedV2 = semver.parse(v2, { loose: true });
+    const buildV1 = parsedV1.build.join('.');
+    const buildV2 = parsedV2.build.join('.');
+
+    // Special logic for Rancher charts where "up" prefix in build metadata contains version info.
+    // E.g. 108.0.0+up0.25.0-rc.4 vs 108.0.0+up0.25.0
+    // Standard semver.compareBuild would sort ASCII: "up...-rc" > "up..." (incorrect for RC)
+    // We strip "up" and compare the rest as versions to properly handle pre-releases (RC < Stable).
+    if (buildV1.startsWith('up') && buildV2.startsWith('up')) {
+      const subV1 = buildV1.substring(2);
+      const subV2 = buildV2.substring(2);
+      const subV1Valid = semver.valid(subV1, { loose: true });
+      const subV2Valid = semver.valid(subV2, { loose: true });
+
+      if (subV1Valid && subV2Valid) {
+        // Both "up" metadata parts are valid semver: compare them semantically.
+        diff = semver.compare(subV1, subV2, { loose: true });
+      } else if (subV1Valid && !subV2Valid) {
+        // Only v1 has valid "up" metadata: prefer v1 over v2.
+        diff = 1;
+      } else if (!subV1Valid && subV2Valid) {
+        // Only v2 has valid "up" metadata: prefer v2 over v1.
+        diff = -1;
+      }
+    }
+
+    // Fallback to standard build comparison for other cases (e.g. 1.0.0+1 vs 1.0.0+2).
+    // semver.compareBuild sorts build metadata lexicographically.
+    if (diff === 0) {
+      diff = semver.compareBuild(v1, v2, { loose: true });
+    }
+  }
+
+  return diff;
+}
+
 /**
  * Get the latest chart version that is compatible with the cluster's OS and user's pre-release preference.
  * @param {Object} chart - The chart object.

package/utils/pagination-wrapper.ts

@@ -31,6 +31,11 @@ interface Args {
     classify?: boolean,
     reactive?: boolean,
   }
+
+  /**
+   * Specifies the name to use if we should save the count returned in the paginated request
+   */
+  saveCountAs?: string;
 }
 
 interface Result<T> extends Omit<ActionFindPageTransientResponse<T>, 'data'> {
@@ -57,6 +62,7 @@ class PaginationWrapper<T extends object> {
   private backOffId: string;
   private classify: boolean;
   private reactive: boolean;
+  private saveCountAs: string | undefined;
   private cachedRevision?: string;
   private cachedResult?: Result<T>;
 
@@ -65,7 +71,7 @@ class PaginationWrapper<T extends object> {
 
   constructor(args: Args) {
     const {
-      $store, id, enabledFor, onChange, formatResponse
+      $store, id, enabledFor, onChange, formatResponse, saveCountAs
     } = args;
 
     this.$store = $store;
@@ -75,6 +81,7 @@ class PaginationWrapper<T extends object> {
     this.onChange = onChange;
     this.classify = formatResponse?.classify || false;
     this.reactive = formatResponse?.reactive || false;
+    this.saveCountAs = saveCountAs;
 
     this.isEnabled = paginationUtils.isEnabled({ rootGetters: $store.getters, $extension: this.$store.$extension }, enabledFor);
   }
@@ -152,9 +159,10 @@ class PaginationWrapper<T extends object> {
       },
       delayedFn: async() => {
         const opt: ActionFindPageArgs = {
-          watch:     false,
+          watch:       false,
           pagination,
-          transient: true,
+          transient:   true,
+          saveCountAs: this.saveCountAs,
           revision
         };
         const res: ActionFindPageTransientResponse<T> = await this.$store.dispatch(`${ this.enabledFor.store }/findPage`, { opt, type });

package/utils/version.js

@@ -3,6 +3,7 @@ import semver from 'semver';
 import { MANAGEMENT } from '@shell/config/types';
 import { READ_WHATS_NEW, SEEN_WHATS_NEW } from '@shell/store/prefs';
 import { SETTING } from '@shell/config/settings';
+import { getVersionData } from '@shell/config/version';
 
 export function parse(str) {
   str = `${ str }`;
@@ -74,21 +75,6 @@ export function isPrerelease(version = '') {
   return !!semver.prerelease(version);
 }
 
-export function isUpgradeFromPreToStable(currentVersion, targetVersion) {
-  if (!isPrerelease(currentVersion) || isPrerelease(targetVersion)) {
-    return false;
-  }
-
-  const cVersion = semver.clean(currentVersion, { loose: true });
-  const tVersion = semver.clean(targetVersion, { loose: true });
-
-  if (cVersion && tVersion && semver.valid(cVersion) && semver.valid(tVersion)) {
-    return semver.lt(cVersion, tVersion);
-  }
-
-  return false;
-}
-
 export function isDevBuild(version) {
   if ( ['dev', 'master', 'head'].includes(version) || version.endsWith('-head') || version.match(/-rc\d+$/) || version.match(/-alpha\d+$/) ) {
     return true;
@@ -98,8 +84,10 @@ export function isDevBuild(version) {
 }
 
 export function getVersionInfo(store) {
-  const setting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.VERSION_RANCHER);
-  const fullVersion = setting?.value || 'unknown';
+  const fullVersion = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.VERSION_RANCHER)?.value ??
+    getVersionData()?.Version ??
+    'unknown';
+
   let displayVersion = fullVersion;
 
   const match = fullVersion.match(/^(.*)-([0-9a-f]{40})-(.*)$/);