more cleanup

Author: MananTank

apps/dashboard/src/@/components/ui/button.tsx

@@ -26,7 +26,6 @@ const buttonVariants = cva(
         link: "underline-offset-4 hover:underline",
         outline:
           "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground",
-        pink: "border border-nebula-pink-foreground !text-nebula-pink-foreground bg-[hsl(var(--nebula-pink-foreground)/5%)] hover:bg-nebula-pink-foreground/10 dark:!text-foreground dark:bg-nebula-pink-foreground/10 dark:hover:bg-nebula-pink-foreground/20",
         primary: "bg-primary hover:bg-primary/90 text-primary-foreground ",
         secondary:
           "bg-secondary hover:bg-secondary/80 text-secondary-foreground ",

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/SupportTabs.tsx renamed to apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/case-filters.tsx

@@ -3,7 +3,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { cn } from "@/lib/utils";
 
-interface SupportTabsProps {
+export function SupportCaseFilters(props: {
   activeTab: string;
   onTabChange: (tab: string) => void;
   searchQuery: string;
@@ -13,15 +13,8 @@ interface SupportTabsProps {
     open: number;
     closed: number;
   };
-}
-
-export function SupportTabs({
-  activeTab,
-  onTabChange,
-  searchQuery,
-  onSearchChange,
-  counts,
-}: SupportTabsProps) {
+}) {
+  const { activeTab, onTabChange, searchQuery, onSearchChange, counts } = props;
   const tabs = [
     { count: counts.all, id: "all", label: "All" },
     { count: counts.open, id: "open", label: "Open" },

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/SupportCasesClient.tsx renamed to apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/case-list.tsx

@@ -12,9 +12,9 @@ import {
   getTicketStatusBadgeVariant,
   getTicketStatusLabel,
 } from "../utils/ticket-status";
-import { SupportTabs } from "./SupportTabs";
+import { SupportCaseFilters } from "./case-filters";
 
-export default function SupportCasesClient({
+export function SupportsCaseList({
   tickets,
   team,
 }: {
@@ -80,7 +80,7 @@ export default function SupportCasesClient({
 
   return (
     <div className="flex flex-col">
-      <SupportTabs
+      <SupportCaseFilters
         activeTab={activeTab}
         counts={counts}
         onSearchChange={setSearchQuery}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/apis/tickets.ts

@@ -12,14 +12,11 @@ export async function getSupportTicketsByTeam(params: {
   const encodedTeamSlug = encodeURIComponent(params.teamSlug);
   const apiUrl = `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${encodedTeamSlug}/support-conversations/list`;
 
-  // Build the POST payload according to API spec
-  const payload = {
-    limit: 50,
-    descending: true,
-  };
-
   const response = await fetch(apiUrl, {
-    body: JSON.stringify(payload),
+    body: JSON.stringify({
+      limit: 50,
+      descending: true,
+    }),
     cache: "no-store",
     headers: {
       Accept: "application/json",
@@ -51,15 +48,13 @@ type RawSupportMessage = {
     email: string;
     isExternal: boolean;
   };
-  // Add any other fields you use from the API
 };
 
 export async function getSupportTicket(params: {
   ticketId: string;
   teamSlug: string;
   authToken: string;
 }): Promise<SupportTicket> {
-  // URL encode the team slug to handle special characters like #
   const encodedTeamSlug = encodeURIComponent(params.teamSlug);
   const encodedTicketId = encodeURIComponent(params.ticketId);
 
@@ -68,7 +63,6 @@ export async function getSupportTicket(params: {
     descending: false,
   };
 
-  // Fetch conversation details and messages in parallel
   const [conversationResponse, messagesResponse] = await Promise.all([
     fetch(
       `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${encodedTeamSlug}/support-conversations/${encodedTicketId}`,
@@ -108,11 +102,6 @@ export async function getSupportTicket(params: {
   const conversation: SupportTicket = await conversationResponse.json();
   const messagesData: { data?: unknown[] } = await messagesResponse.json();
 
-  console.log({
-    conversation,
-    messagesData,
-  });
-
   const rawMessages = messagesData.data || [];
   // Transform the raw messages to match our interface
   const messages: SupportMessage[] = (rawMessages as RawSupportMessage[])

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/cases/[id]/page.tsx

@@ -1,7 +1,7 @@
 import { notFound, redirect } from "next/navigation";
 import { getAuthToken } from "@/api/auth-token";
 import { getTeamBySlug } from "@/api/team";
-import { tryCatch } from "../../../../../../../../../@/utils/try-catch";
+import { tryCatch } from "@/utils/try-catch";
 import { SupportCaseDetails } from "../../_components/SupportCaseDetails";
 import { getSupportTicket } from "../../apis/tickets";
 

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/page.tsx

@@ -3,7 +3,7 @@ import { notFound } from "next/navigation";
 import { getAuthToken } from "@/api/auth-token";
 import { getTeamBySlug } from "@/api/team";
 import { tryCatch } from "@/utils/try-catch";
-import SupportCasesClient from "./_components/SupportCasesClient";
+import { SupportsCaseList } from "./_components/case-list";
 import { getSupportTicketsByTeam } from "./apis/tickets";
 
 export default async function Page(props: {
@@ -42,7 +42,5 @@ export default async function Page(props: {
     );
   }
 
-  return (
-    <SupportCasesClient team={team} tickets={supportedTicketsResult.data} />
-  );
+  return <SupportsCaseList team={team} tickets={supportedTicketsResult.data} />;
 }

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/types/tickets.ts

@@ -15,6 +15,7 @@ export type SupportTicketStatus =
   | "in_progress"
   | "on_hold"
   | "closed"
+  | "open"
   | "resolved";
 
 export type SupportTicket = {
@@ -26,17 +27,13 @@ export type SupportTicket = {
   respondedAt: string | null;
   messages: SupportMessage[];
   title: string;
-  tags: Array<{ id: string; name: string }>;
 };
 
 export type SupportTicketListItem = {
   id: string;
   status: SupportTicketStatus;
-  // timestamps
   createdAt: string;
   updatedAt: string;
   closedAt: string | null;
-  respondedAt: string | null;
   title: string;
-  tags: Array<{ id: string; name: string }>;
 };

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/utils/ticket-status.ts

@@ -5,14 +5,18 @@ export function getTicketStatusBadgeVariant(
   status: SupportTicketStatus,
 ): BadgeProps["variant"] {
   switch (status) {
+    case "open":
+      return "default";
     case "resolved":
       return "success";
     case "closed":
       return "outline";
+    // invert logic for user
     case "in_progress":
-      return "default";
-    case "needs_response":
       return "warning";
+    // invert logic for user
+    case "needs_response":
+      return "default";
     case "on_hold":
       return "outline";
     default:
@@ -24,10 +28,14 @@ export function getTicketStatusLabel(status: SupportTicketStatus): string {
   switch (status) {
     case "closed":
       return "Closed";
+    case "open":
+      return "Open";
     case "resolved":
       return "Resolved";
+    // Invert logic for user - in Progress becomes needs response
     case "in_progress":
-      return "Needs Response";
+      return "Response Required";
+    // Invert logic for user - needs response becomes in progress
     case "needs_response":
       return "In Progress";
     case "on_hold":