Zammad send fixes, update deps

apps/bridge-frontend/package.json

@@ -20,8 +20,8 @@
     "@mui/icons-material": "^5",
     "@mui/material": "^5",
     "@mui/material-nextjs": "^5.16.6",
-    "@mui/x-data-grid-pro": "^7.12.0",
-    "@mui/x-date-pickers-pro": "^7.12.0",
+    "@mui/x-data-grid-pro": "^7.12.1",
+    "@mui/x-date-pickers-pro": "^7.12.1",
     "@mui/x-license": "^7.12.0",
     "@link-stack/bridge-common": "*",
     "@link-stack/bridge-ui": "*",
@@ -43,7 +43,7 @@
     "react-timer-hook": "^3.0.7",
     "sharp": "^0.33.4",
     "tss-react": "^4.9.12",
-    "tsx": "^4.16.5",
+    "tsx": "^4.17.0",
     "@link-stack/ui": "*"
   },
   "devDependencies": {

apps/bridge-migrations/package.json

@@ -12,7 +12,7 @@
     "dotenv": "^16.4.5",
     "kysely": "0.26.1",
     "pg": "^8.12.0",
-    "tsx": "^4.16.5"
+    "tsx": "^4.17.0"
   },
   "devDependencies": {
     "@types/node": "^22",

apps/bridge-whatsapp/package.json

@@ -20,7 +20,7 @@
     "@link-stack/typescript-config": "*",
     "@types/node": "*",
     "dotenv-cli": "^7.4.2",
-    "tsx": "^4.16.5",
+    "tsx": "^4.17.0",
     "typescript": "^5.5.4"
   },
   "scripts": {

apps/bridge-worker/package.json

@@ -20,7 +20,7 @@
     "jest": "^29.7.0",
     "kysely": "^0.27.3",
     "pg": "^8.12.0",
-    "remeda": "^2.10.0",
+    "remeda": "^2.11.0",
     "twilio": "^5.2.2"
   },
   "devDependencies": {

apps/bridge-worker/tasks/leafcutter/import-leafcutter.ts

@@ -142,7 +142,7 @@ const sendToLeafcutter = async (tickets: LabelStudioTicket[]) => {
     },
     body: JSON.stringify({ tickets: finalTickets }),
   });
-  console.log({ result });
+
 };
  */
 const importLeafcutterTask = async (): Promise<void> => {

apps/leafcutter/package.json

@@ -22,8 +22,8 @@
     "@mui/icons-material": "^5",
     "@mui/material": "^5",
     "@mui/material-nextjs": "^5.16.6",
-    "@mui/x-data-grid-pro": "^7.12.0",
-    "@mui/x-date-pickers-pro": "^7.12.0",
+    "@mui/x-data-grid-pro": "^7.12.1",
+    "@mui/x-date-pickers-pro": "^7.12.1",
     "@opensearch-project/opensearch": "^2.11.0",
     "cryptr": "^6.3.0",
     "date-fns": "^3.6.0",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
-    "@types/node": "^22.1.0",
+    "@types/node": "^22.2.0",
     "@types/react": "18.3.3",
     "@types/uuid": "^10.0.0",
     "babel-loader": "^9.1.3",

apps/link/app/(main)/overview/[overview]/_components/TicketCreateDialog.tsx

@@ -59,7 +59,6 @@ export const TicketCreateDialog: FC<TicketCreateDialogProps> = ({
   useEffect(() => {
     const fetchUsers = async () => {
       const result = await getCustomersAction();
-      console.log({ result });
       setCustomers(result);
     };
 

apps/link/app/_actions/groups.ts

@@ -3,14 +3,19 @@
 import { executeREST } from "app/_lib/zammad";
 
 export const getGroupsAction = async () => {
-  const groups = await executeREST({
-    path: "/api/v1/groups",
-  });
-  const allGroups = groups ?? [];
-  const formattedGroups = allGroups.map((group: any) => ({
-    label: group.name,
-    value: `gid://zammad/Group/${group.id}`,
-  }));
+  try {
+    const groups = await executeREST({
+      path: "/api/v1/groups",
+    });
+    const allGroups = groups ?? [];
+    const formattedGroups = allGroups.map((group: any) => ({
+      label: group.name,
+      value: `gid://zammad/Group/${group.id}`,
+    }));
 
-  return formattedGroups;
+    return formattedGroups;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };

apps/link/app/_actions/overviews.ts

@@ -16,75 +16,82 @@ const overviewLookup = {
 };
 
 export const getOverviewTicketCountsAction = async () => {
-  const recent = await executeREST({ path: "/api/v1/recent_view" });
-  const countResult = await executeGraphQL({
-    query: getTicketOverviewCountsQuery,
-  });
-  const overviews = countResult?.ticketOverviews?.edges ?? [];
-  const counts = overviews.reduce((acc: any, overview: any) => {
-    const name = overview.node.name;
-    const key = Object.keys(overviewLookup)
-      .find((k) => overviewLookup[k] === name)
-      ?.toLowerCase();
-    if (key) {
-      acc[key] = overview.node.ticketCount ?? 0;
-    }
-    return acc;
-  }, {});
-  counts.recent = recent.length;
+  try {
+    const recent = await executeREST({ path: "/api/v1/recent_view" });
+    const countResult = await executeGraphQL({
+      query: getTicketOverviewCountsQuery,
+    });
+    const overviews = countResult?.ticketOverviews?.edges ?? [];
+    const counts = overviews.reduce((acc: any, overview: any) => {
+      const name = overview.node.name;
+      const key = Object.keys(overviewLookup)
+        .find((k) => overviewLookup[k] === name)
+        ?.toLowerCase();
+      if (key) {
+        acc[key] = overview.node.ticketCount ?? 0;
+      }
+      return acc;
+    }, {});
+    counts.recent = recent.length;
 
-  return counts;
+    return counts;
+  } catch (e) {
+    console.error(e);
+    return {};
+  }
 };
 
 export const getOverviewTicketsAction = async (name: string) => {
   let tickets = [];
-  let error = null;
 
-  if (name === "Recent") {
-    const recent = await executeREST({ path: "/api/v1/recent_view" });
+  try {
+    if (name === "Recent") {
+      const recent = await executeREST({ path: "/api/v1/recent_view" });
 
-    for (const rec of recent) {
-      const tkt = await executeREST({
-        path: `/api/v1/tickets/${rec.o_id}`,
+      for (const rec of recent) {
+        const tkt = await executeREST({
+          path: `/api/v1/tickets/${rec.o_id}`,
+        });
+        tickets.push({
+          ...tkt,
+          internalId: tkt.id,
+          createdAt: tkt.created_at,
+          updatedAt: tkt.updated_at,
+        });
+      }
+    } else {
+      const fullName = overviewLookup[name];
+      const countResult = await executeGraphQL({
+        query: getTicketOverviewCountsQuery,
       });
-      tickets.push({
-        ...tkt,
-        internalId: tkt.id,
-        createdAt: tkt.created_at,
-        updatedAt: tkt.updated_at,
+      const overviewID = countResult?.ticketOverviews?.edges?.find(
+        (overview: any) => overview.node.name === fullName,
+      )?.node?.id;
+
+      const ticketsResult = await executeGraphQL({
+        query: getTicketsByOverviewQuery,
+        variables: { overviewId: overviewID, pageSize: 250 },
       });
+
+      const edges = ticketsResult?.ticketsByOverview?.edges;
+      if (edges) {
+        tickets = edges.map((edge: any) => edge.node);
+      }
     }
-  } else {
-    const fullName = overviewLookup[name];
-    const countResult = await executeGraphQL({
-      query: getTicketOverviewCountsQuery,
-    });
-    const overviewID = countResult?.ticketOverviews?.edges?.find(
-      (overview: any) => overview.node.name === fullName,
-    )?.node?.id;
 
-    console.log({ overviewID });
-
-    const ticketsResult = await executeGraphQL({
-      query: getTicketsByOverviewQuery,
-      variables: { overviewId: overviewID, pageSize: 250 },
+    const sortedTickets = tickets.sort((a: any, b: any) => {
+      if (a.internalId < b.internalId) {
+        return 1;
+      }
+      if (a.internalId > b.internalId) {
+        return -1;
+      }
+      return 0;
     });
 
-    const edges = ticketsResult?.ticketsByOverview?.edges;
-    if (edges) {
-      tickets = edges.map((edge: any) => edge.node);
-    }
+    return { tickets: sortedTickets };
+  } catch (e) {
+    console.error(e);
+    return { tickets, message: e.message ?? "" };
   }
-
-  const sortedTickets = tickets.sort((a: any, b: any) => {
-    if (a.internalId < b.internalId) {
-      return 1;
-    }
-    if (a.internalId > b.internalId) {
-      return -1;
-    }
-    return 0;
-  });
-
-  return { tickets: sortedTickets, error };
 };

apps/link/app/_actions/search.ts

@@ -3,10 +3,15 @@ import { executeGraphQL } from "app/_lib/zammad";
 import { searchQuery } from "@/app/_graphql/searchQuery";
 
 export const searchAllAction = async (query: string, limit: number) => {
-  const result = await executeGraphQL({
-    query: searchQuery,
-    variables: { search: query, limit },
-  });
+  try {
+    const result = await executeGraphQL({
+      query: searchQuery,
+      variables: { search: query, limit },
+    });
 
-  return result?.search;
+    return result?.search;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };

apps/link/app/_actions/tickets.ts

@@ -15,7 +15,7 @@ export const createTicketAction = async (
   try {
     const ticket = {
       groupId: formData.get("groupId"),
-      customerId: `gid://zammad/User/3`, // { email: formData.get("customerId") },
+      customerId: formData.get("customerId"),
       title: formData.get("title"),
       article: {
         internal: true,
@@ -23,16 +23,13 @@ export const createTicketAction = async (
       },
     };
 
-    console.log({ ticket });
-
-    const result = await executeGraphQL({
+    await executeGraphQL({
       query: createTicketMutation,
       variables: {
         input: ticket,
       },
     });
 
-    console.log({ result });
     return {
       ...currentState,
       values: ticket,
@@ -61,7 +58,6 @@ export const createTicketArticleAction = async (
       },
     });
 
-    console.log({ result });
     return {
       result,
       success: true,
@@ -114,10 +110,8 @@ export const updateTicketAction = async (
           tags: ticketInfo.tags,
         },
       });
-      console.log({ tagsResult });
     }
 
-    console.log({ result });
     return {
       result,
       success: true,
@@ -132,55 +126,80 @@ export const updateTicketAction = async (
 };
 
 export const getTicketAction = async (id: string) => {
-  const ticketData = await executeGraphQL({
-    query: getTicketQuery,
-    variables: { ticketId: `gid://zammad/Ticket/${id}` },
-  });
-  console.log({ td: ticketData.ticket });
-  return ticketData?.ticket;
+  try {
+    const ticketData = await executeGraphQL({
+      query: getTicketQuery,
+      variables: { ticketId: `gid://zammad/Ticket/${id}` },
+    });
+
+    return ticketData?.ticket;
+  } catch (e) {
+    console.error(e);
+    return {};
+  }
 };
 
 export const getTicketArticlesAction = async (id: string) => {
-  const ticketData = await executeGraphQL({
-    query: getTicketArticlesQuery,
-    variables: { ticketId: `gid://zammad/Ticket/${id}` },
-  });
+  try {
+    const ticketData = await executeGraphQL({
+      query: getTicketArticlesQuery,
+      variables: { ticketId: `gid://zammad/Ticket/${id}` },
+    });
 
-  return ticketData?.ticketArticles;
+    return ticketData?.ticketArticles;
+  } catch (e) {
+    console.error(e);
+    return {};
+  }
 };
 
 export const getTicketStatesAction = async () => {
-  const states = await executeREST({
-    path: "/api/v1/ticket_states",
-  });
+  try {
+    const states = await executeREST({
+      path: "/api/v1/ticket_states",
+    });
 
-  const formattedStates =
-    states?.map((state: any) => ({
-      value: `gid://zammad/Ticket::State/${state.id}`,
-      label: state.name,
-    })) ?? [];
+    const formattedStates =
+      states?.map((state: any) => ({
+        value: `gid://zammad/Ticket::State/${state.id}`,
+        label: state.name,
+      })) ?? [];
 
-  return formattedStates;
+    return formattedStates;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };
 
 export const getTagsAction = async () => {
-  const { tags } = await executeREST({
-    path: "/api/v1/tags",
-  });
+  try {
+    const { tags } = await executeREST({
+      path: "/api/v1/tags",
+    });
 
-  return tags;
+    return tags;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };
 
 export const getTicketPrioritiesAction = async () => {
-  const priorities = await executeREST({
-    path: "/api/v1/ticket_priorities",
-  });
+  try {
+    const priorities = await executeREST({
+      path: "/api/v1/ticket_priorities",
+    });
 
-  const formattedPriorities =
-    priorities?.map((priority: any) => ({
-      value: `gid://zammad/Ticket::Priority/${priority.id}`,
-      label: priority.name,
-    })) ?? [];
+    const formattedPriorities =
+      priorities?.map((priority: any) => ({
+        value: `gid://zammad/Ticket::Priority/${priority.id}`,
+        label: priority.name,
+      })) ?? [];
 
-  return formattedPriorities;
+    return formattedPriorities;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };

apps/link/app/_actions/users.ts

@@ -3,48 +3,63 @@
 import { executeREST } from "app/_lib/zammad";
 
 export const getAgentsAction = async () => {
-  const users = await executeREST({
-    path: "/api/v1/users",
-  });
-  const agents = users?.filter((user: any) => user.role_ids.includes(2)) ?? [];
-  const formattedAgents = agents
-    .map((agent: any) => ({
-      label: `${agent.firstname} ${agent.lastname}`,
-      value: `gid://zammad/User/${agent.id}`,
-    }))
-    .sort((a: any, b: any) => a.label.localeCompare(b.label));
+  try {
+    const users = await executeREST({
+      path: "/api/v1/users",
+    });
+    const agents =
+      users?.filter((user: any) => user.role_ids.includes(2)) ?? [];
+    const formattedAgents = agents
+      .map((agent: any) => ({
+        label: `${agent.firstname} ${agent.lastname}`,
+        value: `gid://zammad/User/${agent.id}`,
+      }))
+      .sort((a: any, b: any) => a.label.localeCompare(b.label));
 
-  return formattedAgents;
+    return formattedAgents;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };
 
 export const getCustomersAction = async () => {
-  const users = await executeREST({
-    path: "/api/v1/users",
-  });
-  console.log({ users });
-  const customers =
-    users?.filter((user: any) => user.role_ids.includes(3)) ?? [];
-  const formattedCustomers = customers
-    .map((customer: any) => ({
-      label: customer.login,
-      value: `gid://zammad/User/${customer.id}`,
-    }))
-    .sort((a: any, b: any) => a.label.localeCompare(b.label));
+  try {
+    const users = await executeREST({
+      path: "/api/v1/users",
+    });
+    const customers =
+      users?.filter((user: any) => user.role_ids.includes(3)) ?? [];
+    const formattedCustomers = customers
+      .map((customer: any) => ({
+        label: customer.login,
+        value: `gid://zammad/User/${customer.id}`,
+      }))
+      .sort((a: any, b: any) => a.label.localeCompare(b.label));
 
-  return formattedCustomers;
+    return formattedCustomers;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };
 
 export const getUsersAction = async () => {
-  const users = await executeREST({
-    path: "/api/v1/users",
-  });
-  console.log({ users });
-  const formattedUsers = users
-    .map((customer: any) => ({
-      label: customer.login,
-      value: `gid://zammad/User/${customer.id}`,
-    }))
-    .sort((a: any, b: any) => a.label.localeCompare(b.label));
+  try {
+    const users = await executeREST({
+      path: "/api/v1/users",
+    });
+    console.log({ users });
+    const formattedUsers = users
+      .map((customer: any) => ({
+        label: customer.login,
+        value: `gid://zammad/User/${customer.id}`,
+      }))
+      .sort((a: any, b: any) => a.label.localeCompare(b.label));
 
-  return formattedUsers;
+    return formattedUsers;
+  } catch (e) {
+    console.error(e);
+    return [];
+  }
 };

apps/link/app/_components/CSRFProvider.tsx

@@ -1,22 +1,36 @@
 "use client";
 
-import { FC, PropsWithChildren, useEffect } from "react";
+import { FC, PropsWithChildren, useState, useEffect } from "react";
+import { useRouter } from "next/navigation";
 import { useSession } from "next-auth/react";
 
 export const CSRFProvider: FC<PropsWithChildren> = ({ children }) => {
   const { data: session, status, update } = useSession();
+  const router = useRouter();
+  const [redirectCount, setRedirectCount] = useState(0);
 
   useEffect(() => {
     const interval = setInterval(async () => {
+      console.log("Checking session status...");
+      console.log(status);
       if (status === "authenticated") {
         const response = await fetch("/api/v1/users/me");
-        const token = response.headers.get("CSRF-Token");
-        update({ csrfToken: token });
+        console.log(response.ok);
+        console.log(!!router);
+        if (!response.ok && !!router) {
+          console.log("redirecting");
+          setRedirectCount(redirectCount + 1);
+          router.push("/setup");
+        } else {
+          setRedirectCount(0);
+          const token = response.headers.get("CSRF-Token");
+          update({ csrfToken: token });
+        }
       }
-    }, 30000);
+    }, 15000);
 
     return () => clearInterval(interval);
-  }, [session, status, update]);
+  }, [session, status, update, router]);
 
   return children;
 };

apps/link/app/_lib/zammad.ts

@@ -1,4 +1,5 @@
 import { getServerSession } from "app/_lib/authentication";
+import { redirect } from "next/navigation";
 import { cookies } from "next/headers";
 
 const getHeaders = async () => {

apps/link/middleware.ts

@@ -10,12 +10,12 @@ const rewriteURL = (
   const destinationURL = request.url.replace(originBaseURL, destinationBaseURL);
   console.log(`Rewriting ${request.url} to ${destinationURL}`);
   const requestHeaders = new Headers(request.headers);
-  //  console.log({ beforeHeaders: requestHeaders });
+
   for (const [key, value] of Object.entries(headers)) {
     requestHeaders.set(key, value as string);
   }
   requestHeaders.delete("connection");
-  //  console.log({ afterHeaders: requestHeaders });
+
   return NextResponse.rewrite(new URL(destinationURL), {
     request: { headers: requestHeaders },
   });
@@ -26,7 +26,15 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
   const zammadURL = process.env.ZAMMAD_URL ?? "http://zammad-nginx:8080";
   const opensearchDashboardsURL =
     process.env.OPENSEARCH_DASHBOARDS_URL ?? "http://macmini:5601";
-  const zammadPaths = ["/zammad", "/api/v1", "/auth/sso", "/assets", "/mobile"];
+  const zammadPaths = [
+    "/zammad",
+    "/api/v1",
+    "/auth/sso",
+    "/assets",
+    "/mobile",
+    "/graphql",
+    "/cable",
+  ];
   const { token } = request.nextauth;
   const email = token?.email?.toLowerCase() ?? "unknown";
   let headers = { "x-forwarded-user": email };

apps/link/package.json

@@ -24,8 +24,8 @@
     "@mui/icons-material": "^5",
     "@mui/material": "^5",
     "@mui/material-nextjs": "^5.16.6",
-    "@mui/x-data-grid-pro": "^7.12.0",
-    "@mui/x-date-pickers-pro": "^7.12.0",
+    "@mui/x-data-grid-pro": "^7.12.1",
+    "@mui/x-date-pickers-pro": "^7.12.1",
     "date-fns": "^3.6.0",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.0",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
-    "@types/node": "^22.1.0",
+    "@types/node": "^22.2.0",
     "@types/react": "18.3.3",
     "@types/uuid": "^10.0.0",
     "babel-loader": "^9.1.3",