Edit sampling site fixes #1279

mauberti-bc · 2024-04-24T23:59:10Z

Links to Jira Tickets

N/A
Fixes the issue where stratums and blocks cannot be added to a sampling site when editing the site

Description of Changes

When a sampling site is edited, the edit page now requests data for that specific sampling site to initialize the formik values
Added .kml support for sampling site location file uploads
Updated tests for sample-location-repository and the sample location GET endpoint
additionalProperties: false is added to the blocks and stratums objects of the sampling site PUT endpoint
Renamed methods and periods properties to sample_methods and sample_periods to help reassign types
Removed references to surveyed_all_areas, a deprecated field
Rearranged survey form files into subdirectories

Testing Notes

Should be able to create and edit a sampling site with blocks and stratums
Should be able to create and edit sampling sites with .kml

…to SIMSBIOHUB-501

Fix issues

codecov-commenter · 2024-04-25T01:09:17Z

Codecov Report

Attention: Patch coverage is 34.97758% with 145 lines in your changes are missing coverage. Please review.

Project coverage is 53.12%. Comparing base (f9a9062) to head (d4cf6ae).

Files	Patch %	Lines
...ites/components/map/SamplingSiteEditMapControl.tsx	0.00%	23 Missing ⚠️
...tions/sampling-sites/edit/SamplingSiteEditPage.tsx	0.00%	15 Missing ⚠️
.../sampling-sites/create/form/SamplingMethodForm.tsx	0.00%	14 Missing ⚠️
api/src/database/db.ts	13.33%	12 Missing and 1 partial ⚠️
.../sampling-sites/edit/form/SampleMethodEditForm.tsx	0.00%	13 Missing ⚠️
...ampling-sites/create/form/SampleSiteCreateForm.tsx	0.00%	8 Missing ⚠️
...s/sampling-strategy/stratums/SurveyStratumForm.tsx	0.00%	7 Missing ⚠️
...s/sampling-sites/edit/form/SamplingStratumForm.tsx	0.00%	7 Missing ⚠️
...urveyId}/sample-site/{surveySampleSiteId}/index.ts	73.91%	5 Missing and 1 partial ⚠️
api/src/repositories/sample-location-repository.ts	53.84%	5 Missing and 1 partial ⚠️
... and 19 more

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #1279      +/-   ##
==========================================
+ Coverage   52.91%   53.12%   +0.20%     
==========================================
  Files         564      562       -2     
  Lines       16441    16432       -9     
  Branches     2561     2552       -9     
==========================================
+ Hits         8700     8729      +29     
+ Misses       7159     7119      -40     
- Partials      582      584       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…espectively

NickPhura · 2024-05-01T21:09:02Z

Getting an error when I try and load the survey page:

(In this case, I'm loading a default survey generated by the seed)

{
  timestamp: '2024-05-01 14:07:55',
  level: 'error',
  logger: 'paths/project/{projectId}/survey/{surveyId}/view',
  label: 'getSurveyForView',
  message: 'error',
  error: Error executing SQL query: SQL response failed schema check
      at new ApiError (/opt/app-root/src/src/errors/api-error.ts:23:13)
      at new ApiExecuteSQLError (/opt/app-root/src/src/errors/api-error.ts:67:5)
      at parseError (/opt/app-root/src/src/database/db-utils.ts:67:11)
      at Object.sql (/opt/app-root/src/src/database/db-utils.ts:39:13)
      at processTicksAndRejections (node:internal/process/task_queues:95:5)
      at async SurveyLocationRepository.getSurveyLocationsData (/opt/app-root/src/src/repositories/survey-location-repository.ts:99:22)
      at async SurveyService.getSurveyById (/opt/app-root/src/src/services/survey-service.ts:83:18)
      at async /opt/app-root/src/src/paths/project/{projectId}/survey/{surveyId}/view.ts:167:26 {
    errors: [
      ZodError: [
        {
          "code": "invalid_type",
          "expected": "object",
          "received": "undefined",
          "path": [
            "rows",
            0,
            "geometry"
          ],
          "message": "Required"
        },
        {
          "code": "invalid_type",
          "expected": "string",
          "received": "undefined",
          "path": [
            "rows",
            0,
            "geography"
          ],
          "message": "Required"
        }
      ]
          at Object.get error [as error] (/opt/app-root/src/node_modules/zod/lib/types.js:55:31)
          at ZodObject.parseAsync (/opt/app-root/src/node_modules/zod/lib/types.js:183:22)
          at processTicksAndRejections (node:internal/process/task_queues:95:5)
          at async Object.sql (/opt/app-root/src/src/database/db-utils.ts:37:14)
          at async SurveyLocationRepository.getSurveyLocationsData (/opt/app-root/src/src/repositories/survey-location-repository.ts:99:22)
          at async SurveyService.getSurveyById (/opt/app-root/src/src/services/survey-service.ts:83:18)
          at async /opt/app-root/src/src/paths/project/{projectId}/survey/{surveyId}/view.ts:167:26 {
        issues: [
          {
            code: 'invalid_type',
            expected: 'object',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          },
          {
            code: 'invalid_type',
            expected: 'string',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          }
        ],
        addIssue: [Function (anonymous)],
        addIssues: [Function (anonymous)],
        errors: [
          {
            code: 'invalid_type',
            expected: 'object',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          },
          {
            code: 'invalid_type',
            expected: 'string',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          }
        ]
      }
    ]
  }
}

mauberti-bc · 2024-05-02T22:30:09Z

Getting an error when I try and load the survey page:

(In this case, I'm loading a default survey generated by the seed)

{
  timestamp: '2024-05-01 14:07:55',
  level: 'error',
  logger: 'paths/project/{projectId}/survey/{surveyId}/view',
  label: 'getSurveyForView',
  message: 'error',
  error: Error executing SQL query: SQL response failed schema check
      at new ApiError (/opt/app-root/src/src/errors/api-error.ts:23:13)
      at new ApiExecuteSQLError (/opt/app-root/src/src/errors/api-error.ts:67:5)
      at parseError (/opt/app-root/src/src/database/db-utils.ts:67:11)
      at Object.sql (/opt/app-root/src/src/database/db-utils.ts:39:13)
      at processTicksAndRejections (node:internal/process/task_queues:95:5)
      at async SurveyLocationRepository.getSurveyLocationsData (/opt/app-root/src/src/repositories/survey-location-repository.ts:99:22)
      at async SurveyService.getSurveyById (/opt/app-root/src/src/services/survey-service.ts:83:18)
      at async /opt/app-root/src/src/paths/project/{projectId}/survey/{surveyId}/view.ts:167:26 {
    errors: [
      ZodError: [
        {
          "code": "invalid_type",
          "expected": "object",
          "received": "undefined",
          "path": [
            "rows",
            0,
            "geometry"
          ],
          "message": "Required"
        },
        {
          "code": "invalid_type",
          "expected": "string",
          "received": "undefined",
          "path": [
            "rows",
            0,
            "geography"
          ],
          "message": "Required"
        }
      ]
          at Object.get error [as error] (/opt/app-root/src/node_modules/zod/lib/types.js:55:31)
          at ZodObject.parseAsync (/opt/app-root/src/node_modules/zod/lib/types.js:183:22)
          at processTicksAndRejections (node:internal/process/task_queues:95:5)
          at async Object.sql (/opt/app-root/src/src/database/db-utils.ts:37:14)
          at async SurveyLocationRepository.getSurveyLocationsData (/opt/app-root/src/src/repositories/survey-location-repository.ts:99:22)
          at async SurveyService.getSurveyById (/opt/app-root/src/src/services/survey-service.ts:83:18)
          at async /opt/app-root/src/src/paths/project/{projectId}/survey/{surveyId}/view.ts:167:26 {
        issues: [
          {
            code: 'invalid_type',
            expected: 'object',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          },
          {
            code: 'invalid_type',
            expected: 'string',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          }
        ],
        addIssue: [Function (anonymous)],
        addIssues: [Function (anonymous)],
        errors: [
          {
            code: 'invalid_type',
            expected: 'object',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          },
          {
            code: 'invalid_type',
            expected: 'string',
            received: 'undefined',
            path: [Array],
            message: 'Required'
          }
        ]
      }
    ]
  }
}

Fixed

Fix various endpoints and type definitions to match actual responses. Misc tweaks/updates/cleanup.

sonarqubecloud · 2024-05-07T18:38:52Z

Quality Gate failed

Failed conditions
13.3% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

NickPhura and others added 30 commits April 5, 2024 15:53

Initial working observation import against sampling period

2eba603

Add better loading/disabled handlers

b1b0079

Merge remote-tracking branch 'origin/dev' into SIMSBIOHUB-501

f9a4999

Add Knip and SWC

5545b77

Update import observations

bf0c063

Remove console logs

f3572c7

Remove swc from API to fix unit tests

3ffe5b5

Remove knip

16d7f10

Remove gulp

303288d

Update lock

fe9538c

Merge remote-tracking branch 'origin/dev' into SIMSBIOHUB-501

b88fe37

standards page and api service

7b66813

Merge branch 'dev' into SIMSBIOHUB-501

72b5c65

Merge branch 'SIMSBIOHUB-501' of https://github.com/bcgov/biohubbc in…

8da65db

…to SIMSBIOHUB-501

Add unit tests. fix spelling

e384884

Add tests

84dc2e0

update standards page

a270322

standards endpoint and service tests

83853b3

finish unit tests

17538dd

linter

df37d81

add standards to hamburger menu for smaller screens

0049685

fix openapi spec

4611339

linter

3770df6

Fix prettier (bump eslint/prettier versions)

33fd406

Update .eslintrc

87cfc71

Update .eslintrc

485745e

Fix issues

re-run install

1da9a3f

Merge branch 'dev' into npTechDebt

9ceba80

Merge remote-tracking branch 'origin/npTechDebt' into taxon-standards

00bb321

prettier changes & node update

58dfa30

mauberti-bc added 2 commits April 24, 2024 18:04

refactor survey folder subdirectories

74c5dea

prettier

5969b81

mauberti-bc added 11 commits April 24, 2024 18:32

fix file paths in tests

555703e

merge in dev

ad2c5b2

replace sample_blocks and sample_stratums with blocks and stratums, r…

24a6d72

…espectively

remove extra fields from project details response

3d1dded

prettier

0c541ab

re-remove surveyed_areas_all

26d3f3c

prettier

2e32c81

merge in remote

faa2c80

update openapi sec

7b7282e

update tests

1f08446

fix sonarcloud alert

cd6f3bc

mauberti-bc requested review from NickPhura and MacQSL April 30, 2024 21:24

mauberti-bc added Ready For Review PR is ready for review and removed Early Feedback Welcome PR is not finished, but early review feedback is welcomed labels Apr 30, 2024

additionalproperties: false

e58362f

NickPhura and others added 2 commits May 1, 2024 17:48

Merge remote-tracking branch 'origin/dev' into sample-site-req

5a6498f

kml support

06f3792

NickPhura added 3 commits May 3, 2024 23:04

Refactor database zod schema validation. Now strict.

bdbc304

Fix various endpoints and type definitions to match actual responses. Misc tweaks/updates/cleanup.

Fix strict zod issues.

ee622ca

Fix test

d4cf6ae

NickPhura approved these changes May 7, 2024

View reviewed changes

NickPhura merged commit 7ce3576 into dev May 7, 2024
17 of 19 checks passed

NickPhura deleted the sample-site-req branch May 7, 2024 19:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Edit sampling site fixes #1279

Edit sampling site fixes #1279

mauberti-bc commented Apr 24, 2024 •

edited

Loading

codecov-commenter commented Apr 25, 2024 •

edited by codecov bot

Loading

NickPhura commented May 1, 2024 •

edited

Loading

mauberti-bc commented May 2, 2024

sonarqubecloud bot commented May 7, 2024

Edit sampling site fixes #1279

Edit sampling site fixes #1279

Conversation

mauberti-bc commented Apr 24, 2024 • edited Loading

Links to Jira Tickets

Description of Changes

Testing Notes

codecov-commenter commented Apr 25, 2024 • edited by codecov bot Loading

Codecov Report

NickPhura commented May 1, 2024 • edited Loading

mauberti-bc commented May 2, 2024

sonarqubecloud bot commented May 7, 2024

Quality Gate failed

mauberti-bc commented Apr 24, 2024 •

edited

Loading

codecov-commenter commented Apr 25, 2024 •

edited by codecov bot

Loading

NickPhura commented May 1, 2024 •

edited

Loading