Skip to content

Commit

Permalink
Merge branch 'dev' into tooltip-samplesite
Browse files Browse the repository at this point in the history
  • Loading branch information
NickPhura authored Dec 11, 2024
2 parents 7c96d48 + 66b47fc commit cab27ca
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions app/src/features/surveys/animals/AnimalPage.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import CircularProgress from '@mui/material/CircularProgress';
import Stack from '@mui/material/Stack';
import Box from '@mui/system/Box';
import { SystemAlertBanner } from 'features/alert/banner/SystemAlertBanner';
import { useBiohubApi } from 'hooks/useBioHubApi';
import { useAnimalPageContext, useProjectContext, useSurveyContext } from 'hooks/useContext';
import useDataLoader from 'hooks/useDataLoader';
import { SystemAlertBannerEnum } from 'interfaces/useAlertApi.interface';
import { useEffect } from 'react';
import { AnimalHeader } from './AnimalHeader';
import { AnimalListContainer } from './list/AnimalListContainer';
Expand Down Expand Up @@ -58,7 +56,6 @@ export const SurveyAnimalPage = () => {
survey_id={surveyContext.surveyId}
survey_name={surveyContext.surveyDataLoader.data.surveyData.survey_details.survey_name}
/>
<SystemAlertBanner alertTypes={[SystemAlertBannerEnum.ANIMALS]} />
<Stack
direction="row"
gap={1.5}
Expand Down
3 changes: 0 additions & 3 deletions app/src/features/surveys/telemetry/TelemetryPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ import Box from '@mui/material/Box';
import CircularProgress from '@mui/material/CircularProgress';
import Stack from '@mui/material/Stack';
import { TelemetryTableContextProvider } from 'contexts/telemetryTableContext';
import { SystemAlertBanner } from 'features/alert/banner/SystemAlertBanner';
import { SurveyDeploymentList } from 'features/surveys/telemetry/list/SurveyDeploymentList';
import { TelemetryTableContainer } from 'features/surveys/telemetry/table/TelemetryTableContainer';
import { TelemetryHeader } from 'features/surveys/telemetry/TelemetryHeader';
import { useBiohubApi } from 'hooks/useBioHubApi';
import { useProjectContext, useSurveyContext } from 'hooks/useContext';
import useDataLoader from 'hooks/useDataLoader';
import { SystemAlertBannerEnum } from 'interfaces/useAlertApi.interface';
import { useEffect } from 'react';

export const TelemetryPage = () => {
Expand Down Expand Up @@ -74,7 +72,6 @@ export const TelemetryPage = () => {
survey_id={surveyContext.surveyId}
survey_name={surveyContext.surveyDataLoader.data.surveyData.survey_details.survey_name}
/>
<SystemAlertBanner alertTypes={[SystemAlertBannerEnum.TELEMETRY]} />
<Stack flex="1 1 auto" direction="row" gap={1} p={1}>
{/* Telematry List */}
<Box flex="0 0 auto" position="relative" width="400px">
Expand Down

0 comments on commit cab27ca

Please sign in to comment.