[open-formulieren/open-forms#3805] Fix label if field is not required

Backport-of: #638
open-formulieren · Jan 26, 2024 · 7125428 · 7125428
1 parent 3daa5ba
commit 7125428
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 83 deletions.
diff --git a/src/components/forms/Label.js b/src/components/forms/Label.js
@@ -17,14 +17,18 @@ export const LabelContent = ({id, disabled = false, isRequired = false, type, ch
         [`utrecht-form-label--${type}`]: type,
       })}
     >
-      <FormattedMessage
-        description="Form field label, field possibly optional"
-        defaultMessage="{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}"
-        values={{
-          withAsterisk: requiredFieldsWithAsterisk,
-          label: () => children,
-        }}
-      />
+      {isRequired ? (
+        <>{children}</>
+      ) : (
+        <FormattedMessage
+          description="Form field label, field not required"
+          defaultMessage="{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}"
+          values={{
+            withAsterisk: requiredFieldsWithAsterisk,
+            label: () => children,
+          }}
+        />
+      )}
     </FormLabel>
   );
 };

diff --git a/src/components/modals/FormStepSaveModal.js b/src/components/modals/FormStepSaveModal.js
@@ -138,7 +138,6 @@ const FormStepSaveModal = ({
                 values={{numberOfDays: suspendFormUrlLifetime}}
               />
             </Body>
-
             <EmailField
               name="email"
               isRequired

diff --git a/src/i18n/compiled/en.json b/src/i18n/compiled/en.json
@@ -849,6 +849,38 @@
       "value": "Payment"
     }
   ],
+  "OnfuIr": [
+    {
+      "options": {
+        "other": {
+          "value": [
+            {
+              "children": [
+              ],
+              "type": 8,
+              "value": "label"
+            },
+            {
+              "type": 0,
+              "value": " (not required)"
+            }
+          ]
+        },
+        "true": {
+          "value": [
+            {
+              "children": [
+              ],
+              "type": 8,
+              "value": "label"
+            }
+          ]
+        }
+      },
+      "type": 5,
+      "value": "withAsterisk"
+    }
+  ],
   "P194bo": [
     {
       "type": 0,
@@ -1929,38 +1961,6 @@
       "value": "Co-sign confirmation"
     }
   ],
-  "yXbqL6": [
-    {
-      "options": {
-        "other": {
-          "value": [
-            {
-              "children": [
-              ],
-              "type": 8,
-              "value": "label"
-            },
-            {
-              "type": 0,
-              "value": " (not required)"
-            }
-          ]
-        },
-        "true": {
-          "value": [
-            {
-              "children": [
-              ],
-              "type": 8,
-              "value": "label"
-            }
-          ]
-        }
-      },
-      "type": 5,
-      "value": "withAsterisk"
-    }
-  ],
   "zQWnFh": [
     {
       "type": 0,

diff --git a/src/i18n/compiled/nl.json b/src/i18n/compiled/nl.json
@@ -849,6 +849,38 @@
       "value": "Betalen"
     }
   ],
+  "OnfuIr": [
+    {
+      "options": {
+        "other": {
+          "value": [
+            {
+              "children": [
+              ],
+              "type": 8,
+              "value": "label"
+            },
+            {
+              "type": 0,
+              "value": " (not required)"
+            }
+          ]
+        },
+        "true": {
+          "value": [
+            {
+              "children": [
+              ],
+              "type": 8,
+              "value": "label"
+            }
+          ]
+        }
+      },
+      "type": 5,
+      "value": "withAsterisk"
+    }
+  ],
   "P194bo": [
     {
       "type": 0,
@@ -1933,38 +1965,6 @@
       "value": "Bevestiging mede-ondertekening"
     }
   ],
-  "yXbqL6": [
-    {
-      "options": {
-        "other": {
-          "value": [
-            {
-              "children": [
-              ],
-              "type": 8,
-              "value": "label"
-            },
-            {
-              "type": 0,
-              "value": " (niet verplicht)"
-            }
-          ]
-        },
-        "true": {
-          "value": [
-            {
-              "children": [
-              ],
-              "type": 8,
-              "value": "label"
-            }
-          ]
-        }
-      },
-      "type": 5,
-      "value": "withAsterisk"
-    }
-  ],
   "zQWnFh": [
     {
       "type": 0,

diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
@@ -404,6 +404,11 @@
     "description": "Payment page title",
     "originalDefault": "Payment"
   },
+  "OnfuIr": {
+    "defaultMessage": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}",
+    "description": "Form field label, field not required",
+    "originalDefault": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}"
+  },
   "P194bo": {
     "defaultMessage": "Invalid input: must start with \"{startsWith}\".",
     "description": "ZOD 'invalid_string' error message, with startsWith",
@@ -879,11 +884,6 @@
     "description": "On succesful completion title",
     "originalDefault": "Co-sign confirmation"
   },
-  "yXbqL6": {
-    "defaultMessage": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}",
-    "description": "Form field label, field possibly optional",
-    "originalDefault": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}"
-  },
   "zQWnFh": {
     "defaultMessage": "Are you sure that you want to logout and not co-sign the current form submission?",
     "description": "log out confirmation prompt on co-sign page",

diff --git a/src/i18n/messages/nl.json b/src/i18n/messages/nl.json
@@ -410,6 +410,11 @@
     "description": "Payment page title",
     "originalDefault": "Payment"
   },
+  "OnfuIr": {
+    "defaultMessage": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}",
+    "description": "Form field label, field not required",
+    "originalDefault": "{withAsterisk, select, true {<label></label>} other {<label></label> (niet verplicht)}}"
+  },
   "P194bo": {
     "defaultMessage": "De ingevoerde waarde moet beginnen met \"{startsWith}\".",
     "description": "ZOD 'invalid_string' error message, with startsWith",
@@ -891,11 +896,6 @@
     "description": "On succesful completion title",
     "originalDefault": "Co-sign confirmation"
   },
-  "yXbqL6": {
-    "defaultMessage": "{withAsterisk, select, true {<label></label>} other {<label></label> (niet verplicht)}}",
-    "description": "Form field label, field possibly optional",
-    "originalDefault": "{withAsterisk, select, true {<label></label>} other {<label></label> (not required)}}"
-  },
   "zQWnFh": {
     "defaultMessage": "Bent u zeker dat u wilt uitloggen en hiermee de inzending niet mede-ondertekent?",
     "description": "log out confirmation prompt on co-sign page",