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 set site settings in swagger_ui so it function correctly. #8582

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

ianwallen
Copy link
Contributor

@ianwallen ianwallen commented Dec 24, 2024

Prior to this fix, the swagger ui for applying site settings was not working.

Before the swagger ui would look like the following

image

And generate the following error

image

After, it will look like the following (with some examples.)

image

And when valid values are supplied, it will generate the following results

image

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

@ianwallen ianwallen added api change Indicate a change in the API backport 4.2.x labels Dec 24, 2024
@ianwallen ianwallen added this to the 4.4.7 milestone Dec 24, 2024
@ianwallen ianwallen force-pushed the fix_save_setting_swagger_ui branch from 37e2faf to adc73ff Compare December 24, 2024 19:04
Prior to this fix, the swagger ui for applying site settings was not working.
@ianwallen ianwallen force-pushed the fix_save_setting_swagger_ui branch from adc73ff to c9e0ae9 Compare December 25, 2024 00:55
Copy link
Member

@josegar74 josegar74 left a comment

Choose a reason for hiding this comment

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

Tested and works fine. Code changes look good.

@ianwallen ianwallen merged commit 21f0dc8 into geonetwork:main Jan 10, 2025
7 checks passed
@ianwallen ianwallen deleted the fix_save_setting_swagger_ui branch January 10, 2025 15:32
@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 c9e0ae9bf2... Fix set site settings in swagger_ui so it function correctly.
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 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

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-8582-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c9e0ae9bf2273ff80b6fc15e698c86c5ad355cf6
# Push it to GitHub
git push --set-upstream origin backport-8582-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-8582-to-4.2.x.

tylerjmchugh pushed a commit to tylerjmchugh/core-geonetwork that referenced this pull request Jan 10, 2025
…work#8582)

Prior to this fix, the swagger ui for applying site settings was not working.

(cherry picked from commit 21f0dc8)
ianwallen added a commit that referenced this pull request Jan 10, 2025
…#8589)

Prior to this fix, the swagger ui for applying site settings was not working.

(cherry picked from commit 21f0dc8)

Co-authored-by: Ian <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants