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

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

Conversation

spwoodcock
Copy link
Member

No description provided.

spwoodcock and others added 30 commits January 14, 2024 04:51
@spwoodcock
build: remove ref to script_domain (move to separate repo)
3e5b7d1
@spwoodcock
docs: add CNAME for custom docs domain
3cbaa95
@spwoodcock
build: move install.sh to fmtm-installer repo
fa562b2
@spwoodcock
ci: remove install script from pr labeller
0f7e855
@spwoodcock
docs: update info for using easy install script
359b682
@spwoodcock
build: add justfile to repo for basic commands (#1098)
f6c0243 
* 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
Merge branch 'development' of https://github.com/hotosm/fmtm into dev…
6bc5eff 
…elopment
@spwoodcock @nrjadkry @pre-commit-ci
refactor: organization routes/crud/schemas to use best practice (#1096)
d4b20b1 
* 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>
@spwoodcock @pre-commit-ci
feat: add basic user role support to backend (#1094)
f8cf65f 
* 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 @pre-commit-ci
refactor: fix all pre-commit.ci linting errors (#1101)
da5c95f 
* 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>
@NSUWAL123
fix: editable vector layer in ol for project creation (#1102)
c03f908 
* 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
fix: limit project area during create (#1109)
da99c41 
* 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
@spwoodcock
fix: use organization_manager table for org admins
0ce89c9
@nrjadkry
Merge pull request #1113 from hotosm/fix/use-org-admin-table
1322cd1 
Use organisation manager table for organisation admins
@NSUWAL123
fix (newProjectDetails): searchInput - width increased (#1111)
8ad3ec1
@NSUWAL123
fix (frontend): projection validity check using coordinates of extent (…
1c5420b 
…#1112)
@spwoodcock
docs: link to docs.hotosm.org for versioning info
ee8f1a8
@spwoodcock
Merge branch 'development' of https://github.com/hotosm/fmtm into dev…
c5b1cad 
…elopment
@spwoodcock
refactor: remove variable from docker install script
670c455
@spwoodcock
ci: add py310 version to black code formatter
e67aeaa
@spwoodcock
docs: add link to pre-commit info in docs
36af459
@spwoodcock
refactor: renaming for consistency with database (#1114)
ed95c47
@spwoodcock
docs: update info about interactive api debugging port
4d7ba07
@spwoodcock
docs: add timestamp to doc pages via plugin
0c01424
@spwoodcock
build: add git-revision-date-localized plugin to docs group
0db23d1
@spwoodcock
ci: docs build use image from gh-workflows
1a9aabc
@spwoodcock
build: upgrade osm-fieldwork-->0.4.1, osm-rawdata-->0.2.6
b0bb274
Fix condition in elif statement for Feature type detection
5704fe1
@nrjadkry
Merge pull request #1119 from hotosm/fix-data-extract
a3b2fc7 
Fix condition in elif statement for Feature type detection
@nrjadkry
Merge pull request #1117 from hotosm/build/upgrade-osm-pkgs
60399ca 
Upgrade osm-fieldwork --> 0.4.1 & fmtm-splitter --> 0.2.6
Sujanadh and others added 18 commits January 23, 2024 16:34
@Sujanadh
feat: paginated submissions per task (#1128)
9a9d728 
* merge development

* feat: paginated submissions by task

---------

Co-authored-by: sujanadh <sujanadh07@gmail.com>
@spwoodcock
fix: Depends usage for task_submissions endpoint
17ae34d
@spwoodcock
build: replace project.private field with project.visibility enum (#1132
0925773 
)

* 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
ci: add sleep 5 for frontend smoke test dev startup
ebb07cd
@spwoodcock
ci: replace black with ruff-format
f3bea80
@spwoodcock
build: update docker install script to handle root user
d72b49f
@spwoodcock
docs: add info about using pyright for type checking
307b8ca
@spwoodcock
ci: add tool.pyright config section to pyproject.toml
35f5c11
@spwoodcock
fix: use optional params for extra AuthUser items
69a1a19
@spwoodcock
refactor: fix return type for organisation url validator
c42af08
@varun2948
feat: added withcredential to include cookies on organization list api
d7f2075
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
fbcbca1 
for more information, see https://pre-commit.ci
@varun2948
Merge pull request #1137 from hotosm/feat-organization-cookie
bb8b2ce 
feature/added withcredential to include cookies on organization list api
@spwoodcock
build: add deployment container replicas and resource constraints (#1139
ecdf41a 
)

* 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
@Sujanadh @spwoodcock
feat: endpoint to return count of validated and mapped tasks (#1138)
c8246ce 
* 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>
@NSUWAL123
feat: add AOI editing to map during project creation (#1135)
b382fde 
* 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
@spwoodcock
refactor(frontend): use absolute (aliased) imports over relative impo…
4c12cc3 
…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
refactor: remove withCredentials from org endpoint (use interceptor)
c8ed194
@spwoodcock spwoodcock self-assigned this Jan 25, 2024
@github-actions github-actions bot added docs Improvements or additions to documentation frontend Related to frontend code backend Related to backend code devops Related to deployment or configuration migration Contains a DB migration contrib External contributions, or not related to core functionality labels Jan 25, 2024
@spwoodcock spwoodcock merged commit 1b9e8d0 into staging Jan 25, 2024
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@spwoodcock spwoodcock

Labels
backend Related to backend code contrib External contributions, or not related to core functionality devops Related to deployment or configuration docs Improvements or additions to documentation frontend Related to frontend code migration Contains a DB migration
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@spwoodcock @NSUWAL123 @nrjadkry @cordovez @Sujanadh @varun2948