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

2024-01-25 merge development --> staging #1140

Merged
merged 66 commits into from
Jan 25, 2024
Merged

2024-01-25 merge development --> staging #1140

merged 66 commits into from
Jan 25, 2024

Commits on Jan 14, 2024

  1. Configuration menu
    Copy the full SHA
    3e5b7d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3cbaa95 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fa562b2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0f7e855 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    359b682 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6bc5eff View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. build: add justfile to repo for basic commands (#1098)

    * build: add justfile to repo for basic commands
    
    * build: remove Makefile, update Justfile
    
    * build: add Justfile commands to clean databases
    
    * docs: add Justfile to pr auto labeller
    spwoodcock authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    f6c0243 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. refactor: organization routes/crud/schemas to use best practice (#1096)

    * fix: use enums for HTTPStatus over codes
    
    * refactor: update organization routes/crud/schemas best pracice
    
    * added int to the union with str in org_exists functions
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    ---------
    
    Co-authored-by: Niraj Adhikari <nrjadkry@gmail.com>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    3 people authored Jan 16, 2024
    Configuration menu
    Copy the full SHA
    d4b20b1 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. feat: add basic user role support to backend (#1094)

    * feat: update role enums: UserRole and ProjectRole
    
    * feat: update DbUserRole model to use ProjectRole enum + comp key
    
    * build: update base schema with new enum types
    
    * fix: osm login methods to async
    
    * feat: add basic roles: super admin & validator
    
    * build: add migration for ProjectRole db enum type
    
    * build: fix migrations with revert for projectrole
    
    * build: fix enum migrations with intermediate varchar
    
    * fix: handle invalid access tokens
    
    * refactor: correct use of 403 http status over 401
    
    * refactor: tidy minor code edits & lint fixes
    
    * build: default to 4 workers on dev uvicorn container
    
    * feat: add project_deps with get_project_by_id logic
    
    * feat: add org_admin role to role deps
    
    * fix: add user role to response /me for frontend
    
    * [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>
    spwoodcock and pre-commit-ci[bot] authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    f8cf65f View commit details
    Browse the repository at this point in the history
  2. refactor: fix all pre-commit.ci linting errors (#1101)

    * build: add migration for ProjectRole db enum type
    
    * fix: database model backrefs for DbUserRole --> (DbProject/DbUser)
    
    * fix: add debug user to bypass auth during tests
    
    * refactor: simplify project deletion endpoint /project/{id}
    
    * test: add test for project deletion endpoint
    
    * refactor: rename upload_multi_polygon --> custom_task_boundaries
    
    * ci: disable markdownlint rule MD033 (allow inline html img resize)
    
    * docs: update docs home page to use ref links
    
    * refactor: fix all linting errors for code
    
    * ci: add CONTRIBUTING.md to prettier ignore list
    
    * docs: fix linting errors for all markdown docs
    
    * refactor: rename LICENSE --> LICENSE.md
    
    * refactor: update badges in readme
    
    * docs: add allcontributors to badge table
    
    * ci: add LICENSE.md to markdownlint ignore
    
    * ci: update markdownlint ignore syntax for ci
    
    * ci: add LICENSE.md to prettier ignore
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * style: revert prettier changes to LICENSE.md
    
    * ci: update pre-commit hook versions
    
    * docs: fix markdown linting errors after update
    
    * ci: disable hadolint until bundled binary
    
    * ci: do not run shellcheck on contrib dir
    
    * ci: ignore SC2188,SC2143 from shellcheck
    
    * refactor: fix lint errors for all shell/bash scripts
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    spwoodcock and pre-commit-ci[bot] authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    da5c95f View commit details
    Browse the repository at this point in the history
  3. fix: editable vector layer in ol for project creation (#1102)

    * fix: backend import error fix
    
    * fix (vectorLayer): style - conditionaly apply style on onModify present
    
    * fix (splitTasks): map - edit added to splitted taskLayer
    
    * fix (splitTasks): onModify - edited geojson set to dividedTaskGeojson state
    
    * feat (createNewProject): only enable generate task btn if fgb file fetch is completed
    
    * fix (createNewProject): splitTasks - logic fix
    
    * fix (createNewProject): splitTasks - clear dividedTaskGeojson, splitTasksSelection, and dataExtractGeojson state on previous click
    
    * feat (createNewProject): splitTasks - show loader and message until FGB file is fetching
    
    * fix (createNewProject): taskSplit - display error on taskSplit fail
    
    * fix vectorLayer: on modifyEnd return area of boundary as well
    
    * fix button: loading text added to the button
    
    * fix NewDefineAreaMap: removed data extraction in progress message from mapComponent
    
    * fix (createNewProject): splitTasks - clearing state on step toggle remove
    
    * fix (createNewProject): uploadArea - clear step4 & step5 step on AOI edit
    
    * fix (createNewProject): dataExtract - generateTaskBTN added, disable next until taskGeneration success, state logic changed to track extractWays & featureType state validation
    
    * fix (createNewProject): dataExtract - clear file state on reset click or if generateDataExtract click
    
    * fix (createNewProject): customLine, customPolygon file state clear on AOI edit
    
    * fix (createNewProject): dataExtract - clear previous extractGeojson, customLine, customPolygon on generate extract, btn disable state update
    NSUWAL123 authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c03f908 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. fix: limit project area during create (#1109)

    * fix: backend import error fix
    
    * fix (vectorLayer): style - conditionaly apply style on onModify present
    
    * fix (splitTasks): map - edit added to splitted taskLayer
    
    * fix (splitTasks): onModify - edited geojson set to dividedTaskGeojson state
    
    * feat (createNewProject): only enable generate task btn if fgb file fetch is completed
    
    * fix (createNewProject): splitTasks - logic fix
    
    * fix (createNewProject): splitTasks - clear dividedTaskGeojson, splitTasksSelection, and dataExtractGeojson state on previous click
    
    * feat (createNewProject): splitTasks - show loader and message until FGB file is fetching
    
    * fix (createNewProject): taskSplit - display error on taskSplit fail
    
    * fix vectorLayer: on modifyEnd return area of boundary as well
    
    * fix button: loading text added to the button
    
    * fix NewDefineAreaMap: removed data extraction in progress message from mapComponent
    
    * fix (createNewProject): splitTasks - clearing state on step toggle remove
    
    * fix (createNewProject): uploadArea - clear step4 & step5 step on AOI edit
    
    * fix (createNewProject): dataExtract - generateTaskBTN added, disable next until taskGeneration success, state logic changed to track extractWays & featureType state validation
    
    * fix (createNewProject): dataExtract - clear file state on reset click or if generateDataExtract click
    
    * fix (createNewProject): customLine, customPolygon file state clear on AOI edit
    
    * fix (createNewProject): dataExtract - clear previous extractGeojson, customLine, customPolygon on generate extract, btn disable state update
    
    * fix (createNewProject): uploadArea - warning & error shown if AOI exceeds 100 & 1000 sq.km respectively
    NSUWAL123 authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    da99c41 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0ce89c9 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1113 from hotosm/fix/use-org-admin-table

    Use organisation manager table for organisation admins
    nrjadkry authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    1322cd1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8ad3ec1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1c5420b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ee8f1a8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c5b1cad View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    670c455 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e67aeaa View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    36af459 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    ed95c47 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    4d7ba07 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    0c01424 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    0db23d1 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    1a9aabc View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    b0bb274 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Configuration menu
    Copy the full SHA
    5704fe1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1119 from hotosm/fix-data-extract

    Fix condition in elif statement for Feature type detection
    nrjadkry authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    a3b2fc7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1117 from hotosm/build/upgrade-osm-pkgs

    Upgrade osm-fieldwork --> 0.4.1 & fmtm-splitter --> 0.2.6
    nrjadkry authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    60399ca View commit details
    Browse the repository at this point in the history
  4. docs: update markdown links from inline to reference (footnote) style (

    …#1116)
    
    * Clean up links in contributing
    
    * done: CONTRIBUTING.md
    
    * done: INSTALL.md
    
    * done: User-Mantual-For-Project-Managers.md
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * Moving script file to a new directory
    
    * move new script file to a new directory
    
    * deleted superfluous XINSTALL copy.md
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    cordovez and pre-commit-ci[bot] authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    512b130 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    650f7c3 View commit details
    Browse the repository at this point in the history
  6. feat: paginated submissions by project (#1110)

    * feat: submission form fields for the submision table
    
    * feat: paginated submissions by project
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * refactor: format submission_routes, remove dup import
    
    * refactor: fix incorrect import from app.submission
    
    * run pre-commit
    
    ---------
    
    Co-authored-by: sujanadh <sujanadh07@gmail.com>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
    4 people authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    b44ebee View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    10c31fc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    126f80a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1033e0f View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. Configuration menu
    Copy the full SHA
    c74855e View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. fix divide by square on multipolygon geojson

    sujanadh committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    e97ef2c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1125 from hotosm/fix-square-split

    Fix divide by square on multipolygon geojson
    nrjadkry authored Jan 22, 2024
    Configuration menu
    Copy the full SHA
    6b32142 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    66b3607 View commit details
    Browse the repository at this point in the history
  4. feat: add test coverage metric (#1129)

    * build: add coverage.py to test dependencies
    
    * docs: add dev info about coverage and profiling
    
    * refactor: add doxygen output to gitignore
    
    * build: add coverage-badge to test deps
    
    * ci: update all workflows v1.4.2 --> v1.4.3
    
    * ci: add coverage output during deploy pytest
    
    * docs: add coverage stats to readme
    
    * build: lock dependencies after merge coverage+fmtm-splitter
    
    * build: add coverage files to gitignore
    
    * ci: update pytest workflow test to use coverage
    
    * ci: update all workflows v1.4.3 --> v1.4.4
    spwoodcock authored Jan 22, 2024
    Configuration menu
    Copy the full SHA
    148de05 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    15345c5 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. hotfix: geom type not populated with feature type

    sujanadh committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    aa2680d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1130 from hotosm/fix-geom-type

    hotfix: geom type not populated with feature type
    nrjadkry authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    749431f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    67a099f View commit details
    Browse the repository at this point in the history
  4. feat: organisation approval and admin endpoints (#1126)

    * dependencies to cehck if user_exists
    
    * endpoint to add organisation admin
    
    * added approved field in organisation model
    
    * fix: table name in migration file for organisations
    
    * feat: organisations list api updated according to role
    
    * feat: endpoint to approve organisations
    
    * update: get organisation endpoint for filtering approval
    
    * [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci
    
    * added docstrings
    
    * fix: pre-commit linting errors
    
    * added docstring in user_deps file
    
    * build: add default odk credentials to organisations
    
    * build: merge migrations to organisations table
    
    * refactor: fix linting errors
    
    * refactor: remove subscription_tier field for orgs
    
    * build: add public.organisation.approved field to base schema
    
    * refactor: remove extra url field from DbOrganisation
    
    * refactor: fix organizationModel dir --> organisation for import
    
    * fix: remove router get_db global dependency (on routes)
    
    * fix: use separate super_admin + check_super_admin deps
    
    * fix: update org_admin to also allow super_admin
    
    * refactor: remove missed log.warning from organisations endpoint
    
    * fix: separate Depends from logic, working org approval
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
    3 people authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    36ae5d4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8349c8c View commit details
    Browse the repository at this point in the history
  6. refactor: update project dashboard to use deps functions (#1127)

    * Refactor: updated code to use deps function
    
    * Created new deps function org_from_project
    
    * fix: call check_org_exists logic from dependency
    
    * refactor: var naming for consistency
    
    ---------
    
    Co-authored-by: sujanadh <sujanadh07@gmail.com>
    Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
    3 people authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    3060f19 View commit details
    Browse the repository at this point in the history
  7. feat: paginated submissions per task (#1128)

    * merge development
    
    * feat: paginated submissions by task
    
    ---------
    
    Co-authored-by: sujanadh <sujanadh07@gmail.com>
    Sujanadh and sujanadh authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    9a9d728 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    17ae34d View commit details
    Browse the repository at this point in the history
  9. build: replace project.private field with project.visibility enum (#1132

    )
    
    * build: remove project_allowed_users table from db
    
    * build: remove odk_central_src field from project table
    
    * refactor: tidy/reorder project db model fields
    
    * build: remove project.task_creation_mode field + enum
    
    * build: replace project.private field with project.visibility enum
    
    * fix: fix visibility migration column add syntax
    
    * fix: apply migration to projects table
    
    * build: fix check for projectvisibility type in migration
    
    * ci: update workflows 1.4.5 for mkdocs --dirty
    spwoodcock authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    0925773 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ebb07cd View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Configuration menu
    Copy the full SHA
    f3bea80 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d72b49f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    307b8ca View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    35f5c11 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    69a1a19 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c42af08 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Configuration menu
    Copy the full SHA
    d7f2075 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fbcbca1 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1137 from hotosm/feat-organization-cookie

    feature/added withcredential to include cookies on organization list api
    varun2948 authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    bb8b2ce View commit details
    Browse the repository at this point in the history
  4. build: add deployment container replicas and resource constraints (#1139

    )
    
    * build: update backend image to use 1 uvicorn worker
    
    * build: add api deploy replicas, remove container_name
    
    * build: default to 1 local replica for easier debug
    
    * docs: update container name for docker logs cmd
    
    * fix: return of AuthUser during debug tests + linting
    spwoodcock authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    ecdf41a View commit details
    Browse the repository at this point in the history
  5. feat: endpoint to return count of validated and mapped tasks (#1138)

    * feat: new endpoint to return count of validated and mapped task
    
    * refactor: move to tasks router + use pydantic model
    
    * refactor: rename task_activity route --> tasks/activity
    
    ---------
    
    Co-authored-by: sujanadh <sujanadh07@gmail.com>
    Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
    3 people authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    c8246ce View commit details
    Browse the repository at this point in the history
  6. feat: add AOI editing to map during project creation (#1135)

    * feat (createNewProject): mapControlComponent - mapControlComponent including edit, undo added
    
    * feat AssetModules: icons added
    
    * feat (createNewProject): splitTasks - edit task on editBtn click
    
    * fix codeRefactor: consoles removed
    
    * fix mapControlComponent: undoIcon removed
    NSUWAL123 authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    b382fde View commit details
    Browse the repository at this point in the history
  7. refactor(frontend): use absolute (aliased) imports over relative impo…

    …rts (#1136)
    
    * fix: add vite alias @ for src dir
    
    * refactor(frontend): replace all relative imports with @ alias
    
    * build: add lint command to package.json (eslint)
    
    * build: add @ alias to tsconfig for type imports
    
    * refactor: fix all linting errors from eslint
    
    * fix: browser console errors incorrect React usage
    
    * fix: add axios interceptor withCredentials, plus API const
    
    * refactor: fix remaining relative imports
    spwoodcock authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    4c12cc3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c8ed194 View commit details
    Browse the repository at this point in the history