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.

Sign up for GitHub

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

Fixed path in logo customization section #4352

Merged
merged 9 commits into from
Jul 26, 2022
Merged

Fixed path in logo customization section #4352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
edd856d
change of path
chantal-kelm Jul 21, 2022
0923a42
CHANGELOG
chantal-kelm Jul 21, 2022
20a5874
new constant
chantal-kelm Jul 22, 2022
ef7f2ed
update test
chantal-kelm Jul 22, 2022
1de865b
updated constant name
chantal-kelm Jul 22, 2022
4a25b54
updated constant name
chantal-kelm Jul 22, 2022
4a05595
Update CHANGELOG.md
AlexRuiz7 Jul 26, 2022
1d5090b
changelog: add PR entry
Desvelao Jul 26, 2022
ce03bdf
Merge branch 'Fix/4337-Wrong-path-for-Wazuh-logo-Customization' of ht…
Desvelao Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to the Wazuh app project will be documented in this file.

## Wazuh v4.3.7 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 4308

### Fixed

- Fixed path in logo customization section [#4352](https://github.com/wazuh/wazuh-kibana-app/pull/4352)

## Wazuh v4.3.6 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 4307

### Fixed
Expand Down
1 change: 1 addition & 0 deletions common/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ export const UI_TOAST_COLOR = {

// Assets
export const ASSETS_BASE_URL_PREFIX = '/plugins/wazuh/assets/';
export const ASSETS_PUBLIC_URL = '/plugins/wazuh/public/assets/';

// Reports
export const REPORTS_LOGO_IMAGE_ASSETS_RELATIVE_PATH = 'images/logo_reports.png';
Expand Down
10 changes: 5 additions & 5 deletions public/utils/config-equivalences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { ASSETS_BASE_URL_PREFIX, PLUGIN_PLATFORM_NAME } from "../../common/constants";
import { ASSETS_PUBLIC_URL, PLUGIN_PLATFORM_NAME } from "../../common/constants";

export const configEquivalences = {
pattern: 'Default index pattern to use on the app.',
'customization.logo.app':`Define the name of the app logo saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.sidebar':`Define the name of the sidebar logo saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.healthcheck':`Define the name of the health-check logo saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.reports':`Define the name of the reports logo (.png) saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.app':`Define the name of the app logo saved in the path ${ASSETS_PUBLIC_URL}`,
'customization.logo.sidebar':`Define the name of the sidebar logo saved in the path ${ASSETS_PUBLIC_URL}`,
'customization.logo.healthcheck':`Define the name of the health-check logo saved in the path ${ASSETS_PUBLIC_URL}`,
'customization.logo.reports':`Define the name of the reports logo (.png) saved in the path ${ASSETS_PUBLIC_URL}`,
'checks.pattern':
'Enable or disable the index pattern health check when opening the app.',
'checks.template':
Expand Down
10 changes: 5 additions & 5 deletions server/lib/initial-wazuh-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Find more information about this on the LICENSE file.
*/

import { ASSETS_BASE_URL_PREFIX, WAZUH_MONITORING_DEFAULT_INDICES_REPLICAS, WAZUH_MONITORING_DEFAULT_INDICES_SHARDS, WAZUH_STATISTICS_DEFAULT_INDICES_REPLICAS, WAZUH_STATISTICS_DEFAULT_INDICES_SHARDS } from "../../common/constants";
import { ASSETS_PUBLIC_URL, WAZUH_MONITORING_DEFAULT_INDICES_REPLICAS, WAZUH_MONITORING_DEFAULT_INDICES_SHARDS, WAZUH_STATISTICS_DEFAULT_INDICES_REPLICAS, WAZUH_STATISTICS_DEFAULT_INDICES_SHARDS } from "../../common/constants";
import { webDocumentationLink } from "../../common/services/web_documentation";

export const initialWazuhConfig: string = `---
Expand Down Expand Up @@ -170,16 +170,16 @@ export const initialWazuhConfig: string = `---
#
# ------------------------------ wazuh-logo-customization -------------------------------
#
#Define the name of the app logo saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the app logo saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.app: ''
#
#Define the name of the sidebar logo saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the sidebar logo saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.sidebar: ''
#
#Define the name of the health-check logo saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the health-check logo saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.healthcheck: ''
#
#Define the name of the reports logo (.png) saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the reports logo (.png) saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.reports: ''
#
# ---------------------------- Hide manager alerts ------------------------------
Expand Down