feat: use harvster prime ext logo for prime version

Signed-off-by: Andy Lee <andy.lee@suse.com>

.github/pull_request_template.md

@@ -8,12 +8,16 @@
     - [ ] Yes, the backend owner is @
     - [ ] No, frontend-only.
 
-### Related Issue #
+### Related Issue
  <!-- Link the issue as harvester/harvester#<issue_number> -->
  harvester/harvester#<issue_number>
 
 
-### Test screenshot or video (Required)
+### Test Steps
-<!-- Attach screenshot or video of the changes and eventual comparison if you find it necessary -->
+ <!-- Provide the test steps for reviewer to verify the issue -->
+1. Go to ... page
+
+### Test screenshot or video
+<!-- Attach screenshot or video of the changes and eventual comparison -->
 
 

.github/workflows/build-and-publish-standalone.yaml

@@ -125,13 +125,6 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-        # Tag builds (RC, formal and sprint releases) ship the tag as the package
-        # version. RC/formal tags already match package.json; sprint tags
-        # (vX.Y.Z-dev-YYYYMMDD) only share its prefix, so pin it here for the build.
-      - name: Pin package version to tag
-        if: ${{ inputs.CI_BUILD_TAG != '' }}
-        run: ./scripts/bump_version.sh "${{ inputs.CI_BUILD_TAG }}"
-
       - id: ci-build-pkg
         name: Build pkg
         run: ./scripts/ci-build-pkg.sh harvester

.github/workflows/build-extension-catalog.yml

@@ -58,12 +58,6 @@ jobs:
       - name: Setup Nodejs with yarn install
         uses: ./.github/actions/setup
 
-        # The catalog image is tagged with the package.json version. Sprint tags
-        # (vX.Y.Z-dev-YYYYMMDD) only share its prefix, so pin it to the tag here.
-      - name: Pin package version to tag
-        if: ${{ github.ref_type == 'tag' }}
-        run: ./scripts/bump_version.sh "${{ github.ref_name }}"
-
       - name: Build and push UI image
         run: |
           publish="yarn publish-pkgs -cp -r ${{ inputs.registry_target }} -o ${{ inputs.registry_user }}"

.github/workflows/build-standalone-on-merge.yaml

@@ -1,6 +1,7 @@
 name: Build Standalone on PR Merge
 
 on:
+  workflow_dispatch: # manually trigger on Github Actions only support PR branch pushed to harvester/harvester-ui-extension
   push:
     branches:
       - main
@@ -29,3 +30,35 @@ jobs:
       id-token: write
     with:
       CI_BRANCH: ${{github.ref_name}}
+  comment-on-pr:
+    name: Comment build result on PR
+    # Only for manual runs so the existing push / pull_request flows are untouched.
+    if: github.event_name == 'workflow_dispatch'
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Add build artifact comment to the PR opened from this branch
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: ${{ github.ref_name }}
+        run: |
+          set -euo pipefail
+          # Match scripts/version: sanitize the branch and map main -> latest.
+          if [ "$BRANCH" = "main" ]; then
+            DIR="latest"
+          else
+            DIR=$(printf '%s' "$BRANCH" | sed -E 's/[^a-zA-Z0-9.-]+/-/g')
+          fi
+          URL="https://releases.rancher.com/harvester-ui/dashboard/${DIR}/index.html"
+
+          PR=$(gh pr list --repo "$GITHUB_REPOSITORY" --state open --base main --head "$BRANCH" --json number --jq '.[0].number // empty')
+          if [ -z "$PR" ]; then
+            echo "No open PR found for branch $BRANCH, skipping comment."
+            exit 0
+          fi
+
+          BODY=$(printf '🚀 **UI Artifact Build Status:** `SUCCESS` ✅\n> ui-index: %s\n> ui-source: external' "$URL")
+          gh pr comment "$PR" --repo "$GITHUB_REPOSITORY" --body "$BODY"

package.json

@@ -1,13 +1,13 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.9.1-rc3",
+  "version": "1.10.0-dev",
   "private": false,
   "engines": {
     "node": ">=24.0.0"
   },
   "dependencies": {
     "@babel/plugin-transform-class-static-block": "7.29.7",
-    "@rancher/shell": "3.0.12-rc.7",
+    "@rancher/shell": "3.0.13",
     "@vue-flow/background": "^1.3.0",
     "@vue-flow/controls": "^1.1.1",
     "@vue-flow/core": "^1.33.5",
@@ -48,15 +48,17 @@
     "dev": "NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve",
     "build": "./node_modules/.bin/vue-cli-service build",
     "clean": "./node_modules/@rancher/shell/scripts/clean",
-    "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
+    "lint": "./node_modules/@rancher/shell/scripts/lint --max-warnings 0 --ext .js,.ts,.vue .",
-    "lint:fix": "./node_modules/.bin/eslint --fix --max-warnings 0 --ext .js,.ts,.vue .",
+    "lint:fix": "./node_modules/@rancher/shell/scripts/lint --fix --max-warnings 0 --ext .js,.ts,.vue .",
     "build-pkg": "./node_modules/@rancher/shell/scripts/build-pkg.sh",
     "serve-pkgs": "./node_modules/@rancher/shell/scripts/serve-pkgs",
     "publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish",
     "parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name",
     "commitlint": "commitlint --edit",
     "prepare": "husky",
-    "agents:generate": "./scripts/generate-agent-and-persona-mds.sh"
+    "agents:generate": "./scripts/generate-agent-and-persona-mds.sh",
+    "prelint": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error",
+    "prelint:fix": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error"
   },
   "devDependencies": {
     "@commitlint/load": "^19.8.1",

pkg/harvester/components/SettingList.vue

@@ -10,7 +10,6 @@ import { docLink } from '../utils/feature-flags';
 const CATEGORY = {
   ui: [
     'branding',
-    HCI_SETTING.SERVER_FLAVOR,
     'ui-source',
     'ui-index',
   ]
@@ -54,7 +53,7 @@ export default {
     };
   },
 
-  computed: { ...mapGetters({ t: 'i18n/t', isHarvesterPrime: 'harvester-common/isHarvesterPrime' }) },
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
 
   watch: {
     settings: {
@@ -270,8 +269,7 @@ export default {
           v-if="!setting.hide"
           class="settings-value"
         >
-          <pre v-if="setting.id === 'branding' && isHarvesterPrime">{{ $store.getters['harvester-common/privateLabel'] }}</pre>
+          <pre v-if="setting.kind === 'json'">{{ setting.json }}</pre>
-          <pre v-else-if="setting.kind === 'json'">{{ setting.json }}</pre>
           <pre v-else-if="setting.kind === 'multiline'">{{ setting.data.value || setting.data.default }}</pre>
           <pre v-else-if="setting.kind === 'enum'">{{ t(setting.enum) }}</pre>
           <pre v-else-if="setting.kind === 'custom' && setting.custom">{{ setting.custom }}</pre>

pkg/harvester/config/feature-flags.js

@@ -77,11 +77,6 @@ const FEATURE_FLAGS = {
     'staticIPForVM',
     'fsFreezeDeadline',
   ],
-  'v1.9.1': [
-    'lvmDmThinOnly',
-    'highPerformanceStorage',
-  ],
-  'v1.10.0': [],
 };
 
 const generateFeatureFlags = () => {

pkg/harvester/config/harvester-cluster.js

@@ -57,8 +57,6 @@ import {
 } from './table-headers';
 import { ADD_ONS } from './harvester-map';
 import { registerAddonSideNav } from '../utils/dynamic-nav';
-import { setVendor } from '@shell/config/private-label';
-import { createCssVars } from '@shell/utils/color';
 
 const TEMPLATE = HCI.VM_VERSION;
 const MONITORING_GROUP = 'Monitoring & Logging::Monitoring';
@@ -111,51 +109,15 @@ export function init($plugin, store) {
       }
     };
 
-    store.watch(
+    store.dispatch('setIsSingleProduct', {
-      (_state, getters) => JSON.stringify([
+      productName:       PRODUCT_NAME,
-        !!getters['harvester-common/isHarvesterPrime'],
+      logo:              require(`@shell/assets/images/providers/harvester.svg`),
-        getters['prefs/theme'] === 'dark',
+      productNameKey:    'harvester.productLabel',
-        getters['harvester-common/privateLabel']
+      getVersionInfo:    (store) => store.getters[`${ PRODUCT_NAME }/byId`]?.(HCI.SETTING, 'server-version')?.value || 'unknown',
-      ]),
+      afterLoginRoute:   home,
-      (value) => {
+      logoRoute:         home,
-        const [isHarvesterPrime, isDark, privateLabel] = JSON.parse(value);
+      supportCustomLogo: true
-        const primeLogo = isDark ? require('../assets/images/dark/suse-virtualization.svg') : require('../assets/images/suse-virtualization.svg');
+    });
-
-        setVendor(privateLabel || '');
-
-        let primaryColorStyle = document.getElementById('harvester-prime-primary-color');
-
-        // set harvester prime primary color style to #4dd192 (Cyan Green)
-        if (isHarvesterPrime) {
-          if (!primaryColorStyle) {
-            primaryColorStyle = document.createElement('style');
-            primaryColorStyle.id = 'harvester-prime-primary-color';
-            document.head.appendChild(primaryColorStyle);
-            primaryColorStyle.sheet.insertRule('body.theme-light, body.theme-dark {}', 0);
-          }
-
-          const colors = createCssVars('#4dd192', isDark ? 'dark' : 'light');
-          const rule = primaryColorStyle.sheet.cssRules[0];
-
-          Object.entries(colors).forEach(([property, color]) => rule.style.setProperty(property.trim(), color));
-        } else {
-          primaryColorStyle?.remove();
-        }
-
-        const primeLabelKey = privateLabel ? 'harvester.branding.primeLabel' : 'harvester.branding.primeEmptyLabel';
-
-        store.dispatch('setIsSingleProduct', {
-          productName:       PRODUCT_NAME,
-          logo:              isHarvesterPrime ? primeLogo : require(`@shell/assets/images/providers/harvester.svg`),
-          productNameKey:    isHarvesterPrime ? primeLabelKey : 'harvester.productLabel',
-          getVersionInfo:    (store) => store.getters[`${ PRODUCT_NAME }/byId`]?.(HCI.SETTING, 'server-version')?.value || 'unknown',
-          afterLoginRoute:   home,
-          logoRoute:         home,
-          supportCustomLogo: !isHarvesterPrime
-        });
-      },
-      { immediate: true }
-    );
   }
 
   product({

pkg/harvester/config/settings.ts

@@ -3,7 +3,6 @@ export const HCI_SETTING = {
   CONTAINERD_REGISTRY:                      'containerd-registry',
   LOG_LEVEL:                                'log-level',
   SERVER_VERSION:                           'server-version',
-  SERVER_FLAVOR:                            'server-flavor',
   UI_INDEX:                                 'ui-index',
   UPGRADE_CHECKER_ENABLED:                  'upgrade-checker-enabled',
   UPGRADE_CHECKER_URL:                      'upgrade-checker-url',
@@ -69,7 +68,6 @@ export const HCI_ALLOWED_SETTINGS = {
     kind: 'json', from: 'import', featureFlag: 'csiOnlineExpandValidation'
   },
   [HCI_SETTING.SERVER_VERSION]:               { readOnly: true },
-  [HCI_SETTING.SERVER_FLAVOR]:                { readOnly: true },
   [HCI_SETTING.UPGRADE_CHECKER_ENABLED]:      { kind: 'boolean' },
   [HCI_SETTING.UPGRADE_CHECKER_URL]:          { kind: 'url' },
   [HCI_SETTING.HTTP_PROXY]:                   { kind: 'json', from: 'import' },

pkg/harvester/config/types.js

@@ -15,6 +15,13 @@ export const VOLUME_MODE = {
   FILE_SYSTEM: 'Filesystem'
 };
 
+export const ACCESS_MODE = {
+  READ_WRITE_MANY:     'ReadWriteMany',
+  READ_WRITE_ONCE:     'ReadWriteOnce',
+  READ_ONLY_MANY:      'ReadOnlyMany',
+  READ_WRITE_ONCE_POD: 'ReadWriteOncePod',
+};
+
 export const NETWORK_PROTOCOL = {
   IPv4: 'IPv4',
   IPv6: 'IPv6',

pkg/harvester/edit/harvesterhci.io.cloudtemplate.vue

@@ -7,7 +7,6 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
 import YamlEditor from '@shell/components/YamlEditor';
 
 import CreateEditView from '@shell/mixins/create-edit-view';
-import FormValidation from '@shell/mixins/form-validation';
 import { HCI } from '@pkg/harvester/config/labels-annotations';
 
 export default {
@@ -24,19 +23,14 @@ export default {
     NameNsDescription,
   },
 
-  mixins: [CreateEditView, FormValidation],
+  mixins: [CreateEditView],
 
   inheritAttrs: false,
 
   data() {
     return {
-      config:         this.value.data?.cloudInit || '',
+      config: this.value.data?.cloudInit || '',
-      type:           this.value?.metadata?.labels?.[HCI.CLOUD_INIT] || 'user',
+      type:   this.value?.metadata?.labels?.[HCI.CLOUD_INIT] || 'user',
-      fvFormRuleSets: [{
-        path:           'metadata.name',
-        rules:          ['required'],
-        translationKey: 'nameNsDescription.name.label',
-      }],
     };
   },
 
@@ -84,7 +78,6 @@ export default {
     :resource="value"
     :errors="errors"
     :apply-hooks="applyHooks"
-    :validation-passed="fvFormIsValid"
     @finish="save"
     @cancel="done"
     @error="e=>errors=e"
@@ -93,7 +86,6 @@ export default {
       :value="value"
       :mode="mode"
       :namespaced="true"
-      :rules="{ name: fvGetAndReportPathRules('metadata.name') }"
       @update:value="$emit('update:value', $event)"
     />
 

pkg/harvester/edit/harvesterhci.io.storage/CDISettings.vue

@@ -1,5 +1,5 @@
 <script>
-import { VOLUME_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import ArrayList from '@shell/components/form/ArrayList';
 import { Checkbox } from '@components/Form/Checkbox';
@@ -10,6 +10,10 @@ import { HCI_SETTING } from '../../config/settings';
 import { allHash } from '@shell/utils/promise';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 
+const {
+  READ_WRITE_ONCE, READ_ONLY_MANY, READ_WRITE_MANY, READ_WRITE_ONCE_POD
+} = ACCESS_MODE;
+
 export default {
   name: 'CDISettings',
 
@@ -90,10 +94,10 @@ export default {
 
     accessModeOptions() {
       return [
-        { label: 'ReadWriteOnce', value: 'ReadWriteOnce' },
+        { label: READ_WRITE_ONCE, value: READ_WRITE_ONCE },
-        { label: 'ReadOnlyMany', value: 'ReadOnlyMany' },
+        { label: READ_ONLY_MANY, value: READ_ONLY_MANY },
-        { label: 'ReadWriteMany', value: 'ReadWriteMany' },
+        { label: READ_WRITE_MANY, value: READ_WRITE_MANY },
-        { label: 'ReadWriteOncePod', value: 'ReadWriteOncePod' },
+        { label: READ_WRITE_ONCE_POD, value: READ_WRITE_ONCE_POD },
       ];
     },
 

pkg/harvester/edit/harvesterhci.io.storage/provisioners/lvm.driver.harvesterhci.io.vue

@@ -7,12 +7,8 @@ import { allHash } from '@shell/utils/promise';
 import { clone } from '@shell/utils/object';
 import { HCI } from '../../../types';
 import { NODE } from '@shell/config/types';
-import { _CREATE, _CLONE } from '@shell/config/query-params';
 import { LVM_TOPOLOGY_LABEL } from '../index.vue';
 
-const STRIPED_TYPE = 'striped';
-const DM_THIN_TYPE = 'dm-thin';
-
 const DEFAULT_PARAMETERS = [
   'type',
   'vgName'
@@ -58,17 +54,8 @@ export default {
   data() {
     const node = (this.value.allowedTopologies?.[0]?.matchLabelExpressions || []).find((t) => t.key === LVM_TOPOLOGY_LABEL)?.values[0];
 
-    // striped is dropped once the LVM add-on reaches GA (v1.9.1); dm-thin is the only supported type.
-    const dmThinOnly = this.$store.getters['harvester-common/getFeatureEnabled']('lvmDmThinOnly');
-    const volumeGroupTypes = dmThinOnly ? [DM_THIN_TYPE] : [STRIPED_TYPE, DM_THIN_TYPE];
-
-    // Default new storage classes to dm-thin, and reset a cloned striped type that is no longer selectable.
-    if (dmThinOnly && [_CREATE, _CLONE].includes(this.realMode) && !volumeGroupTypes.includes(this.value.parameters.type)) {
-      this.value.parameters.type = DM_THIN_TYPE;
-    }
-
     return {
-      volumeGroupTypes,
+      volumeGroupTypes: ['striped', 'dm-thin'],
       node,
     };
   },

pkg/harvester/edit/harvesterhci.io.volume.vue

@@ -26,9 +26,11 @@ import { HCI, VOLUME_SNAPSHOT } from '../types';
 import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
 import { DATA_ENGINE_V2 } from '../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../utils/unit';
-import { VOLUME_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
 import { isInternalStorageClass } from '../utils/storage-class';
 
+const { READ_WRITE_MANY, READ_WRITE_ONCE, READ_ONLY_MANY } = ACCESS_MODE;
+
 export default {
   name: 'HarvesterVolume',
 
@@ -83,7 +85,7 @@ export default {
     if (this.mode === _CREATE) {
       // default volumeMode to Block
       this.value.spec.volumeMode = VOLUME_MODE.BLOCK;
-      this.value.spec.accessModes = ['ReadWriteMany'];
+      this.value.spec.accessModes = [READ_WRITE_MANY];
     }
 
     const storage = this.value?.spec?.resources?.requests?.storage || null;
@@ -160,7 +162,7 @@ export default {
     },
 
     accessModeOptions() {
-      return ['ReadWriteOnce', 'ReadWriteMany', 'ReadOnlyMany'];
+      return [READ_WRITE_ONCE, READ_WRITE_MANY, READ_ONLY_MANY];
     },
 
     imageOption() {
@@ -355,7 +357,7 @@ export default {
 
     getAccessMode() {
       if (!this.longhornV2LVMSupport) {
-        return ['ReadWriteMany'];
+        return [READ_WRITE_MANY];
       }
 
       if (this.value?.spec?.accessModes && this.value?.spec?.accessModes?.length > 0) {
@@ -371,7 +373,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.value.thirdPartyStorageFeatureEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
+      return readWriteOnce ? [READ_WRITE_ONCE] : [READ_WRITE_MANY];
     },
     buildDataVolumeObj() {
       const storage = {

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue

@@ -16,10 +16,12 @@ import { PLUGIN_DEVELOPER, DEV } from '@shell/store/prefs';
 import { VOLUME_HOTPLUG_ACTION, SOURCE_TYPE } from '../../../config/harvester-map';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester';
 import { HCI } from '../../../types';
-import { VOLUME_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
 import { OFF } from '../../../models/kubevirt.io.virtualmachine';
 import { EMPTY_IMAGE } from '../../../utils/vm';
 
+const { READ_WRITE_MANY } = ACCESS_MODE;
+
 export default {
   emits: ['update:value'],
 
@@ -69,7 +71,7 @@ export default {
 
     customAccessMode: {
       type:    String,
-      default: 'ReadWriteMany'
+      default: READ_WRITE_MANY
     },
 
     resourceType: {

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue

@@ -14,7 +14,9 @@ import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storagec
 import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../../../../utils/unit';
 import { isInternalStorageClass } from '../../../../utils/storage-class';
-import { VOLUME_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+
+const { READ_WRITE_MANY, READ_WRITE_ONCE } = ACCESS_MODE;
 
 export default {
   name: 'HarvesterEditVolume',
@@ -205,7 +207,7 @@ export default {
 
     getAccessMode(storageClassName) {
       if (!this.longhornV2LVMSupport) {
-        return 'ReadWriteMany';
+        return READ_WRITE_MANY;
       }
 
       const storageClass = this.storageClasses.find((sc) => sc.name === storageClassName);
@@ -216,7 +218,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.thirdPartyStorageClassEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? 'ReadWriteOnce' : 'ReadWriteMany';
+      return readWriteOnce ? READ_WRITE_ONCE : READ_WRITE_MANY;
     },
 
     update() {

pkg/harvester/harvester-prime.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 165"><defs><style>.cls-1{fill:#30BA78;}.cls-2{fill:#fff;}</style></defs><rect class="cls-1" width="200" height="165" rx="20"/><path class="cls-2" d="M158.93945,121.73682H119.40527a5.0009,5.0009,0,0,1-4.33007-2.5L95.30859,84.99951a4.99813,4.99813,0,0,1,0-5L115.0752,45.7627a5.00088,5.00088,0,0,1,4.33007-2.5h39.53418a5.00088,5.00088,0,0,1,4.33008,2.5l19.7666,34.23681a4.99808,4.99808,0,0,1,0,5l-19.7666,34.23731A5.0009,5.0009,0,0,1,158.93945,121.73682Zm-36.64746-10h33.76074l16.87989-29.23731L156.05273,53.2627H122.292L105.41211,82.49951Z"/><path class="cls-2" d="M147.39258,101.73633H130.95312a5.0009,5.0009,0,0,1-4.33007-2.5L118.40332,85a4.99813,4.99813,0,0,1,0-5l8.21973-14.2373a5.00088,5.00088,0,0,1,4.33007-2.5h16.43946a5.00091,5.00091,0,0,1,4.33008,2.5L159.94238,80a4.99808,4.99808,0,0,1,0,5l-8.21972,14.23633A5.00093,5.00093,0,0,1,147.39258,101.73633Zm-13.55274-10h10.666l5.333-9.23633-5.333-9.2373h-10.666l-5.333,9.2373Z"/><path class="cls-2" d="M50.34082,121.73682H40.958a5.00092,5.00092,0,0,1-4.33008-2.5L16.86133,84.99951a4.99808,4.99808,0,0,1,0-5L36.62793,45.7627a5.0009,5.0009,0,0,1,4.33008-2.5h9.38281a5,5,0,0,1,0,10H43.84473L26.96484,82.49951l16.87989,29.23731h6.49609a5,5,0,1,1,0,10Z"/><path class="cls-2" d="M76.49023,121.73682H67.10742a5.00093,5.00093,0,0,1-4.33008-2.5L43.01074,84.99951a4.99813,4.99813,0,0,1,0-5L62.77734,45.7627a5.00091,5.00091,0,0,1,4.33008-2.5h9.38281a5,5,0,0,1,0,10H69.99414L53.11426,82.49951l16.87988,29.23731h6.49609a5,5,0,0,1,0,10Z"/><path class="cls-2" d="M102.63867,121.73682H93.25684a5.0009,5.0009,0,0,1-4.33008-2.5L69.16016,84.99951a4.99808,4.99808,0,0,1,0-5L88.92676,45.7627a5.00088,5.00088,0,0,1,4.33008-2.5h9.38183a5,5,0,0,1,0,10H96.14355L79.26367,82.49951l16.87988,29.23731h6.49512a5,5,0,1,1,0,10Z"/><path class="cls-2" d="M130.958,73.26367a4.99757,4.99757,0,0,1-4.335-2.501l-11.54785-20a5,5,0,1,1,8.66015-5l11.54785,20a5.00157,5.00157,0,0,1-4.32519,7.501Z"/><path class="cls-2" d="M147.3877,73.26367a5.00157,5.00157,0,0,1-4.3252-7.501l11.54688-20a5,5,0,1,1,8.66015,5l-11.54687,20A4.99758,4.99758,0,0,1,147.3877,73.26367Z"/><path class="cls-2" d="M178.70605,87.5H155.6123a5,5,0,0,1,0-10h23.09375a5,5,0,0,1,0,10Z"/><path class="cls-2" d="M122.7334,87.5H99.63867a5,5,0,1,1,0-10H122.7334a5,5,0,1,1,0,10Z"/><path class="cls-2" d="M119.40039,121.73779a5.00157,5.00157,0,0,1-4.32519-7.501l11.54785-20.00049a5,5,0,1,1,8.66015,5l-11.54785,20.00049A4.99757,4.99757,0,0,1,119.40039,121.73779Z"/><path class="cls-2" d="M158.94434,121.73779a4.99757,4.99757,0,0,1-4.335-2.501L143.0625,99.23633a5,5,0,0,1,8.66016-5l11.54687,20.00049a5.00157,5.00157,0,0,1-4.32519,7.501Z"/><path class="cls-2" d="M101.50195,87.49951H21.19141a5,5,0,0,1,0-10h80.31054a5,5,0,0,1,0,10Z"/></svg>

pkg/harvester/index.ts

@@ -7,10 +7,11 @@ import harvesterStore from './store/harvester-store';
 import customValidators from './validators';
 import { PRODUCT_NAME } from './config/harvester';
 import { defineAsyncComponent } from 'vue';
+import semver from 'semver';
 import './styles/vue-flow.scss';
 
 // Init the package
-export default function (plugin: IPlugin) {
+export default function(plugin: IPlugin) {
   const isDev = process.env.NODE_ENV !== 'production';
   const isSingleVirtualCluster = process.env.rancherEnv === PRODUCT_NAME;
 
@@ -20,8 +21,19 @@ export default function (plugin: IPlugin) {
   // Provide plugin metadata from package.json
   plugin.metadata = require('./package.json');
 
-  // Built-in icon
+  const version = semver.parse(plugin.metadata.version);
-  plugin.metadata.icon = require('./icon.svg');
+  const isHarvesterPrime = (version?.patch ?? 0) > 0;
+  const rancher = typeof plugin.metadata.rancher === 'object' ? plugin.metadata.rancher : {};
+
+  plugin.metadata.description = isHarvesterPrime ? 'Rancher UI Extension for Harvester Prime' : 'Rancher UI Extension for Harvester';
+  plugin.metadata.rancher = {
+    ...rancher,
+    annotations: {
+      ...rancher?.annotations,
+      'catalog.cattle.io/display-name': isHarvesterPrime ? 'SUSE Virtualization' : 'Harvester',
+    },
+  };
+  plugin.metadata.icon = isHarvesterPrime ? require('./harvester-prime.svg') : require('./icon.svg');
 
   plugin.addProduct(require('./config/harvester-cluster'));
 

pkg/harvester/l10n/en-us.yaml

@@ -84,8 +84,6 @@ dialog:
 
 harvester:
   branding:
-    primeLabel: '{vendor}'
-    primeEmptyLabel: ''
     logos:
       tip: 'Upload a logo to replace the Harvester logo in the top-level navigation header. Image height should be 21 pixels with a max width of 200 pixels. Max file size is 20KB. Accepted formats: JPEG, PNG, SVG.'
     favicon:
@@ -2447,7 +2445,6 @@ advancedSettings:
     'harv-containerd-registry': Containerd Registry Configuration to connect private registries.
     'harv-log-level': Configure Harvester server log level. Defaults to Info.
     'harv-server-version': Harvester server version.
-    'harv-server-flavor': "Indicates the Harvester edition: Prime or Community."
     'harv-upgrade-checker-enabled': Specifies whether to enable Harvester upgrade check or not. Default is True.
     'harv-upgrade-checker-url': Default Harvester upgrade check url. Only used when the <code>upgrade-checker-enabled</code> is equal to True.
     'harv-ui-source': Configure how to load the UI source. The `External` option is used to load the UI from a ui-index URL, while the `Bundled` option loads the UI from the local Harvester server.

pkg/harvester/mixins/harvester-vm/index.js

@@ -25,7 +25,9 @@ import { HCI } from '../../types';
 import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
 import impl, { QGA_JSON, USB_TABLET } from './impl';
 import { GIBIBYTE } from '../../utils/unit';
-import { VOLUME_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE, ACCESS_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
+
+const { READ_WRITE_MANY } = ACCESS_MODE;
 
 const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
 
@@ -276,7 +278,7 @@ export default {
     },
 
     customAccessMode() {
-      return this.storageClassSetting.accessModes || 'ReadWriteMany';
+      return this.storageClassSetting.accessModes || READ_WRITE_MANY;
     },
 
     isWindows() {
@@ -504,7 +506,7 @@ export default {
           id:               randomStr(5),
           source:           SOURCE_TYPE.IMAGE,
           name:             'disk-0',
-          accessMode:       'ReadWriteMany', // root disk only support LHv1 volume, should be RWX
+          accessMode:       READ_WRITE_MANY, // root disk only support LHv1 volume, should be RWX
           bus,
           volumeName:       '',
           size,
@@ -570,7 +572,7 @@ export default {
               const pvcResource = allPVCs.find( (O) => O.id === `${ namespace }/${ volume?.persistentVolumeClaim?.claimName }`);
 
               source = SOURCE_TYPE.ATTACH_VOLUME;
-              accessMode = pvcResource?.spec?.accessModes?.[0] || 'ReadWriteMany';
+              accessMode = pvcResource?.spec?.accessModes?.[0] || READ_WRITE_MANY;
               size = pvcResource?.spec?.resources?.requests?.storage || '10Gi';
               storageClassName = pvcResource?.spec?.storageClassName;
               volumeMode = pvcResource?.spec?.volumeMode || VOLUME_MODE.BLOCK;
@@ -1315,8 +1317,9 @@ export default {
       case SOURCE_TYPE.IMAGE: {
         const image = this.images.find( (I) => R.image === I.id);
 
+        out.spec.storageClassName = R.realName ? R.storageClassName : (R.storageClassName || image?.storageClassName);
+
         if (image) {
-          out.spec.storageClassName = image.storageClassName;
           out.metadata.annotations = { [HCI_ANNOTATIONS.IMAGE_ID]: image.id };
         } else {
           out.metadata.annotations = { [HCI_ANNOTATIONS.IMAGE_ID]: '' };

pkg/harvester/models/management/management.cattle.io.setting.js

@@ -1,14 +0,0 @@
-import ManagementSetting from '@shell/models/management.cattle.io.setting';
-import { HCI_SETTING } from '../../config/settings';
-
-export default class HarvesterManagementSetting extends ManagementSetting {
-  get _availableActions() {
-    const actions = super._availableActions;
-
-    if (this.$rootGetters['isStandaloneHarvester'] && this.id === HCI_SETTING.UI_PL) {
-      return actions.filter((action) => !['goToClone', 'promptRemove'].includes(action.action));
-    }
-
-    return actions;
-  }
-}

pkg/harvester/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.9.1-rc3",
+  "version": "1.10.0-dev",
   "private": false,
   "rancher": {
     "annotations": {

pkg/harvester/pages/c/_cluster/brand/index.vue

@@ -63,7 +63,6 @@ export default {
     return {
       vendor:             getVendor(),
       uiPLSetting:        {},
-      privateLabelDraft:  null,
       uiLogoDarkSetting:  {},
       uiLogoDark:         '',
       uiLogoLightSetting: {},
@@ -82,17 +81,6 @@ export default {
     };
   },
   computed: {
-    isHarvesterPrime() {
-      return !!this.$store.getters['harvester-common/isHarvesterPrime'];
-    },
-    privateLabel: {
-      get() {
-        return this.privateLabelDraft ?? (this.isHarvesterPrime ? this.$store.getters['harvester-common/privateLabel'] : this.uiPLSetting.value);
-      },
-      set(value) {
-        this.privateLabelDraft = value;
-      }
-    },
     mode() {
       const schema = this.$store.getters[`management/schemaFor`](MANAGEMENT.SETTING);
 
@@ -124,7 +112,7 @@ export default {
       this.errors.push(e);
     },
     async save(btnCB) {
-      this.uiPLSetting.value = (this.privateLabel || '').replaceAll(/[\<>&=#()"]/gm, '');
+      this.uiPLSetting.value = this.uiPLSetting.value.replaceAll(/[\<>&=#()"]/gm, '');
       if (this.customizeLogo) {
         this.uiLogoLightSetting.value = this.uiLogoLight;
         this.uiLogoDarkSetting.value = this.uiLogoDark;
@@ -181,7 +169,7 @@ export default {
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model:value="privateLabel"
+            v-model:value="uiPLSetting.value"
             :label="t('branding.uiPL.label')"
             :mode="mode"
             :maxlength="100"

pkg/harvester/store/harvester-common.js

@@ -1,6 +1,4 @@
 import Parse from 'url-parse';
-import { MANAGEMENT } from '@shell/config/types';
-import { SETTING } from '@shell/config/settings';
 import { HCI } from '../types';
 import { PRODUCT_NAME } from '../config/harvester';
 import { featureEnabled, getVersion } from '../utils/feature-flags';
@@ -66,23 +64,6 @@ const mutations = {
 };
 
 const getters = {
-  isHarvesterPrime: (_state, _getters, _rootState, rootGetters) => {
-    const setting = rootGetters['harvester/byId']?.(HCI.SETTING, 'server-flavor');
-
-    return (setting?.value || setting?.default) === 'prime';
-  },
-
-  privateLabel: (_state, getters, _rootState, rootGetters) => {
-    const setting = rootGetters['management/byId']?.(MANAGEMENT.SETTING, SETTING.PL);
-    const value = setting?.value || '';
-
-    if (getters.isHarvesterPrime && value === (setting?.default || 'Harvester')) {
-      return '';
-    }
-
-    return value;
-  },
-
   getBundleId(state) {
     return state.latestBundleId;
   },

pkg/harvester/utils/dynamic-nav.js

@@ -1,5 +1,3 @@
-import { FAVORITE_TYPES } from '@shell/store/prefs';
-
 /**
  * Dynamically toggles SideNav entries based on the enabled status of a specific Addon.
  *
@@ -28,13 +26,10 @@ export function registerAddonSideNav(store, productName, {
 
     // Toggle the trigger a few times so an early kick (fired before the SideNav
     // has mounted on first login) is retried once the component is listening.
-    // Use the prefs/load mutation (in-memory only)
     [0, 600, 1500].forEach((delay) => {
       setTimeout(() => {
-        const base = (store.getters['prefs/get'](FAVORITE_TYPES) || []).filter((t) => t !== TRIGGER);
+        store.dispatch('type-map/addFavorite', TRIGGER);
-
+        setTimeout(() => store.dispatch('type-map/removeFavorite', TRIGGER), 300);
-        store.commit('prefs/load', { key: FAVORITE_TYPES, value: [...base, TRIGGER] });
-        setTimeout(() => store.commit('prefs/load', { key: FAVORITE_TYPES, value: [...base] }), 300);
       }, delay);
     });
   };