-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(PaginatedStorage): add grouping
- Loading branch information
1 parent
960e97f
commit c53bc8f
Showing
45 changed files
with
963 additions
and
664 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ | |
| } | ||
|
|
||
| &__vdisks-item { | ||
| flex-basis: 5px; | ||
| flex-basis: 3px; | ||
| flex-shrink: 0; | ||
|
|
||
| .stack__layer { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,163 +1,22 @@ | ||
| import {StringParam, useQueryParams} from 'use-query-params'; | ||
| import {PaginatedStorageGroups} from './PaginatedStorageGroups'; | ||
| import {PaginatedStorageNodes} from './PaginatedStorageNodes'; | ||
| import {useStorageQueryParams} from './useStorageQueryParams'; | ||
|
|
||
| import {AccessDenied} from '../../components/Errors/403/AccessDenied'; | ||
| import {ResponseError} from '../../components/Errors/ResponseError/ResponseError'; | ||
| import type {RenderControls, RenderErrorMessage} from '../../components/PaginatedTable'; | ||
| import {useClusterBaseInfo} from '../../store/reducers/cluster/cluster'; | ||
| import {VISIBLE_ENTITIES} from '../../store/reducers/storage/constants'; | ||
| import {storageTypeSchema, visibleEntitiesSchema} from '../../store/reducers/storage/types'; | ||
| import type {StorageType, VisibleEntities} from '../../store/reducers/storage/types'; | ||
| import {NodesUptimeFilterValues, nodesUptimeFilterValuesSchema} from '../../utils/nodes'; | ||
| import {useAdditionalNodeProps} from '../AppWithClusters/useClusterData'; | ||
|
|
||
| import {StorageControls} from './StorageControls/StorageControls'; | ||
| import {PaginatedStorageGroups} from './StorageGroups/PaginatedStorageGroups'; | ||
| import {useStorageGroupsSelectedColumns} from './StorageGroups/columns/hooks'; | ||
| import {PaginatedStorageNodes} from './StorageNodes/PaginatedStorageNodes'; | ||
| import {useStorageNodesSelectedColumns} from './StorageNodes/columns/hooks'; | ||
|
|
||
| interface PaginatedStorageProps { | ||
| export interface PaginatedStorageProps { | ||
| database?: string; | ||
| nodeId?: string; | ||
| groupId?: string; | ||
| parentContainer?: Element | null; | ||
| } | ||
|
|
||
| export const PaginatedStorage = ({ | ||
| database, | ||
| nodeId, | ||
| groupId, | ||
| parentContainer, | ||
| }: PaginatedStorageProps) => { | ||
| const {balancer} = useClusterBaseInfo(); | ||
| const {additionalNodesProps} = useAdditionalNodeProps({balancer}); | ||
| export const PaginatedStorage = (props: PaginatedStorageProps) => { | ||
| const {storageType} = useStorageQueryParams(); | ||
|
|
||
| const [queryParams, setQueryParams] = useQueryParams({ | ||
| type: StringParam, | ||
| visible: StringParam, | ||
| search: StringParam, | ||
| uptimeFilter: StringParam, | ||
| }); | ||
| const storageType = storageTypeSchema.parse(queryParams.type); | ||
| const isGroups = storageType === 'groups'; | ||
| const isNodes = storageType === 'nodes'; | ||
|
|
||
| const visibleEntities = visibleEntitiesSchema.parse(queryParams.visible); | ||
| const searchValue = queryParams.search ?? ''; | ||
| const nodesUptimeFilter = nodesUptimeFilterValuesSchema.parse(queryParams.uptimeFilter); | ||
|
|
||
| const { | ||
| columnsToShow: storageNodesColumnsToShow, | ||
| columnsToSelect: storageNodesColumnsToSelect, | ||
| setColumns: setStorageNodesSelectedColumns, | ||
| } = useStorageNodesSelectedColumns({ | ||
| additionalNodesProps, | ||
| visibleEntities, | ||
| database, | ||
| groupId, | ||
| }); | ||
|
|
||
| const { | ||
| columnsToShow: storageGroupsColumnsToShow, | ||
| columnsToSelect: storageGroupsColumnsToSelect, | ||
| setColumns: setStorageGroupsSelectedColumns, | ||
| } = useStorageGroupsSelectedColumns(visibleEntities); | ||
|
|
||
| const handleTextFilterChange = (value: string) => { | ||
| setQueryParams({search: value || undefined}, 'replaceIn'); | ||
| }; | ||
|
|
||
| const handleGroupVisibilityChange = (value: VisibleEntities) => { | ||
| setQueryParams({visible: value}, 'replaceIn'); | ||
| }; | ||
|
|
||
| const handleStorageTypeChange = (value: StorageType) => { | ||
| setQueryParams({type: value}, 'replaceIn'); | ||
| }; | ||
|
|
||
| const handleUptimeFilterChange = (value: NodesUptimeFilterValues) => { | ||
| setQueryParams({uptimeFilter: value}, 'replaceIn'); | ||
| }; | ||
|
|
||
| const handleShowAllGroups = () => { | ||
| handleGroupVisibilityChange(VISIBLE_ENTITIES.all); | ||
| }; | ||
|
|
||
| const handleShowAllNodes = () => { | ||
| setQueryParams( | ||
| { | ||
| visible: VISIBLE_ENTITIES.all, | ||
| uptimeFilter: NodesUptimeFilterValues.All, | ||
| }, | ||
| 'replaceIn', | ||
| ); | ||
| }; | ||
|
|
||
| const renderControls: RenderControls = ({totalEntities, foundEntities, inited}) => { | ||
| const columnsToSelect = isGroups | ||
| ? storageGroupsColumnsToSelect | ||
| : storageNodesColumnsToSelect; | ||
|
|
||
| const handleSelectedColumnsUpdate = isGroups | ||
| ? setStorageGroupsSelectedColumns | ||
| : setStorageNodesSelectedColumns; | ||
|
|
||
| return ( | ||
| <StorageControls | ||
| searchValue={searchValue} | ||
| handleSearchValueChange={handleTextFilterChange} | ||
| withTypeSelector | ||
| storageType={storageType} | ||
| handleStorageTypeChange={handleStorageTypeChange} | ||
| visibleEntities={visibleEntities} | ||
| handleVisibleEntitiesChange={handleGroupVisibilityChange} | ||
| nodesUptimeFilter={nodesUptimeFilter} | ||
| handleNodesUptimeFilterChange={handleUptimeFilterChange} | ||
| withGroupsUsageFilter={false} | ||
| entitiesCountCurrent={foundEntities} | ||
| entitiesCountTotal={totalEntities} | ||
| entitiesLoading={!inited} | ||
| columnsToSelect={columnsToSelect} | ||
| handleSelectedColumnsUpdate={handleSelectedColumnsUpdate} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| const renderErrorMessage: RenderErrorMessage = (error) => { | ||
| if (error.status === 403) { | ||
| return <AccessDenied position="left" />; | ||
| } | ||
|
|
||
| return <ResponseError error={error} />; | ||
| }; | ||
|
|
||
| if (isNodes) { | ||
| return ( | ||
| <PaginatedStorageNodes | ||
| searchValue={searchValue} | ||
| visibleEntities={visibleEntities} | ||
| nodesUptimeFilter={nodesUptimeFilter} | ||
| database={database} | ||
| onShowAll={handleShowAllNodes} | ||
| parentContainer={parentContainer} | ||
| renderControls={renderControls} | ||
| renderErrorMessage={renderErrorMessage} | ||
| columns={storageNodesColumnsToShow} | ||
| /> | ||
| ); | ||
| return <PaginatedStorageNodes {...props} />; | ||
| } | ||
|
|
||
| return ( | ||
| <PaginatedStorageGroups | ||
| searchValue={searchValue} | ||
| visibleEntities={visibleEntities} | ||
| database={database} | ||
| nodeId={nodeId} | ||
| onShowAll={handleShowAllGroups} | ||
| parentContainer={parentContainer} | ||
| renderControls={renderControls} | ||
| renderErrorMessage={renderErrorMessage} | ||
| columns={storageGroupsColumnsToShow} | ||
| /> | ||
| ); | ||
| return <PaginatedStorageGroups {...props} />; | ||
| }; |
Oops, something went wrong.