@evershop/evershop 1.0.0 → 1.1.0

package/src/lib/util/filterOperationMapp.js

@@ -0,0 +1,16 @@
+// Map the operation to the SQL operation
+const OPERATION_MAP = {
+  eq: '=',
+  neq: '<>',
+  gt: '>',
+  gteq: '>=',
+  lt: '<',
+  lteq: '<=',
+  like: 'ILIKE',
+  nlike: 'NOT ILIKE',
+  in: 'IN',
+  nin: 'NOT IN'
+};
+
+module.exports = exports;
+exports.OPERATION_MAP = OPERATION_MAP;

package/src/lib/util/registry.js

@@ -10,7 +10,8 @@ class Registry {
       // If the initValue and the context are identical, return the cached value. Skip the processors
       if (
         isEqual(initValue, this.values[name].initValue) &&
-        isEqual(this.values[name].context, context)
+        isEqual(this.values[name].context, context) &&
+        Object.prototype.hasOwnProperty.call(this.values[name], 'value')
       ) {
         return this.values[name].value;
       }
@@ -65,7 +66,8 @@ class Registry {
       // If the initValue and the context are identical, return the cached value. Skip the processors
       if (
         isEqual(initValue, this.values[name].initValue) &&
-        isEqual(this.values[name].context, context)
+        isEqual(this.values[name].context, context) &&
+        Object.prototype.hasOwnProperty.call(this.values[name], 'value')
       ) {
         return this.values[name].value;
       }
@@ -167,22 +169,52 @@ const registry = new Registry();
 module.exports = {
   /**
    * @param {String} name
-   * @param {any} initValue
+   * @param {any} initialization
    * @param {Object} context
    * @param {Function} validator
    */
-  async getValue(name, initValue, context, validator) {
+  async getValue(name, initialization, context, validator) {
+    let initValue;
+    // Check if the initValue is a function, then add this function to the processors as the first processor
+    if (typeof initialization === 'function') {
+      // Add this function to the processors, add this to the biginning of the processors
+      const processors = this.values[name] ? this.values[name].processors : [];
+      processors.unshift({
+        callback: initialization,
+        priority: 0
+      });
+      this.values[name] = this.values[name] || {};
+      this.values[name].processors = processors;
+    } else {
+      initValue = initialization;
+    }
     const val = await registry.get(name, initValue, context, validator);
     return val;
   },
 
   /**
    * @param {String} name
-   * @param {any} initValue
+   * @param {any} initialization
    * @param {Object} context
    * @param {Function} validator
    */
-  getValueSync(name, initValue, context, validator) {
+  getValueSync(name, initialization, context, validator) {
+    let initValue;
+    // Check if the initValue is a function, then add this function to the processors as the first processor
+    if (typeof initialization === 'function') {
+      // Add this function to the processors, add this to the biginning of the processors
+      const processors = registry.values[name]
+        ? registry.values[name]?.processors
+        : [];
+      processors.unshift({
+        callback: initialization,
+        priority: 0
+      });
+      registry.values[name] = registry.values[name] || {};
+      registry.values[name].processors = processors;
+    } else {
+      initValue = initialization;
+    }
     const val = registry.getSync(name, initValue, context, validator);
     return val;
   },
@@ -200,6 +232,12 @@ module.exports = {
   },
 
   lockRegistry() {
+    // Reset the values cache by removing all values from all properties in the registry values
+    Object.keys(registry.values).forEach((key) => {
+      if (Object.prototype.hasOwnProperty.call(registry.values, key)) {
+        delete registry.values[key].value;
+      }
+    });
     locked = true;
   }
 };

package/src/lib/webpack/dev/createConfigClient.js

@@ -97,5 +97,7 @@ module.exports.createConfigClient = function createConfigClient(route) {
     poll: 1000
   };
 
+  // Enable source maps
+  config.devtool = 'eval-cheap-module-source-map';
   return config;
 };

package/src/lib/webpack/loaders/AreaLoader.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const { inspect } = require('util');
 const JSON5 = require('json5');
 const { CONSTANTS } = require('../../helpers');
-const { error } = require('../../log/debuger');
+const { error } = require('../../log/logger');
 
 /* eslint-disable no-multi-assign */
 /* eslint-disable global-require */

package/src/lib/webpack/loaders/loadTranslationFromCsv.js

@@ -3,7 +3,7 @@ const path = require('path');
 const { getConfig } = require('../../util/getConfig');
 const { CONSTANTS } = require('../../helpers');
 const { readCsvFile } = require('../../util/readCsvFile');
-const { error } = require('../../log/debuger');
+const { error } = require('../../log/logger');
 
 module.exports.loadCsvTranslationFiles =
   async function loadCsvTranslationFiles() {

package/src/lib/webpack/plugins/Tailwindcss.js

@@ -7,7 +7,7 @@ const autoprefixer = require('autoprefixer');
 const CleanCSS = require('clean-css');
 const { Compilation, sources } = require('webpack');
 const { getTailwindConfig } = require('../util/getTailwindConfig');
-const { error } = require('../../log/debuger');
+const { error } = require('../../log/logger');
 
 // eslint-disable-next-line no-multi-assign
 module.exports = exports = {};

package/src/modules/auth/graphql/types/AdminUser/AdminUser.admin.resolvers.js

@@ -21,7 +21,7 @@ module.exports = {
           query.andWhere('admin_user.full_name', 'LIKE', `%${filter.value}%`);
           currentFilters.push({
             key: 'full_name',
-            operation: '=',
+            operation: 'eq',
             value: filter.value
           });
         }
@@ -29,7 +29,7 @@ module.exports = {
           query.andWhere('admin_user.status', '=', filter.value);
           currentFilters.push({
             key: 'status',
-            operation: '=',
+            operation: 'eq',
             value: filter.value
           });
         }
@@ -43,7 +43,7 @@ module.exports = {
         query.orderBy('admin_user.full_name', sortOrder.value);
         currentFilters.push({
           key: 'sortBy',
-          operation: '=',
+          operation: 'eq',
           value: sortBy.value
         });
       } else {
@@ -53,7 +53,7 @@ module.exports = {
       if (sortOrder.key) {
         currentFilters.push({
           key: 'sortOrder',
-          operation: '=',
+          operation: 'eq',
           value: sortOrder.value
         });
       }
@@ -68,12 +68,12 @@ module.exports = {
       }; // TODO: Get from the config
       currentFilters.push({
         key: 'page',
-        operation: '=',
+        operation: 'eq',
         value: page.value
       });
       currentFilters.push({
         key: 'limit',
-        operation: '=',
+        operation: 'eq',
         value: limit.value
       });
       query.limit(

package/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx

@@ -3,7 +3,6 @@ import React from 'react';
 import { Field } from '@components/common/form/Field';
 import { Form } from '@components/common/form/Form';
 import './LoginForm.scss';
-import Button from '@components/common/form/Button';
 
 export default function LoginForm({ authUrl, dashboardUrl }) {
   const [error, setError] = React.useState(null);
@@ -33,7 +32,7 @@ export default function LoginForm({ authUrl, dashboardUrl }) {
         id="adminLoginForm"
         isJSON
         onSuccess={onSuccess}
-        submitBtn={false}
+        btnText="SIGN IN"
       >
         <Field
           name="email"
@@ -49,19 +48,6 @@ export default function LoginForm({ authUrl, dashboardUrl }) {
           placeholder="Password"
           validationRules={['notEmpty']}
         />
-        <div className="form-submit-button flex border-t border-divider mt-1 pt-1">
-          <Button
-            title="Login"
-            type="submit"
-            onAction={() => {
-              document
-                .getElementById('adminLoginForm')
-                .dispatchEvent(
-                  new Event('submit', { cancelable: true, bubbles: true })
-                );
-            }}
-          />
-        </div>
       </Form>
     </div>
   );

package/src/modules/base/api/global/[apiResponse]apiErrorHandler.js

@@ -1,11 +1,11 @@
 const {
   INTERNAL_SERVER_ERROR
 } = require('@evershop/evershop/src/lib/util/httpStatus');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 // eslint-disable-next-line no-unused-vars
 module.exports = async (err, request, response, delegate, next) => {
-  debug('critical', err);
+  error(err);
   // Set this flag to make sure this middleware only be executed 1 time
   response.locals.errorHandlerTriggered = true;
   const promises = [];

package/src/modules/base/pages/global/[response]errorHandler.js

@@ -2,11 +2,11 @@ const { encode } = require('html-entities');
 const {
   INTERNAL_SERVER_ERROR
 } = require('@evershop/evershop/src/lib/util/httpStatus');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 // eslint-disable-next-line no-unused-vars
 module.exports = async (err, request, response, delegate, next) => {
-  debug('critical', err);
+  error(err);
   // Set this flag to make sure this middleware only be executed 1 time
   response.locals.errorHandlerTriggered = true;
   const promises = [];

package/src/modules/catalog/api/addProductToCategory/addProducts.js

@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
 const {
   INVALID_PAYLOAD,

package/src/modules/catalog/api/addProductToCollection/addProducts.js

@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const {
   getConnection
 } = require('@evershop/evershop/src/lib/postgres/connection');
@@ -8,11 +8,11 @@ const {
   INTERNAL_SERVER_ERROR
 } = require('@evershop/evershop/src/lib/util/httpStatus');
 const {
-  insert,
   startTransaction,
   rollback,
   commit,
-  select
+  select,
+  insertOnUpdate
 } = require('@evershop/postgres-query-builder');
 
 // eslint-disable-next-line no-unused-vars
@@ -47,27 +47,40 @@ module.exports = async (request, response, delegate, next) => {
         message: 'Product does not exists'
       });
     }
-    // Check if the product is already assigned to the collection
-    const productCollection = await select()
-      .from('product_collection')
-      .where('collection_id', '=', collection.collection_id)
-      .and('product_id', '=', product.product_id)
-      .load(connection);
-    if (productCollection) {
-      response.status(OK);
-      return response.json({
-        success: true,
-        message: 'Product is assigned to the collection'
-      });
+
+    // If the product is belong to a variant group, get all the variants and assign them to the collection
+    if (product.variant_group_id) {
+      const variants = await select()
+        .from('product')
+        .where('variant_group_id', '=', product.variant_group_id)
+        .execute(connection);
+      // Insert all the variants to the collection
+      await Promise.all(
+        variants.map(async (variant) => {
+          await insertOnUpdate('product_collection', [
+            'collection_id',
+            'product_id'
+          ])
+            .given({
+              collection_id: collection.collection_id,
+              product_id: variant.product_id
+            })
+            .execute(connection);
+        })
+      );
+    } else {
+      // Assign the product to the collection
+      await insertOnUpdate('product_collection', [
+        'collection_id',
+        'product_id'
+      ])
+        .given({
+          collection_id: collection.collection_id,
+          product_id: product.product_id
+        })
+        .execute(connection);
     }
 
-    // Assign the product to the collection
-    await insert('product_collection')
-      .given({
-        collection_id: collection.collection_id,
-        product_id: product.product_id
-      })
-      .execute(connection);
     await commit(connection);
     response.status(OK);
     return response.json({

package/src/modules/catalog/api/removeProductFromCollection/removeProducts.js

@@ -48,11 +48,26 @@ module.exports = async (request, response, delegate, next) => {
       });
     }
 
-    // Remove the product from the collection
-    await del('product_collection')
-      .where('collection_id', '=', collection.collection_id)
-      .and('product_id', '=', product.product_id)
-      .execute(connection);
+    if (product.variant_group_id) {
+      const variants = await select()
+        .from('product')
+        .where('variant_group_id', '=', product.variant_group_id)
+        .execute(connection);
+
+      await Promise.all(
+        variants.map(async (variant) => {
+          await del('product_collection')
+            .where('collection_id', '=', collection.collection_id)
+            .and('product_id', '=', variant.product_id)
+            .execute(connection);
+        })
+      );
+    } else {
+      await del('product_collection')
+        .where('collection_id', '=', collection.collection_id)
+        .and('product_id', '=', product.product_id)
+        .execute(connection);
+    }
     await commit(connection);
     response.status(OK);
     response.json({

package/src/modules/catalog/bootstrap.js

@@ -1,4 +1,12 @@
 const config = require('config');
+const { addProcessor } = require('../../lib/util/registry');
+const registerDefaultProductCollectionFilters = require('./services/registerDefaultProductCollectionFilters');
+const registerDefaultCategoryCollectionFilters = require('./services/registerDefaultCategoryCollectionFilters');
+const registerDefaultCollectionCollectionFilters = require('./services/registerDefaultCollectionCollectionFilters');
+const registerDefaultAttributeCollectionFilters = require('./services/registerDefaultAttributeCollectionFilters');
+const {
+  defaultPaginationFilters
+} = require('../../lib/util/defaultPaginationFilters');
 
 module.exports = () => {
   const catalogConfig = {
@@ -30,4 +38,59 @@ module.exports = () => {
   };
   config.util.setModuleDefaults('pricing', pricingConfig);
   // Getting config value like this: config.get('catalog.product.image.thumbnail.width');
+
+  // Reigtering the default filters for product collection
+  addProcessor(
+    'productCollectionFilters',
+    registerDefaultProductCollectionFilters,
+    1
+  );
+  addProcessor(
+    'productCollectionFilters',
+    (filters) => [...filters, ...defaultPaginationFilters],
+    2
+  );
+
+  // Reigtering the default filters for category collection
+  addProcessor(
+    'categoryCollectionFilters',
+    registerDefaultCategoryCollectionFilters,
+    1
+  );
+  addProcessor(
+    'categoryCollectionFilters',
+    (filters) => [...filters, ...defaultPaginationFilters],
+    2
+  );
+
+  // Reigtering the default filters for collection collection
+  addProcessor(
+    'collectionCollectionFilters',
+    registerDefaultCollectionCollectionFilters,
+    1
+  );
+  addProcessor(
+    'collectionCollectionFilters',
+    (filters) => [...filters, ...defaultPaginationFilters],
+    2
+  );
+
+  // Reigtering the default filters for attribute collection
+  addProcessor(
+    'attributeCollectionFilters',
+    registerDefaultAttributeCollectionFilters,
+    1
+  );
+  addProcessor(
+    'attributeCollectionFilters',
+    (filters) => [...filters, ...defaultPaginationFilters],
+    2
+  );
+
+  // Reigtering the default filters for attribute group collection
+  addProcessor(
+    'attributeGroupCollectionFilters',
+    (filters) => [...filters, ...defaultPaginationFilters],
+    1
+  );
 };

package/src/modules/catalog/graphql/types/Attribute/Attribute.admin.graphql

@@ -6,11 +6,11 @@ type AttributeGroup {
   uuid: String!
   groupName: String!
   updateApi: String!
-  attributes: [Attribute]
+  attributes: AttributeCollection
 }
 
 extend type Attribute {
-  groups: [AttributeGroup]
+  groups: AttributeGroupCollection
   editUrl: String!
   updateApi: String!
   deleteApi: String!