From 3f2256c4c8f9a9d021db263fdd51691a63dd6f17 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 01:59:46 +0000
Subject: [PATCH] change order of validation and add try catch in semver check
 (#297)

Signed-off-by: Joanne Wang <jowg@amazon.com>
(cherry picked from commit 71411b402c01abe56fd5709543302941ddba3857)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 public/pages/Main/Main.tsx | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
index 654a8356..03945a5a 100644
--- 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) {