Merged conflicts resolved

Author: jimmally

src/app/RTKslices.tsx

@@ -125,10 +125,12 @@ export const mainSlice = createSlice({
       if (!mode?.paused) {
         if (typeof action.payload === 'number') {
           state.currentTab = action.payload;
+          return;
         } else if (typeof action.payload === 'object') {
           state.currentTab = action.payload.tabId;
           if (action.payload?.title)
             state.currentTitle = action.payload.title;
+            return;
         };
       }
     },
@@ -329,7 +331,9 @@ export const mainSlice = createSlice({
         switch (action.payload) {
           case 'paused':
             actionText = 'setPause';
+            break;
           default:
+            break;
         }
         port.postMessage({
           action: actionText,
@@ -402,6 +406,7 @@ export const mainSlice = createSlice({
       const { newSeries, newSeriesName } = action.payload;
         if (!tabs[currentTab].seriesSavedStatus) {
           tabs[currentTab] = { ...tabs[currentTab], seriesSavedStatus: 'inputBoxOpen' };
+          //testing return to fix save functionality
           return;
         }
         // Runs if series name input box is active.
@@ -415,6 +420,7 @@ export const mainSlice = createSlice({
           seriesArray.push(newSeries);
           localStorage.setItem('project', JSON.stringify(seriesArray));
           tabs[currentTab] = { ...tabs[currentTab], seriesSavedStatus: 'saved' };
+          //testing return to fix save functionality instead of break
           return;
         }
     },

src/app/components/StateRoute/PerformanceVisx/BarGraph.tsx

@@ -113,15 +113,17 @@ const BarGraph = (props: BarGraphProps): JSX.Element => {
   });
 
   const saveSeriesClickHandler = () => { // function to save the currently selected series
+    console.log('we are in save series click handler')
     if (tabs[currentTab].seriesSavedStatus === 'inputBoxOpen') {
+      console.log('we are inside the conditional within saveSeriesClickHandler')
+      console.log('this is the comparison.length', comparison.length)
       const actionNames = document.getElementsByClassName('actionname');
       for (let i = 0; i < actionNames.length; i += 1) {
         toStorage.data.barStack[i].name = actionNames[i].value;
       }
-
-      // dispatch(save(toStorage, seriesNameInput)); // saves the series under seriesName
-      dispatch(save({ newSeries: toStorage, newSeriesName: seriesNameInput }));
-
+      console.log('this is seriesnameINput', seriesNameInput);
+      console.log('this is toStorage', toStorage);
+      dispatch(save({ newSeries: toStorage, newSeriesName: seriesNameInput })); // saves the series under seriesName
       setSeriesNameInput(`Series ${comparison.length}`); // sends a reducer that saves the series/toStorage object the user wants to chrome local storage
       return;
     }

src/app/components/StateRoute/PerformanceVisx/PerformanceVisx.tsx

@@ -123,6 +123,7 @@ const traverse = (snapshot, data, snapshots, currTotalRender: currNum = 0): void
 const allStorage = (): Series[] => {
   let values = localStorage.getItem('project');
   const newValues: Series[] = values === null ? [] : JSON.parse(values);
+  console.log('this is newValues', newValues);
   return newValues;
 };