From 86461e1dbd5a3b1998093ef5aabf5eda3e2e888d Mon Sep 17 00:00:00 2001 From: "andy.lee" Date: Tue, 12 Nov 2024 15:48:12 +0800 Subject: [PATCH] add getServerVersion in harvester-common store --- pkg/harvester/components/UpgradeInfo.vue | 2 +- pkg/harvester/components/settings/storage-network.vue | 2 +- pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue | 2 +- pkg/harvester/list/harvesterhci.io.host.vue | 2 +- pkg/harvester/pages/c/_cluster/support/index.vue | 2 +- pkg/harvester/store/harvester-common.js | 4 ++-- pkg/harvester/utils/feature-flags.js | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/harvester/components/UpgradeInfo.vue b/pkg/harvester/components/UpgradeInfo.vue index 84c23a26..2ea4ec55 100644 --- a/pkg/harvester/components/UpgradeInfo.vue +++ b/pkg/harvester/components/UpgradeInfo.vue @@ -21,7 +21,7 @@ export default { }, upgradeLink() { - const version = this.$rootGetters['harvester-common/getServerVersion'](); + const version = this.$store.getters['harvester-common/getServerVersion'](); return docLink(DOC.UPGRADE_URL, version); } diff --git a/pkg/harvester/components/settings/storage-network.vue b/pkg/harvester/components/settings/storage-network.vue index d0b27628..8aaa6aaf 100644 --- a/pkg/harvester/components/settings/storage-network.vue +++ b/pkg/harvester/components/settings/storage-network.vue @@ -88,7 +88,7 @@ export default { computed: { storageNetworkExampleLink() { - const version = this.$rootGetters['harvester-common/getServerVersion'](); + const version = this.$store.getters['harvester-common/getServerVersion'](); return docLink(DOC.STORAGE_NETWORK_EXAMPLE, version); }, diff --git a/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue b/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue index de16e351..d742ee26 100644 --- a/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue +++ b/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue @@ -91,7 +91,7 @@ export default { }, ksmtunedLink() { - const version = this.$rootGetters['harvester-common/getServerVersion'](); + const version = this.$store.getters['harvester-common/getServerVersion'](); return docLink(DOC.KSMTUNED_MODE, version); } diff --git a/pkg/harvester/list/harvesterhci.io.host.vue b/pkg/harvester/list/harvesterhci.io.host.vue index 321cc9a7..6ad60496 100644 --- a/pkg/harvester/list/harvesterhci.io.host.vue +++ b/pkg/harvester/list/harvesterhci.io.host.vue @@ -167,7 +167,7 @@ export default { }, consoleDocLink() { - const version = this.$rootGetters['harvester-common/getServerVersion'](); + const version = this.$store.getters['harvester-common/getServerVersion'](); return docLink(DOC.CONSOLE_URL, version); } diff --git a/pkg/harvester/pages/c/_cluster/support/index.vue b/pkg/harvester/pages/c/_cluster/support/index.vue index 17824d94..f0c540b7 100644 --- a/pkg/harvester/pages/c/_cluster/support/index.vue +++ b/pkg/harvester/pages/c/_cluster/support/index.vue @@ -76,7 +76,7 @@ export default { }, rancherIntegrationLink() { - const version = this.$rootGetters['harvester-common/getServerVersion'](); + const version = this.$store.getters['harvester-common/getServerVersion'](); return docLink(DOC.RANCHER_INTEGRATION_URL, version); }, diff --git a/pkg/harvester/store/harvester-common.js b/pkg/harvester/store/harvester-common.js index e64328ae..03b149e7 100644 --- a/pkg/harvester/store/harvester-common.js +++ b/pkg/harvester/store/harvester-common.js @@ -1,7 +1,7 @@ import Parse from 'url-parse'; import { HCI } from '../types'; import { PRODUCT_NAME } from '../config/harvester'; -import { featureEnabled, featureVersion } from '../utils/feature-flags'; +import { featureEnabled, getVersion } from '../utils/feature-flags'; const state = function() { return { @@ -74,7 +74,7 @@ const getters = { getServerVersion: (_state, _getters, _rootState, rootGetters) => () => { const serverVersion = rootGetters['harvester/byId'](HCI.SETTING, 'server-version')?.value; - return featureVersion(serverVersion); + return getVersion(serverVersion); }, getFeatureEnabled: (_state, _getters, _rootState, rootGetters) => (feature, version) => { diff --git a/pkg/harvester/utils/feature-flags.js b/pkg/harvester/utils/feature-flags.js index 08c77650..de955d24 100644 --- a/pkg/harvester/utils/feature-flags.js +++ b/pkg/harvester/utils/feature-flags.js @@ -7,7 +7,7 @@ export const docLink = (suffix, version) => { return `https://docs.harvesterhci.io/${ docVersion }${ suffix }`; }; -export function featureVersion(v) { +export function getVersion(v) { // e.g v1.4.0 if (process.env.VUE_APP_SERVER_VERSION) { return process.env.VUE_APP_SERVER_VERSION; @@ -22,7 +22,7 @@ export function featureVersion(v) { } export const featureEnabled = (featureKey, serverVersion) => { - const version = featureVersion(serverVersion); + const version = getVersion(serverVersion); const releasedFeatures = RELEASE_FEATURES[version] || []; return releasedFeatures.includes(featureKey);