Refactor to incompatibleDataSourcesExist

Signed-off-by: Huy Nguyen <[email protected]>
opensearch-project · May 6, 2024 · 5f7a594 · 5f7a594
1 parent b49a73b
commit 5f7a594
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 38 deletions.
diff --git a/..._management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx b/..._management/public/components/data_source_aggregated_view/data_source_aggregated_view.tsx
@@ -45,7 +45,7 @@ interface DataSourceAggregatedViewState extends DataSourceBaseState {
   allDataSourcesIdToTitleMap: Map<string, any>;
   switchChecked: boolean;
   defaultDataSource: string | null;
-  hasIncompatibleDataSources: boolean;
+  incompatibleDataSourcesExist: boolean;
 }
 
 interface DataSourceOptionDisplay extends DataSourceOption {
@@ -69,7 +69,7 @@ export class DataSourceAggregatedView extends React.Component<
       showError: false,
       switchChecked: false,
       defaultDataSource: null,
-      hasIncompatibleDataSources: false,
+      incompatibleDataSourcesExist: false,
     };
   }
 
@@ -119,7 +119,7 @@ export class DataSourceAggregatedView extends React.Component<
             changeState: this.onEmptyState.bind(this, !!fetchedDataSources?.length),
             notifications: this.props.notifications,
             application: this.props.application,
-            hasIncompatibleDatasources: !!fetchedDataSources?.length,
+            incompatibleDataSourcesExist: !!fetchedDataSources?.length,
           });
           return;
         }
@@ -136,8 +136,8 @@ export class DataSourceAggregatedView extends React.Component<
       });
   }
 
-  onEmptyState(hasIncompatibleDataSources: boolean) {
-    this.setState({ showEmptyState: true, hasIncompatibleDataSources });
+  onEmptyState(incompatibleDataSourcesExist: boolean) {
+    this.setState({ showEmptyState: true, incompatibleDataSourcesExist });
   }
 
   onError() {
@@ -149,7 +149,7 @@ export class DataSourceAggregatedView extends React.Component<
       return (
         <NoDataSource
           application={this.props.application}
-          hasIncompatibleDatasources={this.state.hasIncompatibleDataSources}
+          incompatibleDataSourcesExist={this.state.incompatibleDataSourcesExist}
         />
       );
     }

diff --git a/...anagement/public/components/data_source_multi_selectable/data_source_multi_selectable.tsx b/...anagement/public/components/data_source_multi_selectable/data_source_multi_selectable.tsx
@@ -34,7 +34,7 @@ interface DataSourceMultiSeletableState extends DataSourceBaseState {
   dataSourceOptions: SelectedDataSourceOption[];
   selectedOptions: SelectedDataSourceOption[];
   defaultDataSource: string | null;
-  hasIncompatibleDatasources: boolean;
+  incompatibleDataSourcesExist: boolean;
 }
 
 export class DataSourceMultiSelectable extends React.Component<
@@ -52,7 +52,7 @@ export class DataSourceMultiSelectable extends React.Component<
       defaultDataSource: null,
       showEmptyState: false,
       showError: false,
-      hasIncompatibleDatasources: false,
+      incompatibleDataSourcesExist: false,
     };
   }
 
@@ -97,7 +97,7 @@ export class DataSourceMultiSelectable extends React.Component<
           notifications: this.props.notifications,
           application: this.props.application,
           callback: this.props.onSelectedDataSources,
-          hasIncompatibleDatasources: !!fetchedDataSources?.length,
+          incompatibleDataSourcesExist: !!fetchedDataSources?.length,
         });
         return;
       }
@@ -118,8 +118,8 @@ export class DataSourceMultiSelectable extends React.Component<
     }
   }
 
-  onEmptyState(hasIncompatibleDatasources: boolean) {
-    this.setState({ showEmptyState: true, hasIncompatibleDatasources });
+  onEmptyState(incompatibleDataSourcesExist: boolean) {
+    this.setState({ showEmptyState: true, incompatibleDataSourcesExist });
   }
 
   onError() {

diff --git a/...ource_management/public/components/data_source_selectable/data_source_selectable.test.tsx b/...ource_management/public/components/data_source_selectable/data_source_selectable.test.tsx
@@ -154,7 +154,7 @@ describe('DataSourceSelectable', () => {
         },
       ],
       showError: false,
-      hasIncompatibleDatasources: false,
+      incompatibleDataSourcesExist: false,
     });
 
     containerInstance.onChange([{ id: 'test2', label: 'test2', checked: 'on' }]);
@@ -177,7 +177,7 @@ describe('DataSourceSelectable', () => {
         },
       ],
       showError: false,
-      hasIncompatibleDatasources: false,
+      incompatibleDataSourcesExist: false,
     });
 
     expect(onSelectedDataSource).toBeCalledWith([{ id: 'test2', label: 'test2' }]);
@@ -356,7 +356,7 @@ describe('DataSourceSelectable', () => {
         },
       ],
       showError: false,
-      hasIncompatibleDatasources: false,
+      incompatibleDataSourcesExist: false,
     });
   });
 
@@ -386,7 +386,7 @@ describe('DataSourceSelectable', () => {
       selectedOption: [],
       showEmptyState: false,
       showError: true,
-      hasIncompatibleDatasources: false,
+      incompatibleDataSourcesExist: false,
     });
 
     containerInstance.onChange([{ id: 'test2', label: 'test2', checked: 'on' }]);
@@ -409,7 +409,7 @@ describe('DataSourceSelectable', () => {
         },
       ],
       showError: true,
-      hasIncompatibleDatasources: false,
+      incompatibleDataSourcesExist: false,
     });
 
     expect(onSelectedDataSource).toBeCalledWith([{ id: 'test2', label: 'test2' }]);

diff --git a/...ata_source_management/public/components/data_source_selectable/data_source_selectable.tsx b/...ata_source_management/public/components/data_source_selectable/data_source_selectable.tsx
@@ -56,7 +56,7 @@ interface DataSourceSelectableState extends DataSourceBaseState {
   isPopoverOpen: boolean;
   selectedOption?: DataSourceOption[];
   defaultDataSource: string | null;
-  hasIncompatibleDatasources: boolean;
+  incompatibleDataSourcesExist: boolean;
 }
 
 export class DataSourceSelectable extends React.Component<
@@ -75,7 +75,7 @@ export class DataSourceSelectable extends React.Component<
       defaultDataSource: null,
       showEmptyState: false,
       showError: false,
-      hasIncompatibleDatasources: false,
+      incompatibleDataSourcesExist: false,
     };
 
     this.onChange.bind(this);
@@ -194,7 +194,7 @@ export class DataSourceSelectable extends React.Component<
           notifications: this.props.notifications,
           application: this.props.application,
           callback: this.props.onSelectedDataSources,
-          hasIncompatibleDatasources: !!fetchedDataSources?.length,
+          incompatibleDataSourcesExist: !!fetchedDataSources?.length,
         });
         return;
       }
@@ -217,8 +217,8 @@ export class DataSourceSelectable extends React.Component<
     }
   }
 
-  onEmptyState(hasIncompatibleDatasources: boolean) {
-    this.setState({ showEmptyState: true, hasIncompatibleDatasources });
+  onEmptyState(incompatibleDataSourcesExist: boolean) {
+    this.setState({ showEmptyState: true, incompatibleDataSourcesExist });
   }
 
   onError() {
@@ -248,7 +248,7 @@ export class DataSourceSelectable extends React.Component<
       return (
         <NoDataSource
           application={this.props.application}
-          hasIncompatibleDatasources={this.state.hasIncompatibleDatasources}
+          incompatibleDataSourcesExist={this.state.incompatibleDataSourcesExist}
         />
       );
     }

diff --git a/...ce_management/public/components/no_data_source/__snapshots__/no_data_source.test.tsx.snap b/...ce_management/public/components/no_data_source/__snapshots__/no_data_source.test.tsx.snap
diff --git a/src/plugins/data_source_management/public/components/no_data_source/no_data_source.test.tsx b/src/plugins/data_source_management/public/components/no_data_source/no_data_source.test.tsx
@@ -66,12 +66,12 @@ describe('NoDataSource', () => {
   });
 
   it.each([false, true])(
-    'should render normally when hasIncompatibleDatasources is %b',
-    (hasIncompatibleDatasources) => {
+    'should render normally when incompatibleDataSourcesExist is %b',
+    (incompatibleDataSourcesExist) => {
       component = shallow(
         <NoDataSource
           totalDataSourceCount={0}
-          hasIncompatibleDatasource={hasIncompatibleDatasources}
+          hasIncompatibleDatasource={incompatibleDataSourcesExist}
         />
       );
       expect(component).toMatchSnapshot();

diff --git a/src/plugins/data_source_management/public/components/no_data_source/no_data_source.tsx b/src/plugins/data_source_management/public/components/no_data_source/no_data_source.tsx
@@ -29,12 +29,12 @@ import {
 
 interface DataSourceDropDownHeaderProps {
   application?: ApplicationStart;
-  hasIncompatibleDatasources: boolean;
+  incompatibleDataSourcesExist: boolean;
 }
 
 export const NoDataSource: React.FC<DataSourceDropDownHeaderProps> = ({
   application,
-  hasIncompatibleDatasources,
+  incompatibleDataSourcesExist,
 }) => {
   const [showPopover, setShowPopover] = useState<boolean>(false);
   const button = (
@@ -74,7 +74,7 @@ export const NoDataSource: React.FC<DataSourceDropDownHeaderProps> = ({
           <FormattedMessage
             id="dataSourcesManagement.dataSourceEmptyMenu.noData"
             defaultMessage={
-              hasIncompatibleDatasources
+              incompatibleDataSourcesExist
                 ? NO_COMPATIBLE_DATASOURCES_MESSAGE
                 : NO_DATASOURCES_CONNECTED_MESSAGE
             }
@@ -87,7 +87,7 @@ export const NoDataSource: React.FC<DataSourceDropDownHeaderProps> = ({
           <FormattedMessage
             id="dataSourcesManagement.dataSourceEmptyMenu.connect"
             defaultMessage={
-              hasIncompatibleDatasources
+              incompatibleDataSourcesExist
                 ? ADD_COMPATIBLE_DATASOURCES_MESSAGE
                 : CONNECT_DATASOURCES_MESSAGE
             }

diff --git a/src/plugins/data_source_management/public/components/utils.test.ts b/src/plugins/data_source_management/public/components/utils.test.ts
@@ -101,21 +101,21 @@ describe('DataSourceManagement: Utils.ts', () => {
 
     test.each([
       {
-        hasIncompatibleDatasources: false,
+        incompatibleDataSourcesExist: false,
         defaultMessage: noDataSourcesConnectedMessage,
       },
       {
-        hasIncompatibleDatasources: true,
+        incompatibleDataSourcesExist: true,
         defaultMessage: noCompatibleDataSourcesMessage,
       },
     ])(
       'should send warning when data source is not available',
-      ({ hasIncompatibleDatasources, defaultMessage }) => {
+      ({ incompatibleDataSourcesExist, defaultMessage }) => {
         const changeState = jest.fn();
         handleNoAvailableDataSourceError({
           changeState,
           notifications: toasts,
-          hasIncompatibleDatasources,
+          incompatibleDataSourcesExist,
         });
         expect(toasts.add).toBeCalledTimes(1);
         expect(toasts.add).toBeCalledWith(

diff --git a/src/plugins/data_source_management/public/components/utils.ts b/src/plugins/data_source_management/public/components/utils.ts
@@ -98,13 +98,13 @@ export interface HandleNoAvailableDataSourceErrorProps {
   notifications: ToastsStart;
   application?: ApplicationStart;
   callback?: (ds: DataSourceOption[]) => void;
-  hasIncompatibleDatasources: boolean;
+  incompatibleDataSourcesExist: boolean;
 }
 
 export function handleNoAvailableDataSourceError(props: HandleNoAvailableDataSourceErrorProps) {
-  const { changeState, notifications, application, callback, hasIncompatibleDatasources } = props;
+  const { changeState, notifications, application, callback, incompatibleDataSourcesExist } = props;
 
-  const defaultMessage = hasIncompatibleDatasources
+  const defaultMessage = incompatibleDataSourcesExist
     ? `${NO_COMPATIBLE_DATASOURCES_MESSAGE} ${ADD_COMPATIBLE_DATASOURCES_MESSAGE}`
     : `${NO_DATASOURCES_CONNECTED_MESSAGE} ${CONNECT_DATASOURCES_MESSAGE}`;