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.

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

Fix button styling in event view #5137

Merged
merged 3 commits into from
Jan 24, 2023
Merged

Conversation

yenienserrano
Copy link
Member

@yenienserrano yenienserrano commented Jan 18, 2023

Description

Changed the styles of the button that shows more information of each row of the table in events so that it has the same styles as the button that appears in discover.

Issues Resolved

Evidence

Wazuh

image

image

Discover

image

image

Test

Scenario 1 The button should have the same appearance as the button that appears in Discover when the information is not displayed.
When the user navigates to a module/events
Then should see the button like the one shown in Discover

Scenario 2 The button should have the same appearance as the button that appears in Discover when after clicking to see the information.
When the user navigates to a module/events and click to see the information
Then should see the button like the one shown in Discover

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@yenienserrano yenienserrano requested a review from a team as a code owner January 18, 2023 13:34
@yenienserrano yenienserrano self-assigned this Jan 18, 2023
@yenienserrano yenienserrano linked an issue Jan 18, 2023 that may be closed by this pull request
@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.76% ( 3236 / 36906 )
Branches 4.5% ( 1291 / 28670 )
Functions 7.63% ( 698 / 9142 )
Lines 8.83% ( 3121 / 35340 )

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: 🟢

Wazuh dashboard

Legend:
⚫: none
🟢: passed
🔴: failed
🟡: warning
⚪: not applicable

Environment:
Platform: Wazuh dashboard

Test Chrome Firefox Safari
The button should have the same appearance as the button that appears in Discover when the information is not displayed 🟢 🟢
The button should have the same appearance as the button that appears in Discover when after clicking to see the information. 🟢 🟢

Details

🟢 The button should have the same appearance as the button that appears in Discover when the information is not displayed

Chrome - 🟢
image

Firefox - 🟢
image

Safari - ⚫

🟢 The button should have the same appearance as the button that appears in Discover when after clicking to see the information.

Chrome - 🟢
image

Firefox - 🟢
image
Safari - ⚫

Copy link
Member

@Tostti Tostti left a comment

Choose a reason for hiding this comment

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

review

Wazuh dashboard

Legend:
⚫: none
🟢: passed
🔴: failed
🟡: warning
⚪: not applicable

Environment:
Platform: Wazuh dashboard

Test Chrome Firefox Safari
The button should have the same appearance as the button that appears in Discover when the information is not displayed 🟢 🟢
The button should have the same appearance as the button that appears in Discover when after clicking to see the information. 🟢 🟢

Details

🟢 The button should have the same appearance as the button that appears in Discover when the information is not displayed

Chrome - 🟢

Discover

imagen

Wazuh

imagen

Firefox - 🟢

Discover

imagen

Wazuh

imagen

Safari - ⚫

🟢 The button should have the same appearance as the button that appears in Discover when after clicking to see the information.

Chrome - 🟢

Discover

imagen

Wazuh

imagen

Firefox - 🟢

Discover

imagen

Wazuh

imagen

Safari - ⚫

TEST:✔️
CR:✔️

LGTM

@Desvelao
Copy link
Member

We should test it with the Safari browser as possible.

@chantal-kelm chantal-kelm self-requested a review January 24, 2023 10:44
Copy link
Member

@chantal-kelm chantal-kelm 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: 🟢

Wazuh dashboard

Legend:
⚫: none
🟢: passed
🔴: failed
🟡: warning
⚪: not applicable

Environment:
Platform: Wazuh dashboard

Test Chrome Firefox Safari
The button should have the same appearance as the button that appears in Discover when the information is not displayed 🟢 🟢 🟢
The button should have the same appearance as the button that appears in Discover when after clicking to see the information. 🟢 🟢 🟢

Evidence

Chrome - 🟢

image image

Firefox - 🟢

image image

Safari - 🟢

image image

@Desvelao Desvelao merged commit 57f0e9f into 4.4-2.4-wzd Jan 24, 2023
@Desvelao Desvelao deleted the fix-5136-button-style-fixes branch January 24, 2023 12:34
@github-actions
Copy link
Contributor

The backport to 4.4-7.10 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.4-7.10 4.4-7.10
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.10
# Create a new branch
git switch --create backport-5137-to-4.4-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 57f0e9fab6fa9dbfb8f0b396f8a7d1ae52317607
# Push it to GitHub
git push --set-upstream origin backport-5137-to-4.4-7.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.10

Then, create a pull request where the base branch is 4.4-7.10 and the compare/head branch is backport-5137-to-4.4-7.10.

@github-actions
Copy link
Contributor

The backport to 4.4-7.16 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.4-7.16 4.4-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.16
# Create a new branch
git switch --create backport-5137-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 57f0e9fab6fa9dbfb8f0b396f8a7d1ae52317607
# Push it to GitHub
git push --set-upstream origin backport-5137-to-4.4-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.16

Then, create a pull request where the base branch is 4.4-7.16 and the compare/head branch is backport-5137-to-4.4-7.16.

AlexRuiz7 pushed a commit that referenced this pull request Jan 31, 2023
* add new style

* add changelog

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
(cherry picked from commit 57f0e9f)
AlexRuiz7 pushed a commit that referenced this pull request Jan 31, 2023
* add new style

* add changelog

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
(cherry picked from commit 57f0e9f)
AlexRuiz7 added a commit that referenced this pull request Jan 31, 2023
* Fix button styling in event view  (#5137)

* add new style

* add changelog

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
(cherry picked from commit 57f0e9f)

* Fix Events open row button styles

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
AlexRuiz7 added a commit that referenced this pull request Jan 31, 2023
* Fix button styling in event view  (#5137)

* add new style

* add changelog

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
(cherry picked from commit 57f0e9f)

* Fix details button style classes

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Render button with different styles in events
5 participants