Merge branch 'main' into handle-name-change

Author: timarney

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/publish/components/Publish.tsx

@@ -11,7 +11,8 @@ import { logMessage } from "@lib/logger";
 import { DownloadFileButton } from "@formBuilder/components/shared/DownloadFileButton";
 import { useTemplateContext } from "@lib/hooks/form-builder/useTemplateContext";
 import LinkButton from "@serverComponents/globals/Buttons/LinkButton";
-import { updateTemplatePublishedStatus } from "@formBuilder/actions";
+import { updateTemplate } from "@formBuilder/actions";
+import { UpdateTemplateAction } from "@lib/templates/types";
 import { useAllowPublish } from "@lib/hooks/form-builder/useAllowPublish";
 import { Language } from "@lib/types/form-builder-types";
 import { PrePublishDialog } from "../PrePublishDialog";
@@ -67,8 +68,9 @@ export const Publish = ({ id }: { id: string }) => {
     try {
       ga("publish_form");
 
-      const { formRecord, error } = await updateTemplatePublishedStatus({
-        id,
+      const { formRecord, error } = await updateTemplate({
+        action: UpdateTemplateAction.IsPublished,
+        formId: id,
         isPublished: true,
         publishFormType: formType,
         publishDescription: description,

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/settings/components/FormProfile.tsx

@@ -5,7 +5,7 @@ import { useSession } from "next-auth/react";
 import { useTranslation } from "@i18n/client";
 
 import { toast } from "@formBuilder/components/shared/Toast";
-import { updateTemplateSecurityAttribute, updateTemplateFormPurpose } from "@formBuilder/actions";
+import { updateTemplate } from "@formBuilder/actions";
 import { FormServerError, FormServerErrorCodes } from "@lib/types/form-builder-types";
 
 import { useTemplateStore } from "@lib/store/useTemplateStore";
@@ -23,6 +23,7 @@ import { SetSaveAndResume } from "./saveAndResume/SetSaveAndResume";
 import { AuditForm } from "./AuditForm";
 
 import { IntendedUse, PurposeOption } from "./intendedUse/IntendedUse";
+import { UpdateTemplateAction } from "@lib/templates/types";
 
 export const FormProfile = ({ hasBrandingRequestForm }: { hasBrandingRequestForm: boolean }) => {
   const { t, i18n } = useTranslation("form-builder");
@@ -61,8 +62,9 @@ export const FormProfile = ({ hasBrandingRequestForm }: { hasBrandingRequestForm
       setClassification(classification);
 
       try {
-        const resultAttribute = (await updateTemplateSecurityAttribute({
-          id,
+        const resultAttribute = (await updateTemplate({
+          action: UpdateTemplateAction.SecurityAttribute,
+          formId: id,
           securityAttribute: classification,
         })) as FormServerError;
 
@@ -99,8 +101,9 @@ export const FormProfile = ({ hasBrandingRequestForm }: { hasBrandingRequestForm
 
       try {
         // Update the database
-        const result = await updateTemplateFormPurpose({
-          id,
+        const result = await updateTemplate({
+          action: UpdateTemplateAction.FormPurpose,
+          formId: id,
           formPurpose: purposeOption,
         });
 

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/settings/components/branding/Branding.tsx

@@ -11,11 +11,12 @@ import { useTemplateStore } from "@lib/store/useTemplateStore";
 import { toast } from "@formBuilder/components/shared/Toast";
 import Brand from "@clientComponents/globals/Brand";
 import { ExternalLinkIcon } from "@serverComponents/icons";
-import { updateBranding } from "@formBuilder/actions";
 import { FormServerErrorCodes } from "@lib/types/form-builder-types";
 import { safeJSONParse } from "@lib/utils";
 import { ErrorSaving } from "@formBuilder/components/shared/ErrorSaving";
 import { FormProperties } from "@lib/types";
+import { updateTemplate } from "../../../../actions";
+import { UpdateTemplateAction } from "@lib/templates/types";
 
 const Label = ({ htmlFor, children }: { htmlFor: string; children?: JSX.Element | string }) => {
   return (
@@ -66,9 +67,10 @@ export const Branding = ({ hasBrandingRequestForm }: { hasBrandingRequestForm: b
       return;
     }
 
-    const operationResult = await updateBranding({
+    const operationResult = await updateTemplate({
+      action: UpdateTemplateAction.FormBranding,
       formId: id,
-      branding: formConfig.brand || undefined, // pass undefined to reset to default GoC branding
+      formConfig: formConfig,
     });
 
     if (operationResult.formRecord !== null) {
@@ -112,7 +114,7 @@ export const Branding = ({ hasBrandingRequestForm }: { hasBrandingRequestForm: b
       <div>
         <Label htmlFor="branding-select">{t("branding.select")}</Label>
         <BrandingSelect
-          className="mb-5 mt-2 max-w-[450px] truncate bg-gray-soft p-1 pr-10"
+          className="bg-gray-soft mt-2 mb-5 max-w-[450px] truncate p-1 pr-10"
           options={brandingOptions.map(({ value, label }) => ({ value, label }))}
           selected={brandName}
           handleUpdate={updateBrand}

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/settings/components/saveAndResume/SetSaveAndResume.tsx

@@ -5,7 +5,8 @@ import { useTemplateStore } from "@lib/store/useTemplateStore";
 import { toast } from "@formBuilder/components/shared/Toast";
 
 import { SaveAndResumeToggle } from "./SaveAndResumeToggle";
-import { updateTemplateFormSaveAndResume } from "@formBuilder/actions";
+import { updateTemplate } from "@formBuilder/actions";
+import { UpdateTemplateAction } from "@lib/templates/types";
 
 export const SetSaveAndResume = ({ formId }: { formId: string }) => {
   "use memo";
@@ -24,8 +25,9 @@ export const SetSaveAndResume = ({ formId }: { formId: string }) => {
   const saveFormStatus = async (newStatus: string) => {
     const saveAndResume = newStatus === "off" ? false : true;
 
-    const result = await updateTemplateFormSaveAndResume({
-      id: formId,
+    const result = await updateTemplate({
+      action: UpdateTemplateAction.FormSaveAndResume,
+      formId: formId,
       saveAndResume,
     });
 

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/settings/manage/components/close/SetClosingDate.tsx

@@ -12,12 +12,13 @@ import { ClosedMessage } from "./ClosedMessage";
 import { ClosedSuccess } from "./ClosedSuccess";
 import { ClosedDateBanner } from "./ClosedDateBanner";
 
-import { closeForm } from "@formBuilder/actions";
+import { updateTemplate } from "@formBuilder/actions";
 import { ClosingDateDialog } from "./ClosingDateDialog";
 
 import { ScheduledClosingDate } from "./ScheduledClosingDate";
 import { dateHasPast } from "@lib/utils";
 import { Dialog, useDialogRef } from "@formBuilder/components/shared/Dialog";
+import { UpdateTemplateAction } from "@lib/templates/types";
 
 export const SetClosingDate = ({
   formId,
@@ -72,8 +73,9 @@ export const SetClosingDate = ({
     // If closed, set date to now. If open, clear the closing date.
     const closeDate = newStatus === "closed" ? new Date().toISOString() : null;
 
-    const result = await closeForm({
-      id: formId,
+    const result = await updateTemplate({
+      action: UpdateTemplateAction.ClosedData,
+      formId: formId,
       closingDate: closeDate,
       closedDetails: closedMessage,
     });
@@ -126,8 +128,9 @@ export const SetClosingDate = ({
 
       const isoClosingDate = closingDate ? new Date(closingDate).toISOString() : null;
 
-      const result = await closeForm({
-        id: formId,
+      const result = await updateTemplate({
+        action: UpdateTemplateAction.ClosedData,
+        formId: formId,
         closingDate: isoClosingDate,
         closedDetails: messageToSave,
       });
@@ -143,8 +146,9 @@ export const SetClosingDate = ({
   );
 
   const clearClosingDate = () => {
-    closeForm({
-      id: formId,
+    updateTemplate({
+      action: UpdateTemplateAction.ClosedData,
+      formId: formId,
       closingDate: null,
     });
     setClosingDate(null);
@@ -164,8 +168,9 @@ export const SetClosingDate = ({
         return;
       }
 
-      const result = await closeForm({
-        id: formId,
+      const result = await updateTemplate({
+        action: UpdateTemplateAction.ClosedData,
+        formId: formId,
         closingDate,
         closedDetails: closedMessage,
       });