Skip to content

Commit dd2b040

Browse files
krosy1337krosy1337
authored
fix: rename additionalInfo params to additionalProps (#525)
1 parent f593b57 commit dd2b040

File tree

12 files changed

+45
-45
lines changed

12 files changed

+45
-45
lines changed

‎src/components/BasicNodeViewer/BasicNodeViewer.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ const b = cn('basic-node-viewer');
1313

1414
interface BasicNodeViewerProps {
1515
node: TSystemStateInfo;
16-
additionalNodesInfo?: AdditionalNodesProps;
16+
additionalNodesProps?: AdditionalNodesProps;
1717
className?: string;
1818
}
1919

20-
export const BasicNodeViewer = ({node, additionalNodesInfo, className}: BasicNodeViewerProps) => {
21-
const nodeHref = additionalNodesInfo?.getNodeRef
22-
? additionalNodesInfo.getNodeRef(node) + 'internal'
20+
export const BasicNodeViewer = ({node, additionalNodesProps, className}: BasicNodeViewerProps) => {
21+
const nodeHref = additionalNodesProps?.getNodeRef
22+
? additionalNodesProps.getNodeRef(node) + 'internal'
2323
: undefined;
2424

2525
return (

‎src/containers/Cluster/Cluster.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ const b = cn('cluster');
3535

3636
interface ClusterProps {
3737
additionalTenantsProps?: AdditionalTenantsProps;
38-
additionalNodesInfo?: AdditionalNodesProps;
38+
additionalNodesProps?: AdditionalNodesProps;
3939
additionalClusterProps?: AdditionalClusterProps;
4040
additionalVersionsProps?: AdditionalVersionsProps;
4141
}
4242

4343
function Cluster({
4444
additionalClusterProps,
4545
additionalTenantsProps,
46-
additionalNodesInfo,
46+
additionalNodesProps,
4747
additionalVersionsProps,
4848
}: ClusterProps) {
4949
const dispatch = useDispatch();
@@ -104,10 +104,10 @@ function Cluster({
104104
return <Tenants additionalTenantsProps={additionalTenantsProps} />;
105105
}
106106
case clusterTabsIds.nodes: {
107-
return <Nodes additionalNodesInfo={additionalNodesInfo} />;
107+
return <Nodes additionalNodesProps={additionalNodesProps} />;
108108
}
109109
case clusterTabsIds.storage: {
110-
return <Storage additionalNodesInfo={additionalNodesInfo} />;
110+
return <Storage additionalNodesProps={additionalNodesProps} />;
111111
}
112112
case clusterTabsIds.versions: {
113113
return <Versions versionToColor={versionToColor} />;

‎src/containers/Node/Node.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const STORAGE_ROLE = 'Storage';
3434
const autofetcher = new AutoFetcher();
3535

3636
interface NodeProps {
37-
additionalNodesInfo?: AdditionalNodesProps;
37+
additionalNodesProps?: AdditionalNodesProps;
3838
className?: string;
3939
}
4040

@@ -115,7 +115,7 @@ function Node(props: NodeProps) {
115115
);
116116
};
117117
const renderTabContent = () => {
118-
const {additionalNodesInfo} = props;
118+
const {additionalNodesProps} = props;
119119

120120
switch (activeTab) {
121121
case STORAGE: {
@@ -138,7 +138,7 @@ function Node(props: NodeProps) {
138138
<NodeStructure
139139
className={b('node-page-wrapper')}
140140
nodeId={nodeId}
141-
additionalNodesInfo={additionalNodesInfo}
141+
additionalNodesProps={additionalNodesProps}
142142
/>
143143
);
144144
}
@@ -157,7 +157,7 @@ function Node(props: NodeProps) {
157157
<div className={b(null, props.className)}>
158158
<BasicNodeViewer
159159
node={node}
160-
additionalNodesInfo={props.additionalNodesInfo}
160+
additionalNodesProps={props.additionalNodesProps}
161161
className={b('header')}
162162
/>
163163

‎src/containers/Node/NodeStructure/NodeStructure.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ function generateId({type, id}: {type: 'pdisk' | 'vdisk'; id: string}) {
3232
interface NodeStructureProps {
3333
nodeId: string;
3434
className?: string;
35-
additionalNodesInfo?: AdditionalNodesProps;
35+
additionalNodesProps?: AdditionalNodesProps;
3636
}
3737

3838
const autofetcher = new AutoFetcher();
3939

40-
function NodeStructure({nodeId, className, additionalNodesInfo}: NodeStructureProps) {
40+
function NodeStructure({nodeId, className, additionalNodesProps}: NodeStructureProps) {
4141
const dispatch = useDispatch();
4242

4343
const nodeStructure = useTypedSelector(selectNodeStructure);
@@ -46,10 +46,10 @@ function NodeStructure({nodeId, className, additionalNodesInfo}: NodeStructurePr
4646
const nodeData = useTypedSelector((state) => state.node?.data?.SystemStateInfo?.[0]);
4747

4848
const nodeHref = useMemo(() => {
49-
return additionalNodesInfo?.getNodeRef
50-
? additionalNodesInfo.getNodeRef(nodeData)
49+
return additionalNodesProps?.getNodeRef
50+
? additionalNodesProps.getNodeRef(nodeData)
5151
: undefined;
52-
}, [nodeData, additionalNodesInfo]);
52+
}, [nodeData, additionalNodesProps]);
5353

5454
const {pdiskId: pdiskIdFromUrl, vdiskId: vdiskIdFromUrl} = url.parse(
5555
window.location.href,

‎src/containers/Nodes/Nodes.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ const b = cn('ydb-nodes');
5454
interface NodesProps {
5555
path?: string;
5656
type?: EPathType;
57-
additionalNodesInfo?: AdditionalNodesProps;
57+
additionalNodesProps?: AdditionalNodesProps;
5858
}
5959

60-
export const Nodes = ({path, type, additionalNodesInfo = {}}: NodesProps) => {
60+
export const Nodes = ({path, type, additionalNodesProps = {}}: NodesProps) => {
6161
const dispatch = useDispatch();
6262

6363
const isClusterNodes = !path;
@@ -154,7 +154,7 @@ export const Nodes = ({path, type, additionalNodesInfo = {}}: NodesProps) => {
154154

155155
const renderTable = () => {
156156
const columns = getNodesColumns({
157-
getNodeRef: additionalNodesInfo.getNodeRef,
157+
getNodeRef: additionalNodesProps.getNodeRef,
158158
});
159159

160160
if (nodes && nodes.length === 0) {

‎src/containers/Storage/Storage.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ import './Storage.scss';
6060
const b = cn('global-storage');
6161

6262
interface StorageProps {
63-
additionalNodesInfo?: AdditionalNodesProps;
63+
additionalNodesProps?: AdditionalNodesProps;
6464
tenant?: string;
6565
nodeId?: string;
6666
}
6767

68-
export const Storage = ({additionalNodesInfo, tenant, nodeId}: StorageProps) => {
68+
export const Storage = ({additionalNodesProps, tenant, nodeId}: StorageProps) => {
6969
const dispatch = useDispatch();
7070

7171
const {autorefresh} = useTypedSelector((state) => state.schema);
@@ -189,7 +189,7 @@ export const Storage = ({additionalNodesInfo, tenant, nodeId}: StorageProps) =>
189189
data={storageNodes}
190190
tableSettings={DEFAULT_TABLE_SETTINGS}
191191
onShowAll={handleShowAllNodes}
192-
additionalNodesInfo={additionalNodesInfo}
192+
additionalNodesProps={additionalNodesProps}
193193
sort={nodesSort}
194194
handleSort={handleNodesSort}
195195
/>

‎src/containers/Storage/StorageNodes/StorageNodes.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ interface StorageNodesProps {
4040
visibleEntities: VisibleEntities;
4141
nodesUptimeFilter: keyof typeof NodesUptimeFilterValues;
4242
onShowAll?: VoidFunction;
43-
additionalNodesInfo?: AdditionalNodesProps;
43+
additionalNodesProps?: AdditionalNodesProps;
4444
sort?: SortOrder;
4545
handleSort?: HandleSort;
4646
}
@@ -63,11 +63,11 @@ export function StorageNodes({
6363
visibleEntities,
6464
onShowAll,
6565
nodesUptimeFilter,
66-
additionalNodesInfo,
66+
additionalNodesProps,
6767
sort,
6868
handleSort,
6969
}: StorageNodesProps) {
70-
const getNodeRef = additionalNodesInfo?.getNodeRef;
70+
const getNodeRef = additionalNodesProps?.getNodeRef;
7171

7272
const rawColumns: Column<PreparedStorageNode>[] = [
7373
{

‎src/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ interface DetailedOverviewProps {
1717
type?: EPathType;
1818
className?: string;
1919
tenantName: string;
20-
additionalTenantInfo?: AdditionalTenantsProps;
20+
additionalTenantProps?: AdditionalTenantsProps;
2121
}
2222

2323
const b = cn('kv-detailed-overview');
@@ -52,7 +52,7 @@ function DetailedOverview(props: DetailedOverviewProps) {
5252
};
5353

5454
const renderContent = () => {
55-
const {type, tenantName, additionalTenantInfo} = props;
55+
const {type, tenantName, additionalTenantProps} = props;
5656
const isTenant = tenantName === currentSchemaPath;
5757
return (
5858
<div className={b()}>
@@ -61,7 +61,7 @@ function DetailedOverview(props: DetailedOverviewProps) {
6161
<div className={b('section')}>
6262
<TenantOverview
6363
tenantName={tenantName}
64-
additionalTenantInfo={additionalTenantInfo}
64+
additionalTenantProps={additionalTenantProps}
6565
/>
6666
</div>
6767
<div className={b('section')}>

‎src/containers/Tenant/Diagnostics/Diagnostics.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import './Diagnostics.scss';
4242

4343
interface DiagnosticsProps {
4444
type?: EPathType;
45-
additionalTenantInfo?: AdditionalTenantsProps;
46-
additionalNodesInfo?: AdditionalNodesProps;
45+
additionalTenantProps?: AdditionalTenantsProps;
46+
additionalNodesProps?: AdditionalNodesProps;
4747
}
4848

4949
const b = cn('kv-tenant-diagnostics');
@@ -108,7 +108,7 @@ function Diagnostics(props: DiagnosticsProps) {
108108
<DetailedOverview
109109
type={type}
110110
tenantName={tenantNameString}
111-
additionalTenantInfo={props.additionalTenantInfo}
111+
additionalTenantProps={props.additionalTenantProps}
112112
/>
113113
);
114114
}
@@ -123,7 +123,7 @@ function Diagnostics(props: DiagnosticsProps) {
123123
<Nodes
124124
path={currentSchemaPath}
125125
type={type}
126-
additionalNodesInfo={props.additionalNodesInfo}
126+
additionalNodesProps={props.additionalNodesProps}
127127
/>
128128
);
129129
}

‎src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ const b = cn('tenant-overview');
2424

2525
interface TenantOverviewProps {
2626
tenantName: string;
27-
additionalTenantInfo?: AdditionalTenantsProps;
27+
additionalTenantProps?: AdditionalTenantsProps;
2828
}
2929

30-
export function TenantOverview({tenantName, additionalTenantInfo}: TenantOverviewProps) {
30+
export function TenantOverview({tenantName, additionalTenantProps}: TenantOverviewProps) {
3131
const {tenant, loading, wasLoaded} = useTypedSelector((state) => state.tenant);
3232
const {autorefresh} = useTypedSelector((state) => state.schema);
3333
const dispatch = useDispatch();
@@ -119,7 +119,7 @@ export function TenantOverview({tenantName, additionalTenantInfo}: TenantOvervie
119119
<div className={b('top-label')}>{tenantType}</div>
120120
<div className={b('top')}>
121121
{renderName()}
122-
{additionalTenantInfo?.getMonitoringLink?.(Name, Type)}
122+
{additionalTenantProps?.getMonitoringLink?.(Name, Type)}
123123
</div>
124124
<div className={b('system-tablets')}>
125125
{SystemTablets &&

0 commit comments

Comments
 (0)