Merge branch 'main' into testid-140-data-test-subjs

opensearch-project · Dec 10, 2024 · 16201f2 · 16201f2
2 parents 77f1cd7 + 6a0484a
commit 16201f2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/plugins/data/public/ui/dataset_selector/dataset_explorer.tsx b/src/plugins/data/public/ui/dataset_selector/dataset_explorer.tsx
@@ -152,6 +152,7 @@ export const DatasetExplorer = ({
       <EuiModalBody>
         <div
           className="datasetExplorer"
+          data-test-subj="datasetExplorerWindow"
           style={{
             gridTemplateColumns: `repeat(${
               columnCount - 1

diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
@@ -78,7 +78,12 @@ function FilterBarUI(props: Props) {
 
   function renderItems() {
     return props.filters.map((filter, i) => (
-      <EuiFlexItem key={i} grow={false} className="globalFilterBar__flexItem">
+      <EuiFlexItem
+        key={i}
+        grow={false}
+        className="globalFilterBar__flexItem"
+        data-test-subj="globalFilterBar"
+      >
         <FilterItem
           id={`${i}`}
           intl={props.intl}

diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.test.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.test.tsx
@@ -95,6 +95,7 @@ test('alias with warning status', () => {
       : 
       <span
         class="globalFilterLabel__value"
+        data-test-subj="globalFilterLabelValue"
       >
         Warning
       </span>
@@ -125,6 +126,7 @@ test('alias with error status', () => {
       : 
       <span
         class="globalFilterLabel__value"
+        data-test-subj="globalFilterLabelValue"
       >
         Error
       </span>
@@ -141,6 +143,7 @@ test('warning', () => {
       : 
       <span
         class="globalFilterLabel__value"
+        data-test-subj="globalFilterLabelValue"
       >
         Warning
       </span>
@@ -157,6 +160,7 @@ test('error', () => {
       : 
       <span
         class="globalFilterLabel__value"
+        data-test-subj="globalFilterLabelValue"
       >
         Error
       </span>

diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.tsx
@@ -59,7 +59,11 @@ export default function FilterLabel({ filter, valueLabel, filterLabelStatus }: F
     );
 
   const getValue = (text?: string) => {
-    return <span className="globalFilterLabel__value">{text}</span>;
+    return (
+      <span className="globalFilterLabel__value" data-test-subj="globalFilterLabelValue">
+        {text}
+      </span>
+    );
   };
 
   if (filter.meta.alias !== null) {