abmp-npm 2.0.63 → 2.0.65

package/backend/jobs.js

@@ -2,6 +2,7 @@ const { taskManager } = require('psdev-task-manager');
 
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { TASKS_NAMES } = require('./tasks/consts');
+const { dailyPullExecutionCheck } = require('./tasks/daily-pull-check-methods');
 const { TASKS } = require('./tasks/tasks-configs');
 
 async function runScheduledTasks() {
@@ -96,6 +97,16 @@ async function scheduleFixUrlsWithSpacesTask() {
   }
 }
 
+async function runDailyPullExecutionCheck() {
+  try {
+    console.log('runDailyPullExecutionCheck started!');
+    return await dailyPullExecutionCheck({});
+  } catch (error) {
+    console.error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
+    throw new Error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
+  }
+}
+
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -115,4 +126,5 @@ module.exports = {
   scheduleCreateContactsFromMembersTask,
   scheduleFixPrimaryAddressForMembersTask,
   scheduleFixUrlsWithSpacesTask,
+  runDailyPullExecutionCheck,
 };

package/backend/tasks/consts.js

@@ -22,6 +22,7 @@ const TASKS_NAMES = {
   fixPrimaryAddressChunk: 'fixPrimaryAddressChunk',
   scheduleFixUrlsWithSpaces: 'scheduleFixUrlsWithSpaces',
   fixUrlsWithSpacesChunk: 'fixUrlsWithSpacesChunk',
+  dailyPullExecutionCheck: 'dailyPullExecutionCheck',
 };
 
 module.exports = {

package/backend/tasks/daily-pull-check-methods.js

@@ -0,0 +1,58 @@
+const { taskManager } = require('psdev-task-manager');
+const { COLLECTIONS } = require('psdev-task-manager/public/consts');
+
+const { wixData } = require('../elevated-modules');
+const { queryAllItems } = require('../utils');
+
+const { TASKS_NAMES } = require('./consts');
+
+const DEFAULT_HOURS_BACK = 4;
+
+/**
+ * Detects whether the daily pull was scheduled (cron / root task).
+ * If no `ScheduleDailyMembersDataSync` task exists in the lookback window, schedules it.
+ */
+async function dailyPullExecutionCheck(taskData) {
+  const hoursBack =
+    taskData?.hoursBack && Number.isFinite(taskData.hoursBack)
+      ? taskData.hoursBack
+      : DEFAULT_HOURS_BACK;
+  const sinceDate = new Date(Date.now() - hoursBack * 60 * 60 * 1000);
+
+  console.log('dailyPullExecutionCheck started', { hoursBack, sinceDate });
+
+  const rootTasksQuery = wixData
+    .query(COLLECTIONS.TASKS)
+    .eq('name', TASKS_NAMES.ScheduleDailyMembersDataSync)
+    .ge('_createdDate', sinceDate);
+
+  const rootTasks = await queryAllItems(rootTasksQuery);
+  const rootTaskScheduled = rootTasks.length > 0;
+
+  const result = {
+    success: rootTaskScheduled,
+    sinceDate: sinceDate.toISOString(),
+    rootTaskName: TASKS_NAMES.ScheduleDailyMembersDataSync,
+    rootTasksFound: rootTasks.length,
+  };
+
+  if (!rootTaskScheduled) {
+    console.log('ScheduleDailyMembersDataSync missing in window; scheduling root daily pull', {
+      hoursBack,
+    });
+    await taskManager().schedule({
+      name: TASKS_NAMES.ScheduleDailyMembersDataSync,
+      data: {},
+      type: 'scheduled',
+    });
+    result.fallbackScheduled = true;
+  }
+
+  console.log('dailyPullExecutionCheck result', JSON.stringify(result, null, 2));
+
+  return result;
+}
+
+module.exports = {
+  dailyPullExecutionCheck,
+};

package/backend/tasks/index.js

@@ -6,4 +6,5 @@ module.exports = {
   ...require('./url-migration-methods'),
   ...require('./address-primary-methods'),
   ...require('./url-space-fix-methods'),
+  ...require('./daily-pull-check-methods'),
 };

package/backend/tasks/tasks-configs.js

@@ -9,6 +9,7 @@ const {
   fixPrimaryAddressChunk,
 } = require('./address-primary-methods');
 const { TASKS_NAMES } = require('./consts');
+const { dailyPullExecutionCheck } = require('./daily-pull-check-methods');
 const {
   scheduleTaskForEmptyAboutYouMembers,
   convertAboutYouHtmlToRichContent,
@@ -202,6 +203,13 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
+  [TASKS_NAMES.dailyPullExecutionCheck]: {
+    name: TASKS_NAMES.dailyPullExecutionCheck,
+    getIdentifier: task => task.data,
+    process: dailyPullExecutionCheck,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 30,
+  },
 };
 
 module.exports = { TASKS };

package/package.json

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

package/pages/personalDetails.js

@@ -18,6 +18,33 @@ const {
 const MAX_PHONES_COUNT = 10;
 const MAX_ADDRESSES_COUNT = 10;
 
+/** US 10-digit NANP: strip non-digits; drop leading 1 from 11-digit input. */
+function digitsFromPhoneInput(value) {
+  if (!value || typeof value !== 'string') return '';
+  let d = value.replace(/\D/g, '');
+  if (d.length === 11 && d[0] === '1') d = d.slice(1);
+  return d.slice(0, 10);
+}
+
+/** Format as (###) ###-#### while typing. */
+function formatUsPhoneInput(digits) {
+  if (!digits) return '';
+  const d = digits.slice(0, 10);
+  if (d.length <= 3) return `(${d}`;
+  if (d.length <= 6) return `(${d.slice(0, 3)}) ${d.slice(3)}`;
+  return `(${d.slice(0, 3)}) ${d.slice(3, 6)}-${d.slice(6)}`;
+}
+
+function formatPhoneNumberForInput(value) {
+  return formatUsPhoneInput(digitsFromPhoneInput(value || ''));
+}
+
+function phoneDigitsEqual(a, b) {
+  const da = digitsFromPhoneInput(String(a || ''));
+  const db = digitsFromPhoneInput(String(b || ''));
+  return da.length > 0 && db.length > 0 && da === db;
+}
+
 const ADDRESS_STATES = {
   VIEW: 'addressViewState',
   EDIT: 'addressEditState',
@@ -2024,12 +2051,16 @@ async function personalDetailsOnReady({
     _$w('#phoneInput').onInput(event => {
       const data = _$w('#phoneNumbersList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
-      const phoneValue = event.target.value;
+      const digits = digitsFromPhoneInput(event.target.value);
+      const formatted = formatUsPhoneInput(digits);
+      if (event.target.value !== formatted) {
+        event.target.value = formatted;
+      }
 
-      updatePhoneNumber(clickedItemData._id, phoneValue);
+      updatePhoneNumber(clickedItemData._id, formatted);
 
-      if (clickedItemData.isNewPhone && phoneValue.trim()) {
-        addNewPhoneToData(clickedItemData._id, phoneValue.trim());
+      if (clickedItemData.isNewPhone && digits.length > 0) {
+        addNewPhoneToData(clickedItemData._id, formatted);
         clickedItemData.isNewPhone = false;
       }
 
@@ -2098,7 +2129,7 @@ async function personalDetailsOnReady({
   }
 
   function handlePhoneItem($item, itemData) {
-    $item('#phoneInput').value = itemData.phoneNumber || '';
+    $item('#phoneInput').value = formatPhoneNumberForInput(itemData.phoneNumber || '');
     $item('#showPhoneCheckbox').checked = itemData.showPhone || false;
     $item('#phoneNumberLabel').text = `Phone ${itemData.phoneIndex}`;
   }
@@ -2112,7 +2143,7 @@ async function personalDetailsOnReady({
       let matched = false;
       return phoneData.map(p => {
         const t = (p.phoneNumber || '').trim();
-        const isMatch = Boolean(t && t === cms);
+        const isMatch = Boolean(t && phoneDigitsEqual(t, cms));
         if (isMatch && !matched) {
           matched = true;
           return { ...p, showPhone: true };
@@ -2140,7 +2171,7 @@ async function personalDetailsOnReady({
       phoneData = phones.map((phone, index) => ({
         _id: `phone_${index}`,
         phoneNumber: phone,
-        showPhone: phone === itemMemberObj.toShowPhone,
+        showPhone: phoneDigitsEqual(phone, itemMemberObj.toShowPhone),
         isNewPhone: false,
         phoneIndex: index + 1,
       }));
@@ -2195,7 +2226,7 @@ async function personalDetailsOnReady({
       } else if (
         itemMemberObj.toShowPhone &&
         prevTrimmed &&
-        itemMemberObj.toShowPhone === prevTrimmed
+        phoneDigitsEqual(itemMemberObj.toShowPhone, prevTrimmed)
       ) {
         itemMemberObj.toShowPhone = newTrimmed || null;
       }
@@ -2230,14 +2261,17 @@ async function personalDetailsOnReady({
     if (phoneToRemove) {
       if (itemMemberObj.phones) {
         itemMemberObj.phones = itemMemberObj.phones.filter(
-          phone => phone !== phoneToRemove.phoneNumber
+          phone => !phoneDigitsEqual(phone, phoneToRemove.phoneNumber)
         );
       }
 
       // Clear toShowPhone if it was the removed phone or if it's no longer in the list
       // (handles format mismatch e.g. "(406)655-4940" vs "(406) 655-4940")
       const remainingPhones = Array.isArray(itemMemberObj.phones) ? itemMemberObj.phones : [];
-      if (itemMemberObj.toShowPhone && !remainingPhones.includes(itemMemberObj.toShowPhone)) {
+      if (
+        itemMemberObj.toShowPhone &&
+        !remainingPhones.some(p => phoneDigitsEqual(p, itemMemberObj.toShowPhone))
+      ) {
         itemMemberObj.toShowPhone = null;
       }
 
@@ -2262,7 +2296,10 @@ async function personalDetailsOnReady({
       return;
     }
 
-    if (itemMemberObj.toShowPhone === trimmed) {
+    if (
+      itemMemberObj.toShowPhone === trimmed ||
+      phoneDigitsEqual(itemMemberObj.toShowPhone, trimmed)
+    ) {
       itemMemberObj.toShowPhone = null;
     }
   }
@@ -2273,7 +2310,7 @@ async function personalDetailsOnReady({
     // Never expose toShowPhone when phones is empty, so save payload clears it in CMS
     if (phones.length === 0) return null;
     // If toShowPhone is not in the list (e.g. format mismatch), treat as none selected
-    if (toShow && !phones.includes(toShow)) return null;
+    if (toShow && !phones.some(p => phoneDigitsEqual(p, toShow))) return null;
     return toShow;
   }
 
@@ -2302,9 +2339,6 @@ async function personalDetailsOnReady({
   }
 
   async function saveContactBooking() {
-    // if showWixUrl value changes then update optWebsiteCheckbox value
-    _$w('#optWebsiteCheckbox').checked = itemMemberObj.showWixUrl;
-
     const showExistingUrl = _$w('#showExsistingUrlCheckbox').checked;
     const otherWebsiteValue = (_$w('#UrlInput').value || '').trim();
     const isOtherWebsiteInvalid =
@@ -2345,8 +2379,13 @@ async function personalDetailsOnReady({
     console.groupEnd();
 
     const result = await saveData(formData);
-    if (beforeData.showWebsite !== contactChanges.showWebsite) {
-      handleOptWebsiteCheckboxEnable(showExistingUrl);
+    if (result.success) {
+      if (beforeData.showWebsite !== contactChanges.showWebsite) {
+        handleOptWebsiteCheckboxEnable(showExistingUrl);
+      }
+      // Sync Personal Details opt-in from saved member.
+      _$w('#optWebsiteCheckbox').checked = itemMemberObj.showWixUrl;
+      toggleFreeWebsiteText(itemMemberObj.showWixUrl);
     }
     formHasUnsavedChanges[FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING.section] = false;
     handleSaveDataFeedback(_$w('#contactMessage'), result.message);