fix check plugin 2

Signed-off-by: Ryan Liang <jiallian@amazon.com>
RyanL1997 · Jul 24, 2024 · 3839343 · 3839343
1 parent 1321b26
commit 3839343
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 42 deletions.
diff --git a/...direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx b/...direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx
@@ -53,7 +53,7 @@ import {
   IntegrationInstancesSearchResult,
 } from '../../../../framework/types';
 import { INTEGRATIONS_BASE } from '../../../../framework/utils/shared';
-import { checkIfPluginIsInstalled } from '../../utils';
+import { isPluginInstalled } from '../../utils';
 
 interface DirectQueryDataConnectionDetailProps {
   featureFlagStatus: boolean;
@@ -177,10 +177,8 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
   };
 
   useEffect(() => {
-    checkIfPluginIsInstalled(
-      'plugin:observabilityDashboards',
-      setObservabilityDashboardsExists,
-      notifications
+    isPluginInstalled('plugin:observabilityDashboards', notifications, http).then(
+      setObservabilityDashboardsExists
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

diff --git a/...es_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx b/...es_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx
@@ -41,7 +41,7 @@ import { DATACONNECTIONS_BASE, observabilityMetricsID } from '../../../constants
 import { getRenderCreateAccelerationFlyout } from '../../../plugin';
 import { InstallIntegrationFlyout } from '../integrations/installed_integrations_table';
 import { redirectToExplorerS3 } from '../associated_object_management/utils/associated_objects_tab_utils';
-import { checkIfPluginIsInstalled } from '../../utils';
+import { isPluginInstalled } from '../../utils';
 
 interface DataConnection {
   connectionType: DirectQueryDatasourceType;
@@ -143,10 +143,8 @@ export const ManageDirectQueryDataConnectionsTable: React.FC<ManageDirectQueryDa
 
   useEffect(() => {
     fetchDataSources();
-    checkIfPluginIsInstalled(
-      'plugin:observabilityDashboards',
-      setObservabilityDashboardsExists,
-      notifications
+    isPluginInstalled('plugin:observabilityDashboards', notifications, http).then(
+      setObservabilityDashboardsExists
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetchDataSources]);

diff --git a/src/plugins/data_source_management/public/components/utils.ts b/src/plugins/data_source_management/public/components/utils.ts
@@ -408,37 +408,21 @@ export const formatError = (name: string, message: string, details: string) => {
   };
 };
 
-export const checkIfPluginIsInstalled = (
+export const isPluginInstalled = async (
   pluginId: string,
-  setPluginExists: (exists: boolean) => void,
-  notifications: NotificationsStart
-) => {
-  fetch('/api/status', {
-    headers: {
-      'Content-Type': 'application/json',
-      'osd-xsrf': 'true',
-      'accept-language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,zh-TW;q=0.6',
-      pragma: 'no-cache',
-      'sec-fetch-dest': 'empty',
-      'sec-fetch-mode': 'cors',
-      'sec-fetch-site': 'same-origin',
-    },
-    method: 'GET',
-    referrerPolicy: 'strict-origin-when-cross-origin',
-    mode: 'cors',
-    credentials: 'include',
-  })
-    .then((response) =>
-      response.json().then((data) => {
-        const pluginExists = data.status.statuses.some((status: { id: string | string[] }) =>
-          status.id.includes(pluginId)
-        );
-        setPluginExists(pluginExists);
-      })
-    )
-    .catch((error) => {
-      notifications.toasts.addDanger(`Error checking ${pluginId} Plugin Installation status.`);
-      // eslint-disable-next-line no-console
-      console.error(error);
-    });
+  notifications: NotificationsStart,
+  http: HttpStart
+): Promise<boolean> => {
+  try {
+    const response = await http.get('/api/status');
+    const pluginExists = response.status.statuses.some((status: { id: string }) =>
+      status.id.includes(pluginId)
+    );
+    return pluginExists;
+  } catch (error) {
+    notifications.toasts.addDanger(`Error checking ${pluginId} Plugin Installation status.`);
+    // eslint-disable-next-line no-console
+    console.error(error);
+    return false;
+  }
 };