diff --git a/app/routes/_layout+/assets.$assetId.reminders.tsx b/app/routes/_layout+/assets.$assetId.reminders.tsx
new file mode 100644
index 000000000..221c387d4
--- /dev/null
+++ b/app/routes/_layout+/assets.$assetId.reminders.tsx
@@ -0,0 +1,96 @@
+import { json } from "@remix-run/node";
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
+import { z } from "zod";
+import RemindersTable from "~/components/asset-reminder/reminders-table";
+import type { HeaderData } from "~/components/layout/header/types";
+import { getPaginatedAndFilterableReminders } from "~/modules/asset-reminder/service.server";
+import { resolveRemindersActions } from "~/modules/asset-reminder/utils.server";
+import { getDateTimeFormat } from "~/utils/client-hints";
+import { makeShelfError } from "~/utils/error";
+import { data, error, getParams } from "~/utils/http.server";
+import {
+ PermissionAction,
+ PermissionEntity,
+} from "~/utils/permissions/permission.data";
+import { requirePermission } from "~/utils/roles.server";
+
+export async function loader({ context, request, params }: LoaderFunctionArgs) {
+ const authSession = context.getSession();
+ const userId = authSession.userId;
+
+ const { assetId } = getParams(params, z.object({ assetId: z.string() }), {
+ additionalData: { userId },
+ });
+
+ try {
+ const { organizationId } = await requirePermission({
+ userId,
+ request,
+ entity: PermissionEntity.asset,
+ action: PermissionAction.read,
+ });
+
+ const { reminders, totalReminders, page, perPage, totalPages } =
+ await getPaginatedAndFilterableReminders({
+ organizationId,
+ request,
+ where: { assetId },
+ });
+
+ const header: HeaderData = { title: "Reminders" };
+ const modelName = {
+ singular: "reminder",
+ plural: "reminders",
+ };
+
+ const assetReminders = reminders.map((reminder) => ({
+ ...reminder,
+ displayDate: getDateTimeFormat(request, {
+ dateStyle: "short",
+ timeStyle: "short",
+ }).format(reminder.alertDateTime),
+ }));
+
+ return json(
+ data({
+ header,
+ modelName,
+ items: assetReminders,
+ totalItems: totalReminders,
+ page,
+ perPage,
+ totalPages,
+ })
+ );
+ } catch (cause) {
+ const reason = makeShelfError(cause, { userId, assetId });
+ throw json(error(reason), { status: reason.status });
+ }
+}
+
+export async function action({ context, request }: ActionFunctionArgs) {
+ const authSession = context.getSession();
+ const userId = authSession.userId;
+
+ try {
+ const { organizationId } = await requirePermission({
+ userId,
+ request,
+ entity: PermissionEntity.asset,
+ action: PermissionAction.update,
+ });
+
+ return await resolveRemindersActions({
+ request,
+ organizationId,
+ userId,
+ });
+ } catch (cause) {
+ const reason = makeShelfError(cause, { userId });
+ return json(error(reason), { status: reason.status });
+ }
+}
+
+export default function AssetReminders() {
+ return = ({ data }) => [
+ { title: appendToMetaTitle(data?.header.title) },
+];
+
+export default function Reminders() {
+ return (
+ <>
+
+ = {
organizationId,
@@ -84,13 +85,32 @@ export async function loader({ context, request }: LoaderFunctionArgs) {
* - teamMember's name
* - teamMember's user firstName, lastName and email
*/
- if (name === "teamMember") {
+ if (modelFilters.name === "teamMember") {
where.OR.push(
{ name: { contains: queryValue, mode: "insensitive" } },
{ user: { firstName: { contains: queryValue, mode: "insensitive" } } },
{ user: { firstName: { contains: queryValue, mode: "insensitive" } } },
{ user: { email: { contains: queryValue, mode: "insensitive" } } }
);
+
+ where.deletedAt = modelFilters.deletedAt;
+ if (modelFilters.userWithAdminAndOwnerOnly) {
+ where.AND = [
+ { user: { isNot: null } },
+ {
+ user: {
+ userOrganizations: {
+ some: {
+ AND: [
+ { organizationId },
+ { roles: { hasSome: ["ADMIN", "OWNER"] } },
+ ],
+ },
+ },
+ },
+ },
+ ];
+ }
} else {
where.OR.push({
[queryKey]: { contains: queryValue, mode: "insensitive" },
@@ -98,7 +118,7 @@ export async function loader({ context, request }: LoaderFunctionArgs) {
}
const queryData = (await db[name].dynamicFindMany({
- where: { ...where, ...filters },
+ where,
include:
/** We need user's information to resolve teamMember's name */
name === "teamMember"
diff --git a/app/routes/api+/reminders.team-members.ts b/app/routes/api+/reminders.team-members.ts
new file mode 100644
index 000000000..a9b4a7a9b
--- /dev/null
+++ b/app/routes/api+/reminders.team-members.ts
@@ -0,0 +1,71 @@
+import type { Prisma } from "@prisma/client";
+import type { LoaderFunctionArgs } from "@remix-run/node";
+import { json } from "@remix-run/node";
+import { db } from "~/database/db.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";
+
+const TEAM_MEMBER_INCLUDE = {
+ custodies: true,
+ user: {
+ select: {
+ id: true,
+ email: true,
+ firstName: true,
+ lastName: true,
+ profilePicture: true,
+ },
+ },
+} satisfies Prisma.TeamMemberInclude;
+
+export type ReminderTeamMember = Prisma.TeamMemberGetPayload<{
+ include: typeof TEAM_MEMBER_INCLUDE;
+}>;
+
+export async function loader({ context, request }: LoaderFunctionArgs) {
+ const authSession = context.getSession();
+ const userId = authSession.userId;
+
+ try {
+ const { organizationId } = await requirePermission({
+ userId,
+ request,
+ entity: PermissionEntity.teamMember,
+ action: PermissionAction.read,
+ });
+
+ const teamMembers = await db.teamMember.findMany({
+ where: {
+ deletedAt: null,
+ organizationId,
+ AND: [
+ { user: { isNot: null } },
+ {
+ user: {
+ userOrganizations: {
+ some: {
+ AND: [
+ { organizationId },
+ { roles: { hasSome: ["ADMIN", "OWNER"] } },
+ ],
+ },
+ },
+ },
+ },
+ ],
+ },
+ orderBy: { createdAt: "desc" },
+ include: TEAM_MEMBER_INCLUDE,
+ });
+
+ return json(data({ teamMembers }));
+ } catch (cause) {
+ const reason = makeShelfError(cause, { userId });
+ return json(error(reason), { status: reason.status });
+ }
+}
diff --git a/app/utils/csv.server.ts b/app/utils/csv.server.ts
index 69cc295e1..b4b362917 100644
--- a/app/utils/csv.server.ts
+++ b/app/utils/csv.server.ts
@@ -359,6 +359,10 @@ export const buildCsvExportDataFromAssets = ({
case "availableToBook":
value = asset.availableToBook ? "Yes" : "No";
break;
+ case "upcomingReminder": {
+ value = asset.upcomingReminder?.displayDate;
+ break;
+ }
default:
checkExhaustiveSwitch(fieldName);
value = "";
diff --git a/app/utils/error.ts b/app/utils/error.ts
index 238533b40..df95725d9 100644
--- a/app/utils/error.ts
+++ b/app/utils/error.ts
@@ -91,7 +91,9 @@ export type FailureReason = {
| "Dev error" // Error that should never happen in production because it's a developer mistake
| "Environment" // Related to the environment setup
| "Image Import"
- | "Image Cache"; // Error related to the image import
+ | "Image Cache"
+ | "Asset Reminder"
+ | "Asset Scheduler"; // Error related to the image import
/**
* The message intended for the user.
* You can add new lines using \n which will be parsed into paragraphs in the html
diff --git a/app/utils/permissions/permission.data.ts b/app/utils/permissions/permission.data.ts
index 03c978446..dd08be866 100644
--- a/app/utils/permissions/permission.data.ts
+++ b/app/utils/permissions/permission.data.ts
@@ -33,6 +33,7 @@ export enum PermissionEntity {
note = "note",
scan = "scan",
custody = "custody",
+ assetReminders = "assetReminders",
}
//this will come from DB eventually
@@ -64,6 +65,7 @@ export const Role2PermissionMap: {
[PermissionEntity.note]: [],
[PermissionEntity.scan]: [],
[PermissionEntity.custody]: [],
+ [PermissionEntity.assetReminders]: [],
},
[OrganizationRoles.SELF_SERVICE]: {
[PermissionEntity.asset]: [PermissionAction.read, PermissionAction.custody],
@@ -94,5 +96,6 @@ export const Role2PermissionMap: {
[PermissionEntity.note]: [],
[PermissionEntity.scan]: [],
[PermissionEntity.custody]: [PermissionAction.read],
+ [PermissionEntity.assetReminders]: [],
},
};
+
+