Handling empty Tickets Table

FalkWolsky · FalkWolsky · commit a0843e9223d1 · 2024-11-02T14:58:58.000+01:00
diff --git a/client/packages/lowcoder/src/api/subscriptionApi.ts b/client/packages/lowcoder/src/api/subscriptionApi.ts
@@ -136,22 +136,30 @@ export const searchCustomersSubscriptions = async (Customer: LowcoderSearchCusto
     method: "post",
     headers: lcHeaders
   };
+
   try {
     const result = await SubscriptionApi.secureRequest(apiBody);
 
-    if (result?.data?.data?.length > 0) {
-      return result?.data?.data;
-    }
-    else if (result.data.success == "false" && result.data.reason == "customerNotFound") {
-      return [];
-    }
-    else if (result.data.success == "false" && result.data.reason == "userSubscriptionNotFound") {
+    if (!result || !result.data) {
       return [];
     }
-    else if (result.data.success == "false" && result.data.reason == "orgSubscriptionNotFound") {
-      return [];
-    }
-    return [];
+
+    // Filter out entries with `"success": "false"`
+    const validEntries = result.data.filter((entry: any) => entry.success !== "false");
+
+    // Flatten the data arrays and filter out duplicates by `id`
+    const uniqueSubscriptions = Object.values(
+      validEntries.reduce((acc: Record<string, any>, entry: any) => {
+        entry.data.forEach((subscription: any) => {
+          if (!acc[subscription.id]) {
+            acc[subscription.id] = subscription;
+          }
+        });
+        return acc;
+      }, {})
+    );
+
+    return uniqueSubscriptions;
   } catch (error) {
     console.error("Error searching customer:", error);
     throw error;
diff --git a/client/packages/lowcoder/src/api/supportApi.ts b/client/packages/lowcoder/src/api/supportApi.ts
@@ -70,7 +70,7 @@ class SupportApi extends Api {
     const source = axios.CancelToken.source();
     const timeoutId = setTimeout(() => {
       source.cancel("Request timed out.");
-    }, 2000);
+    }, 10000);
 
     // Request configuration with cancel token
     const requestConfig: AxiosRequestConfig = {
@@ -91,7 +91,7 @@ class SupportApi extends Api {
           const retrySource = axios.CancelToken.source();
           const retryTimeoutId = setTimeout(() => {
             retrySource.cancel("Retry request timed out.");
-          }, 2000);
+          }, 15000);
 
           response = await axiosInstance.request({
             ...requestConfig,
@@ -128,7 +128,14 @@ export const searchCustomerTickets = async (orgID : string, currentUserId : stri
   };
   try {
     const result = await SupportApi.secureRequest(apiBody);
-    return result.data as TicketList;
+
+    if (!result || !result.data) {
+      return [];
+    }
+
+    const validEntries = result.data.filter((entry: any) => entry.success !== "false");
+
+    return validEntries as TicketList;
   } catch (error) {
     console.error("Error searching Support Tickets: ", error);
     throw error;
diff --git a/client/packages/lowcoder/src/pages/support/supportDetail.tsx b/client/packages/lowcoder/src/pages/support/supportDetail.tsx
@@ -279,8 +279,9 @@ export function SupportDetail() {
       const ticketData = await getTicket(ticketId);
       if (ticketData && ticketData.length === 1) {
         setTicket(ticketData[0]);
-
-        setNewDescription(convertJiraToHtml(ticketData[0].fields.description) || '');
+        if (ticketData[0].fields.description) {
+          setNewDescription(convertJiraToHtml(ticketData[0].fields.description) || '');
+        }
       } else {
         setError(trans("support.ticketNotFound"));
       }
