fix check plugin

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

Hide file tree

Showing 3 changed files with 48 additions and 72 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,6 +53,7 @@ import {
   IntegrationInstancesSearchResult,
 } from '../../../../framework/types';
 import { INTEGRATIONS_BASE } from '../../../../framework/utils/shared';
+import { checkIfPluginIsInstalled } from '../../utils';
 
 interface DirectQueryDataConnectionDetailProps {
   featureFlagStatus: boolean;
@@ -70,41 +71,6 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
   setBreadcrumbs,
 }) => {
   const [observabilityDashboardsExists, setObservabilityDashboardsExists] = useState(false);
-  const checkIfObservabilityDashboardsPluginIsInstalled = () => {
-    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(function (response) {
-        return response.json();
-      })
-      .then((data) => {
-        for (let i = 0; i < data.status.statuses.length; ++i) {
-          if (data.status.statuses[i].id.includes('plugin:observabilityDashboards')) {
-            setObservabilityDashboardsExists(true);
-          }
-        }
-      })
-      .catch((error) => {
-        notifications.toasts.addDanger(
-          'Error checking Dashboards Observability Plugin Installation status.'
-        );
-        // eslint-disable-next-line no-console
-        console.error(error);
-      });
-  };
-
   const { dataSourceName } = useParams<{ dataSourceName: string }>();
   const { search } = useLocation();
   const queryParams = new URLSearchParams(search);
@@ -211,7 +177,11 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
   };
 
   useEffect(() => {
-    checkIfObservabilityDashboardsPluginIsInstalled();
+    checkIfPluginIsInstalled(
+      'plugin:observabilityDashboards',
+      setObservabilityDashboardsExists,
+      notifications
+    );
     // 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,6 +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';
 
 interface DataConnection {
   connectionType: DirectQueryDatasourceType;
@@ -75,41 +76,6 @@ export const ManageDirectQueryDataConnectionsTable: React.FC<ManageDirectQueryDa
   const [showIntegrationsFlyout, setShowIntegrationsFlyout] = useState(false);
   const [integrationsFlyout, setIntegrationsFlyout] = useState<React.JSX.Element | null>(null);
 
-  const checkIfObservabilityDashboardsPluginIsInstalled = () => {
-    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('plugin:observabilityDashboards')
-          );
-          if (pluginExists) {
-            setObservabilityDashboardsExists(true);
-          }
-        })
-      )
-      .catch((error) => {
-        notifications.toasts.addDanger(
-          'Error checking Dashboards Observability Plugin Installation status.'
-        );
-        // eslint-disable-next-line no-console
-        console.error(error);
-      });
-  };
-
   const [data, setData] = useState<DataConnection[]>([]);
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [modalLayout, setModalLayout] = useState(<EuiOverlayMask />);
@@ -177,7 +143,11 @@ export const ManageDirectQueryDataConnectionsTable: React.FC<ManageDirectQueryDa
 
   useEffect(() => {
     fetchDataSources();
-    checkIfObservabilityDashboardsPluginIsInstalled();
+    checkIfPluginIsInstalled(
+      'plugin:observabilityDashboards',
+      setObservabilityDashboardsExists,
+      notifications
+    );
     // 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
@@ -11,6 +11,7 @@ import {
   ToastsStart,
   ApplicationStart,
   CoreStart,
+  NotificationsStart,
 } from 'src/core/public';
 import { deepFreeze } from '@osd/std';
 import uuid from 'uuid';
@@ -406,3 +407,38 @@ export const formatError = (name: string, message: string, details: string) => {
     },
   };
 };
+
+export const checkIfPluginIsInstalled = (
+  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);
+    });
+};