From 72e4161f37fe227fcddc8fae8159c352ca8025a1 Mon Sep 17 00:00:00 2001
From: sumukhswamy <sumukhhs@amazon.com>
Date: Mon, 21 Oct 2024 13:57:31 -0700
Subject: [PATCH] added changes for de registering plugins not in Neo and
 changed other apis to 400

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
---
 server/routes/index.ts                      | 6 +++---
 server/routes/metrics/metrics_rounter.ts    | 2 +-
 server/routes/ppl.ts                        | 2 +-
 server/routes/trace_analytics_dsl_router.ts | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/routes/index.ts b/server/routes/index.ts
index 696578ab1..78c316981 100644
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -35,12 +35,9 @@ export function setupRoutes({
   client: ILegacyClusterClient;
   dataSourceEnabled: boolean;
 }) {
-  PanelsRouter(router);
   VisualizationsRouter(router);
   registerPplRoute({ router, facet: new PPLFacet(client) });
   registerDslRoute({ router, facet: new DSLFacet(client) }, dataSourceEnabled);
-  registerEventAnalyticsRouter({ router, savedObjectFacet: new SavedObjectFacet(client) });
-  registerAppAnalyticsRouter(router);
 
   // TODO remove trace analytics route when DSL route for autocomplete is added
   registerTraceAnalyticsDslRouter(router, dataSourceEnabled);
@@ -60,6 +57,9 @@ export function setupRoutes({
   // query assist is part of log explorer, which will be disabled if datasource is enabled
   if (!dataSourceEnabled) {
     registerQueryAssistRoutes(router);
+    PanelsRouter(router);
+    registerEventAnalyticsRouter({ router, savedObjectFacet: new SavedObjectFacet(client) });
+    registerAppAnalyticsRouter(router);
   }
 
   registerGettingStartedRoutes(router);
diff --git a/server/routes/metrics/metrics_rounter.ts b/server/routes/metrics/metrics_rounter.ts
index 595cd0636..f4ee9427d 100644
--- a/server/routes/metrics/metrics_rounter.ts
+++ b/server/routes/metrics/metrics_rounter.ts
@@ -99,7 +99,7 @@ export function registerMetricsRoute(router: IRouter, dataSourceEnabled: boolean
       } catch (error) {
         if (error.statusCode !== 404) console.error(error);
         return response.custom({
-          statusCode: error.statusCode || 500,
+          statusCode: error.statusCode || 400,
           body: error.message,
         });
       }
diff --git a/server/routes/ppl.ts b/server/routes/ppl.ts
index d9943aca6..2aa2a0324 100644
--- a/server/routes/ppl.ts
+++ b/server/routes/ppl.ts
@@ -33,7 +33,7 @@ export function registerPplRoute({ router, facet }: { router: IRouter; facet: PP
         return res.ok(result);
       }
       return res.custom({
-        statusCode: queryRes.data.statusCode || queryRes.data.status || 500,
+        statusCode: queryRes.data.statusCode || queryRes.data.status || 400,
         body: queryRes.data.body || queryRes.data.message || '',
       });
     }
diff --git a/server/routes/trace_analytics_dsl_router.ts b/server/routes/trace_analytics_dsl_router.ts
index 4d99ea401..d42276a1f 100644
--- a/server/routes/trace_analytics_dsl_router.ts
+++ b/server/routes/trace_analytics_dsl_router.ts
@@ -51,7 +51,7 @@ export function registerTraceAnalyticsDslRouter(router: IRouter, dataSourceEnabl
       } catch (error) {
         console.error(error);
         return response.custom({
-          statusCode: error.statusCode || 500,
+          statusCode: error.statusCode || 400,
           body: error.message,
         });
       }
@@ -90,7 +90,7 @@ export function registerTraceAnalyticsDslRouter(router: IRouter, dataSourceEnabl
       } catch (error) {
         console.error(error);
         return response.custom({
-          statusCode: error.statusCode || 500,
+          statusCode: error.statusCode || 400,
           body: error.message,
         });
       }