Cleaned up /metaChart and associated code (#47)

* remove metachart endpoint and associated references

* cleaned up and removed chartMetaData and associated code from frontend

* comment out all metachartdata

* merge main

* resolve merge conflict

* correction of formatting and residues

* clean up rebase

Author: marodins

.gitignore

@@ -143,6 +143,7 @@ thumb
 sketch
 
 ### VisualStudioCode ###
+.vscode/
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json

backend/src/controllers/databaseController.js

@@ -64,7 +64,7 @@ class DatabaseController {
             throw new Error('Not connected');
         }
     }
-
+    /*
     async getMetaChart(req, res, next) {
         let databaseService = sessionService.get(req.sessionID);
         if (databaseService.isConnected()) {
@@ -88,7 +88,7 @@ class DatabaseController {
         } else {
             throw new Error('Not connected');
         }
-    }
+    }*/
 }
 
 module.exports = DatabaseController;

backend/src/routes/databaseRouter.js

@@ -27,6 +27,6 @@ router.get("/", wrap(databaseController.getStatus));
 router.post("/connect", wrap(databaseController.connectDatabase));
 router.get("/disconnect", wrap(databaseController.disconnectDatabase));
 router.get("/meta", wrap(databaseController.getMetadata));
-router.get("/metaChart", wrap(databaseController.getMetaChart));
+// router.get("/metaChart", wrap(databaseController.getMetaChart));
 
 module.exports = router;

backend/src/services/databaseService.js

@@ -67,7 +67,7 @@ class DatabaseService {
         }
         return metadata;
     }
-
+    /*
     async getGraphLabels() {
         let graphRepository = this._graphRepository;
         let queryResult = {};
@@ -93,7 +93,7 @@ class DatabaseService {
         let queryResult = await graphRepository.execute(query);
 
         return queryResult.rows;
-    }
+    }*/
 
     async readMetaData(graphName){
         let gr = this._graphRepository;

frontend/src/components/contents/containers/Contents.js

@@ -19,14 +19,14 @@
 
 import { connect } from 'react-redux';
 import { getConnectionStatus } from '../../../features/database/DatabaseSlice';
-import { getMetaData, getMetaChartData } from '../../../features/database/MetadataSlice';
+import { getMetaData/* getMetaChartData */ } from '../../../features/database/MetadataSlice';
 import Contents from '../presentations/Contents';
 
 const mapStateToProps = (state) => ({
   database: state.database,
   isActive: state.navigator.isActive,
 });
 
-const mapDispatchToProps = { getConnectionStatus, getMetaData, getMetaChartData };
+const mapDispatchToProps = { getConnectionStatus, getMetaData /* getMetaChartData */ };
 
 export default connect(mapStateToProps, mapDispatchToProps)(Contents);

frontend/src/components/contents/presentations/Contents.jsx

@@ -24,7 +24,7 @@ import FramesContainer from '../containers/Frames';
 import styles from './Contents.module.scss';
 
 const Contents = ({
-  database, isActive, getConnectionStatus, getMetaData, getMetaChartData,
+  database, isActive, getConnectionStatus, getMetaData, /* getMetaChartData, */
 }) => {
   const dispatch = useDispatch();
 
@@ -34,7 +34,7 @@ const Contents = ({
         getConnectionStatus().then((response) => {
           if (response.type === 'database/getConnectionStatus/fulfilled') {
             getMetaData();
-            getMetaChartData();
+            /* getMetaChartData(); */
           }
         });
       });
@@ -57,7 +57,7 @@ Contents.propTypes = {
   isActive: PropTypes.bool.isRequired,
   getConnectionStatus: PropTypes.func.isRequired,
   getMetaData: PropTypes.func.isRequired,
-  getMetaChartData: PropTypes.func.isRequired,
+  /* getMetaChartData: PropTypes.func.isRequired, */
 };
 
 export default Contents;

frontend/src/components/frame/containers/ServerConnectContainer.js

@@ -19,7 +19,7 @@
 
 import { connect } from 'react-redux';
 import { connectToDatabase } from '../../../features/database/DatabaseSlice';
-import { getMetaChartData, getMetaData } from '../../../features/database/MetadataSlice';
+import { /* getMetaChartData, */ getMetaData } from '../../../features/database/MetadataSlice';
 import {
   addFrame, pinFrame, removeFrame, trimFrame,
 } from '../../../features/frame/FrameSlice';
@@ -36,7 +36,7 @@ const mapDispatchToProps = {
   pinFrame,
   addAlert,
   getMetaData,
-  getMetaChartData,
+  /* getMetaChartData, */
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(ServerConnectFrame);

frontend/src/components/frame/presentations/ServerConnectFrame.jsx

@@ -29,7 +29,7 @@ import styles from './ServerConnectFrame.module.scss';
 import { connectToDatabase as connectToDatabaseApi, changeGraph } from '../../../features/database/DatabaseSlice';
 import { addAlert } from '../../../features/alert/AlertSlice';
 import { addFrame, trimFrame } from '../../../features/frame/FrameSlice';
-import { getMetaChartData, getMetaData } from '../../../features/database/MetadataSlice';
+import { /* getMetaChartData, */ getMetaData } from '../../../features/database/MetadataSlice';
 
 const FormInitialValue = {
   database: '',
@@ -54,9 +54,10 @@ const ServerConnectFrame = ({
       dispatch(getMetaData()).then((metadataResponse) => {
         if (metadataResponse.type === 'database/getMetaData/fulfilled') {
           const graphName = Object.keys(metadataResponse.payload)[0];
-          dispatch(getMetaChartData());
+          /* dispatch(getMetaChartData()); */
           dispatch(changeGraph({ graphName }));
-        } else if (metadataResponse.type === 'database/getMetaData/rejected') {
+        }
+        if (metadataResponse.type === 'database/getMetaData/rejected') {
           dispatch(addAlert('ErrorMetaFail'));
         }
       });

frontend/src/features/database/MetadataSlice.js

@@ -54,7 +54,7 @@ export const getMetaData = createAsyncThunk(
     }
   },
 );
-
+/*
 export const getMetaChartData = createAsyncThunk(
   'database/getMetaChartData',
   async () => {
@@ -74,6 +74,7 @@ export const getMetaChartData = createAsyncThunk(
     }
   },
 );
+*/
 
 const MetadataSlice = createSlice({
   name: 'metadata',
@@ -108,12 +109,12 @@ const MetadataSlice = createSlice({
         dbname: action.payload.database,
       };
     },
-    [getMetaChartData.fulfilled]: (state, action) => {
+    /* [getMetaChartData.fulfilled]: (state, action) => {
       if (action.payload) {
         return Object.assign(state, { rows: action.payload });
       }
       return Object.assign(state, { rows: [] });
-    },
+    }, */
   },
 });