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

package/models/ext.cattle.io.kubeconfig.ts

@@ -0,0 +1,97 @@
+import { CAPI, MANAGEMENT } from '@shell/config/types';
+import SteveModel from '@shell/plugins/steve/steve-class';
+import { Location } from 'vue-router';
+
+interface ReferencedCluster {
+  label: string;
+  location: Location | null;
+}
+
+export default class Kubeconfig extends SteveModel {
+  declare spec: {
+    clusters?: string[];
+    ttl?: number;
+  };
+
+  declare metadata: {
+    name?: string;
+    creationTimestamp?: string;
+  };
+
+  get _availableActions(): object[] {
+    const out = super._availableActions;
+
+    // Remove element at index 1 (the first divider), the actions that don't make sense.
+    return out.filter((action: { action: string }, index: number) => index !== 1 && !['goToEdit', 'goToEditYaml', 'cloneYaml', 'download'].includes(action.action));
+  }
+
+  /**
+   * Calculates the expiry timestamp from creationTimestamp + ttl.
+   * Returns an ISO date string for use with LiveDate formatter.
+   */
+  get expiresAt(): string | null {
+    const ttlSeconds = this.spec?.ttl;
+    const creationTimestamp = this.metadata?.creationTimestamp;
+
+    if (!ttlSeconds || !creationTimestamp) {
+      return null;
+    }
+
+    const createdAt = new Date(creationTimestamp);
+    const expiresAt = new Date(createdAt.getTime() + (ttlSeconds * 1000));
+
+    return expiresAt.toISOString();
+  }
+
+  /**
+   * Returns cluster information for display and linking.
+   * Each object contains {label, location} where location is null if cluster doesn't exist.
+   */
+  get referencedClusters(): ReferencedCluster[] {
+    const clusterIds = this.spec?.clusters || [];
+    const provClusters = this.$rootGetters['management/all'](CAPI.RANCHER_CLUSTER) || [];
+    const mgmtClusters = this.$rootGetters['management/all'](MANAGEMENT.CLUSTER) || [];
+
+    return clusterIds.map((id: string) => {
+      const provCluster = provClusters.find((c: any) => c.mgmt?.id === id || c.status?.clusterName === id);
+      const mgmtCluster = mgmtClusters.find((c: any) => c.id === id);
+      const cluster = provCluster || mgmtCluster;
+
+      return {
+        label:    cluster?.nameDisplay || this.t('"ext.cattle.io.kubeconfig".deleted', { name: id }),
+        location: provCluster?.detailLocation || mgmtCluster?.detailLocation || null
+      };
+    });
+  }
+
+  /**
+   * Returns referenced clusters sorted: existing clusters first (by name), then deleted clusters.
+   */
+  get sortedReferencedClusters(): ReferencedCluster[] {
+    return this.referencedClusters.slice().sort((a, b) => {
+      const aExists = a.location !== null;
+      const bExists = b.location !== null;
+
+      if (aExists && !bExists) {
+        return -1;
+      }
+      if (!aExists && bExists) {
+        return 1;
+      }
+
+      const aName = a.label.toLowerCase();
+      const bName = b.label.toLowerCase();
+
+      return aName.localeCompare(bName, undefined, { numeric: true });
+    });
+  }
+
+  /**
+   * Returns a sortable string for the clusters column.
+   */
+  get referencedClustersSortable(): string {
+    return this.sortedReferencedClusters
+      .map((c) => c.label.toLowerCase())
+      .join(',');
+  }
+}

package/models/secret.js

@@ -573,7 +573,7 @@ export default class Secret extends SteveModel {
       const id = this.id?.replace(/.*\//, '');
 
       return {
-        name:   `c-cluster-product-resource-namespace-id`,
+        name:   `c-cluster-product-${ VIRTUAL_TYPES.PROJECT_SECRETS }-namespace-id`,
         params: {
           product:   this.$rootGetters['productId'],
           cluster:   this.$rootGetters['clusterId'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.9-rc.3",
+  "version": "3.0.9-rc.4",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancher/dashboard",
   "license": "Apache-2.0",
@@ -39,7 +39,7 @@
     "@babel/preset-typescript": "7.16.7",
     "@novnc/novnc": "1.2.0",
     "@popperjs/core": "2.11.8",
-    "@rancher/icons": "2.0.54",
+    "@rancher/icons": "2.0.55",
     "@types/is-url": "1.2.30",
     "@types/node": "20.10.8",
     "@types/semver": "^7.5.8",

package/pages/about.vue

@@ -9,6 +9,7 @@ import { mapGetters } from 'vuex';
 import TabTitle from '@shell/components/TabTitle';
 import { PanelLocation, ExtensionPoint } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel';
+import { getVersionInfo } from '@shell/utils/version';
 
 export default {
   components: {
@@ -30,7 +31,7 @@ export default {
   computed: {
     ...mapGetters(['releaseNotesUrl']),
     rancherVersion() {
-      return this.settings.find((s) => s.id === SETTING.VERSION_RANCHER);
+      return getVersionInfo(this.$store).fullVersion;
     },
     appName() {
       return getVendor();
@@ -124,7 +125,7 @@ export default {
           >
             {{ t("about.versions.rancher") }}
           </a>
-        </td><td>{{ rancherVersion.value }}</td>
+        </td><td>{{ rancherVersion }}</td>
       </tr>
       <tr v-if="dashboardVersion">
         <td>

package/pages/c/_cluster/apps/charts/AppChartCardFooter.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { RcItemCardAction } from '@components/RcItemCard';
+import { RcButton } from '@components/RcButton';
 
 interface FooterItem {
   icon?: string;
@@ -30,26 +31,34 @@ function onClickItem(type: string, label: string) {
       class="app-chart-card-footer-item"
       data-testid="app-chart-card-footer-item"
     >
-      <i
-        v-if="footerItem.icon"
-        v-clean-tooltip="t(footerItem.iconTooltip?.key)"
-        :class="['icon', 'app-chart-card-footer-item-icon', footerItem.icon]"
-      />
       <template
         v-for="(label, j) in footerItem.labels"
         :key="j"
       >
         <rc-item-card-action
           v-if="clickable && footerItem.type"
-          v-clean-tooltip="footerItem.labelTooltip"
-          class="app-chart-card-footer-item-text secondary-text-link"
-          data-testid="app-chart-card-footer-item-text"
-          tabindex="0"
-          :aria-label="t('catalog.charts.appChartCard.footerItem.ariaLabel')"
-          @click="onClickItem(footerItem.type, label)"
+          class="app-chart-card-footer-item-text"
         >
-          {{ label }}
-          <span v-if="footerItem.labels.length > 1 && j !== footerItem.labels.length - 1">, </span>
+          <rc-button
+            v-clean-tooltip="footerItem.labelTooltip"
+            variant="ghost"
+            class="app-chart-card-footer-button secondary-text-link"
+            data-testid="app-chart-card-footer-item-text"
+            :aria-label="t('catalog.charts.appChartCard.footerItem.ariaLabel', { filter: label })"
+            @click="onClickItem(footerItem.type, label)"
+          >
+            <template
+              v-if="footerItem.icon"
+              #before
+            >
+              <i
+                v-clean-tooltip="t(footerItem.iconTooltip?.key)"
+                :class="['icon', 'app-chart-card-footer-item-icon', footerItem.icon]"
+              />
+            </template>
+            {{ label }}
+            <span v-if="footerItem.labels.length > 1 && j !== footerItem.labels.length - 1">, </span>
+          </rc-button>
         </rc-item-card-action>
         <span
           v-else
@@ -78,7 +87,6 @@ function onClickItem(type: string, label: string) {
     margin-right: 8px;
 
     &-text {
-      text-transform: capitalize;
       margin-right: 8px;
       display: -webkit-box;
       -webkit-line-clamp: 1;
@@ -98,5 +106,21 @@ function onClickItem(type: string, label: string) {
       margin-right: 8px;
     }
   }
+
+  &-button {
+    text-transform: capitalize;
+  }
+}
+
+button.variant-ghost.app-chart-card-footer-button {
+  padding: 0;
+  gap: 0;
+  min-height: 20px;
+
+  &:focus-visible {
+    border-color: var(--primary);
+    @include focus-outline;
+    outline-offset: -2px;
+  }
 }
 </style>

package/pages/c/_cluster/apps/charts/index.vue

@@ -696,6 +696,7 @@ export default {
             :content="card.content"
             :value="card.rawChart"
             variant="medium"
+            role="link"
             :class="{ 'single-card': appChartCards.length === 1 }"
             :clickable="true"
             @card-click="selectChart"

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

@@ -124,7 +124,7 @@ describe('rcItemCard', () => {
       }
     });
 
-    const root = wrapper.get(`[data-testid="item-card-${ id }"]`);
+    const root = wrapper.get(`[data-testid="card-header-left"]`);
 
     expect(root.attributes('role')).toBe('button');
     expect(root.attributes('tabindex')).toBe('0');
@@ -152,7 +152,9 @@ describe('rcItemCard', () => {
       }
     });
 
-    await wrapper.trigger('keydown.enter');
+    const clickTarget = wrapper.find('.item-card-header-left');
+
+    await clickTarget.trigger('keydown.enter');
     expect(wrapper.emitted('card-click')).toBeTruthy();
   });
 

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/types/shell/index.d.ts

@@ -4089,6 +4089,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 +5422,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/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/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})-(.*)$/);