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

Jump to bottom

Fixed path in logo customization section #4352

Merged
merged 9 commits into from Jul 26, 2022
Merged

Fixed path in logo customization section #4352

merged 9 commits into from Jul 26, 2022

Conversation

chantal-kelm
Copy link
Member

@chantal-kelm chantal-kelm commented Jul 21, 2022 •
edited

A new constant has been created in the common/constants.ts file and used in all necessary places

@chantal-kelm chantal-kelm changed the title change of path Path fix in Logo Customization section Jul 21, 2022
@chantal-kelm chantal-kelm linked an issue Jul 21, 2022 that may be closed by this pull request
Wrong path for Wazuh logo customization #4337
Closed
AlexRuiz7
AlexRuiz7 approved these changes Jul 22, 2022
View reviewed changes
Copy link
Member

@AlexRuiz7 AlexRuiz7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@matiasmoreno876
Copy link
Contributor

In this PR it is necessary to backport to the 4.3-7.16 branches and 4.3-1.2-wdz?

AlexRuiz7
AlexRuiz7 suggested changes Jul 22, 2022
View reviewed changes
common/constants.ts Outdated Show resolved Hide resolved
AlexRuiz7
AlexRuiz7 approved these changes Jul 22, 2022
View reviewed changes
Copy link
Member

@AlexRuiz7 AlexRuiz7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Code review: ✔️
  • Test: ✔️

@gdiazlo gdiazlo changed the title Path fix in Logo Customization section Fixed path of logo customization section Jul 26, 2022
@gdiazlo gdiazlo changed the title Fixed path of logo customization section Fixed path in logo customization section Jul 26, 2022
gdiazlo
gdiazlo reviewed Jul 26, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
Desvelao
Desvelao approved these changes Jul 26, 2022
View reviewed changes
Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review
Code ✔️
Test ✔️

Screenshots
image

# ------------------------------ wazuh-logo-customization -------------------------------
#
#Define the name of the app logo saved in the path /plugins/wazuh/public/assets/
#customization.logo.app: ''
#
#Define the name of the sidebar logo saved in the path /plugins/wazuh/public/assets/
#customization.logo.sidebar: ''
#
#Define the name of the health-check logo saved in the path /plugins/wazuh/public/assets/
#customization.logo.healthcheck: ''
#
#Define the name of the reports logo (.png) saved in the path /plugins/wazuh/public/assets/
#customization.logo.reports: ''

@Desvelao Desvelao merged commit 05598cf into 4.3-7.10 Jul 26, 2022
@Desvelao Desvelao deleted the Fix/4337-Wrong-path-for-Wazuh-logo-Customization branch July 26, 2022 08:37
github-actions bot pushed a commit that referenced this pull request Jul 26, 2022
@chantal-kelm @github-actions
Fixed path in logo customization section (#4352)
1543718 
* change of path

* CHANGELOG

* new constant

* update test

* updated constant name

* updated constant name

* Update CHANGELOG.md

* changelog: add PR entry

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 05598cf)
@github-actions github-actions bot mentioned this pull request Jul 26, 2022
Merged
@github-actions
Copy link
Contributor

The backport to 4.3-1.2-wzd failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.3-1.2-wzd 4.3-1.2-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.3-1.2-wzd
# Create a new branch
git switch --create backport-4352-to-4.3-1.2-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 05598cf83a70221e8203b2b41afd43d61813fee6
# Push it to GitHub
git push --set-upstream origin backport-4352-to-4.3-1.2-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.3-1.2-wzd

Then, create a pull request where the base branch is 4.3-1.2-wzd and the compare/head branch is backport-4352-to-4.3-1.2-wzd.

Desvelao pushed a commit that referenced this pull request Jul 26, 2022
@github-actions @chantal-kelm
[Backport 4.3-7.16] Fixed path in logo customization section (#4360)
7564f72 
Fixed path in logo customization section (#4352)

* change of path

* CHANGELOG

* new constant

* update test

* updated constant name

* updated constant name

* Update CHANGELOG.md

* changelog: add PR entry

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 05598cf)

Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com>
@github-actions
Copy link
Contributor

Jest Test Coverage % values
Statements 6.67% ( 2431 / 36463 )
Branches 2.67% ( 754 / 28251 )
Functions 4.46% ( 398 / 8917 )
Lines 6.74% ( 2352 / 34878 )

Desvelao added a commit that referenced this pull request Jul 26, 2022
@chantal-kelm @AlexRuiz7 @Desvelao
Fixed path in logo customization section (#4352)
4f806e3 
* change of path

* CHANGELOG

* new constant

* update test

* updated constant name

* updated constant name

* Update CHANGELOG.md

* changelog: add PR entry

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
@Desvelao
Copy link
Member

Desvelao commented Jul 26, 2022 •
edited

The backport to 4.3-1.2-wzd failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.3-1.2-wzd 4.3-1.2-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.3-1.2-wzd
# Create a new branch
git switch --create backport-4352-to-4.3-1.2-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 05598cf83a70221e8203b2b41afd43d61813fee6
# Push it to GitHub
git push --set-upstream origin backport-4352-to-4.3-1.2-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.3-1.2-wzd

Then, create a pull request where the base branch is 4.3-1.2-wzd and the compare/head branch is backport-4352-to-4.3-1.2-wzd.

Integrated in b35023c.

Desvelao added a commit that referenced this pull request Jul 26, 2022
@chantal-kelm @AlexRuiz7 @Desvelao
Fixed path in logo customization section (#4352)
b35023c 
* change of path

* CHANGELOG

* new constant

* update test

* updated constant name

* updated constant name

* Update CHANGELOG.md

* changelog: add PR entry

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
@Desvelao Desvelao mentioned this pull request Jul 26, 2022
Closed
@Mayons95 Mayons95 mentioned this pull request Aug 16, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdiazlo gdiazlo gdiazlo left review comments

@AlexRuiz7 AlexRuiz7 AlexRuiz7 approved these changes

@Desvelao Desvelao Desvelao approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Wrong path for Wazuh logo customization
5 participants
@chantal-kelm @matiasmoreno876 @Desvelao @gdiazlo @AlexRuiz7