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

Harvesters / Reset harvester history pagination when selecting a harvester #7765

Merged
merged 1 commit into from
Mar 4, 2024

Conversation

josegar74
Copy link
Member

Test case:

  1. Select a harvester and move to the 2on page of the executions history.
  2. Select another harvester:
  • Without the fix: the harvester executions history shows the 2on page (that could not exist), instead of the 1st page.
  • With the fix: the harvester executions history shows the 1st page.

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

@fxprunayre fxprunayre merged commit 99f6b8e into geonetwork:main Mar 4, 2024
8 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 3.12.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2ccf679b43... Harvesters / Reset harvester history pagination when selecting a harvester
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".

stdout
Auto-merging web-ui/src/main/resources/catalog/js/admin/HarvestSettingsController.js
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/js/admin/HarvestSettingsController.js

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

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

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.

3 participants