Fix incorrect report config request body schemas (#222)

* npm audit fix * fix create/update report config schema issues; add toast notifications * clean up unused vars * replace update with create in toast notification
USACE · Jun 27, 2024 · b0238d1 · b0238d1
1 parent 0f0442e
commit b0238d1
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app-bundles/report-configurations-bundle.js b/src/app-bundles/report-configurations-bundle.js
@@ -1,3 +1,7 @@
+import { toast } from 'react-toastify';
+
+import { tUpdateError, tUpdateSuccess } from '../common/helpers/toast-helpers';
+
 export default {
   name: 'reportConfigurations',
   getReducer: () => {
@@ -40,6 +44,7 @@ export default {
   },
 
   doCreateNewReportConfiguration: (data) => ({ store, apiPost }) => {
+    const toastId = toast.loading('Creating Report Configuration...');
     const projectId = store.selectProjectsIdByRoute()?.projectId;
     const uri = `/projects/${projectId}/report_configs`;
 
@@ -50,30 +55,24 @@ export default {
 
     apiPost(uri, body, (err, _body) => {
       if (err) {
-        // eslint-disable-next-line no-console
-        console.log('todo', err);
+        tUpdateError(toastId, "Failed to create Report Configuration");
       } else {
+        tUpdateSuccess(toastId, "Successfully created Report Configuration");
         store.doFetchReportConfigurationsByProjectId();
       }
     });
   },
 
   doUpdateReportConfiguration: (data) => ({ store, apiPut }) => {
-    const { id, name, description, plot_configs } = data;
+    const toastId = toast.loading('Updating Report Configuration...');
     const projectId = store.selectProjectsIdByRoute()?.projectId;
+    const uri = `/projects/${projectId}/report_configs/${data?.id}`;
 
-    const uri = `/projects/${projectId}/report_configs/${id}`;
-    const body = {
-      name,
-      description,
-      plot_configs,
-    };
-
-    apiPut(uri, body, (err, _body) => {
+    apiPut(uri, data, (err, _body) => {
       if (err) {
-        // eslint-disable-next-line no-console
-        console.log('todo', err);
+        tUpdateError(toastId, "Failed to update Report Configuration");
       } else {
+        tUpdateSuccess(toastId, "Successfully updated Report Configuration");
         store.doFetchReportConfigurationsByProjectId();
       }
     });

diff --git a/src/app-pages/project/batch-plotting/helper.js b/src/app-pages/project/batch-plotting/helper.js
@@ -38,6 +38,7 @@ export const generateNewChartData = (measurements, timeseries, chartSettings, pl
         } = timeseries.find(t => t.id === timeseries_id) || {};
 
         if (!instrument) {
+          // eslint-disable-next-line no-console
           console.error('Error: timeseries id (%s) does not exist in `timeseries` array.', String(timeseries_id));
           return;
         }

diff --git a/src/app-pages/project/batch-plotting/modals/components/SecondaryAxis.jsx b/src/app-pages/project/batch-plotting/modals/components/SecondaryAxis.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Button, Divider, FormControl, Input, InputLabel, MenuItem, Select } from '@mui/material';
+import { Button, FormControl, Input, InputLabel, MenuItem, Select } from '@mui/material';
 import { connect } from 'redux-bundler-react';
 
 const generateTimeseriesOptions = (timeseriesIds = [], timeseries = []) => {

diff --git a/src/app-pages/project/batch-plotting/tab-content/batch-plot-chart.jsx b/src/app-pages/project/batch-plotting/tab-content/batch-plot-chart.jsx
@@ -9,15 +9,15 @@ import ChartErrors from '../components/batch-plot-errors';
 import { generateNewChartData } from '../helper';
 
 const BatchPlotChart = connect(
-  'doPrintSetData',
+  // 'doPrintSetData',
   'doTimeseriesMeasurementsFetchById',
   'doBatchPlotConfigurationsSave',
   'selectBatchPlotConfigurationsActiveId',
   'selectBatchPlotConfigurationsItemsObject',
   'selectTimeseriesMeasurementsItems',
   'selectInstrumentTimeseriesItems',
   ({
-    doPrintSetData,
+    // doPrintSetData,
     doTimeseriesMeasurementsFetchById,
     doBatchPlotConfigurationsSave,
     batchPlotConfigurationsActiveId: activeId,

diff --git a/src/app-pages/project/dashboard/modals/newReportConfigContent.jsx b/src/app-pages/project/dashboard/modals/newReportConfigContent.jsx
@@ -29,11 +29,11 @@ const initFormState = (initValue = {}) => {
       },
       show_masked: {
         enabled: false,
-        value: '',
+        value: true,
       },
       show_nonvalidated: {
         enabled: false,
-        value: '',
+        value: true,
       }
     },
   } = initValue;
@@ -234,7 +234,7 @@ const NewReportConfigContent = connect(
                   size='small'
                   id='masked-select'
                   value={String(formState?.global_overrides?.show_masked?.value)}
-                  onChange={e => setFormState(prev => setGlobalOverrides(prev, 'show_masked', 'value', String(e.target.value)))}
+                  onChange={e => setFormState(prev => setGlobalOverrides(prev, 'show_masked', 'value', Boolean(e.target.value)))}
                   sx={{ width: '250px' }}
                 >
                   <MenuItem value='false'>Hide Masked Values</MenuItem>
@@ -254,7 +254,7 @@ const NewReportConfigContent = connect(
                   size='small'
                   id='non-validated-select'
                   value={String(formState?.global_overrides?.show_nonvalidated?.value)}
-                  onChange={e => setFormState(prev => setGlobalOverrides(prev, 'show_nonvalidated', 'value', String(e.target.value)))}
+                  onChange={e => setFormState(prev => setGlobalOverrides(prev, 'show_nonvalidated', 'value', Boolean(e.target.value)))}
                   sx={{ width: '250px' }}
                 >
                   <MenuItem value='false'>Hide Non-Validated Values</MenuItem>