Skip to content
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

[8.15] [Roles] Fix bug with roles grid not sorting on clicking table header (#194196) #194282

Merged
merged 1 commit into from
Sep 27, 2024
Merged

[8.15] [Roles] Fix bug with roles grid not sorting on clicking table header (#194196) #194282

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
115 changes: 112 additions & 3 deletions x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { EuiBasicTable, EuiIcon } from '@elastic/eui';
import { EuiIcon, EuiInMemoryTable } from '@elastic/eui';
import type { ReactWrapper } from 'enzyme';
import React from 'react';

Expand Down Expand Up @@ -209,7 +209,7 @@ describe('<RolesGridPage />', () => {
return updatedWrapper.find(EuiIcon).length > initialIconCount;
});

expect(wrapper.find(EuiBasicTable).props().items).toEqual([
expect(wrapper.find(EuiInMemoryTable).props().items).toEqual([
{
name: 'test-role-1',
elasticsearch: {
Expand Down Expand Up @@ -296,7 +296,7 @@ describe('<RolesGridPage />', () => {

findTestSubject(wrapper, 'showReservedRolesSwitch').simulate('click');

expect(wrapper.find(EuiBasicTable).props().items).toEqual([
expect(wrapper.find(EuiInMemoryTable).props().items).toEqual([
{
name: 'test-role-1',
elasticsearch: { cluster: [], indices: [], run_as: [] },
Expand All @@ -322,6 +322,115 @@ describe('<RolesGridPage />', () => {
]);
});

it('sorts columns on clicking the column header', async () => {
const wrapper = mountWithIntl(
<RolesGridPage
rolesAPIClient={apiClientMock}
history={history}
notifications={notifications}
i18n={i18n}
buildFlavor={'traditional'}
analytics={analytics}
theme={theme}
/>
);
const initialIconCount = wrapper.find(EuiIcon).length;

await waitForRender(wrapper, (updatedWrapper) => {
return updatedWrapper.find(EuiIcon).length > initialIconCount;
});

expect(wrapper.find(EuiInMemoryTable).props().items).toEqual([
{
name: 'test-role-1',
elasticsearch: {
cluster: [],
indices: [],
run_as: [],
},
kibana: [
{
base: [],
spaces: [],
feature: {},
},
],
},
{
name: 'test-role-with-description',
description: 'role-description',
elasticsearch: {
cluster: [],
indices: [],
run_as: [],
},
kibana: [
{
base: [],
spaces: [],
feature: {},
},
],
},
{
name: 'reserved-role',
elasticsearch: {
cluster: [],
indices: [],
run_as: [],
},
kibana: [
{
base: [],
spaces: [],
feature: {},
},
],
metadata: {
_reserved: true,
},
},
{
name: 'disabled-role',
elasticsearch: {
cluster: [],
indices: [],
run_as: [],
},
kibana: [
{
base: [],
spaces: [],
feature: {},
},
],
transient_metadata: {
enabled: false,
},
},
{
name: 'special%chars%role',
elasticsearch: {
cluster: [],
indices: [],
run_as: [],
},
kibana: [
{
base: [],
spaces: [],
feature: {},
},
],
},
]);

findTestSubject(wrapper, 'tableHeaderCell_name_0').simulate('click');

const firstRowElement = findTestSubject(wrapper, 'roleRowName').first();
expect(firstRowElement.text()).toBe('disabled-role');
});

it('hides controls when `readOnly` is enabled', async () => {
const wrapper = mountWithIntl(
<RolesGridPage
Expand Down
52 changes: 8 additions & 44 deletions x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,13 @@
* 2.0.
*/

import type {
CriteriaWithPagination,
EuiBasicTableColumn,
EuiSwitchEvent,
Query,
} from '@elastic/eui';
import type { EuiBasicTableColumn, EuiSwitchEvent } from '@elastic/eui';
import {
EuiBasicTable,
EuiButton,
EuiButtonEmpty,
EuiFlexGroup,
EuiFlexItem,
EuiInMemoryTable,
EuiLink,
EuiSearchBar,
EuiSpacer,
Expand Down Expand Up @@ -59,12 +54,6 @@ export interface Props extends StartServices {
cloudOrgUrl?: string;
}

interface RolesTableState {
query: Query;
from: number;
size: number;
}

const getRoleManagementHref = (action: 'edit' | 'clone', roleName?: string) => {
return `/${action}${roleName ? `/${encodeURIComponent(roleName)}` : ''}`;
};
Expand All @@ -79,17 +68,6 @@ const getVisibleRoles = (roles: Role[], filter: string, includeReservedRoles: bo
});
};

const DEFAULT_TABLE_STATE = {
query: EuiSearchBar.Query.MATCH_ALL,
sort: {
field: 'creation' as const,
direction: 'desc' as const,
},
from: 0,
size: 25,
filters: {},
};

export const RolesGridPage: FC<Props> = ({
notifications,
rolesAPIClient,
Expand All @@ -109,7 +87,6 @@ export const RolesGridPage: FC<Props> = ({
const [permissionDenied, setPermissionDenied] = useState<boolean>(false);
const [includeReservedRoles, setIncludeReservedRoles] = useState<boolean>(true);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [tableState, setTableState] = useState<RolesTableState>(DEFAULT_TABLE_STATE);

useEffect(() => {
loadRoles();
Expand Down Expand Up @@ -235,15 +212,6 @@ export const RolesGridPage: FC<Props> = ({
}
};

const onTableChange = ({ page, sort }: CriteriaWithPagination<Role>) => {
const newState = {
...tableState,
from: page?.index! * page?.size!,
size: page?.size!,
};
setTableState(newState);
};

const getColumnConfig = (): Array<EuiBasicTableColumn<Role>> => {
const config: Array<EuiBasicTableColumn<Role>> = [
{
Expand Down Expand Up @@ -365,12 +333,6 @@ export const RolesGridPage: FC<Props> = ({
setShowDeleteConfirmation(false);
};

const pagination = {
pageIndex: tableState.from / tableState.size,
pageSize: tableState.size,
totalItemCount: visibleRoles.length,
pageSizeOptions: [25, 50, 100],
};
return permissionDenied ? (
<PermissionDenied />
) : (
Expand Down Expand Up @@ -466,7 +428,7 @@ export const RolesGridPage: FC<Props> = ({
toolsRight={renderToolsRight()}
/>
<EuiSpacer size="s" />
<EuiBasicTable
<EuiInMemoryTable
data-test-subj="rolesTable"
itemId="name"
columns={getColumnConfig()}
Expand All @@ -481,9 +443,11 @@ export const RolesGridPage: FC<Props> = ({
selected: selection,
}
}
onChange={onTableChange}
pagination={pagination}
noItemsMessage={
pagination={{
initialPageSize: 20,
pageSizeOptions: [10, 20, 30, 50, 100],
}}
message={
buildFlavor === 'serverless' ? (
<FormattedMessage
id="xpack.security.management.roles.noCustomRolesFound"
Expand Down