diff --git a/.env b/.env index b66a84c..23389ab 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ VITE_CUSTOMIZATION_API_VERSION=v1alpha VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME=navigations VITE_CUSTOMIZATION_NAVIGATION_RESOURCE=navigation -VITE_USE_NAMESPACE_NAV=false +VITE_USE_NAMESPACE_NAV=true VITE_NAVIGATE_FROM_CLUSTERLIST=/openapi-ui/clusters/~recordValue~ diff --git a/server/index.ts b/server/index.ts index 6995c05..1cbdc63 100644 --- a/server/index.ts +++ b/server/index.ts @@ -175,7 +175,7 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => { JSON.stringify(CUSTOMIZATION_NAVIGATION_RESOURCE_NAME) || '"check envs"' }, CUSTOMIZATION_NAVIGATION_RESOURCE: ${JSON.stringify(CUSTOMIZATION_NAVIGATION_RESOURCE) || '"check envs"'}, - USE_NAMESPACE_NAV: ${!!USE_NAMESPACE_NAV ? '"true"' : '"false"'}, + USE_NAMESPACE_NAV: ${USE_NAMESPACE_NAV ? JSON.stringify(USE_NAMESPACE_NAV).toLowerCase() : '"false"'}, NAVIGATE_FROM_CLUSTERLIST: ${JSON.stringify(NAVIGATE_FROM_CLUSTERLIST) || '"check envs"'}, PROJECTS_API_GROUP: ${JSON.stringify(PROJECTS_API_GROUP) || '"check envs"'}, PROJECTS_VERSION: ${JSON.stringify(PROJECTS_VERSION) || '"check envs"'}, @@ -189,8 +189,8 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => { LOGIN_URL: ${JSON.stringify(LOGIN_URL) || '"check envs"'}, LOGOUT_URL: ${JSON.stringify(LOGOUT_URL) || '"check envs"'}, LOGIN_USERNAME_FIELD: ${JSON.stringify(LOGIN_USERNAME_FIELD) || '"check envs"'}, - REMOVE_BACKLINK: ${!!REMOVE_BACKLINK ? REMOVE_BACKLINK?.toString().toLowerCase() : '"false"'}, - REMOVE_BACKLINK_TEXT: ${!!REMOVE_BACKLINK_TEXT ? REMOVE_BACKLINK_TEXT?.toString().toLowerCase() : '"false"'} + REMOVE_BACKLINK: ${!!REMOVE_BACKLINK ? JSON.stringify(REMOVE_BACKLINK).toLowerCase() : '"false"'}, + REMOVE_BACKLINK_TEXT: ${!!REMOVE_BACKLINK_TEXT ? JSON.stringify(REMOVE_BACKLINK_TEXT).toLowerCase() : '"false"'} } `, ) diff --git a/src/constants/customizationApiGroupAndVersion.ts b/src/constants/customizationApiGroupAndVersion.ts index d645069..bd543b9 100644 --- a/src/constants/customizationApiGroupAndVersion.ts +++ b/src/constants/customizationApiGroupAndVersion.ts @@ -1,41 +1,71 @@ /* eslint-disable no-underscore-dangle */ -export const BASE_API_GROUP = window._env_.CUSTOMIZATION_API_GROUP || import.meta.env.VITE_CUSTOMIZATION_API_GROUP -export const BASE_API_VERSION = window._env_.CUSTOMIZATION_API_VERSION || import.meta.env.VITE_CUSTOMIZATION_API_VERSION +export const BASE_API_GROUP = import.meta.env.DEV + ? window._env_.CUSTOMIZATION_API_GROUP || import.meta.env.VITE_CUSTOMIZATION_API_GROUP + : window._env_.CUSTOMIZATION_API_GROUP +export const BASE_API_VERSION = import.meta.env.DEV + ? window._env_.CUSTOMIZATION_API_VERSION || import.meta.env.VITE_CUSTOMIZATION_API_VERSION + : window._env_.CUSTOMIZATION_API_VERSION -export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME = - window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE_NAME || import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME -export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE = - window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE || import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE +export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME = import.meta.env.DEV + ? window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE_NAME || import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME + : window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE_NAME +export const BASE_CUSTOMIZATION_NAVIGATION_RESOURCE = import.meta.env.DEV + ? window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE || import.meta.env.VITE_CUSTOMIZATION_NAVIGATION_RESOURCE + : window._env_.CUSTOMIZATION_NAVIGATION_RESOURCE -export const BASE_USE_NAMESPACE_NAV = window._env_.USE_NAMESPACE_NAV || import.meta.env.VITE_USE_NAMESPACE_NAV +export const BASE_USE_NAMESPACE_NAV = import.meta.env.DEV + ? window._env_.USE_NAMESPACE_NAV || import.meta.env.VITE_USE_NAMESPACE_NAV + : window._env_.USE_NAMESPACE_NAV -export const BASE_NAVIGATE_FROM_CLUSTERLIST = - window._env_.NAVIGATE_FROM_CLUSTERLIST || import.meta.env.VITE_NAVIGATE_FROM_CLUSTERLIST +export const BASE_NAVIGATE_FROM_CLUSTERLIST = import.meta.env.DEV + ? window._env_.NAVIGATE_FROM_CLUSTERLIST || import.meta.env.VITE_NAVIGATE_FROM_CLUSTERLIST + : window._env_.NAVIGATE_FROM_CLUSTERLIST -export const BASE_PROJECTS_API_GROUP = window._env_.PROJECTS_API_GROUP || import.meta.env.VITE_PROJECTS_API_GROUP -export const BASE_PROJECTS_VERSION = window._env_.PROJECTS_VERSION || import.meta.env.VITE_PROJECTS_VERSION -export const BASE_PROJECTS_RESOURCE_NAME = - window._env_.PROJECTS_RESOURCE_NAME || import.meta.env.VITE_PROJECTS_RESOURCE_NAME +export const BASE_PROJECTS_API_GROUP = import.meta.env.DEV + ? window._env_.PROJECTS_API_GROUP || import.meta.env.VITE_PROJECTS_API_GROUP + : window._env_.PROJECTS_API_GROUP +export const BASE_PROJECTS_VERSION = import.meta.env.DEV + ? window._env_.PROJECTS_VERSION || import.meta.env.VITE_PROJECTS_VERSION + : window._env_.PROJECTS_VERSION +export const BASE_PROJECTS_RESOURCE_NAME = import.meta.env.DEV + ? window._env_.PROJECTS_RESOURCE_NAME || import.meta.env.VITE_PROJECTS_RESOURCE_NAME + : window._env_.PROJECTS_RESOURCE_NAME -export const BASE_MARKETPLACE_RESOURCE_NAME = - window._env_.MARKETPLACE_RESOURCE_NAME || import.meta.env.VITE_MARKETPLACE_RESOURCE_NAME -export const BASE_MARKETPLACE_KIND = window._env_.MARKETPLACE_KIND || import.meta.env.VITE_MARKETPLACE_KIND +export const BASE_MARKETPLACE_RESOURCE_NAME = import.meta.env.DEV + ? window._env_.MARKETPLACE_RESOURCE_NAME || import.meta.env.VITE_MARKETPLACE_RESOURCE_NAME + : window._env_.MARKETPLACE_RESOURCE_NAME +export const BASE_MARKETPLACE_KIND = import.meta.env.DEV + ? import.meta.env.VITE_MARKETPLACE_KIND + : window._env_.MARKETPLACE_KIND -export const BASE_INSTANCES_API_GROUP = window._env_.INSTANCES_API_GROUP || import.meta.env.VITE_INSTANCES_API_GROUP -export const BASE_INSTANCES_VERSION = window._env_.INSTANCES_VERSION || import.meta.env.VITE_INSTANCES_VERSION -export const BASE_INSTANCES_RESOURCE_NAME = - window._env_.INSTANCES_RESOURCE_NAME || import.meta.env.VITE_INSTANCES_RESOURCE_NAME +export const BASE_INSTANCES_API_GROUP = import.meta.env.DEV + ? window._env_.INSTANCES_API_GROUP || import.meta.env.VITE_INSTANCES_API_GROUP + : window._env_.INSTANCES_API_GROUP +export const BASE_INSTANCES_VERSION = import.meta.env.DEV + ? window._env_.INSTANCES_VERSION || import.meta.env.VITE_INSTANCES_VERSION + : window._env_.INSTANCES_VERSION +export const BASE_INSTANCES_RESOURCE_NAME = import.meta.env.DEV + ? window._env_.INSTANCES_RESOURCE_NAME || import.meta.env.VITE_INSTANCES_RESOURCE_NAME + : window._env_.INSTANCES_RESOURCE_NAME -export const NODE_TERMINAL_DEFAULT_PROFILE = - window._env_.NODE_TERMINAL_DEFAULT_PROFILE || import.meta.env.VITE_NODE_TERMINAL_DEFAULT_PROFILE +export const NODE_TERMINAL_DEFAULT_PROFILE = import.meta.env.DEV + ? window._env_.NODE_TERMINAL_DEFAULT_PROFILE || import.meta.env.VITE_NODE_TERMINAL_DEFAULT_PROFILE + : window._env_.NODE_TERMINAL_DEFAULT_PROFILE -export const LOGIN_URL = window._env_.LOGIN_URL || import.meta.env.VITE_LOGIN_URL -export const LOGOUT_URL = window._env_.LOGOUT_URL || import.meta.env.VITE_LOGOUT_URL -export const LOGIN_USERNAME_FIELD = window._env_.LOGIN_USERNAME_FIELD || import.meta.env.VITE_LOGIN_USERNAME_FIELD +export const LOGIN_URL = import.meta.env.DEV + ? window._env_.LOGIN_URL || import.meta.env.VITE_LOGIN_URL + : window._env_.LOGIN_URL +export const LOGOUT_URL = import.meta.env.DEV + ? window._env_.LOGOUT_URL || import.meta.env.VITE_LOGOUT_URL + : window._env_.LOGOUT_URL +export const LOGIN_USERNAME_FIELD = import.meta.env.DEV + ? window._env_.LOGIN_USERNAME_FIELD || import.meta.env.VITE_LOGIN_USERNAME_FIELD + : window._env_.LOGIN_USERNAME_FIELD -export const BASE_REMOVE_BACKLINK = - window._env_.REMOVE_BACKLINK === 'true' || - (import.meta.env.DEV && import.meta.env.VITE_REMOVE_BACKLINK?.toString().toLowerCase() === 'true') -export const BASE_REMOVE_BACKLINK_TEXT = - window._env_.REMOVE_BACKLINK_TEXT === 'true' || - (import.meta.env.DEV && import.meta.env.VITE_REMOVE_BACKLINK_TEXT?.toString().toLowerCase() === 'true') +export const BASE_REMOVE_BACKLINK = import.meta.env.DEV + ? window._env_.REMOVE_BACKLINK === 'true' || import.meta.env.VITE_REMOVE_BACKLINK?.toString().toLowerCase() === 'true' + : window._env_.REMOVE_BACKLINK === 'true' +export const BASE_REMOVE_BACKLINK_TEXT = import.meta.env.DEV + ? window._env_.REMOVE_BACKLINK_TEXT === 'true' || + import.meta.env.VITE_REMOVE_BACKLINK_TEXT?.toString().toLowerCase() === 'true' + : window._env_.REMOVE_BACKLINK_TEXT === 'true'