Filter Saved Query by supported language (opensearch-project#8325)

Signed-off-by: Suchit Sahoo <suchsah@amazon.com>

src/plugins/data/public/plugin.ts

@@ -150,6 +150,7 @@ export class DataPublicPlugin
       storage: this.storage,
       sessionStorage: this.sessionStorage,
       defaultSearchInterceptor: searchService.getDefaultSearchInterceptor(),
+      applicaton: core.application,
     });
 
     uiActions.registerAction(
@@ -224,6 +225,7 @@ export class DataPublicPlugin
       savedObjectsClient: savedObjects.client,
       uiSettings,
       indexPatterns,
+      applicaton: core.application,
     });
     setQueryService(query);
 

src/plugins/data/public/query/query_service.ts

@@ -97,6 +97,7 @@ export class QueryService {
     storage,
     uiSettings,
     indexPatterns,
+    applicaton,
   }: QueryServiceStartDependencies): IQueryStart {
     this.queryStringManager.getDatasetService().init(indexPatterns);
     return {
@@ -106,7 +107,11 @@ export class QueryService {
       }),
       filterManager: this.filterManager,
       queryString: this.queryStringManager,
-      savedQueries: createSavedQueryService(savedObjectsClient),
+      savedQueries: createSavedQueryService(
+        savedObjectsClient,
+        this.queryStringManager,
+        applicaton
+      ),
       state$: this.state$,
       timefilter: this.timefilter,
       getOpenSearchQuery: (indexPattern: IndexPattern) => {

src/plugins/data/public/query/saved_query/saved_query_service.ts

@@ -29,8 +29,10 @@
  */
 
 import { isObject } from 'lodash';
-import { SavedObjectsClientContract, SavedObjectAttributes } from 'src/core/public';
+import { SavedObjectsClientContract, SavedObjectAttributes, CoreStart } from 'src/core/public';
+import { first } from 'rxjs/operators';
 import { SavedQueryAttributes, SavedQuery, SavedQueryService } from './types';
+import { QueryStringContract } from '../query_string';
 
 type SerializedSavedQueryAttributes = SavedObjectAttributes &
   SavedQueryAttributes & {
@@ -41,7 +43,9 @@ type SerializedSavedQueryAttributes = SavedObjectAttributes &
   };
 
 export const createSavedQueryService = (
-  savedObjectsClient: SavedObjectsClientContract
+  savedObjectsClient: SavedObjectsClientContract,
+  queryStringManager?: QueryStringContract,
+  application?: CoreStart['application']
 ): SavedQueryService => {
   const saveQuery = async (attributes: SavedQueryAttributes, { overwrite = false } = {}) => {
     if (!attributes.title.length) {
@@ -117,12 +121,29 @@ export const createSavedQueryService = (
       page: activePage,
     });
 
+    let queries = response.savedObjects.map(
+      (savedObject: { id: string; attributes: SerializedSavedQueryAttributes }) =>
+        parseSavedQueryObject(savedObject)
+    );
+
+    const currentAppId =
+      (await application?.currentAppId$?.pipe(first()).toPromise()) ?? Promise.resolve(undefined);
+    const languageService = queryStringManager?.getLanguageService();
+
+    // Filtering saved queries based on language supported by cirrent application
+    if (currentAppId && languageService) {
+      queries = queries.filter((query) => {
+        const languageId = query.attributes.query.language;
+        return (
+          languageService?.getLanguage(languageId)?.supportedAppNames?.includes(currentAppId) ??
+          true
+        );
+      });
+    }
+
     return {
       total: response.total,
-      queries: response.savedObjects.map(
-        (savedObject: { id: string; attributes: SerializedSavedQueryAttributes }) =>
-          parseSavedQueryObject(savedObject)
-      ),
+      queries,
     };
   };
 

src/plugins/data/public/query/types.ts

@@ -3,7 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { IUiSettingsClient, SavedObjectsClientContract } from 'opensearch-dashboards/public';
+import {
+  ApplicationSetup,
+  ApplicationStart,
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+} from 'opensearch-dashboards/public';
 import { Observable } from 'rxjs';
 import { DataStorage } from '../../common';
 import { IndexPattern, IndexPatternsService } from '../index_patterns';
@@ -38,6 +43,7 @@ export interface QueryServiceSetupDependencies {
   storage: DataStorage;
   sessionStorage: DataStorage;
   defaultSearchInterceptor: ISearchInterceptor;
+  applicaton: ApplicationSetup;
 }
 
 /** @internal */
@@ -46,4 +52,5 @@ export interface QueryServiceStartDependencies {
   storage: DataStorage;
   uiSettings: IUiSettingsClient;
   indexPatterns: IndexPatternsService;
+  applicaton: ApplicationStart;
 }