The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: dateformat and timezone customization (#506)
hallidayo32633f96d292
diff --git a/apps/marketing/src/pages/api/stripe/webhook/index.ts b/apps/marketing/src/pages/api/stripe/webhook/index.tsindex 2bdcdeb50..a19cffda9 100644--- a/apps/marketing/src/pages/api/stripe/webhook/index.ts+++ b/apps/marketing/src/pages/api/stripe/webhook/index.ts@@ -1,4 +1,4 @@-import { NextApiRequest, NextApiResponse } from 'next';+import type { NextApiRequest, NextApiResponse } from 'next';import { randomBytes } from 'crypto';import { buffer } from 'micro';@@ -6,7 +6,8 @@ import { buffer } from 'micro';import { insertImageInPDF } from '@documenso/lib/server-only/pdf/insert-image-in-pdf';import { insertTextInPDF } from '@documenso/lib/server-only/pdf/insert-text-in-pdf';import { redis } from '@documenso/lib/server-only/redis';-import { Stripe, stripe } from '@documenso/lib/server-only/stripe';+import type { Stripe } from '@documenso/lib/server-only/stripe';+import { stripe } from '@documenso/lib/server-only/stripe';import { getFile } from '@documenso/lib/universal/upload/get-file';import { updateFile } from '@documenso/lib/universal/upload/update-file';import { prisma } from '@documenso/prisma';diff --git a/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx b/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsxindex 3baf5d63b..9ae270d28 100644--- a/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx+++ b/apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx@@ -9,7 +9,6 @@ import type { z } from 'zod';import { trpc } from '@documenso/trpc/react';import { ZUpdateProfileMutationByAdminSchema } from '@documenso/trpc/server/admin-router/schema';import { Button } from '@documenso/ui/primitives/button';-import { Combobox } from '@documenso/ui/primitives/combobox';import {Form,FormControl,@@ -19,6 +18,7 @@ import {FormMessage,} from '@documenso/ui/primitives/form/form';import { Input } from '@documenso/ui/primitives/input';+import { MultiSelectCombobox } from '@documenso/ui/primitives/multiselect-combobox';import { useToast } from '@documenso/ui/primitives/use-toast';const ZUserFormSchema = ZUpdateProfileMutationByAdminSchema.omit({ id: true });@@ -117,7 +117,7 @@ export default function UserPage({ params }: { params: { id: number } }) {<fieldset className="flex flex-col gap-2"><FormLabel className="text-muted-foreground">Roles</FormLabel><FormControl>- <Combobox+ <MultiSelectComboboxlistValues={roles}onChange={(values: string[]) => onChange(values)}/>diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsxindex ffce3bd6c..a5dc9e23e 100644--- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx@@ -4,8 +4,8 @@ import { useState } from 'react';import { useRouter } from 'next/navigation';-import { DocumentStatus } from '@documenso/prisma/client';import type { DocumentData, Field, Recipient, User } from '@documenso/prisma/client';+import { DocumentStatus } from '@documenso/prisma/client';import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';import { trpc } from '@documenso/trpc/react';import { cn } from '@documenso/ui/lib/utils';@@ -145,14 +145,16 @@ export const EditDocumentForm = ({};const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => {- const { subject, message } = data.email;+ const { subject, message, timezone, dateFormat } = data.meta;try {await sendDocument({documentId: document.id,- email: {+ meta: {subject,message,+ timezone,+ dateFormat,},});diff --git a/apps/web/src/app/(dashboard)/documents/upload-document.tsx b/apps/web/src/app/(dashboard)/documents/upload-document.tsxindex 5e93495e3..04ba990d5 100644--- a/apps/web/src/app/(dashboard)/documents/upload-document.tsx+++ b/apps/web/src/app/(dashboard)/documents/upload-document.tsx@@ -25,6 +25,7 @@ export type UploadDocumentProps = {export const UploadDocument = ({ className }: UploadDocumentProps) => {const router = useRouter();const analytics = useAnalytics();+const { data: session } = useSession();const { toast } = useToast();diff --git a/apps/web/src/app/(signing)/sign/[token]/date-field.tsx b/apps/web/src/app/(signing)/sign/[token]/date-field.tsxindex 9cff29c64..40d0f945a 100644--- a/apps/web/src/app/(signing)/sign/[token]/date-field.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/date-field.tsx@@ -6,8 +6,13 @@ import { useRouter } from 'next/navigation';import { Loader } from 'lucide-react';-import { Recipient } from '@documenso/prisma/client';-import { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';+import {+ DEFAULT_DOCUMENT_DATE_FORMAT,+ convertToLocalSystemFormat,+} from '@documenso/lib/constants/date-formats';+import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';+import type { Recipient } from '@documenso/prisma/client';+import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';import { trpc } from '@documenso/trpc/react';import { useToast } from '@documenso/ui/primitives/use-toast';@@ -16,9 +21,16 @@ import { SigningFieldContainer } from './signing-field-container';export type DateFieldProps = {field: FieldWithSignature;recipient: Recipient;+ dateFormat?: string | null;+ timezone?: string | null;};-export const DateField = ({ field, recipient }: DateFieldProps) => {+export const DateField = ({+ field,+ recipient,+ dateFormat = DEFAULT_DOCUMENT_DATE_FORMAT,+ timezone = DEFAULT_DOCUMENT_TIME_ZONE,+}: DateFieldProps) => {const router = useRouter();const { toast } = useToast();@@ -35,12 +47,18 @@ export const DateField = ({ field, recipient }: DateFieldProps) => {const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;+ const localDateString = convertToLocalSystemFormat(field.customText, dateFormat, timezone);++ const isDifferentTimeZone = field.inserted && localDateString !== field.customText;++ const tooltipText = `"${field.customText}" will appear on the document as it has a timezone of "${timezone}".`;+const onSign = async () => {try {await signFieldWithToken({token: recipient.token,fieldId: field.id,- value: '',+ value: dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT,});startTransition(() => router.refresh());@@ -75,7 +93,13 @@ export const DateField = ({ field, recipient }: DateFieldProps) => {};return (- <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove}>+ <SigningFieldContainer+ field={field}+ onSign={onSign}+ onRemove={onRemove}+ type="Date"+ tooltipText={isDifferentTimeZone ? tooltipText : undefined}+ >{isLoading && (<div className="bg-background absolute inset-0 flex items-center justify-center rounded-md"><Loader className="text-primary h-5 w-5 animate-spin md:h-8 md:w-8" />@@ -87,7 +111,7 @@ export const DateField = ({ field, recipient }: DateFieldProps) => {)}{field.inserted && (- <p className="text-muted-foreground text-sm duration-200">{field.customText}</p>+ <p className="text-muted-foreground text-sm duration-200">{localDateString}</p>)}</SigningFieldContainer>);diff --git a/apps/web/src/app/(signing)/sign/[token]/email-field.tsx b/apps/web/src/app/(signing)/sign/[token]/email-field.tsxindex f6f790799..4d52ca50a 100644--- a/apps/web/src/app/(signing)/sign/[token]/email-field.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/email-field.tsx@@ -6,8 +6,8 @@ import { useRouter } from 'next/navigation';import { Loader } from 'lucide-react';-import { Recipient } from '@documenso/prisma/client';-import { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';+import type { Recipient } from '@documenso/prisma/client';+import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';import { trpc } from '@documenso/trpc/react';import { useToast } from '@documenso/ui/primitives/use-toast';@@ -79,7 +79,7 @@ export const EmailField = ({ field, recipient }: EmailFieldProps) => {};return (- <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove}>+ <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove} type="Email">{isLoading && (<div className="bg-background absolute inset-0 flex items-center justify-center rounded-md"><Loader className="text-primary h-5 w-5 animate-spin md:h-8 md:w-8" />diff --git a/apps/web/src/app/(signing)/sign/[token]/form.tsx b/apps/web/src/app/(signing)/sign/[token]/form.tsxindex 29cd77995..4f20a8199 100644--- a/apps/web/src/app/(signing)/sign/[token]/form.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/form.tsx@@ -34,6 +34,7 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =const { data: session } = useSession();const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();+const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);const { mutateAsync: completeDocumentWithToken } =@@ -92,7 +93,11 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =disabled={isSubmitting}className={cn('-mx-2 flex flex-1 flex-col overflow-hidden px-2')}>- <div className={cn('flex flex-1 flex-col')}>+ <div+ className={cn(+ 'custom-scrollbar -mx-2 flex flex-1 flex-col overflow-y-auto overflow-x-hidden px-2',+ )}+ ><h3 className="text-foreground text-2xl font-semibold">Sign Document</h3><p className="text-muted-foreground mt-2 text-sm">diff --git a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx b/apps/web/src/app/(signing)/sign/[token]/name-field.tsxindex bbe18fb8a..6e661e77a 100644--- a/apps/web/src/app/(signing)/sign/[token]/name-field.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/name-field.tsx@@ -6,8 +6,8 @@ import { useRouter } from 'next/navigation';import { Loader } from 'lucide-react';-import { Recipient } from '@documenso/prisma/client';-import { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';+import type { Recipient } from '@documenso/prisma/client';+import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';import { trpc } from '@documenso/trpc/react';import { Button } from '@documenso/ui/primitives/button';import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';@@ -98,7 +98,7 @@ export const NameField = ({ field, recipient }: NameFieldProps) => {};return (- <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove}>+ <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove} type="Name">{isLoading && (<div className="bg-background absolute inset-0 flex items-center justify-center rounded-md"><Loader className="text-primary h-5 w-5 animate-spin md:h-8 md:w-8" />diff --git a/apps/web/src/app/(signing)/sign/[token]/page.tsx b/apps/web/src/app/(signing)/sign/[token]/page.tsxindex 97babb82f..18b81696e 100644--- a/apps/web/src/app/(signing)/sign/[token]/page.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/page.tsx@@ -2,9 +2,12 @@ import { notFound, redirect } from 'next/navigation';import { match } from 'ts-pattern';+import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';+import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';+import { getDocumentMetaByDocumentId } from '@documenso/lib/server-only/document/get-document-meta-by-document-id';import { viewedDocument } from '@documenso/lib/server-only/document/viewed-document';import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';@@ -42,6 +45,8 @@ export default async function SigningPage({ params: { token } }: SigningPagePropviewedDocument({ token }).catch(() => null),]);+ const documentMeta = await getDocumentMetaByDocumentId({ id: document!.id }).catch(() => null);+if (!document || !document.documentData || !recipient) {return notFound();}@@ -111,7 +116,13 @@ export default async function SigningPage({ params: { token } }: SigningPageProp<NameField key={field.id} field={field} recipient={recipient} />)).with(FieldType.DATE, () => (- <DateField key={field.id} field={field} recipient={recipient} />+ <DateField+ key={field.id}+ field={field}+ recipient={recipient}+ dateFormat={documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}+ timezone={documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE}+ />)).with(FieldType.EMAIL, () => (<EmailField key={field.id} field={field} recipient={recipient} />diff --git a/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx b/apps/web/src/app/(signing)/sign/[token]/signature-field.tsxindex ec3e45fe5..220d3084a 100644--- a/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx@@ -127,7 +127,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {};return (- <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove}>+ <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove} type="Signature">{isLoading && (<div className="bg-background absolute inset-0 flex items-center justify-center rounded-md"><Loader className="text-primary h-5 w-5 animate-spin md:h-8 md:w-8" />diff --git a/apps/web/src/app/(signing)/sign/[token]/signing-field-container.tsx b/apps/web/src/app/(signing)/sign/[token]/signing-field-container.tsxindex 046e5b3df..b4805fa6b 100644--- a/apps/web/src/app/(signing)/sign/[token]/signing-field-container.tsx+++ b/apps/web/src/app/(signing)/sign/[token]/signing-field-container.tsx@@ -2,8 +2,9 @@import React from 'react';-import { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';+import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';import { FieldRootContainer } from '@documenso/ui/components/field/field';+import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';export type SignatureFieldProps = {field: FieldWithSignature;@@ -11,6 +12,8 @@ export type SignatureFieldProps = {children: React.ReactNode;onSign?: () => Promise<void> | void;onRemove?: () => Promise<void> | void;+ type?: 'Date' | 'Email' | 'Name' | 'Signature';+ tooltipText?: string | null;};export const SigningFieldContainer = ({@@ -19,6 +22,8 @@ export const SigningFieldContainer = ({onSign,onRemove,children,+ type,+ tooltipText,}: SignatureFieldProps) => {const onSignFieldClick = async () => {if (field.inserted) {@@ -46,7 +51,22 @@ export const SigningFieldContainer = ({/>)}- {field.inserted && !loading && (+ {type === 'Date' && field.inserted && !loading && (+ <Tooltip delayDuration={0}>+ <TooltipTrigger asChild>+ <button+ className="text-destructive bg-background/40 absolute inset-0 z-10 flex h-full w-full items-center justify-center rounded-md text-sm opacity-0 backdrop-blur-sm duration-200 group-hover:opacity-100"+ onClick={onRemoveSignedFieldClick}+ >+ Remove+ </button>+ </TooltipTrigger>++ {tooltipText && <TooltipContent className="max-w-xs">{tooltipText}</TooltipContent>}+ </Tooltip>+ )}++ {type !== 'Date' && field.inserted && !loading && (<buttonclassName="text-destructive bg-background/40 absolute inset-0 z-10 flex h-full w-full items-center justify-center rounded-md text-sm opacity-0 backdrop-blur-sm duration-200 group-hover:opacity-100"onClick={onRemoveSignedFieldClick}diff --git a/apps/web/src/components/formatter/document-status.tsx b/apps/web/src/components/formatter/document-status.tsxindex 17cd182a8..3deaa302a 100644--- a/apps/web/src/components/formatter/document-status.tsx+++ b/apps/web/src/components/formatter/document-status.tsx@@ -1,9 +1,9 @@-import { HTMLAttributes } from 'react';+import type { HTMLAttributes } from 'react';import { CheckCircle2, Clock, File } from 'lucide-react';import type { LucideIcon } from 'lucide-react/dist/lucide-react';-import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';+import type { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';import { SignatureIcon } from '@documenso/ui/icons/signature';import { cn } from '@documenso/ui/lib/utils';diff --git a/apps/web/src/components/formatter/locale-date.tsx b/apps/web/src/components/formatter/locale-date.tsxindex ecefb1e3b..7262a9a57 100644--- a/apps/web/src/components/formatter/locale-date.tsx+++ b/apps/web/src/components/formatter/locale-date.tsx@@ -1,8 +1,10 @@'use client';-import { HTMLAttributes, useEffect, useState } from 'react';+import type { HTMLAttributes } from 'react';+import { useEffect, useState } from 'react';-import { DateTime, DateTimeFormatOptions } from 'luxon';+import type { DateTimeFormatOptions } from 'luxon';+import { DateTime } from 'luxon';import { useLocale } from '@documenso/lib/client-only/providers/locale';diff --git a/package-lock.json b/package-lock.jsonindex 61c4749e6..8ffc208ad 100644--- a/package-lock.json+++ b/package-lock.json@@ -6431,6 +6431,11 @@"crypto-js": "^4.2.0"}},+ "node_modules/@vvo/tzdb": {+ "version": "6.117.0",+ "resolved": "https://registry.npmjs.org/@vvo/tzdb/-/tzdb-6.117.0.tgz",+ "integrity": "sha512-vZkfoag1kHqItK/zebxT0Fkt3R/zscjgD+Ib7kaAdum0Sz9psXDfVHPW1Benv91d02zPWlLIvZtjBmzX4a+6fw=="+ },"node_modules/abbrev": {"version": "1.1.1","resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",@@ -19359,6 +19364,7 @@"@scure/base": "^1.1.3","@sindresorhus/slugify": "^2.2.1","@upstash/redis": "^1.20.6",+ "@vvo/tzdb": "^6.117.0","bcrypt": "^5.1.0","luxon": "^3.4.0","nanoid": "^4.0.2",diff --git a/packages/lib/client-only/recipient-type.ts b/packages/lib/client-only/recipient-type.tsindex fd843c6a0..8b5a8a528 100644--- a/packages/lib/client-only/recipient-type.ts+++ b/packages/lib/client-only/recipient-type.ts@@ -1,4 +1,5 @@-import { ReadStatus, Recipient, SendStatus, SigningStatus } from '@documenso/prisma/client';+import type { Recipient } from '@documenso/prisma/client';+import { ReadStatus, SendStatus, SigningStatus } from '@documenso/prisma/client';export const getRecipientType = (recipient: Recipient) => {if (diff --git a/packages/lib/constants/date-formats.ts b/packages/lib/constants/date-formats.tsnew file mode 100644index 000000000..8c9ebe9e6--- /dev/null+++ b/packages/lib/constants/date-formats.ts@@ -0,0 +1,71 @@+import { DateTime } from 'luxon';++import { DEFAULT_DOCUMENT_TIME_ZONE } from './time-zones';++export const DEFAULT_DOCUMENT_DATE_FORMAT = 'yyyy-MM-dd hh:mm a';++export const DATE_FORMATS = [+ {+ key: 'YYYYMMDD',+ label: 'YYYY-MM-DD',+ value: DEFAULT_DOCUMENT_DATE_FORMAT,+ },+ {+ key: 'DDMMYYYY',+ label: 'DD/MM/YYYY',+ value: 'dd/MM/yyyy hh:mm a',+ },+ {+ key: 'MMDDYYYY',+ label: 'MM/DD/YYYY',+ value: 'MM/dd/yyyy hh:mm a',+ },+ {+ key: 'YYYYMMDDHHmm',+ label: 'YYYY-MM-DD HH:mm',+ value: 'yyyy-MM-dd HH:mm',+ },+ {+ key: 'YYMMDD',+ label: 'YY-MM-DD',+ value: 'yy-MM-dd hh:mm a',+ },+ {+ key: 'YYYYMMDDhhmmss',+ label: 'YYYY-MM-DD HH:mm:ss',+ value: 'yyyy-MM-dd HH:mm:ss',+ },+ {+ key: 'MonthDateYear',+ label: 'Month Date, Year',+ value: 'MMMM dd, yyyy hh:mm a',+ },+ {+ key: 'DayMonthYear',+ label: 'Day, Month Year',+ value: 'EEEE, MMMM dd, yyyy hh:mm a',+ },+ {+ key: 'ISO8601',+ label: 'ISO 8601',+ value: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",+ },+];++export const convertToLocalSystemFormat = (+ customText: string,+ dateFormat: string | null = DEFAULT_DOCUMENT_DATE_FORMAT,+ timeZone: string | null = DEFAULT_DOCUMENT_TIME_ZONE,+): string => {+ const parsedDate = DateTime.fromFormat(customText, dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT, {+ zone: timeZone ?? DEFAULT_DOCUMENT_TIME_ZONE,+ });++ if (!parsedDate.isValid) {+ return 'Invalid date';+ }++ const formattedDate = parsedDate.toLocal().toFormat(dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT);++ return formattedDate;+};diff --git a/packages/lib/constants/time-zones.ts b/packages/lib/constants/time-zones.tsnew file mode 100644index 000000000..3ef2bdc8b--- /dev/null+++ b/packages/lib/constants/time-zones.ts@@ -0,0 +1,44 @@+import { rawTimeZones, timeZonesNames } from '@vvo/tzdb';++export const TIME_ZONE_DATA = rawTimeZones;++export const DEFAULT_DOCUMENT_TIME_ZONE = 'Etc/UTC';++export type TimeZone = {+ name: string;+ rawOffsetInMinutes: number;+};++export const minutesToHours = (minutes: number): string => {+ const hours = Math.abs(Math.floor(minutes / 60));+ const min = Math.abs(minutes % 60);+ const sign = minutes >= 0 ? '+' : '-';++ return `${sign}${String(hours).padStart(2, '0')}:${String(min).padStart(2, '0')}`;+};++const getGMTOffsets = (timezones: TimeZone[]): string[] => {+ const gmtOffsets: string[] = [];++ for (const timezone of timezones) {+ const offsetValue = minutesToHours(timezone.rawOffsetInMinutes);+ const gmtText = `(${offsetValue})`;++ gmtOffsets.push(`${timezone.name} ${gmtText}`);+ }++ return gmtOffsets;+};++export const splitTimeZone = (input: string | null): string => {+ if (input === null) {+ return '';+ }+ const [timeZone] = input.split('(');++ return timeZone.trim();+};++export const TIME_ZONES_FULL = getGMTOffsets(TIME_ZONE_DATA);++export const TIME_ZONES = ['Etc/UTC', ...timeZonesNames];diff --git a/packages/lib/package.json b/packages/lib/package.jsonindex 41558e2e0..3fd14864e 100644--- a/packages/lib/package.json+++ b/packages/lib/package.json@@ -31,6 +31,7 @@"@scure/base": "^1.1.3","@sindresorhus/slugify": "^2.2.1","@upstash/redis": "^1.20.6",+ "@vvo/tzdb": "^6.117.0","bcrypt": "^5.1.0","luxon": "^3.4.0","nanoid": "^4.0.2",diff --git a/packages/lib/server-only/document-meta/upsert-document-meta.ts b/packages/lib/server-only/document-meta/upsert-document-meta.tsindex e3cce2ea2..c7221cce9 100644--- a/packages/lib/server-only/document-meta/upsert-document-meta.ts+++ b/packages/lib/server-only/document-meta/upsert-document-meta.ts@@ -6,11 +6,15 @@ export type CreateDocumentMetaOptions = {documentId: number;subject: string;message: string;+ timezone: string;+ dateFormat: string;};export const upsertDocumentMeta = async ({subject,message,+ timezone,+ dateFormat,documentId,}: CreateDocumentMetaOptions) => {return await prisma.documentMeta.upsert({@@ -20,11 +24,15 @@ export const upsertDocumentMeta = async ({create: {subject,message,+ dateFormat,+ timezone,documentId,},update: {subject,message,+ dateFormat,+ timezone,},});};diff --git a/packages/lib/server-only/document/duplicate-document-by-id.ts b/packages/lib/server-only/document/duplicate-document-by-id.tsindex 5d3bb9f9c..5986b4cfe 100644--- a/packages/lib/server-only/document/duplicate-document-by-id.ts+++ b/packages/lib/server-only/document/duplicate-document-by-id.ts@@ -25,6 +25,8 @@ export const duplicateDocumentById = async ({ id, userId }: DuplicateDocumentByIselect: {message: true,subject: true,+ dateFormat: true,+ timezone: true,},},},diff --git a/packages/lib/server-only/document/get-document-meta-by-document-id.ts b/packages/lib/server-only/document/get-document-meta-by-document-id.tsnew file mode 100644index 000000000..575ba5d6e--- /dev/null+++ b/packages/lib/server-only/document/get-document-meta-by-document-id.ts@@ -0,0 +1,13 @@+import { prisma } from '@documenso/prisma';++export interface GetDocumentMetaByDocumentIdOptions {+ id: number;+}++export const getDocumentMetaByDocumentId = async ({ id }: GetDocumentMetaByDocumentIdOptions) => {+ return await prisma.documentMeta.findFirstOrThrow({+ where: {+ documentId: id,+ },+ });+};diff --git a/packages/lib/server-only/document/update-document.ts b/packages/lib/server-only/document/update-document.tsindex 7793c990a..5ad686860 100644--- a/packages/lib/server-only/document/update-document.ts+++ b/packages/lib/server-only/document/update-document.ts@@ -1,6 +1,6 @@'use server';-import { Prisma } from '@prisma/client';+import type { Prisma } from '@prisma/client';import { prisma } from '@documenso/prisma';diff --git a/packages/lib/server-only/field/sign-field-with-token.ts b/packages/lib/server-only/field/sign-field-with-token.tsindex 59fab71e5..62deccd5a 100644--- a/packages/lib/server-only/field/sign-field-with-token.ts+++ b/packages/lib/server-only/field/sign-field-with-token.ts@@ -5,6 +5,9 @@ import { DateTime } from 'luxon';import { prisma } from '@documenso/prisma';import { DocumentStatus, FieldType, SigningStatus } from '@documenso/prisma/client';+import { DEFAULT_DOCUMENT_DATE_FORMAT } from '../../constants/date-formats';+import { DEFAULT_DOCUMENT_TIME_ZONE } from '../../constants/time-zones';+export type SignFieldWithTokenOptions = {token: string;fieldId: number;@@ -58,6 +61,12 @@ export const signFieldWithToken = async ({throw new Error(`Field ${fieldId} has no recipientId`);}+ const documentMeta = await prisma.documentMeta.findFirst({+ where: {+ documentId: document.id,+ },+ });+const isSignatureField =field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE;@@ -67,7 +76,9 @@ export const signFieldWithToken = async ({const typedSignature = isSignatureField && !isBase64 ? value : undefined;if (field.type === FieldType.DATE) {- customText = DateTime.now().toFormat('yyyy-MM-dd hh:mm a');+ customText = DateTime.now()+ .setZone(documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE)+ .toFormat(documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT);}if (isSignatureField && !signatureImageAsBase64 && !typedSignature) {diff --git a/packages/lib/utils/recipient-formatter.ts b/packages/lib/utils/recipient-formatter.tsindex da404830b..2e2bace3b 100644--- a/packages/lib/utils/recipient-formatter.ts+++ b/packages/lib/utils/recipient-formatter.ts@@ -1,4 +1,4 @@-import { Recipient } from '@documenso/prisma/client';+import type { Recipient } from '@documenso/prisma/client';export const recipientInitials = (text: string) =>textdiff --git a/packages/prisma/migrations/20231207134820_add_document_meta_dateformat_timezone/migration.sql b/packages/prisma/migrations/20231207134820_add_document_meta_dateformat_timezone/migration.sqlnew file mode 100644index 000000000..ed099417d--- /dev/null+++ b/packages/prisma/migrations/20231207134820_add_document_meta_dateformat_timezone/migration.sql@@ -0,0 +1,3 @@+-- AlterTable+ALTER TABLE "DocumentMeta" ADD COLUMN "dateFormat" TEXT DEFAULT 'yyyy-MM-dd hh:mm a',+ADD COLUMN "timezone" TEXT DEFAULT 'Etc/UTC';diff --git a/packages/prisma/migrations/20231214081915_remove_template_token_column/migration.sql b/packages/prisma/migrations/20231214081915_remove_template_token_column/migration.sqlnew file mode 100644index 000000000..8514a14b7--- /dev/null+++ b/packages/prisma/migrations/20231214081915_remove_template_token_column/migration.sql@@ -0,0 +1,8 @@+/*+ Warnings:++ - You are about to drop the column `templateToken` on the `Recipient` table. All the data in the column will be lost.++*/+-- AlterTable+ALTER TABLE "Recipient" DROP COLUMN "templateToken";diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prismaindex 67fb182a7..f0bfc6fda 100644--- a/packages/prisma/schema.prisma+++ b/packages/prisma/schema.prisma@@ -161,6 +161,8 @@ model DocumentMeta {id String @id @default(cuid())subject String?message String?+ timezone String? @db.Text @default("Etc/UTC")+ dateFormat String? @db.Text @default("yyyy-MM-dd hh:mm a")documentId Int @uniquedocument Document @relation(fields: [documentId], references: [id], onDelete: Cascade)}diff --git a/packages/prisma/types/document-with-data.ts b/packages/prisma/types/document-with-data.tsindex d8dd8a888..461d13e6c 100644--- a/packages/prisma/types/document-with-data.ts+++ b/packages/prisma/types/document-with-data.ts@@ -1,4 +1,4 @@-import { Document, DocumentData, DocumentMeta } from '@documenso/prisma/client';+import type { Document, DocumentData, DocumentMeta } from '@documenso/prisma/client';export type DocumentWithData = Document & {documentData?: DocumentData | null;diff --git a/packages/prisma/types/document-with-recipient.ts b/packages/prisma/types/document-with-recipient.tsindex 1db025279..c55b99e67 100644--- a/packages/prisma/types/document-with-recipient.ts+++ b/packages/prisma/types/document-with-recipient.ts@@ -1,4 +1,4 @@-import { Document, DocumentData, Recipient } from '@documenso/prisma/client';+import type { Document, DocumentData, Recipient } from '@documenso/prisma/client';export type DocumentWithRecipients = Document & {Recipient: Recipient[];diff --git a/packages/prisma/types/field-with-signature.ts b/packages/prisma/types/field-with-signature.tsindex a3f6d845c..c215a3fb0 100644--- a/packages/prisma/types/field-with-signature.ts+++ b/packages/prisma/types/field-with-signature.ts@@ -1,4 +1,4 @@-import { Field, Signature } from '@documenso/prisma/client';+import type { Field, Signature } from '@documenso/prisma/client';export type FieldWithSignature = Field & {Signature?: Signature | null;diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.tsindex fc6ea2377..425f34857 100644--- a/packages/trpc/server/document-router/router.ts+++ b/packages/trpc/server/document-router/router.ts@@ -179,13 +179,15 @@ export const documentRouter = router({.input(ZSendDocumentMutationSchema).mutation(async ({ input, ctx }) => {try {- const { documentId, email } = input;+ const { documentId, meta } = input;- if (email.message || email.subject) {+ if (meta.message || meta.subject || meta.timezone || meta.dateFormat) {await upsertDocumentMeta({documentId,- subject: email.subject,- message: email.message,+ subject: meta.subject,+ message: meta.message,+ dateFormat: meta.dateFormat,+ timezone: meta.timezone,});}diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.tsindex 71ee9766d..4559f65f3 100644--- a/packages/trpc/server/document-router/schema.ts+++ b/packages/trpc/server/document-router/schema.ts@@ -65,9 +65,11 @@ export type TSetFieldsForDocumentMutationSchema = z.infer<export const ZSendDocumentMutationSchema = z.object({documentId: z.number(),- email: z.object({+ meta: z.object({subject: z.string(),message: z.string(),+ timezone: z.string(),+ dateFormat: z.string(),}),});diff --git a/packages/trpc/server/trpc.ts b/packages/trpc/server/trpc.tsindex a382e3511..9b958a5a5 100644--- a/packages/trpc/server/trpc.ts+++ b/packages/trpc/server/trpc.ts@@ -3,7 +3,7 @@ import SuperJSON from 'superjson';import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';-import { TrpcContext } from './context';+import type { TrpcContext } from './context';const t = initTRPC.context<TrpcContext>().create({transformer: SuperJSON,diff --git a/packages/ui/lib/utils.ts b/packages/ui/lib/utils.tsindex e57f98028..568578c5a 100644--- a/packages/ui/lib/utils.ts+++ b/packages/ui/lib/utils.ts@@ -1,4 +1,5 @@-import { ClassValue, clsx } from 'clsx';+import type { ClassValue } from 'clsx';+import { clsx } from 'clsx';import { twMerge } from 'tailwind-merge';export function cn(...inputs: ClassValue[]) {diff --git a/packages/ui/primitives/combobox.tsx b/packages/ui/primitives/combobox.tsxindex 85f86056d..9ba113b67 100644--- a/packages/ui/primitives/combobox.tsx+++ b/packages/ui/primitives/combobox.tsx@@ -1,8 +1,6 @@import * as React from 'react';-import { Check, ChevronsUpDown } from 'lucide-react';--import { Role } from '@documenso/prisma/client';+import { Check, ChevronDown } from 'lucide-react';import { cn } from '../lib/utils';import { Button } from './button';@@ -10,34 +8,31 @@ import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem } from 'import { Popover, PopoverContent, PopoverTrigger } from './popover';type ComboboxProps = {- listValues: string[];- onChange: (_values: string[]) => void;+ className?: string;+ options: string[];+ value: string | null;+ onChange: (_value: string | null) => void;+ placeholder?: string;+ disabled?: boolean;};-const Combobox = ({ listValues, onChange }: ComboboxProps) => {+const Combobox = ({+ className,+ options,+ value,+ onChange,+ disabled = false,+ placeholder,+}: ComboboxProps) => {const [open, setOpen] = React.useState(false);- const [selectedValues, setSelectedValues] = React.useState<string[]>([]);- const dbRoles = Object.values(Role);-- React.useEffect(() => {- setSelectedValues(listValues);- }, [listValues]);-- const allRoles = [...new Set([...dbRoles, ...selectedValues])];- const handleSelect = (currentValue: string) => {- let newSelectedValues;- if (selectedValues.includes(currentValue)) {- newSelectedValues = selectedValues.filter((value) => value !== currentValue);- } else {- newSelectedValues = [...selectedValues, currentValue];- }-- setSelectedValues(newSelectedValues);- onChange(newSelectedValues);+ const onOptionSelected = (newValue: string) => {+ onChange(newValue === value ? null : newValue);setOpen(false);};+ const placeholderValue = placeholder ?? 'Select an option';+return (<Popover open={open} onOpenChange={setOpen}><PopoverTrigger asChild>@@ -45,26 +40,28 @@ const Combobox = ({ listValues, onChange }: ComboboxProps) => {variant="outline"role="combobox"aria-expanded={open}- className="w-[200px] justify-between"+ className={cn('my-2 w-full justify-between', className)}+ disabled={disabled}>- {selectedValues.length > 0 ? selectedValues.join(', ') : 'Select values...'}- <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />+ {value ? value : placeholderValue}+ <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /></Button></PopoverTrigger>- <PopoverContent className="w-[200px] p-0">++ <PopoverContent className="p-0" side="bottom" align="start"><Command>- <CommandInput placeholder={selectedValues.join(', ')} />+ <CommandInput placeholder={value || placeholderValue} />+<CommandEmpty>No value found.</CommandEmpty>- <CommandGroup>- {allRoles.map((value: string, i: number) => (- <CommandItem key={i} onSelect={() => handleSelect(value)}>++ <CommandGroup className="max-h-[250px] overflow-y-auto">+ {options.map((option, index) => (+ <CommandItem key={index} onSelect={() => onOptionSelected(option)}><Check- className={cn(- 'mr-2 h-4 w-4',- selectedValues.includes(value) ? 'opacity-100' : 'opacity-0',- )}+ className={cn('mr-2 h-4 w-4', option === value ? 'opacity-100' : 'opacity-0')}/>- {value}++ {option}</CommandItem>))}</CommandGroup>diff --git a/packages/ui/primitives/command.tsx b/packages/ui/primitives/command.tsxindex 67cd3f487..cbc306c66 100644--- a/packages/ui/primitives/command.tsx+++ b/packages/ui/primitives/command.tsx@@ -2,7 +2,7 @@import * as React from 'react';-import { DialogProps } from '@radix-ui/react-dialog';+import type { DialogProps } from '@radix-ui/react-dialog';import { Command as CommandPrimitive } from 'cmdk';import { Search } from 'lucide-react';diff --git a/packages/ui/primitives/document-flow/add-signature.tsx b/packages/ui/primitives/document-flow/add-signature.tsxindex e4e5d9253..5accdca16 100644--- a/packages/ui/primitives/document-flow/add-signature.tsx+++ b/packages/ui/primitives/document-flow/add-signature.tsx@@ -7,11 +7,13 @@ import { DateTime } from 'luxon';import { useForm } from 'react-hook-form';import { match } from 'ts-pattern';+import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';import type { Field } from '@documenso/prisma/client';import { FieldType } from '@documenso/prisma/client';import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';+import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';import { FieldToolTip } from '../../components/field/field-tooltip';import { cn } from '../../lib/utils';@@ -34,7 +36,6 @@ import {SinglePlayerModeCustomTextField,SinglePlayerModeSignatureField,} from './single-player-mode-fields';-import type { DocumentFlowStep } from './types';export type AddSignatureFormProps = {defaultValues?: TAddSignatureFormSchema;@@ -140,7 +141,7 @@ export const AddSignatureFormPartial = ({return match(field.type).with(FieldType.DATE, () => ({...field,- customText: DateTime.now().toFormat('yyyy-MM-dd hh:mm a'),+ customText: DateTime.now().toFormat(DEFAULT_DOCUMENT_DATE_FORMAT),inserted: true,})).with(FieldType.EMAIL, () => ({diff --git a/packages/ui/primitives/document-flow/add-subject.tsx b/packages/ui/primitives/document-flow/add-subject.tsxindex 881d59c74..d73019732 100644--- a/packages/ui/primitives/document-flow/add-subject.tsx+++ b/packages/ui/primitives/document-flow/add-subject.tsx@@ -1,11 +1,30 @@'use client';-import { useForm } from 'react-hook-form';+import { useEffect } from 'react';+import { Controller, useForm } from 'react-hook-form';++import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';+import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';import type { Field, Recipient } from '@documenso/prisma/client';import { DocumentStatus } from '@documenso/prisma/client';+import { SendStatus } from '@documenso/prisma/client';import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';-+import {+ Accordion,+ AccordionContent,+ AccordionItem,+ AccordionTrigger,+} from '@documenso/ui/primitives/accordion';+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from '@documenso/ui/primitives/select';++import { Combobox } from '../combobox';import { FormErrorMessage } from '../form/form-error-message';import { Input } from '../input';import { Label } from '../label';@@ -31,20 +50,25 @@ export type AddSubjectFormProps = {export const AddSubjectFormPartial = ({documentFlow,- recipients: _recipients,- fields: _fields,+ recipients: recipients,+ fields: fields,document,onSubmit,}: AddSubjectFormProps) => {const {+ control,register,handleSubmit,- formState: { errors, isSubmitting },+ formState: { errors, isSubmitting, touchedFields },+ getValues,+ setValue,} = useForm<TAddSubjectFormSchema>({defaultValues: {- email: {+ meta: {subject: document.documentMeta?.subject ?? '',message: document.documentMeta?.message ?? '',+ timezone: document.documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE,+ dateFormat: document.documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT,},},});@@ -52,6 +76,20 @@ export const AddSubjectFormPartial = ({const onFormSubmit = handleSubmit(onSubmit);const { currentStep, totalSteps, previousStep } = useStep();+ const hasDateField = fields.find((field) => field.type === 'DATE');++ const documentHasBeenSent = recipients.some(+ (recipient) => recipient.sendStatus === SendStatus.SENT,+ );++ // We almost always want to set the timezone to the user's local timezone to avoid confusion+ // when the document is signed.+ useEffect(() => {+ if (!touchedFields.meta?.timezone && !documentHasBeenSent) {+ setValue('meta.timezone', Intl.DateTimeFormat().resolvedOptions().timeZone);+ }+ }, [documentHasBeenSent, setValue, touchedFields.meta?.timezone]);+return (<><DocumentFlowFormContainerHeader@@ -71,10 +109,10 @@ export const AddSubjectFormPartial = ({// placeholder="Subject"className="bg-background mt-2"disabled={isSubmitting}- {...register('email.subject')}+ {...register('meta.subject')}/>- <FormErrorMessage className="mt-2" error={errors.email?.subject} />+ <FormErrorMessage className="mt-2" error={errors.meta?.subject} /></div><div>@@ -86,14 +124,12 @@ export const AddSubjectFormPartial = ({id="message"className="bg-background mt-2 h-32 resize-none"disabled={isSubmitting}- {...register('email.message')}+ {...register('meta.message')}/><FormErrorMessageclassName="mt-2"- error={- typeof errors.email?.message !== 'string' ? errors.email?.message : undefined- }+ error={typeof errors.meta?.message !== 'string' ? errors.meta?.message : undefined}/></div>@@ -123,6 +159,67 @@ export const AddSubjectFormPartial = ({</li></ul></div>++ <Accordion type="multiple" className="mt-8 border-none">+ <AccordionItem value="advanced-options" className="border-none">+ <AccordionTrigger className="mb-2 border-b text-left hover:no-underline">+ Advanced Options+ </AccordionTrigger>++ <AccordionContent className="text-muted-foreground -mx-1 flex max-w-prose flex-col px-1 text-sm leading-relaxed">+ {hasDateField && (+ <div className="mt-2 flex flex-col">+ <Label htmlFor="date-format">+ Date Format <span className="text-muted-foreground">(Optional)</span>+ </Label>++ <Controller+ control={control}+ name={`meta.dateFormat`}+ disabled={documentHasBeenSent}+ render={({ field: { value, onChange, disabled } }) => (+ <Select value={value} onValueChange={onChange} disabled={disabled}>+ <SelectTrigger className="bg-background mt-2">+ <SelectValue />+ </SelectTrigger>++ <SelectContent>+ {DATE_FORMATS.map((format) => (+ <SelectItem key={format.key} value={format.value}>+ {format.label}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ )}+ />+ </div>+ )}++ {hasDateField && (+ <div className="mt-4 flex flex-col">+ <Label htmlFor="time-zone">+ Time Zone <span className="text-muted-foreground">(Optional)</span>+ </Label>++ <Controller+ control={control}+ name={`meta.timezone`}+ render={({ field: { value, onChange } }) => (+ <Combobox+ className="bg-background"+ options={TIME_ZONES}+ value={value}+ onChange={(value) => value && onChange(value)}+ disabled={documentHasBeenSent}+ />+ )}+ />+ </div>+ )}+ </AccordionContent>+ </AccordionItem>+ </Accordion></div></div></DocumentFlowFormContainerContent>diff --git a/packages/ui/primitives/document-flow/add-subject.types.ts b/packages/ui/primitives/document-flow/add-subject.types.tsindex 33e2dedfb..ea14f4c0f 100644--- a/packages/ui/primitives/document-flow/add-subject.types.ts+++ b/packages/ui/primitives/document-flow/add-subject.types.ts@@ -1,9 +1,14 @@import { z } from 'zod';+import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';+import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';+export const ZAddSubjectFormSchema = z.object({- email: z.object({+ meta: z.object({subject: z.string(),message: z.string(),+ timezone: z.string().optional().default(DEFAULT_DOCUMENT_TIME_ZONE),+ dateFormat: z.string().optional().default(DEFAULT_DOCUMENT_DATE_FORMAT),}),});diff --git a/packages/ui/primitives/multiselect-combobox.tsx b/packages/ui/primitives/multiselect-combobox.tsxnew file mode 100644index 000000000..bac87ce0b--- /dev/null+++ b/packages/ui/primitives/multiselect-combobox.tsx@@ -0,0 +1,82 @@+import * as React from 'react';++import { Check, ChevronsUpDown } from 'lucide-react';++import { Role } from '@documenso/prisma/client';+import { cn } from '@documenso/ui/lib/utils';+import { Button } from '@documenso/ui/primitives/button';+import {+ Command,+ CommandEmpty,+ CommandGroup,+ CommandInput,+ CommandItem,+} from '@documenso/ui/primitives/command';+import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover';++type ComboboxProps = {+ listValues: string[];+ onChange: (_values: string[]) => void;+};++const MultiSelectCombobox = ({ listValues, onChange }: ComboboxProps) => {+ const [open, setOpen] = React.useState(false);+ const [selectedValues, setSelectedValues] = React.useState<string[]>([]);+ const dbRoles = Object.values(Role);++ React.useEffect(() => {+ setSelectedValues(listValues);+ }, [listValues]);++ const allRoles = [...new Set([...dbRoles, ...selectedValues])];++ const handleSelect = (currentValue: string) => {+ let newSelectedValues;+ if (selectedValues.includes(currentValue)) {+ newSelectedValues = selectedValues.filter((value) => value !== currentValue);+ } else {+ newSelectedValues = [...selectedValues, currentValue];+ }++ setSelectedValues(newSelectedValues);+ onChange(newSelectedValues);+ setOpen(false);+ };++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger asChild>+ <Button+ variant="outline"+ role="combobox"+ aria-expanded={open}+ className="w-[200px] justify-between"+ >+ {selectedValues.length > 0 ? selectedValues.join(', ') : 'Select values...'}+ <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />+ </Button>+ </PopoverTrigger>+ <PopoverContent className="w-[200px] p-0">+ <Command>+ <CommandInput placeholder={selectedValues.join(', ')} />+ <CommandEmpty>No value found.</CommandEmpty>+ <CommandGroup>+ {allRoles.map((value: string, i: number) => (+ <CommandItem key={i} onSelect={() => handleSelect(value)}>+ <Check+ className={cn(+ 'mr-2 h-4 w-4',+ selectedValues.includes(value) ? 'opacity-100' : 'opacity-0',+ )}+ />+ {value}+ </CommandItem>+ ))}+ </CommandGroup>+ </Command>+ </PopoverContent>+ </Popover>+ );+};++export { MultiSelectCombobox };