fixing small clear state issues

Signed-off-by: Paul Sebastian <[email protected]>
opensearch-project · Oct 3, 2023 · d70de7c · d70de7c
1 parent a33ae31
commit d70de7c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/common/types/index.ts b/common/types/index.ts
@@ -77,4 +77,4 @@ export interface CreateAccelerationForm {
   formErrors: FormErrorsType;
 }
 
-export type AsyncQueryLoadingStatus = "SUCCESS" | "FAILED" | "RUNNING" | "SCHEDULED | CANCELED"
+export type AsyncQueryLoadingStatus = "SUCCESS" | "FAILED" | "RUNNING" | "SCHEDULED" | "CANCELED"
diff --git a/public/components/Main/main.tsx b/public/components/Main/main.tsx
@@ -449,16 +449,28 @@ export class Main extends React.Component<MainProps, MainState> {
 
               const queryId: string = _.get(responseObj, 'queryId');
 
+              // clear state from previous results and start async loading
               this.setState({
+                queryTranslations: [],
+                queryResultsTable: [],
+                queryResults: [],
+                queryResultsCSV: [],
+                queryResultsJSON: [],
+                queryResultsTEXT: [],
+                messages: [],
+                selectedTabId: MESSAGE_TAB_LABEL,
+                selectedTabName: MESSAGE_TAB_LABEL,
+                itemIdToExpandedRowMap: {},
                 asyncLoading: true,
+                asyncLoadingStatus: 'SCHEDULED',
                 asyncJobId: queryId,
               });
+              this.callGetStartPolling(queries);
               const interval = setInterval(() => {
-                console.log('interval iteration');
                 if (!this.state.asyncLoading) {
                   clearInterval(interval);
                 }
-                this.callGetStartPolling(queries, queryId);
+                this.callGetStartPolling(queries);
               }, 2 * 1000);
             }
           }
@@ -467,18 +479,20 @@ export class Main extends React.Component<MainProps, MainState> {
     }
   };
 
-  callGetStartPolling = async (queries: string[], jobId: string) => {
+  callGetStartPolling = async (queries: string[]) => {
     const nextP = Promise.all([
-      this.httpClient.get('/api/spark_sql_console/get/' + jobId).catch((error: any) => {
-        this.setState({
-          messages: [
-            {
-              text: error.message,
-              className: 'error-message',
-            },
-          ],
-        });
-      }),
+      this.httpClient
+        .get('/api/spark_sql_console/get/' + this.state.asyncJobId)
+        .catch((error: any) => {
+          this.setState({
+            messages: [
+              {
+                text: error.message,
+                className: 'error-message',
+              },
+            ],
+          });
+        }),
     ]);
 
     return await Promise.all([nextP]).then(([response]) => {
@@ -504,7 +518,6 @@ export class Main extends React.Component<MainProps, MainState> {
           asyncLoadingStatus: status,
         });
       } else if (_.isEqual(status, 'FAILED') || _.isEqual(status, 'CANCELLED')) {
-        console.log('fail or cancel');
         this.setState({
           asyncLoading: false,
           asyncLoadingStatus: status,