added check for multi dat (#1132)

a source support Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
opensearch-project · Sep 5, 2024 · ac24194 · ac24194
1 parent 930b74a
commit ac24194
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 19 deletions.
diff --git a/common/helpers.ts b/common/helpers.ts
@@ -7,6 +7,7 @@ import _ from 'lodash';
 import { DEFAULT_METRICS_COUNTER } from '../server/utils/constants';
 import { MetricsCounter, PartialMetricsCounter } from '../types';
 import { SecurityAnalyticsPluginConfigType } from '../config';
+import { Get, Set } from '../../../src/plugins/opensearch_dashboards_utils/common';
 
 export function aggregateMetrics(
   metrics: PartialMetricsCounter,
@@ -61,3 +62,17 @@ export function extractFieldsFromMappings(
     }
   });
 }
+
+export function createNullableGetterSetter<T>(): [Get<T | undefined>, Set<T>] {
+  let value: T;
+
+  const get = () => {
+    return value;
+  };
+
+  const set = (newValue: T) => {
+    value = newValue;
+  };
+
+  return [get, set];
+}
diff --git a/public/components/DataSourceThreatAlertsCard/DataSourceThreatAlertsCard.tsx b/public/components/DataSourceThreatAlertsCard/DataSourceThreatAlertsCard.tsx
@@ -38,15 +38,15 @@ import { OverviewAlertItem } from '../../../types';
 import { Time } from '@opensearch-project/opensearch/api/types';
 
 export interface DataSourceAlertsCardProps {
-  getDataSourceMenu: DataSourceManagementPluginSetup['ui']['getDataSourceMenu'];
+  getDataSourceMenu?: DataSourceManagementPluginSetup['ui']['getDataSourceMenu'];
   detectorService: DetectorsService;
 }
 
 export const DataSourceThreatAlertsCard: React.FC<DataSourceAlertsCardProps> = ({
   getDataSourceMenu,
   detectorService,
 }) => {
-  const DataSourceSelector = getDataSourceMenu();
+  const DataSourceSelector = getDataSourceMenu?.();
   const notifications = getNotifications();
   const [loading, setLoading] = useState(false);
   const [dataSource, setDataSource] = useState<DataSourceOption>({
@@ -157,19 +157,21 @@ export const DataSourceThreatAlertsCard: React.FC<DataSourceAlertsCardProps> = (
                     <h3>Recent threat alerts</h3>
                   </EuiTitle>
                 </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <DataSourceSelector
-                    componentType={'DataSourceSelectable'}
-                    componentConfig={{
-                      savedObjects: getSavedObjectsClient(),
-                      notifications: getNotifications(),
-                      onSelectedDataSources: onDataSourceSelected,
-                      fullWidth: false,
-                      dataSourceFilter: dataSourceFilterFn,
-                      activeOption: dataSource ? [{ id: dataSource.id }] : undefined,
-                    }}
-                  />
-                </EuiFlexItem>
+                {DataSourceSelector && (
+                  <EuiFlexItem grow={false}>
+                    <DataSourceSelector
+                      componentType={'DataSourceSelectable'}
+                      componentConfig={{
+                        savedObjects: getSavedObjectsClient(),
+                        notifications: getNotifications(),
+                        onSelectedDataSources: onDataSourceSelected,
+                        fullWidth: false,
+                        dataSourceFilter: dataSourceFilterFn,
+                        activeOption: dataSource ? [{ id: dataSource.id }] : undefined,
+                      }}
+                    />
+                  </EuiFlexItem>
+                )}
               </EuiFlexGroup>
             </EuiFlexItem>
             <EuiFlexItem style={{ overflow: 'scroll' }}>

diff --git a/public/services/utils/constants.ts b/public/services/utils/constants.ts
@@ -10,6 +10,7 @@ import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigati
 import { ContentManagementPluginStart } from '../../../../../src/plugins/content_management/public';
 import { BrowserServices } from '../../models/interfaces';
 import { DataSourceManagementPluginSetup } from '../../../../../src/plugins/data_source_management/public';
+import { createNullableGetterSetter } from '../../../common/helpers';
 
 export const dataSourceInfo: { activeDataSource: DataSourceOption } = {
   activeDataSource: {
@@ -51,6 +52,7 @@ export const [getSavedObjectsClient, setSavedObjectsClient] = createGetterSetter
   CoreStart['savedObjects']['client']
 >('SavedObjectsClient');
 
-export const [getDataSourceManagementPlugin, setDataSourceManagementPlugin] = createGetterSetter<
-  DataSourceManagementPluginSetup
->('DataSourceManagement');
+export const [
+  getDataSourceManagementPlugin,
+  setDataSourceManagementPlugin,
+] = createNullableGetterSetter<DataSourceManagementPluginSetup>();
diff --git a/public/utils/helpers.tsx b/public/utils/helpers.tsx
@@ -697,7 +697,7 @@ export function registerThreatAlertsCard() {
       order: 20,
       render: () => (
         <DataSourceThreatAlertsCard
-          getDataSourceMenu={getDataSourceManagementPlugin().ui.getDataSourceMenu}
+          getDataSourceMenu={getDataSourceManagementPlugin()?.ui.getDataSourceMenu}
           detectorService={getBrowserServices().detectorsService}
         />
       ),