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

Commits on Jul 29, 2024

  1. fix(dialogTaskActions): on lock task for validation, redirect to subm… 

    …ission table with filtered taskId
    @NSUWAL123
    NSUWAL123 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    41938a2 View commit details
    Browse the repository at this point in the history

  2. fix(projectTaskStatus): syle, existingData, feature prop optional

    @NSUWAL123
    NSUWAL123 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    1c8facd View commit details
    Browse the repository at this point in the history

  3. fix(projectDetails): reorder updateTaskStatus arguments

    @NSUWAL123
    NSUWAL123 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    b4388d5 View commit details
    Browse the repository at this point in the history

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

    @NSUWAL123
    NSUWAL123 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    3c63d64 View commit details
    Browse the repository at this point in the history

  5. fix(dialogTaskActions): if validated show merge with OSM btn & redire… 

    …ct to conflation page on click
    @NSUWAL123
    NSUWAL123 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    f7a15af View commit details
    Browse the repository at this point in the history

  6. fix(dataConflation): data conflation component and route setup

    @NSUWAL123
    NSUWAL123 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    a221a51 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. fix(merge): merge conflict solve

    @NSUWAL123
    NSUWAL123 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    811f8b6 View commit details
    Browse the repository at this point in the history

  2. feat(taskInfo): conflation task section slicing

    @NSUWAL123
    NSUWAL123 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    856c0c4 View commit details
    Browse the repository at this point in the history

  3. feat(conflationMap): map & legend setup

    @NSUWAL123
    NSUWAL123 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    ae4eb13 View commit details
    Browse the repository at this point in the history

  4. fix(button): outline remove from button

    @NSUWAL123
    NSUWAL123 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    5650926 View commit details
    Browse the repository at this point in the history

  5. feat(dataConflation): merge OSM modal, taskInfo, conflationMap sectio… 

    …n add
    @NSUWAL123
    NSUWAL123 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    f47b573 View commit details
    Browse the repository at this point in the history

  6. fix(taskInfo): style fix

    @NSUWAL123
    NSUWAL123 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    e01d34d View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

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

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    6e119f2 View commit details
    Browse the repository at this point in the history

  2. feat(submissionConflation): component UI slicing

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    96bf18c View commit details
    Browse the repository at this point in the history

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

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    42fd14b View commit details
    Browse the repository at this point in the history

  4. fix(dataConflation): UI fix

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    3a788af View commit details
    Browse the repository at this point in the history

  5. feat(mergeAttributes): UI slicing for merge attributes modal

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    9acfd58 View commit details
    Browse the repository at this point in the history

  6. feat(submissionConflation): add mergeAttributes component

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    2e4ae4e View commit details
    Browse the repository at this point in the history

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

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    272e8e8 View commit details
    Browse the repository at this point in the history

  8. feat(dataConflation): skeleton loader add

    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    543e762 View commit details
    Browse the repository at this point in the history

  9. fix(mergeAttributes): preventDefault and stopPropagation add to onCli… 

    …ck event
    @NSUWAL123
    NSUWAL123 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    13988ee View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge branch 'development' of github.com:hotosm/fmtm into feat/data-c… 

    …onflation-ui
    @NSUWAL123
    NSUWAL123 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    0b6021e View commit details
    Browse the repository at this point in the history

  2. feat(dataConflation): store, slice add

    @NSUWAL123
    NSUWAL123 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    dc70dcc View commit details
    Browse the repository at this point in the history

  3. feat(dataConflation): submissionConflationGeojson service add

    @NSUWAL123
    NSUWAL123 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    faf2151 View commit details
    Browse the repository at this point in the history

  4. feat(dataConflation): submissionConflationGeojson service fetch

    @NSUWAL123
    NSUWAL123 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    f79e22b View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. fix(dataConflation): UI style fix

    @NSUWAL123
    NSUWAL123 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    029778d View commit details
    Browse the repository at this point in the history

  2. feat(conflationMap): display submissionConflation on map

    @NSUWAL123
    NSUWAL123 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    a249e19 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. feat(conflationMap): on map feature click dispatch action to set sele… 

    …ctedFeatureOSMId
    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ad0ed42 View commit details
    Browse the repository at this point in the history

  2. feat(submissionConflation): replace actual data with dummy data

    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    5fadf63 View commit details
    Browse the repository at this point in the history

  3. feat(mergeAttributes): replace dummy data with actual data

    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    fa8998d View commit details
    Browse the repository at this point in the history

  4. feat(dataConflation): setSelectedFeatureOSMId action add

    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    23cb6ef View commit details
    Browse the repository at this point in the history

  5. fix(dataConflation): UI style fix according to feature click

    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    191327f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'development' of github.com:hotosm/fmtm into feat/data-c… 

    …onflation-ui
    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    c50ddac View commit details
    Browse the repository at this point in the history

  7. fix(conflationMap): update accessor key

    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    178772b View commit details
    Browse the repository at this point in the history

  8. fix(dataConflation): style fix

    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ac51b91 View commit details
    Browse the repository at this point in the history

  9. fix(submissionConflation): remove commented code

    @NSUWAL123
    NSUWAL123 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ccccf26 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. feat(taskInfo): task feature, conflict counts calculation

    @NSUWAL123
    NSUWAL123 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b9a628e View commit details
    Browse the repository at this point in the history

  2. fix(dataConflation): remove modal

    @NSUWAL123
    NSUWAL123 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    71aef57 View commit details
    Browse the repository at this point in the history

  3. fix(dataConflation): loading state add

    @NSUWAL123
    NSUWAL123 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b015eea View commit details
    Browse the repository at this point in the history

  4. fix(mergeAttributes): title add, hover effects add

    @NSUWAL123
    NSUWAL123 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    36248cd View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. fix(mergeConflict): merge conflict solve

    @NSUWAL123
    NSUWAL123 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    d7e5f76 View commit details
    Browse the repository at this point in the history

  2. fix(updateTaskStatus): update prop type

    @NSUWAL123
    NSUWAL123 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    41e1896 View commit details
    Browse the repository at this point in the history

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

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    e94e150 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Merge branch 'development' of github.com:hotosm/fmtm into feat/data-c… 

    …onflation-ui
    @NSUWAL123
    NSUWAL123 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    66962e6 View commit details
    Browse the repository at this point in the history

  2. fix(submissionsTable): replace empty string with null

    @NSUWAL123
    NSUWAL123 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    d22ff4c View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. fix(dialogTaskActions): hide merge data with OSM button

    @NSUWAL123
    NSUWAL123 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    4eb7924 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/data-conflation-ui' of github.com:NSUWAL123/fmtm i… 

    …nto feat/data-conflation-ui
    @NSUWAL123
    NSUWAL123 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    d6c44dc View commit details
    Browse the repository at this point in the history