feat: new filter added

calcom · Sep 19, 2022 · a16bd08 · a16bd08
1 parent 1640264
commit a16bd08
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/apps/web/pages/v2/bookings/[status].tsx b/apps/web/pages/v2/bookings/[status].tsx
@@ -20,13 +20,14 @@ import SkeletonLoader from "@components/v2/bookings/SkeletonLoader";
 type BookingListingStatus = inferQueryInput<"viewer.bookings">["status"];
 type BookingOutput = inferQueryOutput<"viewer.bookings">["bookings"][0];
 
-const validStatuses = ["upcoming", "recurring", "past", "cancelled"] as const;
+const validStatuses = ["upcoming", "recurring", "past", "cancelled", "unconfirmed"] as const;
 
 const descriptionByStatus: Record<BookingListingStatus, string> = {
   upcoming: "upcoming_bookings",
   recurring: "recurring_bookings",
   past: "past_bookings",
   cancelled: "cancelled_bookings",
+  unconfirmed: "unconfirmed_bookings",
 };
 
 const querySchema = z.object({

diff --git a/packages/app-store/wipemycalother/components/wipeMyCalActionButton.tsx b/packages/app-store/wipemycalother/components/wipeMyCalActionButton.tsx
@@ -7,7 +7,7 @@ import { ConfirmDialog } from "./confirmDialog";
 
 interface IWipeMyCalActionButtonProps {
   bookingsEmpty: boolean;
-  bookingStatus: "upcoming" | "recurring" | "past" | "cancelled";
+  bookingStatus: "upcoming" | "recurring" | "past" | "cancelled" | "unconfirmed";
 }
 
 const WipeMyCalActionButton = (props: IWipeMyCalActionButtonProps) => {

diff --git a/packages/trpc/server/routers/viewer.tsx b/packages/trpc/server/routers/viewer.tsx
@@ -439,7 +439,7 @@ const loggedInViewerRouter = createProtectedRouter()
   })
   .query("bookings", {
     input: z.object({
-      status: z.enum(["upcoming", "recurring", "past", "cancelled"]),
+      status: z.enum(["upcoming", "recurring", "past", "cancelled", "unconfirmed"]),
       limit: z.number().min(1).max(100).nullish(),
       cursor: z.number().nullish(), // <-- "cursor" needs to exist when using useInfiniteQuery, but can be any type
     }),
@@ -495,6 +495,10 @@ const loggedInViewerRouter = createProtectedRouter()
             { status: { equals: BookingStatus.REJECTED } },
           ],
         },
+        unconfirmed: {
+          endTime: { gte: new Date() },
+          status: { equals: BookingStatus.PENDING },
+        },
       };
       const bookingListingOrderby: Record<
         typeof bookingListingByStatus,
@@ -504,6 +508,7 @@ const loggedInViewerRouter = createProtectedRouter()
         recurring: { startTime: "asc" },
         past: { startTime: "desc" },
         cancelled: { startTime: "desc" },
+        unconfirmed: { startTime: "asc" },
       };
       const passedBookingsFilter = bookingListingFilters[bookingListingByStatus];
       const orderBy = bookingListingOrderby[bookingListingByStatus];

diff --git a/packages/ui/v2/core/layouts/BookingLayout.tsx b/packages/ui/v2/core/layouts/BookingLayout.tsx
@@ -15,11 +15,11 @@ const tabs: (VerticalTabItemProps | HorizontalTabItemProps)[] = [
     icon: Icon.FiCalendar,
   },
   // TODO: Add filter for unconfimred bookings in a future PR - Out of scope
-  // {
-  //   name: "unconfirmed",
-  //   href: "/bookings/unconfirmed",
-  //   icon: Icon.FiInbox,
-  // },
+  {
+    name: "unconfirmed",
+    href: "/bookings/unconfirmed",
+    icon: Icon.FiInbox,
+  },
   {
     name: "recurring",
     href: "/bookings/recurring",