Merge pull request opensearch-project#513 from TackAdam/pplFix

BugFix Application Analytics timestamp query error (cherry picked from commit adc3fa3) Signed-off-by: TackAdam <navytackett@hotmail.com> (cherry picked from commit 98c6f1b)
amsiglan · Aug 9, 2023 · 1e26584 · 1e26584
1 parent 45268fe
commit 1e26584
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/auto_sync_commit_metadata.json b/auto_sync_commit_metadata.json
@@ -1,4 +1,4 @@
 {
-    "last_github_commit": "a137a19256d3f58d92d0338cb58fdd910d60acac",
-    "last_gitfarm_commit": "f0b411d72d2819b934140cd91d4ae77ae4cc449c"
+    "last_github_commit": "98c6f1b4d266a449ae1cf309dbb2d9ca0fe56b87",
+    "last_gitfarm_commit": "86d37bf48cea3bee9cdd66d1ba144099591648cc"
 }
diff --git a/public/services/data_fetchers/ppl/ppl_data_fetcher.ts b/public/services/data_fetchers/ppl/ppl_data_fetcher.ts
@@ -83,7 +83,7 @@ export class PPLDataFetcher extends DataFetcherBase implements IDataFetcher {
     } = this.searchContext;
     const { dispatch, changeQuery } = this.storeContext;
 
-    await this.processTimestamp(query);
+    await this.processTimestamp(query, appBaseQuery);
     if (isEmpty(this.timestamp)) return;
 
     const curStartTime = startingTime || this.query[SELECTED_DATE_RANGE][0];
@@ -103,7 +103,7 @@ export class PPLDataFetcher extends DataFetcherBase implements IDataFetcher {
     );
 
     // update UI with new query state
-    await this.updateQueryState(this.query[RAW_QUERY], finalQuery, this.timestamp);
+    await this.updateQueryState(this.query[RAW_QUERY], finalQuery, this.timestamp, appBaseQuery);
     // calculate proper time interval for count distribution
     if (!selectedInterval.current || selectedInterval.current.text === 'Auto') {
       findAutoInterval(curStartTime, curEndTime);
@@ -158,8 +158,8 @@ export class PPLDataFetcher extends DataFetcherBase implements IDataFetcher {
     }
   }
 
-  async processTimestamp(query: IQuery) {
-    if (query[SELECTED_TIMESTAMP]) {
+  async processTimestamp(query: IQuery, appBaseQuery: string) {
+    if (query[SELECTED_TIMESTAMP] && appBaseQuery === '') {
       this.timestamp = query[SELECTED_TIMESTAMP];
     } else {
       await this.setTimestamp(this.queryIndex);
@@ -175,7 +175,12 @@ export class PPLDataFetcher extends DataFetcherBase implements IDataFetcher {
     return await timestampUtils.getTimestamp(indexPattern);
   }
 
-  async updateQueryState(rawQuery: string, finalQuery: string, curTimestamp: string) {
+  async updateQueryState(
+    rawQuery: string,
+    finalQuery: string,
+    curTimestamp: string,
+    appBaseQuery: string
+  ) {
     const { batch, dispatch, changeQuery, changeVizConfig } = this.storeContext;
     const { query } = this.searchParams;
     const {
@@ -192,7 +197,7 @@ export class PPLDataFetcher extends DataFetcherBase implements IDataFetcher {
           tabId,
           query: {
             finalQuery,
-            [RAW_QUERY]: query.rawQuery,
+            [RAW_QUERY]: buildRawQuery(query, appBaseQuery),
             [SELECTED_TIMESTAMP]: curTimestamp,
           },
         })