github-personal/openapi-ui
1
0
Fork 0
mirror of https://github.com/outbackdingo/openapi-ui.git synced 2026-01-27 18:19:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54 from PRO-Robotech/feature/dev

Browse Source 
fix use namespace nav
This commit is contained in:
typescreep
2025-07-16 23:33:42 +03:00
committed by GitHub
parent b7235b1191 5e6d46cac7
commit 0316dff453
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/index.ts
View File

@@ -163,7 +163,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},
USE_NAMESPACE_NAV: ${!!USE_NAMESPACE_NAV ? '"true"' : '"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"'},

8
src/components/organisms/HeaderSecond/HeaderSecond.tsx
View File

@@ -21,15 +21,17 @@ export const HeaderSecond: FC<THeaderProps> = ({ inside }) => {
return (
<Styled.BackgroundContainer $bgColor={token.colorFillSecondary} $borderRadius={token.borderRadius}>
<Styled.PaddingContainer $height={HEAD_SECOND_ROW}>
{inside && !BASE_USE_NAMESPACE_NAV && <SelectorInside clusterName={clusterName} namespace={namespace} />}
{!inside && !BASE_USE_NAMESPACE_NAV && (
{inside && BASE_USE_NAMESPACE_NAV !== 'true' && (
<SelectorInside clusterName={clusterName} namespace={namespace} />
)}
{!inside && BASE_USE_NAMESPACE_NAV !== 'true' && (
<Selector
clusterName={clusterName}
projectName={projectName || possibleProject}
instanceName={instanceName || possibleInstance}
/>
)}
{BASE_USE_NAMESPACE_NAV && <SelectorNamespace clusterName={clusterName} namespace={namespace} />}
{BASE_USE_NAMESPACE_NAV === 'true' && <SelectorNamespace clusterName={clusterName} namespace={namespace} />}
</Styled.PaddingContainer>
</Styled.BackgroundContainer>
)