abmp-npm 1.1.76 → 1.1.78

package/backend/contacts-methods.js

@@ -20,7 +20,7 @@ async function updateContactInfo(contactId, updateInfoCallback, operationName) {
     const currentInfo = contact.info;
     const updatedInfo = updateInfoCallback(currentInfo);
 
-    await elevatedUpdateContact(contactId, { info: updatedInfo }, contact.revision);
+    await elevatedUpdateContact(contactId, updatedInfo, contact.revision);
   } catch (error) {
     console.error(`Error in ${operationName}:`, error);
     throw new Error(`Failed to ${operationName}: ${error.message}`);

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

@@ -5,11 +5,18 @@ const { changeWixMembersEmails } = require('./utils');
 
 /**
  * Processes and saves multiple member records in bulk
+ * @param {Object} options - The options object
+ * @param {Array} options.memberDataList - Array of member data from API
+ * @param {number} options.currentPageNumber - Current page number being processed
+ * @param {boolean} [options.addInterests=true] - Whether to add interests to the member data
  * @param {Array} memberDataList - Array of member data from API
- * @param {number} currentPageNumber - Current page number being processed
  * @returns {Promise<Object>} - Bulk save operation result with statistics
  */
-const bulkProcessAndSaveMemberData = async (memberDataList, currentPageNumber) => {
+const bulkProcessAndSaveMemberData = async ({
+  memberDataList,
+  currentPageNumber,
+  addInterests = true,
+}) => {
   if (!Array.isArray(memberDataList) || memberDataList.length === 0) {
     throw new Error('Invalid member data list provided');
   }
@@ -18,7 +25,11 @@ const bulkProcessAndSaveMemberData = async (memberDataList, currentPageNumber) =
 
   try {
     const processedMemberDataPromises = memberDataList.map(memberData =>
-      generateUpdatedMemberData(memberData, currentPageNumber)
+      generateUpdatedMemberData({
+        inputMemberData: memberData,
+        currentPageNumber,
+        addInterests,
+      })
     );
 
     const processedMemberDataList = await Promise.all(processedMemberDataPromises);

package/backend/daily-pull/consts.js

@@ -24,8 +24,19 @@ const DEFAULT_MEMBER_DISPLAY_SETTINGS = {
   showWixUrl: true,
 };
 
+const PAC_ASSOCIATIONS = {
+  ABMP: 'ABMP',
+  ASCP: 'ASCP',
+  ANP: 'ANP',
+  AHP: 'AHP',
+};
+
+const SITES_WITH_INTERESTS_TO_MIGRATE = [PAC_ASSOCIATIONS.ABMP];
+
 module.exports = {
   MEMBER_ACTIONS,
   ADDRESS_VISIBILITY_OPTIONS,
   DEFAULT_MEMBER_DISPLAY_SETTINGS,
+  PAC_ASSOCIATIONS,
+  SITES_WITH_INTERESTS_TO_MIGRATE,
 };

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

@@ -42,7 +42,7 @@ const ensureUniqueUrl = async ({ url, memberId, fullName }) => {
     excludeDropped: true,
     excludeSearchedMember: true,
     memberId,
-    queryAllMatches: true,
+    normalizeSlugForComparison: true,
   });
   if (existingMember && existingMember.url) {
     console.log(
@@ -60,11 +60,17 @@ const ensureUniqueUrl = async ({ url, memberId, fullName }) => {
 
 /**
  * Generates complete updated member data by combining existing and migration data
- * @param {Object} inputMemberData - Raw member data from API
- * @param {number} currentPageNumber - Current page number being processed
+ * @param {Object} options - The options object
+ * @param {Object} options.inputMemberData - Raw member data from API
+ * @param {string} options.addInterests - Site association of the member
+ * @param {number} options.currentPageNumber - Current page number being processed
  * @returns {Promise<Object|null>} - Complete updated member data or null if validation fails
  */
-async function generateUpdatedMemberData(inputMemberData, currentPageNumber) {
+async function generateUpdatedMemberData({
+  inputMemberData,
+  addInterests = true,
+  currentPageNumber,
+}) {
   if (!validateCoreMemberData(inputMemberData)) {
     throw new Error(
       'Invalid member data: memberid, email (valid string), and memberships (array) are required'
@@ -86,7 +92,11 @@ async function generateUpdatedMemberData(inputMemberData, currentPageNumber) {
 
   // Only enrich with migration and address data for new members
   if (!existingDbMember) {
-    enrichWithMigrationData(updatedMemberData, inputMemberData.migrationData);
+    enrichWithMigrationData({
+      memberDataToUpdate: updatedMemberData,
+      migrationData: inputMemberData.migrationData,
+      addInterests,
+    });
 
     enrichWithAddressData(
       updatedMemberData,
@@ -196,10 +206,13 @@ async function getNewMemberOnlyFields(inputMemberData, existingDbMember) {
 }
 /**
  * Enriches member data with optional migration properties
- * @param {Object} memberDataToUpdate - Member data object to enhance
+ * @param {Object} options - The options object
+ * @param {Object} options.memberDataToUpdate - Member data object to enhance
+ * @param {Object} options.migrationData - Migration data containing optional properties
+ * @param {boolean} [options.addInterests=true] - Whether to add interests to the member data
  * @param {Object} migrationData - Migration data containing optional properties
  */
-function enrichWithMigrationData(memberDataToUpdate, migrationData) {
+function enrichWithMigrationData({ memberDataToUpdate, migrationData, addInterests = true }) {
   if (!migrationData) return;
 
   memberDataToUpdate.addressInfo = migrationData.addressinfo;
@@ -209,7 +222,7 @@ function enrichWithMigrationData(memberDataToUpdate, migrationData) {
     memberDataToUpdate.showWebsite = true;
   }
 
-  if (migrationData.interests) {
+  if (addInterests && migrationData.interests) {
     memberDataToUpdate.areasOfPractices = processInterests(migrationData.interests);
   }
 }

package/backend/daily-pull/sync-to-cms-methods.js

@@ -6,6 +6,7 @@ const { TASKS_NAMES } = require('../tasks/consts');
 const { getSiteConfigs } = require('../utils');
 
 const { bulkProcessAndSaveMemberData } = require('./bulk-process-methods');
+const { SITES_WITH_INTERESTS_TO_MIGRATE } = require('./consts');
 const { isUpdatedMember, isSiteAssociatedMember } = require('./utils');
 
 async function syncMembersDataPerAction(action) {
@@ -79,6 +80,7 @@ async function synchronizeSinglePage(taskObject) {
       getSiteConfigs(CONFIG_KEYS.SITE_ASSOCIATION),
       fetchPACMembers(pageNumber, action),
     ]);
+    const addInterests = SITES_WITH_INTERESTS_TO_MIGRATE.includes(siteAssociation);
     if (
       !memberDataResponse ||
       !memberDataResponse.results ||
@@ -98,7 +100,11 @@ async function synchronizeSinglePage(taskObject) {
         message: `No to be updated, or members of association: '${siteAssociation}' found`,
       };
     }
-    const result = await bulkProcessAndSaveMemberData(toSyncMembers, pageNumber);
+    const result = await bulkProcessAndSaveMemberData({
+      memberDataList: toSyncMembers,
+      currentPageNumber: pageNumber,
+      addInterests,
+    });
 
     return {
       success: true,

package/backend/elevated-modules.js

@@ -11,7 +11,8 @@ const wixData = {
   remove: auth.elevate(items.remove),
   get: auth.elevate(items.get),
   truncate: auth.elevate(items.truncate),
+  bulkSave: auth.elevate(items.bulkSave),
+  search: auth.elevate(items.search),
   //TODO: add other methods here as needed
 };
-
 module.exports = { wixData };

package/backend/jobs.js

@@ -1,6 +1,7 @@
 const { taskManager } = require('psdev-task-manager');
 
-const { TASKS, TASKS_NAMES } = require('./tasks/consts');
+const { TASKS_NAMES } = require('./tasks/consts');
+const { TASKS } = require('./tasks/tasks-configs');
 
 async function runScheduledTasks() {
   try {

package/backend/members-data-methods.js

@@ -10,6 +10,7 @@ const {
   normalizeUrlForComparison,
   queryAllItems,
   generateGeoHash,
+  searchAllItems,
 } = require('./utils');
 
 /**
@@ -108,7 +109,7 @@ async function findMemberById(memberId) {
  * @param {boolean} options.excludeDropped - Whether to exclude dropped members (default: true)
  * @param {boolean} options.excludeSearchedMember - Whether to exclude a specific member (default: false)
  * @param {string|number} [options.memberId] - Member ID to exclude when excludeSearchedMember is true (optional)
- * @param {boolean} [options.queryAllMatches=false] - Whether to query all matches or just the first one (default: false)
+ * @param {boolean} [options.normalizeSlugForComparison=false] - Whether to normalize the slug for comparison (default: false)
  * @returns {Promise<Object|null>} - Member data or null if not found
  */
 async function getMemberBySlug({
@@ -116,12 +117,12 @@ async function getMemberBySlug({
   excludeDropped = true,
   excludeSearchedMember = false,
   memberId = null,
-  queryAllMatches = false,
+  normalizeSlugForComparison = false,
 }) {
   if (!slug) return null;
 
   try {
-    let query = wixData.query(COLLECTIONS.MEMBERS_DATA).contains('url', slug);
+    let query = wixData.search(COLLECTIONS.MEMBERS_DATA).expression(slug);
 
     if (excludeDropped) {
       query = query.ne('action', 'drop');
@@ -130,17 +131,13 @@ async function getMemberBySlug({
     if (excludeSearchedMember && memberId) {
       query = query.ne('memberId', memberId);
     }
-    let membersList;
-    if (queryAllMatches) {
-      query = query.limit(1000);
-      membersList = await queryAllItems(query);
-    } else {
-      membersList = await query.find().then(res => res.items);
-    }
+    query = query.limit(1000);
+    const searchResult = await searchAllItems(query);
+    const membersList = searchResult.items.filter(item => item.url && item.url.includes(slug)); //replacement for contains
     let matchingMembers = membersList.filter(
       item => item.url && item.url.toLowerCase() === slug.toLowerCase()
     );
-    if (queryAllMatches) {
+    if (normalizeSlugForComparison) {
       matchingMembers = membersList
         .filter(
           //remove trailing "-1", "-2", etc.
@@ -152,7 +149,7 @@ async function getMemberBySlug({
       const queryResultMsg = `Multiple members found with same slug ${slug} membersIds are : [${matchingMembers
         .map(member => member.memberId)
         .join(', ')}]`;
-      if (!queryAllMatches) {
+      if (!normalizeSlugForComparison) {
         throw new Error(queryResultMsg);
       } else {
         console.log(queryResultMsg);

package/backend/utils.js

@@ -107,18 +107,28 @@ function getAddressesByStatus(addresses = [], addressDisplayOption = []) {
     })
     .filter(Boolean);
 }
-const queryAllItems = async query => {
-  console.log('start query');
-  let oldResults = await query.find();
+const getAllItems = async querySearchResult => {
+  let oldResults = querySearchResult;
   console.log(`found items: ${oldResults.items.length}`);
   const allItems = oldResults.items;
   while (oldResults.hasNext()) {
     oldResults = await oldResults.next();
     allItems.push(...oldResults.items);
   }
-  console.log(`all items: ${allItems.length}`);
+  console.log(`all items count : ${allItems.length}`);
   return allItems;
 };
+const searchAllItems = async searchQuery => {
+  console.log('start search');
+  const searchResults = await searchQuery.run();
+  return getAllItems(searchResults);
+};
+
+const queryAllItems = async query => {
+  console.log('start query');
+  const queryResults = await query.find();
+  return getAllItems(queryResults);
+};
 /**
  * Chunks large arrays into smaller chunks for processing
  * @param {Array} array - Array to chunk
@@ -206,4 +216,5 @@ module.exports = {
   formatDateOnly,
   getAddressesByStatus,
   isPAC_STAFF,
+  searchAllItems,
 };

package/package.json

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

package/pages/SaveAlerts.js

@@ -0,0 +1,13 @@
+const { lightbox } = require('@wix/site-window');
+
+async function saveAlertsOnReady({ $w: _$w }) {
+  const receivedData = await lightbox.getContext();
+  _$w('#closeButton').onClick(() => lightbox.close());
+  _$w('#cancelButton').onClick(() => lightbox.close());
+  _$w('#leaveButton').link = receivedData?.membersExternalPortalUrl;
+  _$w('#leaveButton').target = '_blank';
+}
+
+module.exports = {
+  saveAlertsOnReady,
+};

package/pages/SelectBannerImages.js

@@ -0,0 +1,46 @@
+const { lightbox } = require('@wix/site-window');
+
+function selectBannerImagesOnReady({ $w: _$w }) {
+  _$w('#imageDataset').onReady(async () => {
+    const numOfItems = _$w('#imageDataset').getTotalCount();
+    const result = await _$w('#imageDataset').getItems(0, numOfItems);
+    const items = result.items;
+    console.log('Loaded items from dataset:', items);
+
+    _$w('#bannerImagesRepeater').data = items;
+  });
+
+  _$w('#bannerImagesRepeater').onItemReady(($item, itemData, index) => {
+    $item('#bannerImage').src = itemData.image; // image field
+    $item('#bannerSelected').checked = false;
+
+    // Only one checkbox can be selected
+    $item('#bannerSelected').onChange(() => {
+      if ($item('#bannerSelected').checked) {
+        _$w('#bannerImagesRepeater').forEachItem(($otherItem, _, otherIndex) => {
+          if (otherIndex !== index) {
+            $otherItem('#bannerSelected').checked = false;
+          }
+        });
+      }
+    });
+  });
+
+  _$w('#uploadSelectedImages').onClick(() => {
+    let selectedImage = null;
+
+    _$w('#bannerImagesRepeater').forEachItem(($item, itemData) => {
+      if ($item('#bannerSelected').checked) {
+        selectedImage = {
+          image: itemData.image,
+          title: itemData.title,
+        };
+      }
+    });
+    lightbox.close(selectedImage);
+  });
+}
+
+module.exports = {
+  selectBannerImagesOnReady,
+};

package/pages/deleteConfirm.js

@@ -0,0 +1,19 @@
+const { lightbox } = require('@wix/site-window');
+
+function deleteConfirmOnReady({ $w: _$w }) {
+  _$w('#delete').onClick(() => {
+    lightbox.close({
+      toDelete: true,
+    });
+  });
+
+  _$w('#cancel').onClick(() => {
+    lightbox.close({
+      toDelete: false,
+    });
+  });
+}
+
+module.exports = {
+  deleteConfirmOnReady,
+};

package/pages/index.js

@@ -5,4 +5,7 @@ module.exports = {
   ...require('./personalDetails.js'),
   ...require('./QAPage.js'),
   ...require('./LoadingPage.js'),
+  ...require('./SelectBannerImages.js'),
+  ...require('./deleteConfirm.js'),
+  ...require('./SaveAlerts.js'),
 };

package/public/Utils/homePage.js

@@ -127,6 +127,8 @@ const createHomepageUtils = (_$w, filterProfiles) => {
 
     paginateSearchResults(searchResults, pagination);
     await updateUrlParams(filter, pagination);
+
+    _$w('#resultsStateBox').scrollTo();
   }
 
   async function onChangeMultiCheckbox({