From ad3f089420851b3c6e3bfe515746aa8dec843c92 Mon Sep 17 00:00:00 2001 From: typescreep Date: Tue, 18 Nov 2025 17:24:39 +0300 Subject: [PATCH] sidebars fallback --- .env | 2 ++ .env.options.dist | 2 ++ README.md | 1 + server/index.ts | 6 ++++++ .../molecules/ManageableSidebar/ManageableSidebar.tsx | 2 -- src/constants/customizationApiGroupAndVersion.ts | 4 ++++ 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.env b/.env index d117d9b..c527b4f 100644 --- a/.env +++ b/.env @@ -10,6 +10,8 @@ VITE_CUSTOMIZATION_API_VERSION=v1alpha VITE_CUSTOMIZATION_NAVIGATION_RESOURCE_NAME=navigations VITE_CUSTOMIZATION_NAVIGATION_RESOURCE=navigation +VITE_CUSTOMIZATION_SIDEBAR_FALLBACK_ID = fallback + VITE_USE_NAMESPACE_NAV=true VITE_HIDE_INSIDE=false diff --git a/.env.options.dist b/.env.options.dist index d36b462..9039ae3 100644 --- a/.env.options.dist +++ b/.env.options.dist @@ -12,6 +12,8 @@ CUSTOMIZATION_API_VERSION= CUSTOMIZATION_NAVIGATION_RESOURCE_NAME= CUSTOMIZATION_NAVIGATION_RESOURCE= +CUSTOMIZATION_SIDEBAR_FALLBACK_ID= + USE_NAMESPACE_NAV= HIDE_INSIDE= diff --git a/README.md b/README.md index 5614994..22342c1 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ This app can be configured through environment variables. | `CUSTOMIZATION_API_VERSION` | `string` | API version for customization resources. `v1alpha1` | | `CUSTOMIZATION_NAVIGATION_RESOURCE_NAME` | `string` | Resource plural name for navigation settings. `navigations` | | `CUSTOMIZATION_NAVIGATION_RESOURCE` | `string` | Resource name for navigation settings. `navigation` | +| `CUSTOMIZATION_SIDEBAR_FALLBACK_ID` | `string` | `spec.id` to find in `sidebars` to fallback. Use `-namespaced` for NS-pages | | `USE_NAMESPACE_NAV` | `boolean` | Use namespaces instead of project/instances. `true` | | `HIDE_INSIDE` | `boolean` | Use namespaces instead of project/instances. `true` | | `NAVIGATE_FROM_CLUSTERLIST` | `string` | Location to be navigated after selecting cluster. `/openapi-ui/clusters/~recordValue~` | diff --git a/server/index.ts b/server/index.ts index f14aca6..354369d 100644 --- a/server/index.ts +++ b/server/index.ts @@ -38,6 +38,11 @@ const CUSTOMIZATION_NAVIGATION_RESOURCE = ? options?.CUSTOMIZATION_NAVIGATION_RESOURCE : process.env.CUSTOMIZATION_NAVIGATION_RESOURCE +const CUSTOMIZATION_SIDEBAR_FALLBACK_ID = + process.env.LOCAL === 'true' + ? options?.CUSTOMIZATION_SIDEBAR_FALLBACK_ID + : process.env.CUSTOMIZATION_SIDEBAR_FALLBACK_ID + const USE_NAMESPACE_NAV = process.env.LOCAL === 'true' ? options?.USE_NAMESPACE_NAV : process.env.USE_NAMESPACE_NAV const HIDE_INSIDE = process.env.LOCAL === 'true' ? options?.HIDE_INSIDE : process.env.HIDE_INSIDE @@ -239,6 +244,7 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => { : '' } CUSTOMIZATION_NAVIGATION_RESOURCE: ${JSON.stringify(CUSTOMIZATION_NAVIGATION_RESOURCE) || '"check envs"'}, + CUSTOMIZATION_SIDEBAR_FALLBACK_ID: ${JSON.stringify(CUSTOMIZATION_SIDEBAR_FALLBACK_ID) || '"check envs"'}, USE_NAMESPACE_NAV: ${USE_NAMESPACE_NAV ? JSON.stringify(USE_NAMESPACE_NAV).toLowerCase() : '"false"'}, HIDE_INSIDE: ${HIDE_INSIDE ? JSON.stringify(HIDE_INSIDE).toLowerCase() : '"false"'}, NAVIGATE_FROM_CLUSTERLIST: ${JSON.stringify(NAVIGATE_FROM_CLUSTERLIST) || '"check envs"'}, diff --git a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx index 568c2c9..e3d478c 100644 --- a/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx +++ b/src/components/molecules/ManageableSidebar/ManageableSidebar.tsx @@ -60,8 +60,6 @@ export const ManageableSidebar: FC = ({ return acc }, {}) - console.log(namespace ? `${CUSTOMIZATION_SIDEBAR_FALLBACK_ID}-namespaced` : CUSTOMIZATION_SIDEBAR_FALLBACK_ID) - return (