Add defaultCategoryID field to Form (#385)

Co-authored-by: Simone Salsi <[email protected]>
pagopa · Jul 26, 2024 · bb5adf2 · bb5adf2
1 parent 5abfa9b
commit bb5adf2
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 2 deletions.
diff --git a/.changeset/seven-cars-build.md b/.changeset/seven-cars-build.md
@@ -0,0 +1,5 @@
+---
+"nextjs-website": patch
+---
+
+Add defaultCategoryID field to Form
diff --git a/.changeset/stale-onions-bow.md b/.changeset/stale-onions-bow.md
@@ -0,0 +1,5 @@
+---
+"strapi-cms": patch
+---
+
+Add defaultCategoryID field to Form
diff --git a/apps/nextjs-website/react-components/components/Form/Form.tsx b/apps/nextjs-website/react-components/components/Form/Form.tsx
@@ -36,6 +36,7 @@ const Form = ({
   subtitle,
   theme,
   categoriesTitle,
+  defaultCategoryID,
   categories,
   clientID,
   listID,
@@ -130,7 +131,7 @@ const Form = ({
           method: 'POST',
           body: JSON.stringify({
             recaptchaToken,
-            groups: [formData.category],
+            groups: (categories.length > 0 && formData.category !== '') ? [formData.category] : [defaultCategoryID],
             email: formData.email,
             ...(showName && { name: formData.name }),
             ...(showSurname && { surname: formData.surname }),

diff --git a/apps/nextjs-website/react-components/types/Form/Form.types.ts b/apps/nextjs-website/react-components/types/Form/Form.types.ts
@@ -8,6 +8,7 @@ interface FormFields {
 
 interface FormCategories {
   readonly categoriesTitle?: string;
+  readonly defaultCategoryID: string;
   readonly categories: {
     categoryID: string,
     label: string;

diff --git a/apps/nextjs-website/src/lib/fetch/types/PageSection.ts b/apps/nextjs-website/src/lib/fetch/types/PageSection.ts
@@ -174,6 +174,7 @@ const FormSectionCodec = t.strict({
   showSurname: t.boolean,
   showOrganization: t.boolean,
   categoriesTitle: t.union([t.string, t.null]),
+  defaultCategoryID: t.string,
   categories: t.array(FormCategoryCodec),
   theme: t.union([t.literal('light'), t.literal('dark')]),
   recaptchaSiteKey: t.string,

diff --git a/apps/nextjs-website/stories/Form/formCommons.tsx b/apps/nextjs-website/stories/Form/formCommons.tsx
@@ -16,6 +16,7 @@ const generateFormProps = (theme: 'light' | 'dark'): FormProps => ({
     { label: 'Giornalista', categoryID: '5' },
   ],
   categoriesTitle: 'Vorrei ricevere news sul progetto IO in qualità di*:',
+  defaultCategoryID: '61',
   clientID: 'io',
   listID: 'listID',
   recaptchaSiteKey: 'sitekey'

diff --git a/apps/strapi-cms/src/components/sections/form.json b/apps/strapi-cms/src/components/sections/form.json
@@ -60,6 +60,10 @@
     "recaptchaSiteKey": {
       "type": "string",
       "required": true
+    },
+    "defaultCategoryID": {
+      "type": "string",
+      "required": true
     }
   }
 }
diff --git a/apps/strapi-cms/viewconfig.json b/apps/strapi-cms/viewconfig.json