abmp-npm 2.0.44 → 2.0.45

package/backend/jobs.js

@@ -68,6 +68,20 @@ async function scheduleCreateContactsFromMembersTask() {
   }
 }
 
+async function scheduleFixPrimaryAddressForMembersTask() {
+  try {
+    console.log('scheduleFixPrimaryAddressForMembers started!');
+    return await taskManager().schedule({
+      name: TASKS_NAMES.scheduleFixPrimaryAddressForMembers,
+      data: {},
+      type: 'scheduled',
+    });
+  } catch (error) {
+    console.error(`Failed to scheduleFixPrimaryAddressForMembers: ${error.message}`);
+    throw new Error(`Failed to scheduleFixPrimaryAddressForMembers: ${error.message}`);
+  }
+}
+
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -85,4 +99,5 @@ module.exports = {
   scheduleDailyPullTask,
   updateSiteMapS3,
   scheduleCreateContactsFromMembersTask,
+  scheduleFixPrimaryAddressForMembersTask,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.44",
+  "version": "2.0.45",
   "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,9 +1556,23 @@ 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);
@@ -1567,7 +1581,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);
@@ -1579,6 +1593,15 @@ 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);
     });