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

Metadata editor / validation report improvements #8395

Merged
merged 2 commits into from
Oct 8, 2024

Conversation

josegar74
Copy link
Member

@josegar74 josegar74 commented Oct 1, 2024

  • Update buttons to display success and errors to use text instead of an icon.
  • Show separate messages for success and errors.
validation-rules-panel-1
  • Add style to display the display buttons greyed when the related rules are not displayed.
validation-rules-panel-3
  • If not success or errors reported don't show the expander to display the results in the validation rules.
validation-geo
  • Group the success and error messages.
validation-rules-panel-2

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

- Update buttons to display success and errors to use text instead of an icon.
- Add style to display the display buttons greyed when the related rules are not displayed.
- Show separate messages for success and errors.
- If not success or errors reported don't show the expander to show the results in the validation rules.
- Group the success and error messages.
@MichelGabriel
Copy link
Contributor

@josegar74 It looks good, more clear and simple.

One thing I noticed, the expander was still there, although there were no errors.

gn-validation

@josegar74
Copy link
Member Author

Thanks @MichelGabriel I'll check to fix that

- Fix the display of the expander.
- Improve the a bit the layout of the error / success messages.
- Improve the tooltips for the buttons to hide / show the messages.
@josegar74
Copy link
Member Author

@MichelGabriel I've pushed a change to fix the expander and also improve the a bit the layout of the error / success messages and the tooltips for the buttons to hide / show the messages:

validation-rules-panel-4

Copy link
Contributor

@MichelGabriel MichelGabriel left a comment

Choose a reason for hiding this comment

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

The expander is now hidden when there are no messages, and the rest is tested and works fine. Thanks.

@fxprunayre fxprunayre merged commit bb9c861 into geonetwork:main Oct 8, 2024
6 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2323b0a890... Metadata editor / validation report improvements:
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging web-ui/src/main/resources/catalog/locales/en-editor.json
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/locales/en-editor.json
Auto-merging web-ui/src/main/resources/catalog/style/gn_editor.less

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.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8395-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2323b0a89084241f901e8f71357b4ba8f79b8322,9b12031edb7e38c42830d25bfdbdb105e4eb5f5d
# Push it to GitHub
git push --set-upstream origin backport-8395-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-8395-to-4.2.x.

@ianwallen ianwallen modified the milestones: 4.4.7, 4.4.6 Oct 8, 2024
josegar74 added a commit that referenced this pull request Nov 6, 2024
* Metadata editor / validation report improvements:
- Update buttons to display success and errors to use text instead of an icon.
- Add style to display the display buttons greyed when the related rules are not displayed.
- Show separate messages for success and errors.
- If not success or errors reported don't show the expander to show the results in the validation rules.
- Group the success and error messages.

* Metadata editor / validation report improvements:

- Fix the display of the expander.
- Improve the a bit the layout of the error / success messages.
- Improve the tooltips for the buttons to hide / show the messages.
josegar74 added a commit that referenced this pull request Nov 6, 2024
* Metadata editor / validation report improvements:
- Update buttons to display success and errors to use text instead of an icon.
- Add style to display the display buttons greyed when the related rules are not displayed.
- Show separate messages for success and errors.
- If not success or errors reported don't show the expander to show the results in the validation rules.
- Group the success and error messages.

* Metadata editor / validation report improvements:

- Fix the display of the expander.
- Improve the a bit the layout of the error / success messages.
- Improve the tooltips for the buttons to hide / show the messages.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants