update order of validation; catch exceptions in semver check (#1212)

Signed-off-by: Amardeepsingh Siglani <[email protected]> (cherry picked from commit b350af5) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Oct 30, 2024 · c8f0aed · c8f0aed
1 parent 270a849
commit c8f0aed
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/public/utils/helpers.tsx b/public/utils/helpers.tsx
@@ -654,12 +654,18 @@ export function setBreadcrumbs(crumbs: ChromeBreadcrumb[]) {
 }
 
 export function dataSourceFilterFn(dataSource: SavedObject<DataSourceAttributes>) {
-  const dataSourceVersion = dataSource?.attributes?.dataSourceVersion || '';
-  const installedPlugins = dataSource?.attributes?.installedPlugins || [];
-  return (
-    semver.satisfies(dataSourceVersion, pluginManifest.supportedOSDataSourceVersions) &&
-    pluginManifest.requiredOSDataSourcePlugins.every((plugin) => installedPlugins.includes(plugin))
-  );
+  try {
+    const dataSourceVersion = dataSource?.attributes?.dataSourceVersion || '';
+    const installedPlugins = dataSource?.attributes?.installedPlugins || [];
+    return (
+      pluginManifest.requiredOSDataSourcePlugins.every((plugin) =>
+        installedPlugins.includes(plugin)
+      ) && semver.satisfies(dataSourceVersion, pluginManifest.supportedOSDataSourceVersions)
+    );
+  } catch (error: any) {
+    // Filter out invalid data source
+    return false;
+  }
 }
 
 export function getSeverityText(severity: string) {