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

Rebase and test commit afe66af, "refactor: combine ward filtering onto map page" #102

Open
KyleDolezal opened this issue Aug 13, 2023 · 3 comments
Assignees
Labels
Clean Up enhancement New feature or request

Comments

@KyleDolezal
Copy link
Collaborator

Overview
This issue tracks work to merge a refactor into main, including addressing merge conflicts and testing functionality.

Problem
Commit afe66af, part of branch create-ward-filtering, was not merged in during a recent attempt to merge several commits to main. Difficulties in addressing merge conflicts led us to hold off on merging this commit in order to invest dedicated time to researching and testing it.

Solution

  • Cherry-pick the commit on top of main.
  • Address any merge conflicts
  • Test the functionality
@KyleDolezal
Copy link
Collaborator Author

Update

  • I cherry-picked the commit on top of main.
  • Merge conflicts have been resolved.
  • I checked in 5965ec to address compilation errors.
  • I tested the functionality and identified outstanding issues:
  1. The route map consists entirely of yellow lines, and hovering turns them white.
    image
  2. The more stats page does not function properly.
    image
  3. The modal for an individual route is not styled correctly.
    image

@KyleDolezal
Copy link
Collaborator Author

Analysis

  • The commit consists of: moving functionality around, adding styles, and updating the formatting of existing code.
  • The commit, when merged in, is not expected to add to or impact existing functionality.
  • Fixing the functionality for the commit may not be a trivial undertaking, as there are multiple issues with the code change.

@KyleDolezal
Copy link
Collaborator Author

Next steps
I recommend:

  • Storing the rebased commit (including fixes to address compilation errors) on a branch here.
  • Documenting issues with the code change in this issue.
  • Creating a new issue to fix outstanding problems with the code change.
  • Closing this issue and prioritizing the new issue appropriately.

@hkier hkier added enhancement New feature or request Clean Up labels Aug 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Clean Up enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants