fix: rename additionalInfo params to additionalProps (#525)

krosy1337 · web-flow · commit dd2b04039cd8 · 2023-08-28T11:15:34.000+03:00
diff --git a/src/components/BasicNodeViewer/BasicNodeViewer.tsx b/src/components/BasicNodeViewer/BasicNodeViewer.tsx
@@ -13,13 +13,13 @@ const b = cn('basic-node-viewer');
 
 interface BasicNodeViewerProps {
     node: TSystemStateInfo;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalNodesProps?: AdditionalNodesProps;
     className?: string;
 }
 
-export const BasicNodeViewer = ({node, additionalNodesInfo, className}: BasicNodeViewerProps) => {
-    const nodeHref = additionalNodesInfo?.getNodeRef
-        ? additionalNodesInfo.getNodeRef(node) + 'internal'
+export const BasicNodeViewer = ({node, additionalNodesProps, className}: BasicNodeViewerProps) => {
+    const nodeHref = additionalNodesProps?.getNodeRef
+        ? additionalNodesProps.getNodeRef(node) + 'internal'
         : undefined;
 
     return (
diff --git a/src/containers/Cluster/Cluster.tsx b/src/containers/Cluster/Cluster.tsx
@@ -35,15 +35,15 @@ const b = cn('cluster');
 
 interface ClusterProps {
     additionalTenantsProps?: AdditionalTenantsProps;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalNodesProps?: AdditionalNodesProps;
     additionalClusterProps?: AdditionalClusterProps;
     additionalVersionsProps?: AdditionalVersionsProps;
 }
 
 function Cluster({
     additionalClusterProps,
     additionalTenantsProps,
-    additionalNodesInfo,
+    additionalNodesProps,
     additionalVersionsProps,
 }: ClusterProps) {
     const dispatch = useDispatch();
@@ -104,10 +104,10 @@ function Cluster({
                 return <Tenants additionalTenantsProps={additionalTenantsProps} />;
             }
             case clusterTabsIds.nodes: {
-                return <Nodes additionalNodesInfo={additionalNodesInfo} />;
+                return <Nodes additionalNodesProps={additionalNodesProps} />;
             }
             case clusterTabsIds.storage: {
-                return <Storage additionalNodesInfo={additionalNodesInfo} />;
+                return <Storage additionalNodesProps={additionalNodesProps} />;
             }
             case clusterTabsIds.versions: {
                 return <Versions versionToColor={versionToColor} />;
diff --git a/src/containers/Node/Node.tsx b/src/containers/Node/Node.tsx
@@ -34,7 +34,7 @@ export const STORAGE_ROLE = 'Storage';
 const autofetcher = new AutoFetcher();
 
 interface NodeProps {
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalNodesProps?: AdditionalNodesProps;
     className?: string;
 }
 
@@ -115,7 +115,7 @@ function Node(props: NodeProps) {
         );
     };
     const renderTabContent = () => {
-        const {additionalNodesInfo} = props;
+        const {additionalNodesProps} = props;
 
         switch (activeTab) {
             case STORAGE: {
@@ -138,7 +138,7 @@ function Node(props: NodeProps) {
                     <NodeStructure
                         className={b('node-page-wrapper')}
                         nodeId={nodeId}
-                        additionalNodesInfo={additionalNodesInfo}
+                        additionalNodesProps={additionalNodesProps}
                     />
                 );
             }
@@ -157,7 +157,7 @@ function Node(props: NodeProps) {
                 <div className={b(null, props.className)}>
                     <BasicNodeViewer
                         node={node}
-                        additionalNodesInfo={props.additionalNodesInfo}
+                        additionalNodesProps={props.additionalNodesProps}
                         className={b('header')}
                     />
 
diff --git a/src/containers/Node/NodeStructure/NodeStructure.tsx b/src/containers/Node/NodeStructure/NodeStructure.tsx
@@ -32,12 +32,12 @@ function generateId({type, id}: {type: 'pdisk' | 'vdisk'; id: string}) {
 interface NodeStructureProps {
     nodeId: string;
     className?: string;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalNodesProps?: AdditionalNodesProps;
 }
 
 const autofetcher = new AutoFetcher();
 
-function NodeStructure({nodeId, className, additionalNodesInfo}: NodeStructureProps) {
+function NodeStructure({nodeId, className, additionalNodesProps}: NodeStructureProps) {
     const dispatch = useDispatch();
 
     const nodeStructure = useTypedSelector(selectNodeStructure);
@@ -46,10 +46,10 @@ function NodeStructure({nodeId, className, additionalNodesInfo}: NodeStructurePr
     const nodeData = useTypedSelector((state) => state.node?.data?.SystemStateInfo?.[0]);
 
     const nodeHref = useMemo(() => {
-        return additionalNodesInfo?.getNodeRef
-            ? additionalNodesInfo.getNodeRef(nodeData)
+        return additionalNodesProps?.getNodeRef
+            ? additionalNodesProps.getNodeRef(nodeData)
             : undefined;
-    }, [nodeData, additionalNodesInfo]);
+    }, [nodeData, additionalNodesProps]);
 
     const {pdiskId: pdiskIdFromUrl, vdiskId: vdiskIdFromUrl} = url.parse(
         window.location.href,
diff --git a/src/containers/Nodes/Nodes.tsx b/src/containers/Nodes/Nodes.tsx
@@ -54,10 +54,10 @@ const b = cn('ydb-nodes');
 interface NodesProps {
     path?: string;
     type?: EPathType;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalNodesProps?: AdditionalNodesProps;
 }
 
-export const Nodes = ({path, type, additionalNodesInfo = {}}: NodesProps) => {
+export const Nodes = ({path, type, additionalNodesProps = {}}: NodesProps) => {
     const dispatch = useDispatch();
 
     const isClusterNodes = !path;
@@ -154,7 +154,7 @@ export const Nodes = ({path, type, additionalNodesInfo = {}}: NodesProps) => {
 
     const renderTable = () => {
         const columns = getNodesColumns({
-            getNodeRef: additionalNodesInfo.getNodeRef,
+            getNodeRef: additionalNodesProps.getNodeRef,
         });
 
         if (nodes && nodes.length === 0) {
diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx
@@ -60,12 +60,12 @@ import './Storage.scss';
 const b = cn('global-storage');
 
 interface StorageProps {
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalNodesProps?: AdditionalNodesProps;
     tenant?: string;
     nodeId?: string;
 }
 
-export const Storage = ({additionalNodesInfo, tenant, nodeId}: StorageProps) => {
+export const Storage = ({additionalNodesProps, tenant, nodeId}: StorageProps) => {
     const dispatch = useDispatch();
 
     const {autorefresh} = useTypedSelector((state) => state.schema);
@@ -189,7 +189,7 @@ export const Storage = ({additionalNodesInfo, tenant, nodeId}: StorageProps) =>
                         data={storageNodes}
                         tableSettings={DEFAULT_TABLE_SETTINGS}
                         onShowAll={handleShowAllNodes}
-                        additionalNodesInfo={additionalNodesInfo}
+                        additionalNodesProps={additionalNodesProps}
                         sort={nodesSort}
                         handleSort={handleNodesSort}
                     />
diff --git a/src/containers/Storage/StorageNodes/StorageNodes.tsx b/src/containers/Storage/StorageNodes/StorageNodes.tsx
@@ -40,7 +40,7 @@ interface StorageNodesProps {
     visibleEntities: VisibleEntities;
     nodesUptimeFilter: keyof typeof NodesUptimeFilterValues;
     onShowAll?: VoidFunction;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalNodesProps?: AdditionalNodesProps;
     sort?: SortOrder;
     handleSort?: HandleSort;
 }
@@ -63,11 +63,11 @@ export function StorageNodes({
     visibleEntities,
     onShowAll,
     nodesUptimeFilter,
-    additionalNodesInfo,
+    additionalNodesProps,
     sort,
     handleSort,
 }: StorageNodesProps) {
-    const getNodeRef = additionalNodesInfo?.getNodeRef;
+    const getNodeRef = additionalNodesProps?.getNodeRef;
 
     const rawColumns: Column<PreparedStorageNode>[] = [
         {
diff --git a/src/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx b/src/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx
@@ -17,7 +17,7 @@ interface DetailedOverviewProps {
     type?: EPathType;
     className?: string;
     tenantName: string;
-    additionalTenantInfo?: AdditionalTenantsProps;
+    additionalTenantProps?: AdditionalTenantsProps;
 }
 
 const b = cn('kv-detailed-overview');
@@ -52,7 +52,7 @@ function DetailedOverview(props: DetailedOverviewProps) {
     };
 
     const renderContent = () => {
-        const {type, tenantName, additionalTenantInfo} = props;
+        const {type, tenantName, additionalTenantProps} = props;
         const isTenant = tenantName === currentSchemaPath;
         return (
             <div className={b()}>
@@ -61,7 +61,7 @@ function DetailedOverview(props: DetailedOverviewProps) {
                         <div className={b('section')}>
                             <TenantOverview
                                 tenantName={tenantName}
-                                additionalTenantInfo={additionalTenantInfo}
+                                additionalTenantProps={additionalTenantProps}
                             />
                         </div>
                         <div className={b('section')}>
diff --git a/src/containers/Tenant/Diagnostics/Diagnostics.tsx b/src/containers/Tenant/Diagnostics/Diagnostics.tsx
@@ -42,8 +42,8 @@ import './Diagnostics.scss';
 
 interface DiagnosticsProps {
     type?: EPathType;
-    additionalTenantInfo?: AdditionalTenantsProps;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalTenantProps?: AdditionalTenantsProps;
+    additionalNodesProps?: AdditionalNodesProps;
 }
 
 const b = cn('kv-tenant-diagnostics');
@@ -108,7 +108,7 @@ function Diagnostics(props: DiagnosticsProps) {
                     <DetailedOverview
                         type={type}
                         tenantName={tenantNameString}
-                        additionalTenantInfo={props.additionalTenantInfo}
+                        additionalTenantProps={props.additionalTenantProps}
                     />
                 );
             }
@@ -123,7 +123,7 @@ function Diagnostics(props: DiagnosticsProps) {
                     <Nodes
                         path={currentSchemaPath}
                         type={type}
-                        additionalNodesInfo={props.additionalNodesInfo}
+                        additionalNodesProps={props.additionalNodesProps}
                     />
                 );
             }
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
@@ -24,10 +24,10 @@ const b = cn('tenant-overview');
 
 interface TenantOverviewProps {
     tenantName: string;
-    additionalTenantInfo?: AdditionalTenantsProps;
+    additionalTenantProps?: AdditionalTenantsProps;
 }
 
-export function TenantOverview({tenantName, additionalTenantInfo}: TenantOverviewProps) {
+export function TenantOverview({tenantName, additionalTenantProps}: TenantOverviewProps) {
     const {tenant, loading, wasLoaded} = useTypedSelector((state) => state.tenant);
     const {autorefresh} = useTypedSelector((state) => state.schema);
     const dispatch = useDispatch();
@@ -119,7 +119,7 @@ export function TenantOverview({tenantName, additionalTenantInfo}: TenantOvervie
             <div className={b('top-label')}>{tenantType}</div>
             <div className={b('top')}>
                 {renderName()}
-                {additionalTenantInfo?.getMonitoringLink?.(Name, Type)}
+                {additionalTenantProps?.getMonitoringLink?.(Name, Type)}
             </div>
             <div className={b('system-tablets')}>
                 {SystemTablets &&
diff --git a/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx b/src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx
@@ -19,8 +19,8 @@ const b = cn('object-general');
 
 interface ObjectGeneralProps {
     type?: EPathType;
-    additionalTenantInfo?: AdditionalTenantsProps;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalTenantProps?: AdditionalTenantsProps;
+    additionalNodesProps?: AdditionalNodesProps;
 }
 
 function ObjectGeneral(props: ObjectGeneralProps) {
@@ -33,7 +33,7 @@ function ObjectGeneral(props: ObjectGeneralProps) {
     const {name: tenantName, tenantPage = initialPage} = queryParams;
 
     const renderTabContent = () => {
-        const {type, additionalTenantInfo, additionalNodesInfo} = props;
+        const {type, additionalTenantProps, additionalNodesProps} = props;
         switch (tenantPage) {
             case TENANT_PAGES_IDS.query: {
                 return <Query path={tenantName as string} theme={theme} type={type} />;
@@ -42,8 +42,8 @@ function ObjectGeneral(props: ObjectGeneralProps) {
                 return (
                     <Diagnostics
                         type={type}
-                        additionalTenantInfo={additionalTenantInfo}
-                        additionalNodesInfo={additionalNodesInfo}
+                        additionalTenantProps={additionalTenantProps}
+                        additionalNodesProps={additionalNodesProps}
                     />
                 );
             }
diff --git a/src/containers/Tenant/Tenant.tsx b/src/containers/Tenant/Tenant.tsx
@@ -38,8 +38,8 @@ const initialTenantSummaryState = {
 };
 
 interface TenantProps {
-    additionalTenantInfo?: AdditionalTenantsProps;
-    additionalNodesInfo?: AdditionalNodesProps;
+    additionalTenantProps?: AdditionalTenantsProps;
+    additionalNodesProps?: AdditionalNodesProps;
 }
 
 function Tenant(props: TenantProps) {
@@ -125,8 +125,8 @@ function Tenant(props: TenantProps) {
                     />
                     <ObjectGeneral
                         type={preloadedPathType || currentPathType}
-                        additionalTenantInfo={props.additionalTenantInfo}
-                        additionalNodesInfo={props.additionalNodesInfo}
+                        additionalTenantProps={props.additionalTenantProps}
+                        additionalNodesProps={props.additionalNodesProps}
                     />
                 </SplitPane>
             )}
