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.

Sign up for GitHub

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

Jump to bottom

Feat/data conflation UI #1743

Merged
merged 47 commits into from
Aug 29, 2024
Merged

Feat/data conflation UI #1743

merged 47 commits into from
Aug 29, 2024

Conversation

NSUWAL123
Copy link
Collaborator

What type of PR is this? (check all applicable)

  • 🍕 Feature
  • 🐛 Bug Fix
  • 📝 Documentation
  • 🧑‍💻 Refactor
  • ✅ Test
  • 🤖 Build or CI
  • ❓ Other (please specify)

Related Issues

Describe this PR

This PR contains the following works:

  • UI slicing of data conflation with dynamic data from API
  • Validator flow to mark task validated
  • Navigation flow from start mapping to data conflation

Screenshots

image
image

@NSUWAL123
fix(dialogTaskActions): on lock task for validation, redirect to subm…
41938a2 
…ission table with filtered taskId
@NSUWAL123
fix(projectTaskStatus): syle, existingData, feature prop optional
1c8facd
@NSUWAL123
fix(projectDetails): reorder updateTaskStatus arguments
b4388d5
@NSUWAL123
fix(submissionTable): btn add to update task as mapped
3c63d64
@NSUWAL123
fix(dialogTaskActions): if validated show merge with OSM btn & redire…
f7a15af 
…ct to conflation page on click
@NSUWAL123
fix(dataConflation): data conflation component and route setup
a221a51
@NSUWAL123
fix(merge): merge conflict solve
811f8b6
@NSUWAL123
feat(taskInfo): conflation task section slicing
856c0c4
@NSUWAL123
feat(conflationMap): map & legend setup
ae4eb13
@NSUWAL123
fix(button): outline remove from button
5650926
@NSUWAL123
feat(dataConflation): merge OSM modal, taskInfo, conflationMap sectio…
f47b573 
…n add
@NSUWAL123
fix(taskInfo): style fix
e01d34d
@NSUWAL123
feat(dataConflation): submissionConflation component add, UI style fix
6e119f2
@NSUWAL123
feat(submissionConflation): component UI slicing
96bf18c
@NSUWAL123
fix(modal): show dialogTrigger only if dialogOpen prop present
42fd14b
@NSUWAL123
fix(dataConflation): UI fix
3a788af
@NSUWAL123
feat(mergeAttributes): UI slicing for merge attributes modal
9acfd58
@NSUWAL123
feat(submissionConflation): add mergeAttributes component
2e4ae4e
@NSUWAL123
fix(customTable): remove hover effect & add row bg distinguishable
272e8e8
@NSUWAL123
feat(dataConflation): skeleton loader add
543e762
@NSUWAL123
fix(mergeAttributes): preventDefault and stopPropagation add to onCli…
13988ee 
…ck event
@NSUWAL123
Merge branch 'development' of github.com:hotosm/fmtm into feat/data-c…
0b6021e 
…onflation-ui
@NSUWAL123
feat(dataConflation): store, slice add
dc70dcc
@NSUWAL123
feat(dataConflation): submissionConflationGeojson service add
faf2151
@NSUWAL123
feat(dataConflation): submissionConflationGeojson service fetch
f79e22b
@NSUWAL123
fix(dataConflation): UI style fix
029778d
@NSUWAL123
feat(conflationMap): display submissionConflation on map
a249e19
@NSUWAL123
feat(conflationMap): on map feature click dispatch action to set sele…
ad0ed42 
…ctedFeatureOSMId
@NSUWAL123
feat(submissionConflation): replace actual data with dummy data
5fadf63
@NSUWAL123
feat(mergeAttributes): replace dummy data with actual data
fa8998d
@github-actions github-actions bot added enhancement New feature or request frontend Related to frontend code labels Aug 8, 2024
@NSUWAL123 NSUWAL123 marked this pull request as ready for review August 29, 2024 03:39
@NSUWAL123
Copy link
Collaborator Author

@spwoodcock, this branch was supposed to be for data conflation but since there are works pending on the backend this was on hold.
Since this PR contains some mapper workflow update #1654 and currently I am going to write the test case for mapper workflow, this PR needs to get merged. For now I have hide out the Merge data with OSM button on the popup so that user wont go to the data-conflation page since there are dummy data's.

@spwoodcock spwoodcock merged commit 9729f53 into hotosm:development Aug 29, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spwoodcock spwoodcock Awaiting requested review from spwoodcock

Assignees
No one assigned
Labels
enhancement New feature or request frontend Related to frontend code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@NSUWAL123 @spwoodcock