Skip to content

Commit 6c632b9

Browse files
committed
140 update the repo with the latest changes of wazuh dashboard (#141)
1 parent f57e873 commit 6c632b9

File tree

55 files changed

+909
-741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+909
-741
lines changed

dev-tools/build-packages/base/generate_base.sh

+35
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,41 @@ build() {
144144
fi
145145
done
146146

147+
148+
# Move installed plugins from categories after generating the package
149+
category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}'
150+
category_dashboard_management='{id:"management",label:"Index management",order:5e3,euiIconType:"managementApp"}'
151+
152+
# Replace app category to Reporting app
153+
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
154+
155+
# Replace app category to Alerting app
156+
sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js
157+
158+
# Replace app category to Maps app
159+
sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js
160+
161+
# Replace app category to Notifications app
162+
sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
163+
164+
# Replace app category to Index Management app
165+
sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js
166+
167+
# Generate compressed files
168+
files_to_recreate=(
169+
./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js
170+
./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js
171+
./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js
172+
./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
173+
./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js
174+
)
175+
176+
for value in "${files_to_recreate[@]}"
177+
do
178+
gzip -c "$value" > "$value.gz"
179+
brotli -c "$value" > "$value.br"
180+
done
181+
147182
# Enable the default configuration (renaming)
148183
cp $config_path/opensearch_dashboards.prod.yml config/opensearch_dashboards.yml
149184
cp $config_path/node.options.prod config/node.options

src/core/common/logos/__snapshots__/get_logos.test.ts.snap

+36-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/common/logos/get_logos.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import { ColorScheme, ImageType } from './constants';
99
import { Branding } from '../../types';
1010

1111
// The logos are stored at `src/core/server/core_app/assets/logos` to have a pretty URL
12-
export const OPENSEARCH_DASHBOARDS_THEMED = 'ui/logos/opensearch_dashboards.svg';
13-
export const OPENSEARCH_DASHBOARDS_ON_LIGHT = 'ui/logos/opensearch_dashboards_on_light.svg';
14-
export const OPENSEARCH_DASHBOARDS_ON_DARK = 'ui/logos/opensearch_dashboards_on_dark.svg';
15-
export const OPENSEARCH_THEMED = 'ui/logos/opensearch.svg';
16-
export const OPENSEARCH_ON_LIGHT = 'ui/logos/opensearch_on_light.svg';
17-
export const OPENSEARCH_ON_DARK = 'ui/logos/opensearch_on_dark.svg';
18-
export const MARK_THEMED = 'ui/logos/opensearch_mark.svg';
19-
export const MARK_ON_LIGHT = 'ui/logos/opensearch_mark_on_light.svg';
20-
export const MARK_ON_DARK = 'ui/logos/opensearch_mark_on_dark.svg';
21-
export const CENTER_MARK_THEMED = 'ui/logos/opensearch_center_mark.svg';
22-
export const CENTER_MARK_ON_LIGHT = 'ui/logos/opensearch_center_mark_on_light.svg';
23-
export const CENTER_MARK_ON_DARK = 'ui/logos/opensearch_center_mark_on_dark.svg';
12+
export const OPENSEARCH_DASHBOARDS_THEMED = 'ui/logos/wazuh_dashboards.svg';
13+
export const OPENSEARCH_DASHBOARDS_ON_LIGHT = 'ui/logos/wazuh_dashboards_on_light.svg';
14+
export const OPENSEARCH_DASHBOARDS_ON_DARK = 'ui/logos/wazuh_dashboards_on_dark.svg';
15+
export const OPENSEARCH_THEMED = 'ui/logos/wazuh.svg';
16+
export const OPENSEARCH_ON_LIGHT = 'ui/logos/wazuh_on_light.svg';
17+
export const OPENSEARCH_ON_DARK = 'ui/logos/wazuh_on_dark.svg';
18+
export const MARK_THEMED = 'ui/logos/wazuh_mark.svg';
19+
export const MARK_ON_LIGHT = 'ui/logos/wazuh_mark_on_light.svg';
20+
export const MARK_ON_DARK = 'ui/logos/wazuh_mark_on_dark.svg';
21+
export const CENTER_MARK_THEMED = 'ui/logos/wazuh_center_mark.svg';
22+
export const CENTER_MARK_ON_LIGHT = 'ui/logos/wazuh_center_mark_on_light.svg';
23+
export const CENTER_MARK_ON_DARK = 'ui/logos/wazuh_center_mark_on_dark.svg';
2424
export const ANIMATED_MARK_THEMED = 'ui/logos/spinner.svg';
2525
export const ANIMATED_MARK_ON_LIGHT = 'ui/logos/spinner_on_light.gif';
2626
export const ANIMATED_MARK_ON_DARK = 'ui/logos/spinner_on_dark.gif';

src/core/public/chrome/chrome_service.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ export class ChromeService {
269269
forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
270270
helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
271271
helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
272-
homeHref={application.getUrlForApp('home')}
272+
homeHref={application.getUrlForApp('/app/wz-home')}
273273
isVisible$={this.isVisible$}
274274
opensearchDashboardsVersion={injectedMetadata.getWazuhVersion()}
275275
navLinks$={navLinks.getNavLinks$()}

0 commit comments

Comments
 (0)