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

Merge dev --> staging 12/02/2024 #1267

Merged
merged 131 commits into from
Feb 23, 2024
Merged

Merge dev --> staging 12/02/2024 #1267

merged 131 commits into from
Feb 23, 2024

Conversation

spwoodcock
Copy link
Member

What type of PR is this? (check all applicable)

  • 🍕 Feature
  • 🐛 Bug Fix
  • 📝 Documentation Update
  • 🎨 Style
  • 🧑‍💻 Code Refactor
  • 🔥 Performance Improvements
  • ✅ Test
  • 🤖 Build
  • 🔁 CI
  • 📦 Chore (Release)
  • ⏩ Revert

Describe this PR

  • Trying to get back on track with regular staging releases after the public beta.
  • This will apply all migrations before they are removed from the build image.
  • The prod deploy will rely on the base schema file.

Checklist before requesting a review

[optional] What gif best describes this PR or how it makes you feel?

NSUWAL123 and others added 30 commits January 31, 2024 16:47
@NSUWAL123 @pre-commit-ci
feat: project submissions page (#1150)
7e43cdd 
* fix (routes): projectSubmissions route added

* fix (icon): icon added

* fix (projectSubmissions): setup

* fix (projectSubmissions): styling adjustments

* feat (projectSubmissions): projectInfo section slicing

* feat (AssetModules): icon added

* feat (taskSubmissions): taskSection - UI slicing

* fix (projectSubmissions): UI fixes

* feat (AssetModules): icons added

* feat (select): className added to select

* feat (projectSubmission): submissionsTable - filter section UI completed

* feat: (AssetModules): icons added

* fix (routes): normal import for projectSubmissions

* feat (customTable): custom table added

* feat (submissionsPage): table added to submission page

* fix (taskSubmissions): mobile responsive

* feat (recharts): recharts package added

* icon added

* feat (recharts): bar & pie chart added

* feat (LineChart): lineChart added

* feat (ProjectSubmissions): infographics - infographics slicing

* feat (package): html2canvas package added

* feat (submissionsPage): chartDownload - download feature added to the charts

* fix (lineChart): line color changed

* fix (UI): UI changes

* fix (barChart): dynamic data for barChart

* fix (pieChart): dynamic data for pieChart

* fix (barChart): dynamic dataKey for xAxis

* fix (lineChart): dynamic data for lineChart

* fix (chart): bar/pie color changed

* fix (lineChart): x & y axis labels added

* feat (projectSubmissions): skeleton loader added

* fix (projectSubmissions): filter padding increase

* feat (projectSubmissions): skeletonLoader - skeletonLoader added to infographics and table

* created api that returns the submission count by date

* fix (projectSubmissions): infographicsCard - infographicsCard seperated to another component

* feat (projectSubmissions): barChart - api fetch for formSubmissions

* refactored response

* feat: (projectSubmissions): submissionBar - dummy data replaced with actual data

* fix (barChart): maxBarSize set

* feat (projectSubmissions): task api call

* feat (projectSubmissions): projectInfo - dynamic value for projTitle, tasks count, submission count

* feat (projectSubmissions): taskSidebar - dynamic data added

* feat (projectSubmissions): taskSidebar - zoomToTask feature added

* Created Project dashboard

* added organization info

* Exception handling in s3 if no object found

* refactor

* fix: string based date to custom date format for over 7days

* feat (projectSubmissions): contributorsTable - contributors table data fetch

* fix (projectSubmissions): UI fix

* fix (assetModules): duplicated icon removed

* feat (projectSubmissions): projectInfo - api integration

* fix (projectSubmissions): piechart - outerRadius adjusted

* fix (projectSubmissions): message display if no data available

* feat (projectSubmissions): taskLoading - skeleton loader added for tasks

* fix (projectSubmissions): filter - UI fix

* feat submissionsTable: api fetch for submissionsTable field & data

* feat projectSubmissionsTable: dynamic header & data add with skeleton loader

* fix projectSubmissions: relative path imports replaced with absolute path imports

* feat projectSubmissionsTable: refresh table data functionality add

* fix import: wrong validation import fix

* feat submissionTable: mui tablePagination added

* fix projectSubmissions: pagination api fetch

* fix createProjectSlice: import fix

* fix projectSubmissions: types added to slice

* fix projectSubmissions: loading state to false if error arise in table api fetch

* fix projectSubmissions: pagination disable on api fetch pending

* fix select: optional type of null to value, errorMsg optional

* fix projectSubmissions: table filter state added

* fix lineChart: line color changed, xLabel & yLabel hidden if not present

* fix projectSubmissions: validated vs mapped task lineChart add

* fix bar/pieChart - color updated

* fix projectSubmissions: redirection to submissionsPage on View Submissions click

* fix projectSubmissions: loading state add on projectProgress api fetch

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

for more information, see https://pre-commit.ci

---------

Co-authored-by: sujanadh <sujanadh07@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@NSUWAL123
fix loadingBar: loading bar moved to & imported from createnewproject…
7d89e8e 
… folder
@NSUWAL123
refactor createproject: old createProject folder deleted
d1d9eb2
@NSUWAL123
refactor routes: removed import & removed old commented createproject…
4dc8a27 
… routes
@varun2948
Merge pull request #1155 from NSUWAL123/cleanup-delete-old-create-pro…
4fec980 
…ject

Cleanup delete old create project
@spwoodcock
docs: add docs and task board badges to README
a177bf6
@spwoodcock
docs: update docs/task board badges to track development
5ef1914
@NSUWAL123
fix: project creation draw and max boundary area (#1157)
f0ea999 
* fix uploadArea: areaValidation for fileUpload, draw hide if selectionType uploadFile, draw available if AOI reset

* fix stepSwitcher: remove cursor-pointer on step hover

* fix projctDetails: link to setting ODK server placed on Here text
@spwoodcock
refactor: add extra error handling if data extract download fails (#1158
154c660 
)

* fix: downloading data extract accessing download_url key

* add error log if data extract download fails
@NSUWAL123
fix: project submission date and time formatted (#1160)
f467b8c
@NSUWAL123
fix button: other btnType UI change
ead6e2f
@NSUWAL123
fix useOutsideClick: useOutsideClick hook add
3a7ad30
@NSUWAL123
feat projectDetails: buttons added including handleOutsideClick
1bc9b89
@NSUWAL123
feat projectOptions: options added for larger screens
d734424
@NSUWAL123
fix projectDetails: redirect to projectSubmissions page on viewInfogr…
53f4297 
…aphics click
@NSUWAL123
Merge branch 'development' of github.com:hotosm/fmtm into fix-project…
54a1bad 
…-details-ui-additions
@spwoodcock
fix: zlib compress dynamic QR codes from frontend (#1159)
a34c8c0 
* build(frontend): add pako for zlib compression, relock via pnpm

* fix(frontend): add zlib compression to dynamic qrcodes

* fix: zlib compression for qrcodes pako v2 (Uint8Array)

* build: add qrcode conversion container to contrib
@spwoodcock
fix(frontend): remove svcfmtm from loginSlice initialState
711551b
@spwoodcock
fix(backend): append /v1/ to odk_token url for qrcodes
01b1caf
@spwoodcock
fix: map default odk credentials to organisations (#1123)
9654218 
* fix: add odk cred org schemas for db and pydantic

* fix: add HttpUrlStr type for Url validation of str values

* fix: fix OdkCentral schema to handle passwords, inherit

* refactor: use new ODKCentralDecrypted, simplify proj create

* fix: add org_deps get_org_odk_creds method

* refactor(frontend): update create_project json structure

* refactor(frontend): remove code to add #FMTM tag automatically

* test: fix project route tests

* refactor: revert setting outline_geojson in create_app_project

* feat(frontend): option to add default odk creds for organisation

* refactor(frontend): rename form during project creation --> category

* refactor: remove additional route added during rebase
@spwoodcock
feat: set project delete endpoint to org_admin only
689a873
@spwoodcock
feat(frontend): project deletion capability
81cd778
@NSUWAL123
fix: organisation logo display full width (#1166)
304863e 
* fix homePage: exploreProjectCard image crop fix

* fix splitTasks: text below progressBar remove
@spwoodcock
fix: create popup outside of async request (fix ios login) (#1167)
03d2c7b
@varun2948
Merge pull request #1162 from NSUWAL123/fix-project-details-ui-additions
61de9dc 
Fix project details UI additions
@varun2948
fix: baselayer url changed with token
eb91100
@varun2948
Merge branch 'development' of github.com:hotosm/fmtm into development
1007392
@varun2948
Merge pull request #1168 from hotosm/feat/frontend-delete-proj
c8bd552 
Project deletion via frontend
@nrjadkry @pre-commit-ci @spwoodcock
feat: project admin role (#1133)
4cbec25 
* project_admin role deps

* fix: default value for role in user_role table

* feat: api to create new project manager

* fix: linting errors

* fix: linting errors

* delete projects endpoint restricted for organisation admin only

* fix:linting errors

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

for more information, see https://pre-commit.ci

* add new project admin allowed to project admin role

* updated project admin role deps

* feat: dependency org_admin to create project

* feat: implemented access to project_admin to edit the project

* feat: applied user dependency as per the requirement

* project_admin role deps

* fix: default value for role in user_role table

* feat: api to create new project manager

* fix: linting errors

* fix: linting errors

* delete projects endpoint restricted for organisation admin only

* fix:linting errors

* add new project admin allowed to project admin role

* updated project admin role deps

* feat: dependency org_admin to create project

* feat: implemented access to project_admin to edit the project

* feat: applied user dependency as per the requirement

* update and refactor: user roles

* refactor: simplify role access, combine into single query

* refactor: update usage of roles, org_admin return dict of objects

* fix: update project manager role usage

* perf: add db indexes for org managers and user roles

* dependency removed from validate_form endpoint

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

for more information, see https://pre-commit.ci

* test: fix create_project pass url param

* fix: add role for DEBUG enabled user

* fix(frontend): pass org_id as url param to create_project

* test: create test user account as ADMIN permission

* fix: separate login logic from /me/ route

* test: fix tests requiring auth permissions

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: sujanadh <sujanadh07@gmail.com>
Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
Co-authored-by: Sam <78538841+spwoodcock@users.noreply.github.com>
@spwoodcock
fix: organisation routes role usage & approval
d893605
spwoodcock and others added 16 commits February 22, 2024 18:37
@spwoodcock
fix: comment broken SubmissionMap import on frontend
ff32c52
@Sujanadh
refactor: changed sync to async gather_all_submission_csvs (#1258)
3212ba4 
Co-authored-by: sujanadh <sujanadh07@gmail.com>
@Prajwalism
feat(manage-organizations): add OrganizationCardSkeleton component
67986f0
@Prajwalism
feat(manage-organisations): implement skeleton loader while Organizat…
877fc68 
…ions are being fetched
@Prajwalism
refactor: reorganize the code to make it cleaner
7e5ea37
@NSUWAL123
fix: send bbox from geojson properties to josm (#1256)
cfb8a76
@varun2948
Merge pull request #1260 from hotosm/feat(manage-organizations)/imple…
e29a00b 
…ment-skeleton-while-loading

Feat(manage organizations)/implement skeleton while loading
@spwoodcock
build: upgrade osm-rawdata --> 0.2.3 & relock all versions
cfdc030
@NSUWAL123
fix: file validity check on fileUpload only once (#1262)
a370631
@spwoodcock
fix: use raw sql for organisation crud (#1253)
51ae6a2
@spwoodcock
fix: update initial_feature_count --> feature_count and populate valu…
28f0ac0 
…es (#1265)

* build: rename tasks.initial_feature_count --> tasks.feature_count

* refactor: rename initial_feauture_count in endpoints
@NSUWAL123 @pre-commit-ci
fix: dynamic submissions legend chloropeth (#1250)
98fcf58 
* fix projectSubmissions: dynamic mapLegend and taskChloropeth on increasing submissions count

* feat projectSubmissionsMap: popup showing expected/submissions count add

* fix homeSCSS: width fix

* fix popupHeader: border fix

* [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>
@Sujanadh
refactor: removing redundant code for removing extra closing </osm> t…
0a3de42 
…ag (#1264)

Co-authored-by: sujanadh <sujanadh07@gmail.com>
@spwoodcock
fix: task splitting with custom data extract (#1255)
55bfdf5 
* fix: handle GeometryCollection wrappers in geojson parse

* fix: task splitting when custom data extract uploaded
@spwoodcock
feat: add map popups to data extract geometries (#1266)
1c9a541 
* refactor: always return all properties on map click

* refactor: rename submissionModel --> taskModel

* refactor: configurable primary property key for map AsyncPopup

* feat: add map popup on data extract geom click
@spwoodcock
build: make initial_feature_count migration idempotent
f9449c7
@spwoodcock spwoodcock self-assigned this Feb 23, 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 Feb 23, 2024
@spwoodcock spwoodcock merged commit 951dd58 into staging Feb 23, 2024
18 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 @varun2948 @nrjadkry @Sujanadh @Prajwalism