Select agents and add/remove groups #6274

lucianogorza · 2024-01-08T14:16:30Z

Description

This PR adds global actions to the agent's table to allow the user to add agents to groups or remove agents from groups.
To achieve this, a selector was added to the table, and the TableWzAPI component had to be modified. Global actions to edit agent groups open a modal from which groups to add or remove can be selected. Upon saving, the progress of the process is displayed, first retrieving agent information and then applying changes to each group.
Finally, the result of the transactions is shown, providing information to the user about agents that were successfully assigned or removed from groups and indicating the cause of any failures if they occurred.

In summary, the following modifications were made:

Add global actions to agent's table
- Add agents to groups
- Remove agents from groups
Add "addOnTitle" optional prop to TableWzAPI component to add selection options after the title on the table.
Enhance the TableWzAPI header for better visibility across various screen widths.
Utilize the ref prop in TableWithSearchBar to reset the selection when the table is refreshed, sorted, or the page is changed.
Enhance the apiReq method in the WzRequest class by introducing an optional parameter returnOriginalResponse. This parameter allows the method to return all affected and failed items when adding agents to groups or removing agents from groups.

Issues Resolved

#6257

Evidence

Select some agents

Select all filtered agents

Test

Test with manager
Create at least 11 agents and 3 groups

Test

Legend:
⚫: none
🟢: pass
🟡: warning
🔴: fail
⚪: not applicable

UI

General

Test	Chrome	Firefox	Safari
Without select agents global actions must be disabled	⚫	⚫	⚫
Select some agents. Global actions must be enabled	⚫	⚫	⚫
Select agents and change filters. Selection must cleared	⚫	⚫	⚫
Select agents and change page. Selection must cleared	⚫	⚫	⚫
Select agents and sort data. Selection must cleared	⚫	⚫	⚫
With a read only user, select some agents. Global actions must be disabled	⚫	⚫	⚫

Details

⚫ Without select agents global actions must be disabled

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Select some agents. Global actions must be enabled

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Select agents and change filters. Selection must cleared

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Select agents and change page. Selection must cleared

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Select agents and sort data. Selection must cleared

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ With a read only user, select some agents. Global actions must be disabled

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

Select some agents

Test	Chrome	Firefox	Safari
Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different agents and groups.	⚫	⚫	⚫
Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different agents and groups.	⚫	⚫	⚫

Details

⚫ Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different agents and groups

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different agents and groups

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

Select all filtered agents

Test	Chrome	Firefox	Safari
Go to Add/Remove groups -> Add groups to agents. A callout should be displayed warning that the changes will be applied to all filtered agents.	⚫	⚫	⚫
Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different groups.	⚫	⚫	⚫
Go to Add/Remove groups -> Remove groups from agents. A callout should be displayed warning that the changes will be applied to all filtered agents.	⚫	⚫	⚫
Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different groups.	⚫	⚫	⚫

Details

⚫ Go to Add/Remove groups -> Add groups to agents. A callout should be displayed warning that the changes will be applied to all filtered agents

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different groups

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Go to Add/Remove groups -> Remove groups from agents. A callout should be displayed warning that the changes will be applied to all filtered agents

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Remove groups from agents. Select groups, save, and check the results. Test with different groups

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

Paginate requests

The following request must be paginated:

Agents list: When adding or removing groups for all filtered agents, the agents must be retrieved through paginated requests.
Groups list: When the modal is open, the list of groups is retrieved.
Modify groups: When selecting groups and saving, the changes must be applied to the agents through paginated requests.

The default pagination is set to 1000. To test, it is necessary to modify the default value, for example, to 2.

plugins/main/public/components/endpoints-summary/services/get-agents.tsx: Line 9.
plugins/main/public/components/endpoints-summary/services/get-groups.tsx: Line 9.
plugins/main/public/components/endpoints-summary/services/paginated-agents-group.tsx: Line 17.

Test	Chrome	Firefox	Safari
Select agents > Go to Add/Remove groups -> Add groups to agents. Check the groups list and the network requests.	⚫	⚫	⚫
Select all filtered agents > Go to Add/Remove groups -> Add groups to agents. Select groups and save. Check the network requests to get the agents and add the groups. Check the displayed result.	⚫	⚫	⚫

Details

⚫ Select agents > Go to Add/Remove groups -> Add groups to agents. Check the groups list and the network requests

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

⚫ Select all filtered agents > Go to Add/Remove groups -> Add groups to agents. Select groups and save. Check the network requests to get the agents and add the groups. Check the displayed result

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

Check List

All tests pass
- yarn test:jest
New functionality includes testing.
New functionality has been documented.
Update CHANGELOG.md
Commits are signed per the DCO using --signoff

Tostti · 2024-02-23T19:09:37Z

UI

General

Test	Chrome	Firefox	Safari
Without select agents global actions must be disabled	🟢	🟢	🟢
Select some agents. Global actions must be enabled	🟢	🟢	🟢
Select agents and change filters. Selection must cleared	🟢	🟢	🟢
Select agents and change page. Selection must cleared	🟢	🟢	🟢
Select agents and sort data. Selection must cleared	🟢	🟢	🟢
With a read only user, select some agents. Global actions must be disabled	🟢	🟢	🟢

Details

🟢 Without select agents global actions must be disabled

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

🟢 Select some agents. Global actions must be enabled

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

🟢 Select agents and change filters. Selection must cleared

Chrome - 🟢

Video_2024-02-26_11-26-39.mp4

Firefox - 🟢

Video_2024-02-26_11-27-19.mp4

Safari - 🟢

Video_2024-02-26_11-29-45.mp4

🟢 Select agents and change page. Selection must cleared

Chrome - 🟢

Video_2024-02-26_11-32-01.mp4

Firefox - 🟢

Video_2024-02-26_11-32-23.mp4

Safari - 🟢

Video_2024-02-26_11-32-47.mp4

🟢 Select agents and sort data. Selection must cleared

Chrome - 🟢

Video_2024-02-26_11-34-55.mp4

Firefox - 🟢

Video_2024-02-26_11-35-33.mp4

Safari - 🟢

Video_2024-02-26_11-35-59.mp4

🟢 With a read only user, select some agents. Global actions must be disabled

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

Select some agents

Test	Chrome	Firefox	Safari
Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different agents and groups.	🟢	🟢	🟢
Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different agents and groups.	🟢	🟢	🟢

Details

🟢 Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different agents and groups

Chrome - 🟢

Video_2024-02-26_12-09-43.mp4

Firefox - 🟢

Video_2024-02-26_12-11-53.mp4

Safari - 🟢

Video_2024-02-26_12-13-37.mp4

🟢 Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different agents and groups

Chrome - 🟢

Video_2024-02-26_12-10-34.mp4

Firefox - 🟢

Video_2024-02-26_12-12-41.mp4

Safari - 🟢

Video_2024-02-26_12-14-26.mp4

Select all filtered agents

Test	Chrome	Firefox	Safari
Go to Add/Remove groups -> Add groups to agents. A callout should be displayed warning that the changes will be applied to all filtered agents.	🟢	🟢	🟢
Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different groups.	🟢	🟢	🟢
Go to Add/Remove groups -> Remove groups from agents. A callout should be displayed warning that the changes will be applied to all filtered agents.	🟢	🟢	🟢
Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different groups.	🟢	🟢	🟢

Details

🟢 Go to Add/Remove groups -> Add groups to agents. A callout should be displayed warning that the changes will be applied to all filtered agents

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

🟢 Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different groups

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

🟢 Go to Add/Remove groups -> Remove groups from agents. A callout should be displayed warning that the changes will be applied to all filtered agents

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

🟢 Remove groups from agents. Select groups, save, and check the results. Test with different groups

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

Paginate requests

The following request must be paginated:

Agents list: When adding or removing groups for all filtered agents, the agents must be retrieved through paginated requests.
Groups list: When the modal is open, the list of groups is retrieved.
Modify groups: When selecting groups and saving, the changes must be applied to the agents through paginated requests.

The default pagination is set to 1000. To test, it is necessary to modify the default value, for example, to 2.

plugins/main/public/components/endpoints-summary/services/get-agents.tsx: Line 9.
plugins/main/public/components/endpoints-summary/services/get-groups.tsx: Line 9.
plugins/main/public/components/endpoints-summary/services/paginated-agents-group.tsx: Line 17.

Value modified to 2

Test	Chrome	Firefox	Safari
Select agents > Go to Add/Remove groups -> Add groups to agents. Check the groups list and the network requests.	🟢	🟢	🟢
Select all filtered agents > Go to Add/Remove groups -> Add groups to agents. Select groups and save. Check the network requests to get the agents and add the groups. Check the displayed result.	🟢	🟢	🟢

Details

🟢 Select agents > Go to Add/Remove groups -> Add groups to agents. Check the groups list and the network requests

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

🟢 Select all filtered agents > Go to Add/Remove groups -> Add groups to agents. Select groups and save. Check the network requests to get the agents and add the groups. Check the displayed result

Chrome - 🟢

Firefox - 🟢

Safari - 🟢

jbiset · 2024-02-23T20:19:30Z

CR: ✔️

UI

General

Test	Chrome	Firefox	Safari
Without select agents global actions must be disabled	🟢	🟢	⚫
Select some agents. Global actions must be enabled	🟢	🟢	⚫
Select agents and change filters. Selection must cleared	🟢	🟢	⚫
Select agents and change page. Selection must cleared	🟢	🟢	⚫
Select agents and sort data. Selection must cleared	🟢	🟢	⚫
With a read only user, select some agents. Global actions must be disabled	🟢	🟢	⚫

Details

🟢 Without select agents global actions must be disabled

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 Select some agents. Global actions must be enabled

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 Select agents and change filters. Selection must cleared

Chrome - 🟢

3_evidence_chrome.webm

Firefox - 🟢

3_evidence_firefox.webm

Safari - ⚫

🟢 Select agents and change page. Selection must cleared

Chrome - 🟢

4_evidence_chrome.webm

Firefox - 🟢

4_evidence_firefox.webm

Safari - ⚫

🟢 Select agents and sort data. Selection must cleared

Chrome - 🟢

5_evidence_chrome.webm

Firefox - 🟢

5_evidence_firefox.webm

Safari - ⚫

🟢 With a read only user, select some agents. Global actions must be disabled

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

Select some agents

Test	Chrome	Firefox	Safari
Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different agents and groups.	🟢	🟢	⚫
Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different agents and groups.	🟢	🟢	⚫

Details

🟢 Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different agents and groups

Chrome - 🟢

6_evidence_chrome.webm

Firefox - 🟢

6_evidence_firefox.webm

Safari - ⚫

🟢 Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different agents and groups

Chrome - 🟢

7_evidence_chrome.webm

Firefox - 🟢

7_evidence_firefox.webm

Safari - ⚫

COMMENT
When allowed to select a group that is not assigned, it failed. So, if possible, you can list only the groups that can be removed from the selected agent group.

7_evidence_chrome_yellow.webm

Select all filtered agents

Test	Chrome	Firefox	Safari
Go to Add/Remove groups -> Add groups to agents. A callout should be displayed warning that the changes will be applied to all filtered agents.	🟢	🟢	⚫
Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different groups.	🟢	🟢	⚫
Go to Add/Remove groups -> Remove groups from agents. A callout should be displayed warning that the changes will be applied to all filtered agents.	🟢	🟢	⚫
Go to Add/Remove groups -> Remove groups from agents. Select groups, save, and check the results. Test with different groups.	🟢	🟢	⚫

Details

🟢 Go to Add/Remove groups -> Add groups to agents. A callout should be displayed warning that the changes will be applied to all filtered agents

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 Go to Add/Remove groups -> Add groups to agents. Select groups, save, and check the results. Test with different groups

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 Go to Add/Remove groups -> Remove groups from agents. A callout should be displayed warning that the changes will be applied to all filtered agents

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 Remove groups from agents. Select groups, save, and check the results. Test with different groups

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

Paginate requests

The following request must be paginated:

Agents list: When adding or removing groups for all filtered agents, the agents must be retrieved through paginated requests.
Groups list: When the modal is open, the list of groups is retrieved.
Modify groups: When selecting groups and saving, the changes must be applied to the agents through paginated requests.

The default pagination is set to 1000. To test, it is necessary to modify the default value, for example, to 2.

plugins/main/public/components/endpoints-summary/services/get-agents.tsx: Line 9.
plugins/main/public/components/endpoints-summary/services/get-groups.tsx: Line 9.
plugins/main/public/components/endpoints-summary/services/paginated-agents-group.tsx: Line 17.

Test	Chrome	Firefox	Safari
Select agents > Go to Add/Remove groups -> Add groups to agents. Check the groups list and the network requests.	🟢	🟢	⚫
Select all filtered agents > Go to Add/Remove groups -> Add groups to agents. Select groups and save. Check the network requests to get the agents and add the groups. Check the displayed result.	🟢	🟢	⚫

Details

🟢 Select agents > Go to Add/Remove groups -> Add groups to agents. Check the groups list and the network requests

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 Select all filtered agents > Go to Add/Remove groups -> Add groups to agents. Select groups and save. Check the network requests to get the agents and add the groups. Check the displayed result

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

plugins/main/public/components/endpoints-summary/services/paginated-agents-group.test.tsx

github-actions · 2024-02-23T20:45:49Z

Wazuh Core plugin code coverage (Jest) test	%	values
Statements	21.38%	( 176 / 823 )
Branches	19.45%	( 79 / 406 )
Functions	14.17%	( 36 / 254 )
Lines	21.57%	( 173 / 802 )

github-actions · 2024-02-23T20:45:57Z

Wazuh Check Updates plugin code coverage (Jest) test	%	values
Statements	76.44%	( 172 / 225 )
Branches	58.65%	( 61 / 104 )
Functions	61.7%	( 29 / 47 )
Lines	76.44%	( 172 / 225 )

github-actions · 2024-02-23T20:50:03Z

Main plugin code coverage (Jest) test	%	values
Statements	12%	( 4164 / 34696 )
Branches	7.93%	( 1817 / 22901 )
Functions	11.5%	( 955 / 8302 )
Lines	12.18%	( 4048 / 33234 )

Tostti

Test ✅
CR ✅

LGTM

jbiset

CR 🟢

Test 🟢

lucianogorza self-assigned this Jan 8, 2024

lucianogorza linked an issue Jan 8, 2024 that may be closed by this pull request

Allow select agents to add or remove groups #6257

Closed

13 tasks

lucianogorza changed the title ~~Enhancement/6257 select agents and add remove groups~~ Select agents and add remove groups Feb 2, 2024

lucianogorza changed the title ~~Select agents and add remove groups~~ Select agents and add/remove groups Feb 2, 2024

asteriscos changed the base branch from master to 4.9.0 February 13, 2024 10:03

lucianogorza force-pushed the enhancement/6257-select-agents-and-add-remove-groups branch from 23ebaf7 to 63446b0 Compare February 21, 2024 20:20

lucianogorza marked this pull request as ready for review February 23, 2024 15:23

lucianogorza added 23 commits February 23, 2024 12:24

Add global action to agents table

e46470e

Add global action remove groups from agents

e0c4497

Add warning to remove groups from agents

3cb0fe7

Add results to modal

fb582f9

Improve global actions to agent table

bf2a1ed

Improve modal result

6c20614

Manage API response

cc1b66f

Improve result modal

7d55cd8

Fix table layout

c2b4b5f

Clear table selection on refresh

044c026

Fix filters and clear selection on sort and pagination

bd4c66b

Fix filters when user type

942eb9d

Improve parameters in service funtions

68aae74

Paginate getAgents and getGroups

2d4b4f8

Paginate add and remove agents to groups

85e4e3a

Update CHANGELOG

cba808c

Update test snapshots

402a39a

Fix pageSize on add-remove agents

08ef700

Fix snapshot

016126e

Fix snapshot checkbox id and label

57d4466

Fix snapshot checkbox id and label in Mobile

c6d49b7

Add unit test for services

3453f34

Add unit test for hooks

c00aa2d

Add unit test for React components

36fe172

lucianogorza force-pushed the enhancement/6257-select-agents-and-add-remove-groups branch from 60bcfa7 to 36fe172 Compare February 23, 2024 15:27

Update snapshots

fa94bc1

Tostti self-requested a review February 23, 2024 18:17

jbiset self-requested a review February 23, 2024 19:34

yenienserrano reviewed Feb 23, 2024

View reviewed changes

plugins/main/public/components/endpoints-summary/services/paginated-agents-group.test.tsx Outdated Show resolved Hide resolved

Remove comments

892057a

Tostti approved these changes Feb 26, 2024

View reviewed changes

jbiset approved these changes Feb 27, 2024

View reviewed changes

asteriscos merged commit 1bc5bb6 into 4.9.0 Feb 27, 2024
4 checks passed

asteriscos deleted the enhancement/6257-select-agents-and-add-remove-groups branch February 27, 2024 17:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Select agents and add/remove groups #6274

Select agents and add/remove groups #6274

lucianogorza commented Jan 8, 2024 •

edited

Loading

Tostti commented Feb 23, 2024 •

edited

Loading

jbiset commented Feb 23, 2024 •

edited

Loading

github-actions bot commented Feb 23, 2024

github-actions bot commented Feb 23, 2024

github-actions bot commented Feb 23, 2024

Tostti left a comment

jbiset left a comment

Select agents and add/remove groups #6274

Select agents and add/remove groups #6274

Conversation

lucianogorza commented Jan 8, 2024 • edited Loading

Description

Issues Resolved

Evidence

Select some agents

Select all filtered agents

Test

Test

UI

General

Select some agents

Select all filtered agents

Paginate requests

Check List

Tostti commented Feb 23, 2024 • edited Loading

UI

General

Select some agents

Select all filtered agents

Paginate requests

jbiset commented Feb 23, 2024 • edited Loading

CR: ✔️

UI

General

Select some agents

Select all filtered agents

Paginate requests

github-actions bot commented Feb 23, 2024

github-actions bot commented Feb 23, 2024

github-actions bot commented Feb 23, 2024

Tostti left a comment

Choose a reason for hiding this comment

jbiset left a comment

Choose a reason for hiding this comment

CR 🟢

Test 🟢

lucianogorza commented Jan 8, 2024 •

edited

Loading

Tostti commented Feb 23, 2024 •

edited

Loading

jbiset commented Feb 23, 2024 •

edited

Loading