change order of validation and all trycatch in semver check

Signed-off-by: Joanne Wang <[email protected]>
opensearch-project · Oct 30, 2024 · 4e4d324 · 4e4d324
1 parent d2b3495
commit 4e4d324
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/public/utils/helpers.js b/public/utils/helpers.js
@@ -172,12 +172,18 @@ export function getManageChannelsUrl() {
 }
 
 export function dataSourceFilterFn(dataSource) {
-  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) {
+    // Filter out invalid data source
+    return false;
+  }
 }
 
 export function getSeverityText(severity) {