- {plots.map((plot, i) => {
- if (i < 5) return createReportRow(project, plot);
- })}
+
+ {plots.map((plot, _i) => createReportRow(project, plot))}
) : (
diff --git a/src/app-pages/project/dashboard/cards/reportConfigsCard.jsx b/src/app-pages/project/dashboard/cards/reportConfigsCard.jsx
index 98e531a3..37c92f4d 100644
--- a/src/app-pages/project/dashboard/cards/reportConfigsCard.jsx
+++ b/src/app-pages/project/dashboard/cards/reportConfigsCard.jsx
@@ -53,8 +53,8 @@ const ReportConfigsCard = connect(
const { report_config_id: reportConfigId, id: jobId } = jobDetails || {};
const { data: currentJob } = useGetReportStatus({ projectId, reportConfigId, jobId }, {
- enabled: !!((projectId && reportConfigId && jobId) && (jobDetails?.status === 'INIT')),
- refetchInterval: (data) => (!data || data.progress < 100) ? 3000 : undefined,
+ enabled: !!((projectId && reportConfigId && jobId) && (['INIT', 'IN_PROGRESS'].includes(jobDetails?.status))),
+ refetchInterval: 3000,
});
const { file_key, progress } = currentJob || {};
@@ -75,7 +75,7 @@ const ReportConfigsCard = connect(
const tId = toast.loading('Getting your report ready for download. This may take a minute...');
setToastId(tId);
initReportJobMutator(id);
- }
+ };
return (
diff --git a/src/app-services/collections/instrument-timeseries-measurements.ts b/src/app-services/collections/instrument-timeseries-measurements.ts
new file mode 100644
index 00000000..27a38245
--- /dev/null
+++ b/src/app-services/collections/instrument-timeseries-measurements.ts
@@ -0,0 +1,67 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { apiGet } from '../fetch-helpers';
+
+interface InstrumentParams {
+ instrumentId: string,
+ instrumentType: string,
+}
+
+interface BullseyeParams {
+ projectId: string,
+ plotConfigId: string,
+}
+
+interface ContourParams extends BullseyeParams {
+ time: string,
+}
+
+interface TimestampParams extends BullseyeParams {
+ before?: string,
+ after?: string,
+}
+
+export const useGetContourMeasurements = ({ projectId, plotConfigId, time }: ContourParams, opts: ClientQueryOptions) => {
+ const uri = `/projects/${projectId}/plot_configs/contour_plots/${plotConfigId}/measurements?time=${time}`;
+
+ return useQuery({
+ queryKey: [`contourMeasurements`, projectId, plotConfigId, time],
+ queryFn: () => apiGet(uri),
+ ...opts,
+ });
+};
+
+export const useGetBullseyeMeasurements = ({ projectId, plotConfigId }: BullseyeParams, opts: ClientQueryOptions) => {
+ const uri = `/projects/${projectId}/plot_configs/bullseye_plots/${plotConfigId}/measurements`;
+
+ return useQuery({
+ queryKey: [`contourMeasurements`, projectId, plotConfigId],
+ queryFn: () => apiGet(uri),
+ ...opts,
+ });
+};
+
+export const useGetMeasurementsByInstrumentType = ({ instrumentId, instrumentType }: InstrumentParams, opts: ClientQueryOptions) => {
+ const typeMap = {
+ 'SAA': 'saa',
+ 'IPI': 'ipi',
+ } as Record;
+
+ const uri = `/instruments/${typeMap[instrumentType]}/${instrumentId}/measurements`;
+
+ return useQuery({
+ queryKey: [`instrumentMeasurementsType`, instrumentId, instrumentType],
+ queryFn: () => apiGet(uri),
+ ...opts,
+ });
+};
+
+export const useGetMeasurementTimestamps = ({ projectId, plotConfigId, before, after }: TimestampParams, opts: ClientQueryOptions) => {
+ const uri = `/projects/${projectId}/plot_configs/contour_plots/${plotConfigId}/times?before=${before}&after=${after}`;
+
+ return useQuery({
+ queryKey: [`measurementTimestamps`, projectId, plotConfigId, before, after],
+ queryFn: () => apiGet(uri),
+ ...opts,
+ });
+}
diff --git a/src/upload-parsers/timeseries_measurements.js b/src/upload-parsers/timeseries_measurements.js
index 82abcf4c..10893f45 100644
--- a/src/upload-parsers/timeseries_measurements.js
+++ b/src/upload-parsers/timeseries_measurements.js
@@ -8,7 +8,7 @@ const timeseriesMeasurementParser = {
prePostFilter: (data) => (
/** this will work for single timeseries_id, needs to be updated to allow for multiple */
data.reduce((accum, current) => {
- const { timeseries_id, time, value, masked, validated, annotation } = current;
+ const { timeseries_id, time, value, masked, validated, annotation = '' } = current;
return ({
...accum,
@@ -61,7 +61,7 @@ const timeseriesMeasurementParser = {
label: 'Masked',
type: 'boolean',
required: false,
- parse: val => val === 'true' || val === 'T' || val ==='Y',
+ parse: val => val === 'true' || val === 'T' || val === 'Y',
validate: val => !!val,
helpText: 'Boolean value of whether the measurement should be masked (Optional, default to false)',
},
@@ -69,7 +69,7 @@ const timeseriesMeasurementParser = {
label: 'Validated',
type: 'boolean',
required: false,
- parse: val => val === 'true' || val === 'T' || val ==='Y',
+ parse: val => val === 'true' || val === 'T' || val === 'Y',
validate: val => !!val,
helpText: 'Boolean value of whether the measurement is already validated (Optional, default to false)',
},
@@ -78,7 +78,7 @@ const timeseriesMeasurementParser = {
type: 'string',
required: false,
parse: val => val,
- validate: val => !!val,
+ validate: val => !!val || val === '',
helpText: 'String note to be associated with the measurement (Optional, can be empty)',
},
},