Fixed bug in UI where non indicative banner appears in routing rules page for external service

Author: RoeyoOgen

gateway-ha/src/main/java/io/trino/gateway/ha/resource/GatewayWebAppResource.java

@@ -18,6 +18,7 @@
 import io.trino.gateway.ha.clustermonitor.ClusterStats;
 import io.trino.gateway.ha.config.HaGatewayConfiguration;
 import io.trino.gateway.ha.config.ProxyBackendConfiguration;
+import io.trino.gateway.ha.config.RulesType;
 import io.trino.gateway.ha.config.UIConfiguration;
 import io.trino.gateway.ha.domain.Result;
 import io.trino.gateway.ha.domain.RoutingRule;
@@ -76,6 +77,7 @@ public class GatewayWebAppResource
     // TODO Avoid putting mutable objects in fields
     private final UIConfiguration uiConfiguration;
     private final RoutingRulesManager routingRulesManager;
+    private final HaGatewayConfiguration haGatewayConfiguration;
 
     @Inject
     public GatewayWebAppResource(
@@ -92,6 +94,7 @@ public GatewayWebAppResource(
         this.resourceGroupsManager = requireNonNull(resourceGroupsManager, "resourceGroupsManager is null");
         this.uiConfiguration = configuration.getUiConfiguration();
         this.routingRulesManager = requireNonNull(routingRulesManager, "routingRulesManager is null");
+        this.haGatewayConfiguration = configuration;
     }
 
     @POST
@@ -160,7 +163,7 @@ public Response getDistribution(QueryDistributionRequest query)
         Map<String, List<DistributionResponse.LineChart>> lineChartMap = lineChart.stream().collect(Collectors.groupingBy(DistributionResponse.LineChart::getName));
         List<DistributionResponse.DistributionChart> distributionChart = lineChartMap.values().stream().map(d -> {
             DistributionResponse.DistributionChart dc = new DistributionResponse.DistributionChart();
-            DistributionResponse.LineChart lc = d.get(0);
+            DistributionResponse.LineChart lc = d.getFirst();
             long sum = d.stream().collect(Collectors.summarizingLong(DistributionResponse.LineChart::getQueryCount)).getSum();
             dc.setQueryCount(sum);
             dc.setBackendUrl(lc.getBackendUrl());
@@ -446,6 +449,10 @@ public Response readExactMatchSourceSelector()
     public Response getRoutingRules()
             throws IOException
     {
+        if (haGatewayConfiguration.getRoutingRules().isRulesEngineEnabled() && haGatewayConfiguration.getRoutingRules().getRulesType() == RulesType.EXTERNAL) {
+            return Response.status(Response.Status.NO_CONTENT)
+                    .entity(Result.fail("Routing rules are managed by an external service")).build();
+        }
         List<RoutingRule> routingRulesList = routingRulesManager.getRoutingRules();
         return Response.ok(Result.ok(routingRulesList)).build();
     }

webapp/src/api/base.ts

@@ -17,6 +17,14 @@ export class ClientApi {
     if (res.status === 401 || res.status === 403) {
       this.authErrorHandler()
     }
+    else if (res.status === 204) {
+      // handle the case of Response.Status.NO_CONTENT when External Routing Service is used
+      return { isExternalRouting: true };
+    }
+    else if (res.status >= 500) {
+      const resJson = await res.json();
+      this.serverErrorHandler(resJson.msg);
+    }
     else if (res.status !== 200) {
       Toast.error({
         content: Locale.Error.Network,
@@ -119,6 +127,14 @@ export class ClientApi {
     accessStore.updateToken("");
     throw new Error(Locale.Auth.Expiration);
   }
+  serverErrorHandler(msg: string): void {
+    Toast.error({
+      content: msg,
+      duration: 5,
+      theme: "light"
+    });
+    throw new Error(msg);
+  }
 }
 
 export const api = new ClientApi();

webapp/src/components/routing-rules.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { routingRulesApi, updateRoutingRulesApi } from "../api/webapp/routing-rules.ts";
 import { RoutingRulesData } from "../types/routing-rules";
-import { Button, Card, Form, Toast } from "@douyinfe/semi-ui";
+import { Button, Card, Form, Toast, Spin } from "@douyinfe/semi-ui";
 import { FormApi } from "@douyinfe/semi-ui/lib/es/form";
 import { Role, useAccessStore } from "../store";
 import Locale from "../locales";
@@ -10,20 +10,31 @@ export function RoutingRules() {
     const [rules, setRules] = useState<RoutingRulesData[]>([]);
     const [editingStates, setEditingStates] = useState<boolean[]>([]);
     const [formApis, setFormApis] = useState<(FormApi<any> | null)[]>([]);
+    const [isExternalRouting, setIsExternalRouting] = useState(false);
+    const [isLoading, setIsLoading] = useState(true);
     const access = useAccessStore();
 
     useEffect(() => {
         fetchRoutingRules();
     }, []);
 
     const fetchRoutingRules = () => {
+        setIsLoading(true);
         routingRulesApi()
                 .then(data => {
-                    setRules(data);
-                    setEditingStates(new Array(data.length).fill(false));
-                    setFormApis(new Array(data.length).fill(null));
+                    if (data.isExternalRouting) {
+                        setIsExternalRouting(true);
+                        setRules([]);
+                    } else {
+                        setRules(data);
+                        setEditingStates(new Array(data.length).fill(false));
+                        setFormApis(new Array(data.length).fill(null));
+                        setIsExternalRouting(false);
+                    }
                 }).catch(() => {
             Toast.error(Locale.RoutingRules.ErrorFetch);
+        }).finally(() => {
+            setIsLoading(false);
         });
     };
 
@@ -81,7 +92,31 @@ export function RoutingRules() {
 
     return (
             <div>
-                {rules.map((rule, index) => (
+                {isLoading ? (
+                    <div style={{
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                        paddingTop: '40px'
+                    }}>
+                        <Spin size="large" />
+                    </div>
+                ) : rules.length === 0 ? (
+                    <div style={{
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignItems: 'flex-start',
+                        paddingTop: '40px',
+                        fontSize: '16px',
+                        color: '#666'
+                    }}>
+                        {isExternalRouting ?
+                            "No routing rules available. Routing rules are managed by an external service." :
+                            "No routing rules configured. Add rules to manage query routing."
+                        }
+                    </div>
+                ) : (
+                    rules.map((rule, index) => (
                         <div key={index} style={{marginBottom: '20px'}}>
                             <Card
                                     shadows='always'
@@ -170,7 +205,7 @@ export function RoutingRules() {
                                 </Form>
                             </Card>
                         </div>
-                ))}
+                )))}
             </div>
     );
 }