change order of validation and add try catch in semver check

Signed-off-by: Joanne Wang <[email protected]>
opensearch-project · Oct 30, 2024 · 9f5cacf · 9f5cacf
1 parent 449c3ec
commit 9f5cacf
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
@@ -177,12 +177,22 @@ export default class Main extends Component<MainProps, MainState> {
   };
 
   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) {
+      // Filter out invalid data source
+      return false;
+    }
   };
 
   getServices(http: HttpSetup) {