Merge pull request opensearch-project#3 from wanglam/feat-remove-all-…

…data-source-modal Remove all tab and sort connections by name alphabetical
Kapian1234 · Aug 28, 2024 · 724170e · 724170e
2 parents 49377ce + f1a54af
commit 724170e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.tsx b/src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.tsx
@@ -56,18 +56,11 @@ const convertConnectionsToOptions = (
 };
 
 enum AssociationDataSourceModalTab {
-  All = 'all',
   OpenSearchConnections = 'opensearch-connections',
   DirectQueryConnections = 'direction-query-connections',
 }
 
 const tabOptions: EuiButtonGroupOptionProps[] = [
-  {
-    id: AssociationDataSourceModalTab.All,
-    label: i18n.translate('workspace.form.selectDataSource.subTitle', {
-      defaultMessage: 'All',
-    }),
-  },
   {
     id: AssociationDataSourceModalTab.OpenSearchConnections,
     label: i18n.translate('workspace.form.selectDataSource.subTitle', {
@@ -100,7 +93,7 @@ export const AssociationDataSourceModal = ({
   handleAssignDataSourceConnections,
 }: AssociationDataSourceModalProps) => {
   const [allConnections, setAllConnections] = useState<DataSourceConnection[]>([]);
-  const [currentTab, setCurrentTab] = useState('all');
+  const [currentTab, setCurrentTab] = useState(tabOptions[0].id);
   const [allOptions, setAllOptions] = useState<DataSourceModalOption[]>([]);
   const [isLoading, setIsLoading] = useState(false);
 

diff --git a/src/plugins/workspace/public/utils.ts b/src/plugins/workspace/public/utils.ts
@@ -449,7 +449,10 @@ export const fetchDataSourceConnections = async (
     );
     const directQueryConnectionsResult = await Promise.all(directQueryConnectionsPromises);
     const directQueryConnections = directQueryConnectionsResult.flat();
-    return mergeDataSourcesWithConnections(assignedDataSources, directQueryConnections);
+    return mergeDataSourcesWithConnections(
+      assignedDataSources,
+      directQueryConnections
+    ).sort((a, b) => a.name.localeCompare(b.name));
   } catch (error) {
     notifications?.toasts.addDanger(
       i18n.translate('workspace.detail.dataSources.error.message', {