Skip to content
Merged
Changes from 2 commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
d90ee8f
stubbing out survey page
al-rosenthal Jan 18, 2024
a508373
stubbing out control component
al-rosenthal Jan 18, 2024
c1efc41
wip
al-rosenthal Jan 18, 2024
cca0899
got toggle working
al-rosenthal Jan 19, 2024
40c1bae
added controls for layout
al-rosenthal Jan 19, 2024
50d6156
clean up
al-rosenthal Jan 19, 2024
81227a5
Merge branch 'dev' into SIMSBIOHUB-445
al-rosenthal Jan 19, 2024
42fa76b
telemetry data showing on map
al-rosenthal Jan 19, 2024
4c14934
adjusted UI
al-rosenthal Jan 19, 2024
2f11928
integrate studyarea, sample site name
KjartanE Jan 19, 2024
987fa70
added basic table data
al-rosenthal Jan 19, 2024
2b7b39b
basic table rows
al-rosenthal Jan 19, 2024
0206c1e
cleaned up telemetry data fetch
al-rosenthal Jan 19, 2024
9c09ce7
UI Updates
jeznorth Jan 22, 2024
1dac43c
merged ui changes
al-rosenthal Jan 22, 2024
72bfe66
clean up
al-rosenthal Jan 22, 2024
72a62ca
renamed header
al-rosenthal Jan 22, 2024
07123ab
UI Updates
jeznorth Jan 22, 2024
ff13159
Merge branch 'SIMSBIOHUB-445' of https://github.com/bcgov/biohubbc in…
jeznorth Jan 22, 2024
d245310
UI Updates
jeznorth Jan 22, 2024
dffa8b6
merged in changes
al-rosenthal Jan 22, 2024
e89c1db
UI Updates
jeznorth Jan 22, 2024
bf26418
Merge branch 'SIMSBIOHUB-445' of https://github.com/bcgov/biohubbc in…
jeznorth Jan 22, 2024
45e46f7
Fix positioning
jeznorth Jan 22, 2024
0abc3f6
telemetry data sorted
al-rosenthal Jan 22, 2024
2a2dbf0
fix observation species display
KjartanE Jan 22, 2024
bb94383
observation data displaying
al-rosenthal Jan 22, 2024
d32503f
moved some code into new components
al-rosenthal Jan 23, 2024
dca98f4
added map skeleton loader component
al-rosenthal Jan 23, 2024
f52955f
lint
al-rosenthal Jan 23, 2024
04bdee1
added labels to toggle buttons
al-rosenthal Jan 23, 2024
29d49d9
fixing data load
al-rosenthal Jan 23, 2024
ffae6e9
split loading logic
al-rosenthal Jan 23, 2024
a39c87e
added loading skeletons for tables
al-rosenthal Jan 23, 2024
d824b00
renamed old grid, updated observation table
al-rosenthal Jan 24, 2024
b3c8cdf
swapped out telemetry table with data grid
al-rosenthal Jan 24, 2024
d99f68c
SIMSBIOHUB-445: Added observations pagination on the API
curtisupshall Jan 24, 2024
f93339b
Merge branch 'SIMSBIOHUB-445' of github.com:bcgov/biohubbc into SIMSB…
curtisupshall Jan 24, 2024
bab422f
swapped default tab
al-rosenthal Jan 24, 2024
9547e08
Merge branch 'dev' into SIMSBIOHUB-414
KjartanE Jan 24, 2024
9b7e87a
Updating Spatial Tables
jeznorth Jan 24, 2024
a8c1200
Merge branch 'SIMSBIOHUB-445' of https://github.com/bcgov/biohubbc in…
jeznorth Jan 24, 2024
f3892a5
Removing reference
jeznorth Jan 24, 2024
b998100
Fixing small issue
jeznorth Jan 24, 2024
0a21adb
SIMSBIOHUB-445: Added column sorting to API pagination
curtisupshall Jan 24, 2024
d7dffc4
Updated Styling
jeznorth Jan 24, 2024
a997123
updated api to account for first page
al-rosenthal Jan 24, 2024
05af61d
modified for server side sorting
al-rosenthal Jan 24, 2024
d880fe2
Update spatial data tables
jeznorth Jan 24, 2024
a43a8a7
Merge branch 'SIMSBIOHUB-445' of https://github.com/bcgov/biohubbc in…
jeznorth Jan 24, 2024
7cf9c4c
Fix small code issue
jeznorth Jan 24, 2024
e02c84d
added migration
al-rosenthal Jan 24, 2024
28bb6f7
fixed migration
al-rosenthal Jan 24, 2024
6db11ce
updated some column names
al-rosenthal Jan 24, 2024
a26c86c
map auto bounds map on tab select
al-rosenthal Jan 25, 2024
401a62e
UI Updates
jeznorth Jan 25, 2024
542fcfd
added custom message to no rows overlay for styled data grid
al-rosenthal Jan 25, 2024
d8a1b44
SIMSBIOHUB-445: Refactored observations fetching to include supplemen…
curtisupshall Jan 25, 2024
054da90
Merge branch 'SIMSBIOHUB-445' of github.com:bcgov/biohubbc into SIMSB…
curtisupshall Jan 25, 2024
d19efec
SIMSBIOHUB-445: Amended zod schema
curtisupshall Jan 25, 2024
0b1cf06
updated pagination flow
al-rosenthal Jan 25, 2024
2b4b3b6
fixed dates
al-rosenthal Jan 25, 2024
bec95a7
UI Updates
jeznorth Jan 25, 2024
93107a1
fixed issue with observation reload
al-rosenthal Jan 25, 2024
8aff0c3
Merge branch 'SIMSBIOHUB-445' of https://github.com/bcgov/biohubbc in…
al-rosenthal Jan 25, 2024
23752fa
SIMSBIOHUB-445: Fix some pagination bugs
curtisupshall Jan 25, 2024
072d5d6
SIMSBIOHUB-445: Support optional pagination
curtisupshall Jan 25, 2024
09dc980
SIMSBIOHUB-445: Update toggle button bug
curtisupshall Jan 25, 2024
319b7fc
updated page starts
al-rosenthal Jan 26, 2024
8825141
Merge branch 'SIMSBIOHUB-445' of https://github.com/bcgov/biohubbc in…
al-rosenthal Jan 26, 2024
00acc5e
SIMSBIOHUB-445: Added observations spatial query endpoint
curtisupshall Jan 26, 2024
20393b9
Merge branch 'SIMSBIOHUB-445' of github.com:bcgov/biohubbc into SIMSB…
curtisupshall Jan 26, 2024
a25c925
SIMSBIOHUB-442: Updated observationPoints to use observation geometry…
curtisupshall Jan 26, 2024
312bcbc
Merge branch 'dev' into SIMSBIOHUB-445
curtisupshall Jan 26, 2024
641c0f9
Merge branch 'dev' into SIMSBIOHUB-445
curtisupshall Jan 26, 2024
4ed8a58
got initial load working with pagination
al-rosenthal Jan 26, 2024
e3bd4dd
pulled down latest changes
al-rosenthal Jan 26, 2024
3710d60
wired up sort model changes
al-rosenthal Jan 26, 2024
7ac1c37
SIMSBIOHUB-445: Fixed pagination start at page 2 bug in API
curtisupshall Jan 26, 2024
2a5f632
clean up
al-rosenthal Jan 26, 2024
1d96f45
survey table can now remove sorting options
al-rosenthal Jan 26, 2024
643a516
SIMSBIOHUB-445: code cleanup for API
curtisupshall Jan 27, 2024
5e4d43e
SIMSBIOHUB-445: Renamed components and interfaces
curtisupshall Jan 29, 2024
1e44f9b
Fixing telemetry toolbar spacing
jeznorth Jan 29, 2024
04666e3
SIMSBIOHUB-445: Remove unused useEffect
curtisupshall Jan 29, 2024
2dd7197
Merge branch 'SIMSBIOHUB-445' of github.com:bcgov/biohubbc into SIMSB…
curtisupshall Jan 29, 2024
b524cf3
SIMSBIOHUB-445: Removed commented out code
curtisupshall Jan 29, 2024
981f388
SIMSBIOHUB-445: Deleted summary results files.
curtisupshall Jan 29, 2024
9a701e3
SIMSBIOHUB-445: Continued refactor
curtisupshall Jan 29, 2024
5954932
SIMSBIOHUB-445: PR updates; API test updates
curtisupshall Jan 29, 2024
3feddae
SIMSBIOHUB-445: Fix app tests
curtisupshall Jan 29, 2024
477b0f5
SIMSBIOHUB-445: Remove uuid() from survey map
curtisupshall Jan 29, 2024
60a89ba
SIMSBIOHUB-445: Code cleanup; Linter.
curtisupshall Jan 29, 2024
560305f
SIMSBIOHUB-445: Some changes to pagination required fields; Added tes…
curtisupshall Jan 29, 2024
e8fa6f7
Merge branch 'dev' into SIMSBIOHUB-414
NickPhura Jan 30, 2024
7990684
Merge branch 'SIMSBIOHUB-414' into SIMSBIOHUB-445
curtisupshall Jan 30, 2024
b72e67e
SIMSBIOHUB-414: Added metadata endpoint for survey observations
curtisupshall Jan 30, 2024
cd956af
Merge branch 'dev' into SIMSBIOHUB-445
KjartanE Jan 30, 2024
f121bfd
SIMSBIOHUB-414: Added hook call to fetch single observation record
curtisupshall Jan 30, 2024
ea3c16d
SIMSBIOHUB-414: Memoize bounds
curtisupshall Jan 30, 2024
bd3a0f6
Merge branch 'SIMSBIOHUB-445' of github.com:bcgov/biohubbc into SIMSB…
curtisupshall Jan 30, 2024
154de48
SIMSBIOHUB-445: Linting and sonarcloud changes
curtisupshall Jan 30, 2024
1a1da25
SIMSBIOHUB-445: More code quality changes
curtisupshall Jan 30, 2024
2f1e4e9
SIMSBIOHUB-445: PR changes
curtisupshall Jan 31, 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
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,12 @@ const ManualTelemetryTableContainer = () => {
</Typography>
</Typography>

<Box display={'flex'} overflow={'hidden'} gap={1} whiteSpace={'nowrap'}>
<Stack
flexDirection="row"
alignItems="center"
gap={1}
overflow="hidden"
whiteSpace="nowrap">
<Button
variant="contained"
color="primary"
Expand All @@ -216,8 +221,11 @@ const ManualTelemetryTableContainer = () => {
disabled={telemetryTableContext.isSaving}>
Add Record
</Button>
<Collapse in={hasUnsavedChanges} orientation="horizontal" sx={{ mr: -1 }}>
<Box whiteSpace="nowrap" display="flex" sx={{ gap: 1, pr: 1 }}>
<Collapse in={hasUnsavedChanges} orientation="horizontal">
<Stack
flexDirection="row"
whiteSpace="nowrap"
gap={1}>
<LoadingButton
loading={telemetryTableContext.isSaving}
variant="contained"
Expand All @@ -233,17 +241,14 @@ const ManualTelemetryTableContainer = () => {
disabled={telemetryTableContext.isSaving}>
Discard Changes
</Button>
</Box>
</Stack>
</Collapse>
{hideableColumns.length > 0 && (
<>
<IconButton
// variant="outlined"
color="default"
onClick={(event) => setColumnVisibilityMenuAnchorEl(event.currentTarget)}
disabled={telemetryTableContext.isSaving}>
<Icon path={mdiCogOutline} size={1} />
{/* Column Visibility */}
</IconButton>
<Menu
anchorOrigin={{
Expand Down Expand Up @@ -330,7 +335,7 @@ const ManualTelemetryTableContainer = () => {
</MenuItem>
</Menu>
</Box>
</Box>
</Stack>
</Toolbar>

<Divider flexItem></Divider>
Expand Down