Merge branch 'main' into feature/discover-pagination

kishor82 · Dec 19, 2023 · 37ec704 · 37ec704
2 parents 899516d + 28c1fbb
commit 37ec704
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [BUG][Data] Support for custom filters with heterogeneous data fields ([5577](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5577))
 - [BUG][Data] Fix empty suggestion history when querying in search bar [#5349](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5349)
 - [BUG][Discover] Fix what is displayed in `selected fields` when removing columns from canvas [#5537](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5537)
+- [Discover] Fix missing index pattern field from breaking Discover [#5626](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5626)
 
 ### 🚞 Infrastructure
 

diff --git a/src/plugins/discover/public/application/components/chart/utils/create_histogram_configs.ts b/src/plugins/discover/public/application/components/chart/utils/create_histogram_configs.ts
@@ -25,5 +25,13 @@ export function createHistogramConfigs(
       },
     },
   ];
-  return data.search.aggs.createAggConfigs(indexPattern, visStateAggs);
+
+  // If index pattern is created before the index, this function will fail since the required fields for the histogram agg will be missing.
+  try {
+    return data.search.aggs.createAggConfigs(indexPattern, visStateAggs);
+  } catch (error) {
+    // Just display the error to the user but continue to render the rest of the page
+    data.search.showError(error as Error);
+    return;
+  }
 }