140 update the repo with the latest changes of wazuh dashboard (#141)

wazuh · Feb 21, 2024 · c8fa56a · c8fa56a
1 parent 6b07750
commit c8fa56a
Show file tree

Hide file tree

Showing 55 changed files with 909 additions and 741 deletions.
diff --git 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
diff --git 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
@@ -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$()}