diff --git a/package-lock.json b/package-lock.json index 68bdffa..da3698a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@ant-design/icons": "5.6.0", "@monaco-editor/react": "4.6.0", "@originjs/vite-plugin-federation": "1.3.6", - "@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.57", + "@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.59", "@readme/openapi-parser": "4.0.0", "@reduxjs/toolkit": "2.2.5", "@tanstack/react-query": "5.62.2", @@ -2798,9 +2798,9 @@ } }, "node_modules/@prorobotech/openapi-k8s-toolkit": { - "version": "0.0.1-alpha.57", - "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.57.tgz", - "integrity": "sha512-EXLoITgOAD0UqODFURTrzKOD/ezRnYpQLQjIvP3VHqD9ixY92eecdr1rKDe5Fh1lgnCA2T2E9meI9/CmIeD4PQ==", + "version": "0.0.1-alpha.59", + "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.59.tgz", + "integrity": "sha512-hVGgBk2q0a27h9FwASZ7FwzOmi3gw6oh7ch4Nqy+fEmVvFHmIUSzmYIfT1xCzJvILkeXGtXdxtK+8aFegh55yQ==", "license": "MIT", "dependencies": { "@monaco-editor/react": "4.6.0", diff --git a/package.json b/package.json index a5ae19e..f6394a8 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@ant-design/icons": "5.6.0", "@monaco-editor/react": "4.6.0", "@originjs/vite-plugin-federation": "1.3.6", - "@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.57", + "@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.59", "@readme/openapi-parser": "4.0.0", "@reduxjs/toolkit": "2.2.5", "@tanstack/react-query": "5.62.2", diff --git a/src/components/organisms/Factory/Factory.tsx b/src/components/organisms/Factory/Factory.tsx index 5113e82..0af712f 100644 --- a/src/components/organisms/Factory/Factory.tsx +++ b/src/components/organisms/Factory/Factory.tsx @@ -13,7 +13,11 @@ import { RootState } from 'store/store' import { BASE_API_GROUP, BASE_API_VERSION } from 'constants/customizationApiGroupAndVersion' import { HEAD_FIRST_ROW, HEAD_SECOND_ROW, FOOTER_HEIGHT, NAV_HEIGHT } from 'constants/blocksSizes' -export const Factory: FC = () => { +type TFactoryProps = { + setSidebarTags: (tags: string[]) => void +} + +export const Factory: FC = ({ setSidebarTags }) => { const theme = useSelector((state: RootState) => state.openapiTheme.theme) const cluster = useSelector((state: RootState) => state.cluster.cluster) const { key } = useParams() @@ -44,6 +48,10 @@ export const Factory: FC = () => { const { spec } = factoryData?.items.find(({ spec }) => spec.key === key) ?? { spec: undefined } + useEffect(() => { + setSidebarTags(spec?.sidebarTags || []) + }) + if (!spec) { return null } diff --git a/src/pages/FactoryPage/FactoryPage.tsx b/src/pages/FactoryPage/FactoryPage.tsx index e8f2779..bb40a62 100644 --- a/src/pages/FactoryPage/FactoryPage.tsx +++ b/src/pages/FactoryPage/FactoryPage.tsx @@ -1,4 +1,4 @@ -import React, { FC } from 'react' +import React, { FC, useState } from 'react' import { useParams } from 'react-router-dom' import { ManageableBreadcrumbs, ManageableSidebar, Factory, NavigationContainer } from 'components' import { getBreadcrumbsIdPrefix } from 'utils/getBreadcrumbsIdPrefix' @@ -12,6 +12,8 @@ type TFactoryPageProps = { export const FactoryPage: FC = ({ forcedTheme }) => { const { namespace, syntheticProject, key } = useParams() + const [currentTags, setCurrentTags] = useState() + const possibleProject = syntheticProject && namespace ? syntheticProject : namespace const possibleInstance = syntheticProject && namespace ? namespace : undefined @@ -29,14 +31,19 @@ export const FactoryPage: FC = ({ forcedTheme }) => { + } withNoCluster > - + ) }