Skip to content

fix(Nodes,Storage): reorder controls - prevent moving on count change #1562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2024
Merged

fix(Nodes,Storage): reorder controls - prevent moving on count change #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/containers/Nodes/Nodes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,19 @@ export const Nodes = ({path, database, additionalNodesProps = {}}: NodesProps) =
/>
<ProblemFilter value={problemFilter} onChange={handleProblemFilterChange} />
<UptimeFilter value={uptimeFilter} onChange={handleUptimeFilterChange} />
<EntitiesCount
total={totalNodes}
current={nodes.length}
label={'Nodes'}
loading={isLoading}
/>
<TableColumnSetup
popupWidth={200}
items={columnsToSelect}
showStatus
onUpdate={setColumns}
sortable={false}
/>
<EntitiesCount
total={totalNodes}
current={nodes.length}
label={'Nodes'}
loading={isLoading}
/>
</React.Fragment>
);
};
Expand Down
12 changes: 6 additions & 6 deletions src/containers/Nodes/PaginatedNodes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ export const PaginatedNodes = ({path, database, parentRef, additionalNodesProps}
/>
<ProblemFilter value={problemFilter} onChange={handleProblemFilterChange} />
<UptimeFilter value={uptimeFilter} onChange={handleUptimeFilterChange} />
<EntitiesCount
total={totalEntities}
current={foundEntities}
label={'Nodes'}
loading={!inited}
/>
<TableColumnSetup
popupWidth={200}
items={columnsToSelect}
showStatus
onUpdate={setColumns}
sortable={false}
/>
<EntitiesCount
total={totalEntities}
current={foundEntities}
label={'Nodes'}
loading={!inited}
/>
</React.Fragment>
);
};
Expand Down
24 changes: 12 additions & 12 deletions src/containers/Storage/StorageControls/StorageControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ export function StorageGroupsControls({
onChange={handleVisibleEntitiesChange}
/>
)}
<EntitiesCount
label={i18n('groups')}
loading={entitiesLoading}
total={entitiesCountTotal}
current={entitiesCountCurrent}
/>
<TableColumnSetup
popupWidth={200}
items={columnsToSelect}
Expand All @@ -97,6 +91,12 @@ export function StorageGroupsControls({
/>
</React.Fragment>
) : null}
<EntitiesCount
label={i18n('groups')}
loading={entitiesLoading}
total={entitiesCountTotal}
current={entitiesCountCurrent}
/>
</React.Fragment>
);
}
Expand Down Expand Up @@ -149,12 +149,6 @@ export function StorageNodesControls({
{withGroupBySelect ? null : (
<UptimeFilter value={nodesUptimeFilter} onChange={handleUptimeFilterChange} />
)}
<EntitiesCount
label={i18n('nodes')}
loading={entitiesLoading}
total={entitiesCountTotal}
current={entitiesCountCurrent}
/>
<TableColumnSetup
popupWidth={200}
items={columnsToSelect}
Expand All @@ -177,6 +171,12 @@ export function StorageNodesControls({
/>
</React.Fragment>
) : null}
<EntitiesCount
label={i18n('nodes')}
loading={entitiesLoading}
total={entitiesCountTotal}
current={entitiesCountCurrent}
/>
</React.Fragment>
);
}
Loading