abmp-npm 1.1.76 → 1.1.77

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(

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.77",
   "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'),
 };