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

Merge Development --> Staging #1526

Merged
merged 103 commits into from
May 17, 2024
Merged

Merge Development --> Staging #1526

merged 103 commits into from
May 17, 2024

Conversation

Sujanadh
Copy link
Collaborator

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

  • πŸ• Feature
  • πŸ› Bug Fix
  • πŸ“ Documentation
  • πŸ§‘β€πŸ’» Refactor
  • βœ… Test
  • πŸ€– Build or CI
  • ❓ Other (please specify)

Related Issue

N/A

Describe this PR

This PR takes all the changes from development to staging.

Screenshots

Please provide screenshots of the change.

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?

NSUWAL123 and others added 30 commits March 29, 2024 13:19
* feat formUpdateTab: form validation api add

* fix projectDetails: toggle debug console btn replaced with checkbox

* fix project: consoles remove
…ut (#1404)

* feat select: required mark add

* feat projectDetailsForm: organization name select field required

* fix projectDetailsForm: display odk fields if no odk-credentials

* feat textArea: character length limit & current character length display in textArea

* feat projectDescription: short description character length limit set to 200 characters
Co-authored-by: sujanadh <sujanadh07@gmail.com>
* feat useDocumentTitle - hook to dynamically set document title

* feat documentTitle: document title add across all pages

* feat projectDetails: dynamic project name display on document title
Co-authored-by: sujanadh <sujanadh07@gmail.com>
…history (#1419)

Co-authored-by: sujanadh <sujanadh07@gmail.com>
* refactor: response of update task status and added user info in task history

* fix: return task history instead of db task

---------

Co-authored-by: sujanadh <sujanadh07@gmail.com>
* fix: edit project name

* feat: calculate prefix name in partial update schema

---------

Co-authored-by: sujanadh <sujanadh07@gmail.com>
Co-authored-by: sujanadh <sujanadh07@gmail.com>
* feat: add route to convert geojson --> odk csv format

* build: add public.xforms table for future multiple form per project

* build: update osm-fieldwork --> 0.6.1 for entities support

* feat: refactor project creation to use entities

* refactor: features and submission counts per task

* refactor: support all geometry type for javarosa geom and add state in nominatim

* refactor: added project_id as a foreign key to xforms table

* build: relock dependencies after merge

* feat: add helper route to convery odk submission json --> geojson

* fix: rename DbXForm.form_id --> odk_form_id

* feat: add javarosa_to_geojson_geom conversion func

* build: rename form_id --> odk_form_id in db

* feat: load odk collect with entity prefilled by intent link

* refactor: run pre-commit hooks formatting

* build: add migration to set odk_token on project, not per task

* fix: frontend

build qrcode based on project, not task

* refactor: remove generating project log (as performance improvements)

* feat: helper route to convert javarosa geom --> geojson

* build: update osm-fieldwork --> 0.7.0

* fix: working entity generation during project creation

* test: fix test for project creation flow

* fix: foreign key refernce for DbXForm to project_id

---------

Co-authored-by: sujanadh <sujanadh07@gmail.com>
Co-authored-by: sujanadh <sujanadh07@gmail.com>
* fix: add favicon.ico to public frontend dir

* fix: make ENCRYPTION_KEY variable mandatory for settings

* docs: update project description

* build: add basic helm chart for deployment
* feat: Playwright integration

* [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 others added 20 commits April 26, 2024 18:02
…1493)

* fix(Modal): zIndex fix

* feat(projectDetailsV2): fetch /task-completion api on project page

* feat(dialogTaskActions): task mapped confirmation prompt if features not fully mapped

* [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>
…1496)

* feat: otel work in progress

* build: relock dependencies after otel rebase

* feat: add optional monitoring config (openobserve or sentry)

* docs: add SENTRY_DSN optional env var to example .env

* build: add sentry[opentelemetry] dependencies to monitoring group

* build: relock backend dependencies after rebase to development

* fix(backend): invalid use of WKBElement in pydantic model

* ci: upgrade all workflows --> 1.5.1 for WITH_MONITORING var img build

* docs: info on WITH_MONITORING api img build arg

* feat: working sentry opentelemetry optional instrumentation

* docs: add info for using the monitoring setup (sentry)

* docs: remove demo/testing broken routes for monitoring

* fix: linting error for not equal evaluation

* docs: set default .env.example MONITORING empty var

* fix(backend): allow passing MONITORING="" for empty config var
* feat(getTaskStatusSyle): getFeatureStatusStyle function add to colorize each building according to feature map status

* feat(projectDetailsV2): getFeatureStatusStyle function call to set style of each feature

* refactor(projectDetailsV2): remove unused variables
* fix(backend): add logo to s3 for fmtm beta organisation init

* fix(backend): add organisation_logo field to returned project info

* fix(frontend): replace project_dashboard call on project details page

* refactor: remove task-completion endpoint

* fix(backend): add task_id to entity statuses by default

* fix(backend): simplify central schemas for entities

* fix(backend): fix submission_form_fields endpoint (use xform uuid)

* refactor(frontend): simplify getting project submission data from entities

* fix(frontend): replace missed task_priority_str --> task_status
* refactor: submission table, submission details, review state and filtering

* frontend_fix: updated end point and task id param

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

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

* fix: pre-commit fail

* refactor: removed unnecessary brackets

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* fix(customDrawer/primaryAppBar): replace img_url key with profile_img key to display profile picture

* fix(taskSubmissionMap): replace comparision with taskId with task index

* fix(submissionDetails): replace decodedProjectId with projectId

* fix(submissionDetails): replace decodedProjectId with projectId & show recieved status by defualt if no reviewState

* fix(projectSubmissions): statuses endpoint fetch to display taskList and display taskList options

* fix(taskSubmission): replace uid with fid

* fix(taskSelectionPopup): use task index instead of taskId

* fix(dialogTaskActions): use taskId instead of task index on api fetch, post

* fix(activitiesPanel): zoom to task using taskIndex
* fix(customDrawer/primaryAppBar): replace img_url key with profile_img key to display profile picture

* fix(taskSubmissionMap): replace comparision with taskId with task index

* fix(submissionDetails): replace decodedProjectId with projectId

* fix(submissionDetails): replace decodedProjectId with projectId & show recieved status by defualt if no reviewState

* fix(projectSubmissions): statuses endpoint fetch to display taskList and display taskList options

* fix(taskSubmission): replace uid with fid

* fix(projectDetailsV2): order taskHistory tab to first & defult show taskHistory tab on task click

* fix(taskSelectionPopup): use task index instead of taskId

* fix(dialogTaskActions): use taskId instead of task index on api fetch, post

* fix(activitiesPanel): zoom to task using taskIndex

* fix(projectModel): add index type to taskBoudriesTypes

* fix(comments): use taskId instead of index for get & post api
* feat(projectSlice): action and state to track submission download loading

* feat(project): DownloadSubmission geojson service to download geojson

* feat(projectDetailsV2): pass project name to projectOptions component as props

* feat(projectOptions): submission geojson download button & functionality add
* fix(projectSubmissions): csv & json download fix according to api

* fix(projectSubmissions): add project name as file name
* build: bump version string --> 2024.0.2 to prep for next release

* bump: version 2024.2.0 β†’ 2024.3.0

* fix(hotfix): use centroids for extract division by task area (#1336)

* fix: fix random integer generation if missing in data extract

* fix: reduce length of random id generated for data extract

* fix: hotfix add top level id to geojson with it missing

* fix: default UNDERPASS_API_URL no trailing slash

* build: revert v2024.3.0 --> v2024.1.0

* bump: version 2024.1.0 β†’ 2024.2.0

---------

Co-authored-by: spwoodcock <sam.woodcock@protonmail.com>
Co-authored-by: Sam <78538841+spwoodcock@users.noreply.github.com>
@github-actions github-actions bot added documentation Improvements or additions to documentation frontend backend devops migration Contains a DB migration contrib External contributions, or not related to core functionality labels May 17, 2024
@Sujanadh Sujanadh changed the title Development --> Staging Merge Development --> Staging May 17, 2024
@Sujanadh Sujanadh merged commit 89a423c into staging May 17, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend contrib External contributions, or not related to core functionality devops documentation Improvements or additions to documentation frontend migration Contains a DB migration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants