pcm-shared-components 2.1.406 → 2.1.407

package/dist/components/Reservation/AnimalVehicleDetailsEditor/AnimalFieldsOnceBlock.js

@@ -22,6 +22,22 @@ const isFullWidthField = field => ['select', 'textarea', 'select_multiple', 'not
 // through unflattened still works.
 const readFieldProp = (field, key) => field[key] !== undefined ? field[key] : field.meta?.[key];
 
+// Same type-aware required-field wording as AnimalVehicleDetailsEditor's tab-per-animal grid
+// (index.jsx, this directory) -- duplicated rather than shared, matching the small amount of
+// tolerated duplication already elsewhere in this feature (e.g. each host app keeps its own copy
+// for its live-preview sandbox). Falls back to animal.required_error for text/textarea. 'notice'
+// gets its own message rather than the generic one -- its required-satisfying condition is
+// stricter than every other type (see isFieldAnswered below): only a CHECKED "I have read this"
+// box counts, so "please fill this in" would read wrong for what's actually a checkbox.
+const REQUIRED_ERROR_KEY_BY_TYPE = {
+  select: 'animal.required_error_select',
+  select_multiple: 'animal.required_error_select_multiple',
+  number: 'animal.required_error_number',
+  date: 'animal.required_error_date',
+  yes_no: 'animal.required_error_yes_no',
+  notice: 'animal.required_error_notice'
+};
+
 /**
  * Flat, non-tabbed block for a lot's "once per reservation" animal fields: no tabs, no per-animal
  * chrome, no add/remove -- these are single shared values/notices for the whole reservation, not
@@ -59,12 +75,14 @@ export const AnimalFieldsOnceBlock = props => {
     fields,
     values,
     onChange,
+    isFieldAnswered,
     className,
     theme,
     i18next
   } = props;
   const compTheme = theme || useTheme();
   const defaultTheme = createTheme(compTheme);
+  const requiredErrorText = fieldType => i18next.t(REQUIRED_ERROR_KEY_BY_TYPE[fieldType] || 'animal.required_error');
   const relevantFields = fields.filter(field => readFieldProp(field, 'once_per_reservation') === true);
   if (relevantFields.length === 0) return null;
   return /*#__PURE__*/React.createElement(ThemeProvider, {
@@ -80,6 +98,14 @@ export const AnimalFieldsOnceBlock = props => {
     }
   }, relevantFields.map(field => {
     const rawValue = values?.[field.key] ?? (field.type === 'select_multiple' ? [] : '');
+    // Required-and-not-yet-answered gets the same red label + control error state the
+    // per-animal grid already shows (index.jsx, this directory) -- this block previously
+    // hardcoded error: false/helperText: '' unconditionally, so a required once-per-
+    // reservation field (e.g. a mandatory "I have read this" notice, or a required yes_no
+    // asked once) never visibly indicated it was outstanding. isFieldAnswered is supplied
+    // by the caller (same prop AnimalVehicleDetailsEditor already requires), since it's
+    // app-specific logic this shared package doesn't own.
+    const showError = field.required && !isFieldAnswered(field.type, rawValue);
     const labelText = field.required ? `${field.label} *` : field.label;
     return /*#__PURE__*/React.createElement("div", {
       key: field.key,
@@ -88,7 +114,8 @@ export const AnimalFieldsOnceBlock = props => {
       variant: "body2",
       sx: {
         fontWeight: 500,
-        mb: 0.5
+        mb: 0.5,
+        color: showError ? 'error.main' : 'text.primary'
       }
     }, labelText), renderFieldTypeControl({
       field,
@@ -98,8 +125,8 @@ export const AnimalFieldsOnceBlock = props => {
       // consumer's own event wiring calls it directly in a test.
       onChange: onChange ? newValue => onChange(field.key, newValue) : () => {},
       disabled: !onChange,
-      error: false,
-      helperText: '',
+      error: showError,
+      helperText: showError ? requiredErrorText(field.type) : '',
       i18next
     }));
   }))));
@@ -138,6 +165,10 @@ AnimalFieldsOnceBlock.propTypes = {
   /** (fieldKey, value) => void. Omit entirely to render every input control disabled/read-only
    * (review-screen usage) -- see the component doc above. */
   onChange: PropTypes.func,
+  /** (fieldType, value) => boolean. Same function each host app already passes into
+   * AnimalVehicleDetailsEditor's isFieldAnswered prop -- required so a required-but-unanswered
+   * once-per-reservation field can show the same red label/error state the per-animal grid does. */
+  isFieldAnswered: PropTypes.func.isRequired,
   /** Classes applied to the component's own wrapper div. */
   className: PropTypes.string,
   /** Theme object to use on this component, if none provided then the MUI5 theme provider theme is used. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pcm-shared-components",
-  "version": "2.1.406",
+  "version": "2.1.407",
   "private": false,
   "main": "dist/index.js",
   "babel": {