diff --git a/src/app-pages/instrument/timeseries/timeseries.jsx b/src/app-pages/instrument/timeseries/timeseries.jsx
index 5643eda9..231637e1 100644
--- a/src/app-pages/instrument/timeseries/timeseries.jsx
+++ b/src/app-pages/instrument/timeseries/timeseries.jsx
@@ -12,7 +12,6 @@ import TimeseriesListItem from './timeseries-list-item';
import '../../../css/grids.scss';
import '../instrument.css';
-import { ca } from 'date-fns/locale';
const doesSetHaveData = (dataSet, key, activeTimeseries) => {
const data = dataSet[activeTimeseries];
@@ -20,38 +19,11 @@ const doesSetHaveData = (dataSet, key, activeTimeseries) => {
return !!(data && data[key] && data[key].length);
};
-// @TODO - check this for runtime
-const getInclinometerItems = inclinometers => {
- const items = [];
-
- inclinometers.forEach(inclinometer => {
- const { time, values } = inclinometer;
-
- values.forEach(value => {
- const { depth, aChecksum, a0, a180, bChecksum, b0, b180 } = value;
- items.push({
- time,
- depth,
- aChecksum,
- a0,
- a180,
- bChecksum,
- b0,
- b180,
- });
- });
- });
-
- return items;
-};
-
-const getColumnDefs = (measurements, inclinometerMeasurements, activeTimeseries, updateMeasurement) => {
+const getColumnDefs = (measurements, activeTimeseries, updateMeasurement) => {
const items =
doesSetHaveData(measurements, 'items', activeTimeseries)
? measurements[activeTimeseries].items
- : doesSetHaveData(inclinometerMeasurements, 'inclinometers', activeTimeseries)
- ? getInclinometerItems(inclinometerMeasurements[activeTimeseries].inclinometers)
- : [];
+ : []
const keys = items && items.length ? ['time', 'value', 'masked', 'validated', 'annotation'] : [];
@@ -98,27 +70,22 @@ export default connect(
'doInstrumentTimeseriesSetActiveId',
'doTimeseriesMeasurementsSave',
'doTimeseriesMeasurementsDelete',
- 'doInclinometerMeasurementsDelete',
'selectProjectsByRoute',
'selectInstrumentsByRoute',
'selectNonComputedTimeseriesItemsByRoute',
'selectTimeseriesMeasurementsItemsObject',
- 'selectInclinometerMeasurementsItemsObject',
({
doModalOpen,
doInstrumentTimeseriesSetActiveId,
doTimeseriesMeasurementsSave,
doTimeseriesMeasurementsDelete,
- doInclinometerMeasurementsDelete,
projectsByRoute: project,
instrumentsByRoute: instrument,
nonComputedTimeseriesItemsByRoute: timeseries,
timeseriesMeasurementsItemsObject: measurements,
- inclinometerMeasurementsItemsObject: inclinometerMeasurements,
}) => {
const grid = useRef(null);
const [activeTimeseries, setActiveTimeseries] = useState(null);
- const [isInclinometer, setIsInclinometer] = useState(false);
// filter out any timeseries used for constants AND cwms timeseries
const actualSeries = timeseries.filter((ts) => (
@@ -133,9 +100,7 @@ export default connect(
const { data } = node;
const { time } = data;
- isInclinometer
- ? doInclinometerMeasurementsDelete({ timeseriesId: activeTimeseries, date: time })
- : doTimeseriesMeasurementsDelete({ timeseriesId: activeTimeseries, date: time });
+ doTimeseriesMeasurementsDelete({ timeseriesId: activeTimeseries, date: time });
});
};
@@ -146,33 +111,23 @@ export default connect(
const newValue = { ...data };
- if (isInclinometer) {
- // TODO: implement inclinometer measurement saving endpoint.
- // console.info(`Saving measurements ${data}`);
- // doInclinometerMeasurementsSave({
- // timeseries_id: activeTimeseries,
- // items: [data],
- // }, null, false, true);
- } else {
- newValue.value = new Number(value);
+ newValue.value = new Number(value);
- if (field === 'time') doTimeseriesMeasurementsDelete({ timeseriesId: activeTimeseries, date: oldValue });
- if (field === 'validated') newValue.validated = validated === true;
- if (field === 'masked') newValue.masked = masked === true;
+ if (field === 'time') doTimeseriesMeasurementsDelete({ timeseriesId: activeTimeseries, date: oldValue });
+ if (field === 'validated') newValue.validated = validated === true;
+ if (field === 'masked') newValue.masked = masked === true;
- doTimeseriesMeasurementsSave({
- timeseries_id: activeTimeseries,
- items: [newValue],
- }, null, false, true);
- }
+ doTimeseriesMeasurementsSave({
+ timeseries_id: activeTimeseries,
+ items: [newValue],
+ }, null, false, true);
};
- const { rowData, columnDefs } = getColumnDefs(measurements, inclinometerMeasurements, activeTimeseries, updateMeasurement);
+ const { rowData, columnDefs } = getColumnDefs(measurements, activeTimeseries, updateMeasurement);
useEffect(() => {
if (activeTimeseries) {
doInstrumentTimeseriesSetActiveId(activeTimeseries);
- setIsInclinometer(Boolean(doesSetHaveData(inclinometerMeasurements, 'inclinometers', activeTimeseries)));
}
}, [activeTimeseries, doInstrumentTimeseriesSetActiveId]);
diff --git a/src/app-pages/project/batch-plotting/helper.js b/src/app-pages/project/batch-plotting/helper.js
index c339920a..e8ea06b7 100644
--- a/src/app-pages/project/batch-plotting/helper.js
+++ b/src/app-pages/project/batch-plotting/helper.js
@@ -222,6 +222,7 @@ export const formatTimeseriesOptions = (timeseries = []) => (
instrumentName: ts.instrument,
instrumentId: ts.instrument_id,
timeseriesName: ts.name,
+ type: ts.type,
}))
);
diff --git a/src/app-pages/project/data-loggers/modals/dataLoggerModal.jsx b/src/app-pages/project/data-loggers/modals/dataLoggerModal.jsx
index 5adb3547..e838edb8 100644
--- a/src/app-pages/project/data-loggers/modals/dataLoggerModal.jsx
+++ b/src/app-pages/project/data-loggers/modals/dataLoggerModal.jsx
@@ -26,7 +26,7 @@ const DataLoggerModal = connect(
model_id: initModelId,
} = dataLogger;
const title = `${isEdit ? 'Edit' : 'Add New'} Data Logger`;
-
+
const [sn, setSN] = useState(initSn);
const [name, setName] = useState(initName);
const [modelId, setModelId] = useState(initModelId);
@@ -41,7 +41,8 @@ const DataLoggerModal = connect(
};
const isSaveDisabled = () => {
- if (!sn || !name || !modelId) return true;
+ if (isEdit && !name) return true;
+ else if (!isEdit && (!sn || !name || !modelId)) return true;
else return false;
};
@@ -82,7 +83,17 @@ const DataLoggerModal = connect(
) : (
- The Serial Number and Model fields are not editable. If they are not correct, please create a new data logger with the proper values and delete the invalid data logger.
+ The{' '}
+
+ Serial Number
+ {' '}
+ and{' '}
+
+ Model
+ {' '}
+ fields are not editable. If they are not correct, please create a
+ new data logger with the proper values and delete the invalid data
+ logger.
)}
diff --git a/src/app-pages/project/data-loggers/modals/deleteDataLoggerMappingRowModal.jsx b/src/app-pages/project/data-loggers/modals/deleteDataLoggerMappingRowModal.jsx
index d195d629..116daac6 100644
--- a/src/app-pages/project/data-loggers/modals/deleteDataLoggerMappingRowModal.jsx
+++ b/src/app-pages/project/data-loggers/modals/deleteDataLoggerMappingRowModal.jsx
@@ -5,21 +5,24 @@ import * as Modal from '../../../../app-components/modal';
const DeleteDataLoggerMappingRowModal = connect(
'doDeleteDataLoggerEquivalencyRow',
- ({
- doDeleteDataLoggerEquivalencyRow,
- dataLoggerId,
- id,
- tableId,
- }) => (
+ ({ doDeleteDataLoggerEquivalencyRow, dataLoggerId, id, tableId }) => (
- Are you sure you want to delete this data logger mapping? Associated timeseries will NOT be deleted and will not receieve any new data unless assigned to another datalogger.
+ Are you sure you want to delete this data logger mapping? Associated
+ timeseries will{' '}
+
+ NOT
+ {' '}
+ be deleted and will not receive any new data unless assigned to another
+ datalogger.
doDeleteDataLoggerEquivalencyRow({ dataLoggerId, id, tableId })}
+ onDelete={() =>
+ doDeleteDataLoggerEquivalencyRow({ dataLoggerId, id, tableId })
+ }
/>
),
diff --git a/src/app-pages/project/qa-qc/components/modals/newAlertConfigModal.jsx b/src/app-pages/project/qa-qc/components/modals/newAlertConfigModal.jsx
index fe2f3fb2..9054f531 100644
--- a/src/app-pages/project/qa-qc/components/modals/newAlertConfigModal.jsx
+++ b/src/app-pages/project/qa-qc/components/modals/newAlertConfigModal.jsx
@@ -196,7 +196,6 @@ const NewAlertConfigModal = connect(
saveText='Submit'
saveIsDisabled={isSaveDisabled(formState, optionalFields) || isSaveDisabled(formState.opts?.val, optionalOpts[formState?.alert_type_id?.val])}
onSave={() => {
- console.log('test formState:', formState)
isEdit
? doUpdateProjectAlertConfigs(formState, alertConfigId, uriMap[formState?.alert_type_id?.val], doModalClose)
: doCreateProjectAlertConfigs(formState, uriMap[formState?.alert_type_id?.val], doModalClose);
diff --git a/src/app-pages/project/uploader/Uploader.jsx b/src/app-pages/project/uploader/Uploader.jsx
index 75846d76..d1670ba8 100644
--- a/src/app-pages/project/uploader/Uploader.jsx
+++ b/src/app-pages/project/uploader/Uploader.jsx
@@ -52,13 +52,14 @@ const Uploader = connect(
id='uploader-config-search'
className='w-50 d-inline-block'
options={buildConfigurationOptions(configurations)}
+ value={activeConfiguration}
renderInput={params =>
}
isOptionEqualToValue={(opt, val) => opt.id === val.id}
onChange={(_e, val) => setActiveConfiguration(val)}
/>
) :
No Configurations for this project. Add one using the Add New Configuration button to the right.}
- {activeConfiguration && (
+ {!!activeConfiguration && (
{
deleteMutator.mutate({ uploadConfigId: activeConfiguration?.value });
- activeConfiguration(null);
+ setActiveConfiguration(null);
}}
>
diff --git a/src/app-pages/project/uploader/helper.js b/src/app-pages/project/uploader/helper.js
index 52ad5616..1b7887bd 100644
--- a/src/app-pages/project/uploader/helper.js
+++ b/src/app-pages/project/uploader/helper.js
@@ -1,16 +1,36 @@
import { DateTime } from 'luxon';
import { readString } from 'react-papaparse';
+import * as XLSX from 'xlsx';
+
+export const extractInstrumentNames = (
+ parsedData,
+ fileType,
+ instrumentColumn,
+) => {
+ if (!fileType) return [];
+
+ switch (fileType) {
+ case 'csv':
+ return _extractInstrumentNamesFromCSV(parsedData, instrumentColumn);
+ case 'xlsx':
+ return _extractInstrumentNamesFromXLSX(parsedData, instrumentColumn);
+ default:
+ return [];
+ }
+};
export const extractFields = (parsedData, fileType) => {
if (!fileType) return [];
-
+
switch (fileType) {
case 'toa5':
return _extractFieldsFromToa5(parsedData);
case 'dux':
- return []; // TODO
+ return _extractFieldsFromDux(parsedData);
case 'csv':
return _extractFieldsFromCSV(parsedData);
+ case 'xlsx':
+ return _extractFieldsFromXLSX(parsedData);
default:
return [];
}
@@ -27,26 +47,57 @@ export const fileTypeByExtension = (fileName = '') => {
return 'dux';
case 'csv':
return 'csv';
+ case 'xlsx':
+ return 'xlsx';
default:
return null;
+ }
+};
+
+export const getTimezoneOption = (zone = 'Universal') => {
+ if (!zone) return;
+
+ const dt = DateTime.local({ zone });
+ if (!dt.isValid) return;
+
+ return {
+ label: `${zone} (${dt.offsetNameShort} ${dt.toFormat('ZZ')})`,
+ value: zone,
};
};
export const buildTimezoneOptions = (timezones = []) => {
if (!timezones?.length) return [];
- return timezones.map(tz => {
- const dt = DateTime.now().setZone(tz.name);
-
- if (!dt.isValid) return;
+ return timezones
+ .map(zone => {
+ const dt = DateTime.local({ zone });
+ if (!dt.isValid) return;
+
+ return {
+ label: `${zone} (${dt.offsetNameShort} ${dt.toFormat('ZZ')})`,
+ value: zone,
+ };
+ })
+ .filter(e => e);
+};
- return ({
- label: `${tz.name} (${tz.abbrev} ${dt.toFormat('ZZ')})`,
- value: tz.name,
- });
- }).filter(e => e);
+export const buildXLSXSheetOptions = (file, onComplete) => {
+ const reader = new FileReader();
+ reader.onload = (e) => {
+ const data = new Uint8Array(e.target.result);
+ const workbook = XLSX.read(data, { type: 'array' });
+ const options = workbook.SheetNames.map(name => ({
+ value: name,
+ label: name,
+ }));
+ onComplete(options);
+ }
+ reader.readAsArrayBuffer(file);
};
+// FILE PARSERS
+
export const parseFile = async (file, onComplete) => {
const text = await file.text();
@@ -54,12 +105,29 @@ export const parseFile = async (file, onComplete) => {
worker: true,
header: false,
skipEmptyLines: true,
- complete: (results) => {
+ complete: results => {
onComplete(results);
},
});
};
+export const parseXLSXFile = async (file, worksheet, onComplete) => {
+ const reader = new FileReader();
+ reader.onload = (e) => {
+ const data = new Uint8Array(e.target.result);
+ const workbook = XLSX.read(data, { type: 'array' });
+
+ // Process the workbook
+ const ws = workbook.Sheets[worksheet];
+ const jsonData = XLSX.utils.sheet_to_json(ws);
+
+ if (!jsonData?.length) onComplete(undefined);
+ else onComplete(jsonData);
+ };
+ reader.onerror = () => onComplete(undefined);
+ reader.readAsArrayBuffer(file);
+};
+
// FIELD EXTRACTORS
const _extractFieldsFromCSV = parsedData => {
@@ -77,14 +145,54 @@ const _extractFieldsFromToa5 = parsedData => {
const { data } = parsedData || {};
if (!data?.length) return [];
- const _fileMetaData = data[0];
+ // const _fileMetaData = data[0];
const headerRow = data[1];
- return headerRow.map((h, ind) => {
- if (ind <= 1) return;
+ return headerRow
+ .map((h, ind) => {
+ if (ind <= 1) return;
+ else
+ return {
+ fieldName: h,
+ };
+ })
+ .filter(e => e);
+};
+
+const _extractFieldsFromXLSX = parsedData => {
+ if (!parsedData?.length) return [];
+
+ const keys = Object.keys(parsedData[0]);
- else return {
- fieldName: h,
- };
- }).filter(e => e);
-};
\ No newline at end of file
+ if (!keys?.length) return [];
+
+ return keys.map(k => ({
+ fieldName: k
+ }));
+};
+
+const _extractFieldsFromDux = parsedData => {
+ if (!parsedData?.length) return [];
+ return [];
+};
+
+// INSTRUMENT COLUMN PARSERS
+
+const _extractInstrumentNamesFromCSV = (parsedData, instrumentColumn) => {
+ const { data } = parsedData || {};
+ if (!data?.length) return [];
+
+ const idx = data[0].findIndex(el => el === instrumentColumn);
+
+ const d = data.map(r => r[idx]).filter(el => el !== instrumentColumn);
+ const s = new Set(d);
+ return [...s];
+};
+
+const _extractInstrumentNamesFromXLSX = (parsedData, instrumentColumn) => {
+ if (!parsedData?.length) return [];
+
+ const d = parsedData.map(r => r[instrumentColumn]);
+ const s = new Set(d);
+ return [...s];
+};
diff --git a/src/app-pages/project/uploader/mappingDetails.jsx b/src/app-pages/project/uploader/mappingDetails.jsx
index a055c6fd..04ad6d01 100644
--- a/src/app-pages/project/uploader/mappingDetails.jsx
+++ b/src/app-pages/project/uploader/mappingDetails.jsx
@@ -3,9 +3,10 @@ import { Box, Typography } from '@mui/material';
import Table from '../../../app-components/table';
import HelperTooltip from '../../../app-components/helper-tooltip';
+import { connect } from 'redux-bundler-react';
const timeseriesNameById = (timeseries, id) => {
- const ts = timeseries.find(el=> el.id === id);
+ const ts = timeseries.find(el => el.id === id);
return `${ts?.instrument} - ${ts?.name}`;
};
@@ -23,61 +24,88 @@ const timeseriesSort = (rowA, rowB, timeseries) => {
return (timeseriesAName || '').localeCompare(timeseriesBName);
};
-const MappingDetails = ({ timeseries, configuration = {}, mappings = []}) => {
- const { time_field, comment_field, comment_field_enabled, masked_field, masked_field_enabled, validated_field, validated_field_enabled } = configuration;
+const instrumentNameById = (instruments, id) => {
+ const i = instruments.find(el => el.id === id);
+ return i?.name;
+};
- return (
- <>
-
- To fully utilize this configuration, ensure the file you are uploading matches the following configuration details. A check will occur prior to upload
- to ensure your file's field names matches the configuration. An option to ignore errors will be provided if there are any missing fields in your file.
- Any excess fields in your file that do not appear in the configuration will be ignored.
-
-
-
- Time Column: {time_field}
- {comment_field_enabled ? (
- Comments Column: {comment_field}
- ) : null}
- {masked_field_enabled ? (
- Masked Column: {masked_field}
- ) : null}
- {validated_field_enabled ? (
- Validated Column: {validated_field}
- ) : null}
-
+const MappingDetails = connect(
+ 'selectInstrumentsItems',
+ ({
+ instrumentsItems: instruments,
+ timeseries,
+ configuration = {},
+ mappings = [],
+ }) => {
+ const { time_field, comment_field, comment_field_enabled, masked_field, masked_field_enabled, validated_field, validated_field_enabled, instrument_field_enabled, instrument_field, depth_based_instrument_id } = configuration;
- {mappings?.length ? (
-
- Field Name
-
- The field name is the name expected to be found in your file when uploaded.
-
- )}
- />
-
- ),
- isSortable: true,
- }, {
- key: 'timeseries_id',
- header: 'Timeseries',
- isSortable: true,
- sortingFn: (rowA, rowB) => timeseriesSort(rowA, rowB, timeseries),
- render: (data) => timeseriesNameById(timeseries, data.timeseries_id),
- }]}
- />
- ) : null}
-
- );
-};
+ const hasInstrumentData = mappings.some(el => !!el.instrument_field_name);
+
+ const columns = [{
+ key: 'field_name',
+ header: (
+
+ Field Name
+
+ The field name is the name expected to be found in your file when uploaded.
+
+ )}
+ />
+
+ ),
+ isSortable: true,
+ }, hasInstrumentData ? {
+ key: 'instrument_field_name',
+ header: 'Instrument Name',
+ isSortable: true,
+ } : null, {
+ key: 'timeseries_id',
+ header: 'Timeseries',
+ isSortable: true,
+ sortingFn: (rowA, rowB) => timeseriesSort(rowA, rowB, timeseries),
+ render: (data) => timeseriesNameById(timeseries, data.timeseries_id),
+ }].filter(e => !!e);
+
+ return (
+ <>
+
+ To fully utilize this configuration, ensure the file you are uploading matches the following configuration details. A check will occur prior to upload
+ to ensure your file's field names matches the configuration. An option to ignore errors will be provided if there are any missing fields in your file.
+ Any excess fields in your file that do not appear in the configuration will be ignored.
+
+
+
+ {!!time_field && Time Column: {time_field}
}
+ {comment_field_enabled ? (
+ Comments Column: {comment_field}
+ ) : null}
+ {masked_field_enabled ? (
+ Masked Column: {masked_field}
+ ) : null}
+ {validated_field_enabled ? (
+ Validated Column: {validated_field}
+ ) : null}
+ {instrument_field_enabled ? (
+ Instrument Column: {instrument_field}
+ ) : null}
+ {!!depth_based_instrument_id && (
+ Instrument: {instrumentNameById(instruments, depth_based_instrument_id)}
+ )}
+
+
+ {mappings?.length ? (
+
+ ) : null}
+
+ );
+ },
+);
export default MappingDetails;
diff --git a/src/app-pages/project/uploader/modals/_configurationOption.jsx b/src/app-pages/project/uploader/modals/_configurationOption.jsx
index 9a5f1d2f..5eb94e1a 100644
--- a/src/app-pages/project/uploader/modals/_configurationOption.jsx
+++ b/src/app-pages/project/uploader/modals/_configurationOption.jsx
@@ -26,7 +26,7 @@ const ConfigurationOption = connect(
sx={{ marginTop: 2 }}
groupBy={opt => opt.instrumentName}
getOptionLabel={option => option?.label}
- options={timeseries.sort((a, b) => -b.label.localeCompare(a.label))}
+ options={timeseries.filter(e => e.type === 'standard').sort((a, b) => -b.label.localeCompare(a.label))}
onChange={(_e, val) => onChange(val)}
renderInput={(params) => (
{
+ const {
+ time_field,
+ depth_based_instrument_id,
+ instrument_field_enabled, instrument_field,
+ masked_field_enabled, masked_field,
+ validated_field_enabled, validated_field,
+ comment_field_enabled, comment_field,
+ } = columnConfig;
+
+ let final = [...fields];
+
+ if (time_field) {
+ final = final.filter(el => el.fieldName !== time_field?.value)
+ }
+ if (instrument_field_enabled) {
+ final = final.filter(el => el.fieldName !== instrument_field?.value);
+ }
+ if (masked_field_enabled) {
+ final = final.filter(el => el.fieldName !== masked_field?.value);
+ }
+ if (validated_field_enabled) {
+ final = final.filter(el => el.fieldName !== validated_field?.value);
+ }
+ if (comment_field_enabled) {
+ final = final.filter(el => el.fieldName !== comment_field?.value);
+ }
+ if (depth_based_instrument_id) {
+ final = final.filter(el => el.fieldName === depth_based_instrument_id?.value);
+ }
+
+ return final;
+};
+
+const FormGen = ({
+ fields = [],
+ parsedData,
+ fileType,
+ columnConfig = {},
+ onChange,
+}) => {
+ const { instrument_field_enabled, instrument_field } = columnConfig || {};
-const FormGen = ({ fields = [], onChange }) => {
const [result, setResult] = useState({});
+ const cleanedFields = removeMappedColumns(columnConfig, fields);
+ const instrumentEnabled = ['csv', 'xlsx'].includes(fileType) && instrument_field_enabled;
+ const instrumentNames = instrumentEnabled ? extractInstrumentNames(parsedData, fileType, instrument_field?.value) : [];
useDeepCompareEffect(() => {
onChange(result);
@@ -12,13 +59,49 @@ const FormGen = ({ fields = [], onChange }) => {
return (
<>
- {fields?.map(field => (
- setResult(prev => ({ ...prev, [field.fieldName]: val })))}
- />
- ))}
+ {instrumentEnabled ? (
+ <>
+ {instrumentNames?.map(name => (
+
+ {name}
+ {cleanedFields?.map(field => (
+ setResult(prev => ({
+ ...prev,
+ [name]: {
+ ...(prev[name] || {}),
+ fields: {
+ ...(prev[name]?.fields || {}),
+ [field.fieldName]: val,
+ },
+ isInstrument: true,
+ }
+ })))}
+ />
+ ))}
+
+ ))}
+
+ ) : (
+ <>
+ {cleanedFields?.map(field => (
+ setResult(prev => ({ ...prev, [field.fieldName]: val })))}
+ />
+ ))}
+
+ )}
);
};
diff --git a/src/app-pages/project/uploader/modals/_generalColumnFields.jsx b/src/app-pages/project/uploader/modals/_generalColumnFields.jsx
index b6b83d70..ba4c0b45 100644
--- a/src/app-pages/project/uploader/modals/_generalColumnFields.jsx
+++ b/src/app-pages/project/uploader/modals/_generalColumnFields.jsx
@@ -1,89 +1,175 @@
import React from 'react';
-import { Autocomplete, Checkbox, FormControlLabel, Grid, TextField } from '@mui/material';
+import { connect } from 'redux-bundler-react';
+import { Autocomplete, Checkbox, FormControlLabel, Grid, TextField, Typography } from '@mui/material';
-const GeneralColumnFields = ({
- fileColumns = [],
- onChange = (_fieldName, _val) => {},
-}) => {
- const options = fileColumns.map(col => ({
- value: col?.fieldName,
- label: col?.fieldName,
- }));
+import HelperTooltip from '../../../../app-components/helper-tooltip';
- return (
- <>
- }
- isOptionEqualToValue={(opt, val) => opt.id === val.id}
- onChange={(_e, val) => onChange('time_field', val)}
- />
-
-
- }
- isOptionEqualToValue={(opt, val) => opt.id === val.id}
- onChange={(_e, val) => onChange('validated_field', val)}
- />
-
-
- onChange('validated_field_enabled', e.target.checked)} />}
- label='Enable'
- />
-
-
-
-
- }
- isOptionEqualToValue={(opt, val) => opt.id === val.id}
- onChange={(_e, val) => onChange('masked_field', val)}
- />
-
-
- onChange('masked_field_enabled', e.target.checked)} />}
- label='Enable'
- />
-
-
-
-
+const generateInstrumentOptions = (instruments = []) => instruments?.length ? (
+ instruments.map(i => ({
+ value: i.id,
+ label: i.name,
+ }))
+) : [];
+
+const GeneralColumnFields = connect(
+ 'selectInstrumentsItems',
+ ({
+ instrumentsItems: instruments,
+ fileType,
+ fileColumns = [],
+ onChange = (_fieldName, _val) => {},
+ }) => {
+ const options = fileColumns.map(col => ({
+ value: col?.fieldName,
+ label: col?.fieldName,
+ }));
+
+ const instrumentEnabled = ['csv', 'xlsx'].includes(fileType);
+ const depthBasedEnabled = ['dux'].includes(fileType);
+
+ return (
+ <>
+ {instrumentEnabled && (
+ <>
+
+
+ }
+ isOptionEqualToValue={(opt, val) => opt.id === val.id}
+ onChange={(_e, val) => onChange('time_field', val)}
+ />
+
+
+ onChange('prefer_day_first', e.target.checked)} />}
+ label='Prefer DD / MM / YYYY'
+ />
+
+ By default the parser will attempt to read ambigious date strings as month-first (eg: MM / DD / YYYY).
+ By enabling this option, the parser will instead read ambigious date strings as day-first (eg: DD / MM / YYYY).
+
+ )}
+ />
+
+
+
+
+ }
+ isOptionEqualToValue={(opt, val) => opt.id === val.id}
+ onChange={(_e, val) => onChange('validated_field', val)}
+ />
+
+
+ onChange('validated_field_enabled', e.target.checked)} />}
+ label='Enable'
+ />
+
+
+
+
+ }
+ isOptionEqualToValue={(opt, val) => opt.id === val.id}
+ onChange={(_e, val) => onChange('masked_field', val)}
+ />
+
+
+ onChange('masked_field_enabled', e.target.checked)} />}
+ label='Enable'
+ />
+
+
+
+
+ }
+ isOptionEqualToValue={(opt, val) => opt.id === val.id}
+ onChange={(_e, val) => onChange('comment_field', val)}
+ />
+
+
+ onChange('comment_field_enabled', e.target.checked)} />}
+ label='Enable'
+ />
+
+
+
+
+ }
+ isOptionEqualToValue={(opt, val) => opt.id === val.id}
+ onChange={(_e, val) => onChange('instrument_field', val)}
+ />
+
+
+ onChange('instrument_field_enabled', e.target.checked)} />}
+ label='Enable'
+ />
+
+ Enabling this field will allow parsing of the supplied instrument field
+ and generate timeseries options for multiple instruments.
+
+ )}
+ />
+
+
+
+ )}
+ {depthBasedEnabled && (
}
+ options={generateInstrumentOptions(instruments)}
+ renderInput={params => }
isOptionEqualToValue={(opt, val) => opt.id === val.id}
- onChange={(_e, val) => onChange('comment_field', val)}
- />
-
-
- onChange('comment_field_enabled', e.target.checked)} />}
- label='Enable'
+ onChange={(_e, val) => onChange('depth_based_instrument_id', val)}
/>
-
-
-
- );
-};
+ )}
+
+ );
+ },
+);
export default GeneralColumnFields;
diff --git a/src/app-pages/project/uploader/modals/newConfiguration.jsx b/src/app-pages/project/uploader/modals/newConfiguration.jsx
index 004c3e43..2721bd99 100644
--- a/src/app-pages/project/uploader/modals/newConfiguration.jsx
+++ b/src/app-pages/project/uploader/modals/newConfiguration.jsx
@@ -1,18 +1,35 @@
import React, { useEffect, useState } from 'react';
-import { Autocomplete, FormControl, Input, InputLabel, TextField } from '@mui/material';
+import {
+ Autocomplete,
+ FormControl,
+ Input,
+ InputLabel,
+ TextField,
+} from '@mui/material';
import { MuiFileInput } from 'mui-file-input';
import { useQueryClient } from '@tanstack/react-query';
import * as Modal from '../../../../app-components/modal';
import FormGen from './_formGen.jsx';
import GeneralColumnFields from './_generalColumnFields.jsx';
-import { buildTimezoneOptions, extractFields, fileTypeByExtension, parseFile } from '../helper.js';
+import {
+ buildTimezoneOptions,
+ buildXLSXSheetOptions,
+ extractFields,
+ fileTypeByExtension,
+ getTimezoneOption,
+ parseFile,
+ parseXLSXFile,
+} from '../helper.js';
import { useGetTimezoneDomain } from '../../../../app-services/collections/domains.ts';
-import { useCreateUploadConfigurationMappingMutation, useCreateUploadConfigurationMutation } from '../../../../app-services/collections/uploader.ts';
+import {
+ useCreateUploadConfigurationMappingMutation,
+ useCreateUploadConfigurationMutation,
+} from '../../../../app-services/collections/uploader.ts';
const formControlStyles = { backgroundColor: '#fff' };
-const cleanConfig = (columnConfig) => {
+const cleanConfig = columnConfig => {
const keys = Object.keys(columnConfig);
const ret = {};
@@ -20,9 +37,9 @@ const cleanConfig = (columnConfig) => {
if (typeof columnConfig[key] === 'boolean') {
ret[key] = columnConfig[key];
} else {
- ret[key] = columnConfig[key].value;
+ ret[key] = columnConfig[key]?.value;
}
- })
+ });
return ret;
};
@@ -33,19 +50,36 @@ const generateDefaultColumnConfig = (isEdit, columnConfig) => {
console.log('test config:', columnConfig);
// @TODO
+ return {};
};
-const NewConfigurationModal = ({ projectId, isEdit, configuration, mappings }) => {
- const { name, description, ...rest } = configuration || {};
+const generateDefaultMappingConfig = (isEdit, mappings) => {
+ if (!isEdit) return {};
+
+ console.log('test config:', mappings);
+
+ // @TODO
+ return {};
+};
+
+const NewConfigurationModal = ({
+ projectId,
+ isEdit,
+ configuration,
+ mappings,
+}) => {
+ const { name, description, tz_name, ...rest } = configuration || {};
const [file, setFile] = useState(null);
const [parsed, setParsed] = useState(undefined);
const [configName, setConfigName] = useState(name);
const [desc, setDesc] = useState(description);
- const [timezone, setTimezone] = useState(undefined);
+ const [timezone, setTimezone] = useState(getTimezoneOption(tz_name));
const [columnConfig, setColumnConfig] = useState(generateDefaultColumnConfig(isEdit, rest));
- const [mappingConfig, setMappingConfig] = useState({});
+ const [mappingConfig, setMappingConfig] = useState(generateDefaultMappingConfig(isEdit, mappings));
+ const [worksheet, setWorksheet] = useState(null);
+ const [worksheetOptions, setWorksheetOptions] = useState([]);
const { name: fileName } = file || {};
const fileType = fileTypeByExtension(fileName);
@@ -53,15 +87,31 @@ const NewConfigurationModal = ({ projectId, isEdit, configuration, mappings }) =
const client = useQueryClient();
const { data: timezones, isLoading } = useGetTimezoneDomain();
- const createMappingMutator = useCreateUploadConfigurationMappingMutation(client);
+ const createMappingMutator =
+ useCreateUploadConfigurationMappingMutation(client);
- const saveMappings = (body) => {
+ const saveMappings = body => {
const { id } = body;
const keys = Object.keys(mappingConfig) || [];
- const formData = keys.map(key => ({
- field_name: key,
- timeseries_id: mappingConfig[key].value,
- }));
+ const formData = keys
+ .map(key => {
+ const { isInstrument, fields } = mappingConfig[key];
+
+ if (isInstrument) {
+ const fieldKeys = Object.keys(fields) || [];
+ return fieldKeys.map(field => ({
+ field_name: field,
+ timeseries_id: mappingConfig[key].fields[field].value,
+ instrument_field_name: key,
+ }));
+ } else {
+ return {
+ field_name: key,
+ timeseries_id: mappingConfig[key].value,
+ };
+ }
+ })
+ .flat();
createMappingMutator.mutate({
projectId,
@@ -70,7 +120,10 @@ const NewConfigurationModal = ({ projectId, isEdit, configuration, mappings }) =
});
};
- const createConfigMutator = useCreateUploadConfigurationMutation(client, saveMappings);
+ const createConfigMutator = useCreateUploadConfigurationMutation(
+ client,
+ saveMappings,
+ );
const saveNewConfiguration = () => {
const formData = {
@@ -78,6 +131,7 @@ const NewConfigurationModal = ({ projectId, isEdit, configuration, mappings }) =
description: desc,
tz_name: timezone.value,
type: fileType,
+ xlsx_sheet_name: worksheet?.value,
...cleanConfig(columnConfig),
};
@@ -88,21 +142,37 @@ const NewConfigurationModal = ({ projectId, isEdit, configuration, mappings }) =
};
useEffect(() => {
- if (file) {
- parseFile(file, (results) => setParsed(results));
+ if (file && fileType) {
+ if (['csv', 'toa5', 'dux'].includes(fileType)) {
+ parseFile(file, results => setParsed(results));
+ } else if (fileType === 'xlsx') {
+ if (worksheet) {
+ parseXLSXFile(file, worksheet.value, results => setParsed(results));
+ }
+ } else {
+ throw new Error(`Invalid fileType: ${fileType}.`);
+ }
setColumnConfig({});
}
- }, [file]);
+ }, [file, fileType, worksheet]);
+
+ useEffect(() => {
+ if (file && fileType === 'xlsx') {
+ buildXLSXSheetOptions(file, res => setWorksheetOptions(res));
+ }
+ }, [file, fileType]);
return (
-
+
- The file selected will NOT be uploaded and will only be used to generate the mapping table below.
+ The file selected will NOT be uploaded and will only be used to generate
+ the mapping table below.
+
+ {fileType === 'xlsx' && (
+ (
+
+ )}
+ value={worksheet}
+ onChange={(_e, val) => setWorksheet(val)}
+ />
+ )}
{!!parsed && (
<>
- Configuration Name
+
+ Configuration Name
+
setConfigName(e.target.value)}
+ onChange={e => setConfigName(e.target.value)}
/>
-
- Description
+
+
+ Description
+
setDesc(e.target.value)}
+ onChange={e => setDesc(e.target.value)}
/>
{!isLoading && (
- }
- isOptionEqualToValue={(opt, val) => opt.id === val.id}
- onChange={(_e, val) => setTimezone(val)}
- />
+ (
+
+ )}
+ isOptionEqualToValue={(opt, val) => opt.id === val.id}
+ value={timezone}
+ onChange={(_e, val) => setTimezone(val)}
+ />
)}
setColumnConfig(prev => ({ ...prev, [fieldName]: val }))}
+ onChange={(fieldName, val) =>
+ setColumnConfig(prev => ({ ...prev, [fieldName]: val }))
+ }
+ />
+ setMappingConfig(c)}
/>
- setMappingConfig(c)} />
)}
diff --git a/src/app-pages/project/uploader/modals/uploadFile.jsx b/src/app-pages/project/uploader/modals/uploadFile.jsx
index 9b0f30e9..1b4da1d1 100644
--- a/src/app-pages/project/uploader/modals/uploadFile.jsx
+++ b/src/app-pages/project/uploader/modals/uploadFile.jsx
@@ -1,27 +1,13 @@
import React, { useEffect, useState } from 'react';
import { Checkbox, FormControlLabel } from '@mui/material';
import { MuiFileInput } from 'mui-file-input';
-import { readString } from 'react-papaparse';
import { Icon } from '@iconify/react';
import { useQueryClient } from '@tanstack/react-query';
import * as Modal from '../../../../app-components/modal';
-import { extractFields } from '../helper';
+import { extractFields, fileTypeByExtension, parseFile, parseXLSXFile } from '../helper';
import { useUploadFile } from '../../../../app-services/collections/uploader.ts';
-const parseFile = async (file, onComplete) => {
- const text = await file.text();
-
- readString(text, {
- worker: true,
- header: false,
- skipEmptyLines: true,
- complete: (results) => {
- onComplete(results);
- },
- });
-};
-
const getFieldsInformation = (configuration, mappings, fileData) => {
const { type, time_field, comment_field, comment_field_enabled, masked_field, masked_field_enabled, validated_field, validated_field_enabled } = configuration || {};
@@ -41,7 +27,7 @@ const getFieldsInformation = (configuration, mappings, fileData) => {
};
const UploadFile = ({ configuration, mappings, projectId }) => {
- const { id, type } = configuration || {};
+ const { id, type, xlsx_sheet_name } = configuration || {};
const [file, setFile] = useState(null);
const [fileData, setFileData] = useState(undefined);
@@ -51,6 +37,8 @@ const UploadFile = ({ configuration, mappings, projectId }) => {
const uploadFileMutator = useUploadFile(client);
const { missingFields } = getFieldsInformation(configuration, mappings, fileData);
+ const { name: fileName } = file || {};
+ const fileType = fileTypeByExtension(fileName);
const uploadFile = () => {
const body = new FormData();
@@ -60,10 +48,16 @@ const UploadFile = ({ configuration, mappings, projectId }) => {
};
useEffect(() => {
- if (file) {
- parseFile(file, (res) => setFileData(res));
+ if (file && fileType) {
+ if (['csv', 'toa5', 'dux'].includes(fileType)) {
+ parseFile(file, results => setFileData(results));
+ } else if (fileType === 'xlsx') {
+ parseXLSXFile(file, xlsx_sheet_name, results => setFileData(results));
+ } else {
+ throw new Error(`Invalid fileType: ${fileType}.`);
+ }
}
- }, [file]);
+ }, [file, fileType]);
return (
diff --git a/src/app-services/collections/domains.ts b/src/app-services/collections/domains.ts
index 7cf835fc..ca8e1abb 100644
--- a/src/app-services/collections/domains.ts
+++ b/src/app-services/collections/domains.ts
@@ -10,4 +10,14 @@ export const useGetTimezoneDomain = (opts: ClientQueryOptions) => {
queryFn: () => apiGet(uri),
...opts,
});
-};
\ No newline at end of file
+};
+
+export const useGetDomainsByGroup = (opts: ClientQueryOptions) => {
+ const uri = `/domains/groups`;
+
+ return useQuery({
+ queryKey: [`domainGroups`],
+ queryFn: () => apiGet(uri),
+ ...opts,
+ });
+};
diff --git a/src/common/forms/instrument-form.jsx b/src/common/forms/instrument-form.jsx
index e96997f3..b1b8bb49 100644
--- a/src/common/forms/instrument-form.jsx
+++ b/src/common/forms/instrument-form.jsx
@@ -226,7 +226,8 @@ export default connect(
{(
findDomainItem('instrument_type', 'SAA')?.id === type_id ||
- findDomainItem('instrument_type', 'IPI')?.id === type_id
+ findDomainItem('instrument_type', 'IPI')?.id === type_id ||
+ findDomainItem('instrument_type', 'Inclinometer')?.id === type_id
) && (