diff --git a/dev-tools/build-packages/base/generate_base.sh b/dev-tools/build-packages/base/generate_base.sh index ad80a08c6c4b..1580cf4d1d17 100755 --- a/dev-tools/build-packages/base/generate_base.sh +++ b/dev-tools/build-packages/base/generate_base.sh @@ -144,6 +144,41 @@ build() { fi done + + # 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:"Index 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 + + # Replace app category to Alerting app + sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js + + # Replace app category to Maps app + sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js + + # Replace app category to Notifications app + sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js + + # Replace app category to Index Management app + sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js + + # Generate compressed files + files_to_recreate=( + ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js + ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js + ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js + ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js + ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js + ) + + for value in "${files_to_recreate[@]}" + do + gzip -c "$value" > "$value.gz" + brotli -c "$value" > "$value.br" + done + # Enable the default configuration (renaming) cp $config_path/opensearch_dashboards.prod.yml config/opensearch_dashboards.yml cp $config_path/node.options.prod config/node.options diff --git a/src/core/common/logos/__snapshots__/get_logos.test.ts.snap b/src/core/common/logos/__snapshots__/get_logos.test.ts.snap index cfd1b9f7e3cf..c1abadf17f2e 100644 --- a/src/core/common/logos/__snapshots__/get_logos.test.ts.snap +++ b/src/core/common/logos/__snapshots__/get_logos.test.ts.snap @@ -518,29 +518,29 @@ AnimatedMark.light.url = "/mocked/base/path/ui/logos/spinner_on_light.gif" AnimatedMark.type = "default" AnimatedMark.url = "/mocked/base/path/ui/logos/spinner_on_light.gif" Application.dark.type = "default" -Application.dark.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_dark.svg" +Application.dark.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_dark.svg" Application.light.type = "default" -Application.light.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_light.svg" +Application.light.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_light.svg" Application.type = "default" -Application.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_light.svg" +Application.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_light.svg" CenterMark.dark.type = "default" -CenterMark.dark.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_dark.svg" +CenterMark.dark.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_dark.svg" CenterMark.light.type = "default" -CenterMark.light.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_light.svg" +CenterMark.light.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_light.svg" CenterMark.type = "default" -CenterMark.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_light.svg" +CenterMark.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_light.svg" Mark.dark.type = "default" -Mark.dark.url = "/mocked/base/path/ui/logos/opensearch_mark_on_dark.svg" +Mark.dark.url = "/mocked/base/path/ui/logos/wazuh_mark_on_dark.svg" Mark.light.type = "default" -Mark.light.url = "/mocked/base/path/ui/logos/opensearch_mark_on_light.svg" +Mark.light.url = "/mocked/base/path/ui/logos/wazuh_mark_on_light.svg" Mark.type = "default" -Mark.url = "/mocked/base/path/ui/logos/opensearch_mark_on_light.svg" +Mark.url = "/mocked/base/path/ui/logos/wazuh_mark_on_light.svg" OpenSearch.dark.type = "default" -OpenSearch.dark.url = "/mocked/base/path/ui/logos/opensearch_on_dark.svg" +OpenSearch.dark.url = "/mocked/base/path/ui/logos/wazuh_on_dark.svg" OpenSearch.light.type = "default" -OpenSearch.light.url = "/mocked/base/path/ui/logos/opensearch_on_light.svg" +OpenSearch.light.url = "/mocked/base/path/ui/logos/wazuh_on_light.svg" OpenSearch.type = "default" -OpenSearch.url = "/mocked/base/path/ui/logos/opensearch_on_light.svg" +OpenSearch.url = "/mocked/base/path/ui/logos/wazuh_on_light.svg" colorScheme = "light" `; @@ -552,29 +552,29 @@ AnimatedMark.light.url = "/mocked/base/path/ui/logos/spinner_on_light.gif" AnimatedMark.type = "default" AnimatedMark.url = "/mocked/base/path/ui/logos/spinner_on_dark.gif" Application.dark.type = "default" -Application.dark.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_dark.svg" +Application.dark.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_dark.svg" Application.light.type = "default" -Application.light.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_light.svg" +Application.light.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_light.svg" Application.type = "default" -Application.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_dark.svg" +Application.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_dark.svg" CenterMark.dark.type = "default" -CenterMark.dark.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_dark.svg" +CenterMark.dark.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_dark.svg" CenterMark.light.type = "default" -CenterMark.light.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_light.svg" +CenterMark.light.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_light.svg" CenterMark.type = "default" -CenterMark.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_dark.svg" +CenterMark.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_dark.svg" Mark.dark.type = "default" -Mark.dark.url = "/mocked/base/path/ui/logos/opensearch_mark_on_dark.svg" +Mark.dark.url = "/mocked/base/path/ui/logos/wazuh_mark_on_dark.svg" Mark.light.type = "default" -Mark.light.url = "/mocked/base/path/ui/logos/opensearch_mark_on_light.svg" +Mark.light.url = "/mocked/base/path/ui/logos/wazuh_mark_on_light.svg" Mark.type = "default" -Mark.url = "/mocked/base/path/ui/logos/opensearch_mark_on_dark.svg" +Mark.url = "/mocked/base/path/ui/logos/wazuh_mark_on_dark.svg" OpenSearch.dark.type = "default" -OpenSearch.dark.url = "/mocked/base/path/ui/logos/opensearch_on_dark.svg" +OpenSearch.dark.url = "/mocked/base/path/ui/logos/wazuh_on_dark.svg" OpenSearch.light.type = "default" -OpenSearch.light.url = "/mocked/base/path/ui/logos/opensearch_on_light.svg" +OpenSearch.light.url = "/mocked/base/path/ui/logos/wazuh_on_light.svg" OpenSearch.type = "default" -OpenSearch.url = "/mocked/base/path/ui/logos/opensearch_on_dark.svg" +OpenSearch.url = "/mocked/base/path/ui/logos/wazuh_on_dark.svg" colorScheme = "dark" `; @@ -586,28 +586,28 @@ AnimatedMark.light.url = "/mocked/base/path/ui/logos/spinner_on_light.gif" AnimatedMark.type = "default" AnimatedMark.url = "/mocked/base/path/ui/logos/spinner_on_light.gif" Application.dark.type = "default" -Application.dark.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_dark.svg" +Application.dark.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_dark.svg" Application.light.type = "default" -Application.light.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_light.svg" +Application.light.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_light.svg" Application.type = "default" -Application.url = "/mocked/base/path/ui/logos/opensearch_dashboards_on_light.svg" +Application.url = "/mocked/base/path/ui/logos/wazuh_dashboards_on_light.svg" CenterMark.dark.type = "default" -CenterMark.dark.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_dark.svg" +CenterMark.dark.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_dark.svg" CenterMark.light.type = "default" -CenterMark.light.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_light.svg" +CenterMark.light.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_light.svg" CenterMark.type = "default" -CenterMark.url = "/mocked/base/path/ui/logos/opensearch_center_mark_on_light.svg" +CenterMark.url = "/mocked/base/path/ui/logos/wazuh_center_mark_on_light.svg" Mark.dark.type = "default" -Mark.dark.url = "/mocked/base/path/ui/logos/opensearch_mark_on_dark.svg" +Mark.dark.url = "/mocked/base/path/ui/logos/wazuh_mark_on_dark.svg" Mark.light.type = "default" -Mark.light.url = "/mocked/base/path/ui/logos/opensearch_mark_on_light.svg" +Mark.light.url = "/mocked/base/path/ui/logos/wazuh_mark_on_light.svg" Mark.type = "default" -Mark.url = "/mocked/base/path/ui/logos/opensearch_mark_on_light.svg" +Mark.url = "/mocked/base/path/ui/logos/wazuh_mark_on_light.svg" OpenSearch.dark.type = "default" -OpenSearch.dark.url = "/mocked/base/path/ui/logos/opensearch_on_dark.svg" +OpenSearch.dark.url = "/mocked/base/path/ui/logos/wazuh_on_dark.svg" OpenSearch.light.type = "default" -OpenSearch.light.url = "/mocked/base/path/ui/logos/opensearch_on_light.svg" +OpenSearch.light.url = "/mocked/base/path/ui/logos/wazuh_on_light.svg" OpenSearch.type = "default" -OpenSearch.url = "/mocked/base/path/ui/logos/opensearch_on_light.svg" +OpenSearch.url = "/mocked/base/path/ui/logos/wazuh_on_light.svg" colorScheme = "light" `; diff --git a/src/core/common/logos/get_logos.ts b/src/core/common/logos/get_logos.ts index 6517cd16ab38..8b27f21d356b 100644 --- a/src/core/common/logos/get_logos.ts +++ b/src/core/common/logos/get_logos.ts @@ -9,18 +9,18 @@ import { ColorScheme, ImageType } from './constants'; import { Branding } from '../../types'; // The logos are stored at `src/core/server/core_app/assets/logos` to have a pretty URL -export const OPENSEARCH_DASHBOARDS_THEMED = 'ui/logos/opensearch_dashboards.svg'; -export const OPENSEARCH_DASHBOARDS_ON_LIGHT = 'ui/logos/opensearch_dashboards_on_light.svg'; -export const OPENSEARCH_DASHBOARDS_ON_DARK = 'ui/logos/opensearch_dashboards_on_dark.svg'; -export const OPENSEARCH_THEMED = 'ui/logos/opensearch.svg'; -export const OPENSEARCH_ON_LIGHT = 'ui/logos/opensearch_on_light.svg'; -export const OPENSEARCH_ON_DARK = 'ui/logos/opensearch_on_dark.svg'; -export const MARK_THEMED = 'ui/logos/opensearch_mark.svg'; -export const MARK_ON_LIGHT = 'ui/logos/opensearch_mark_on_light.svg'; -export const MARK_ON_DARK = 'ui/logos/opensearch_mark_on_dark.svg'; -export const CENTER_MARK_THEMED = 'ui/logos/opensearch_center_mark.svg'; -export const CENTER_MARK_ON_LIGHT = 'ui/logos/opensearch_center_mark_on_light.svg'; -export const CENTER_MARK_ON_DARK = 'ui/logos/opensearch_center_mark_on_dark.svg'; +export const OPENSEARCH_DASHBOARDS_THEMED = 'ui/logos/wazuh_dashboards.svg'; +export const OPENSEARCH_DASHBOARDS_ON_LIGHT = 'ui/logos/wazuh_dashboards_on_light.svg'; +export const OPENSEARCH_DASHBOARDS_ON_DARK = 'ui/logos/wazuh_dashboards_on_dark.svg'; +export const OPENSEARCH_THEMED = 'ui/logos/wazuh.svg'; +export const OPENSEARCH_ON_LIGHT = 'ui/logos/wazuh_on_light.svg'; +export const OPENSEARCH_ON_DARK = 'ui/logos/wazuh_on_dark.svg'; +export const MARK_THEMED = 'ui/logos/wazuh_mark.svg'; +export const MARK_ON_LIGHT = 'ui/logos/wazuh_mark_on_light.svg'; +export const MARK_ON_DARK = 'ui/logos/wazuh_mark_on_dark.svg'; +export const CENTER_MARK_THEMED = 'ui/logos/wazuh_center_mark.svg'; +export const CENTER_MARK_ON_LIGHT = 'ui/logos/wazuh_center_mark_on_light.svg'; +export const CENTER_MARK_ON_DARK = 'ui/logos/wazuh_center_mark_on_dark.svg'; export const ANIMATED_MARK_THEMED = 'ui/logos/spinner.svg'; export const ANIMATED_MARK_ON_LIGHT = 'ui/logos/spinner_on_light.gif'; export const ANIMATED_MARK_ON_DARK = 'ui/logos/spinner_on_dark.gif'; diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx index 93b554c9d3f2..b7aa91c7014d 100644 --- a/src/core/public/chrome/chrome_service.tsx +++ b/src/core/public/chrome/chrome_service.tsx @@ -248,7 +248,7 @@ export class ChromeService { forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()} helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))} helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))} - homeHref={http.basePath.prepend('/app/home')} + homeHref={http.basePath.prepend('/app/wz-home')} isVisible$={this.isVisible$} opensearchDashboardsVersion={injectedMetadata.getWazuhVersion()} navLinks$={navLinks.getNavLinks$()} 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 52378a456579..1c971bfe975e 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 @@ -140,50 +140,50 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` "Application": Object { "dark": Object { "type": "default", - "url": "/test/ui/logos/opensearch_dashboards_on_dark.svg", + "url": "/test/ui/logos/wazuh_dashboards_on_dark.svg", }, "light": Object { "type": "default", - "url": "/test/ui/logos/opensearch_dashboards_on_light.svg", + "url": "/test/ui/logos/wazuh_dashboards_on_light.svg", }, "type": "default", - "url": "/test/ui/logos/opensearch_dashboards_on_light.svg", + "url": "/test/ui/logos/wazuh_dashboards_on_light.svg", }, "CenterMark": Object { "dark": Object { "type": "default", - "url": "/test/ui/logos/opensearch_center_mark_on_dark.svg", + "url": "/test/ui/logos/wazuh_center_mark_on_dark.svg", }, "light": Object { "type": "default", - "url": "/test/ui/logos/opensearch_center_mark_on_light.svg", + "url": "/test/ui/logos/wazuh_center_mark_on_light.svg", }, "type": "default", - "url": "/test/ui/logos/opensearch_center_mark_on_light.svg", + "url": "/test/ui/logos/wazuh_center_mark_on_light.svg", }, "Mark": Object { "dark": Object { "type": "default", - "url": "/test/ui/logos/opensearch_mark_on_dark.svg", + "url": "/test/ui/logos/wazuh_mark_on_dark.svg", }, "light": Object { "type": "default", - "url": "/test/ui/logos/opensearch_mark_on_light.svg", + "url": "/test/ui/logos/wazuh_mark_on_light.svg", }, "type": "default", - "url": "/test/ui/logos/opensearch_mark_on_light.svg", + "url": "/test/ui/logos/wazuh_mark_on_light.svg", }, "OpenSearch": Object { "dark": Object { "type": "default", - "url": "/test/ui/logos/opensearch_on_dark.svg", + "url": "/test/ui/logos/wazuh_on_dark.svg", }, "light": Object { "type": "default", - "url": "/test/ui/logos/opensearch_on_light.svg", + "url": "/test/ui/logos/wazuh_on_light.svg", }, "type": "default", - "url": "/test/ui/logos/opensearch_on_light.svg", + "url": "/test/ui/logos/wazuh_on_light.svg", }, "colorScheme": "light", } @@ -239,7 +239,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` "category": Object { "euiIconType": "managementApp", "id": "management", - "label": "Management", + "label": "Index management", "order": 5000, }, "data-test-subj": "monitoring", @@ -567,7 +567,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
@@ -615,7 +615,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` >
@@ -1734,7 +1734,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` className="euiCollapsibleNavGroup__children" >