From f43050c51bc2cf0d8aa631af8c8d3c14424bc380 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 14 Nov 2024 12:53:40 -0300 Subject: [PATCH 1/6] reorder sections --- src/core/utils/default_app_categories.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core/utils/default_app_categories.ts b/src/core/utils/default_app_categories.ts index 6d112473fc58..57ecaeb4bbe2 100644 --- a/src/core/utils/default_app_categories.ts +++ b/src/core/utils/default_app_categories.ts @@ -73,22 +73,22 @@ export const DEFAULT_APP_CATEGORIES: Record = Object.freeze order: 4000, euiIconType: 'logoSecurity', }, - dashboardManagement: { - id: 'wz-category-dashboard-management', - label: i18n.translate('core.ui.dashboardManagementNavList.label', { - defaultMessage: 'Dashboard management', - }), - order: 5000, - euiIconType: 'dashboardApp', - }, management: { id: 'management', label: i18n.translate('core.ui.managementNavList.label', { defaultMessage: 'Indexer management', }), - order: 6000, + order: 5000, euiIconType: 'managementApp', }, + dashboardManagement: { + id: 'wz-category-dashboard-management', + label: i18n.translate('core.ui.dashboardManagementNavList.label', { + defaultMessage: 'Dashboard management', + }), + order: 6000, + euiIconType: 'dashboardApp', + }, investigate: { id: 'investigate', label: i18n.translate('core.ui.investigate.label', { From d9551d50b58c844ff148977cb81553a0d769ad6d Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 14 Nov 2024 13:02:09 -0300 Subject: [PATCH 2/6] reorder sections --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f04e42ad5d82..ad2f0b7eabf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ All notable changes to the Wazuh app project will be documented in this file. - Removed the setting home:useNewHomePage from the advanced settings because the views are not finished [#282](https://github.com/wazuh/wazuh-dashboard/pull/282) +### Fixed + +- Fixed section order [#413](https://github.com/wazuh/wazuh-dashboard/pull/413) + ## Wazuh dashboard v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 01 ### Added From b4a3b4063c6c1938192bf7595f37df05864790ff Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 14 Nov 2024 13:38:36 -0300 Subject: [PATCH 3/6] update snapshot --- .../ui/header/__snapshots__/collapsible_nav.test.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap index 0d11a8e4a6f7..122a66fdc214 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap @@ -242,7 +242,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` "euiIconType": "managementApp", "id": "management", "label": "Indexer management", - "order": 6000, + "order": 5000, }, "data-test-subj": "monitoring", "href": "monitoring", From f4dae147ae309bc013e1e5e96e98317db5d06bf2 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 14 Nov 2024 14:45:30 -0300 Subject: [PATCH 4/6] update snapshot --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad2f0b7eabf7..500d61967780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ All notable changes to the Wazuh app project will be documented in this file. ### Fixed -- Fixed section order [#413](https://github.com/wazuh/wazuh-dashboard/pull/413) +- Fixed indexer management order [#413](https://github.com/wazuh/wazuh-dashboard/pull/413) ## Wazuh dashboard v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 01 From 5dfb057485483e51781b08217a1b7d0dc64ad02e Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 14 Nov 2024 14:51:12 -0300 Subject: [PATCH 5/6] update snapshot --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 500d61967780..31a9254759b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,16 +7,11 @@ All notable changes to the Wazuh app project will be documented in this file. ### Changed - Reduced the size of the loading logo [#373](https://github.com/wazuh/wazuh-dashboard/pull/373) -- Changed the order of the "Dashboard management" and "Indexer management" sections [#372](https://github.com/wazuh/wazuh-dashboard/pull/372) ### Removed - Removed the setting home:useNewHomePage from the advanced settings because the views are not finished [#282](https://github.com/wazuh/wazuh-dashboard/pull/282) -### Fixed - -- Fixed indexer management order [#413](https://github.com/wazuh/wazuh-dashboard/pull/413) - ## Wazuh dashboard v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 01 ### Added From d83d424400362ff220800bb9472eeb24f4060485 Mon Sep 17 00:00:00 2001 From: "chantal.kelm" Date: Thu, 14 Nov 2024 14:54:04 -0300 Subject: [PATCH 6/6] update generate base --- dev-tools/build-packages/base/generate_base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/build-packages/base/generate_base.sh b/dev-tools/build-packages/base/generate_base.sh index cda6aac36071..6b45e7d35cff 100755 --- a/dev-tools/build-packages/base/generate_base.sh +++ b/dev-tools/build-packages/base/generate_base.sh @@ -148,7 +148,7 @@ build() { # Move installed plugins from categories after generating the package category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}' - category_dashboard_management='{id:"management",label:"Indexer management",order:6e3,euiIconType:"managementApp"}' + category_dashboard_management='{id:"management",label:"Indexer management",order:5e3,euiIconType:"managementApp"}' # Replace app category to Reporting app sed -i -e "s|category:{id:\"opensearch\",label:_i18n.i18n.translate(\"opensearch.reports.categoryName\",{defaultMessage:\"OpenSearch Plugins\"}),order:2e3}|category:${category_explore}|" ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js