Code

Feat/data conflation UI#1743

Code

Merged

spwoodcock merged 47 commits intohotosm:developmenthotosm/fmtm:developmentfrom NSUWAL123:feat/data-conflation-uiNSUWAL123/fmtm:feat/data-conflation-uiCopy head branch name to clipboardAug 29, 2024

+749-67

Commits

Commits on Jul 29, 2024

• fix(dialogTaskActions): on lock task for validation, redirect to submission table with filtered taskId

  NSUWAL123

  committed
  41938a2

  Copy full SHA for 41938a2

• fix(projectTaskStatus): syle, existingData, feature prop optional

  NSUWAL123

  committed
  1c8facd

  Copy full SHA for 1c8facd

• fix(projectDetails): reorder updateTaskStatus arguments

  NSUWAL123

  committed
  b4388d5

  Copy full SHA for b4388d5

• fix(submissionTable): btn add to update task as mapped

  NSUWAL123

  committed
  3c63d64

  Copy full SHA for 3c63d64

• fix(dialogTaskActions): if validated show merge with OSM btn & redirect to conflation page on click

  NSUWAL123

  committed
  f7a15af

  Copy full SHA for f7a15af

• fix(dataConflation): data conflation component and route setup

  NSUWAL123

  committed
  a221a51

  Copy full SHA for a221a51

Commits on Jul 30, 2024

• fix(merge): merge conflict solve

  NSUWAL123

  committed
  811f8b6

  Copy full SHA for 811f8b6

• feat(taskInfo): conflation task section slicing

  NSUWAL123

  committed
  856c0c4

  Copy full SHA for 856c0c4

• feat(conflationMap): map & legend setup

  NSUWAL123

  committed
  ae4eb13

  Copy full SHA for ae4eb13

• fix(button): outline remove from button

  NSUWAL123

  committed
  5650926

  Copy full SHA for 5650926

• feat(dataConflation): merge OSM modal, taskInfo, conflationMap section add

  NSUWAL123

  committed
  f47b573

  Copy full SHA for f47b573

• fix(taskInfo): style fix

  NSUWAL123

  committed
  e01d34d

  Copy full SHA for e01d34d

Commits on Jul 31, 2024

• feat(dataConflation): submissionConflation component add, UI style fix

  NSUWAL123

  committed
  6e119f2

  Copy full SHA for 6e119f2

• feat(submissionConflation): component UI slicing

  NSUWAL123

  committed
  96bf18c

  Copy full SHA for 96bf18c

• fix(modal): show dialogTrigger only if dialogOpen prop present

  NSUWAL123

  committed
  42fd14b

  Copy full SHA for 42fd14b

• fix(dataConflation): UI fix

  NSUWAL123

  committed
  3a788af

  Copy full SHA for 3a788af

• feat(mergeAttributes): UI slicing for merge attributes modal

  NSUWAL123

  committed
  9acfd58

  Copy full SHA for 9acfd58

• feat(submissionConflation): add mergeAttributes component

  NSUWAL123

  committed
  2e4ae4e

  Copy full SHA for 2e4ae4e

• fix(customTable): remove hover effect & add row bg distinguishable

  NSUWAL123

  committed
  272e8e8

  Copy full SHA for 272e8e8

• feat(dataConflation): skeleton loader add

  NSUWAL123

  committed
  543e762

  Copy full SHA for 543e762

• fix(mergeAttributes): preventDefault and stopPropagation add to onClick event

  NSUWAL123

  committed
  13988ee

  Copy full SHA for 13988ee

Commits on Aug 2, 2024

• Merge branch 'development' of github.com:hotosm/fmtm into feat/data-conflation-ui

  NSUWAL123

  committed
  0b6021e

  Copy full SHA for 0b6021e

• feat(dataConflation): store, slice add

  NSUWAL123

  committed
  dc70dcc

  Copy full SHA for dc70dcc

• feat(dataConflation): submissionConflationGeojson service add

  NSUWAL123

  committed
  faf2151

  Copy full SHA for faf2151

• feat(dataConflation): submissionConflationGeojson service fetch

  NSUWAL123

  committed
  f79e22b

  Copy full SHA for f79e22b

Commits on Aug 5, 2024

• fix(dataConflation): UI style fix

  NSUWAL123

  committed
  029778d

  Copy full SHA for 029778d

• feat(conflationMap): display submissionConflation on map

  NSUWAL123

  committed
  a249e19

  Copy full SHA for a249e19

Commits on Aug 6, 2024

• feat(conflationMap): on map feature click dispatch action to set selectedFeatureOSMId

  NSUWAL123

  committed
  ad0ed42

  Copy full SHA for ad0ed42

• feat(submissionConflation): replace actual data with dummy data

  NSUWAL123

  committed
  5fadf63

  Copy full SHA for 5fadf63

• feat(mergeAttributes): replace dummy data with actual data

  NSUWAL123

  committed
  fa8998d

  Copy full SHA for fa8998d

• feat(dataConflation): setSelectedFeatureOSMId action add

  NSUWAL123

  committed
  23cb6ef

  Copy full SHA for 23cb6ef

• fix(dataConflation): UI style fix according to feature click

  NSUWAL123

  committed
  191327f

  Copy full SHA for 191327f

• Merge branch 'development' of github.com:hotosm/fmtm into feat/data-conflation-ui

  NSUWAL123

  committed
  c50ddac

  Copy full SHA for c50ddac

• fix(conflationMap): update accessor key

  NSUWAL123

  committed
  178772b

  Copy full SHA for 178772b

• fix(dataConflation): style fix

  NSUWAL123

  committed
  ac51b91

  Copy full SHA for ac51b91

• fix(submissionConflation): remove commented code

  NSUWAL123

  committed
  ccccf26

  Copy full SHA for ccccf26

Commits on Aug 7, 2024

• feat(taskInfo): task feature, conflict counts calculation

  NSUWAL123

  committed
  b9a628e

  Copy full SHA for b9a628e

• fix(dataConflation): remove modal

  NSUWAL123

  committed
  71aef57

  Copy full SHA for 71aef57

• fix(dataConflation): loading state add

  NSUWAL123

  committed
  b015eea

  Copy full SHA for b015eea

• fix(mergeAttributes): title add, hover effects add

  NSUWAL123

  committed
  36248cd

  Copy full SHA for 36248cd

Commits on Aug 8, 2024

• fix(mergeConflict): merge conflict solve

  NSUWAL123

  committed
  d7e5f76

  Copy full SHA for d7e5f76

• fix(updateTaskStatus): update prop type

  NSUWAL123

  committed
  41e1896

  Copy full SHA for 41e1896

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for e94e150
  pre-commit-ci[bot]

  committed
  e94e150

  Copy full SHA for e94e150

Commits on Aug 28, 2024

• Merge branch 'development' of github.com:hotosm/fmtm into feat/data-conflation-ui

  NSUWAL123

  committed
  66962e6

  Copy full SHA for 66962e6

• fix(submissionsTable): replace empty string with null

  NSUWAL123

  committed
  d22ff4c

  Copy full SHA for d22ff4c

Commits on Aug 29, 2024

• fix(dialogTaskActions): hide merge data with OSM button

  NSUWAL123

  committed
  4eb7924

  Copy full SHA for 4eb7924

• Merge branch 'feat/data-conflation-ui' of github.com:NSUWAL123/fmtm into feat/data-conflation-ui

  NSUWAL123

  committed
  d6c44dc

  Copy full SHA for d6c44dc