Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/containers/Storage/PaginatedStorage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ export const PaginatedStorage = ({
handleVisibleEntitiesChange={handleGroupVisibilityChange}
nodesUptimeFilter={nodesUptimeFilter}
handleNodesUptimeFilterChange={handleUptimeFilterChange}
withGroupsUsageFilter={false}
entitiesCountCurrent={foundEntities}
entitiesCountTotal={totalEntities}
entitiesLoading={!inited}
Expand Down
41 changes: 3 additions & 38 deletions src/containers/Storage/Storage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

import {ArrayParam, StringParam, useQueryParams, withDefault} from 'use-query-params';
import {StringParam, useQueryParams} from 'use-query-params';

import {AccessDenied} from '../../components/Errors/403';
import {isAccessError} from '../../components/Errors/PageError/PageError';
Expand All @@ -13,11 +13,7 @@ import {
import {useClusterBaseInfo} from '../../store/reducers/cluster/cluster';
import type {NodesSortParams} from '../../store/reducers/nodes/types';
import {VISIBLE_ENTITIES} from '../../store/reducers/storage/constants';
import {
filterGroups,
filterNodes,
getUsageFilterOptions,
} from '../../store/reducers/storage/selectors';
import {filterGroups, filterNodes} from '../../store/reducers/storage/selectors';
import {storageApi} from '../../store/reducers/storage/storage';
import {storageTypeSchema, visibleEntitiesSchema} from '../../store/reducers/storage/types';
import type {
Expand All @@ -41,23 +37,6 @@ import {defaultSortNode, getDefaultSortGroup} from './utils';

import './Storage.scss';

const UsageFilterParam = withDefault(
{
encode: ArrayParam.encode,
decode: (input) => {
if (input === null || input === undefined) {
return input;
}

if (!Array.isArray(input)) {
return input ? [input] : [];
}
return input.filter(Boolean) as string[];
},
},
[],
);

interface StorageProps {
database?: string;
nodeId?: string | number;
Expand All @@ -78,7 +57,6 @@ export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => {
visible: StringParam,
search: StringParam,
uptimeFilter: StringParam,
usageFilter: UsageFilterParam,
});
const storageType = storageTypeSchema.parse(queryParams.type);
const isGroups = storageType === 'groups';
Expand All @@ -87,7 +65,6 @@ export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => {
const visibleEntities = visibleEntitiesSchema.parse(queryParams.visible);
const filter = queryParams.search ?? '';
const uptimeFilter = nodesUptimeFilterValuesSchema.parse(queryParams.uptimeFilter);
const usageFilter = queryParams.usageFilter;

const [nodeSort, setNodeSort] = React.useState<NodesSortParams>({
sortOrder: undefined,
Expand Down Expand Up @@ -158,12 +135,7 @@ export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => {
() => filterNodes(nodes, filter, uptimeFilter),
[filter, nodes, uptimeFilter],
);
const storageGroups = React.useMemo(
() => filterGroups(groups, filter, usageFilter),
[filter, groups, usageFilter],
);

const usageFilterOptions = React.useMemo(() => getUsageFilterOptions(groups), [groups]);
const storageGroups = React.useMemo(() => filterGroups(groups, filter), [filter, groups]);

const [nodesSort, handleNodesSort] = useTableSort(nodesSortParams, (params) =>
setNodeSort(params as NodesSortParams),
Expand All @@ -172,10 +144,6 @@ export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => {
setGroupSort(params as StorageSortParams),
);

const handleUsageFilterChange = (value: string[]) => {
setQueryParams({usageFilter: value.length ? value : undefined}, 'replaceIn');
};

const handleTextFilterChange = (value: string) => {
setQueryParams({search: value || undefined}, 'replaceIn');
};
Expand Down Expand Up @@ -251,9 +219,6 @@ export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => {
handleVisibleEntitiesChange={handleGroupVisibilityChange}
nodesUptimeFilter={uptimeFilter}
handleNodesUptimeFilterChange={handleUptimeFilterChange}
groupsUsageFilter={usageFilter}
groupsUsageFilterOptions={usageFilterOptions}
handleGroupsUsageFilterChange={handleUsageFilterChange}
entitiesCountCurrent={entitiesCountCurrent}
entitiesCountTotal={entitiesCount.total}
entitiesLoading={isLoading}
Expand Down
21 changes: 0 additions & 21 deletions src/containers/Storage/StorageControls/StorageControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import type {StorageType, VisibleEntities} from '../../../store/reducers/storage
import type {NodesUptimeFilterValues} from '../../../utils/nodes';
import {StorageTypeFilter} from '../StorageTypeFilter/StorageTypeFilter';
import {StorageVisibleEntitiesFilter} from '../StorageVisibleEntitiesFilter/StorageVisibleEntitiesFilter';
import {UsageFilter} from '../UsageFilter/UsageFilter';
import type {UsageFilterItem} from '../UsageFilter/UsageFilter';
import i18n from '../i18n';
import {b} from '../shared';

Expand All @@ -30,11 +28,6 @@ interface StorageControlsProps {
nodesUptimeFilter: NodesUptimeFilterValues;
handleNodesUptimeFilterChange: (value: NodesUptimeFilterValues) => void;

withGroupsUsageFilter?: boolean;
groupsUsageFilter?: string[];
groupsUsageFilterOptions?: UsageFilterItem[];
handleGroupsUsageFilterChange?: (value: string[]) => void;

entitiesCountCurrent: number;
entitiesCountTotal?: number;
entitiesLoading: boolean;
Expand All @@ -57,11 +50,6 @@ export const StorageControls = ({
nodesUptimeFilter,
handleNodesUptimeFilterChange,

withGroupsUsageFilter,
groupsUsageFilter,
groupsUsageFilterOptions,
handleGroupsUsageFilterChange,

entitiesCountCurrent,
entitiesCountTotal,
entitiesLoading,
Expand All @@ -70,7 +58,6 @@ export const StorageControls = ({
handleSelectedColumnsUpdate,
}: StorageControlsProps) => {
const isNodes = storageType === STORAGE_TYPES.nodes;
const isGroups = storageType === STORAGE_TYPES.groups;
const entityName = isNodes ? i18n('nodes') : i18n('groups');

return (
Expand All @@ -96,14 +83,6 @@ export const StorageControls = ({
{isNodes && (
<UptimeFilter value={nodesUptimeFilter} onChange={handleNodesUptimeFilterChange} />
)}
{isGroups && withGroupsUsageFilter && (
<UsageFilter
value={groupsUsageFilter}
onChange={handleGroupsUsageFilterChange}
groups={groupsUsageFilterOptions}
/>
)}

<EntitiesCount
label={entityName}
loading={entitiesLoading}
Expand Down
38 changes: 0 additions & 38 deletions src/containers/Storage/UsageFilter/UsageFilter.scss

This file was deleted.

100 changes: 0 additions & 100 deletions src/containers/Storage/UsageFilter/UsageFilter.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions src/containers/Storage/UsageFilter/i18n/en.json

This file was deleted.

8 changes: 0 additions & 8 deletions src/containers/Storage/UsageFilter/i18n/index.ts

This file was deleted.

5 changes: 0 additions & 5 deletions src/containers/Storage/UsageFilter/i18n/ru.json

This file was deleted.

1 change: 0 additions & 1 deletion src/containers/Storage/UsageFilter/index.ts

This file was deleted.

6 changes: 0 additions & 6 deletions src/containers/Storage/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import type {
StorageSortParams,
VisibleEntities,
} from '../../../store/reducers/storage/types';
import {EFlag} from '../../../types/api/enums';
import {generateEvaluator} from '../../../utils/generateEvaluator';
import {NODES_COLUMNS_IDS} from '../../Nodes/columns/constants';
import {STORAGE_GROUPS_COLUMNS_IDS} from '../StorageGroups/columns/constants';
Expand Down Expand Up @@ -35,11 +34,6 @@ export const getUsageSeverityForStorageGroup = generateEvaluator(80, 85, [
'warning',
'danger',
]);
export const getUsageSeverityForEntityStatus = generateEvaluator(80, 85, [
EFlag.Green,
EFlag.Yellow,
EFlag.Red,
]);

export const defaultSortNode: NodesSortParams = {
sortValue: NODES_COLUMNS_IDS.NodeId,
Expand Down
Loading
Loading