Merge branch 'main' of github.com:opensearch-project/OpenSearch-Dashb…

…oards into main-admin-back
opensearch-project · May 20, 2024 · da8e238 · da8e238
2 parents 797698f + 9ef7404
commit da8e238
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/changelogs/fragments/6715.yml b/changelogs/fragments/6715.yml
@@ -0,0 +1,2 @@
+fix:
+- Adjust the padding size for aggregated view ([#6715](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6715))
diff --git a/...management/public/components/data_source_aggregated_view/data_source_aggregated_view.scss b/...management/public/components/data_source_aggregated_view/data_source_aggregated_view.scss
@@ -11,10 +11,15 @@
 
   .euiSelectableListItem__content {
     cursor: default;
+    padding-left: 0;
+    margin-right: 0;
 
 
   .euiSelectableListItem__text {
-    max-height: 100%; 
+    max-height: 100%;
+  }
+  .euiSelectableListItem__icon, .euiSelectableListItem__prepend {
+    margin-right: 0;
   }
   }
 
@@ -31,6 +36,7 @@
       overflow: hidden;
       white-space: nowrap;
       display: inline-block;
+      padding-left: 0;
     }
   }
 
@@ -39,4 +45,22 @@
     align-items: center;
     justify-content: center;
   }
+
+  .dataSourceAggregatedViewOuiFlexItem {
+    color: grey;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    display: inline-block;
+    padding-left: 0;
+  }
+
+  .dataSourceListAllActiveOuiFlexItem {
+    color: grey;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    display: inline-block;
+    padding-left: 1em;
+  }
 }
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
@@ -233,7 +233,11 @@ export class DataSourceAggregatedView extends React.Component<
                   options={items}
                   renderOption={(option) => (
                     <DataSourceItem
-                      className={'dataSourceAggregatedView'}
+                      className={
+                        this.props.displayAllCompatibleDataSources
+                          ? 'dataSourceAggregatedView'
+                          : 'dataSourceListAllActive'
+                      }
                       option={option}
                       defaultDataSource={this.state.defaultDataSource}
                     />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- Adjust the padding size for aggregated view ([#6715](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6715))