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

Jump to bottom

[Fleet][EuiInMemoryTable] Replace usage of deprecated ref method with controlled selection.selected API #175727

Merged
merged 2 commits into from
Jan 29, 2024
Merged

[Fleet][EuiInMemoryTable] Replace usage of deprecated ref method with controlled selection.selected API #175727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc61638
[Fleet] Replace advanced usage of deprecated ref method with controll…
cee-chen Jan 26, 2024
dd92161
Merge branch 'main' into eui-table-selection-controlled-advanced
cee-chen Jan 29, 2024
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
6 changes: 3 additions & 3 deletions ...public/applications/fleet/sections/agents/agent_list_page/components/agent_list_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ interface Props {
sortField: keyof Agent;
sortOrder: 'asc' | 'desc';
onSelectionChange: (agents: Agent[]) => void;
tableRef?: React.Ref<any>;
selected: Agent[];
showUpgradeable: boolean;
totalAgents?: number;
pagination: Pagination;
Expand All @@ -77,9 +77,9 @@ export const AgentListTable: React.FC<Props> = (props: Props) => {
renderActions,
sortField,
sortOrder,
tableRef,
onTableChange,
onSelectionChange,
selected,
totalAgents = 0,
showUpgradeable,
pagination,
Expand Down Expand Up @@ -318,7 +318,6 @@ export const AgentListTable: React.FC<Props> = (props: Props) => {

return (
<EuiBasicTable<Agent>
ref={tableRef}
className="fleet__agentList__table"
data-test-subj="fleetAgentListTable"
loading={isLoading}
Expand All @@ -341,6 +340,7 @@ export const AgentListTable: React.FC<Props> = (props: Props) => {
}}
isSelectable={true}
selection={{
selected,
onSelectionChange,
selectable: isAgentSelectable,
selectableMessage: (selectable, agent) => {
Expand Down
24 changes: 9 additions & 15 deletions x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import React, { useState, useMemo, useCallback, useRef } from 'react';
import React, { useState, useMemo, useCallback } from 'react';
import { differenceBy, isEqual } from 'lodash';
import type { EuiBasicTable } from '@elastic/eui';
import { EuiSpacer, EuiPortal } from '@elastic/eui';

import type { Agent } from '../../../types';
Expand Down Expand Up @@ -49,7 +48,6 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
// Table and search states
const [selectedAgents, setSelectedAgents] = useState<Agent[]>([]);
const [selectionMode, setSelectionMode] = useState<SelectionMode>('manual');
const tableRef = useRef<EuiBasicTable<Agent>>(null);

const {
allTags,
Expand Down Expand Up @@ -208,21 +206,19 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
);

const onSelectionChange = (newAgents: Agent[]) => {
setSelectedAgents(newAgents);
if (selectionMode === 'query' && newAgents.length < selectedAgents.length) {
// differentiating between selection changed by agents dropping from current page or user action
const areSelectedAgentsStillVisible =
selectedAgents.length > 0 &&
differenceBy(selectedAgents, agentsOnCurrentPage, 'id').length === 0;
if (areSelectedAgentsStillVisible) {
setSelectionMode('manual');
} else {
if (!areSelectedAgentsStillVisible) {
// force selecting all agents on current page if staying in query mode
if (tableRef?.current) {
tableRef.current.setSelection(agentsOnCurrentPage);
}
return setSelectedAgents(agentsOnCurrentPage);
} else {
setSelectionMode('manual');
}
}
setSelectedAgents(newAgents);
};

const agentToUnenrollHasFleetServer = useMemo(() => {
Expand Down Expand Up @@ -429,10 +425,8 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
setSelectionMode={setSelectionMode}
selectedAgents={selectedAgents}
setSelectedAgents={(newAgents: Agent[]) => {
if (tableRef?.current) {
tableRef.current.setSelection(newAgents);
setSelectionMode('manual');
}
setSelectedAgents(newAgents);
setSelectionMode('manual');
}}
clearFilters={clearFilters}
isUsingFilter={isUsingFilter}
Expand All @@ -448,7 +442,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
agentPoliciesIndexedById={agentPoliciesIndexedById}
renderActions={renderActions}
onSelectionChange={onSelectionChange}
tableRef={tableRef}
selected={selectedAgents}
showUpgradeable={showUpgradeable}
onTableChange={onTableChange}
pagination={pagination}
Expand Down
Loading