Version 0.42.2 (#988)

- fix: fallback in mail for value of conditional block

Author: wp99cp

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conveniat27",
-  "version": "0.42.1",
+  "version": "0.42.2",
   "description": "The official website of conveniat27",
   "license": "MIT",
   "author": "Cyrill Püntener v/o JPG (cyrill.puentener@cevi.ch)",
@@ -33,10 +33,10 @@
   },
   "lint-staged": {
     "**/package.json": "sort-package-json",
-    "*.{md,mdx,yml,json}": "prettier --write",
+    "*.{md,mdx,yml,json}": "prettier --config-path .prettierrc.json --write --cache --experimental-cli .",
     "*.{js,jsx,ts,tsx}": [
-      "prettier --write",
-      "eslint --cache --fix"
+      "prettier --config-path .prettierrc.json --write --cache --experimental-cli .",
+      "eslint -c eslint.config.mjs --fix --quiet --cache ."
     ]
   },
   "dependencies": {

src/features/payload-cms/components/form/hooks/use-form-steps.ts

@@ -19,6 +19,17 @@ export interface UseFormStepsReturn {
   prev: (event?: React.MouseEvent) => void;
 }
 
+const scrollToTop = (formId?: string): void => {
+  if (typeof globalThis !== 'undefined') {
+    const element = formId ? document.querySelector(formId) : undefined;
+    if (element) {
+      // scroll to element - 60px to account for sticky nav
+      const topPos = element.getBoundingClientRect().top + window.pageYOffset - 100;
+      window.scrollTo({ top: topPos, behavior: 'smooth' });
+    }
+  }
+};
+
 export const useFormSteps = (
   sections: FormSection[],
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -96,6 +107,7 @@ export const useFormSteps = (
 
     if (isValid && !isLastStep) {
       setCurrentStepIndex((previous) => previous + 1);
+      scrollToTop(formId);
     }
     return isValid;
   };
@@ -105,6 +117,7 @@ export const useFormSteps = (
     if (!isFirstStep) {
       setCurrentStepIndex((previous_) => previous_ - 1);
     }
+    scrollToTop(formId);
   };
 
   return {

src/features/payload-cms/payload-cms/plugins/form/hooks/link-job-submission.ts

@@ -32,7 +32,7 @@ const noJobSelectedMessage: StaticTranslationString = {
 const getJobSelectionBlockNames = (fields: unknown[] | null | undefined = []): string[] => {
   if (!fields || !Array.isArray(fields)) return [];
   return fields.reduce<string[]>((accumulator, field) => {
-    if (!field || typeof field !== 'object') return accumulator;
+    if (field === null || field === undefined || typeof field !== 'object') return accumulator;
     const f = field as { blockType?: string; name?: string; fields?: unknown[] | null };
 
     if (f.blockType === 'jobSelection' && typeof f.name === 'string') {
@@ -99,6 +99,17 @@ export const linkJobSubmission: CollectionBeforeChangeHook<FormSubmission> = asy
   }
 
   const submissionData = (data.submissionData as SubmissionField[] | undefined) ?? [];
+
+  // If a job selection is within an optional block and not selected, its field
+  // is completely missing from submissionData. Append missing fields as empty.
+  for (const blockName of blockNames) {
+    if (!submissionData.some((entry) => entry.field === blockName)) {
+      submissionData.push({ field: blockName, value: '' });
+    }
+  }
+
+  data.submissionData = submissionData as NonNullable<FormSubmission['submissionData']>;
+
   const entriesToProcess = submissionData.filter((entry) => blockNames.includes(entry.field));
 
   if (entriesToProcess.length === 0) {