From df7d180282553172b103731a64c923012384ef31 Mon Sep 17 00:00:00 2001
From: Xiaoyan Rao <270668624@qq.com>
Date: Thu, 16 Nov 2023 17:22:07 +0800
Subject: [PATCH] fix(kconfig): remove kong version from kconfig.js

---
 src/components/MakeAWish.vue                  |  5 +++--
 src/composables/useDetailGeneralConfig.ts     |  5 ++++-
 src/composables/useDocsLink.ts                | 11 ++++++++---
 src/composables/useFormGeneralConfig.ts       |  5 ++++-
 src/composables/useGatewayFeatureSupported.ts |  7 ++++++-
 src/composables/useListGeneralConfig.ts       |  5 ++++-
 src/config.ts                                 |  6 +-----
 src/pages/overview/Overview.vue               |  5 +++--
 8 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/components/MakeAWish.vue b/src/components/MakeAWish.vue
index 663ba62..587216a 100644
--- a/src/components/MakeAWish.vue
+++ b/src/components/MakeAWish.vue
@@ -16,12 +16,13 @@
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { useI18n } from '@/composables/useI18n'
-import { config } from 'config'
+import { useInfoStore } from '@/stores/info'
 
 const route = useRoute()
 const { t } = useI18n()
+const useInfo = useInfoStore()
 
-const mailToUrl = computed(() => `mailto:wish@konghq.com?subject=${t('wish.subject', { title: `${route.meta.title} | Kong Manager OSS@${config.GATEWAY_VERSION}` })}`)
+const mailToUrl = computed(() => `mailto:wish@konghq.com?subject=${t('wish.subject', { title: `${route.meta.title} | Kong Manager OSS@${useInfo.kongVersion}` })}`)
 </script>
 
 <style scoped lang="scss">
diff --git a/src/composables/useDetailGeneralConfig.ts b/src/composables/useDetailGeneralConfig.ts
index f13c0b6..1651e70 100644
--- a/src/composables/useDetailGeneralConfig.ts
+++ b/src/composables/useDetailGeneralConfig.ts
@@ -1,14 +1,17 @@
 import { reactive } from 'vue'
 import { config } from 'config'
+import { useInfoStore } from '@/stores/info'
 import type { KongManagerBaseEntityConfig } from '@kong-ui-public/entities-shared'
 
+const useInfo = useInfoStore()
+
 export const useDetailGeneralConfig = () => {
   return reactive({
     app: 'kongManager' as const,
     workspace: '',
     gatewayInfo: {
       edition: config.GATEWAY_EDITION,
-      version: config.GATEWAY_VERSION,
+      version: useInfo.kongVersion,
     },
     apiBaseUrl: config.ADMIN_API_URL,
     jsonYamlEnabled: true,
diff --git a/src/composables/useDocsLink.ts b/src/composables/useDocsLink.ts
index ff37450..db262be 100644
--- a/src/composables/useDocsLink.ts
+++ b/src/composables/useDocsLink.ts
@@ -1,18 +1,23 @@
 import { formatVersion } from '@/utils'
 import { config, type GatewayEdition } from 'config'
 import { EntityType } from '@/types'
+import { computed } from 'vue'
+import { useInfoStore } from '@/stores/info'
+
+const useInfo = useInfoStore()
+const kongVersion = computed(() => useInfo.kongVersion)
 
 const getVersionInPath = (edition: GatewayEdition) => {
-  if (!config.GATEWAY_VERSION) {
+  if (!kongVersion.value) {
     return 'latest'
   }
 
   return edition === 'enterprise'
     // For Enterprise, the version has a pattern of <major>.<minor>.0.x where the 3rd digit
     // will always be 0 regardless of the actual patch version
-    ? `${formatVersion(config.GATEWAY_VERSION)}.0.x`
+    ? `${formatVersion(kongVersion.value)}.0.x`
     // For OSS, the version has a pattern of <major>.<minor>.x
-    : `${formatVersion(config.GATEWAY_VERSION)}.x`
+    : `${formatVersion(kongVersion.value)}.x`
 }
 
 export const useDocsLink = (entityType: EntityType) => {
diff --git a/src/composables/useFormGeneralConfig.ts b/src/composables/useFormGeneralConfig.ts
index 5c86dc3..dbbcc49 100644
--- a/src/composables/useFormGeneralConfig.ts
+++ b/src/composables/useFormGeneralConfig.ts
@@ -1,14 +1,17 @@
 import { reactive } from 'vue'
 import { config } from 'config'
+import { useInfoStore } from '@/stores/info'
 import type { KongManagerBaseFormConfig } from '@kong-ui-public/entities-shared'
 
+const useInfo = useInfoStore()
+
 export const useFormGeneralConfig = () => {
   return reactive({
     app: 'kongManager' as const,
     workspace: '',
     gatewayInfo: {
       edition: config.GATEWAY_EDITION,
-      version: config.GATEWAY_VERSION,
+      version: useInfo.kongVersion,
     },
     apiBaseUrl: config.ADMIN_API_URL,
   } as Pick<KongManagerBaseFormConfig, 'app' | 'workspace' | 'gatewayInfo' | 'apiBaseUrl'>)
diff --git a/src/composables/useGatewayFeatureSupported.ts b/src/composables/useGatewayFeatureSupported.ts
index 140a618..ea908a6 100644
--- a/src/composables/useGatewayFeatureSupported.ts
+++ b/src/composables/useGatewayFeatureSupported.ts
@@ -1,13 +1,18 @@
+import { computed } from 'vue'
+import { useInfoStore } from '@/stores/info'
 import { useGatewayFeatureSupported as sharedComposable } from '@kong-ui-public/entities-shared'
 import { config } from 'config'
 
 type Arguments = Parameters<typeof sharedComposable>[0]
 
+const useInfo = useInfoStore()
+const kongVersion = computed(() => useInfo.kongVersion)
+
 export const useGatewayFeatureSupported = (supportedRange: Arguments['supportedRange']) => {
   return sharedComposable({
     gatewayInfo: {
       edition: config.GATEWAY_EDITION ?? 'community',
-      version: config.GATEWAY_VERSION ?? '',
+      version: kongVersion.value ?? '',
     },
     supportedRange,
   })
diff --git a/src/composables/useListGeneralConfig.ts b/src/composables/useListGeneralConfig.ts
index 0b42999..a69e1b8 100644
--- a/src/composables/useListGeneralConfig.ts
+++ b/src/composables/useListGeneralConfig.ts
@@ -1,14 +1,17 @@
 import { reactive } from 'vue'
 import { config } from 'config'
+import { useInfoStore } from '@/stores/info'
 import type { KongManagerBaseTableConfig } from '@kong-ui-public/entities-shared'
 
+const useInfo = useInfoStore()
+
 export const useListGeneralConfig = () => {
   return reactive({
     app: 'kongManager' as const,
     workspace: '',
     gatewayInfo: {
       edition: config.GATEWAY_EDITION,
-      version: config.GATEWAY_VERSION,
+      version: useInfo.kongVersion,
     },
     apiBaseUrl: config.ADMIN_API_URL,
     // Kong Gateway OSS only supports exact match and does not support sorting
diff --git a/src/config.ts b/src/config.ts
index 786af82..1c74c29 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -52,12 +52,8 @@ export const config = {
     return `${window.location.protocol}//${window.location.hostname}:${port}`
   },
 
-  get GATEWAY_VERSION () {
-    return getConfig<string | null>('KONG_VERSION', null)
-  },
-
   get GATEWAY_EDITION () {
-    return getConfig<GatewayEdition | null>('KONG_EDITION', null)
+    return getConfig<GatewayEdition | null>('KONG_EDITION', 'community')
   },
 
   get ANONYMOUS_REPORTS () {
diff --git a/src/pages/overview/Overview.vue b/src/pages/overview/Overview.vue
index e7b3392..f2ee1de 100644
--- a/src/pages/overview/Overview.vue
+++ b/src/pages/overview/Overview.vue
@@ -76,9 +76,10 @@ const infoStore = useInfoStore()
 
 const config = computed(() => ({
   ...infoStore.infoConfig,
+  kongVersion: infoStore.kongVersion,
   hostname: infoStore.info.hostname,
 }))
-const version = computed(() => gatewayConfig.GATEWAY_VERSION ? `${formatVersion(gatewayConfig.GATEWAY_VERSION)}.x` : 'latest')
+const version = computed(() => config.value.kongVersion ? `${formatVersion(config.value.kongVersion)}.x` : 'latest')
 const info = computed(() => {
   const guiListeners = config.value.admin_gui_listeners
   const nonSslGuiListener = guiListeners?.find?.(listener => !listener.ssl)
@@ -97,7 +98,7 @@ const info = computed(() => {
         },
         {
           label: t('overview.info.gateway.version'),
-          value: gatewayConfig.GATEWAY_VERSION,
+          value: config.value.kongVersion,
         },
       ],
     },