Skip to content

Commit f98684f

Browse files
authored
Merge branch 'main' into astandrik.2315
2 parents e7b49c7 + 84f0eee commit f98684f

File tree

4 files changed

+18
-25
lines changed

4 files changed

+18
-25
lines changed

src/containers/Nodes/PaginatedNodes/GroupedNodesComponent.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ import {useSelectedColumns} from '../../../utils/hooks/useSelectedColumns';
1313
import {NodesUptimeFilterValues} from '../../../utils/nodes';
1414
import {TableGroup} from '../../Storage/TableGroup/TableGroup';
1515
import {useExpandedGroups} from '../../Storage/TableGroup/useExpandedTableGroups';
16+
import {NodesControls} from '../NodesControls/NodesControls';
1617
import {NodesTable} from '../NodesTable';
1718
import i18n from '../i18n';
1819
import {b} from '../shared';
1920
import {useNodesPageQueryParams} from '../useNodesPageQueryParams';
2021

21-
import {NodesControlsWithTableState} from './NodesControlsWithTableState';
22-
2322
interface NodeGroupProps {
2423
name: string;
2524
count: number;
@@ -172,12 +171,15 @@ export function GroupedNodesComponent({
172171
<PaginatedTableWithLayout
173172
initialState={initialState}
174173
controls={
175-
<NodesControlsWithTableState
176-
withGroupBySelect={true}
174+
<NodesControls
177175
groupByParams={groupByParams}
178176
withPeerRoleFilter={withPeerRoleFilter}
179177
columnsToSelect={columnsToSelect}
180178
handleSelectedColumnsUpdate={setColumns}
179+
entitiesCountCurrent={found}
180+
entitiesCountTotal={total}
181+
entitiesLoading={isLoading}
182+
withGroupBySelect
181183
/>
182184
}
183185
error={error ? <ResponseError error={error} /> : null}

src/containers/Storage/PaginatedStorageGroups/GroupedStorageGroupsComponent.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import i18n from '../i18n';
1616
import {b} from '../shared';
1717
import {useStorageQueryParams} from '../useStorageQueryParams';
1818

19-
import {StorageGroupsControlsWithTableState} from './StorageGroupsControls';
19+
import {StorageGroupsControls} from './StorageGroupsControls';
2020

2121
interface StorageGroupGroupProps {
2222
name: string;
@@ -160,9 +160,12 @@ export function GroupedStorageGroupsComponent({
160160
return (
161161
<PaginatedTableWithLayout
162162
controls={
163-
<StorageGroupsControlsWithTableState
163+
<StorageGroupsControls
164164
withTypeSelector
165165
withGroupBySelect
166+
entitiesCountCurrent={found}
167+
entitiesCountTotal={total}
168+
entitiesLoading={isLoading}
166169
columnsToSelect={columnsToSelect}
167170
handleSelectedColumnsUpdate={setColumns}
168171
/>

src/containers/Storage/PaginatedStorageNodes/GroupedStorageNodesComponent.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {b} from '../shared';
1616
import {useStorageQueryParams} from '../useStorageQueryParams';
1717
import {useStorageColumnsSettings} from '../utils';
1818

19-
import {StorageNodesControlsWithTableState} from './StorageNodesControls';
19+
import {StorageNodesControls} from './StorageNodesControls';
2020
import {useStorageNodesColumnsToSelect} from './useStorageNodesColumnsToSelect';
2121

2222
interface StorageNodeGroupProps {
@@ -161,9 +161,12 @@ export function GroupedStorageNodesComponent({
161161
return (
162162
<PaginatedTableWithLayout
163163
controls={
164-
<StorageNodesControlsWithTableState
164+
<StorageNodesControls
165165
withTypeSelector
166166
withGroupBySelect
167+
entitiesCountCurrent={found}
168+
entitiesCountTotal={total}
169+
entitiesLoading={isLoading}
167170
columnsToSelect={columnsToSelect}
168171
handleSelectedColumnsUpdate={setColumns}
169172
/>

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -178,23 +178,8 @@ test.describe('Object Summary', async () => {
178178
// Check Effective Access Rights
179179
const effectiveRights = await objectSummary.getEffectiveAccessRights();
180180
expect(effectiveRights).toEqual([
181-
{group: 'USERS', permissions: ['ConnectDatabase']},
182-
{group: 'METADATA-READERS', permissions: ['List']},
183-
{group: 'DATA-READERS', permissions: ['SelectRow']},
184-
{group: 'DATA-WRITERS', permissions: ['UpdateRow', 'EraseRow']},
185-
{
186-
group: 'DDL-ADMINS',
187-
permissions: [
188-
'WriteAttributes',
189-
'CreateDirectory',
190-
'CreateTable',
191-
'CreateQueue',
192-
'RemoveSchema',
193-
'AlterSchema',
194-
],
195-
},
196-
{group: 'ACCESS-ADMINS', permissions: ['GrantAccessRights']},
197-
{group: 'DATABASE-ADMINS', permissions: ['Manage']},
181+
{group: 'Access', permissions: ['Manage']},
182+
{group: 'Inheritance type', permissions: ['Inherit']},
198183
]);
199184
});
200185

0 commit comments

Comments
 (0)