diff --git a/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx b/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx index cd775c8..4302b6b 100644 --- a/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx +++ b/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx @@ -1,5 +1,5 @@ import React, { FC, useState, useEffect } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useLocation, useNavigate, useParams } from 'react-router-dom' import { Spin, Alert, Button, Flex } from 'antd' import { PlusOutlined, ClearOutlined, MinusOutlined } from '@ant-design/icons' import { useSelector } from 'react-redux' @@ -38,6 +38,7 @@ export const TableBuiltinInfo: FC = ({ inside, customizationIdPrefix, }) => { + const location = useLocation() const navigate = useNavigate() const params = useParams() const cluster = useSelector((state: RootState) => state.cluster.cluster) @@ -130,6 +131,13 @@ export const TableBuiltinInfo: FC = ({ setSelectedRowsData([]) } + const replaceValuesPartsOfUrls = location.pathname + .split('/') + .reduce>((acc, value, index) => { + acc[index.toString()] = value + return acc + }, {}) + return ( <> {isPending && } @@ -152,6 +160,7 @@ export const TableBuiltinInfo: FC = ({ entryName: params.entryName, apiExtensionVersion: params.apiExtensionVersion, crdName: params.crdName, + ...replaceValuesPartsOfUrls, }} cluster={cluster} theme={theme} diff --git a/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx b/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx index dbaa9a6..15c914d 100644 --- a/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx +++ b/src/components/organisms/TableCrdInfo/molecules/ResourceInfo/ResourceInfo.tsx @@ -1,5 +1,5 @@ import React, { FC, useState, useEffect } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useLocation, useNavigate, useParams } from 'react-router-dom' import { Spin, Alert, Button, Flex } from 'antd' import { PlusOutlined, ClearOutlined, MinusOutlined } from '@ant-design/icons' import { useSelector } from 'react-redux' @@ -53,6 +53,7 @@ export const ResourceInfo: FC = ({ inside, customizationIdPrefix, }) => { + const location = useLocation() const navigate = useNavigate() const params = useParams() const cluster = useSelector((state: RootState) => state.cluster.cluster) @@ -122,6 +123,13 @@ export const ResourceInfo: FC = ({ setSelectedRowsData([]) } + const replaceValuesPartsOfUrls = location.pathname + .split('/') + .reduce>((acc, value, index) => { + acc[index.toString()] = value + return acc + }, {}) + return ( <> {isPending && } @@ -144,6 +152,7 @@ export const ResourceInfo: FC = ({ entryName: params.entryName, apiExtensionVersion: params.apiExtensionVersion, crdName: params.crdName, + ...replaceValuesPartsOfUrls, }} forceDefaultAdditionalPrinterColumns={crdAdditionalPrinterColumns} cluster={cluster} diff --git a/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx b/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx index 70bb1a9..cfc3c41 100644 --- a/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx +++ b/src/components/organisms/TableNonCrdInfo/TableNonCrdInfo.tsx @@ -1,6 +1,6 @@ /* eslint-disable max-lines-per-function */ import React, { FC, useState, useEffect } from 'react' -import { useNavigate, useParams } from 'react-router-dom' +import { useLocation, useNavigate, useParams } from 'react-router-dom' import { Spin, Alert, Button, Flex } from 'antd' import { PlusOutlined, ClearOutlined, MinusOutlined } from '@ant-design/icons' import { useSelector } from 'react-redux' @@ -43,6 +43,7 @@ export const TableNonCrdInfo: FC = ({ inside, customizationIdPrefix, }) => { + const location = useLocation() const navigate = useNavigate() const params = useParams() const cluster = useSelector((state: RootState) => state.cluster.cluster) @@ -139,6 +140,13 @@ export const TableNonCrdInfo: FC = ({ setSelectedRowsData([]) } + const replaceValuesPartsOfUrls = location.pathname + .split('/') + .reduce>((acc, value, index) => { + acc[index.toString()] = value + return acc + }, {}) + return ( <> {isPending && } @@ -161,6 +169,7 @@ export const TableNonCrdInfo: FC = ({ entryName: params.entryName, apiExtensionVersion: params.apiExtensionVersion, crdName: params.crdName, + ...replaceValuesPartsOfUrls, }} cluster={cluster} theme={theme}