Merge 'staging' to 'main' #2615
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat: migration added to update osm_id type from int to bigint * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * refactor: move migrations dir from backend to src (for frontend + backend) * build: move migrations to root src dir for both frontend / backend migrations --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: spwoodcock <[email protected]>
* refactor(urlChecker): validate url based on url protocol * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: FURUHASHI Taichi <[email protected]>
) * feat: add 'COMPLETED' status to project status enum and update access checks for project completion * refactor(project): remove unused get_active_project dependency * feat(roles): restrict access to completed and archived projects based on check completed parameter * refactor(auth): replace function-based access checks with class-based implementations for ProjectManager and Mapper
* fix(backend): remove custom validation error handler (default "detail" key) * fix(frontend): error handling for invalid geojson data extract upload * fix(backend): remove custom validation error handler (default "detail" key) * refactor(createProjectService): refactor handling of both string & array post project response, remove top-level error message toast * refactor(createProjectService): seperate upload data-extract api call * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: spwoodcock <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Translated using Weblate (Japanese) Currently translated at 100.0% (14 of 14 strings) Translation: HOTOSM/Field-TM Forms Translate-URL: https://hosted.weblate.org/projects/hotosm/field-tm-forms/ja/ * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: FURUHASHI Taichi <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* docs: update README.md * docs: update .all-contributorsrc --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* refactor(user): use /user/usernames api instead of /user api for PM user search * fix(dataExtract): disable fetch osm data extract option if linestring selected * fix(splitTasks): disable task splitting algorithm if linestring selected
…ong with odk server request when applicable (#2589) * feat(organisations): implement organisation approval request notification * fix(organisations): remove unused organisation URL construction in approval request * fix(organisations): clarify message for ODK server access request * fix(organisations): remove thank you message from organisation approval request
* fix(backend): avoid prepending ',' in submission_ids * feat(backend): add submission_ids while updating entity status * feat(mapper): add submission_ids in payload and prepend existing submission_ids if found * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix(pre-commit): added missing docstring --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* fix(+page): add latestEvent as dependency only for initial sync * fix(tasks): select last index from task event rows for most recent event
* feat(messages): translations add * refactor(+page): pass user_sub as key to pass user identifier for who created the new geom * feat(messages): traslations add * feat(dialog-entities-actions): workflow to delete newly created entities * feat(entities): delete new entity api add * refactor(dialog-entities-actions): style add * feat: translations * feat(dialog-entities-actions): only allow entity creator to delete the entity * refactor(entities): if error, show toast * refactor(dialog-entities-actions): allow ready and opened_in_odk to be deleted * feat(featureSelectionPopup): option for pm to delete newly created entity via project details page * feat(project): delete geom api service add * refactor(projectSlice): add geom_id on new geom geojson properties * refactor(project): refactor delete entity api func * refactor(projectDetails): fix styles * feat(featureSelectionPopup): entity delete modal * feat(project): entity delete state * fix(projectDetails): add setSelectedTaskFeature prop * feat(+page): pass user_sub as entity feature property * feat(messages): translations add * refactor(+page): pass user_sub as key to pass user identifier for who created the new geom * feat(messages): traslations add * feat(dialog-entities-actions): workflow to delete newly created entities * feat(entities): delete new entity api add * refactor(dialog-entities-actions): style add * feat: translations * feat(dialog-entities-actions): only allow entity creator to delete the entity * refactor(entities): if error, show toast * refactor(dialog-entities-actions): allow ready and opened_in_odk to be deleted * feat(featureSelectionPopup): option for pm to delete newly created entity via project details page * feat(project): delete geom api service add * refactor(projectDetails): fix styles * feat(featureSelectionPopup): entity delete modal * feat(project): entity delete state * fix(projectDetails): add setSelectedTaskFeature prop * feat(+page): pass user_sub as entity feature property * refactor: replace is_new with created_by entity field in code * fix(mapper): minor tweaks after rebase * build: add migration for entities is_new --> created_by field * refactor(entities): update delete new entities api * refactor(dialog-entities-actions): remove geom_id, update user_sub key to created_by * fix(+page): remove duplicate loginStore initialization * refactor(entities): manually sync status after entity deletion --------- Co-authored-by: spwoodcock <[email protected]>
* feat(entities): state add to store selected entites javaRosa geometry * feat(main): when entity clicked, set its javaRosa geom to state * refactor(wrapper): pass entities javaRosa geom either from selectedEntities state or from odk entities response for new entity * fix(extractGeojsonFromObject): update logic to handle point geoms having semicolon at the end
…mission detail page (#2599) * fix(submission_crud): update submission retrieval to use pyodk except in submission detail and table * refactor(submission): simplify submissions retrieval logic to only use pyodk
Merge branch 'development' to 'staging'
github-actions
bot
added
docs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this? (check all applicable)
Describe this PR
Push changes to main and release to production.
Alternative Approaches Considered
Did you attempt any other approaches that are not documented in code?
Review Guide
Notes for the reviewer. How to test this change?
Checklist before requesting a review
[optional] What gif best describes this PR or how it makes you feel?