fix syntax

Signed-off-by: Yuanqi(Ella) Zhu <[email protected]>
opensearch-project · Apr 3, 2024 · 3bf9adf · 3bf9adf
1 parent 2746d0f
commit 3bf9adf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/src/plugins/data_source_management/public/components/utils.test.ts b/src/plugins/data_source_management/public/components/utils.test.ts
@@ -568,15 +568,15 @@ describe('DataSourceManagement: Utils.ts', () => {
     });
 
     it('should return the default datasource if hideLocalCluster is false', () => {
-      mockUiSettingsCalls(uiSettings, 'get', '1');
+      mockUiSettingsCalls(uiSettings, 'get', '2');
       const result = getDefaultDataSource(getDataSource, LocalCluster, uiSettings, true);
-      expect(result).toEqual([{ id: '1', label: 'DataSource 1' }]);
+      expect(result).toEqual([{ id: '2', label: 'DataSource 2' }]);
     });
 
-    it('should return an empty default data source if no default option, hideLocalCluster is ture and no default datasource', () => {
+    it('should return the first data source if no default option, hideLocalCluster is ture and no default datasource', () => {
       mockUiSettingsCalls(uiSettings, 'get', null);
       const result = getDefaultDataSource(getDataSource, LocalCluster, uiSettings, true);
-      expect(result).toEqual([]);
+      expect(result).toEqual([{ id: '1', label: 'DataSource 1' }]);
     });
   });
 });
diff --git a/src/plugins/data_source_management/public/components/utils.ts b/src/plugins/data_source_management/public/components/utils.ts
@@ -110,8 +110,8 @@ export function getDefaultDataSource(
         label: defaultOption?.[0]?.label || defaultOptionDataSource.attributes?.title,
       },
     ];
-}
-if (defaultDataSourceAfterCheck) {
+  }
+  if (defaultDataSourceAfterCheck) {
     return [
       {
         id: defaultDataSourceAfterCheck.id,
@@ -121,9 +121,16 @@ if (defaultDataSourceAfterCheck) {
   }
   if (!hideLocalCluster) {
     return [LocalCluster];
-  } 
-    return [];
-
+  }
+  if (dataSources.length > 0) {
+    return [
+      {
+        id: dataSources[0].id,
+        label: dataSources[0].attributes.title,
+      },
+    ];
+  }
+  return [];
 }
 
 export async function getDataSourceById(

diff --git a/src/plugins/data_source_management/public/mocks.ts b/src/plugins/data_source_management/public/mocks.ts
@@ -95,7 +95,7 @@ export const getDataSource = [
     type: '',
     references: [],
     attributes: {
-      title: 'DataSource 1',
+      title: 'DataSource 2',
       endpoint: '',
       auth: { type: AuthType.NoAuth, credentials: undefined },
       name: AuthType.NoAuth,

diff --git a/src/plugins/dev_tools/public/application.tsx b/src/plugins/dev_tools/public/application.tsx
@@ -77,7 +77,7 @@ function DevToolsWrapper({
   uiSettings,
 }: DevToolsWrapperProps) {
   const mountedTool = useRef<MountedDevToolDescriptor | null>(null);
-  const [isLoading, setIsLoading] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState<boolean>(true);
 
   useEffect(
     () => () => {
@@ -114,7 +114,7 @@ function DevToolsWrapper({
       mountpoint: mountPoint,
       unmountHandler,
     };
-    setIsLoading(true);
+    setIsLoading(false);
   };
 
   return (
@@ -135,7 +135,7 @@ function DevToolsWrapper({
             </EuiTab>
           </EuiToolTip>
         ))}
-        {dataSourceEnabled && isLoading ? (
+        {dataSourceEnabled && !isLoading ? (
           <div className="devAppDataSourceSelector">
             <DataSourceSelector
               savedObjectsClient={savedObjects.client}