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 merge modal for all cycles #4612

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Fix merge modal for all cycles #4612

merged 2 commits into from
Apr 5, 2024

Conversation

axelstudios
Copy link
Member

@axelstudios axelstudios commented Apr 5, 2024

Any background context you want to provide?

When requesting filtered properties with the /api/v3/properties/filter/ endpoint, if you leave out the cycle param the backend defaults to the first alphabetical cycle

What's this PR do?

  • Makes the cycle id explicit, so that when you're on the Inventory List page, select records, and open the merge modal, it will now work for all cycles and not just the first alphabetical cycle
  • Fixes the cycle toggle on the map page, it was also affected by this issue
  • Adds a fallback on the front-end, such that if a cycle isn't passed when filtering properties it will use the most-recently selected cycle

How should this be manually tested?

  1. In an org with multiple cycles, go to the Inventory List page and select any cycle that is not alphabetically sorted first

  2. Select a few records, and then open the Merge modal

  3. Ensure that the data appears as expected

  4. Go to the Inventory Map page

  5. Toggle between different cycles, ensure that different (and correct) data appears for each cycle

Copy link
Contributor

@perryr16 perryr16 left a comment

Choose a reason for hiding this comment

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

super

@axelstudios axelstudios merged commit f3d92cb into develop Apr 5, 2024
9 checks passed
@axelstudios axelstudios deleted the bugfix/fix-merge-modal branch April 5, 2024 20:35
@perryr16
Copy link
Contributor

perryr16 commented Apr 5, 2024

This PR fixes #4606

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.

None yet

2 participants