show remote cluster in data connections view when name is same as local (#1007)

Signed-off-by: Amit Galitzky <[email protected]>

Author: amitgalitz

public/pages/DefineDetector/components/Datasource/DataSource.tsx

@@ -146,7 +146,15 @@ export function DataSource(props: DataSourceProps) {
       const localCluster: ClusterInfo[] = getLocalCluster(
         opensearchState.clusters
       );
-      setFieldValue('clusters', getVisibleClusterOptions(localCluster));
+      if (props.formikProps.values.clusters && props.formikProps.values.clusters.length > 0) {
+        const clusterInfoList: ClusterInfo[] = props.formikProps.values.clusters.map(option => ({
+          name: option.cluster,
+          localCluster: option.localcluster === 'true',
+        }));
+        setFieldValue('clusters', getVisibleClusterOptions(clusterInfoList));
+      } else {
+        setFieldValue('clusters', getVisibleClusterOptions(localCluster));
+      }
     }
   }, [opensearchState.clusters]);
 

public/pages/ReviewAndCreate/components/DataConnectionFlyout/DataConnectionFlyout.tsx

@@ -53,7 +53,7 @@ const getIndexItemsToDisplay = (props: DataConnectionFlyoutProps) => {
     const splitIndex = index.split(':');
     let clusterName = shouldSplit ? splitIndex[0] : props.localClusterName;
     clusterName =
-      clusterName === props.localClusterName
+      clusterName === props.localClusterName && !shouldSplit
         ? `${clusterName} (Local)`
         : `${clusterName} (Remote)`;
     const indexName = shouldSplit ? splitIndex[1] : index;