Merge branch 'main' into astandrik.2315

Author: astandrik

src/containers/Nodes/PaginatedNodes/GroupedNodesComponent.tsx

@@ -13,13 +13,12 @@ import {useSelectedColumns} from '../../../utils/hooks/useSelectedColumns';
 import {NodesUptimeFilterValues} from '../../../utils/nodes';
 import {TableGroup} from '../../Storage/TableGroup/TableGroup';
 import {useExpandedGroups} from '../../Storage/TableGroup/useExpandedTableGroups';
+import {NodesControls} from '../NodesControls/NodesControls';
 import {NodesTable} from '../NodesTable';
 import i18n from '../i18n';
 import {b} from '../shared';
 import {useNodesPageQueryParams} from '../useNodesPageQueryParams';
 
-import {NodesControlsWithTableState} from './NodesControlsWithTableState';
-
 interface NodeGroupProps {
     name: string;
     count: number;
@@ -172,12 +171,15 @@ export function GroupedNodesComponent({
         <PaginatedTableWithLayout
             initialState={initialState}
             controls={
-                <NodesControlsWithTableState
-                    withGroupBySelect={true}
+                <NodesControls
                     groupByParams={groupByParams}
                     withPeerRoleFilter={withPeerRoleFilter}
                     columnsToSelect={columnsToSelect}
                     handleSelectedColumnsUpdate={setColumns}
+                    entitiesCountCurrent={found}
+                    entitiesCountTotal={total}
+                    entitiesLoading={isLoading}
+                    withGroupBySelect
                 />
             }
             error={error ? <ResponseError error={error} /> : null}

src/containers/Storage/PaginatedStorageGroups/GroupedStorageGroupsComponent.tsx

@@ -16,7 +16,7 @@ import i18n from '../i18n';
 import {b} from '../shared';
 import {useStorageQueryParams} from '../useStorageQueryParams';
 
-import {StorageGroupsControlsWithTableState} from './StorageGroupsControls';
+import {StorageGroupsControls} from './StorageGroupsControls';
 
 interface StorageGroupGroupProps {
     name: string;
@@ -160,9 +160,12 @@ export function GroupedStorageGroupsComponent({
     return (
         <PaginatedTableWithLayout
             controls={
-                <StorageGroupsControlsWithTableState
+                <StorageGroupsControls
                     withTypeSelector
                     withGroupBySelect
+                    entitiesCountCurrent={found}
+                    entitiesCountTotal={total}
+                    entitiesLoading={isLoading}
                     columnsToSelect={columnsToSelect}
                     handleSelectedColumnsUpdate={setColumns}
                 />

src/containers/Storage/PaginatedStorageNodes/GroupedStorageNodesComponent.tsx

@@ -16,7 +16,7 @@ import {b} from '../shared';
 import {useStorageQueryParams} from '../useStorageQueryParams';
 import {useStorageColumnsSettings} from '../utils';
 
-import {StorageNodesControlsWithTableState} from './StorageNodesControls';
+import {StorageNodesControls} from './StorageNodesControls';
 import {useStorageNodesColumnsToSelect} from './useStorageNodesColumnsToSelect';
 
 interface StorageNodeGroupProps {
@@ -161,9 +161,12 @@ export function GroupedStorageNodesComponent({
     return (
         <PaginatedTableWithLayout
             controls={
-                <StorageNodesControlsWithTableState
+                <StorageNodesControls
                     withTypeSelector
                     withGroupBySelect
+                    entitiesCountCurrent={found}
+                    entitiesCountTotal={total}
+                    entitiesLoading={isLoading}
                     columnsToSelect={columnsToSelect}
                     handleSelectedColumnsUpdate={setColumns}
                 />

tests/suites/tenant/summary/objectSummary.test.ts

@@ -178,23 +178,8 @@ test.describe('Object Summary', async () => {
         // Check Effective Access Rights
         const effectiveRights = await objectSummary.getEffectiveAccessRights();
         expect(effectiveRights).toEqual([
-            {group: 'USERS', permissions: ['ConnectDatabase']},
-            {group: 'METADATA-READERS', permissions: ['List']},
-            {group: 'DATA-READERS', permissions: ['SelectRow']},
-            {group: 'DATA-WRITERS', permissions: ['UpdateRow', 'EraseRow']},
-            {
-                group: 'DDL-ADMINS',
-                permissions: [
-                    'WriteAttributes',
-                    'CreateDirectory',
-                    'CreateTable',
-                    'CreateQueue',
-                    'RemoveSchema',
-                    'AlterSchema',
-                ],
-            },
-            {group: 'ACCESS-ADMINS', permissions: ['GrantAccessRights']},
-            {group: 'DATABASE-ADMINS', permissions: ['Manage']},
+            {group: 'Access', permissions: ['Manage']},
+            {group: 'Inheritance type', permissions: ['Inherit']},
         ]);
     });