abmp-npm 1.7.3 → 1.8.1

package/.husky/pre-commit

@@ -0,0 +1,22 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+echo "Running ESLint check..."
+npm run lint
+
+if [ $? -ne 0 ]; then
+  echo "❌ ESLint check failed. Please fix the linting errors before committing."
+  exit 1
+fi
+
+echo "Running Prettier check..."
+npm run format:check
+
+if [ $? -ne 0 ]; then
+  echo "❌ Prettier check failed. Please format your code before committing."
+  echo "Run 'npm run format' to automatically format your files."
+  exit 1
+fi
+
+echo "✅ All checks passed!"
+

package/.prettierignore

@@ -0,0 +1,7 @@
+node_modules
+dist
+build
+coverage
+*.min.js
+package-lock.json
+

package/.prettierrc.json

@@ -0,0 +1,16 @@
+{
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "tabWidth": 2,
+  "semi": true,
+  "bracketSpacing": true,
+  "bracketSameLine": false,
+  "arrowParens": "avoid",
+  "endOfLine": "lf",
+  "quoteProps": "as-needed",
+  "jsxSingleQuote": false,
+  "requirePragma": false,
+  "insertPragma": false,
+  "proseWrap": "preserve"
+}

package/backend/automations-methods.js

@@ -0,0 +1,13 @@
+const { customTrigger } = require('@wix/automations');
+const { auth } = require('@wix/essentials');
+const triggerMethod = auth.elevate(customTrigger.runTrigger);
+
+const triggerAutomation = async (triggerId, payload) =>
+  await triggerMethod({
+    triggerId,
+    payload,
+  });
+
+module.exports = {
+  triggerAutomation,
+};

package/backend/consts.js

@@ -1,52 +1,13 @@
 /**
- * Default display settings for member profiles
+ * Valid configuration keys for getSiteConfigs function
+ * @readonly
+ * @enum {string}
  */
-const DEFAULT_MEMBER_DISPLAY_SETTINGS = {
-    showLicenseNo: true,
-    showName: true,
-    showBookingUrl: false,
-    showWebsite: false,
-    showWixUrl: true,
-  };
-  
-  /**
-   * Address display status types
-   */
-  const ADDRESS_STATUS_TYPES = {
-    FULL_ADDRESS: 'full_address',
-    STATE_CITY_ZIP: 'state_city_zip',
-    DONT_SHOW: 'dont_show',
-  };
-  
-  /**
-   * Address visibility configuration options
-   */
-  const ADDRESS_VISIBILITY_OPTIONS = {
-    ALL: 'all',
-    NONE: 'none',
-  };
-
-  const COLLECTIONS = {
-    MEMBERS_DATA: 'MembersDataLatest',
-  };
-  
-  
+const CONFIG_KEYS = {
+  AUTOMATION_EMAIL_TRIGGER_ID: 'AUTOMATION_EMAIL_TRIGGER_ID',
+  SITE_ASSOCIATION: 'SITE_ASSOCIATION',
+};
 
-   const MEMBER_ACTIONS = {
-    UPDATE: 'update',
-    NEW: 'new',
-    DROP: 'drop',
-    NONE: 'none'
+module.exports = {
+  CONFIG_KEYS,
 };
-  
-  const PRECISION = 3;
-  
-  module.exports = {
-    DEFAULT_MEMBER_DISPLAY_SETTINGS,
-    ADDRESS_STATUS_TYPES,
-    ADDRESS_VISIBILITY_OPTIONS,
-    PRECISION,
-    COLLECTIONS,
-    MEMBER_ACTIONS,
-  };
-  

package/backend/elevated-modules.js

@@ -0,0 +1,16 @@
+const { items } = require('@wix/data');
+const { auth } = require('@wix/essentials');
+
+// @wix/data does not support suppressAuth currently, so we need to elevate it
+const wixData = {
+  insert: auth.elevate(items.insert),
+  update: auth.elevate(items.update),
+  bulkInsert: auth.elevate(items.bulkInsert),
+  query: auth.elevate(items.query),
+  save: auth.elevate(items.save),
+  remove: auth.elevate(items.remove),
+  get: auth.elevate(items.get),
+  //TODO: add other methods here as needed
+};
+
+module.exports = { wixData };

package/backend/forms-methods.js

@@ -0,0 +1,52 @@
+const { COLLECTIONS } = require('../public');
+
+const { triggerAutomation } = require('./automations-methods');
+const { CONFIG_KEYS } = require('./consts');
+const { wixData } = require('./elevated-modules');
+const { findMemberByWixDataId, createContactAndMemberIfNew } = require('./members-data-methods');
+const { getSiteConfigs } = require('./utils');
+
+const contactSubmission = async (data, memberDataId) => {
+  const { firstName, lastName, email, phone, message } = data;
+  const [memberData, automationEmailTriggerId] = await Promise.all([
+    findMemberByWixDataId(memberDataId),
+    getSiteConfigs(CONFIG_KEYS.AUTOMATION_EMAIL_TRIGGER_ID),
+  ]);
+  if (!memberData.showContactForm) {
+    console.log('Member contact form is not enabled for user, skipping contact submission!');
+    return;
+  }
+  let memberContactId = memberData.contactId;
+  if (!memberContactId) {
+    /**
+     * Create a member contact here since some members may have never logged in
+     * and therefore don’t have a contact ID. However, these members can still
+     * appear in the directory, and site visitors can reach out to them if they’ve
+     * enabled their contact form. To handle this, we ensure a contact is created for
+     * them during this flow if it doesn’t already exist.
+     */
+    console.info('Member contact id not found for user, creating new contact!');
+    const member = await createContactAndMemberIfNew(memberData);
+    memberContactId = member.contactId;
+  }
+  console.log('memberContactId', memberContactId);
+  const emailTriggered = await triggerAutomation(automationEmailTriggerId, {
+    contactId: memberContactId,
+    name: `${firstName} ${lastName}`,
+    email: email,
+    phone: phone,
+    message: message,
+  });
+  data = {
+    ...data,
+    phone: Number(data.phone),
+    memberContactId: memberContactId,
+    memberEmail: memberData.contactFormEmail,
+  };
+  await wixData.insert(COLLECTIONS.CONTACT_US_SUBMISSIONS, data);
+  return emailTriggered;
+};
+
+module.exports = {
+  contactSubmission,
+};

package/backend/index.js

@@ -1,6 +1,3 @@
 module.exports = {
-    ...require('./consts'),
-    ...require('./utils'),
-    ...require('./updateMemberData'),
-  };
-  
+  ...require('./forms-methods'),
+};

package/backend/members-area-methods.js

@@ -0,0 +1,36 @@
+const { auth } = require('@wix/essentials');
+const { members } = require('@wix/members');
+const elevatedCreateMember = auth.elevate(members.createMember);
+
+function prepareContactData(partner) {
+  const phones = Array.isArray(partner.phones) ? partner.phones : []; //some users don't have phones
+  const options = {
+    member: {
+      contact: {
+        ...partner,
+        phones,
+        emails: [partner.contactFormEmail || partner.email],
+      },
+      loginEmail: partner.email,
+    },
+  };
+  return options;
+}
+async function createMemberFunction(member) {
+  const newMember = await elevatedCreateMember(member);
+  return newMember._id;
+}
+const createSiteMember = async memberDetails => {
+  try {
+    const options = prepareContactData(memberDetails);
+    const contactId = await createMemberFunction(options);
+    return contactId;
+  } catch (error) {
+    console.error(`Error in createSiteMember ${error.message}`);
+    throw error;
+  }
+};
+
+module.exports = {
+  createSiteMember,
+};

package/backend/members-data-methods.js

@@ -0,0 +1,55 @@
+const { COLLECTIONS } = require('../public');
+
+const { wixData } = require('./elevated-modules');
+const { createSiteMember } = require('./members-area-methods');
+
+/**
+ * Retrieves member data by member ID
+ * @param {string} memberId - The member ID to search for
+ * @returns {Promise<Object|null>} - Member data or null if not found
+ */
+async function findMemberByWixDataId(memberId) {
+  if (!memberId) {
+    throw new Error('Member ID is required');
+  }
+  try {
+    const member = await wixData.get(COLLECTIONS.MEMBERS_DATA, memberId);
+    return member;
+  } catch (error) {
+    throw new Error(`Failed to retrieve member data: ${error.message}`);
+  }
+}
+
+async function createContactAndMemberIfNew(memberData) {
+  if (!memberData) {
+    throw new Error('Member data is required');
+  }
+  try {
+    const toCreateMemberData = {
+      firstName: memberData.firstName,
+      lastName: memberData.lastName,
+      email: memberData.email,
+      phones: memberData.phones,
+      contactFormEmail: memberData.contactFormEmail || memberData.email,
+    };
+    const contactId = await createSiteMember(toCreateMemberData);
+    let memberDataWithContactId = {
+      ...memberData,
+      contactId,
+    };
+    const updatedResult = await wixData.update(COLLECTIONS.MEMBERS_DATA, memberDataWithContactId);
+    memberDataWithContactId = {
+      ...memberDataWithContactId,
+      ...updatedResult,
+    };
+    return memberDataWithContactId;
+  } catch (error) {
+    console.error('Error creating contact and member if new:', error);
+    throw new Error(`Failed to create contact and member if new: ${error.message}`);
+  }
+}
+
+module.exports = {
+  findMemberByWixDataId,
+  createContactAndMemberIfNew,
+};

package/backend/utils.js

@@ -1,134 +1,34 @@
-const {
-    ADDRESS_STATUS_TYPES,
-    ADDRESS_VISIBILITY_OPTIONS,
-    COLLECTIONS,
-  } = require('./consts.js');
-  
-  /**
-   * Safely adds optional properties from source to target object
-   * @param {Object} targetObject - Object to add properties to
-   * @param {Object} sourceObject - Object to get properties from
-   * @param {string} sourcePropertyKey - Key to get from source
-   * @param {string} targetPropertyKey - Key to set on target (defaults to sourcePropertyKey)
-   */
-  const addOptionalProperty = (
-    targetObject,
-    sourceObject,
-    sourcePropertyKey,
-    targetPropertyKey = sourcePropertyKey
-  ) => {
-    if (sourceObject && sourceObject[sourcePropertyKey]) {
-      targetObject[targetPropertyKey] = sourceObject[sourcePropertyKey];
-    }
-  };
-  
-  /**
-   * Safely trims a string value with fallback
-   * @param {string} value - The string to trim
-   * @param {string} fallback - Fallback value if input is invalid
-   * @returns {string} - The trimmed string or fallback
-   */
-  const safeTrim = (value, fallback = '') => {
-    return value ? value.toString().trim() : fallback;
-  };
-  
-  /**
-   * Determines address display status based on visibility settings
-   * @param {string} visibilityValue - The address visibility value from migration data
-   * @returns {string} - The corresponding address status
-   */
-  const determineAddressDisplayStatus = (visibilityValue) => {
-    if (!visibilityValue) {
-      return ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
-    }
-  
-    const normalizedValue = visibilityValue.trim().toLowerCase();
-  
-    switch (normalizedValue) {
-      case ADDRESS_VISIBILITY_OPTIONS.ALL:
-        return ADDRESS_STATUS_TYPES.FULL_ADDRESS;
-      case ADDRESS_VISIBILITY_OPTIONS.NONE:
-        return ADDRESS_STATUS_TYPES.DONT_SHOW;
-      default:
-        return ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
-    }
-  };
-  
-  /**
-   * Validates if input is a non-empty array
-   * @param {*} input - Input to validate
-   * @returns {boolean} - True if input is a non-empty array
-   */
-  const isValidArray = (input) => {
-    return Array.isArray(input) && input.length > 0;
-  };
-  
-  /**
-   * Processes interests string into clean array
-   * @param {string} interestsString - Comma-separated interests string
-   * @returns {Array} - Array of trimmed, non-empty interests
-   */
-  const processInterests = (interestsString) => {
-    if (!interestsString) return [];
-  
-    return interestsString
-      .split(',')
-      .map((interest) => interest.trim())
-      .filter((interest) => interest.length > 0);
-  };
-  
-  /**
-   * Creates a full name from first and last name components
-   * @param {string} firstName - First name
-   * @param {string} lastName - Last name
-   * @returns {string} - Combined full name
-   */
-  const createFullName = (firstName, lastName) => {
-    const trimmedFirst = firstName?.trim() || '';
-    const trimmedLast = lastName?.trim() || '';
-    return `${trimmedFirst} ${trimmedLast}`.trim();
-  };
+const { COLLECTIONS } = require('../public/consts');
 
-  function generateGeoHash(addresses) {
-    const geohash = addresses
-      ?.filter((address) =>
-        isNaN(address?.latitude) && isNaN(address?.longitude) ? false : address
-      )
-      ?.map((address) =>
-        ngeohash.encode(address.latitude, address.longitude, PRECISION)
-      );
-    return geohash && geohash.length > 0 ? geohash : [];
-  }
+const { CONFIG_KEYS } = require('./consts');
+const { wixData } = require('./elevated-modules');
 
-  /**
- * Retrieves member data by member ID
- * @param {string} memberId - The member ID to search for
- * @returns {Promise<Object|null>} - Member data or null if not found
+/**
+ * Retrieves site configuration values from the database
+ * @param {string} [configKey] - The configuration key to retrieve. Must be one of:
+ *   - 'AUTOMATION_EMAIL_TRIGGER_ID' - Email template ID for triggered emails
+ *   - 'SITE_ASSOCIATION' - Site association configuration
+ * @returns {Promise<any>} The configuration value for the specified key, or all configs if no key provided
+ * @example
+ * // Get specific config
+ * const emailTemplateId = await getSiteConfigs('AUTOMATION_EMAIL_TRIGGER_ID');
+ *
+ * // Get all configs
+ * const allConfigs = await getSiteConfigs();
  */
-const findMemberById = async (memberId) => {
-    if (!memberId) {
-        throw new Error('Member ID is required');
-    }
+const getSiteConfigs = async configKey => {
+  if (configKey && !Object.values(CONFIG_KEYS).includes(configKey)) {
+    throw new Error(
+      `Invalid configKey: ${configKey}. Must be one of: ${Object.values(CONFIG_KEYS).join(', ')}`
+    );
+  }
+  const siteConfigs = await wixData.get(COLLECTIONS.SITE_CONFIGS, 'SINGLE_ITEM_ID');
+  if (configKey) {
+    return siteConfigs[configKey];
+  }
+  return siteConfigs;
+};
 
-    try {
-        const queryResult = await wixData.query(COLLECTIONS.MEMBERS_DATA)
-            .eq("memberId", memberId)
-            .find({ suppressAuth: true });
-        
-        return queryResult.items.length > 0 ? queryResult.items[0] : null;
-    } catch (error) {
-        throw new Error(`Failed to retrieve member data: ${error.message}`);
-    }
-}
-  
-  module.exports = {
-    addOptionalProperty,
-    safeTrim,
-    determineAddressDisplayStatus,
-    isValidArray,
-    processInterests,
-    createFullName,
-    generateGeoHash,
-    findMemberById,
-  };
-  
+module.exports = {
+  getSiteConfigs,
+};

package/eslint.config.js

@@ -0,0 +1,113 @@
+const js = require('@eslint/js');
+const prettierConfig = require('eslint-config-prettier');
+const importPlugin = require('eslint-plugin-import');
+const prettier = require('eslint-plugin-prettier');
+const promisePlugin = require('eslint-plugin-promise');
+const globals = require('globals');
+
+module.exports = [
+  // Recommended base configurations
+  js.configs.recommended,
+  prettierConfig,
+
+  // Main configuration
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      ecmaVersion: 2021,
+      sourceType: 'commonjs',
+      globals: {
+        ...globals.node,
+        ...globals.es2021,
+        ...globals.jest,
+      },
+    },
+    plugins: {
+      prettier,
+      import: importPlugin,
+      promise: promisePlugin,
+    },
+    rules: {
+      // Error prevention
+      'no-var': 'error',
+      'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+      'no-console': ['warn', { allow: ['warn', 'error', 'log', 'info'] }],
+      'no-debugger': 'warn',
+      'no-duplicate-imports': 'error',
+      'no-unused-expressions': ['error', { allowShortCircuit: true, allowTernary: true }],
+      'no-use-before-define': ['error', { functions: false }],
+
+      // Best practices
+      'prefer-const': 'error',
+      'no-const-assign': 'error',
+      'prefer-arrow-callback': 'error',
+      'arrow-body-style': ['error', 'as-needed'],
+      'no-return-await': 'off',
+      'require-await': 'warn',
+
+      // Import rules
+      'import/order': [
+        'error',
+        {
+          groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
+          'newlines-between': 'always',
+          alphabetize: { order: 'asc', caseInsensitive: true },
+        },
+      ],
+      'import/no-unresolved': 'error',
+      'import/no-duplicates': 'error',
+      'import/no-commonjs': 'off',
+      'import/no-dynamic-require': 'off',
+
+      // Promise rules
+      'promise/always-return': 'off',
+      'promise/no-return-wrap': 'error',
+      'promise/param-names': 'error',
+      'promise/catch-or-return': 'error',
+      'promise/no-native': 'off',
+      'promise/no-callback-in-promise': 'warn',
+      'promise/no-promise-in-callback': 'warn',
+      'promise/no-nesting': 'warn',
+
+      // Prettier rules
+      'prettier/prettier': [
+        'error',
+        {
+          singleQuote: true,
+          trailingComma: 'es5',
+          printWidth: 100,
+          tabWidth: 2,
+          semi: true,
+          bracketSpacing: true,
+          arrowParens: 'avoid',
+          endOfLine: 'lf',
+        },
+      ],
+    },
+    settings: {
+      'import/resolver': {
+        node: {
+          extensions: ['.js', '.jsx', '.ts', '.tsx'],
+        },
+      },
+    },
+  },
+
+  // Test files override
+  {
+    files: ['**/*.test.js', '**/*.spec.js'],
+    languageOptions: {
+      globals: {
+        ...globals.jest,
+      },
+    },
+    rules: {
+      'no-console': 'off',
+    },
+  },
+
+  // Ignore patterns
+  {
+    ignores: ['node_modules/**', 'dist/**', 'build/**', 'coverage/**', '*.min.js'],
+  },
+];

package/index.js

@@ -1,5 +1,5 @@
 module.exports = {
-  ...require('./public'),
   ...require('./pages'),
   ...require('./backend'),
+  ...require('./public'),
 };

package/package.json

@@ -1,11 +1,36 @@
 {
   "name": "abmp-npm",
-  "version": "1.7.3",
+  "version": "1.8.1",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "format": "prettier --write \"**/*.{js,json,md}\"",
+    "format:check": "prettier --check \"**/*.{js,json,md}\"",
+    "prepare": "husky"
   },
   "author": "",
   "license": "ISC",
-  "description": ""
+  "description": "",
+  "devDependencies": {
+    "@eslint/js": "^9.12.0",
+    "eslint": "^9.12.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-promise": "^7.1.0",
+    "globals": "^15.10.0",
+    "husky": "^9.1.6",
+    "prettier": "^3.3.3"
+  },
+  "dependencies": {
+    "@wix/automations": "^1.0.261",
+    "@wix/crm": "^1.0.1061",
+    "@wix/data": "^1.0.303",
+    "@wix/essentials": "^0.1.28",
+    "@wix/members": "^1.0.330",
+    "@wix/site-window": "^1.44.0",
+    "phone": "^3.1.67"
+  }
 }