pcm-shared-components 2.1.386 → 2.1.388

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

@@ -8,6 +8,7 @@ import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import WarningAmberIcon from '@mui/icons-material/WarningAmber';
 import * as i18nextLocal from 'i18next';
+import { classifyAnimalFieldValue } from '../animalFieldDrift';
 
 // Every visible string this component owns lives under these two pre-existing i18next namespaces
 // (already shared across both PitchCamp apps via pcm-shared-components' translations.json). Keyed
@@ -78,6 +79,7 @@ export const AnimalVehicleDetailsEditor = props => {
     items,
     fieldConfig,
     isFieldAnswered,
+    isFieldDrifted,
     onFieldChange,
     onAddItem,
     onRemoveItem,
@@ -112,6 +114,15 @@ export const AnimalVehicleDetailsEditor = props => {
     onRemoveItem(pendingRemoveId);
     setPendingRemoveId(null);
   };
+
+  // A drifted field (its stored value no longer matches this field's current type/options -- see
+  // isFieldDrifted) renders read-only instead of feeding a mismatched value into a live
+  // type-specific control (e.g. never shove a raw string into a date picker). "Replace" reveals
+  // the normal control for that one field, EMPTY rather than pre-filled with the drifted value, so
+  // the only way the drifted value leaves storage is a deliberate fresh answer overwriting it on
+  // save. Keyed per item+field so revealing one animal's drifted field never affects another.
+  const [revealedDriftKeys, setRevealedDriftKeys] = useState(() => new Set());
+  const revealDrift = revealKey => setRevealedDriftKeys(prev => new Set(prev).add(revealKey));
   const [selectedIndex, setSelectedIndex] = useState(0);
   // Growing the list (Add) jumps to the newly-added last item, since that's the one the host just
   // asked for and the one that needs filling in. Shrinking it (Remove) just clamps the current
@@ -260,12 +271,64 @@ export const AnimalVehicleDetailsEditor = props => {
       gridAutoFlow: 'row dense'
     }
   }, fieldConfig.map(field => {
-    const value = selectedItem.values?.[field.key] ?? '';
+    const rawValue = selectedItem.values?.[field.key] ?? '';
+    const revealKey = `${selectedItem.id}_${field.key}`;
+    const wasDrifted = isFieldDrifted(field, rawValue);
+    const showAsDrifted = wasDrifted && !revealedDriftKeys.has(revealKey);
+    // Once a drifted field is revealed, the live control gets an EMPTY value, never
+    // the mismatched raw one -- a drifted answer is never editable-in-place, only
+    // replaceable. Not drifted (or already revealed): behaves exactly as before.
+    const value = showAsDrifted ? rawValue : wasDrifted ? field.type === 'select_multiple' ? [] : '' : rawValue;
     const showError = field.required && !isFieldAnswered(field.type, value);
     const labelText = field.required ? `${field.label} *` : `${field.label} (${i18next.t('common.app.optional')})`;
     const wrapperClassName = ['select', 'textarea', 'select_multiple', 'yes_no'].includes(field.type) ? 'col-span-full' : undefined;
     let control;
-    if (field.type === 'number') {
+    if (showAsDrifted) {
+      // Generic stringify -- this renders whatever type the field used to be, which
+      // may no longer match field.type at all, so it can't reuse any type-specific
+      // control (a boolean/array/string all need to display as plain read text here).
+      const displayText = typeof rawValue === 'boolean' ? rawValue ? i18next.t('common.app.yes') : i18next.t('common.app.no') : Array.isArray(rawValue) ? rawValue.join(', ') : String(rawValue);
+      control = /*#__PURE__*/React.createElement("div", {
+        className: "flex flex-col",
+        style: {
+          gap: 4
+        }
+      }, /*#__PURE__*/React.createElement(Paper, {
+        variant: "outlined",
+        className: "flex items-center",
+        sx: {
+          gap: 6,
+          px: 1.5,
+          py: 1,
+          bgcolor: 'action.hover'
+        }
+      }, /*#__PURE__*/React.createElement(WarningAmberIcon, {
+        fontSize: "small",
+        color: "warning"
+      }), /*#__PURE__*/React.createElement(Typography, {
+        variant: "body2",
+        sx: {
+          flex: 1,
+          wordBreak: 'break-word'
+        }
+      }, displayText)), /*#__PURE__*/React.createElement("div", {
+        className: "flex items-center",
+        style: {
+          gap: 4
+        }
+      }, /*#__PURE__*/React.createElement(Typography, {
+        variant: "caption",
+        color: "text.secondary"
+      }, i18next.t('animal.field_drifted_hint')), /*#__PURE__*/React.createElement(Button, {
+        size: "small",
+        onClick: () => revealDrift(revealKey),
+        sx: {
+          textTransform: 'none',
+          minWidth: 0,
+          p: 0
+        }
+      }, i18next.t('animal.field_drifted_replace'))));
+    } else if (field.type === 'number') {
       control = /*#__PURE__*/React.createElement(TextField, {
         name: field.key,
         value: value,
@@ -407,7 +470,7 @@ export const AnimalVehicleDetailsEditor = props => {
     }
     return /*#__PURE__*/React.createElement("div", {
       className: wrapperClassName,
-      key: `${selectedItem.id}_${field.key}`,
+      key: revealKey,
       "data-field-invalid": showError ? 'true' : undefined
     }, /*#__PURE__*/React.createElement(Typography, {
       variant: "body2",
@@ -416,12 +479,77 @@ export const AnimalVehicleDetailsEditor = props => {
         mb: 0.5,
         color: showError ? 'error.main' : 'text.primary'
       }
-    }, labelText), control, field.type === 'yes_no' && showError && /*#__PURE__*/React.createElement(Typography, {
+    }, labelText), control, field.type === 'yes_no' && !showAsDrifted && showError && /*#__PURE__*/React.createElement(Typography, {
       variant: "caption",
       color: "error",
       className: "block mt-4"
     }, requiredErrorText(field.type)));
-  })))), (() => {
+  })))), selectedItem && (() => {
+    const liveKeys = new Set(fieldConfig.map(f => f.key));
+    const historicalEntries = Object.keys(selectedItem.values || {}).filter(k => !liveKeys.has(k)).map(k => ({
+      key: k,
+      value: selectedItem.values[k]
+    })).filter(entry => classifyAnimalFieldValue(null, entry.value) !== 'unanswered');
+    if (historicalEntries.length === 0) return null;
+    return /*#__PURE__*/React.createElement(Paper, {
+      variant: "outlined",
+      sx: {
+        mt: 1,
+        p: 1.5,
+        borderRadius: 2,
+        bgcolor: 'action.hover'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "flex items-center",
+      style: {
+        gap: 6,
+        marginBottom: 4
+      }
+    }, /*#__PURE__*/React.createElement(WarningAmberIcon, {
+      fontSize: "small",
+      color: "warning"
+    }), /*#__PURE__*/React.createElement(Typography, {
+      sx: {
+        fontWeight: 700
+      }
+    }, i18next.t('animal.historical_answers_title'))), /*#__PURE__*/React.createElement(Typography, {
+      variant: "caption",
+      color: "text.secondary",
+      sx: {
+        display: 'block',
+        mb: 1.5
+      }
+    }, i18next.t('animal.historical_answers_hint')), /*#__PURE__*/React.createElement("div", {
+      className: "grid grid-cols-2",
+      style: {
+        columnGap: 12,
+        rowGap: 12
+      }
+    }, historicalEntries.map(({
+      key: k,
+      value: v
+    }) => {
+      const displayText = typeof v === 'boolean' ? v ? i18next.t('common.app.yes') : i18next.t('common.app.no') : Array.isArray(v) ? v.join(', ') : String(v);
+      // No live config left to carry a real label -- same title-cased-slug fallback the
+      // read-only review screens use for a retired key.
+      const label = k.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
+      return /*#__PURE__*/React.createElement("div", {
+        key: k,
+        className: "flex flex-col"
+      }, /*#__PURE__*/React.createElement(Typography, {
+        variant: "body2",
+        sx: {
+          fontWeight: 500,
+          color: 'text.secondary'
+        }
+      }, label), /*#__PURE__*/React.createElement(Typography, {
+        variant: "body2",
+        sx: {
+          color: 'text.primary'
+        }
+      }, displayText));
+    })));
+  })(), (() => {
     const incompleteCount = items.filter(item => missingRequiredFields(item).length > 0).length;
     if (incompleteCount === 0) return null;
     return /*#__PURE__*/React.createElement(Alert, {
@@ -470,6 +598,7 @@ AnimalVehicleDetailsEditor.defaultProps = {
   onFieldChange: () => {},
   onAddItem: () => {},
   onRemoveItem: () => {},
+  isFieldDrifted: () => false,
   canAddMore: true,
   maxItems: 0,
   className: 'w-full',
@@ -498,6 +627,11 @@ AnimalVehicleDetailsEditor.propTypes = {
   /** (type, value) => boolean. Injected rather than owned internally, so each host app's existing
    * "has this field actually been answered" rule (yes_no's `false` counts, etc.) stays authoritative. */
   isFieldAnswered: PropTypes.func.isRequired,
+  /** (field, rawValue) => boolean. Optional -- defaults to always-false (no drift concept at all,
+   * e.g. vehicle fields, which have no admin config to drift). When true for a field/value pair,
+   * that field renders read-only with a warning + "replace" action instead of feeding a value that
+   * no longer matches the field's current type/options into a live type-specific control. */
+  isFieldDrifted: PropTypes.func,
   /** (itemId, fieldKey, value) => void */
   onFieldChange: PropTypes.func,
   /** () => void -- host owns the actual array/count mutation. */

package/dist/components/Reservation/animalFieldDrift.js

@@ -0,0 +1,83 @@
+// A lot's admin-configurable animal fields (label, type, options, required, unit) can change at
+// any time, but a reservation's field_values were entered under whatever the config looked like
+// at that moment. This classifies one stored (field, rawValue) pair against the field's CURRENT
+// live config, so a caller can tell three states apart instead of collapsing "answered under a
+// since-changed config" into either "answered" (misleading -- the value may no longer make sense
+// under today's type/options) or "unanswered" (wrong -- silently hides real historical data).
+//
+// This is intentionally a superset of the isAnimalFieldAnswered every host app already owns: that
+// function only asks "is this non-empty" (its job is required-field validation), this one also
+// asks "does it still make sense under today's config" (its job is drift detection). Every
+// per-type completeness threshold below matches isAnimalFieldAnswered exactly (including the
+// legacy 'text' 2-char minimum, deliberately not extended to other types -- see the identical rule
+// there), so a value that was always genuinely incomplete still classifies as 'unanswered', not
+// 'drifted' -- drift only fires for content that's substantial but doesn't fit the current type's
+// shape (or, for select/select_multiple, isn't in the current option list -- the one check
+// isAnimalFieldAnswered can't make since it isn't given the field's options). This mirrors -- does
+// not replace -- the same per-type shape rules the PHP validators enforce server-side
+// (validate_reservation_edit.php / validate_reservation_new.php), so a value the backend would now
+// blank on a genuine edit is exactly the value this flags as 'drifted' on display.
+//
+// fieldConfig is `null` when the field has been fully retired (no longer in the lot's live config
+// at all) -- there's no type left to hold a value to, so any real content at all is 'drifted'.
+
+// Generic "is there real content here, regardless of shape" check -- used only to tell 'drifted'
+// (wrong shape, but something was clearly entered) apart from 'unanswered' (nothing meaningful was
+// ever entered) once a type-specific branch has already ruled out "answered".
+const hasWrongShapeContent = rawValue => {
+  if (typeof rawValue === 'boolean') return true;
+  if (Array.isArray(rawValue)) return rawValue.length > 0;
+  if (typeof rawValue === 'string') return rawValue.trim().length > 0;
+  return rawValue !== null && rawValue !== undefined;
+};
+export const classifyAnimalFieldValue = (fieldConfig, rawValue) => {
+  if (!fieldConfig) {
+    return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+  }
+  const {
+    type,
+    options
+  } = fieldConfig;
+  if (type === 'yes_no') {
+    if (typeof rawValue === 'boolean') return 'answered';
+    return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+  }
+  if (type === 'select_multiple') {
+    if (Array.isArray(rawValue)) {
+      if (rawValue.length === 0) return 'unanswered';
+      const allowed = Array.isArray(options) ? options : [];
+      return rawValue.every(v => allowed.includes(v)) ? 'answered' : 'drifted';
+    }
+    return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+  }
+  if (type === 'select') {
+    if (typeof rawValue === 'string' && rawValue !== '') {
+      const allowed = Array.isArray(options) ? options : [];
+      return allowed.includes(rawValue) ? 'answered' : 'drifted';
+    }
+    return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+  }
+  if (type === 'number') {
+    if (typeof rawValue === 'string' && rawValue.length >= 1) {
+      return !Number.isNaN(Number(rawValue)) ? 'answered' : 'drifted';
+    }
+    return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+  }
+  if (type === 'date') {
+    if (typeof rawValue === 'string' && rawValue.length >= 1) {
+      return /^\d{4}-\d{2}-\d{2}$/.test(rawValue) ? 'answered' : 'drifted';
+    }
+    return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+  }
+  if (type === 'textarea') {
+    if (typeof rawValue === 'string' && rawValue.length >= 1) return 'answered';
+    return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+  }
+  // Legacy 'text' (and the fallback for a missing/unrecognized type): 2-char minimum, matching
+  // isAnimalFieldAnswered exactly -- a single stray keystroke was never a real answer, config
+  // drift or not, so it's 'unanswered' rather than 'drifted'.
+  if (typeof rawValue === 'string' && rawValue.length >= 2) return 'answered';
+  if (typeof rawValue === 'string' && rawValue.length === 1) return 'unanswered';
+  return hasWrongShapeContent(rawValue) ? 'drifted' : 'unanswered';
+};
+export default classifyAnimalFieldValue;

package/dist/index.js

@@ -37,4 +37,5 @@ import VerticalImageTile from './components/Images/VerticalImageTile';
 import EventCard from './components/Cards/EventCard';
 import ImageAssets from './components/Icons/ImageAssets';
 import AnimalVehicleDetailsEditor from './components/Reservation/AnimalVehicleDetailsEditor';
-export { TestButton, CodeHighlight, CustomFab, HelpButton, GenericDialogWindow, PcSharedComponentThemeInheritor, ImageCanvasDraw, PCMScrollbar, TwoColumnDisplay, SimpleTab, HrefLink, GenericAppBar, ReusablePopupMenu, SearchBar, TillButton, ProductItemButton, DropdownButton, translationResources, coreLocals, currencySymbol, DateRangeCalendar, DateCalendar, SimpleLabel, CurrencyTextInput, ImageStack, PlatformPaymentPlans, PlatformPlanTitles, PlatformPlanPrices, LoadingBackdrop, SimpleAccordion, PricingCalendar, FancyDate, HorizontalImageTile, VerticalImageTile, EventCard, ImageAssets, AnimalVehicleDetailsEditor };
+import { classifyAnimalFieldValue } from './components/Reservation/animalFieldDrift';
+export { TestButton, CodeHighlight, CustomFab, HelpButton, GenericDialogWindow, PcSharedComponentThemeInheritor, ImageCanvasDraw, PCMScrollbar, TwoColumnDisplay, SimpleTab, HrefLink, GenericAppBar, ReusablePopupMenu, SearchBar, TillButton, ProductItemButton, DropdownButton, translationResources, coreLocals, currencySymbol, DateRangeCalendar, DateCalendar, SimpleLabel, CurrencyTextInput, ImageStack, PlatformPaymentPlans, PlatformPlanTitles, PlatformPlanPrices, LoadingBackdrop, SimpleAccordion, PricingCalendar, FancyDate, HorizontalImageTile, VerticalImageTile, EventCard, ImageAssets, AnimalVehicleDetailsEditor, classifyAnimalFieldValue };

package/dist/languages/en/translations.json

@@ -36,7 +36,12 @@
     "complete_required_fields": "Complete {{count}} required field",
     "complete_required_fields_plural": "Complete {{count}} required fields",
     "remove_confirm_title": "Remove this animal?",
-    "remove_confirm_message": "All information entered for this animal will be lost. This can't be undone."
+    "remove_confirm_message": "All information entered for this animal will be lost. This can't be undone.",
+    "field_drifted_hint": "This answer no longer matches this question's current setup.",
+    "field_drifted_replace": "Enter a new answer",
+    "field_removed": "This question no longer exists in this lot's setup.",
+    "historical_answers_title": "Historical Answers",
+    "historical_answers_hint": "These questions are no longer part of this lot's setup and can't be edited."
   },
   "app": {
     "common": {
@@ -2460,7 +2465,17 @@
         "unit_label": "Unit",
         "unit_hint": "Shown after the number, e.g. kg",
         "delete_field_confirm_title": "Delete this field?",
-        "delete_field_confirm_text": "\"{{label}}\" will be removed from the list. Answers guests already gave for it on existing reservations aren't deleted, but the field won't be asked again."
+        "delete_field_confirm_text": "\"{{label}}\" will be removed from the list. Answers guests already gave for it on existing reservations aren't deleted, but the field won't be asked again.",
+        "change_type_confirm_title": "Change field type?",
+        "change_type_confirm_text": "{{count}} reservation(s) already have an answer for \"{{label}}\". Changing its type may make that answer display incorrectly. Continue?",
+        "remove_option_confirm_title": "Remove option?",
+        "remove_option_confirm_text": "{{count}} reservation(s) have an answer using an option you're removing from \"{{label}}\". Their answer will no longer match this field's choices. Continue?",
+        "visibility_hint": "Also controls whether this section appears in Online Booking → Online Checkout Options.",
+        "hidden_from_guests_warning": "Guests won't see this until you turn it on.",
+        "online_booking_title": "Animal details for online booking",
+        "manage_fields": "Manage fields",
+        "fields_configured_count_one": "{{count}} field configured",
+        "fields_configured_count_other": "{{count}} fields configured"
       },
       "edit_lot": "Edit Lot",
       "lot_id_exist": "Lot number already exist",

package/dist/languages/es/translations.json

@@ -36,7 +36,12 @@
     "complete_required_fields": "Complete {{count}} campo requerido",
     "complete_required_fields_plural": "Complete {{count}} campos requeridos",
     "remove_confirm_title": "¿Eliminar este animal?",
-    "remove_confirm_message": "Toda la información ingresada para este animal se perderá. Esto no se puede deshacer."
+    "remove_confirm_message": "Toda la información ingresada para este animal se perderá. Esto no se puede deshacer.",
+    "field_drifted_hint": "Esta respuesta ya no coincide con la configuración actual de esta pregunta.",
+    "field_drifted_replace": "Ingrese una nueva respuesta",
+    "field_removed": "Esta pregunta ya no existe en la configuración de este lote.",
+    "historical_answers_title": "Respuestas Históricas",
+    "historical_answers_hint": "Estas preguntas ya no forman parte de la configuración de este lote y no se pueden editar."
   },
   "app": {
     "common": {
@@ -2460,7 +2465,17 @@
         "unit_label": "Unidad",
         "unit_hint": "Se muestra después del número, ej. kg",
         "delete_field_confirm_title": "¿Eliminar este campo?",
-        "delete_field_confirm_text": "\"{{label}}\" será eliminado de la lista. Las respuestas que los huéspedes ya han proporcionado no se eliminarán, pero el campo no se volverá a solicitar."
+        "delete_field_confirm_text": "\"{{label}}\" será eliminado de la lista. Las respuestas que los huéspedes ya han proporcionado no se eliminarán, pero el campo no se volverá a solicitar.",
+        "change_type_confirm_title": "¿Cambiar el tipo de campo?",
+        "change_type_confirm_text": "{{count}} reserva(s) ya tienen una respuesta para \"{{label}}\". Cambiar su tipo puede hacer que esa respuesta se muestre incorrectamente. ¿Continuar?",
+        "remove_option_confirm_title": "¿Eliminar la opción?",
+        "remove_option_confirm_text": "{{count}} reserva(s) tienen una respuesta usando una opción que está eliminando de \"{{label}}\". Su respuesta ya no coincidirá con las opciones de este campo. ¿Continuar?",
+        "visibility_hint": "También controla si esta sección aparece en Reserva en línea → Opciones de pago en línea.",
+        "hidden_from_guests_warning": "Los huéspedes no verán esto hasta que lo actives.",
+        "online_booking_title": "Detalles de los animales para la reserva en línea",
+        "manage_fields": "Administrar campos",
+        "fields_configured_count_one": "{{count}} campo configurado",
+        "fields_configured_count_other": "{{count}} campos configurados"
       },
       "edit_lot": "Editar lote",
       "lot_id_exist": "El número de lote ya existe",

package/dist/languages/fr/translations.json

@@ -36,7 +36,12 @@
     "complete_required_fields": "Complétez {{count}} champ requis",
     "complete_required_fields_plural": "Complétez {{count}} champs requis",
     "remove_confirm_title": "Supprimer cet animal ?",
-    "remove_confirm_message": "Toutes les informations saisies pour cet animal seront perdues. Cela ne peut pas être annulé."
+    "remove_confirm_message": "Toutes les informations saisies pour cet animal seront perdues. Cela ne peut pas être annulé.",
+    "field_drifted_hint": "Cette réponse ne correspond plus à la configuration actuelle de cette question.",
+    "field_drifted_replace": "Entrez une nouvelle réponse",
+    "field_removed": "Cette question n'existe plus dans la configuration de ce terrain.",
+    "historical_answers_title": "Réponses Historiques",
+    "historical_answers_hint": "Ces questions ne font plus partie de la configuration de ce terrain et ne peuvent pas être modifiées."
   },
   "app": {
     "common": {
@@ -2460,7 +2465,17 @@
         "unit_label": "Unité",
         "unit_hint": "Affiché après le nombre, ex. kg",
         "delete_field_confirm_title": "Supprimer ce champ ?",
-        "delete_field_confirm_text": "« {{label}} » sera supprimé de la liste. Les réponses que les clients ont déjà fournies ne seront pas supprimées, mais le champ ne sera plus demandé."
+        "delete_field_confirm_text": "« {{label}} » sera supprimé de la liste. Les réponses que les clients ont déjà fournies ne seront pas supprimées, mais le champ ne sera plus demandé.",
+        "change_type_confirm_title": "Changer le type de champ ?",
+        "change_type_confirm_text": "{{count}} réservation(s) ont déjà une réponse pour « {{label}} ». Modifier son type peut faire afficher incorrectement cette réponse. Continuer ?",
+        "remove_option_confirm_title": "Supprimer l'option ?",
+        "remove_option_confirm_text": "{{count}} réservation(s) ont une réponse utilisant une option que vous supprimez de « {{label}} ». Leur réponse ne correspondra plus aux choix de ce champ. Continuer ?",
+        "visibility_hint": "Contrôle également l'affichage de cette section dans Réservation en ligne → Options de paiement en ligne.",
+        "hidden_from_guests_warning": "Les clients ne verront cela que lorsque vous l'activerez.",
+        "online_booking_title": "Détails sur les animaux pour la réservation en ligne",
+        "manage_fields": "Gérer les champs",
+        "fields_configured_count_one": "{{count}} champ configuré",
+        "fields_configured_count_other": "{{count}} champs configurés"
       },
       "edit_lot": "Editer le lot",
       "lot_id_exist": "Le numéro de lot existe déjà",

package/package.json

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