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

SIMSBIOHUB-466: Add Observation Measurement Columns #1213

Merged
merged 109 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
2c1a559
Initial commit
NickPhura Feb 3, 2024
5702265
WIP
NickPhura Feb 5, 2024
33b697a
Working autocomplete list
NickPhura Feb 5, 2024
06e7dc6
Rename/move components, add jsdoc
NickPhura Feb 5, 2024
09b9149
Tweaks
NickPhura Feb 5, 2024
8ca8da9
Add critterbase proxy
NickPhura Feb 7, 2024
697d2a9
Initial code to add measurement columns to observation table
NickPhura Feb 7, 2024
2ccb3a7
Fix react warnings
NickPhura Feb 7, 2024
6be290f
Move col defs to separate file
NickPhura Feb 7, 2024
d85bfbd
Add qual/quan measurement col defs
NickPhura Feb 7, 2024
71a91db
Add hasError to observations table context
NickPhura Feb 7, 2024
2476970
Update apiRefs to use api exposed through datagrid params
NickPhura Feb 7, 2024
4ea3008
Cleanup measurement type
NickPhura Feb 7, 2024
0fbbe81
Merge branch 'dev' into SIMSBIOHUB-466
al-rosenthal Feb 7, 2024
d75b418
Updating Menu for Column Configuration
jeznorth Feb 9, 2024
7206465
basic version working
al-rosenthal Feb 9, 2024
85ad6af
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
al-rosenthal Feb 9, 2024
9096f1e
added new attribute types to front end
al-rosenthal Feb 9, 2024
7b330f2
UI Updates
jeznorth Feb 9, 2024
d08129d
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
jeznorth Feb 9, 2024
9c27713
Update frontend to start sending measurement data to backend
NickPhura Feb 9, 2024
a3228a7
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
NickPhura Feb 9, 2024
2852ff3
stubbed out basic critter base call
al-rosenthal Feb 9, 2024
50a835b
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
al-rosenthal Feb 9, 2024
0ec9d24
Fix/patch a bunch of react dependency warnings. Rename additional col…
NickPhura Feb 10, 2024
34147a4
Updating Table Pagination Options
jeznorth Feb 12, 2024
bed1944
continued work with inserting attributes
al-rosenthal Feb 12, 2024
34aa89b
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
al-rosenthal Feb 12, 2024
67360d0
remove isLoading from taxonomy context
NickPhura Feb 12, 2024
d9bbb92
Comment more dependency warnings
NickPhura Feb 12, 2024
5e862d1
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
NickPhura Feb 12, 2024
c4f9004
Format
NickPhura Feb 12, 2024
d213422
Fix more warnings
NickPhura Feb 12, 2024
7147ded
Fix bad tsconfig
NickPhura Feb 12, 2024
80d625a
Fix saving existing observation rows
NickPhura Feb 12, 2024
e85eed4
added basic steps for adding new subcount rows
al-rosenthal Feb 13, 2024
3babd40
fixed up function
al-rosenthal Feb 13, 2024
5fa2997
added some helper functions for system user to db connection
al-rosenthal Feb 13, 2024
797f32f
Componentizing observation table pieces
NickPhura Feb 13, 2024
f729dab
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
NickPhura Feb 13, 2024
5691455
Fix dependency warning
NickPhura Feb 13, 2024
32a6f16
measurement columns added to supplementary data
al-rosenthal Feb 13, 2024
a993011
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
al-rosenthal Feb 13, 2024
e670821
Fixing species name rendering
jeznorth Feb 13, 2024
be2e777
fixed issue with delete
al-rosenthal Feb 13, 2024
6eb5d7d
added some documentation
al-rosenthal Feb 13, 2024
05a1f97
added interfaces, updated function names
al-rosenthal Feb 13, 2024
e1333f3
oops
al-rosenthal Feb 13, 2024
c7c6fc9
oops again
al-rosenthal Feb 13, 2024
0ded3a5
Updates to the observation table components
NickPhura Feb 14, 2024
d437c56
Upgrade mui data grid to latest
NickPhura Feb 15, 2024
767e74a
Disable measurement add/remove when in edit mode
NickPhura Feb 15, 2024
2b14472
Merge remote-tracking branch 'origin/dev' into SIMSBIOHUB-466
NickPhura Feb 15, 2024
d942f1b
Update critterbase proxy
NickPhura Feb 15, 2024
9e7805a
Merge fixes
NickPhura Feb 15, 2024
fe17544
Disable add measurements when rows in edit mode
NickPhura Feb 15, 2024
d566484
Update critterbase proxy error handling
NickPhura Feb 15, 2024
4a9e275
added actual critter base call
al-rosenthal Feb 15, 2024
9260013
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
al-rosenthal Feb 15, 2024
70e8dcb
frontend updates
NickPhura Feb 16, 2024
e006976
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
NickPhura Feb 16, 2024
ab46af5
added sub count to seed
al-rosenthal Feb 16, 2024
b3d596e
Fix column hiding, and row saving
NickPhura Feb 16, 2024
2a32711
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
NickPhura Feb 16, 2024
2b543a0
Fix toggle all session Storage. Rename context. Debugging save issue.
NickPhura Feb 16, 2024
26afdcc
updated to account for sub counts
al-rosenthal Feb 16, 2024
031a93c
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
al-rosenthal Feb 16, 2024
f743a1a
added subcount to standard columns
al-rosenthal Feb 16, 2024
2863f1c
Fix saving observation rows
NickPhura Feb 16, 2024
de93c84
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
NickPhura Feb 16, 2024
32e8749
Tweaks
NickPhura Feb 16, 2024
2dff483
fixed open api, added documentation
al-rosenthal Feb 17, 2024
eb85457
Fix observation saving
NickPhura Feb 20, 2024
d0bad75
fixing tests
al-rosenthal Feb 20, 2024
d3d4f43
fixed broken tests for observation index
al-rosenthal Feb 20, 2024
bcf859c
Merge branch 'SIMSBIOHUB-466' of https://github.com/bcgov/biohubbc in…
al-rosenthal Feb 20, 2024
54d9632
fixed more tests
al-rosenthal Feb 20, 2024
b82471f
Merge remote-tracking branch 'origin/dev' into SIMSBIOHUB-466
NickPhura Feb 20, 2024
4e912d3
Update/tighten openapi specs
NickPhura Feb 20, 2024
f208a8e
Fix merge issue
NickPhura Feb 20, 2024
94515e5
fixed delete
al-rosenthal Feb 21, 2024
7c2e112
Updates
NickPhura Feb 22, 2024
27511fe
fixed insert and deletes
al-rosenthal Feb 22, 2024
0a808cc
Tweaks
NickPhura Feb 23, 2024
cdcdf95
Fix delete, remove unnecessary observation refresh
NickPhura Feb 23, 2024
bb1c307
MOve grid col defs to folder
NickPhura Feb 23, 2024
76bcdaa
Fixes
NickPhura Feb 23, 2024
ad73df4
Merge remote-tracking branch 'origin/dev' into SIMSBIOHUB-466
NickPhura Feb 23, 2024
1760fb2
Fix seed
NickPhura Feb 24, 2024
01e6891
Tweaks
NickPhura Feb 24, 2024
4ab044f
Fix observation save openapi spec
NickPhura Feb 24, 2024
3388bfd
Merge remote-tracking branch 'origin/dev' into SIMSBIOHUB-466
NickPhura Feb 24, 2024
31c8aa8
Fix tests (comment out some problematic app tests for now).
NickPhura Feb 26, 2024
62e25b2
Fix test
NickPhura Feb 26, 2024
dcd2ee7
Fix axios test
NickPhura Feb 26, 2024
b7cd024
ignore-skip
NickPhura Feb 26, 2024
cbe2440
Address some code smells
NickPhura Feb 26, 2024
e7517e5
Fix observations column visibility toggle
NickPhura Feb 27, 2024
85308d4
code review updates
NickPhura Feb 27, 2024
074afcb
Code review fixes
NickPhura Feb 27, 2024
f937842
Update endpoint number to integer
NickPhura Feb 27, 2024
0ed68bd
Fix test
NickPhura Feb 28, 2024
735d9d5
Add missing pipeline env var
NickPhura Feb 28, 2024
f224b8f
Fix row modes bug
NickPhura Feb 28, 2024
e0ab7a3
Code review fixes
NickPhura Feb 29, 2024
d1ce3a1
Merge remote-tracking branch 'origin/dev' into SIMSBIOHUB-466
NickPhura Feb 29, 2024
63af389
Remove manual rowModes set
NickPhura Feb 29, 2024
8c89ed8
fix row modes issue when discarding
NickPhura Feb 29, 2024
1e11eda
Merge branch 'dev' into SIMSBIOHUB-466
al-rosenthal Feb 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion api/.pipeline/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ const phases = {
backbonePublicApiHost: 'https://api-dev-biohub-platform.apps.silver.devops.gov.bc.ca',
backboneIntakePath: '/api/dwc/submission/queue',
backboneArtifactIntakePath: '/api/artifact/intake',
biohubTaxonPath: '/api/taxonomy/taxon',
biohubTaxonTsnPath: '/api/taxonomy/taxon/tsn',
backboneIntakeEnabled: false,
bctwApiHost: 'https://moe-bctw-api-dev.apps.silver.devops.gov.bc.ca',
Expand Down Expand Up @@ -115,6 +116,7 @@ const phases = {
backbonePublicApiHost: 'https://api-test-biohub-platform.apps.silver.devops.gov.bc.ca',
backboneIntakePath: '/api/dwc/submission/queue',
backboneArtifactIntakePath: '/api/artifact/intake',
biohubTaxonPath: '/api/taxonomy/taxon',
biohubTaxonTsnPath: '/api/taxonomy/taxon/tsn',
backboneIntakeEnabled: false,
bctwApiHost: 'https://moe-bctw-api-test.apps.silver.devops.gov.bc.ca',
Expand All @@ -123,7 +125,7 @@ const phases = {
s3KeyPrefix: 'sims',
tz: config.timezone.api,
sso: config.sso.test,
logLevel: 'info',
logLevel: (isStaticDeployment && 'info') || 'debug',
nodeOptions: '--max_old_space_size=2250', // 75% of memoryLimit (bytes)
cpuRequest: '50m',
cpuLimit: '1000m',
Expand All @@ -148,6 +150,7 @@ const phases = {
backbonePublicApiHost: 'https://api-biohub-platform.apps.silver.devops.gov.bc.ca',
backboneIntakePath: '/api/dwc/submission/queue',
backboneArtifactIntakePath: '/api/artifact/intake',
biohubTaxonPath: '/api/taxonomy/taxon',
biohubTaxonTsnPath: '/api/taxonomy/taxon/tsn',
backboneIntakeEnabled: false,
bctwApiHost: 'https://moe-bctw-api-prod.apps.silver.devops.gov.bc.ca',
Expand Down
Loading
Loading