fix: Make sure currentView value isn't being reset

Add in a reference to previous results value so we can ensure it has changed before resetting currentView to Table
ScottLogic · Sep 7, 2021 · 34e617d · 34e617d
1 parent b8de6ea
commit 34e617d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/components/ResultsWindow.tsx b/src/components/ResultsWindow.tsx
@@ -60,20 +60,30 @@ const ResultsWindow: FunctionComponent<ResultsWindowProps> = ({
   const error = results?.error;
   const currentScript = results?.script;
 
+  const previousResultsRef = useRef();
+  const previousResults = previousResultsRef.current;
+
   let rows: Array<{} | string> = [];
   let columns: Array<IColumn> = [];
 
   if (currentResults) {
     const processed = ResultsProcessor.process(currentResults);
 
     if (Array.isArray(processed)) {
-      if (currentView !== ResultsView.Table) {
+      if (
+        currentView !== ResultsView.Table &&
+        currentResults != previousResults
+      )
         setCurrentView(ResultsView.Table);
-      }
+
       [columns, rows] = processed as [Array<IColumn>, Array<{}>];
     }
   }
 
+  useEffect(() => {
+    previousResultsRef.current = currentResults;
+  });
+
   let viewOptions: ICommandBarItemProps[] = [];
   if (Array.isArray(currentResults) && currentResults.length > 0) {
     viewOptions = [
@@ -238,7 +248,7 @@ const ResultsWindow: FunctionComponent<ResultsWindowProps> = ({
         ) : (
           <>
             {typeof currentResults === "string" ||
-            currentView == ResultsView.Raw ? (
+            currentView === ResultsView.Raw ? (
               <pre className="raw-results-view">
                 {currentResults ? stringify(currentResults) : ""}
               </pre>