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.

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

Rename applications on agent menu #5997

Conversation

Desvelao
Copy link
Member

@Desvelao Desvelao commented Oct 11, 2023

Description

This pull request adapts the agent menu to display the applications related to agents.

Changes:

  • Refactor agent menu to use the applications and categories
  • Simplify the data saved in the local storage to keep the pinned applications
  • Remove the usage of extensions configuration
  • Change the data schema of the pinned applications
  • Rename the session storage key to wz-menu-agent-apps-pinned where the pinned applications are stored
  • Fix a problem with the agent menu header when the side menu is docked

Issues Resolved

#5893

Evidence

image
image
image
image

Test

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

UI

Test Chrome
With a fresh browser, ensure the Threat hunting, File integrity monitoring, Configuration assessment, Vulnerability detection and MITRE ATT&CK applications are displayed as the default ones in the agent welcome view
Clicking on the More button of agent welcome, should display all the applications
Pinning an application from the More/Applications menu should display that application out of the More menu
Unpinning an application from the More/Applications menu should not display that application out of the More menu
Using a small window width, the More button on the agent welcome should display as Applications
Modify the pinned applications from the agent welcome, close the browser, open it and navigate the the agent welcome view. The pinned applications should be kept
The agent's navbar should display correctly
The agent's navbar should display correctly with the dock menu.
Inventory data, statistics and configuration must be displayed correctly

Details

⚫ With a fresh browser, ensure the Threat hunting, File integrity monitoring, Configuration assessment, Vulnerability detection and MITRE ATT&CK applications are displayed as the default ones in the agent welcome view

Chrome - ⚫

⚫ Clicking on the More button of agent welcome, should display all the applications

Chrome - ⚫

⚫ Pinning an application from the More/Applications menu should display that application out of the More menu

Chrome - ⚫

⚫ Unpinning an application from the More/Applications menu should not display that application out of the More menu

Chrome - ⚫

⚫ Using a small window width, the More button on the agent welcome should display as Applications

Chrome - ⚫

⚫ Modify the pinned applications from the agent welcome, close the browser, open it and navigate the the agent welcome view. The pinned applications should be kept

Chrome - ⚫

⚫ The agent's navbar should display correctly

Chrome - ⚫

⚫ The agent's navbar should display correctly with the dock menu

Chrome - ⚫

⚫ Inventory data, statistics and configuration must be displayed correctly

Chrome - ⚫

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

Refactor agent menu to use the applications and categories
Simplify the data saved in the local storage to keep the pinned
applications
@Desvelao Desvelao requested a review from a team as a code owner October 11, 2023 07:43
@Desvelao Desvelao self-assigned this Oct 11, 2023
@Desvelao Desvelao linked an issue Oct 11, 2023 that may be closed by this pull request
4 tasks
@yenienserrano
Copy link
Member

yenienserrano commented Oct 18, 2023

Test

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

UI

Test Chrome
With a fresh browser, ensure the Threat hunting, File integrity monitoring, Configuration assessment, Vulnerability detection and MITRE ATT&CK applications are displayed as the default ones in the agent welcome view 🟢
Clicking on the More button of agent welcome, should display all the applications 🟢
Pinning an application from the More/Applications menu should display that application out of the More menu 🟢
Unpinning an application from the More/Applications menu should not display that application out of the More menu 🟢
Using a small window width, the More button on the agent welcome should display as Applications 🟡
Modify the pinned applications from the agent welcome, close the browser, open it and navigate the the agent welcome view. The pinned applications should be kept 🟢

Details

🟢 With a fresh browser, ensure the Threat hunting, File integrity monitoring, Configuration assessment, Vulnerability detection and MITRE ATT&CK applications are displayed as the default ones in the agent welcome view

Chrome - 🟢

image

🟢 Clicking on the More button of agent welcome, should display all the applications

Chrome - 🟢

image

🟢 Pinning an application from the More/Applications menu should display that application out of the More menu

Chrome - 🟢

image

🟢 Unpinning an application from the More/Applications menu should not display that application out of the More menu

Chrome - 🟢

image

🟡 Using a small window width, the More button on the agent welcome should display as Applications

Chrome - 🟡

the pin button appears at the bottom

image

🟢 Modify the pinned applications from the agent welcome, close the browser, open it and navigate the the agent welcome view. The pinned applications should be kept

Chrome - 🟢

image

@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 11.69% ( 4031 / 34457 )
Branches 8.01% ( 1854 / 23144 )
Functions 11.13% ( 920 / 8262 )
Lines 11.87% ( 3917 / 32990 )

@Desvelao
Copy link
Member Author

Desvelao commented Oct 19, 2023

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

UI

Partial tests

Test Chrome
The agent's navbar should display correctly 🟢
The agent's navbar should display correctly with the dock menu. 🟢
Inventory data, statistics and configuration must be displayed correctly 🟢

Details

🟢 The agent's navbar should display correctly

Chrome - 🟢
image

🟢 The agent's navbar should display correctly with the dock menu

Chrome - 🟢
image

🟢 Inventory data, statistics and configuration must be displayed correctly

Chrome - 🟢
image
image
image
image
image

Copy link
Member

@yenienserrano yenienserrano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Desvelao Desvelao merged commit 9d324dc into feat/83-move-menu-items-to-applications Oct 20, 2023
@Desvelao Desvelao deleted the enhancement/5893-rename-applications-agent-menu branch October 20, 2023 08:45
@Desvelao Desvelao mentioned this pull request Oct 23, 2023
6 tasks
asteriscos added a commit that referenced this pull request Nov 3, 2023
* feat(menu): create applications for each menu item

* fix(share-data-applications): save selected agent data into sessionStorage

* fix(menu): redirection other tabs in RBAC application

* fix(menu): redirection to the application itself

* fix(menu): rename MITRE ATT&CK appplication

* feat(menu): add GDPR application

* feat(menu): Add modules and Miscellaneous applications

* feat(menu): remove navigation by tabs in Settings

* feat(menu): remove navigation by tabs in Tools

* feat(menu): add Overview app

* fix(menu): change application name to Security configuration assessment

* fix(menu): change app name to Docker listener

* feat(menu): add services to app redirection

* feat(menu): use i18n to define the app and categories name

* fix(menu): removed wz- prefix from the applications and renamed status to server-status due to application ID conflicts

* 5814 adapt the breadcrum to the new menu (#5817)

* Change Agents for Endpoints summary

* Remove unnecessary styles

* Remove deprecated code

* Remove deprecated code

* Revert changes in wz-menu.js

* Remove deprecated code

* Change some breadcrumbs

* Remove wazuh menu

* Change Management breadcrumbs

* Change setGlobalBreadcrumbs for withGlobalBreadcrumbs hoc

* Fix test

* Change href to agent

* Fix redirection breadcrumbs: inventory data, stats and configuration

* Add Miscellaneous to tab into Configuration App (#5830)

* Add Tab into Configuration App to show Miscellaneous as a tab

* Change compareCurrentAppID: wz-configuration to configuration

---------

Co-authored-by: Ian Yenien Serrano <[email protected]>
Co-authored-by: yenienserrano <[email protected]>
Co-authored-by: Antonio David Gutiérrez <[email protected]>

* Adapt the new global menu redirections (#5827)

* Fix endpoint summary and server managment redirections

* fix: adapt the redirections to applications

- Endpoints summary
- IT Hygiene
- Groups

* fix(health-check): fix redirection to health check the removed the tab query parameter from URL and then the previous URL could not be rebuilt

* fix(redirections): redirection from Overview app to Endpoints summary

* fix(redirections): removed wz- prefix from the redirections to applications

* fix: renamed apps redirection URLs

* fix: app redirections URLs

* fix: test

* fix: tests

---------

Co-authored-by: Antonio David Gutiérrez <[email protected]>

* Modify Overview application to display the new menu (#5852)

* Fix endpoint summary and server managment redirections

* fix: adapt the redirections to applications

- Endpoints summary
- IT Hygiene
- Groups

* fix(health-check): fix redirection to health check the removed the tab query parameter from URL and then the previous URL could not be rebuilt

* fix(redirections): redirection from Overview app to Endpoints summary

* fix(redirections): removed wz- prefix from the redirections to applications

* Change overview page, linked to the new menu estructure

* fix: move definitions of applications in the home application

* fix: application descriptions

---------

Co-authored-by: Antonio David Gutiérrez <[email protected]>

* Remove logo side bar and update logo app description (#5882)

Co-authored-by: Antonio David Gutiérrez <[email protected]>

* fix: customization.logo.app setting description

* Merge master into feat/83-move-menu-items-to-applications

* fix: remove comment on test file

* fix: remove comment on test file

* Fix redirection (#5926)

Fix redirection agents table

* Fix redirection to groups and statistics (#5972)

* Fix groups redirection

* Fix statistics redirection

* Fix/5964 fix the breadcrumb of applications (#5968)

* Remove wazuh in breadcrumb

* Change breadcrumb OSD

* Add comment

* Center the agent's name in the breadcrumb

* Update sidebar menu and overview app (#5928)

* Update sidebar menu and overview app

* fix redirections

* Agent message fixed

* Server management order change to 6

* i18n added to applications

* fixed some redirections

---------

Co-authored-by: Antonio <[email protected]>
Co-authored-by: Ian Yenien Serrano <[email protected]>

* Adapt the navigation between applications (#5983)

* feat: adapt navigation between the applications

* Change redirection

* fix(test): mock service

---------

Co-authored-by: yenienserrano <[email protected]>

* Remove categories from overview (#5991)

* Remove categories from overview

* Fix snapshot

---------

Co-authored-by: Antonio <[email protected]>

* fix: app category name and id

* Add order to applications (#6015)

* feat(applications): add order definition to applications

* feat(applications): register order to the applications

* Remove reloading when changing app (#5986)

* change app/discover for app/wz-discover

* Remove reload and add sync history

* Change defaultRout in opensearch_dashboards.yml osd-dev

* feat: adapt navigation between the applications

---------

Co-authored-by: Antonio David Gutiérrez <[email protected]>
Co-authored-by: Antonio <[email protected]>

* Rename applications on agent menu (#5997)

* feat: rename applications on agent menu

Refactor agent menu to use the applications and categories
Simplify the data saved in the local storage to keep the pinned
applications

* Recover the redirectTo in settings and wazuh settings

* Fix pin icon in menu agent

* Fix agent navbar

---------

Co-authored-by: yenienserrano <[email protected]>

* Remove `extensions.*` and `disabled_roles` settings (#5988)

* remove modules

* registry.json extension remove

* remove getExtension from menu-agent and wz-menu

* Delete extensions logic

* Fix wazuh version test

* remove disabled_roles extructure

* remove disabled_roles endpoint

* Add a migration to remove the extensions key in the host and add test for it

* mange-host and update-registry fixed

* fix: render tabs in Wazuh plugin settings application and minor enhancements

* feat: remove unused states in Redux store and minor fixes on breadcrumbs

- Remove managementReducers key from Redux store and related action
  creators and related usage
- Remove toolsReducers key from Redux store and related action
  creators and related usage
- Remove securityReducers key from Redux store and related action
  creators and related usage
- Fix some breadcrumbs

* fix: revert content of osquery.js files

* fix: revert configuration in .settings.json

* fix(test): fix test

---------

Co-authored-by: Antonio David Gutiérrez <[email protected]>

* Add an agent selector to IT Hygiene application (#6005)

* feat: add agent selector to IT Hygiene application

- Wrapped the IT Hygiene application with a required selection of agent
- Added a Explore agent button to the IT Hygiene application
- The Explore agent button of alert modules now display the global agent
  selector instead of the local one.
- Removed the local agent selector modal of Explore agent button on alert
  modules
- Removed the related action creator and reducer case for SHOW_EXPLORE_AGENT_MODAL

* feat: add reactivity to agent welcome view when changing the selected agent

- Refactor MITRE ATT&CK panel
  - Rename MITRE to MITRE ATT&CK in the panel
- Rename mitre_top to mitre-top according to the file naming convention
- Add reactivity to the FIM: Recent events table when changing the
  selected agent

* feat(it-hygiene): fix problems when selecting and agent and navigate

- Move prompt agent never connected to prompts directory
  - Remove duplicated and related components on agent welcome, inventory
    data and agent configuration
- Change button on prompt agent never connected to Select agent
- Change Explore agent button on agent welcome

* fix: imports on prompt and add clarification on agent welcome

* fix(it-hygiene): change mitre attack referecence

* Fix navbar agent styles

* Fix refresh page: inventory data and stats

---------

Co-authored-by: yenienserrano <[email protected]>

* fix: breadcrumb of Endpoint groups application

* Fix change APIs (#6056)

* Fix change apis

* Change management label in menu

* Fix Switchtab exception in dashboards (#6019)

* Define the component properties in the controller constructor

* Delete redundant fetch in Events refresh button

* Prevent duplicate request on Events initial requests

* Revert "Prevent duplicate request on Events initial requests"

This reverts commit db721a1.

* Remove dulplicate request on changeTabView

* Fix explore agent button

* Fix imposter with explore agent button

* Change names of the applications in the menu

* Change breadcrumbs

* Change Wazuh API configuration to API Configuration

* Change the style of Home icons

* Change applications order

* Change comment categories ID

* Change id to new names in applications

* Change redirections without refresh page

* Fix test

* changelog: add entries

---------

Co-authored-by: Ian Yenien Serrano <[email protected]>
Co-authored-by: JuanGarriuz <[email protected]>
Co-authored-by: yenienserrano <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update the new sidebar menu design
2 participants