chore: more feedback implementation

packages/lib/server-only/document/get-document-with-details-by-id.ts

@@ -31,7 +31,6 @@ export const getDocumentWithDetailsById = async ({
       documentData: true,
       documentMeta: true,
       recipients: true,
-      attachments: true,
       folder: true,
       fields: {
         include: {

packages/lib/server-only/template/get-template-by-id.ts

@@ -28,7 +28,6 @@ export const getTemplateById = async ({
       templateMeta: true,
       recipients: true,
       fields: true,
-      attachments: true,
       user: {
         select: {
           id: true,

packages/trpc/server/document-router/update-document.types.ts

@@ -8,7 +8,6 @@ import {
   ZDocumentActionAuthTypesSchema,
 } from '@documenso/lib/types/document-auth';
 import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
-import AttachmentSchema from '@documenso/prisma/generated/zod/modelSchema/AttachmentSchema';
 
 import type { TrpcRouteMeta } from '../trpc';
 import {
@@ -46,13 +45,6 @@ export const ZUpdateDocumentRequestSchema = z.object({
       globalAccessAuth: z.array(ZDocumentAccessAuthTypesSchema).optional(),
       globalActionAuth: z.array(ZDocumentActionAuthTypesSchema).optional(),
       useLegacyFieldInsertion: z.boolean().optional(),
-      attachments: AttachmentSchema.pick({
-        id: true,
-        label: true,
-        url: true,
-      })
-        .array()
-        .optional(),
     })
     .optional(),
   meta: z

packages/ui/primitives/document-flow/add-settings.types.ts

@@ -11,7 +11,6 @@ import {
   ZDocumentActionAuthTypesSchema,
 } from '@documenso/lib/types/document-auth';
 import { isValidRedirectUrl } from '@documenso/lib/utils/is-valid-redirect-url';
-import { AttachmentSchema } from '@documenso/prisma/generated/zod/modelSchema/AttachmentSchema';
 import {
   ZDocumentMetaDateFormatSchema,
   ZDocumentMetaTimezoneSchema,
@@ -48,16 +47,6 @@ export const ZAddSettingsFormSchema = z.object({
       message: msg`At least one signature type must be enabled`.id,
     }),
   }),
-  attachments: AttachmentSchema.pick({
-    id: true,
-    label: true,
-    url: true,
-  })
-    .extend({
-      formId: z.string().min(1),
-    })
-    .array()
-    .optional(),
 });
 
 export type TAddSettingsFormSchema = z.infer<typeof ZAddSettingsFormSchema>;

packages/ui/primitives/template-flow/add-template-settings.tsx

@@ -5,8 +5,8 @@ import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
 import { DocumentVisibility, TeamMemberRole } from '@prisma/client';
 import { DocumentDistributionMethod, type Field, type Recipient } from '@prisma/client';
-import { InfoIcon, Plus, Trash } from 'lucide-react';
+import { InfoIcon } from 'lucide-react';
-import { useFieldArray, useForm } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
 
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
@@ -19,7 +19,6 @@ import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
 import type { TTemplate } from '@documenso/lib/types/template';
-import { nanoid } from '@documenso/lib/universal/id';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
 import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
 import type { TDocumentMetaDateFormat } from '@documenso/trpc/server/document-router/schema';
@@ -42,7 +41,6 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from '@documenso/ui/primitives/accordion';
-import { Button } from '@documenso/ui/primitives/button';
 import {
   Form,
   FormControl,
@@ -125,39 +123,9 @@ export const AddTemplateSettingsFormPartial = ({
         emailSettings: ZDocumentEmailSettingsSchema.parse(template?.templateMeta?.emailSettings),
         signatureTypes: extractTeamSignatureSettings(template?.templateMeta),
       },
-      attachments: template.attachments?.map((attachment) => ({
-        ...attachment,
-        id: String(attachment.id),
-        formId: String(attachment.id),
-      })),
     },
   });
 
-  const {
-    fields: attachments,
-    append: appendAttachment,
-    remove: removeAttachment,
-  } = useFieldArray({
-    control: form.control,
-    name: 'attachments',
-  });
-
-  const onAddAttachment = () => {
-    appendAttachment({
-      id: nanoid(12),
-      formId: nanoid(12),
-      label: '',
-      url: '',
-    });
-  };
-
-  const onRemoveAttachment = (index: number) => {
-    removeAttachment(index);
-
-    const updatedAttachments = attachments.filter((_, idx) => idx !== index);
-    form.setValue('attachments', updatedAttachments);
-  };
-
   const { stepIndex, currentStep, totalSteps, previousStep } = useStep();
 
   const distributionMethod = form.watch('meta.distributionMethod');
@@ -610,81 +578,6 @@ export const AddTemplateSettingsFormPartial = ({
                 </AccordionContent>
               </AccordionItem>
             </Accordion>
-
-            <Accordion type="multiple" className="mt-6">
-              <AccordionItem value="attachments" className="border-none">
-                <AccordionTrigger className="text-foreground mb-2 rounded border px-3 py-2 text-left hover:bg-neutral-200/30 hover:no-underline">
-                  <Trans>Attachments</Trans>
-                </AccordionTrigger>
-
-                <AccordionContent className="text-muted-foreground -mx-1 px-1 pt-2 text-sm leading-relaxed">
-                  <div className="flex flex-col space-y-6">
-                    {attachments.map((attachment, index) => (
-                      <div key={index} className="flex items-start gap-x-3">
-                        <div className="flex-1">
-                          <FormField
-                            control={form.control}
-                            name={`attachments.${index}.label`}
-                            render={({ field }) => (
-                              <FormItem>
-                                <FormLabel className="flex flex-row items-center">
-                                  <Trans>Label</Trans>
-                                </FormLabel>
-
-                                <FormControl>
-                                  <Input className="bg-background" {...field} />
-                                </FormControl>
-
-                                <FormMessage />
-                              </FormItem>
-                            )}
-                          />
-                        </div>
-
-                        <div className="flex-1">
-                          <FormField
-                            control={form.control}
-                            name={`attachments.${index}.url`}
-                            render={({ field }) => (
-                              <FormItem>
-                                <FormLabel className="flex flex-row items-center">
-                                  <Trans>Location link</Trans>
-                                </FormLabel>
-
-                                <FormControl>
-                                  <Input className="bg-background" {...field} />
-                                </FormControl>
-
-                                <FormMessage />
-                              </FormItem>
-                            )}
-                          />
-                        </div>
-
-                        <div className="flex-none pt-8">
-                          <button
-                            onClick={() => onRemoveAttachment(index)}
-                            className="hover:bg-muted rounded-md"
-                          >
-                            <Trash className="h-4 w-4" />
-                          </button>
-                        </div>
-                      </div>
-                    ))}
-
-                    <Button
-                      type="button"
-                      variant="outline"
-                      className="w-full"
-                      onClick={onAddAttachment}
-                    >
-                      <Plus className="mr-2 h-4 w-4" />
-                      <Trans>Add Attachment</Trans>
-                    </Button>
-                  </div>
-                </AccordionContent>
-              </AccordionItem>
-            </Accordion>
           </fieldset>
         </Form>
       </DocumentFlowFormContainerContent>