Add basic functionality for managing missing data

folio-org · Nov 14, 2024 · fa2e534 · fa2e534
1 parent 21f2a60
commit fa2e534
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/components/MediatedRequestsActivities/components/RequestForm/RequestForm.js b/src/components/MediatedRequestsActivities/components/RequestForm/RequestForm.js
@@ -175,7 +175,7 @@ class RequestForm extends React.Component {
       form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.ITEM_BARCODE, request.item.barcode);
     }
 
-    form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.REQUESTER_BARCODE, request.requester.barcode);
+    form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.REQUESTER_BARCODE, request.requester?.barcode);
     form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.PATRON_COMMENTS, request.patronComments);
 
     Promise.allSettled([
@@ -648,20 +648,22 @@ class RequestForm extends React.Component {
       const { requestPreferences } = await findResource(RESOURCE_TYPES.REQUEST_PREFERENCES, userId);
       const preferences = requestPreferences[0];
       const fulfillmentPreference = getFulfillmentPreference(preferences, initialValues);
+      const defaultDeliveryAddressTypeId = preferences?.defaultDeliveryAddressTypeId;
+      const defaultServicePointId = preferences?.defaultServicePointId;
 
       this.setState({
-        defaultDeliveryAddressTypeId: preferences.defaultDeliveryAddressTypeId,
-        defaultServicePointId: preferences.defaultServicePointId,
+        defaultDeliveryAddressTypeId,
+        defaultServicePointId,
         fulfillmentPreference,
       });
 
       return {
         ...defaultPreferences,
-        defaultDeliveryAddressTypeId: preferences.defaultDeliveryAddressTypeId,
-        defaultServicePointId: preferences.defaultServicePointId,
-        hasDelivery: Boolean(preferences.delivery),
+        hasDelivery: Boolean(preferences?.delivery),
         isDeliverySelected: isDelivery(fulfillmentPreference),
-        selectedAddress: preferences.defaultDeliveryAddressTypeId,
+        selectedAddress: defaultDeliveryAddressTypeId,
+        defaultDeliveryAddressTypeId,
+        defaultServicePointId,
         fulfillmentPreference,
       };
     } catch (e) {