bugfix/uploader-timeseries-id (#236)

* fix options that render via fieldmap key instead of from csv data source * filter TS by standard
USACE · Aug 23, 2024 · 23c3931 · 23c3931
1 parent 7867570
commit 23c3931
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hhd-ui",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "private": true,
   "dependencies": {
     "@ag-grid-community/client-side-row-model": "^30.0.3",

diff --git a/src/app-bundles/upload-bundle.js b/src/app-bundles/upload-bundle.js
@@ -395,8 +395,8 @@ const uploadBundle = {
                   ? setAllTo[1] === 'true'
                   : setAllTo[1];
             } else {
-              // If field not mapped, set to null; if required field, push error
-              const data = row[sourceKey];
+              const data = config.useFieldMapKey ? fieldMap[key] : row[sourceKey];
+
               if (!data) {
                 parsedRow[key] = null;
                 if (config.required) parsedRow.errors.push(key);

diff --git a/src/upload-parsers/inclinometer_measurements.js b/src/upload-parsers/inclinometer_measurements.js
@@ -33,6 +33,7 @@ const inclinometerMeasurementParser = {
       type: 'internal',
       required: true,
       useFilterComponent: true,
+      useFieldMapKey: true,
       provider: state => {
         return Object.keys(state.instrumentTimeseries)
           .filter(key => key.charAt(0) !== '_')

diff --git a/src/upload-parsers/timeseries.js b/src/upload-parsers/timeseries.js
@@ -22,6 +22,7 @@ const timeseriesParser = {
       type: 'internal',
       required: true,
       useFilterComponent: true,
+      useFieldMapKey: true,
       hideCsvMappings: true,
       provider: state => (
         Object.keys(state.instruments)

diff --git a/src/upload-parsers/timeseries_measurements.js b/src/upload-parsers/timeseries_measurements.js
@@ -29,9 +29,10 @@ const timeseriesMeasurementParser = {
       type: 'internal',
       required: true,
       useFilterComponent: true,
+      useFieldMapKey: true,
       provider: state => {
         return Object.keys(state.instrumentTimeseries)
-          .filter(key => key.charAt(0) !== '_')
+          .filter(key => key.charAt(0) !== '_' && state.instrumentTimeseries[key].type === 'standard')
           .map(key => ({
             value: key,
             text: `${state.instrumentTimeseries[key].instrument} - ${state.instrumentTimeseries[key].name}`,