stable - v0.15.0

USACE · Jan 30, 2024 · 7752351 · 7752351
2 parents 00a5674 + ca8dc1b
commit 7752351
Show file tree

Hide file tree

Showing 84 changed files with 1,710 additions and 830 deletions.
diff --git a/.env.production b/.env.production
@@ -1,6 +1,7 @@
-VITE_ALERT_EDITOR: false
-VITE_FORMULA_EDITOR: true
-VITE_INSTRUMENT_CHART: true
-VITE_CROSS_SECTION: true
-VITE_DEVELOPMENT_BANNER: false
-VITE_API_URL: https://midas.sec.usace.army.mil/api
+VITE_ALERT_EDITOR=false
+VITE_FORMULA_EDITOR=true
+VITE_INSTRUMENT_CHART=true
+VITE_CROSS_SECTION=true
+VITE_DEVELOPMENT_BANNER=false
+VITE_API_URL=https://midas.sec.usace.army.mil/api
+VITE_URL_BASE_PATH=/midas
diff --git a/.env.test b/.env.test
@@ -1,6 +1,7 @@
-VITE_ALERT_EDITOR: false
-VITE_FORMULA_EDITOR: true
-VITE_INSTRUMENT_CHART: true
-VITE_CROSS_SECTION: true
-VITE_DEVELOPMENT_BANNER: false
-VITE_API_URL: https://midas-test.cwbi.us/api
+VITE_ALERT_EDITOR=false
+VITE_FORMULA_EDITOR=true
+VITE_INSTRUMENT_CHART=true
+VITE_CROSS_SECTION=true
+VITE_DEVELOPMENT_BANNER=false
+VITE_API_URL=https://midas-test.cwbi.us/api
+VITE_URL_BASE_PATH=/midas
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -17,7 +17,9 @@ jobs:
       VITE_INSTRUMENT_CHART: true
       VITE_CROSS_SECTION: true
       VITE_DEVELOPMENT_BANNER: true
+      VITE_MOVING_BANNER: true
       VITE_API_URL: https://develop-midas-api.rsgis.dev
+      VITE_URL_BASE_PATH: ''
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
@@ -14,6 +14,8 @@ jobs:
     env:
       VITE_FORMULA_EDITOR: true
       VITE_API_URL: https://midas-api.rsgis.dev
+      VITE_URL_BASE_PATH: ''
+      VITE_MOVING_BANNER: true
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hhd-ui",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "private": true,
   "dependencies": {
     "@ag-grid-community/client-side-row-model": "^30.0.3",

diff --git a/src/App.jsx b/src/App.jsx
@@ -3,6 +3,7 @@ import { connect } from 'redux-bundler-react';
 import { ToastContainer } from 'react-toastify';
 
 import Modal from './app-components/modal';
+import MovingBanner from './common/moving-banner';
 import NavBar from './app-components/navigation';
 import PageContent from './app-components/pageContent';
 
@@ -13,11 +14,14 @@ import './css/bootstrap/css/bootstrap.water.min.css';
 import './css/ms/css/mapskin.min.css';
 import './css/index.scss';
 
+const isMovingBannerActive = import.meta.env.VITE_MOVING_BANNER === 'true';
+
 export default connect('selectRoute', ({ route: Route }) => (
   <>
     <NavBar theme='primary' />
     <ToastContainer autoClose={3500} hideProgressBar={false} />
     <PageContent>
+      {isMovingBannerActive && <MovingBanner />}
       <Route />
     </PageContent>
     <Modal closeWithEscape />

diff --git a/src/app-bundles/batch-plot-configurations-bundle.js b/src/app-bundles/batch-plot-configurations-bundle.js
@@ -36,7 +36,7 @@ export default createRestBundle({
     selectInstrumentsByBatchPlotConfigurationsGeoJSON: createSelector(
       'selectInstrumentsItems',
       'selectBatchPlotConfigurationsItems',
-      'selectInstrumentTimeseriesItemsByRoute',
+      'selectInstrumentTimeseriesItems',
       'selectBatchPlotConfigurationsActiveId',
       (instruments, batchPlotConfigurations, timeseries, activeId) => {
         const instrumentMap = {};

diff --git a/src/app-bundles/collection-group-bundle.js b/src/app-bundles/collection-group-bundle.js
@@ -20,11 +20,11 @@ export default createRestBundle({
   urlParamSelectors: ['selectProjectsIdByRoute'],
   prefetch: (store) => {
     const hash = store.selectHash();
-    const url = store.selectUrlObject();
+    const pathname = store.selectRelativePathname();
     const whiteList = ['dashboard'];
 
     return (
-      whiteList.includes(hash) || url.pathname.includes('/collection-groups/')
+      whiteList.includes(hash) || pathname.includes('/collection-groups/')
     );
   },
   addons: {

diff --git a/src/app-bundles/create-auth-bundle.js b/src/app-bundles/create-auth-bundle.js
@@ -61,7 +61,7 @@ const createAuthBundle = (opts) => {
         try {
           xhr(url, (err, response, body) => {
             if (err) {
-              throw new Error('Login Response not ok');
+              throw new Error(`Login Response not ok. ${err}`);
             } else {
               const token = typeof body === 'string' ? body : JSON.parse(body);
               dispatch({
@@ -89,7 +89,7 @@ const createAuthBundle = (opts) => {
         });
         store.doRemoveProfile();
         const redirect = store.selectAuthRedirectOnLogout();
-        if (redirect) store.doUpdateUrl(redirect);
+        if (redirect) store.doUpdateRelativeUrl(redirect);
       }
     },
 

diff --git a/src/app-bundles/create-jwt-api-bundle.js b/src/app-bundles/create-jwt-api-bundle.js
@@ -151,6 +151,7 @@ const createJwtApiBundle = (opts) => {
           const options = {
             method: 'GET',
           };
+
           if (!shouldSkipToken(options.method, path, unless)) {
             const token = store[tokenSelector]();
             if (!token) return null;

diff --git a/src/app-bundles/create-url-base-path-bundle.js b/src/app-bundles/create-url-base-path-bundle.js
@@ -0,0 +1,13 @@
+import { createSelector } from "redux-bundler";
+
+export default ({ base }) => {
+  return {
+    name: 'urlBasePath',
+
+    selectRelativePathname: createSelector('selectPathname', pathname => pathname.replace(base, '')),
+
+    doUpdateRelativeUrl: (url, opts) => ({ store }) => {
+      store.doUpdateUrl(`${base}${url}`, opts)
+    },
+  }
+};
diff --git a/src/app-bundles/data-logger-bundle.js b/src/app-bundles/data-logger-bundle.js
@@ -54,8 +54,8 @@ export default {
     });
   },
 
-  doFetchDataLoggerPreview: ({ dataLoggerId }) => ({ dispatch, apiGet }) => {
-    const uri = `/datalogger/${dataLoggerId}/preview`;
+  doFetchDataLoggerPreview: ({ dataLoggerId, tableId }) => ({ dispatch, apiGet }) => {
+    const uri = `/datalogger/${dataLoggerId}/tables/${tableId}/preview`;
 
     apiGet(uri, (err, body) => {
       if (err) {

diff --git a/src/app-bundles/data-logger-equivalency-bundle.js b/src/app-bundles/data-logger-equivalency-bundle.js
@@ -23,8 +23,8 @@ export default {
   selectDataLoggerEquivalencyRaw: state => state.dataLoggerEquivalency,
   selectDataLoggerEquivalencyTable: state => state.dataLoggerEquivalency.table,
 
-  doFetchDataLoggerEquivalency: ({ dataLoggerId }) => ({ dispatch, apiGet }) => {
-    const uri = `/datalogger/${dataLoggerId}/equivalency_table`;
+  doFetchDataLoggerEquivalency: ({ dataLoggerId, tableId }) => ({ dispatch, apiGet }) => {
+    const uri = `/datalogger/${dataLoggerId}/tables/${tableId}/equivalency_table`;
 
     apiGet(uri, (err, body) => {
       if (err) {
@@ -39,18 +39,42 @@ export default {
     });
   },
 
-  doCreateDataLoggerEquivalency: ({ dataLoggerId, newRows = [], unusedRows = [], isDeleteChecked = false }) => ({ store, apiPost }) => {
+  doCreateEquivalencyByTableName: ({ dataLoggerId, tableName, newRows }) => ({ store, apiPost }) => {
     const uri = `/datalogger/${dataLoggerId}/equivalency_table`;
 
+    const payload = {
+      datalogger_id: dataLoggerId,
+      datalogger_table_name: tableName,
+      rows: newRows.map(row => ({
+        field_name: row,
+        display_name: row,
+      })),
+    };
+
+    apiPost(uri, payload, (err, _body) => {
+      if (err) {
+        // eslint-disable-next-line no-console
+        console.log('todo', err);
+      } else {
+        store.doFetchDataLoggersByProjectId();
+      }
+    });
+  },
+
+  doAutoMapDataLoggerEquivalency: ({ dataLoggerId, tableId, tableName, newRows = [], unusedRows = [], isDeleteChecked = false }) => ({ store, apiPost }) => {
+    const uri = `/datalogger/${dataLoggerId}/tables/${tableId}/equivalency_table`;
+
     if (isDeleteChecked) {
       unusedRows.forEach(el => {
         const { id } = el;
         store.doDeleteDataLoggerEquivalencyRow({ dataLoggerId, id, refreshData: false });
       });
     }
-    
+
     const payload = {
       datalogger_id: dataLoggerId,
+      datalogger_table_id: tableId,
+      datalogger_table_name: tableName,
       rows: newRows.map(row => ({
         field_name: row,
         display_name: row,
@@ -62,18 +86,19 @@ export default {
         // eslint-disable-next-line no-console
         console.log('todo', err);
       } else {
-        store.doFetchDataLoggerEquivalency({ dataLoggerId });
+        store.doFetchDataLoggerEquivalency({ dataLoggerId, tableId });
       }
     });
   },
 
   doUpdateSingleDataLoggerEquivalency: (data) => ({ store, apiPut }) => {
-    const { dataLoggerId, id, fieldName, displayName, instrumentId, timeseriesId } = data;
-    const uri = `/datalogger/${dataLoggerId}/equivalency_table`;
+    const { dataLoggerId, tableId, id, fieldName, displayName, instrumentId, timeseriesId } = data;
+    const uri = `/datalogger/${dataLoggerId}/tables/${tableId}/equivalency_table`;
     // const toastId = toast.loading('Updating Field Mapping...');
 
     const payload = {
       datalogger_id: dataLoggerId,
+      datalogger_table_id: tableId,
       rows: [
         {
           id,
@@ -91,18 +116,19 @@ export default {
         console.log('test err: ', JSON.stringify(err));
         // tUpdateError(toastId, 'Failed');
       } else {
-        store.doFetchDataLoggerEquivalency({ dataLoggerId });
+        store.doFetchDataLoggerEquivalency({ dataLoggerId, tableId });
         // tUpdateSuccess(toastId, 'Successfully updated Field Mapping!');
       }
     });
   },
 
   // For use in auto-assigning only.
-  doUpdateMultipleDataLoggerEquivalency: (dataLoggerId, rows, toastId) => ({ store, apiPut }) => {
-    const uri = `/datalogger/${dataLoggerId}/equivalency_table`;
+  doUpdateMultipleDataLoggerEquivalency: (dataLoggerId, tableId, rows, toastId) => ({ store, apiPut }) => {
+    const uri = `/datalogger/${dataLoggerId}/tables/${tableId}/equivalency_table`;
 
     const payload = {
       datalogger_id: dataLoggerId,
+      datalogger_table_id: tableId,
       rows,
     };
 
@@ -113,21 +139,21 @@ export default {
         tUpdateError(toastId, 'Failed to assign timeseries to field names. Please try again later.');
       } else {
         tUpdateSuccess(toastId, 'Successfully assigned timeseries to field names!');
-        store.doFetchDataLoggerEquivalency({ dataLoggerId });
+        store.doFetchDataLoggerEquivalency({ dataLoggerId, tableId });
       }
     });
   },
 
-  doDeleteDataLoggerEquivalencyRow: ({ dataLoggerId, id, refreshData = true }) => ({ store, apiDelete }) => {
-    const uri = `/datalogger/${dataLoggerId}/equivalency_table/row?id=${id}`;
+  doDeleteDataLoggerEquivalencyRow: ({ dataLoggerId, tableId, id, refreshData = true }) => ({ store, apiDelete }) => {
+    const uri = `/datalogger/${dataLoggerId}/tables/${tableId}/equivalency_table/row/${id}`;
 
     apiDelete(uri, (err, _body) => {
       if (err) {
         // eslint-disable-next-line no-console
         console.log('todo', err);
       } else {
         if (refreshData) {
-          store.doFetchDataLoggerEquivalency({ dataLoggerId });
+          store.doFetchDataLoggerEquivalency({ dataLoggerId, tableId });
         }
       }
     });

diff --git a/src/app-bundles/districts-bundle.js b/src/app-bundles/districts-bundle.js
@@ -0,0 +1,36 @@
+export default {
+  name: 'districts',
+  getReducer: () => {
+    const initData = {
+      districts: [],
+    };
+
+    return (state = initData, { type, payload }) => {
+      switch (type) {
+        case 'UPDATE_DISTRICT_DATA':
+          return {
+            ...state,
+            districts: payload,
+          };
+        default:
+          return state;
+      }
+    };
+  },
+
+  selectDistrictsRaw: (state) => state.districts,
+  selectDistricts: (state) => state.districts.districts,
+
+  doFetchDistricts: () => ({ apiGet, dispatch }) => {
+    const url = `/districts`;
+
+    apiGet(url, (err, body) => {
+      if (err) {
+        // eslint-disable-next-line no-console
+        console.log('error: ', err);
+      } else {
+        dispatch({ type: 'UPDATE_DISTRICT_DATA', payload: body });
+      }
+    });
+  },
+};
diff --git a/src/app-bundles/home-data-bundle.js b/src/app-bundles/home-data-bundle.js
@@ -11,11 +11,7 @@ export default createRestBundle({
   getTemplate: '/home',
   fetchActions: ['URL_UPDATED', 'AUTH_LOGGED_IN'],
   forceFetchActions: [],
-  prefetch: store => {
-    const url = store.selectUrlObject();
-
-    return url.pathname === '/';
-  },
+  prefetch: store => store.selectRelativePathname() === '/',
   addons: {
     selectHomeData: createSelector('selectHomeItems', (items) => {
       const data = items && items.length ? items[0] : null;

diff --git a/src/app-bundles/inclinometer-measurements.js b/src/app-bundles/inclinometer-measurements.js
@@ -25,12 +25,12 @@ export default createRestBundle({
   mergeItems: true,
   prefetch: (store) => {
     const hash = store.selectHash();
-    const url = store.selectUrlObject();
+    const pathname = store.selectRelativePathname();
 
     const whitelist = [];
     const pathnameWhitelist = ['/instruments/', '/groups/', '/collection-groups/'];
 
-    return whitelist.includes(hash) || pathnameWhitelist.some(elem => url.pathname.includes(elem));
+    return whitelist.includes(hash) || pathnameWhitelist.some(elem => pathname.includes(elem));
   },
   addons: {
     doFetchInclinometerMeasurementsByTimeseriesId: (timeseriesId) => ({ dispatch, apiGet }) => {