complete merge

sandboxnu · Feb 18, 2025 · 96c363c · 96c363c
1 parent 80dac62
commit 96c363c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/apps/server/src/form-templates/dto/create-form-template.dto.ts b/apps/server/src/form-templates/dto/create-form-template.dto.ts
@@ -5,7 +5,7 @@ import {
   IsNotEmpty,
   IsString,
   ValidateNested,
-  IsOptional
+  IsOptional,
 } from 'class-validator';
 import { CreateFieldGroupDto } from '../../field-group/dto/create-field-group.dto';
 import { Type } from 'class-transformer';

diff --git a/apps/web/src/client/schemas.gen.ts b/apps/web/src/client/schemas.gen.ts
@@ -406,9 +406,6 @@ export const UpdateAssignedGroupSignerDtoSchema = {
 export const CreateTemplateBoxDtoSchema = {
   type: 'object',
   properties: {
-    name: {
-      type: 'string',
-    },
     type: {
       type: 'string',
       enum: ['SIGNATURE', 'CHECKBOX', 'TEXT_FIELD'],
@@ -453,17 +450,21 @@ export const CreateFormTemplateDtoSchema = {
     name: {
       type: 'string',
     },
+    formDocLink: {
+      type: 'string',
+    },
     description: {
       type: 'string',
     },
     fieldGroups: {
+      minItems: 1,
       type: 'array',
       items: {
         $ref: '#/components/schemas/CreateFieldGroupDto',
       },
     },
   },
-  required: ['name', 'formDocLink', 'description', 'fieldGroups'],
+  required: ['file', 'name', 'formDocLink', 'description', 'fieldGroups'],
 } as const;
 
 export const TemplateBoxBaseEntitySchema = {
@@ -832,6 +833,9 @@ export const UpdateFormTemplateDtoSchema = {
     name: {
       type: 'string',
     },
+    formDocLink: {
+      type: 'string',
+    },
     description: {
       type: 'string',
     },

diff --git a/apps/web/src/client/types.gen.ts b/apps/web/src/client/types.gen.ts
@@ -144,6 +144,7 @@ export type CreateFieldGroupDto = {
 };
 
 export type CreateFormTemplateDto = {
+  file: Blob | File;
   name: string;
   description: string;
   fieldGroups: Array<CreateFieldGroupDto>;
@@ -232,6 +233,7 @@ export type FormTemplateEntity = {
 export type UpdateFormTemplateDto = {
   file?: Blob | File;
   name?: string;
+  formDocLink?: string;
   description?: string;
 };
 

diff --git a/apps/web/src/components/createFormTemplate/FormTemplateButtons.tsx b/apps/web/src/components/createFormTemplate/FormTemplateButtons.tsx
@@ -31,7 +31,8 @@ export const FormTemplateButtons = ({
   review?: boolean;
 }) => {
   const router = useRouter();
-  const { formTemplateName, pdfFile } = useCreateFormTemplate();
+  const { formTemplateName, pdfFile, formTemplateDescription } =
+    useCreateFormTemplate();
 
   /**
    * Upload and create a form template
@@ -78,7 +79,7 @@ export const FormTemplateButtons = ({
         body: {
           name: formTemplateName ? formTemplateName : '',
           fieldGroups: fieldGroups,
-          description: formTemplateDescription,
+          description: formTemplateDescription ? formTemplateDescription : '',
           file: pdfFile,
         },
       })