@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/catalog/components/CollectionProductsSetting.js

@@ -1,6 +1,10 @@
-import { Card } from '@components/admin/Card.js';
 import Spinner from '@components/admin/Spinner.js';
+import { InputField } from '@components/common/form/InputField.js';
 import { NumberField } from '@components/common/form/NumberField.js';
+import { Input } from '@components/common/ui/Input.js';
+import { Item, ItemContent } from '@components/common/ui/Item.js';
+import { Label } from '@components/common/ui/Label.js';
+import { RadioGroup, RadioGroupItem } from '@components/common/ui/RadioGroup.js';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
 import { useQuery } from 'urql';
@@ -55,41 +59,40 @@ function CollectionProductsSetting({ collectionProductsWidget: { collection, cou
     }, [page]);
     const { data, fetching, error } = result;
     if (error) {
-        return (React.createElement("p", { className: "text-red-500" },
+        return (React.createElement("p", { className: "text-destructive" },
             "There was an error fetching collections.",
             error.message));
     }
     return (React.createElement("div", null,
-        React.createElement(Card.Session, { title: "Select a collection" },
-            React.createElement("div", null,
-                React.createElement("div", { className: "" },
-                    React.createElement("div", { className: "form-field" },
-                        React.createElement("input", { type: "text", value: inputValue || '', placeholder: "Search collections", onChange: (e) => setInputValue(e.target.value) })),
-                    React.createElement("input", { type: "hidden", ...register('settings[collection]'), defaultValue: selectedCollection })),
-                fetching && (React.createElement("div", { className: "p-2 border border-divider rounded flex justify-center items-center" },
-                    React.createElement(Spinner, { width: 25, height: 25 }))),
-                !fetching && data && (React.createElement("div", { className: "divide-y" },
-                    data.collections.items.length === 0 && (React.createElement("div", { className: "p-2 border border-divider rounded flex justify-center items-center" }, inputValue ? (React.createElement("p", null,
-                        "No collections found for query \"",
-                        inputValue,
-                        "\u201D")) : (React.createElement("p", null, "You have no collections to display")))),
-                    data.collections.items.map((collection) => (React.createElement("div", { key: collection.uuid, className: "grid grid-cols-8 gap-5 py-3 border-divider items-center" },
+        React.createElement("div", null,
+            React.createElement("div", { className: "mb-3" },
+                React.createElement(Input, { type: "text", value: inputValue || '', placeholder: "Search collections", onChange: (e) => setInputValue(e.target.value) })),
+            fetching && (React.createElement(Item, { variant: 'outline' },
+                React.createElement(ItemContent, null,
+                    React.createElement(Spinner, { width: 25, height: 25 })))),
+            !fetching && data && (React.createElement("div", null,
+                data.collections.items.length === 0 && (React.createElement("div", { className: "p-2 border border-divider rounded flex justify-center items-center" }, inputValue ? (React.createElement("p", null,
+                    "No collections found for query \"",
+                    inputValue,
+                    "\u201D")) : (React.createElement("p", null, "You have no collections to display")))),
+                React.createElement(RadioGroup, { defaultValue: selectedCollection, onValueChange: (value) => {
+                        setSelectedCollection(value);
+                        setValue('settings[collection]', value, {
+                            shouldDirty: true
+                        });
+                    } },
+                    React.createElement("div", { className: "divide-y mb-2" }, data.collections.items.map((collection) => (React.createElement("div", { key: collection.uuid, className: "grid grid-cols-8 gap-5 py-3 border-divider items-center" },
                         React.createElement("div", { className: "col-span-6" },
-                            React.createElement("h3", null, collection.name)),
+                            React.createElement(Label, null, collection.name)),
                         React.createElement("div", { className: "col-span-2 flex items-center justify-end" },
-                            React.createElement("input", { type: "radio", checked: collection.code === selectedCollection, onChange: (e) => {
-                                    if (e.target.checked) {
-                                        setSelectedCollection(collection.code);
-                                        setValue('settings[collection]', collection.code, {
-                                            shouldDirty: true
-                                        });
-                                    }
-                                }, className: "ml-2 w-4 h-4 text-blue-600 border-gray-300 focus:ring-blue-500" }))))))))),
-        React.createElement(Card.Session, { title: "Settings" },
-            React.createElement("div", { className: "mt-3" },
-                React.createElement(NumberField, { name: "settings[count]", label: "Total products", defaultValue: count, required: true, validation: { min: 1, required: 'Count is required' }, min: 1, placeholder: "Number of products" }),
-                React.createElement("div", { className: "form-field" },
-                    React.createElement(NumberField, { name: "settings[countPerRow]", label: "Products per row", min: 1, validation: { min: 1, required: 'Count per row is required' }, required: true, defaultValue: countPerRow, placeholder: "Number of products per row" }))))));
+                            React.createElement(RadioGroupItem, { value: collection.code })))))),
+                    React.createElement(InputField, { type: "hidden", name: "settings[collection]", required: true, validation: {
+                            required: 'Please select a collection'
+                        }, defaultValue: selectedCollection }))))),
+        React.createElement("div", { className: "mt-3 space-y-3" },
+            React.createElement(NumberField, { name: "settings[count]", label: "Total products", defaultValue: count, required: true, validation: { min: 1, required: 'Count is required' }, min: 1, placeholder: "Number of products" }),
+            React.createElement("div", { className: "form-field" },
+                React.createElement(NumberField, { name: "settings[countPerRow]", label: "Products per row", min: 1, validation: { min: 1, required: 'Count per row is required' }, required: true, defaultValue: countPerRow, placeholder: "Number of products per row" })))));
 }
 export default CollectionProductsSetting;
 export const query = `

package/dist/modules/catalog/components/CollectionProductsSetting.js.map

@@ -1 +1 @@
-{"version":3,"file":"CollectionProductsSetting.js","sourceRoot":"","sources":["../../../../src/modules/catalog/components/CollectionProductsSetting.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,OAAO,MAAM,8BAA8B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhC,MAAM,WAAW,GAAG;;;;;;;;;;;;CAYnB,CAAC;AASF,SAAS,yBAAyB,CAAC,EACjC,wBAAwB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,EAC7B;IAC/B,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAgB,IAAI,CAAC,CAAC;IACxE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAC/C,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,cAAc,EAAE,CAAC;IAChD,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC;QACxC,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE;YACT,OAAO,EAAE,UAAU;gBACjB,CAAC,CAAC;oBACE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE;oBACrD,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE;oBACxD,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE;iBAC3D;gBACH,CAAC,CAAC;oBACE,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE;oBAC1D,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE;iBACzD;SACN;QACD,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;IACpD,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACxB,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;QAET,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;IACpD,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAEzC,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CACL,2BAAG,SAAS,EAAC,cAAc;;YAExB,KAAK,CAAC,OAAO,CACZ,CACL,CAAC;IACJ,CAAC;IAED,OAAO,CACL;QACE,oBAAC,IAAI,CAAC,OAAO,IAAC,KAAK,EAAC,qBAAqB;YACvC;gBACE,6BAAK,SAAS,EAAC,EAAE;oBACf,6BAAK,SAAS,EAAC,YAAY;wBACzB,+BACE,IAAI,EAAC,MAAM,EACX,KAAK,EAAE,UAAU,IAAI,EAAE,EACvB,WAAW,EAAC,oBAAoB,EAChC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAC9C,CACE;oBAEN,+BACE,IAAI,EAAC,QAAQ,KACT,QAAQ,CAAC,sBAAsB,CAAC,EACpC,YAAY,EAAE,kBAAkB,GAChC,CACE;gBACL,QAAQ,IAAI,CACX,6BAAK,SAAS,EAAC,oEAAoE;oBACjF,oBAAC,OAAO,IAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAI,CAC9B,CACP;gBACA,CAAC,QAAQ,IAAI,IAAI,IAAI,CACpB,6BAAK,SAAS,EAAC,UAAU;oBACtB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CACtC,6BAAK,SAAS,EAAC,oEAAoE,IAChF,UAAU,CAAC,CAAC,CAAC,CACZ;;wBACwC,UAAU;iCAC9C,CACL,CAAC,CAAC,CAAC,CACF,oEAAyC,CAC1C,CACG,CACP;oBACA,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAC1C,6BACE,GAAG,EAAE,UAAU,CAAC,IAAI,EACpB,SAAS,EAAC,yDAAyD;wBAEnE,6BAAK,SAAS,EAAC,YAAY;4BACzB,gCAAK,UAAU,CAAC,IAAI,CAAM,CACtB;wBACN,6BAAK,SAAS,EAAC,0CAA0C;4BACvD,+BACE,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,UAAU,CAAC,IAAI,KAAK,kBAAkB,EAC/C,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;oCACd,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wCACrB,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;wCACvC,QAAQ,CAAC,sBAAsB,EAAE,UAAU,CAAC,IAAI,EAAE;4CAChD,WAAW,EAAE,IAAI;yCAClB,CAAC,CAAC;oCACL,CAAC;gCACH,CAAC,EACD,SAAS,EAAC,gEAAgE,GAC1E,CACE,CACF,CACP,CAAC,CACE,CACP,CACG,CACO;QACf,oBAAC,IAAI,CAAC,OAAO,IAAC,KAAK,EAAC,UAAU;YAC5B,6BAAK,SAAS,EAAC,MAAM;gBACnB,oBAAC,WAAW,IACV,IAAI,EAAC,iBAAiB,EACtB,KAAK,EAAC,gBAAgB,EACtB,YAAY,EAAE,KAAK,EACnB,QAAQ,QACR,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,mBAAmB,EAAE,EACrD,GAAG,EAAE,CAAC,EACN,WAAW,EAAC,oBAAoB,GAChC;gBACF,6BAAK,SAAS,EAAC,YAAY;oBACzB,oBAAC,WAAW,IACV,IAAI,EAAC,uBAAuB,EAC5B,KAAK,EAAC,kBAAkB,EACxB,GAAG,EAAE,CAAC,EACN,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,2BAA2B,EAAE,EAC7D,QAAQ,QACR,YAAY,EAAE,WAAW,EACzB,WAAW,EAAC,4BAA4B,GACxC,CACE,CACF,CACO,CACX,CACP,CAAC;AACJ,CAAC;AAED,eAAe,yBAAyB,CAAC;AAEzC,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;CAQpB,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG;;;;EAIvB,CAAC"}
+{"version":3,"file":"CollectionProductsSetting.js","sourceRoot":"","sources":["../../../../src/modules/catalog/components/CollectionProductsSetting.tsx"],"names":[],"mappings":"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"}

package/dist/modules/catalog/graphql/types/Category/Category.resolvers.d.ts

@@ -1,32 +1,34 @@
-declare namespace _default {
-    namespace Query {
-        function category(_: any, { id }: {
+import { CategoryCollection } from '../../../services/CategoryCollection.js';
+import { ProductCollection } from '../../../services/ProductCollection.js';
+declare const _default: {
+    Query: {
+        category: (_: any, { id }: {
             id: any;
         }, { pool }: {
             pool: any;
-        }): Promise<Record<string, any> | null>;
-        function currentCategory(_: any, args: any, { currentUrl, currentRoute, pool }: {
+        }) => Promise<Record<string, any> | null>;
+        currentCategory: (_: any, args: any, { currentUrl, currentRoute, pool }: {
             currentUrl: any;
             currentRoute: any;
             pool: any;
-        }): Promise<{
+        }) => Promise<{
             products: (_: any, { filters }: {
                 filters?: never[] | undefined;
             }) => Promise<ProductCollection>;
         } | null>;
-        function categories(_: any, { filters }: {
+        categories: (_: any, { filters }: {
             filters?: never[] | undefined;
         }, { user }: {
             user: any;
-        }): Promise<CategoryCollection>;
-    }
-    namespace Category {
-        function products(category: any, { filters }: {
+        }) => Promise<CategoryCollection>;
+    };
+    Category: {
+        products: (category: any, { filters }: {
             filters?: never[] | undefined;
         }, { user }: {
             user: any;
-        }): Promise<any>;
-        function availableAttributes(category: any): Promise<{
+        }) => Promise<any>;
+        availableAttributes: (category: any) => Promise<{
             attributeName: any;
             attributeId: any;
             attributeCode: any;
@@ -35,44 +37,41 @@ declare namespace _default {
                 optionText: any;
             }[];
         }[]>;
-        function priceRange(category: any, _: any, { pool }: {
+        priceRange: (category: any, _: any, { pool }: {
             pool: any;
-        }): Promise<{
+        }) => Promise<{
             min: any;
             minText: string | number;
             max: any;
             maxText: string | number;
         }>;
-        function url(category: any, _: any, { pool }: {
+        url: (category: any, _: any, { pool }: {
             pool: any;
-        }): Promise<any>;
-        function image(category: any): {
+        }) => Promise<any>;
+        image: (category: any) => {
             alt: any;
             url: any;
         } | null;
-        function hasChildren(category: any, _: any, { pool }: {
+        hasChildren: (category: any, _: any, { pool }: {
             pool: any;
-        }): Promise<boolean>;
-        function children(category: any, _: any, { pool }: {
+        }) => Promise<boolean>;
+        children: (category: any, _: any, { pool }: {
             pool: any;
-        }): Promise<Record<string, any>[]>;
-        function path(category: any, _: any, { pool }: {
+        }) => Promise<Record<string, any>[]>;
+        path: (category: any, _: any, { pool }: {
             pool: any;
-        }): Promise<Record<string, any>[]>;
-        function parent(category: any, _: any, { pool }: {
+        }) => Promise<Record<string, any>[]>;
+        parent: (category: any, _: any, { pool }: {
             pool: any;
-        }): Promise<Record<string, any> | null>;
-        function description({ description }: {
+        }) => Promise<Record<string, any> | null>;
+        description: ({ description }: {
             description: any;
-        }): any;
-    }
-    namespace Product {
-        export function category_1(product: any, _: any, { pool }: {
+        }) => any;
+    };
+    Product: {
+        category: (product: any, _: any, { pool }: {
             pool: any;
-        }): Promise<Record<string, any> | null>;
-        export { category_1 as category };
-    }
-}
+        }) => Promise<Record<string, any> | null>;
+    };
+};
 export default _default;
-import { ProductCollection } from '../../../services/ProductCollection.js';
-import { CategoryCollection } from '../../../services/CategoryCollection.js';

package/dist/modules/catalog/graphql/types/Category/Category.resolvers.js

@@ -153,8 +153,12 @@ export default {
             return camelCase(await query.load(pool));
         },
         description: ({ description }) => {
+            if (!description) {
+                return [];
+            }
             try {
-                return JSON.parse(description);
+                const json = JSON.parse(description);
+                return json;
             }
             catch (e) {
                 // This is for backward compatibility. If the description is not a JSON string then it is a raw HTML block

package/dist/modules/catalog/graphql/types/Category/Category.resolvers.js.map

@@ -1 +1 @@
-{"version":3,"file":"Category.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/graphql/types/Category/Category.resolvers.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Category.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/graphql/types/Category/Category.resolvers.ts"],"names":[],"mappings":"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"}

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

@@ -8,6 +8,7 @@ type Product {
   status: Int!
   sku: String!
   weight: Weight!
+  noShippingRequired: Boolean
   taxClass: Int
   description: JSON
   urlKey: String

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

@@ -26,7 +26,8 @@ export default {
                 return [];
             }
             try {
-                return JSON.parse(description);
+                const json = JSON.parse(description);
+                return json;
             }
             catch (e) {
                 // This is for backward compatibility. If the description is not a JSON string then it is a raw HTML block

package/dist/modules/catalog/graphql/types/Product/Product.resolvers.js.map

@@ -1 +1 @@
-{"version":3,"file":"Product.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/graphql/types/Product/Product.resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,eAAe;IACb,OAAO,EAAE;QACP,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAClC,uCAAuC;YACvC,MAAM,UAAU,GAAG,MAAM,MAAM,EAAE;iBAC9B,IAAI,CAAC,aAAa,CAAC;iBACnB,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC;iBACvC,GAAG,CAAC,aAAa,EAAE,GAAG,EAAE,SAAS,CAAC;iBAClC,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO,QAAQ,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACzD,CAAC;iBAAM,CAAC;gBACN,OAAO,UAAU,CAAC,YAAY,CAAC;YACjC,CAAC;QACH,CAAC;QACD,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;YAC/B,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,0GAA0G;gBAC1G,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE,EAAE,CAAC;gBAC/B,OAAO;oBACL;wBACE,IAAI,EAAE,CAAC;wBACP,EAAE,EAAE,KAAK;wBACT,OAAO,EAAE;4BACP;gCACE,EAAE,EAAE,yCAAyC;gCAC7C,IAAI,EAAE,CAAC;gCACP,IAAI,EAAE;oCACJ,IAAI,EAAE,aAAa;oCACnB,MAAM,EAAE;wCACN;4CACE,EAAE,EAAE,YAAY;4CAChB,IAAI,EAAE,KAAK;4CACX,IAAI,EAAE;gDACJ,IAAI,EAAE,WAAW;6CAClB;yCACF;qCACF;oCACD,OAAO,EAAE,QAAQ;iCAClB;6BACF;yBACF;qBACF;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;YACrC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QACD,cAAc,EAAE,KAAK,EACnB,CAAC,EACD,IAAI,EACJ,EAAE,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,EACxC,EAAE;YACF,IAAI,YAAY,CAAC,EAAE,KAAK,aAAa,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;YACrC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;YACzD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAChD,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE;YAC7D,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,EAAE,MAAK,eAAe,EAAE,CAAC;gBACzC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,iCAAiC;YACjC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC;YAC7D,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;YACrC,MAAM,cAAc,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YACvC,OAAO;gBACL,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE,OAAO;aACjB,CAAC;QACJ,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"Product.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/graphql/types/Product/Product.resolvers.ts"],"names":[],"mappings":"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"}

package/dist/modules/catalog/migration/Version-1.0.8.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (connection: any) => Promise<void>;
+export default _default;

package/dist/modules/catalog/migration/Version-1.0.8.js

@@ -0,0 +1,5 @@
+import { execute } from '@evershop/postgres-query-builder';
+export default async (connection) => {
+    await execute(connection, `ALTER TABLE product ADD COLUMN IF NOT EXISTS no_shipping_required boolean DEFAULT FALSE`);
+};
+//# sourceMappingURL=Version-1.0.8.js.map

package/dist/modules/catalog/migration/Version-1.0.8.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Version-1.0.8.js","sourceRoot":"","sources":["../../../../src/modules/catalog/migration/Version-1.0.8.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,eAAe,KAAK,EAAE,UAAU,EAAE,EAAE;IAClC,MAAM,OAAO,CACX,UAAU,EACV,yFAAyF,CAC1F,CAAC;AACJ,CAAC,CAAC"}

package/dist/modules/catalog/pages/admin/all/CatalogMenuGroup.js

@@ -1,29 +1,26 @@
 import { NavigationItemGroup } from '@components/admin/NavigationItemGroup';
-import { ArchiveBoxIcon } from '@heroicons/react/24/solid';
-import { HashtagIcon } from '@heroicons/react/24/solid';
-import { LinkIcon } from '@heroicons/react/24/solid';
-import { TagIcon } from '@heroicons/react/24/solid';
+import { Box, Hash, Link, Tag } from 'lucide-react';
 import PropTypes from 'prop-types';
 import React from 'react';
 export default function CatalogMenuGroup({ productGrid, categoryGrid, attributeGrid, collectionGrid }) {
     return (React.createElement(NavigationItemGroup, { id: "catalogMenuGroup", name: "Catalog", items: [
             {
-                Icon: ArchiveBoxIcon,
+                Icon: Box,
                 url: productGrid,
                 title: 'Products'
             },
             {
-                Icon: LinkIcon,
+                Icon: Link,
                 url: categoryGrid,
                 title: 'Categories'
             },
             {
-                Icon: TagIcon,
+                Icon: Tag,
                 url: collectionGrid,
                 title: 'Collections'
             },
             {
-                Icon: HashtagIcon,
+                Icon: Hash,
                 url: attributeGrid,
                 title: 'Attributes'
             }

package/dist/modules/catalog/pages/admin/all/CatalogMenuGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"CatalogMenuGroup.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/all/CatalogMenuGroup.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,WAAW,EACX,YAAY,EACZ,aAAa,EACb,cAAc,EACf;IACC,OAAO,CACL,oBAAC,mBAAmB,IAClB,EAAE,EAAC,kBAAkB,EACrB,IAAI,EAAC,SAAS,EACd,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,cAAc;gBACpB,GAAG,EAAE,WAAW;gBAChB,KAAK,EAAE,UAAU;aAClB;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,YAAY;gBACjB,KAAK,EAAE,YAAY;aACpB;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,cAAc;gBACnB,KAAK,EAAE,aAAa;aACrB;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,GAAG,EAAE,aAAa;gBAClB,KAAK,EAAE,YAAY;aACpB;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,gBAAgB,CAAC,SAAS,GAAG;IAC3B,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IAC1C,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACzC,cAAc,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IAC3C,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACzC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;CAOpB,CAAC"}
+{"version":3,"file":"CatalogMenuGroup.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/all/CatalogMenuGroup.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,WAAW,EACX,YAAY,EACZ,aAAa,EACb,cAAc,EACf;IACC,OAAO,CACL,oBAAC,mBAAmB,IAClB,EAAE,EAAC,kBAAkB,EACrB,IAAI,EAAC,SAAS,EACd,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,GAAG;gBACT,GAAG,EAAE,WAAW;gBAChB,KAAK,EAAE,UAAU;aAClB;YACD;gBACE,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,YAAY;gBACjB,KAAK,EAAE,YAAY;aACpB;YACD;gBACE,IAAI,EAAE,GAAG;gBACT,GAAG,EAAE,cAAc;gBACnB,KAAK,EAAE,aAAa;aACrB;YACD;gBACE,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,aAAa;gBAClB,KAAK,EAAE,YAAY;aACpB;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,gBAAgB,CAAC,SAAS,GAAG;IAC3B,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IAC1C,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACzC,cAAc,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IAC3C,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACzC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;CAOpB,CAAC"}

package/dist/modules/catalog/pages/admin/all/NewProductQuickLink.js

@@ -1,9 +1,9 @@
 import { NavigationItem } from '@components/admin/NavigationItem.js';
-import { ArchiveBoxIcon } from '@heroicons/react/24/solid';
+import { BoxIcon } from 'lucide-react';
 import PropTypes from 'prop-types';
 import React from 'react';
 export default function NewProductQuickLink({ productNew }) {
-    return (React.createElement(NavigationItem, { Icon: ArchiveBoxIcon, title: "New Product", url: productNew }));
+    return React.createElement(NavigationItem, { Icon: BoxIcon, title: "New Product", url: productNew });
 }
 NewProductQuickLink.propTypes = {
     productNew: PropTypes.string.isRequired

package/dist/modules/catalog/pages/admin/all/NewProductQuickLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"NewProductQuickLink.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/all/NewProductQuickLink.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAAE,UAAU,EAAE;IACxD,OAAO,CACL,oBAAC,cAAc,IACb,IAAI,EAAE,cAAc,EACpB,KAAK,EAAC,aAAa,EACnB,GAAG,EAAE,UAAU,GACf,CACH,CAAC;AACJ,CAAC;AAED,mBAAmB,CAAC,SAAS,GAAG;IAC9B,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACxC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}
+{"version":3,"file":"NewProductQuickLink.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/all/NewProductQuickLink.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAAE,UAAU,EAAE;IACxD,OAAO,oBAAC,cAAc,IAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAC,aAAa,EAAC,GAAG,EAAE,UAAU,GAAI,CAAC;AAChF,CAAC;AAED,mBAAmB,CAAC,SAAS,GAAG;IAC9B,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACxC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}

package/dist/modules/catalog/pages/admin/attributeEdit+attributeNew/Avaibility.js

@@ -1,31 +1,34 @@
-import { Card } from '@components/admin/Card.js';
 import { NumberField } from '@components/common/form/NumberField.js';
 import { RadioGroupField } from '@components/common/form/RadioGroupField.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import React from 'react';
 export default function General({ attribute }) {
-    return (React.createElement(Card, { title: "Setting", subdued: true },
-        React.createElement(Card.Session, null,
+    return (React.createElement(Card, { className: "bg-popover" },
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Setting"),
+            React.createElement(CardDescription, null, "Manage the setting of the attribute.")),
+        React.createElement(CardContent, null,
             React.createElement(RadioGroupField, { name: "is_required", label: "Is Required?", options: [
                     { value: 0, label: 'No' },
                     { value: 1, label: 'Yes' }
                 ], required: true, validation: {
                     required: 'This field is required'
                 }, defaultValue: (attribute === null || attribute === void 0 ? void 0 : attribute.isRequired) === 0 ? 0 : 1 })),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "pt-6 border-t border-border" },
             React.createElement(RadioGroupField, { name: "is_filterable", label: "Is Filterable?", options: [
                     { value: 0, label: 'No' },
                     { value: 1, label: 'Yes' }
                 ], required: true, validation: {
                     required: 'This field is required'
                 }, defaultValue: (attribute === null || attribute === void 0 ? void 0 : attribute.isFilterable) === 1 ? 1 : 0 })),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "pt-6 border-t border-border" },
             React.createElement(RadioGroupField, { name: "display_on_frontend", label: "Display on Frontend?", options: [
                     { value: 0, label: 'No' },
                     { value: 1, label: 'Yes' }
                 ], required: true, validation: {
                     required: 'This field is required'
                 }, defaultValue: (attribute === null || attribute === void 0 ? void 0 : attribute.displayOnFrontend) === 1 ? 1 : 0 })),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "pt-6 border-t border-border" },
             React.createElement(NumberField, { name: "sort_order", label: "Sort Order", placeholder: "Sort order", required: true, validation: {
                     required: 'Sort order is required',
                     min: {

package/dist/modules/catalog/pages/admin/attributeEdit+attributeNew/Avaibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"Avaibility.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/attributeEdit+attributeNew/Avaibility.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,SAAS,EAAgB;IACzD,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,SAAS,EAAC,OAAO;QAC3B,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,eAAe,IACd,IAAI,EAAC,aAAa,EAClB,KAAK,EAAC,cAAc,EACpB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;oBACzB,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;iBAC3B,EACD,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;iBACnC,EACD,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACjD,CACW;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,eAAe,IACd,IAAI,EAAC,eAAe,EACpB,KAAK,EAAC,gBAAgB,EACtB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;oBACzB,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;iBAC3B,EACD,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;iBACnC,EACD,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,CACW;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,eAAe,IACd,IAAI,EAAC,qBAAqB,EAC1B,KAAK,EAAC,sBAAsB,EAC5B,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;oBACzB,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;iBAC3B,EACD,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;iBACnC,EACD,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,iBAAiB,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACxD,CACW;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,WAAW,IACV,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,YAAY,EAClB,WAAW,EAAC,YAAY,EACxB,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;oBAClC,GAAG,EAAE;wBACH,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,sCAAsC;qBAChD;iBACF,EACD,YAAY,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,GAClC,CACW,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;CAUpB,CAAC"}
+{"version":3,"file":"Avaibility.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/attributeEdit+attributeNew/Avaibility.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,SAAS,EAAgB;IACzD,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAC,YAAY;QAC1B,oBAAC,UAAU;YACT,oBAAC,SAAS,kBAAoB;YAC9B,oBAAC,eAAe,+CAAuD,CAC5D;QACb,oBAAC,WAAW;YACV,oBAAC,eAAe,IACd,IAAI,EAAC,aAAa,EAClB,KAAK,EAAC,cAAc,EACpB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;oBACzB,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;iBAC3B,EACD,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;iBACnC,EACD,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACjD,CACU;QACd,oBAAC,WAAW,IAAC,SAAS,EAAC,6BAA6B;YAClD,oBAAC,eAAe,IACd,IAAI,EAAC,eAAe,EACpB,KAAK,EAAC,gBAAgB,EACtB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;oBACzB,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;iBAC3B,EACD,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;iBACnC,EACD,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,CACU;QACd,oBAAC,WAAW,IAAC,SAAS,EAAC,6BAA6B;YAClD,oBAAC,eAAe,IACd,IAAI,EAAC,qBAAqB,EAC1B,KAAK,EAAC,sBAAsB,EAC5B,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;oBACzB,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;iBAC3B,EACD,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;iBACnC,EACD,YAAY,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,iBAAiB,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACxD,CACU;QACd,oBAAC,WAAW,IAAC,SAAS,EAAC,6BAA6B;YAClD,oBAAC,WAAW,IACV,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,YAAY,EAClB,WAAW,EAAC,YAAY,EACxB,QAAQ,QACR,UAAU,EAAE;oBACV,QAAQ,EAAE,wBAAwB;oBAClC,GAAG,EAAE;wBACH,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,sCAAsC;qBAChD;iBACF,EACD,YAAY,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,GAClC,CACU,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;CAUpB,CAAC"}

package/dist/modules/catalog/pages/admin/attributeEdit+attributeNew/General.js

@@ -1,11 +1,16 @@
-import { Card } from '@components/admin/Card.js';
 import Spinner from '@components/admin/Spinner.jsx';
 import { InputField } from '@components/common/form/InputField.js';
 import { RadioGroupField } from '@components/common/form/RadioGroupField.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
+import { InputGroupAddon, InputGroupInput } from '@components/common/ui/InputGroup.js';
+import { InputGroup } from '@components/common/ui/InputGroup.js';
+import { PlusCircle } from 'lucide-react';
 import React from 'react';
 import { useFormContext, Controller, useFieldArray } from 'react-hook-form';
 import Select from 'react-select';
 import { useQuery } from 'urql';
+import { v4 as uuidv4 } from 'uuid';
 import { get } from '../../../../../lib/util/get.js';
 import './General.scss';
 const GroupsQuery = `
@@ -55,7 +60,7 @@ const Groups = ({ groups, createGroupApi }) => {
         return (React.createElement("div", null,
             React.createElement(Spinner, { width: 20, height: 20 })));
     if (error) {
-        return React.createElement("p", { className: "text-red-500" }, error.message);
+        return React.createElement("p", { className: "text-destructive" }, error.message);
     }
     return (React.createElement("div", null,
         React.createElement("div", { className: "mb-2" }, "Select groups the attribute belongs to"),
@@ -67,14 +72,15 @@ const Groups = ({ groups, createGroupApi }) => {
             React.createElement("div", { className: "grid gap-5 grid-cols-1" },
                 React.createElement("div", null,
                     React.createElement("div", { className: "flex gap-5" },
-                        React.createElement("input", { type: "text", placeholder: "Create a new group", ref: newGroup, className: "flex-1 border border-gray-300 rounded-l-md p-2" }),
-                        React.createElement("button", { type: "button", onClick: (e) => {
-                                e.preventDefault();
-                                createGroup();
-                            }, className: "px-2 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600" },
-                            React.createElement("svg", { width: "1.5rem", height: "1.5rem", xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", strokeWidth: 1.5, stroke: "currentColor", className: "w-4 h-4" },
-                                React.createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M12 9v6m3-3H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z" })))),
-                    createGroupError && (React.createElement("p", { className: "text-red-500 text-xs mt-1" }, createGroupError)))))));
+                        React.createElement(InputGroup, { className: "max-w-xs" },
+                            React.createElement(InputGroupInput, { type: "text", placeholder: "Create a new group", ref: newGroup }),
+                            React.createElement(InputGroupAddon, { align: "inline-end" },
+                                React.createElement("a", { className: "flex w-8 items-center justify-center text-primary", href: "#", onClick: (e) => {
+                                        e.preventDefault();
+                                        createGroup();
+                                    } },
+                                    React.createElement(PlusCircle, { className: "size-4" }))))),
+                    createGroupError && (React.createElement("p", { className: "text-destructive text-xs mt-1" }, createGroupError)))))));
 };
 const Options = ({ originOptions = [] }) => {
     const { control } = useFormContext();
@@ -94,29 +100,31 @@ const Options = ({ originOptions = [] }) => {
         append({
             option_text: '',
             option_id: (Math.floor(Math.random() * (9000000 - 1000000)) + 1000000).toString(),
-            uuid: crypto.randomUUID()
+            uuid: uuidv4()
         });
     };
     return (React.createElement("div", { className: "attribute-edit-options" },
         fields.map((field, index) => {
             return (React.createElement("div", { key: field.id, className: "flex items-center mb-2 space-x-5" },
                 React.createElement("div", { className: "flex-1" },
-                    React.createElement(InputField, { name: `options.${index}.option_text`, placeholder: "Option text", validation: { required: 'Option text is required' }, wrapperClassName: "form-field mb-0" }),
-                    React.createElement(InputField, { type: "hidden", name: `options.${index}.option_id`, wrapperClassName: "form-field mb-0" })),
+                    React.createElement(InputField, { name: `options.${index}.option_text`, placeholder: "Option text", validation: { required: 'Option text is required' } }),
+                    React.createElement(InputField, { type: "hidden", name: `options.${index}.option_id` })),
                 React.createElement("div", { className: "self-center" },
-                    React.createElement("button", { type: "button", onClick: (e) => {
+                    React.createElement(Button, { type: "button", onClick: (e) => {
                             e.preventDefault();
                             remove(index);
-                        }, className: "text-red-500 hover:underline" }, "Remove option"))));
+                        }, variant: 'destructive' }, "Remove"))));
         }),
         React.createElement("div", { className: "mt-2" },
-            React.createElement("button", { type: "button", onClick: addOption, className: "text-blue-500 hover:underline" }, "Add option"))));
+            React.createElement(Button, { type: "button", onClick: addOption, variant: 'outline' }, "Add option"))));
 };
 export default function General({ attribute, createGroupApi }) {
-    const { register } = useFormContext();
-    const [type, setType] = React.useState((attribute === null || attribute === void 0 ? void 0 : attribute.type) || 'text');
-    return (React.createElement(Card, { title: "General" },
-        React.createElement(Card.Session, null,
+    const [type] = React.useState((attribute === null || attribute === void 0 ? void 0 : attribute.type) || 'text');
+    return (React.createElement(Card, null,
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "General"),
+            React.createElement(CardDescription, null, "Manage the general information of the attribute.")),
+        React.createElement(CardContent, null,
             React.createElement("div", { className: "space-y-2" },
                 React.createElement(InputField, { name: "attribute_name", label: "Name", placeholder: "Enter attribute name", required: true, defaultValue: attribute === null || attribute === void 0 ? void 0 : attribute.attributeName, validation: { required: 'Attribute name is required' } }),
                 React.createElement(InputField, { name: "attribute_code", label: "Code", placeholder: "Enter attribute code", required: true, defaultValue: attribute === null || attribute === void 0 ? void 0 : attribute.attributeCode, validation: { required: 'Attribute code is required' }, helperText: "Attribute code is used in API and must be unique" }),
@@ -127,10 +135,10 @@ export default function General({ attribute, createGroupApi }) {
                                 { label: 'Select', value: 'select' },
                                 { label: 'Multiselect', value: 'multiselect' },
                                 { label: 'Textarea', value: 'textarea' }
-                            ], label: "Type", defaultValue: attribute === null || attribute === void 0 ? void 0 : attribute.type, required: true, validation: { required: 'Type is required' } }))))),
-        ['select', 'multiselect'].includes(type) && (React.createElement(Card.Session, { title: "Attribute options" },
+                            ], label: "Type", defaultValue: attribute === null || attribute === void 0 ? void 0 : attribute.type, required: true, disabled: !!(attribute === null || attribute === void 0 ? void 0 : attribute.attributeId), validation: { required: 'Type is required' } }))))),
+        ['select', 'multiselect'].includes(type) && (React.createElement(CardContent, { title: "Attribute options" },
             React.createElement(Options, { originOptions: get(attribute, 'options', []) }))),
-        React.createElement(Card.Session, { title: "Attribute Group" },
+        React.createElement(CardContent, { title: "Attribute Group" },
             React.createElement(Groups, { groups: get(attribute, 'groups.items', []), createGroupApi: createGroupApi }))));
 }
 export const layout = {