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 user application feedback #7769

Merged
merged 5 commits into from
Jun 19, 2024
Merged

Conversation

josegar74
Copy link
Member

@josegar74 josegar74 commented Feb 16, 2024

User application feedback appear in the manual as deprecated, but the related setting and part of the functionality was still in the application, causing confusion to users.

You can access in http://localhost:8080/geonetwork/srv/eng/contact.us

userfeedback-wrong

This change request:

  • fixes the layout and the functionality to send the comments:

application-feedback

  • updates the description of the setting so it's a bit more clear to the user:

userfeedback-setting

  • adds a link to the user feedback page in the footer if the previous setting is enabled

application-feedback-link

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

@josegar74 josegar74 force-pushed the 44-user-feedback branch 3 times, most recently from f6b84b8 to 8309064 Compare February 16, 2024 13:24
@josegar74 josegar74 added this to the 4.4.3 milestone Feb 16, 2024
@MichelGabriel
Copy link
Contributor

It requires the mail server is also configured.

I would say something like this: 'It requires the mail server to be configured'

@MichelGabriel
Copy link
Contributor

I would like to see the 'contact' link directly after the 'about' link. Now it's in between all kinds of 'social' links

@josegar74
Copy link
Member Author

@MichelGabriel thanks for the review, I've applied the changes requested.

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.

Looks good, thanks

@fxprunayre fxprunayre modified the milestones: 4.4.3, 4.4.4 Mar 13, 2024
@fxprunayre fxprunayre modified the milestones: 4.4.4, 4.4.5 Apr 16, 2024
@fxprunayre fxprunayre modified the milestones: 4.4.5, 4.4.6 Jun 13, 2024
@fxprunayre fxprunayre merged commit 85d2f96 into geonetwork:main Jun 19, 2024
7 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 cab92fde89... Fix user application feedback
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 docs/manual/docs/administrator-guide/configuring-the-catalog/system-configuration.md
Auto-merging services/src/main/java/org/fao/geonet/api/site/SiteApi.java
CONFLICT (content): Merge conflict in services/src/main/java/org/fao/geonet/api/site/SiteApi.java
Auto-merging web-ui/src/main/resources/catalog/components/contactus/partials/contactusform.html
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/components/contactus/partials/contactusform.html
Auto-merging web-ui/src/main/resources/catalog/js/CatController.js
Auto-merging web-ui/src/main/resources/catalog/locales/en-admin.json
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/locales/en-admin.json
Auto-merging web-ui/src/main/resources/catalog/locales/en-core.json
Auto-merging web-ui/src/main/resources/catalog/views/default/templates/footer.html
Auto-merging web-ui/src/main/resources/catalog/views/default/templates/recordView/summary.html
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/views/default/templates/recordView/summary.html
Auto-merging web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages.properties
Auto-merging web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages_fre.properties
Auto-merging web/src/main/webapp/xslt/base-layout-cssjs-loader.xsl

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-7769-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cab92fde893e4fe28196c8b3b03ed9747bf38064,d56fcb0cff17c7a93e5a9213996e508750f164e6,3328de1bd8cbedfcc463754625a48aad4aa65e38,b0bd2cb856587235e44442873066694f21e15fc2,7bc217ce50fffe3ce1269964ffd51bf3bce4ef45
# Push it to GitHub
git push --set-upstream origin backport-7769-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-7769-to-4.2.x.

fxprunayre added a commit to SPW-DIG/metawal-core-geonetwork that referenced this pull request Jul 18, 2024
* Fix user application feedback

* Update setting help text and change in the footer the 'Contact' after the 'About' link

* Conflict fix (#103)

For https://github.com/geonetwork/core-geonetwork/pull/7769/files

---------

Co-authored-by: François Prunayre <[email protected]>
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.

4 participants