@evershop/evershop 1.0.0 → 1.2.0

package/src/modules/catalog/graphql/types/Collection/Collection.resolvers.js

@@ -1,3 +1,4 @@
+const { v4: uuidv4 } = require('uuid');
 const { select } = require('@evershop/postgres-query-builder');
 const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
 const { ProductCollection } = require('../../../services/ProductCollection');
@@ -22,7 +23,7 @@ module.exports = {
     collections: async (_, { filters = [] }) => {
       const query = getCollectionsBaseQuery();
       const root = new CollectionCollection(query);
-      await root.init({}, { filters });
+      await root.init(filters);
       return root;
     }
   },
@@ -30,8 +31,41 @@ module.exports = {
     products: async (collection, { filters = [] }, { user }) => {
       const query = getProductsByCollectionBaseQuery(collection.collectionId);
       const root = new ProductCollection(query);
-      await root.init(collection, { filters }, { user });
+      await root.init(filters, !!user);
       return root;
+    },
+    description: ({ description }) => {
+      try {
+        return JSON.parse(description);
+      } catch (e) {
+        // This is for backward compatibility. If the description is not a JSON string then it is a raw HTML block
+        const rowId = `r__${uuidv4()}`;
+        return [
+          {
+            size: 1,
+            id: rowId,
+            columns: [
+              {
+                id: 'c__c5d90067-c786-4324-8e24-8e30520ac3d7',
+                size: 1,
+                data: {
+                  time: 1723347125344,
+                  blocks: [
+                    {
+                      id: 'AU89ItzUa7',
+                      type: 'raw',
+                      data: {
+                        html: description
+                      }
+                    }
+                  ],
+                  version: '2.30.2'
+                }
+              }
+            ]
+          }
+        ];
+      }
     }
   },
   Product: {

package/src/modules/catalog/graphql/types/Product/Attribute/ProductAttribute.resolvers.js

@@ -20,6 +20,7 @@ module.exports = {
       if (!user) {
         query.andWhere('attribute.display_on_frontend', '=', true);
       }
+      query.orderBy('attribute.sort_order', 'ASC');
       const attributes = await query.execute(pool);
       return attributes.map((a) => camelCase(a));
     },

package/src/modules/catalog/graphql/types/Product/Product.graphql

@@ -9,7 +9,7 @@ type Product {
   sku: String!
   weight: Weight!
   taxClass: Int
-  description: String
+  description: JSON
   urlKey: String
   metaTitle: String
   metaDescription: String

package/src/modules/catalog/graphql/types/Product/Product.resolvers.js

@@ -1,3 +1,4 @@
+const { v4: uuidv4 } = require('uuid');
 const { select } = require('@evershop/postgres-query-builder');
 const { buildUrl } = require('@evershop/evershop/src/lib/router/buildUrl');
 const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
@@ -20,6 +21,39 @@ module.exports = {
       } else {
         return urlRewrite.request_path;
       }
+    },
+    description: ({ description }) => {
+      try {
+        return JSON.parse(description);
+      } catch (e) {
+        // This is for backward compatibility. If the description is not a JSON string then it is a raw HTML block
+        const rowId = `r__${uuidv4()}`;
+        return [
+          {
+            size: 1,
+            id: rowId,
+            columns: [
+              {
+                id: 'c__c5d90067-c786-4324-8e24-8e30520ac3d7',
+                size: 1,
+                data: {
+                  time: 1723347125344,
+                  blocks: [
+                    {
+                      id: 'AU89ItzUa7',
+                      type: 'raw',
+                      data: {
+                        html: description
+                      }
+                    }
+                  ],
+                  version: '2.30.2'
+                }
+              }
+            ]
+          }
+        ];
+      }
     }
   },
   Query: {
@@ -36,7 +70,7 @@ module.exports = {
     products: async (_, { filters = [] }, { user }) => {
       const query = getProductsBaseQuery();
       const root = new ProductCollection(query);
-      await root.init({}, { filters }, { user });
+      await root.init(filters, !!user);
       return root;
     }
   }

package/src/modules/catalog/graphql/types/Product/Variant/Variant.graphql

@@ -23,8 +23,8 @@ Represents a product variant attribute index
 type VariantAttributeIndex {
   attributeId: ID!
   attributeCode: String!
-  optionId: Int!
-  optionText: String!
+  optionId: Int
+  optionText: String
 }
 
 """

package/src/modules/catalog/graphql/types/Product/Variant/Variant.resolvers.js

@@ -24,7 +24,6 @@ module.exports = {
           .where('variant_group_id', '=', variantGroupId)
           .load(pool);
 
-        const variants = [];
         const query = select();
         query
           .from('product')
@@ -36,22 +35,23 @@ module.exports = {
           .select('product_attribute_value_index.option_text');
 
         query
-          .innerJoin('product_attribute_value_index')
+          .leftJoin('product_attribute_value_index')
           .on(
             'product.product_id',
             '=',
             'product_attribute_value_index.product_id'
           );
         query
-          .innerJoin('attribute')
+          .leftJoin('attribute')
           .on(
             'product_attribute_value_index.attribute_id',
             '=',
             'attribute.attribute_id'
           );
 
-        query.where('variant_group_id', '=', variantGroupId).and(
-          'attribute.attribute_id',
+        query.where('variant_group_id', '=', variantGroupId);
+        query.andWhere(
+          'product_attribute_value_index.attribute_id',
           'IN',
           Object.values(group).filter((v) => Number.isInteger(v))
         );
@@ -59,24 +59,7 @@ module.exports = {
           query.andWhere('status', '=', 1);
         }
         const vs = await query.execute(pool);
-        // Filter the vs array, make sure that each product has all the attributes
-        // that are in the variant group.
-        let filteredVs;
-        if (!user) {
-          filteredVs = vs.filter((v) => {
-            const attributes = Object.values(group).filter((attr) =>
-              Number.isInteger(attr)
-            );
-            const productAttributes = vs
-              .filter((p) => p.product_id === v.product_id)
-              .map((p) => p.attribute_id);
-            return attributes.every((a) => productAttributes.includes(a));
-          });
-        } else {
-          filteredVs = vs;
-        }
-
-        let attributes = await select()
+        const attributes = await select()
           .from('attribute')
           .where(
             'attribute_id',
@@ -85,77 +68,70 @@ module.exports = {
           )
           .execute(pool);
 
-        attributes = attributes.map((a) => ({
-          attributeId: a.attribute_id,
-          attributeCode: a.attribute_code,
-          attributeName: a.attribute_name
-        }));
-
-        const promises = attributes.map(async (attribute) => {
-          const options = await select()
-            .from('attribute_option')
-            .where('attribute_id', '=', attribute.attributeId)
-            .execute(pool);
-
-          // eslint-disable-next-line no-param-reassign
-          attribute.options = options.map((o) => {
-            // Check if the option is used in a variant
-            const used = filteredVs.find(
-              (v) =>
-                parseInt(v.option_id, 10) ===
-                parseInt(o.attribute_option_id, 10)
-            );
-            if (!used) {
-              return {
-                optionId: o.attribute_option_id,
-                optionText: o.option_text
-              };
-            } else {
-              return {
-                optionId: o.attribute_option_id,
-                optionText: o.option_text,
-                productId: used.product_id
-              };
-            }
-          });
-          return attribute;
-        });
-
-        attributes = await Promise.all(promises);
-
-        for (let i = 0, len = filteredVs.length; i < len; i += 1) {
-          const ind = variants.findIndex(
-            (v) => v.productId === filteredVs[i].product_id
-          );
-          if (ind !== -1) {
-            if (!variants[ind].attributes) {
-              variants[ind].attributes = [];
-            }
-            variants[ind].attributes.push({
-              attributeCode: filteredVs[i].attribute_code,
-              attributeId: filteredVs[i].attribute_id,
-              optionId: filteredVs[i].option_id,
-              optionText: filteredVs[i].option_text
-            });
-          } else {
-            variants.push({
-              productId: filteredVs[i].product_id,
-              attributes: [
-                {
-                  attributeCode: filteredVs[i].attribute_code,
-                  attributeId: filteredVs[i].attribute_id,
-                  optionId: filteredVs[i].option_id,
-                  optionText: filteredVs[i].option_text
-                }
-              ]
-            });
-          }
-        }
-
         return {
           variantGroupId,
-          variantAttributes: attributes,
-          items: variants.map((v) => ({ ...v, id: `id${uniqid()}` })),
+          variantAttributes: attributes.map((a) => {
+            // We need to get all the options available from the variants list
+            const options = vs
+              .filter((v) => v.attribute_id === a.attribute_id)
+              .map((v) => ({
+                optionId: v.option_id,
+                optionText: v.option_text,
+                productId: v.product_id
+              }));
+            return {
+              attributeId: a.attribute_id,
+              attributeCode: a.attribute_code,
+              attributeName: a.attribute_name,
+              options
+            };
+          }),
+          items: () =>
+            vs
+              .reduce((acc, v) => {
+                const product = acc.find((p) => p.product_id === v.product_id);
+                if (!product) {
+                  acc.push({
+                    product_id: v.product_id,
+                    attributes: [
+                      {
+                        attributeId: v.attribute_id,
+                        attributeCode: v.attribute_code,
+                        optionId: v.option_id,
+                        optionText: v.option_text
+                      }
+                    ]
+                  });
+                } else {
+                  product.attributes.push({
+                    attributeId: v.attribute_id,
+                    attributeCode: v.attribute_code,
+                    optionId: v.option_id,
+                    optionText: v.option_text
+                  });
+                }
+                return acc;
+              }, [])
+              .map((p) => {
+                const productAttributes = p.attributes.map(
+                  (a) => a.attributeCode
+                );
+                const missingAttributes = attributes
+                  .filter((a) => !productAttributes.includes(a.attribute_code))
+                  .map((a) => ({
+                    attributeId: a.attribute_id,
+                    attributeCode: a.attribute_code,
+                    optionId: null,
+                    optionText: null
+                  }));
+                return {
+                  productId: p.product_id,
+                  id: `id-${uniqid()}`,
+                  attributes: [...p.attributes, ...missingAttributes].filter(
+                    (a) => a.attributeCode
+                  )
+                };
+              }),
           addItemApi: buildUrl('addVariantItem', { id: group.uuid })
         };
       }

package/src/modules/catalog/graphql/types/Widget/CollectionProductsWidget/CollectionProductsWidget.graphql

@@ -0,0 +1,11 @@
+"""
+Return a collection products Widget
+"""
+type CollectionProductsWidget {
+  collection: String
+  count: Int
+}
+
+extend type Query {
+  collectionProductsWidget(collection: String, count: Int): CollectionProductsWidget
+}

package/src/modules/catalog/graphql/types/Widget/CollectionProductsWidget/CollectionProductsWidget.resolvers.js

@@ -0,0 +1,8 @@
+module.exports = {
+  Query: {
+    collectionProductsWidget: async (root, { collection, count }) => ({
+      collection,
+      count: count ? parseInt(count, 10) : 5
+    })
+  }
+};

package/src/modules/catalog/migration/Version-1.0.0.js

@@ -353,6 +353,7 @@ module.exports = exports = async (connection) => {
   "parent_id" INT DEFAULT NULL,
   "include_in_nav" boolean NOT NULL,
   "position" smallint DEFAULT NULL,
+  "show_products" boolean DEFAULT TRUE,
   "created_at" TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
   "updated_at" TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
    CONSTRAINT "CATEGORY_UUID_UNIQUE" UNIQUE ("uuid")

package/src/modules/catalog/migration/Version-1.0.7.js

@@ -0,0 +1,10 @@
+const { execute } = require('@evershop/postgres-query-builder');
+
+// eslint-disable-next-line no-multi-assign
+module.exports = exports = async (connection) => {
+  // rename the image column in the product_image table to origin_image
+  await execute(
+    connection,
+    `ALTER TABLE category ADD COLUMN IF NOT EXISTS show_products boolean DEFAULT TRUE`
+  );
+};

package/src/modules/catalog/pages/admin/attributeEdit+attributeNew/FormContent.jsx

@@ -9,15 +9,15 @@ export default function FormContent({ gridUrl }) {
   const { state } = useFormContext();
   return (
     <>
-      <div className="grid grid-cols-3 gap-x-2 grid-flow-row ">
-        <div className="col-span-2 grid grid-cols-1 gap-2 auto-rows-max">
+      <div className="grid grid-cols-3 gap-x-8 grid-flow-row ">
+        <div className="col-span-2 grid grid-cols-1 gap-8 auto-rows-max">
           <Area id="leftSide" noOuter />
         </div>
-        <div className="col-span-1 grid grid-cols-1 gap-2 auto-rows-max">
+        <div className="col-span-1 grid grid-cols-1 gap-8 auto-rows-max">
           <Area id="rightSide" noOuter />
         </div>
       </div>
-      <div className="form-submit-button flex border-t border-divider mt-15 pt-15 justify-between">
+      <div className="form-submit-button flex border-t border-divider mt-6 pt-6 justify-between">
         <Button
           title="Cancel"
           variant="critical"

package/src/modules/catalog/pages/admin/attributeEdit+attributeNew/General.jsx

@@ -63,8 +63,8 @@ function Groups({ groups, createGroupApi }) {
 
   return (
     <div>
-      <div className="mb-1">Select groups the attribute belongs to</div>
-      <div className="grid gap-2 grid-cols-2">
+      <div className="mb-4">Select groups the attribute belongs to</div>
+      <div className="grid gap-8 grid-cols-2">
         <div>
           <Select
             name="groups[]"
@@ -74,7 +74,7 @@ function Groups({ groups, createGroupApi }) {
             defaultValue={groups}
           />
         </div>
-        <div className="grid gap-2 grid-cols-1">
+        <div className="grid gap-8 grid-cols-1">
           <div>
             <Input
               type="text"
@@ -151,7 +151,7 @@ function Options({ originOptions = [] }) {
       {options.map((option, index) => {
         const { uuid, optionId, optionText } = option;
         return (
-          <div key={uuid} className="flex mb-05 space-x-2">
+          <div key={uuid} className="flex mb-2 space-x-8">
             <div>
               <Field
                 key={uuid}
@@ -179,7 +179,7 @@ function Options({ originOptions = [] }) {
           </div>
         );
       })}
-      <div className="mt-1">
+      <div className="mt-4">
         <a
           href="#"
           onClick={(e) => addOption(e)}
@@ -274,7 +274,7 @@ export default function General({ attribute, createGroupApi }) {
       )}
       <Card.Session title="Attribute Group">
         <Groups
-          groups={get(attribute, 'groups', [])}
+          groups={get(attribute, 'groups.items', [])}
           createGroupApi={createGroupApi}
         />
       </Card.Session>
@@ -294,12 +294,14 @@ General.propTypes = {
         optionText: PropTypes.string
       })
     ),
-    groups: PropTypes.arrayOf(
-      PropTypes.shape({
-        value: PropTypes.number,
-        label: PropTypes.string
-      })
-    )
+    groups: {
+      items: PropTypes.arrayOf(
+        PropTypes.shape({
+          value: PropTypes.number,
+          label: PropTypes.string
+        })
+      )
+    }
   }),
   createGroupApi: PropTypes.string.isRequired
 };
@@ -328,8 +330,10 @@ export const query = `
         optionText
       }
       groups {
-        value: attributeGroupId
-        label: groupName
+        items {
+          value: attributeGroupId
+          label: groupName
+        }
       }
     }
     createGroupApi: url(routeId: "createAttributeGroup")