Feature complete

- Removed all console.logs
- moved refresh and setting of db logic into use effect

Related to #1048

Author: james-l-m-young

src/card/view/CardView.tsx

@@ -161,7 +161,6 @@ const NeoCardView = ({
   }, [settingsOpen, forceRefresh]);
 
   useEffect(() => {
-    console.log(forceRefresh);
     setSelectorChange(true);
   }, [query, type, database, JSON.stringify(settingsSelector), forceRefresh]);
 

src/dashboard/header/DashboardHeader.tsx

@@ -53,6 +53,7 @@ export const NeoDashboardHeader = ({
   const downloadImageEnabled = settings ? settings.downloadImageEnabled : false;
   const [dashboardTitleText, setDashboardTitleText] = React.useState(dashboardTitle);
   const [databases, setDatabases] = useState([]);
+  const [newDataDatabase, setNewDataDatabase] = useState(null);
   const [menuOpen, setMenuOpen] = useState(Menu.NONE);
   const [modalOpen, setModalOpen] = useState(Modal.NONE);
   const [isDarkMode, setDarkMode] = React.useState(themeMode !== 'light');
@@ -71,6 +72,17 @@ export const NeoDashboardHeader = ({
     }
   }, [dashboardTitle]);
 
+  useEffect(() => {
+    let ChangeDatabaseConfirmBoolean = sessionStorage.getItem("ChangeDatabaseConfirmBoolean") || "False"
+    if (ChangeDatabaseConfirmBoolean == 'True' && newDataDatabase) {
+      setDataDatabase(newDataDatabase);
+      refreshPage(newDataDatabase);
+    }
+    else{
+      setModalOpen(Modal.CHANGE);
+    }
+  }, [newDataDatabase]);
+
   useEffect(() => {
     setTheme(isDarkMode ? 'dark' : 'light');
   }, [isDarkMode]);
@@ -80,6 +92,8 @@ export const NeoDashboardHeader = ({
               open={modalOpen == Modal.CHANGE}
               onConfirm={() => {
                 setModalOpen(Modal.NONE);
+                setDataDatabase(newDataDatabase);
+                refreshPage(newDataDatabase);
               }}
               handleClose={() => setModalOpen(Modal.NONE)}
             />
@@ -154,14 +168,7 @@ export const NeoDashboardHeader = ({
         databases={databases}
         selected={dataDatabase}
         setSelected={(newDatabase) => {
-          let ChangeDatabaseConfirmBoolean = sessionStorage.getItem("ChangeDatabaseConfirmBoolean") || "False"
-          if (ChangeDatabaseConfirmBoolean == 'True'){
-            setDataDatabase(newDatabase);
-            refreshPage(newDatabase)
-          }
-          else{
-            setModalOpen(Modal.CHANGE);
-          }
+          setNewDataDatabase(newDatabase);
         }}
         open={menuOpen == Menu.DATABASE}
         anchorEl={menuAnchor}
@@ -204,8 +211,6 @@ const mapDispatchToProps = (dispatch) => ({
   },
 
   refreshPage: (database: string) => {
-    console.log("refreshPage")
-    // dispatch(hardResetAllCardsThunk());
     dispatch(updateAllReportsDatabaseThunk(database));
   },
 });

src/page/PageThunks.ts

@@ -55,14 +55,11 @@ export const updatePageLayoutThunk = (layout: any) => (dispatch: any, getState:
 
 export const updateAllReportsDatabaseThunk = (database) => (dispatch: any, getState: any) => {
   try{
-    console.log('updateAllReportsDatabaseThunk')
     const state = getState();
     const { pages } = state.dashboard;
     const { pagenumber } = getState().dashboard.settings;
     pages.map((page, index) => {
-          console.log(page);
           page.reports.map((report) => {
-            console.log("page: " + index + " | id: " + report.id);
             dispatch(updateReportDatabase(index,report.id, database));
             if (pagenumber === index){
               dispatch(forceRefreshCard(index,report.id));

src/settings/SettingsThunks.ts

@@ -6,7 +6,6 @@ import { updateDashboardSetting } from './SettingsActions';
 
 export const setPageNumberThunk = (number) => (dispatch: any, getState: any) => {
   try {
-    console.log("setPageNumberThunk")
     if (number == undefined) {
       throw 'The specified page could not be found, was it moved, removed, or renamed?';
     }
@@ -18,7 +17,6 @@ export const setPageNumberThunk = (number) => (dispatch: any, getState: any) =>
 
     const page = pages[number];
     page.reports.map((report) => {
-      console.log("pg: " + number + " | " + report.id)
       dispatch(hardResetCardSettings(number, report.id));
     });
   } catch (e) {
@@ -28,13 +26,9 @@ export const setPageNumberThunk = (number) => (dispatch: any, getState: any) =>
 
 export const hardResetAllCardsThunk = () => (dispatch: any, getState: any) => {
   try{
-    console.log("hardResetAllCardsThunk")
     const { pages } = getState().dashboard;
-
     pages.map((page, index) => {
-      console.log(page);
       page.reports.map((report) => {
-        console.log("page: " + index + " | id: " + report.id)
         dispatch(hardResetCardSettings(index,report.id))
       })
     });