fix: fix types for external props (#522)

krosy1337 · web-flow · commit 173081f2f0d2 · 2023-08-25T13:45:32.000+03:00
diff --git a/src/components/BasicNodeViewer/BasicNodeViewer.tsx b/src/components/BasicNodeViewer/BasicNodeViewer.tsx
@@ -1,7 +1,7 @@
 import cn from 'bem-cn-lite';
 
 import type {TSystemStateInfo} from '../../types/api/nodes';
-import type {AdditionalNodesInfo} from '../../utils/nodes';
+import type {AdditionalNodesProps} from '../../types/additionalProps';
 
 import EntityStatus from '../EntityStatus/EntityStatus';
 import {Tags} from '../Tags';
@@ -13,7 +13,7 @@ const b = cn('basic-node-viewer');
 
 interface BasicNodeViewerProps {
     node: TSystemStateInfo;
-    additionalNodesInfo?: AdditionalNodesInfo;
+    additionalNodesInfo?: AdditionalNodesProps;
     className?: string;
 }
 
diff --git a/src/components/NodeHostWrapper/NodeHostWrapper.tsx b/src/components/NodeHostWrapper/NodeHostWrapper.tsx
@@ -3,8 +3,9 @@ import block from 'bem-cn-lite';
 import {Button, Popover, PopoverBehavior} from '@gravity-ui/uikit';
 
 import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
+import type {NodeAddress} from '../../types/additionalProps';
 import {getDefaultNodePath} from '../../containers/Node/NodePages';
-import {isUnavailableNode, NodeAddress} from '../../utils/nodes';
+import {isUnavailableNode} from '../../utils/nodes';
 
 import EntityStatus from '../EntityStatus/EntityStatus';
 import {NodeEndpointsTooltipContent} from '../TooltipsContent';
diff --git a/src/containers/Cluster/Cluster.tsx b/src/containers/Cluster/Cluster.tsx
@@ -10,8 +10,8 @@ import type {
     AdditionalClusterProps,
     AdditionalTenantsProps,
     AdditionalVersionsProps,
+    AdditionalNodesProps,
 } from '../../types/additionalProps';
-import type {AdditionalNodesInfo} from '../../utils/nodes';
 import routes from '../../routes';
 
 import {setHeaderBreadcrumbs} from '../../store/reducers/header/header';
@@ -35,7 +35,7 @@ const b = cn('cluster');
 
 interface ClusterProps {
     additionalTenantsProps?: AdditionalTenantsProps;
-    additionalNodesInfo?: AdditionalNodesInfo;
+    additionalNodesInfo?: AdditionalNodesProps;
     additionalClusterProps?: AdditionalClusterProps;
     additionalVersionsProps?: AdditionalVersionsProps;
 }
diff --git a/src/containers/Node/Node.tsx b/src/containers/Node/Node.tsx
@@ -21,6 +21,8 @@ import {setHeaderBreadcrumbs} from '../../store/reducers/header/header';
 import {AutoFetcher} from '../../utils/autofetcher';
 import {useTypedSelector} from '../../utils/hooks';
 
+import type {AdditionalNodesProps} from '../../types/additionalProps';
+
 import {clusterTabsIds} from '../Cluster/utils';
 
 import './Node.scss';
@@ -32,7 +34,7 @@ export const STORAGE_ROLE = 'Storage';
 const autofetcher = new AutoFetcher();
 
 interface NodeProps {
-    additionalNodesInfo?: any;
+    additionalNodesInfo?: AdditionalNodesProps;
     className?: string;
 }
 
diff --git a/src/containers/Node/NodeStructure/NodeStructure.tsx b/src/containers/Node/NodeStructure/NodeStructure.tsx
@@ -13,6 +13,8 @@ import {selectNodeStructure} from '../../../store/reducers/node/selectors';
 import {AutoFetcher} from '../../../utils/autofetcher';
 import {useTypedSelector} from '../../../utils/hooks';
 
+import type {AdditionalNodesProps} from '../../../types/additionalProps';
+
 import {PDisk} from './Pdisk';
 
 import './NodeStructure.scss';
@@ -30,7 +32,7 @@ function generateId({type, id}: {type: 'pdisk' | 'vdisk'; id: string}) {
 interface NodeStructureProps {
     nodeId: string;
     className?: string;
-    additionalNodesInfo?: any;
+    additionalNodesInfo?: AdditionalNodesProps;
 }
 
 const autofetcher = new AutoFetcher();
diff --git a/src/containers/Node/NodeStructure/Pdisk.tsx b/src/containers/Node/NodeStructure/Pdisk.tsx
@@ -27,7 +27,7 @@ interface PDiskProps {
     unfolded?: boolean;
     id: string;
     selectedVdiskId?: string;
-    nodeHref?: string;
+    nodeHref?: string | null;
 }
 
 enum VDiskTableColumnsIds {
@@ -62,7 +62,7 @@ function getColumns({
 }: {
     pDiskId: number;
     selectedVdiskId?: string;
-    nodeHref?: string;
+    nodeHref?: string | null;
 }) {
     const columns: Column<RowType>[] = [
         {
diff --git a/src/containers/Nodes/Nodes.tsx b/src/containers/Nodes/Nodes.tsx
@@ -26,7 +26,7 @@ import {
     useNodesRequestParams,
     useTableSort,
 } from '../../utils/hooks';
-import {AdditionalNodesInfo, isUnavailableNode, NodesUptimeFilterValues} from '../../utils/nodes';
+import {isUnavailableNode, NodesUptimeFilterValues} from '../../utils/nodes';
 
 import {
     getNodes,
@@ -39,6 +39,7 @@ import {
 } from '../../store/reducers/nodes/nodes';
 import {selectFilteredNodes} from '../../store/reducers/nodes/selectors';
 import {changeFilter, ProblemFilterValues} from '../../store/reducers/settings/settings';
+import type {AdditionalNodesProps} from '../../types/additionalProps';
 
 import {isDatabaseEntityType} from '../Tenant/utils/schema';
 
@@ -53,7 +54,7 @@ const b = cn('ydb-nodes');
 interface NodesProps {
     path?: string;
     type?: EPathType;
-    additionalNodesInfo?: AdditionalNodesInfo;
+    additionalNodesInfo?: AdditionalNodesProps;
 }
 
 export const Nodes = ({path, type, additionalNodesInfo = {}}: NodesProps) => {
diff --git a/src/containers/Nodes/getNodesColumns.tsx b/src/containers/Nodes/getNodesColumns.tsx
@@ -6,11 +6,13 @@ import ProgressViewer from '../../components/ProgressViewer/ProgressViewer';
 import {TabletsStatistic} from '../../components/TabletsStatistic';
 import {NodeHostWrapper} from '../../components/NodeHostWrapper/NodeHostWrapper';
 
-import {isSortableNodesProperty, type NodeAddress} from '../../utils/nodes';
+import {isSortableNodesProperty} from '../../utils/nodes';
 import {formatBytesToGigabyte} from '../../utils/index';
 
 import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
 
+import type {NodeAddress} from '../../types/additionalProps';
+
 const NODES_COLUMNS_IDS = {
     NodeId: 'NodeId',
     Host: 'Host',
diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx
@@ -15,6 +15,7 @@ import type {
     VisibleEntities,
 } from '../../store/reducers/storage/types';
 import type {NodesSortParams} from '../../store/reducers/nodes/types';
+import type {AdditionalNodesProps} from '../../types/additionalProps';
 import {
     setInitialState,
     setVisibleEntities,
@@ -45,7 +46,7 @@ import {
     useTableSort,
     useTypedSelector,
 } from '../../utils/hooks';
-import {AdditionalNodesInfo, NodesUptimeFilterValues} from '../../utils/nodes';
+import {NodesUptimeFilterValues} from '../../utils/nodes';
 import {DEFAULT_TABLE_SETTINGS} from '../../utils/constants';
 
 import {StorageGroups} from './StorageGroups/StorageGroups';
@@ -59,7 +60,7 @@ import './Storage.scss';
 const b = cn('global-storage');
 
 interface StorageProps {
-    additionalNodesInfo?: AdditionalNodesInfo;
+    additionalNodesInfo?: AdditionalNodesProps;
     tenant?: string;
     nodeId?: string;
 }
diff --git a/src/containers/Storage/StorageNodes/StorageNodes.tsx b/src/containers/Storage/StorageNodes/StorageNodes.tsx
@@ -5,10 +5,10 @@ import DataTable, {Column, Settings, SortOrder} from '@gravity-ui/react-data-tab
 import type {ValueOf} from '../../../types/common';
 import type {PreparedStorageNode, VisibleEntities} from '../../../store/reducers/storage/types';
 import type {HandleSort} from '../../../utils/hooks/useTableSort';
+import type {AdditionalNodesProps} from '../../../types/additionalProps';
 
 import {VISIBLE_ENTITIES} from '../../../store/reducers/storage/constants';
 import {
-    AdditionalNodesInfo,
     isSortableNodesProperty,
     isUnavailableNode,
     NodesUptimeFilterValues,
@@ -40,7 +40,7 @@ interface StorageNodesProps {
     visibleEntities: VisibleEntities;
     nodesUptimeFilter: keyof typeof NodesUptimeFilterValues;
     onShowAll?: VoidFunction;
-    additionalNodesInfo?: AdditionalNodesInfo;
+    additionalNodesInfo?: AdditionalNodesProps;
     sort?: SortOrder;
     handleSort?: HandleSort;
 }
diff --git a/src/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx b/src/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx
@@ -5,6 +5,7 @@ import cn from 'bem-cn-lite';
 import {Button, Modal} from '@gravity-ui/uikit';
 
 import type {EPathType} from '../../../../types/api/schema';
+import type {AdditionalTenantsProps} from '../../../../types/additionalProps';
 import {Icon} from '../../../../components/Icon';
 import Overview from '../Overview/Overview';
 import {Healthcheck} from '../Healthcheck';
@@ -16,7 +17,7 @@ interface DetailedOverviewProps {
     type?: EPathType;
     className?: string;
     tenantName: string;
-    additionalTenantInfo?: any;
+    additionalTenantInfo?: AdditionalTenantsProps;
 }
 
 const b = cn('kv-detailed-overview');
diff --git a/src/containers/Tenant/Diagnostics/Diagnostics.tsx b/src/containers/Tenant/Diagnostics/Diagnostics.tsx
@@ -8,6 +8,7 @@ import {useLocation} from 'react-router';
 import {Switch, Tabs} from '@gravity-ui/uikit';
 
 import type {EPathType} from '../../../types/api/schema';
+import type {AdditionalTenantsProps, AdditionalNodesProps} from '../../../types/additionalProps';
 
 import {useTypedSelector} from '../../../utils/hooks';
 import routes, {createHref} from '../../../routes';
@@ -41,8 +42,8 @@ import './Diagnostics.scss';
 
 interface DiagnosticsProps {
     type?: EPathType;
-    additionalTenantInfo?: any;
-    additionalNodesInfo?: any;
+    additionalTenantInfo?: AdditionalTenantsProps;
+    additionalNodesInfo?: AdditionalNodesProps;
 }
 
 const b = cn('kv-tenant-diagnostics');
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
@@ -13,7 +13,8 @@ import {TABLET_STATES, TENANT_DEFAULT_TITLE} from '../../../../utils/constants';
 import {bytesToGB} from '../../../../utils/utils';
 import {mapDatabaseTypeToDBName} from '../../utils/schema';
 import {useAutofetcher, useTypedSelector} from '../../../../utils/hooks';
-import {ETabletVolatileState} from '../../../../types/api/tenant';
+import type {ETabletVolatileState} from '../../../../types/api/tenant';
+import type {AdditionalTenantsProps} from '../../../../types/additionalProps';
 import {getTenantInfo, setDataWasNotLoaded} from '../../../../store/reducers/tenant/tenant';
 
 import i18n from './i18n';
@@ -23,7 +24,7 @@ const b = cn('tenant-overview');
 
 interface TenantOverviewProps {
     tenantName: string;
-    additionalTenantInfo?: any;
+    additionalTenantInfo?: AdditionalTenantsProps;
 }
 
 export function TenantOverview({tenantName, additionalTenantInfo}: TenantOverviewProps) {
@@ -118,7 +119,7 @@ export function TenantOverview({tenantName, additionalTenantInfo}: TenantOvervie
             <div className={b('top-label')}>{tenantType}</div>
             <div className={b('top')}>
                 {renderName()}
-                {tenant && additionalTenantInfo && additionalTenantInfo(tenant.Name, tenant.Type)}
+                {additionalTenantInfo?.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
@@ -4,6 +4,7 @@ import cn from 'bem-cn-lite';
 import {useThemeValue} from '@gravity-ui/uikit';
 
 import type {EPathType} from '../../../types/api/schema';
+import type {AdditionalTenantsProps, AdditionalNodesProps} from '../../../types/additionalProps';
 import {TENANT_PAGES_IDS} from '../../../store/reducers/tenant/constants';
 import {useSetting} from '../../../utils/hooks';
 import {TENANT_INITIAL_PAGE_KEY} from '../../../utils/constants';
@@ -18,8 +19,8 @@ const b = cn('object-general');
 
 interface ObjectGeneralProps {
     type?: EPathType;
-    additionalTenantInfo?: any;
-    additionalNodesInfo?: any;
+    additionalTenantInfo?: AdditionalTenantsProps;
+    additionalNodesInfo?: AdditionalNodesProps;
 }
 
 function ObjectGeneral(props: ObjectGeneralProps) {
diff --git a/src/containers/Tenant/Tenant.tsx b/src/containers/Tenant/Tenant.tsx
@@ -5,6 +5,7 @@ import {useLocation} from 'react-router';
 import qs from 'qs';
 
 import type {TEvDescribeSchemeResult} from '../../types/api/schema';
+import type {AdditionalTenantsProps, AdditionalNodesProps} from '../../types/additionalProps';
 
 import {DEFAULT_IS_TENANT_SUMMARY_COLLAPSED, DEFAULT_SIZE_TENANT_KEY} from '../../utils/constants';
 import {useTypedSelector} from '../../utils/hooks';
@@ -37,8 +38,8 @@ const initialTenantSummaryState = {
 };
 
 interface TenantProps {
-    additionalTenantInfo?: any;
-    additionalNodesInfo?: any;
+    additionalTenantInfo?: AdditionalTenantsProps;
+    additionalNodesInfo?: AdditionalNodesProps;
 }
 
 function Tenant(props: TenantProps) {
diff --git a/src/containers/Tenants/Tenants.tsx b/src/containers/Tenants/Tenants.tsx
@@ -106,9 +106,7 @@ export const Tenants = ({additionalTenantsProps}: TenantsProps) => {
                                     backend,
                                 })}
                             />
-                            {row.Name &&
-                                row.Type &&
-                                additionalTenantsProps?.getMonitoringLink?.(row.Name, row.Type)}
+                            {additionalTenantsProps?.getMonitoringLink?.(row.Name, row.Type)}
                         </div>
                     );
                 },
diff --git a/src/types/additionalProps.ts b/src/types/additionalProps.ts
@@ -2,6 +2,7 @@ import type {ReactNode} from 'react';
 
 import type {InfoViewerItem} from '../components/InfoViewer';
 import type {ETenantType} from './api/tenant';
+import type {TSystemStateInfo} from './api/nodes';
 import type {VersionToColorMap} from './versions';
 
 export interface AdditionalVersionsProps {
@@ -20,5 +21,11 @@ export interface AdditionalClusterProps {
 
 export interface AdditionalTenantsProps {
     prepareTenantBackend?: (backend: string | undefined) => string | undefined;
-    getMonitoringLink?: (name: string, type: ETenantType) => ReactNode;
+    getMonitoringLink?: (name?: string, type?: ETenantType) => ReactNode;
+}
+
+export type NodeAddress = Pick<TSystemStateInfo, 'Host' | 'Endpoints'>;
+
+export interface AdditionalNodesProps extends Record<string, unknown> {
+    getNodeRef?: (node?: NodeAddress) => string | null;
 }
diff --git a/src/utils/nodes.ts b/src/utils/nodes.ts
@@ -18,12 +18,6 @@ export const NodesUptimeFilterTitles = {
 export const isUnavailableNode = (node: NodesPreparedEntity | TSystemStateInfo) =>
     !node.SystemState || node.SystemState === EFlag.Grey;
 
-export type NodeAddress = Pick<TSystemStateInfo, 'Host' | 'Endpoints'>;
-
-export interface AdditionalNodesInfo extends Record<string, unknown> {
-    getNodeRef?: (node?: NodeAddress) => string | null;
-}
-
 export const prepareNodesMap = (nodesList?: TNodeInfo[]) => {
     return nodesList?.reduce<NodesMap>((nodesMap, node) => {
         if (node.Id && node.Host) {
