From 7a95d58e3622c667ab232cf3cce086522fc3d3a4 Mon Sep 17 00:00:00 2001 From: typescreep Date: Mon, 17 Nov 2025 09:32:18 +0300 Subject: [PATCH 1/3] codestyles --- src/components/molecules/BlackholeForm/BlackholeForm.tsx | 4 ++-- .../molecules/ManageableBreadcrumbs/ManageableBreadcrumbs.tsx | 4 ++-- .../molecules/ManageableSidebar/ManageableSidebar.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/molecules/BlackholeForm/BlackholeForm.tsx b/src/components/molecules/BlackholeForm/BlackholeForm.tsx index ceb2139..28ff258 100644 --- a/src/components/molecules/BlackholeForm/BlackholeForm.tsx +++ b/src/components/molecules/BlackholeForm/BlackholeForm.tsx @@ -1,6 +1,6 @@ import React, { FC, useState, useEffect } from 'react' import { useParams } from 'react-router-dom' -import { BlackholeFormDataProvider, TJSON } from '@prorobotech/openapi-k8s-toolkit' +import { BlackholeFormProvider, TJSON } from '@prorobotech/openapi-k8s-toolkit' import { useSelector } from 'react-redux' import type { RootState } from 'store/store' import { @@ -83,7 +83,7 @@ export const BlackholeForm: FC = ({ data, customizationId, } return ( - = ({ idToCom }, {}) return ( - = ({ $colorBorder={token.colorBorder} $maxHeight={height} > - Date: Mon, 17 Nov 2025 09:44:38 +0300 Subject: [PATCH 2/3] navigations ts --- .../HeaderSecond/organisms/Selector/Selector.tsx | 11 ++++++----- .../organisms/SelectorNamespace/SelectorNamespace.tsx | 9 ++++----- src/hooks/useNavSelector/useNavSelector.ts | 7 +++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx index 9fdfeda..782f2d2 100644 --- a/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx +++ b/src/components/organisms/HeaderSecond/organisms/Selector/Selector.tsx @@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom' import { // useDirectUnknownResource, useK8sSmartResource, + TNavigationResource, } from '@prorobotech/openapi-k8s-toolkit' import { useNavSelector } from 'hooks/useNavSelector' import { useMountEffect } from 'hooks/useMountEffect' @@ -44,7 +45,7 @@ export const Selector: FC = ({ clusterName, projectName, instanc // }) const { data: navigationDataArr } = useK8sSmartResource<{ - items: { spec: { projects: { clear: string; change: string }; instances: { clear: string; change: string } } }[] + items: TNavigationResource[] }>({ cluster: clusterName || '', group: BASE_API_GROUP, @@ -66,13 +67,13 @@ export const Selector: FC = ({ clusterName, projectName, instanc if (value && value !== 'all') { setSelectedProjectName(value) const changeUrl = - navigationData?.spec.projects.change + navigationData?.spec?.projects?.change .replace('{selectedCluster}', selectedClusterName || 'no-cluster') .replace('{value}', value) || 'no navigation data' navigate(changeUrl) } else { const clearUrl = - navigationData?.spec.projects.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') || + navigationData?.spec?.projects?.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') || 'no navigation data' navigate(clearUrl) } @@ -82,14 +83,14 @@ export const Selector: FC = ({ clusterName, projectName, instanc if (value && value !== 'all') { setSelectedInstanceName(value) const changeUrl = - navigationData?.spec.instances.change + navigationData?.spec?.instances?.change .replace('{selectedCluster}', selectedClusterName || 'no-cluster') .replace('{selectedProject}', selectedProjectName || 'no-project') .replace('{value}', value) || 'no navigation data' navigate(changeUrl) } else { const clearUrl = - navigationData?.spec.instances.clear + navigationData?.spec?.instances?.clear .replace('{selectedCluster}', selectedClusterName || 'no-cluster') .replace('{selectedProject}', selectedProjectName || 'no-project') || 'no navigation data' navigate(clearUrl) diff --git a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx index 46c9ce5..a3c2db5 100644 --- a/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx +++ b/src/components/organisms/HeaderSecond/organisms/SelectorNamespace/SelectorNamespace.tsx @@ -4,6 +4,7 @@ import { useLocation, useNavigate } from 'react-router-dom' import { // useDirectUnknownResource, useK8sSmartResource, + TNavigationResource, } from '@prorobotech/openapi-k8s-toolkit' import { useSelector } from 'react-redux' import type { RootState } from 'store/store' @@ -44,9 +45,7 @@ export const SelectorNamespace: FC = ({ clusterName, na // }) const { data: navigationDataArr } = useK8sSmartResource<{ - items: { - spec: { namespaces: { clear: string; change: string } } - }[] + items: TNavigationResource[] }>({ cluster: clusterName || '', group: BASE_API_GROUP, @@ -101,13 +100,13 @@ export const SelectorNamespace: FC = ({ clusterName, na if (value && value !== 'all') { setSelectedNamespace(value) const changeUrl = - navigationData?.spec.namespaces.change + navigationData?.spec?.namespaces?.change .replace('{selectedCluster}', selectedClusterName || 'no-cluster') .replace('{value}', value) || 'no navigation data' navigate(changeUrl) } else { const clearUrl = - navigationData?.spec.namespaces.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') || + navigationData?.spec?.namespaces?.clear.replace('{selectedCluster}', selectedClusterName || 'no-cluster') || 'no navigation data' navigate(clearUrl) } diff --git a/src/hooks/useNavSelector/useNavSelector.ts b/src/hooks/useNavSelector/useNavSelector.ts index 1ae504e..a54da43 100644 --- a/src/hooks/useNavSelector/useNavSelector.ts +++ b/src/hooks/useNavSelector/useNavSelector.ts @@ -4,6 +4,7 @@ import { TSingleResource, // useDirectUnknownResource, useK8sSmartResource, + TNavigationResource, } from '@prorobotech/openapi-k8s-toolkit' import { useSelector } from 'react-redux' import { RootState } from 'store/store' @@ -61,9 +62,7 @@ export const useNavSelector = (clusterName?: string, projectName?: string) => { // }) const { data: navigationDataArr } = useK8sSmartResource<{ - items: { - spec: { instances: { mapOptionsPattern: string } } - }[] + items: TNavigationResource[] }>({ cluster: clusterName || '', group: BASE_API_GROUP, @@ -133,7 +132,7 @@ export const useNavSelector = (clusterName?: string, projectName?: string) => { .map(item => mappedInstanceToOptionInSidebar({ instance: item, - templateString: navigationData?.spec.instances.mapOptionsPattern, + templateString: navigationData?.spec?.instances?.mapOptionsPattern, }), ) : [] From 10071ae36a74026fc2a6fbc4c6df58f9b27e3dd9 Mon Sep 17 00:00:00 2001 From: typescreep Date: Mon, 17 Nov 2025 12:23:10 +0300 Subject: [PATCH 3/3] owner refs with relative paths --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 032cc04..c2dcd19 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": "1.1.0-alpha.8", + "@prorobotech/openapi-k8s-toolkit": "^1.1.0-alpha.9", "@readme/openapi-parser": "4.0.0", "@reduxjs/toolkit": "2.2.5", "@tanstack/react-query": "5.62.2", @@ -2804,9 +2804,9 @@ } }, "node_modules/@prorobotech/openapi-k8s-toolkit": { - "version": "1.1.0-alpha.8", - "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.8.tgz", - "integrity": "sha512-bv7paXWtah6Wj1UnTPhx9akfWjKw/CXtddmm2f18ehvDqYgKqmDE4ZLEdBC6pFugxIwiyuXTnQ73pePnT8u+Jw==", + "version": "1.1.0-alpha.9", + "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-1.1.0-alpha.9.tgz", + "integrity": "sha512-Lb97O5RsOQLwhUTetnXeVXqCHRhZRXOxLqVHp24xnyInwWvMbCsgVn3tXKSQz2MFIuyCw1HWVdN5/Dh19GiPdA==", "license": "MIT", "dependencies": { "@monaco-editor/react": "4.6.0", diff --git a/package.json b/package.json index b59c99d..95bab45 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": "^1.1.0-alpha.8", + "@prorobotech/openapi-k8s-toolkit": "1.1.0-alpha.9", "@readme/openapi-parser": "4.0.0", "@reduxjs/toolkit": "2.2.5", "@tanstack/react-query": "5.62.2",