@evershop/evershop 1.2.0 → 1.2.1

package/bin/lib/buildEntry.js

@@ -17,6 +17,9 @@ const { error } = require('@evershop/evershop/src/lib/log/logger');
 const {
   getEnabledWidgets
 } = require('@evershop/evershop/src/lib/util/getEnabledWidgets');
+const {
+  generateComponentKey
+} = require('@evershop/evershop/src/lib/webpack/util/keyGenerator');
 /**
  * Only pass the page routes, not api routes
  */
@@ -50,9 +53,9 @@ module.exports.buildEntry = async function buildEntry(
             .replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:/g, '"$2": ');
           try {
             const layout = JSON5.parse(check);
-            const id = Buffer.from(
+            const id = generateComponentKey(
               module.replace(CONSTANTS.ROOTPATH, '')
-            ).toString('base64');
+            );
             areas[layout.areaId] = areas[layout.areaId] || {};
             areas[layout.areaId][id] = {
               id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evershop/evershop",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "The React Ecommerce platform. Built with React and Postgres. Open-source and free. Fast and customizable.",
   "files": [
     "bin",

package/src/components/common/Editor.jsx

@@ -150,17 +150,19 @@ RenderEditorJS.propTypes = {
 export default function Editor({ rows }) {
   return (
     <div className="editor__html">
-      {rows.map((row) => {
+      {rows.map((row, index) => {
         const rowClasses = getRowClasses(row.size);
         return (
           <div
             className={`row__container mt-12 grid md:${rowClasses} grid-cols-1 gap-8`}
+            key={index}
           >
-            {row.columns.map((column) => {
+            {row.columns.map((column, index) => {
               const columnClasses = getColumnClasses(column.size);
               return (
                 <div
                   className={`column__container md:${columnClasses} col-span-1`}
+                  key={index}
                 >
                   {column.data?.blocks && (
                     <RenderEditorJS blocks={column.data?.blocks} />
@@ -178,10 +180,10 @@ export default function Editor({ rows }) {
 Editor.propTypes = {
   rows: PropTypes.arrayOf(
     PropTypes.shape({
-      size: PropTypes.string.isRequired,
+      size: PropTypes.number.isRequired,
       columns: PropTypes.arrayOf(
         PropTypes.shape({
-          size: PropTypes.string.isRequired,
+          size: PropTypes.number.isRequired,
           // eslint-disable-next-line react/forbid-prop-types
           data: PropTypes.object
         })

package/src/components/common/form/fields/Editor.scss

@@ -27,3 +27,7 @@ body .codex-editor {
 #rows .draggable-source--is-dragging>* {
   visibility: hidden;
 }
+
+.ce-rawtool__textarea {
+  z-index: 0;
+}

package/src/components/frontStore/checkout/cart/items/Quantity.jsx

@@ -63,7 +63,7 @@ export default function Quantity({ qty, api }) {
       >
         {isLoading && (
           <svg
-            ariaHidden="true"
+            aria-hidden="true"
             focusable="false"
             role="presentation"
             className="spinner"
@@ -83,7 +83,7 @@ export default function Quantity({ qty, api }) {
         {!isLoading && (
           <svg
             xmlns="http://www.w3.org/2000/svg"
-            ariaHidden="true"
+            aria-hidden="true"
             focusable="false"
             role="presentation"
             className="icon icon-minus"
@@ -99,7 +99,7 @@ export default function Quantity({ qty, api }) {
           </svg>
         )}
       </button>
-      <input type="text" value={quantity} />
+      <input type="text" value={quantity} readOnly />
       <button
         className="flex justify-center items-center"
         onClick={() => updateQuantity(quantity + 1)}
@@ -108,7 +108,7 @@ export default function Quantity({ qty, api }) {
       >
         {isLoading && (
           <svg
-            ariaHidden="true"
+            aria-hidden="true"
             focusable="false"
             role="presentation"
             className="spinner"
@@ -128,7 +128,7 @@ export default function Quantity({ qty, api }) {
         {!isLoading && (
           <svg
             xmlns="http://www.w3.org/2000/svg"
-            ariaHidden="true"
+            aria-hidden="true"
             focusable="false"
             role="presentation"
             className="icon icon-plus"

package/src/lib/util/getEnabledWidgets.js

@@ -1,5 +1,6 @@
 const isResolvable = require('is-resolvable');
 const { getConfig } = require('./getConfig');
+const { generateComponentKey } = require('../webpack/util/keyGenerator');
 
 module.exports = exports = {};
 
@@ -21,7 +22,12 @@ exports.getEnabledWidgets = function getEnabledWidgets() {
       );
     }
     if (configuredWidgets[widget].enabled === true) {
-      widgets.push({ ...configuredWidgets[widget], type: widget });
+      widgets.push({
+        ...configuredWidgets[widget],
+        type: widget,
+        settingComponentKey: generateComponentKey(setting_component),
+        componentKey: generateComponentKey(component)
+      });
     }
   });
   return widgets;

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

@@ -4,6 +4,7 @@ const JSON5 = require('json5');
 const { CONSTANTS } = require('../../helpers');
 const { error } = require('../../log/logger');
 const { getEnabledWidgets } = require('../../util/getEnabledWidgets');
+const { generateComponentKey } = require('../util/keyGenerator');
 
 /* eslint-disable no-multi-assign */
 /* eslint-disable global-require */
@@ -29,9 +30,7 @@ module.exports = exports = function AreaLoader(c) {
         .replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:/g, '"$2": ');
       try {
         const layout = JSON5.parse(check);
-        const id = Buffer.from(module.replace(CONSTANTS.ROOTPATH, '')).toString(
-          'base64'
-        );
+        const id = generateComponentKey(module.replace(CONSTANTS.ROOTPATH, ''));
         areas[layout.areaId] = areas[layout.areaId] || {};
         areas[layout.areaId][id] = {
           id,

package/src/lib/webpack/util/keyGenerator.js

@@ -0,0 +1,9 @@
+const crypto = require('crypto');
+
+function generateComponentKey(text) {
+  return crypto.createHash('md5').update(text).digest('hex');
+}
+
+module.exports = exports = {
+  generateComponentKey
+};

package/src/lib/webpack/util/parseGraphql.js

@@ -4,6 +4,7 @@ const JSON5 = require('json5');
 const isResolvable = require('is-resolvable');
 const { CONSTANTS } = require('../../helpers');
 const { parseGraphqlByFile } = require('./parseGraphqlByFile');
+const { generateComponentKey } = require('./keyGenerator');
 
 module.exports.parseGraphql = function parseGraphql(modules) {
   let inUsedFragments = [];
@@ -24,12 +25,12 @@ module.exports.parseGraphql = function parseGraphql(modules) {
     // If the module is resolvable, get the apsolute path
     if (!fs.existsSync(module)) {
       modulePath = require.resolve(module);
-      moduleKey = Buffer.from(module).toString('base64');
+      moduleKey = generateComponentKey(module);
     } else {
       modulePath = module;
-      moduleKey = Buffer.from(
+      moduleKey = generateComponentKey(
         modulePath.replace(CONSTANTS.ROOTPATH, '')
-      ).toString('base64');
+      );
     }
     const moduleGraphqlData = parseGraphqlByFile(modulePath);
     queries[moduleKey] = moduleGraphqlData.query.source;

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

@@ -41,6 +41,26 @@ module.exports = async (request, response, delegate, next) => {
           isApi: route.isApi,
           isAdmin: route.isAdmin
         };
+        let widgetInstances;
+        // Check if we are in the test mode
+        if (process.env.NODE_ENV === 'test') {
+          widgetInstances = [];
+        } else {
+          widgetInstances = await loadWidgetInstances(request);
+        }
+        widgetInstances = widgetInstances.map((widget) => {
+          const newWidget = {
+            sortOrder: widget.sortOrder,
+            areaId: widget.areaId,
+            type: widget.type
+          };
+          newWidget.id = `e${widget.uuid.replace(/-/g, '')}`;
+          if (route.isAdmin) {
+            newWidget.areaId = 'widget_setting_form';
+          }
+          return newWidget;
+        });
+        response.locals.widgets = widgetInstances;
         if (
           (isDevelopmentMode() &&
             request.query &&
@@ -51,30 +71,11 @@ module.exports = async (request, response, delegate, next) => {
             success: true,
             eContext: {
               graphqlResponse: get(response, 'locals.graphqlResponse', {}),
-              propsMap: get(response, 'locals.propsMap', {})
+              propsMap: get(response, 'locals.propsMap', {}),
+              widgets: widgetInstances
             }
           });
         } else {
-          let widgetInstances;
-          // Check if we are in the test mode
-          if (process.env.NODE_ENV === 'test') {
-            widgetInstances = [];
-          } else {
-            widgetInstances = await loadWidgetInstances(request);
-          }
-          widgetInstances = widgetInstances.map((widget) => {
-            const newWidget = {
-              sortOrder: widget.sortOrder,
-              areaId: widget.areaId,
-              type: widget.type
-            };
-            newWidget.id = `e${widget.uuid.replace(/-/g, '')}`;
-            if (route.isAdmin) {
-              newWidget.areaId = 'widget_setting_form';
-            }
-            return newWidget;
-          });
-          response.locals.widgets = widgetInstances;
           render(request, response);
         }
       }

package/src/modules/catalog/pages/admin/productEdit+productNew/Attributes.jsx

@@ -254,7 +254,7 @@ export const layout = {
 };
 
 export const query = `
-  query Query {
+  query Query ($filters: [FilterInput!]) {
     product(id: getContextValue("productId", null)) {
       groupId
       variantGroupId
@@ -264,7 +264,7 @@ export const query = `
         optionText
       }
     },
-    groups: attributeGroups {
+    groups: attributeGroups(filters: $filters) {
       items {
         groupId: attributeGroupId
         groupName
@@ -285,3 +285,8 @@ export const query = `
     }
   }
 `;
+
+export const variables = `
+{
+  filters: [{ key: "limit", operation: 'eq', value: 1000 }]
+}`;

package/src/modules/catalog/pages/frontStore/productView/Description.jsx

@@ -15,7 +15,18 @@ export default function Description({ product: { description } }) {
 
 Description.propTypes = {
   product: PropTypes.shape({
-    description: PropTypes.string
+    description: PropTypes.arrayOf(
+      PropTypes.shape({
+        size: PropTypes.number.isRequired,
+        columns: PropTypes.arrayOf(
+          PropTypes.shape({
+            size: PropTypes.number.isRequired,
+            // eslint-disable-next-line react/forbid-prop-types
+            data: PropTypes.object
+          })
+        ).isRequired
+      })
+    ).isRequired
   }).isRequired
 };
 

package/src/modules/catalog/pages/frontStore/productView/Options.jsx

@@ -77,7 +77,11 @@ Options.propTypes = {
       optionName: PropTypes.string,
       optionType: PropTypes.string
     })
-  ).isRequired
+  )
+};
+
+Options.defaultProps = {
+  options: []
 };
 
 export const layout = {

package/src/modules/catalog/pages/frontStore/productView/Variants.jsx

@@ -157,12 +157,12 @@ export default function Variants({
             <input
               name={`variant_options[${i}][attribute_id]`}
               type="hidden"
-              value={a.attributeId}
+              value={a.attributeId || ''}
             />
             <input
               name={`variant_options[${i}][optionId]`}
               type="hidden"
-              value={a.selectedOption}
+              value={a.selectedOption || ''}
             />
             <div className="mb-2 text-textSubdued uppercase">
               <span>{a.attribute_name}</span>

package/src/modules/checkout/api/createCart/createNewCart.js

@@ -4,7 +4,6 @@ const {
   OK
 } = require('@evershop/evershop/src/lib/util/httpStatus');
 const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
-const { error } = require('@evershop/evershop/src/lib/log/logger');
 const {
   translate
 } = require('@evershop/evershop/src/lib/locale/translate/translate');
@@ -70,7 +69,7 @@ module.exports = async (request, response, delegate, next) => {
         groupedItems.map((item) => item.sku)
       )
       .and('status', '=', 1)
-      .load(pool);
+      .execute(pool);
     // Check if all products are available
     if (products.length !== groupedItems.length) {
       response.status(INVALID_PAYLOAD);
@@ -107,7 +106,6 @@ module.exports = async (request, response, delegate, next) => {
     };
     next();
   } catch (e) {
-    error(e);
     response.status(INTERNAL_SERVER_ERROR);
     response.json({
       error: {

package/src/modules/checkout/pages/frontStore/cart/ShoppingCart.jsx

@@ -25,7 +25,7 @@ Title.propTypes = {
   title: PropTypes.string.isRequired
 };
 
-export default function ShoppingCart({ cart, setting, removeUrl }) {
+export default function ShoppingCart({ cart, setting }) {
   const { totalQty = 0, items = [] } = cart || {};
   if (totalQty <= 0) {
     return <Empty />;
@@ -53,7 +53,7 @@ export default function ShoppingCart({ cart, setting, removeUrl }) {
                 coreComponents={[
                   {
                     component: { default: Items },
-                    props: { items, setting, cartId: cart.uuid, removeUrl },
+                    props: { items, setting },
                     sortOrder: 10,
                     id: 'shoppingCartTitle'
                   }
@@ -78,8 +78,7 @@ ShoppingCart.propTypes = {
   }).isRequired,
   setting: PropTypes.shape({
     priceIncludingTax: PropTypes.bool
-  }).isRequired,
-  removeUrl: PropTypes.string.isRequired
+  }).isRequired
 };
 
 export const layout = {

package/src/modules/checkout/pages/frontStore/cart/Summary.jsx

@@ -16,11 +16,17 @@ function Subtotal({ subTotal }) {
 }
 
 Subtotal.propTypes = {
-  subTotal: PropTypes.number
+  subTotal: PropTypes.shape({
+    value: PropTypes.number,
+    text: PropTypes.string
+  })
 };
 
 Subtotal.defaultProps = {
-  subTotal: 0
+  subTotal: {
+    value: 0,
+    text: ''
+  }
 };
 
 function Discount({ discountAmount, coupon }) {
@@ -36,12 +42,18 @@ function Discount({ discountAmount, coupon }) {
 }
 
 Discount.propTypes = {
-  discountAmount: PropTypes.number,
+  discountAmount: PropTypes.shape({
+    value: PropTypes.number,
+    text: PropTypes.string
+  }),
   coupon: PropTypes.string
 };
 
 Discount.defaultProps = {
-  discountAmount: 0,
+  discountAmount: {
+    value: 0,
+    text: ''
+  },
   coupon: ''
 };
 

package/src/modules/checkout/tests/unit/lineTotal.test.js

@@ -15,7 +15,8 @@ describe('Test line total calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('line_total')).toEqual(100);
     const item2 = await cart.addItem(2, 2);
@@ -26,7 +27,8 @@ describe('Test line total calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('line_total_incl_tax')).toEqual(110);
     const item2 = await cart.addItem(2, 2);

package/src/modules/checkout/tests/unit/productPrice.test.js

@@ -15,7 +15,8 @@ describe('Test product price calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('product_price')).toEqual(100);
     expect(item.getData('final_price')).toEqual(100);
@@ -28,7 +29,8 @@ describe('Test product price calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('product_price_incl_tax')).toEqual(110);
     expect(item.getData('final_price_incl_tax')).toEqual(110);

package/src/modules/checkout/tests/unit/taxAmount.test.js

@@ -15,7 +15,8 @@ describe('Test tax amount calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('tax_amount')).toEqual(10);
     const item2 = await cart.addItem(2, 2);

package/src/modules/graphql/pages/global/[bodyParser]buildQuery[graphql].js

@@ -15,7 +15,6 @@ const {
   getEnabledWidgets
 } = require('@evershop/evershop/src/lib/util/getEnabledWidgets');
 const { get } = require('@evershop/evershop/src/lib/util/get');
-const isResolvable = require('is-resolvable');
 const {
   loadWidgetInstances
 } = require('../../../cms/services/widget/loadWidgetInstances');
@@ -98,41 +97,21 @@ module.exports = async (request, response, delegate, next) => {
           const widgetSpecs = enabledWidgets.find(
             (enabledWidget) => enabledWidget.type === widget.type
           );
+          const componentPath = currentRoute?.isAdmin
+            ? widgetSpecs.setting_component
+            : widgetSpecs.component;
+          const componentKey = currentRoute?.isAdmin
+            ? widgetSpecs.settingComponentKey
+            : widgetSpecs.componentKey;
           return {
             uuid: widget.uuid,
+            type: widget.type,
             settings: widget.settings,
-            component: currentRoute?.isAdmin
-              ? widgetSpecs.setting_component
-              : widgetSpecs.component
+            component: componentPath,
+            componentKey
           };
         });
       }
-      json.queries = Object.keys(json.queries).reduce((acc, key) => {
-        const componentPath = Buffer.from(key, 'base64').toString('ascii');
-        if (
-          applicableWidgets.find(
-            (widget) => widget.component === componentPath
-          ) ||
-          !isResolvable(componentPath)
-        ) {
-          acc[key] = json.queries[key];
-        }
-        return acc;
-      }, {});
-
-      // Remove all variables from widgets that are not used
-      json.variables = Object.keys(json.variables).reduce((acc, key) => {
-        const componentPath = Buffer.from(key, 'base64').toString('ascii');
-        if (
-          applicableWidgets.find(
-            (widget) => widget.component === componentPath
-          ) ||
-          !isResolvable(componentPath)
-        ) {
-          acc[key] = json.variables[key];
-        }
-        return acc;
-      }, {});
 
       let operation = 'query Query';
       const { fragments } = json;
@@ -142,7 +121,7 @@ module.exports = async (request, response, delegate, next) => {
 
       if (applicableWidgets.length > 0) {
         applicableWidgets.forEach((widget) => {
-          const widgetKey = Buffer.from(widget.component).toString('base64');
+          const widgetKey = widget.componentKey;
           let widgetQuery = json.queries[widgetKey];
           // Deep clone the widget variables
           let widgetVariables = JSON.parse(
@@ -265,7 +244,13 @@ module.exports = async (request, response, delegate, next) => {
           json.variables[widgetUUID] = widgetVariables;
           // Now we merge the queries to the query as the string,
           queryStr = Object.keys(json.queries).reduce((acc, key) => {
-            if (!isResolvable(Buffer.from(key, 'base64').toString('ascii'))) {
+            if (
+              !enabledWidgets.find(
+                (widget) =>
+                  widget.componentKey === key ||
+                  widget.settingComponentKey === key
+              )
+            ) {
               // eslint-disable-next-line no-param-reassign
               acc += `\n${json.queries[key]} `;
             }
@@ -275,7 +260,13 @@ module.exports = async (request, response, delegate, next) => {
           // Now we merge the variables
           variables = Object.keys(json.variables).reduce(
             (acc, key) => {
-              if (!isResolvable(Buffer.from(key, 'base64').toString('ascii'))) {
+              if (
+                !enabledWidgets.find(
+                  (widget) =>
+                    widget.componentKey === key ||
+                    widget.settingComponentKey === key
+                )
+              ) {
                 acc.values = { ...acc.values, ...json.variables[key].values };
                 acc.defs = [...acc.defs, ...json.variables[key].defs];
               }
@@ -287,7 +278,13 @@ module.exports = async (request, response, delegate, next) => {
       } else {
         // Just delete resolvable queries and variables
         queryStr = Object.keys(json.queries).reduce((acc, key) => {
-          if (isResolvable(Buffer.from(key, 'base64').toString('ascii'))) {
+          if (
+            enabledWidgets.find(
+              (widget) =>
+                widget.componentKey === key ||
+                widget.settingComponentKey === key
+            )
+          ) {
             delete json.queries[key];
           } else {
             // eslint-disable-next-line no-param-reassign
@@ -298,7 +295,13 @@ module.exports = async (request, response, delegate, next) => {
 
         variables = Object.keys(json.variables).reduce(
           (acc, key) => {
-            if (isResolvable(Buffer.from(key, 'base64').toString('ascii'))) {
+            if (
+              enabledWidgets.find(
+                (widget) =>
+                  widget.componentKey === key ||
+                  widget.settingComponentKey === key
+              )
+            ) {
               delete json.variables[key];
             } else {
               acc.values = { ...acc.values, ...json.variables[key].values };