minor fixes

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
opensearch-project · Oct 20, 2023 · c471fdb · c471fdb
1 parent c7fa09b
commit c471fdb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/common/constants/index.ts b/common/constants/index.ts
@@ -84,5 +84,6 @@ export const ACCELERATION_INDEX_NAME_INFO = `All OpenSearch acceleration indices
   `;
 
 export const POLL_INTERVAL_MS = 1000;
-export const ASYNC_QUERY_JOB_ENDPOINT = '/api/spark_sql_console/job/';
+export const ASYNC_QUERY_ENDPOINT = '/api/spark_sql_console';
+export const ASYNC_QUERY_JOB_ENDPOINT = ASYNC_QUERY_ENDPOINT + '/job';
 export const ASYNC_QUERY_SESSION_ID = 'async-query-session-id';
diff --git a/common/utils/async_query_helpers.ts b/common/utils/async_query_helpers.ts
@@ -5,7 +5,12 @@
 
 import _ from 'lodash';
 import { CoreStart } from '../../../../src/core/public';
-import { ASYNC_QUERY_JOB_ENDPOINT, ASYNC_QUERY_SESSION_ID, POLL_INTERVAL_MS } from '../constants';
+import {
+  ASYNC_QUERY_ENDPOINT,
+  ASYNC_QUERY_JOB_ENDPOINT,
+  ASYNC_QUERY_SESSION_ID,
+  POLL_INTERVAL_MS,
+} from '../constants';
 
 export const setAsyncSessionId = (value: string | null) => {
   if (value === null) sessionStorage.removeItem(ASYNC_QUERY_SESSION_ID);
@@ -17,13 +22,12 @@ export const getAsyncSessionId = () => {
 };
 
 export const getJobId = (query: {}, http: CoreStart['http'], callback) => {
-  let id;
   http
-    .post(`/api/spark_sql_console`, {
+    .post(ASYNC_QUERY_ENDPOINT, {
       body: JSON.stringify({ ...query, sessionId: getAsyncSessionId() ?? undefined }),
     })
     .then((res) => {
-      id = res.data.resp.queryId;
+      const id = res.data.resp.queryId;
       setAsyncSessionId(_.get(res.data.resp, 'sessionId', null));
       callback(id);
     })
@@ -36,12 +40,17 @@ export const pollQueryStatus = (id: string, http: CoreStart['http'], callback) =
   http
     .get(ASYNC_QUERY_JOB_ENDPOINT + id)
     .then((res) => {
-      const status = res.data.resp.status;
-      if (status === 'PENDING' || status === 'RUNNING' || status === 'SCHEDULED') {
+      const status = res.data.resp.status.toLowerCase();
+      if (
+        status === 'pending' ||
+        status === 'running' ||
+        status === 'scheduled' ||
+        status === 'waiting'
+      ) {
         setTimeout(() => pollQueryStatus(id, http, callback), POLL_INTERVAL_MS);
-      } else if (status === 'FAILED') {
+      } else if (status === 'failed') {
         callback([]);
-      } else if (status === 'SUCCESS') {
+      } else if (status === 'success') {
         const results = _.get(res.data.resp, 'datarows');
         callback(results);
       }

diff --git a/public/components/Main/main.tsx b/public/components/Main/main.tsx
@@ -20,7 +20,11 @@ import { IHttpResponse } from 'angular';
 import _ from 'lodash';
 import React from 'react';
 import { ChromeBreadcrumb, CoreStart } from '../../../../../src/core/public';
-import { ASYNC_QUERY_JOB_ENDPOINT, POLL_INTERVAL_MS } from '../../../common/constants';
+import {
+  ASYNC_QUERY_ENDPOINT,
+  ASYNC_QUERY_JOB_ENDPOINT,
+  POLL_INTERVAL_MS,
+} from '../../../common/constants';
 import { AsyncQueryLoadingStatus } from '../../../common/types';
 import { getAsyncSessionId, setAsyncSessionId } from '../../../common/utils/async_query_helpers';
 import { MESSAGE_TAB_LABEL } from '../../utils/constants';
@@ -419,11 +423,10 @@ export class Main extends React.Component<MainProps, MainState> {
     const queries: string[] = getQueries(queriesString);
     const language = this.state.language;
     if (queries.length > 0) {
-      let endpoint = '/api/spark_sql_console';
       const responsePromise = Promise.all(
         queries.map((query: string) =>
           this.httpClient
-            .post(endpoint, {
+            .post(ASYNC_QUERY_ENDPOINT, {
               body: JSON.stringify({
                 lang: language,
                 query: query,