remove skip 1 in dataset observable

Signed-off-by: Joshua Li <[email protected]>
joshuali925 · Jul 24, 2024 · 1ec2941 · 1ec2941
1 parent 6f77f7f
commit 1ec2941
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/src/plugins/data/public/query/dataset_manager/dataset_manager.ts b/src/plugins/data/public/query/dataset_manager/dataset_manager.ts
@@ -26,7 +26,7 @@ export class DataSetManager {
   };
 
   public getUpdates$ = () => {
-    return this.dataSet$.asObservable().pipe(skip(1));
+    return this.dataSet$.asObservable();
   };
 
   public getDataSet = () => {

diff --git a/src/plugins/query_enhancements/public/query_assist/components/query_assist_bar.tsx b/src/plugins/query_enhancements/public/query_assist/components/query_assist_bar.tsx
@@ -35,9 +35,7 @@ export const QueryAssistBar: React.FC<QueryAssistInputProps> = (props) => {
   const { generateQuery, loading } = useGenerateQuery();
   const [callOutType, setCallOutType] = useState<QueryAssistCallOutType>();
   const dismissCallout = () => setCallOutType(undefined);
-  const [selectedDataSet, setSelectedDataSet] = useState<SimpleDataSet | undefined>(
-    services.data.query.dataSet.getDataSet()
-  );
+  const [selectedDataSet, setSelectedDataSet] = useState<SimpleDataSet>();
   const selectedIndex = selectedDataSet?.title;
   const previousQuestionRef = useRef<string>();
 

diff --git a/src/plugins/query_enhancements/public/query_assist/utils/create_extension.test.tsx b/src/plugins/query_enhancements/public/query_assist/utils/create_extension.test.tsx
@@ -35,7 +35,6 @@ const mockSimpleDataSet = {
 } as SimpleDataSet;
 
 dataSetMock.getUpdates$.mockReturnValue(of(mockSimpleDataSet));
-dataSetMock.getDataSet.mockReturnValue(mockSimpleDataSet);
 
 jest.mock('../components', () => ({
   QueryAssistBar: jest.fn(() => <div>QueryAssistBar</div>),

diff --git a/src/plugins/query_enhancements/public/query_assist/utils/create_extension.tsx b/src/plugins/query_enhancements/public/query_assist/utils/create_extension.tsx
@@ -6,7 +6,7 @@
 import { HttpSetup } from 'opensearch-dashboards/public';
 import React, { useEffect, useState } from 'react';
 import { of } from 'rxjs';
-import { distinctUntilChanged, map, startWith, switchMap } from 'rxjs/operators';
+import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 import {
   DataPublicPluginSetup,
   QueryEditorExtensionConfig,
@@ -26,7 +26,6 @@ const getAvailableLanguages$ = (
   data: DataPublicPluginSetup
 ) =>
   data.query.dataSet.getUpdates$().pipe(
-    startWith(data.query.dataSet.getDataSet()),
     distinctUntilChanged(),
     switchMap(async (simpleDataSet) => {
       const dataSourceId = simpleDataSet?.dataSourceRef?.id;