From b5299b897b79441052aceb5476ebcf317719aa0d Mon Sep 17 00:00:00 2001
From: Rohit Kumar Saini <rohitbhatwara1@gmail.com>
Date: Tue, 10 Dec 2024 12:32:51 +0100
Subject: [PATCH 1/6] feat(me): create basic layout of me page

---
 app/components/layout/sidebar/bottom.tsx | 14 ++++-
 app/routes/_layout+/me.assets.tsx        | 14 +++++
 app/routes/_layout+/me.tsx               | 67 ++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 app/routes/_layout+/me.assets.tsx
 create mode 100644 app/routes/_layout+/me.tsx

diff --git a/app/components/layout/sidebar/bottom.tsx b/app/components/layout/sidebar/bottom.tsx
index b72e72825..a43989edb 100644
--- a/app/components/layout/sidebar/bottom.tsx
+++ b/app/components/layout/sidebar/bottom.tsx
@@ -74,7 +74,19 @@ export default function SidebarBottom({ user }: Props) {
         >
           <DropdownMenuItem className="border-b border-gray-200 p-0">
             <Button
-              to={`/account-details`}
+              to="/me"
+              icon="profile"
+              role="link"
+              variant="link"
+              className="justify-start px-4 py-3 text-gray-700 hover:text-gray-700"
+              width="full"
+            >
+              My Profile
+            </Button>
+          </DropdownMenuItem>
+          <DropdownMenuItem className="border-b border-gray-200 p-0">
+            <Button
+              to="/account-details"
               icon="profile"
               role="link"
               variant="link"
diff --git a/app/routes/_layout+/me.assets.tsx b/app/routes/_layout+/me.assets.tsx
new file mode 100644
index 000000000..4f3fa5d17
--- /dev/null
+++ b/app/routes/_layout+/me.assets.tsx
@@ -0,0 +1,14 @@
+import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import { makeShelfError } from "~/utils/error";
+import { error } from "~/utils/http.server";
+
+export async function loader({ request, context }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const userId = authSession.userId;
+
+  try {
+  } catch (cause) {
+    const reason = makeShelfError(cause, { userId });
+    throw json(error(reason), { status: reason.status });
+  }
+}
diff --git a/app/routes/_layout+/me.tsx b/app/routes/_layout+/me.tsx
new file mode 100644
index 000000000..22c0b6024
--- /dev/null
+++ b/app/routes/_layout+/me.tsx
@@ -0,0 +1,67 @@
+import { json } from "@remix-run/node";
+import type { MetaArgs, LoaderFunctionArgs } from "@remix-run/node";
+import { Outlet, useLoaderData } from "@remix-run/react";
+import Header from "~/components/layout/header";
+import HorizontalTabs from "~/components/layout/horizontal-tabs";
+import type { Item } from "~/components/layout/horizontal-tabs/types";
+import { getUserByID } from "~/modules/user/service.server";
+import { appendToMetaTitle } from "~/utils/append-to-meta-title";
+import { makeShelfError } from "~/utils/error";
+import { data, error } from "~/utils/http.server";
+
+export async function loader({ context }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const userId = authSession.userId;
+
+  try {
+    const user = await getUserByID(userId);
+
+    const userName = `${user.firstName?.trim()} ${user.lastName?.trim()}`;
+
+    const header = { title: userName };
+
+    return json(data({ header, user, userName }));
+  } catch (cause) {
+    const reason = makeShelfError(cause, { userId });
+    throw json(error(reason), { status: reason.status });
+  }
+}
+
+export const handle = {
+  breadcrumb: () => "single",
+};
+
+export function meta({ data }: MetaArgs<typeof loader>) {
+  return [{ title: data ? appendToMetaTitle(data.header.title) : "" }];
+}
+
+export default function Me() {
+  const { user } = useLoaderData<typeof loader>();
+
+  const TABS: Item[] = [
+    { to: "assets", content: "Assets" },
+    { to: "bookings", content: "Bookings" },
+  ];
+
+  return (
+    <>
+      <Header
+        hideBreadcrumbs
+        slots={{
+          "left-of-title": (
+            <img
+              src={
+                user.profilePicture ?? "/static/images/asset-placeholder.jpg"
+              }
+              alt="team-member"
+              className="mr-4 size-14 rounded"
+            />
+          ),
+        }}
+        subHeading={user.email}
+      />
+      <HorizontalTabs items={TABS} />
+      <Outlet />
+    </>
+  );
+}

From a4cc79d527dbf3fbc38568cf75bd007d508ec02a Mon Sep 17 00:00:00 2001
From: Rohit Kumar Saini <rohitbhatwara1@gmail.com>
Date: Tue, 10 Dec 2024 14:42:56 +0100
Subject: [PATCH 2/6] feat(me): create assets page for my profile page

---
 .../layout/sidebar/sidebar-user-menu.tsx      |  12 +-
 app/routes/_layout+/me._index.tsx             |  11 ++
 app/routes/_layout+/me.assets.tsx             | 107 ++++++++++++++++++
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 app/routes/_layout+/me._index.tsx
 create mode 100644 app/routes/_layout+/me.assets.tsx

diff --git a/app/components/layout/sidebar/sidebar-user-menu.tsx b/app/components/layout/sidebar/sidebar-user-menu.tsx
index c74634649..063019836 100644
--- a/app/components/layout/sidebar/sidebar-user-menu.tsx
+++ b/app/components/layout/sidebar/sidebar-user-menu.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { NavLink, useFetcher, useLoaderData } from "@remix-run/react";
-import { LogOutIcon, UserRoundIcon } from "lucide-react";
+import { LogOutIcon, UserPenIcon, UserRoundIcon } from "lucide-react";
 import { ChevronRight } from "~/components/icons/library";
 import {
   DropdownMenu,
@@ -77,6 +77,16 @@ export default function SidebarUserMenu() {
               </div>
             </DropdownMenuLabel>
             <DropdownMenuSeparator />
+            <DropdownMenuItem
+              asChild
+              className="cursor-pointer gap-2 border-b border-gray-200 p-2"
+              onClick={closeDropdown}
+            >
+              <NavLink to="/me">
+                <UserPenIcon className="size-4" />
+                My Profile
+              </NavLink>
+            </DropdownMenuItem>
             <DropdownMenuItem
               asChild
               className="cursor-pointer gap-2 border-b border-gray-200 p-2"
diff --git a/app/routes/_layout+/me._index.tsx b/app/routes/_layout+/me._index.tsx
new file mode 100644
index 000000000..ebb0c5df5
--- /dev/null
+++ b/app/routes/_layout+/me._index.tsx
@@ -0,0 +1,11 @@
+import { redirect } from "@remix-run/node";
+
+/**
+ * We do not render anything on /me
+ * We just redirect to default sub-route which is /assets
+ */
+export function loader() {
+  return redirect("assets");
+}
+
+export const shouldRevalidate = () => false;
diff --git a/app/routes/_layout+/me.assets.tsx b/app/routes/_layout+/me.assets.tsx
new file mode 100644
index 000000000..d4e7d2654
--- /dev/null
+++ b/app/routes/_layout+/me.assets.tsx
@@ -0,0 +1,107 @@
+import { json, redirect, type LoaderFunctionArgs } from "@remix-run/node";
+import { getPaginatedAndFilterableAssets } from "~/modules/asset/service.server";
+import {
+  getFiltersFromRequest,
+  setCookie,
+  userPrefs,
+} from "~/utils/cookies.server";
+import { makeShelfError } from "~/utils/error";
+import { data, error } from "~/utils/http.server";
+import {
+  PermissionAction,
+  PermissionEntity,
+} from "~/utils/permissions/permission.data";
+import { requirePermission } from "~/utils/roles.server";
+import { AssetsList } from "./assets._index";
+
+export async function loader({ request, context }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const userId = authSession.userId;
+
+  try {
+    const { organizationId } = await requirePermission({
+      userId,
+      request,
+      entity: PermissionEntity.asset,
+      action: PermissionAction.read,
+    });
+
+    const { filters, redirectNeeded } = await getFiltersFromRequest(
+      request,
+      organizationId
+    );
+    if (filters && redirectNeeded) {
+      const cookieParams = new URLSearchParams(filters);
+      return redirect(`/assets?${cookieParams.toString()}`);
+    }
+
+    const filtersSearchParams = new URLSearchParams();
+    filtersSearchParams.set("userId", userId);
+
+    const {
+      search,
+      totalAssets,
+      perPage,
+      page,
+      categories,
+      tags,
+      assets,
+      totalPages,
+      cookie,
+      totalCategories,
+      totalTags,
+      locations,
+      totalLocations,
+    } = await getPaginatedAndFilterableAssets({
+      request,
+      organizationId,
+      filters: filtersSearchParams.toString(),
+    });
+
+    const modelName = {
+      singular: "asset",
+      plural: "assets",
+    };
+
+    const userPrefsCookie = await userPrefs.serialize(cookie);
+    const headers = [setCookie(userPrefsCookie)];
+
+    return json(
+      data({
+        search,
+        totalItems: totalAssets,
+        perPage,
+        page,
+        categories,
+        tags,
+        items: assets,
+        totalPages,
+        cookie,
+        totalCategories,
+        totalTags,
+        locations,
+        totalLocations,
+        modelName,
+      }),
+      {
+        headers,
+      }
+    );
+  } catch (cause) {
+    const reason = makeShelfError(cause, { userId });
+    throw json(error(reason), { status: reason.status });
+  }
+}
+
+export default function MyAssets() {
+  return (
+    <AssetsList
+      disableTeamMemberFilter
+      disableBulkActions
+      customEmptyState={{
+        title: "No assets",
+        text: "You have not created any assets yet and no assets are assigned to you.",
+      }}
+    />
+  );
+}

From 5eac9705c9ef97e5a0228e21b509718f4c9c177f Mon Sep 17 00:00:00 2001
From: Rohit Kumar Saini <rohitbhatwara1@gmail.com>
Date: Tue, 10 Dec 2024 17:11:12 +0100
Subject: [PATCH 3/6] feat(me): create bookings page for my profile

---
 app/modules/booking/service.server.ts         | 26 ++++++
 app/routes/_layout+/bookings.tsx              |  2 +
 app/routes/_layout+/me.assets.tsx             |  4 +-
 app/routes/_layout+/me.bookings.tsx           | 84 +++++++++++++++++++
 .../settings.team.users.$userId.bookings.tsx  | 29 ++-----
 5 files changed, 119 insertions(+), 26 deletions(-)
 create mode 100644 app/routes/_layout+/me.bookings.tsx

diff --git a/app/modules/booking/service.server.ts b/app/modules/booking/service.server.ts
index a1466e7a2..b7a44ce09 100644
--- a/app/modules/booking/service.server.ts
+++ b/app/modules/booking/service.server.ts
@@ -12,6 +12,7 @@ import { db } from "~/database/db.server";
 import { bookingUpdatesTemplateString } from "~/emails/bookings-updates-template";
 import { sendEmail } from "~/emails/mail.server";
 import { getStatusClasses, isOneDayEvent } from "~/utils/calendar";
+import { getDateTimeFormat } from "~/utils/client-hints";
 import { calcTimeDifference } from "~/utils/date-fns";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import type { ErrorLabel } from "~/utils/error";
@@ -1649,3 +1650,28 @@ export async function getExistingBookingDetails(bookingId: string) {
     });
   }
 }
+
+export function formatBookingsDates(bookings: Booking[], request: Request) {
+  return bookings.map((b) => {
+    if (b.from && b.to) {
+      const from = new Date(b.from);
+      const displayFrom = getDateTimeFormat(request, {
+        dateStyle: "short",
+        timeStyle: "short",
+      }).format(from);
+
+      const to = new Date(b.to);
+      const displayTo = getDateTimeFormat(request, {
+        dateStyle: "short",
+        timeStyle: "short",
+      }).format(to);
+
+      return {
+        ...b,
+        displayFrom: displayFrom.split(","),
+        displayTo: displayTo.split(","),
+      };
+    }
+    return b;
+  });
+}
diff --git a/app/routes/_layout+/bookings.tsx b/app/routes/_layout+/bookings.tsx
index 6892426af..163ee69d6 100644
--- a/app/routes/_layout+/bookings.tsx
+++ b/app/routes/_layout+/bookings.tsx
@@ -229,6 +229,7 @@ export default function BookingsIndexPage({
     "$assetId.bookings",
     "$userId.bookings",
     "bookings.update-existing",
+    "me.bookings",
   ];
 
   const shouldRenderIndex = allowedRoutes.includes(currentRoute?.handle?.name);
@@ -237,6 +238,7 @@ export default function BookingsIndexPage({
   const isChildBookingsPage = [
     "$assetId.bookings",
     "$userId.bookings",
+    "me.bookings",
   ].includes(currentRoute?.handle?.name);
 
   const isBookingUpdateExisting =
diff --git a/app/routes/_layout+/me.assets.tsx b/app/routes/_layout+/me.assets.tsx
index d4e7d2654..ccf6b8e50 100644
--- a/app/routes/_layout+/me.assets.tsx
+++ b/app/routes/_layout+/me.assets.tsx
@@ -35,8 +35,8 @@ export async function loader({ request, context }: LoaderFunctionArgs) {
       return redirect(`/assets?${cookieParams.toString()}`);
     }
 
-    const filtersSearchParams = new URLSearchParams();
-    filtersSearchParams.set("userId", userId);
+    const filtersSearchParams = new URLSearchParams(filters);
+    filtersSearchParams.set("teamMember", userId);
 
     const {
       search,
diff --git a/app/routes/_layout+/me.bookings.tsx b/app/routes/_layout+/me.bookings.tsx
new file mode 100644
index 000000000..78704a5ca
--- /dev/null
+++ b/app/routes/_layout+/me.bookings.tsx
@@ -0,0 +1,84 @@
+import { BookingStatus } from "@prisma/client";
+import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { HeaderData } from "~/components/layout/header/types";
+import {
+  formatBookingsDates,
+  getBookings,
+} from "~/modules/booking/service.server";
+import { updateCookieWithPerPage } from "~/utils/cookies.server";
+import { makeShelfError } from "~/utils/error";
+import { data, error, getCurrentSearchParams } from "~/utils/http.server";
+import { getParamsValues } from "~/utils/list";
+import {
+  PermissionAction,
+  PermissionEntity,
+} from "~/utils/permissions/permission.data";
+import { requirePermission } from "~/utils/roles.server";
+import BookingsIndexPage from "./bookings";
+
+export async function loader({ context, request }: LoaderFunctionArgs) {
+  const authSession = context.getSession();
+  const userId = authSession.userId;
+
+  try {
+    const { organizationId } = await requirePermission({
+      userId,
+      request,
+      entity: PermissionEntity.booking,
+      action: PermissionAction.read,
+    });
+
+    const searchParams = getCurrentSearchParams(request);
+    const { page, perPageParam, search, status } =
+      getParamsValues(searchParams);
+
+    const cookie = await updateCookieWithPerPage(request, perPageParam);
+    const { perPage } = cookie;
+
+    const { bookings, bookingCount } = await getBookings({
+      organizationId,
+      page,
+      perPage,
+      search,
+      userId,
+      custodianUserId: userId,
+      statuses: status ? [status] : Object.values(BookingStatus),
+    });
+
+    const totalPages = Math.ceil(bookingCount / perPage);
+
+    const header: HeaderData = { title: "Bookings" };
+
+    const modelName = {
+      singular: "booking",
+      plural: "bookings",
+    };
+
+    /** We format the dates on the server based on the users timezone and locale  */
+    const items = formatBookingsDates(bookings, request);
+
+    return json(
+      data({
+        header,
+        items,
+        search,
+        page,
+        totalItems: bookingCount,
+        totalPages,
+        perPage,
+        modelName,
+      })
+    );
+  } catch (cause) {
+    const reason = makeShelfError(cause, { userId });
+    throw json(error(reason), { status: reason.status });
+  }
+}
+
+export default function MyBookings() {
+  return <BookingsIndexPage disableBulkActions className="!mt-0" />;
+}
+
+export const handle = {
+  name: "me.bookings",
+};
diff --git a/app/routes/_layout+/settings.team.users.$userId.bookings.tsx b/app/routes/_layout+/settings.team.users.$userId.bookings.tsx
index 4048b3d76..fe5e38284 100644
--- a/app/routes/_layout+/settings.team.users.$userId.bookings.tsx
+++ b/app/routes/_layout+/settings.team.users.$userId.bookings.tsx
@@ -2,8 +2,10 @@ import { BookingStatus } from "@prisma/client";
 import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { z } from "zod";
 import type { HeaderData } from "~/components/layout/header/types";
-import { getBookings } from "~/modules/booking/service.server";
-import { getDateTimeFormat } from "~/utils/client-hints";
+import {
+  formatBookingsDates,
+  getBookings,
+} from "~/modules/booking/service.server";
 import {
   setCookie,
   updateCookieWithPerPage,
@@ -72,28 +74,7 @@ export async function loader({ context, request, params }: LoaderFunctionArgs) {
     };
 
     /** We format the dates on the server based on the users timezone and locale  */
-    const items = bookings.map((b) => {
-      if (b.from && b.to) {
-        const from = new Date(b.from);
-        const displayFrom = getDateTimeFormat(request, {
-          dateStyle: "short",
-          timeStyle: "short",
-        }).format(from);
-
-        const to = new Date(b.to);
-        const displayTo = getDateTimeFormat(request, {
-          dateStyle: "short",
-          timeStyle: "short",
-        }).format(to);
-
-        return {
-          ...b,
-          displayFrom: displayFrom.split(","),
-          displayTo: displayTo.split(","),
-        };
-      }
-      return b;
-    });
+    const items = formatBookingsDates(bookings, request);
 
     return json(
       data({

From d6d271ce63eb936d774cf1411439c762c7593b6f Mon Sep 17 00:00:00 2001
From: Rohit Kumar Saini <rohitbhatwara1@gmail.com>
Date: Thu, 12 Dec 2024 12:41:29 +0100
Subject: [PATCH 4/6] feat(me): create common function to get assets for assets
 tab in loader

---
 app/modules/asset/service.server.ts           | 86 ++++++++++++++++++-
 app/routes/_layout+/me.assets.tsx             | 69 ++-------------
 .../settings.team.users.$userId.assets.tsx    | 74 ++--------------
 3 files changed, 94 insertions(+), 135 deletions(-)

diff --git a/app/modules/asset/service.server.ts b/app/modules/asset/service.server.ts
index 18ef0e76d..38983f3de 100644
--- a/app/modules/asset/service.server.ts
+++ b/app/modules/asset/service.server.ts
@@ -19,7 +19,7 @@ import {
   ErrorCorrection,
   Prisma,
 } from "@prisma/client";
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import { redirect, type LoaderFunctionArgs } from "@remix-run/node";
 import type {
   SortingDirection,
   SortingOptions,
@@ -42,7 +42,12 @@ import {
 } from "~/modules/team-member/service.server";
 import type { AllowedModelNames } from "~/routes/api+/model-filters";
 
-import { updateCookieWithPerPage } from "~/utils/cookies.server";
+import {
+  getFiltersFromRequest,
+  setCookie,
+  updateCookieWithPerPage,
+  userPrefs,
+} from "~/utils/cookies.server";
 import {
   buildCustomFieldValue,
   extractCustomFieldValuesFromPayload,
@@ -3015,3 +3020,80 @@ export async function relinkQrCode({
     }),
   ]);
 }
+
+export async function getAssetsTabLoaderData({
+  userId,
+  request,
+  organizationId,
+}: {
+  userId: User["id"];
+  request: Request;
+  organizationId: Organization["id"];
+}) {
+  try {
+    const { filters, redirectNeeded } = await getFiltersFromRequest(
+      request,
+      organizationId
+    );
+
+    if (filters && redirectNeeded) {
+      const cookieParams = new URLSearchParams(filters);
+      return redirect(`/assets?${cookieParams.toString()}`);
+    }
+
+    const filtersSearchParams = new URLSearchParams(filters);
+    filtersSearchParams.set("teamMember", userId);
+
+    const {
+      search,
+      totalAssets,
+      perPage,
+      page,
+      categories,
+      tags,
+      assets,
+      totalPages,
+      cookie,
+      totalCategories,
+      totalTags,
+      locations,
+      totalLocations,
+    } = await getPaginatedAndFilterableAssets({
+      request,
+      organizationId,
+      filters: filtersSearchParams.toString(),
+    });
+
+    const modelName = {
+      singular: "asset",
+      plural: "assets",
+    };
+
+    const userPrefsCookie = await userPrefs.serialize(cookie);
+    const headers = [setCookie(userPrefsCookie)];
+
+    return {
+      search,
+      totalItems: totalAssets,
+      perPage,
+      page,
+      categories,
+      tags,
+      items: assets,
+      totalPages,
+      cookie,
+      totalCategories,
+      totalTags,
+      locations,
+      totalLocations,
+      modelName,
+      headers,
+    };
+  } catch (cause) {
+    throw new ShelfError({
+      cause,
+      label,
+      message: "Something went wrong while fetching assets",
+    });
+  }
+}
diff --git a/app/routes/_layout+/me.assets.tsx b/app/routes/_layout+/me.assets.tsx
index ccf6b8e50..26f25684e 100644
--- a/app/routes/_layout+/me.assets.tsx
+++ b/app/routes/_layout+/me.assets.tsx
@@ -1,10 +1,5 @@
-import { json, redirect, type LoaderFunctionArgs } from "@remix-run/node";
-import { getPaginatedAndFilterableAssets } from "~/modules/asset/service.server";
-import {
-  getFiltersFromRequest,
-  setCookie,
-  userPrefs,
-} from "~/utils/cookies.server";
+import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import { getAssetsTabLoaderData } from "~/modules/asset/service.server";
 import { makeShelfError } from "~/utils/error";
 import { data, error } from "~/utils/http.server";
 import {
@@ -26,67 +21,13 @@ export async function loader({ request, context }: LoaderFunctionArgs) {
       action: PermissionAction.read,
     });
 
-    const { filters, redirectNeeded } = await getFiltersFromRequest(
-      request,
-      organizationId
-    );
-    if (filters && redirectNeeded) {
-      const cookieParams = new URLSearchParams(filters);
-      return redirect(`/assets?${cookieParams.toString()}`);
-    }
-
-    const filtersSearchParams = new URLSearchParams(filters);
-    filtersSearchParams.set("teamMember", userId);
-
-    const {
-      search,
-      totalAssets,
-      perPage,
-      page,
-      categories,
-      tags,
-      assets,
-      totalPages,
-      cookie,
-      totalCategories,
-      totalTags,
-      locations,
-      totalLocations,
-    } = await getPaginatedAndFilterableAssets({
+    const { headers, ...loaderData } = await getAssetsTabLoaderData({
+      userId,
       request,
       organizationId,
-      filters: filtersSearchParams.toString(),
     });
 
-    const modelName = {
-      singular: "asset",
-      plural: "assets",
-    };
-
-    const userPrefsCookie = await userPrefs.serialize(cookie);
-    const headers = [setCookie(userPrefsCookie)];
-
-    return json(
-      data({
-        search,
-        totalItems: totalAssets,
-        perPage,
-        page,
-        categories,
-        tags,
-        items: assets,
-        totalPages,
-        cookie,
-        totalCategories,
-        totalTags,
-        locations,
-        totalLocations,
-        modelName,
-      }),
-      {
-        headers,
-      }
-    );
+    return json(data(loaderData), { headers });
   } catch (cause) {
     const reason = makeShelfError(cause, { userId });
     throw json(error(reason), { status: reason.status });
diff --git a/app/routes/_layout+/settings.team.users.$userId.assets.tsx b/app/routes/_layout+/settings.team.users.$userId.assets.tsx
index 2aec728f0..c20e2c4bb 100644
--- a/app/routes/_layout+/settings.team.users.$userId.assets.tsx
+++ b/app/routes/_layout+/settings.team.users.$userId.assets.tsx
@@ -1,12 +1,7 @@
-import { json, redirect } from "@remix-run/node";
+import { json } from "@remix-run/node";
 import type { LoaderFunctionArgs } from "@remix-run/node";
 import { z } from "zod";
-import { getPaginatedAndFilterableAssets } from "~/modules/asset/service.server";
-import {
-  getFiltersFromRequest,
-  setCookie,
-  userPrefs,
-} from "~/utils/cookies.server";
+import { getAssetsTabLoaderData } from "~/modules/asset/service.server";
 import { makeShelfError } from "~/utils/error";
 import { data, error, getParams } from "~/utils/http.server";
 import {
@@ -35,73 +30,14 @@ export async function loader({ request, context, params }: LoaderFunctionArgs) {
         additionalData: { userId },
       }
     );
-    const { filters, redirectNeeded } = await getFiltersFromRequest(
-      request,
-      organizationId
-    );
-
-    if (filters && redirectNeeded) {
-      const cookieParams = new URLSearchParams(filters);
-      return redirect(`/assets?${cookieParams.toString()}`);
-    }
-
-    /**
-     * We have to protect against bad actors adding teamMember param in the url and getting the assets from another team member
-     * In this view there could only be 1 team member this is scoped to and that is the user we are currently viewing: selectedUserId
-     * */
-    const filtersSearchParams = new URLSearchParams(filters);
-    filtersSearchParams.set("teamMember", selectedUserId as string);
 
-    const {
-      search,
-      totalAssets,
-      perPage,
-      page,
-      categories,
-      tags,
-      assets,
-      totalPages,
-      cookie,
-      totalCategories,
-      totalTags,
-      locations,
-      totalLocations,
-    } = await getPaginatedAndFilterableAssets({
-      // @TODO this is a good example where we dont need the teamMembers so we should modify the function to allow skipping it from query as it can be very heavy. This should be done for every case where we dont use teamMembers
+    const { headers, ...loaderData } = await getAssetsTabLoaderData({
+      userId: selectedUserId,
       request,
       organizationId,
-      filters: filtersSearchParams.toString(),
     });
 
-    const modelName = {
-      singular: "asset",
-      plural: "assets",
-    };
-
-    const userPrefsCookie = await userPrefs.serialize(cookie);
-    const headers = [setCookie(userPrefsCookie)];
-
-    return json(
-      data({
-        search,
-        totalItems: totalAssets,
-        perPage,
-        page,
-        categories,
-        tags,
-        items: assets,
-        totalPages,
-        cookie,
-        totalCategories,
-        totalTags,
-        locations,
-        totalLocations,
-        modelName,
-      }),
-      {
-        headers,
-      }
-    );
+    return json(data(loaderData), { headers });
   } catch (cause) {
     const reason = makeShelfError(cause, { userId });
     throw json(error(reason), { status: reason.status });

From edc4ef082371cc0edacc8f1bbc73af35f457d01b Mon Sep 17 00:00:00 2001
From: Donkoko <nbonev@duck.com>
Date: Thu, 12 Dec 2024 14:36:12 +0200
Subject: [PATCH 5/6] adjustments: - made sure status of bookings on team
 member page and my profile page is handled the same way - added breadcrumbs
 on profile page & updated breadcrumbs content - fixed small bug with 404 page

---
 app/routes/$.tsx                                            | 2 +-
 app/routes/_layout+/me.bookings.tsx                         | 6 ++++--
 app/routes/_layout+/me.tsx                                  | 3 +--
 .../_layout+/settings.team.users.$userId.bookings.tsx       | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/routes/$.tsx b/app/routes/$.tsx
index 25f4c1b5c..9c2bc9d5e 100644
--- a/app/routes/$.tsx
+++ b/app/routes/$.tsx
@@ -6,7 +6,7 @@ export const meta = () => [{ title: appendToMetaTitle("Not found") }];
 
 export default function LayoutSplat() {
   return (
-    <div className="flex size-full items-center justify-center">
+    <div className="flex size-full h-screen items-center justify-center">
       <div className="flex flex-col items-center text-center">
         <span className="mb-5 size-[56px] text-primary">
           <ErrorIcon />
diff --git a/app/routes/_layout+/me.bookings.tsx b/app/routes/_layout+/me.bookings.tsx
index 78704a5ca..bce8da485 100644
--- a/app/routes/_layout+/me.bookings.tsx
+++ b/app/routes/_layout+/me.bookings.tsx
@@ -1,4 +1,3 @@
-import { BookingStatus } from "@prisma/client";
 import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import type { HeaderData } from "~/components/layout/header/types";
 import {
@@ -42,7 +41,10 @@ export async function loader({ context, request }: LoaderFunctionArgs) {
       search,
       userId,
       custodianUserId: userId,
-      statuses: status ? [status] : Object.values(BookingStatus),
+      ...(status && {
+        // If status is in the params, we filter based on it
+        statuses: [status],
+      }),
     });
 
     const totalPages = Math.ceil(bookingCount / perPage);
diff --git a/app/routes/_layout+/me.tsx b/app/routes/_layout+/me.tsx
index 22c0b6024..8735d4d60 100644
--- a/app/routes/_layout+/me.tsx
+++ b/app/routes/_layout+/me.tsx
@@ -28,7 +28,7 @@ export async function loader({ context }: LoaderFunctionArgs) {
 }
 
 export const handle = {
-  breadcrumb: () => "single",
+  breadcrumb: () => "My profile",
 };
 
 export function meta({ data }: MetaArgs<typeof loader>) {
@@ -46,7 +46,6 @@ export default function Me() {
   return (
     <>
       <Header
-        hideBreadcrumbs
         slots={{
           "left-of-title": (
             <img
diff --git a/app/routes/_layout+/settings.team.users.$userId.bookings.tsx b/app/routes/_layout+/settings.team.users.$userId.bookings.tsx
index fe5e38284..d4a333588 100644
--- a/app/routes/_layout+/settings.team.users.$userId.bookings.tsx
+++ b/app/routes/_layout+/settings.team.users.$userId.bookings.tsx
@@ -1,4 +1,3 @@
-import { BookingStatus } from "@prisma/client";
 import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { z } from "zod";
 import type { HeaderData } from "~/components/layout/header/types";
@@ -60,7 +59,10 @@ export async function loader({ context, request, params }: LoaderFunctionArgs) {
       search,
       userId: authSession?.userId,
       custodianUserId: selectedUserId,
-      statuses: status ? [status] : Object.values(BookingStatus),
+      ...(status && {
+        // If status is in the params, we filter based on it
+        statuses: [status],
+      }),
     });
 
     const totalPages = Math.ceil(bookingCount / perPage);

From 2e5d4927d4973b25dabc4734f30b3c5bbd92d998 Mon Sep 17 00:00:00 2001
From: Rohit Kumar Saini <rohitbhatwara1@gmail.com>
Date: Thu, 12 Dec 2024 13:59:40 +0100
Subject: [PATCH 6/6] feat(auto-logout): update expiry of session to 3 days

---
 server/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/index.ts b/server/index.ts
index 47f99a179..4d5551fdf 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -112,7 +112,7 @@ export const server = await createHonoServer({
             // If a user doesn't come back to the app within 30 days, their session will be deleted.
             async commitSession(session) {
               return sessionStorage.commitSession(session, {
-                maxAge: 60 * 60 * 24 * 30, // 30 days
+                maxAge: 60 * 60 * 24 * 3, // 3 days
               });
             },
           };