abmp-npm 10.0.46 → 10.0.48

package/backend/daily-pull/process-member-methods.js

@@ -1,3 +1,4 @@
+const { ADDRESS_STATUS_TYPES } = require('../../public/consts');
 const { findMemberById, getMemberBySlug } = require('../members-data-methods');
 const { isValidArray, generateGeoHash } = require('../utils');
 
@@ -82,7 +83,21 @@ async function generateUpdatedMemberData({ inputMemberData, currentPageNumber })
 
   // Only add address data for new members
   if (!existingDbMember && isValidArray(inputMemberData.addresses)) {
-    updatedMemberData.addresses = inputMemberData.addresses;
+    const normalizedAddresses = inputMemberData.addresses.map((address, index) => {
+      const key = address?.key || `address_${index}`;
+      const rawStatus = address?.addressStatus;
+      const resolvedStatus =
+        index === 0 && rawStatus === ADDRESS_STATUS_TYPES.DONT_SHOW
+          ? ADDRESS_STATUS_TYPES.STATE_CITY_ZIP
+          : rawStatus || ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
+      return {
+        ...address,
+        key,
+        addressStatus: resolvedStatus,
+      };
+    });
+    updatedMemberData.addresses = normalizedAddresses;
+    updatedMemberData.addressDisplayOption = [{ key: normalizedAddresses[0].key, isMain: true }];
   }
 
   return { ...updatedMemberData, isNewToDb: !existingDbMember };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "10.0.46",
+  "version": "10.0.48",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/pages/LoadingPage.js

@@ -1,6 +1,8 @@
+const { location: wixLocationFrontend } = require('@wix/site-location');
+const { local } = require('@wix/site-storage');
 const { window: wixWindow, rendering } = require('@wix/site-window');
 
-const { LIGHTBOX_NAMES } = require('../public/consts');
+const { LIGHTBOX_NAMES, PAGES_PATHS } = require('../public/consts');
 const { checkAndLogin } = require('../public/sso-auth-methods');
 
 async function loadingPageOnReady(authenticateSSOToken) {
@@ -8,9 +10,16 @@ async function loadingPageOnReady(authenticateSSOToken) {
   //This calls needs to triggered on client side, otherwise PAC API will return 401 error
   if (renderingEnv === 'browser') {
     //Need to pass authenticateSSOToken to checkAndLogin so it will run as a web method not a public one.
-    await checkAndLogin(authenticateSSOToken).catch(error => {
-      wixWindow.openLightbox(LIGHTBOX_NAMES.LOGIN_ERROR_ALERT);
+    await checkAndLogin(authenticateSSOToken).catch(async error => {
       console.error(`Something went wrong while logging in: ${error}`);
+      // If we already have a session (memberId), redirect to form instead of showing error.
+      const storedMemberId = await local.getItem('memberId');
+      if (storedMemberId) {
+        const redirectTo = `${PAGES_PATHS.MEMBERS_FORM}?token=${encodeURIComponent(storedMemberId)}`;
+        await wixLocationFrontend.to(`/${redirectTo}`);
+        return;
+      }
+      wixWindow.openLightbox(LIGHTBOX_NAMES.LOGIN_ERROR_ALERT);
     });
   }
 }

package/pages/personalDetails.js

@@ -1556,23 +1556,9 @@ async function personalDetailsOnReady({
       _$w('#mainAddressCheckbox').checked = false;
       checkbox.checked = true;
 
-      // Primary address cannot be hidden: update model and repeater data so UI and save stay in sync
       if (clickedItemData.address.addressStatus === ADDRESS_STATUS_TYPES.DONT_SHOW) {
         updateAddressStatus(clickedItemData._id, ADDRESS_STATUS_TYPES.STATE_CITY_ZIP);
         $item('#addressStatusOptions').value = ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
-        const currentData = _$w('#addressesList').data || [];
-        const dataWithStatusFixed = currentData.map(item =>
-          item._id === clickedItemData._id
-            ? {
-                ...item,
-                address: {
-                  ...item.address,
-                  addressStatus: ADDRESS_STATUS_TYPES.STATE_CITY_ZIP,
-                },
-              }
-            : item
-        );
-        _$w('#addressesList').data = dataWithStatusFixed;
       }
 
       updateMainAddressSelection(clickedItemData._id);
@@ -1581,7 +1567,7 @@ async function personalDetailsOnReady({
     });
 
     _$w('#addressStatusOptions').onChange(event => {
-      const data = _$w('#addressesList').data || [];
+      const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
       const newStatus = event.target.value;
       const $item = _$w.at(event.context);
@@ -1593,15 +1579,6 @@ async function personalDetailsOnReady({
       }
 
       updateAddressStatus(clickedItemData._id, newStatus);
-
-      // Keep repeater data in sync (required for new addresses not yet in itemMemberObj.addresses)
-      const updatedData = data.map(item =>
-        item._id === clickedItemData._id
-          ? { ...item, address: { ...item.address, addressStatus: newStatus } }
-          : item
-      );
-      _$w('#addressesList').data = updatedData;
-
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });