@evershop/evershop 2.1.0 → 2.1.1

package/dist/modules/catalog/pages/admin/categoryGrid/NewCategoryButton.d.ts

@@ -1,15 +1,11 @@
-declare function NewCategoryButton({ newCateoryUrl }: {
-    newCateoryUrl: any;
-}): React.JSX.Element;
-declare namespace NewCategoryButton {
-    namespace propTypes {
-        let newCateoryUrl: any;
-    }
-}
-export default NewCategoryButton;
-export namespace layout {
-    let areaId: string;
-    let sortOrder: number;
-}
-export const query: "\n  query Query {\n    newCateoryUrl: url(routeId: \"categoryNew\")\n  }\n";
 import React from 'react';
+interface NewCategoryButtonProps {
+    newCateoryUrl: string;
+}
+export default function NewCategoryButton({ newCateoryUrl }: NewCategoryButtonProps): React.JSX.Element;
+export declare const layout: {
+    areaId: string;
+    sortOrder: number;
+};
+export declare const query = "\n  query Query {\n    newCateoryUrl: url(routeId: \"categoryNew\")\n  }\n";
+export {};

package/dist/modules/catalog/pages/admin/categoryGrid/NewCategoryButton.js

@@ -1,12 +1,8 @@
-import Button from '@components/common/Button';
-import PropTypes from 'prop-types';
+import { Button } from '@components/common/ui/Button.js';
 import React from 'react';
 export default function NewCategoryButton({ newCateoryUrl }) {
-    return React.createElement(Button, { url: newCateoryUrl, title: "New Category" });
+    return (React.createElement(Button, { onClick: () => (window.location.href = newCateoryUrl) }, "New Category"));
 }
-NewCategoryButton.propTypes = {
-    newCateoryUrl: PropTypes.string.isRequired
-};
 export const layout = {
     areaId: 'pageHeadingRight',
     sortOrder: 10

package/dist/modules/catalog/pages/admin/categoryGrid/NewCategoryButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"NewCategoryButton.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/categoryGrid/NewCategoryButton.jsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAE,aAAa,EAAE;IACzD,OAAO,oBAAC,MAAM,IAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAC,cAAc,GAAG,CAAC;AAC7D,CAAC;AAED,iBAAiB,CAAC,SAAS,GAAG;IAC5B,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CAC3C,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,kBAAkB;IAC1B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}
+{"version":3,"file":"NewCategoryButton.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/categoryGrid/NewCategoryButton.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,aAAa,EACU;IACvB,OAAO,CACL,oBAAC,MAAM,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC,mBAEpD,CACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,kBAAkB;IAC1B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}

package/dist/modules/catalog/pages/admin/categoryGrid/rows/CategoryName.js

@@ -1,6 +1,7 @@
+import { TableCell } from '@components/common/ui/Table.js';
 import React from 'react';
 export function CategoryNameRow({ category }) {
-    return (React.createElement("td", null,
+    return (React.createElement(TableCell, null,
         React.createElement("div", null,
             React.createElement("a", { className: "hover:underline font-semibold", href: category.editUrl }, category.path.map((p) => p.name).join(' / ')))));
 }

package/dist/modules/catalog/pages/admin/categoryGrid/rows/CategoryName.js.map

@@ -1 +1 @@
-{"version":3,"file":"CategoryName.js","sourceRoot":"","sources":["../../../../../../../src/modules/catalog/pages/admin/categoryGrid/rows/CategoryName.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,MAAM,UAAU,eAAe,CAAC,EAAE,QAAQ,EAAwB;IAChE,OAAO,CACL;QACE;YACE,2BAAG,SAAS,EAAC,+BAA+B,EAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,IAChE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAC3C,CACA,CACH,CACN,CAAC;AACJ,CAAC"}
+{"version":3,"file":"CategoryName.js","sourceRoot":"","sources":["../../../../../../../src/modules/catalog/pages/admin/categoryGrid/rows/CategoryName.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,MAAM,UAAU,eAAe,CAAC,EAAE,QAAQ,EAAwB;IAChE,OAAO,CACL,oBAAC,SAAS;QACR;YACE,2BAAG,SAAS,EAAC,+BAA+B,EAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,IAChE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAC3C,CACA,CACI,CACb,CAAC;AACJ,CAAC"}

package/dist/modules/catalog/pages/admin/collectionEdit/Products.js

@@ -1,9 +1,9 @@
-import { Card } from '@components/admin/Card.js';
 import { ProductListSkeleton } from '@components/admin/ProductListSkeleton.js';
 import { ProductSelector } from '@components/admin/ProductSelector.js';
-import Button from '@components/common/Button.js';
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Card, CardAction, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from '@components/common/ui/Dialog.js';
+import { Input } from '@components/common/ui/Input.js';
 import React from 'react';
 import { toast } from 'react-toastify';
 import { useQuery } from 'urql';
@@ -37,7 +37,6 @@ export default function Products({ collection: { code, addProductApi } }) {
     const [loading, setLoading] = React.useState(false);
     const [page, setPage] = React.useState(1);
     const [removing, setRemoving] = React.useState([]);
-    const modal = useModal();
     const addProductFunction = async (sku, uuid) => {
         const response = await fetch(addProductApi, {
             method: 'POST',
@@ -104,62 +103,64 @@ export default function Products({ collection: { code, addProductApi } }) {
         reexecuteQuery({ requestPolicy: 'network-only' });
     }, [page]);
     const { data, fetching, error } = result;
-    return (React.createElement(Card, { title: "Products", actions: [
-            {
-                name: 'Add products',
-                onAction: () => {
-                    modal.open();
-                }
-            }
-        ] },
-        error && (React.createElement(Card.Session, null,
-            React.createElement("span", { className: "text-critical" }, error.message))),
-        data && (React.createElement(Modal, { title: "Add Products", onClose: modal.close, isOpen: modal.isOpen },
-            React.createElement(ProductSelector, { onSelect: addProductFunction, selectedProducts: data.collection.products.items.map((p) => ({
+    return (React.createElement(Dialog, null,
+        React.createElement(Card, null,
+            React.createElement(CardHeader, null,
+                React.createElement(CardTitle, null, "Products"),
+                React.createElement(CardDescription, null, "Manage the products assigned to this collection."),
+                React.createElement(CardAction, null,
+                    React.createElement(DialogTrigger, null,
+                        React.createElement(Button, { variant: "link" }, "Add Products")))),
+            error && (React.createElement(CardContent, null,
+                React.createElement("span", { className: "text-destructive" }, error.message))),
+            React.createElement(CardContent, null,
+                React.createElement("div", null,
+                    React.createElement("div", { className: "mb-5" },
+                        React.createElement(Input, { type: "text", value: keyword, placeholder: "Search products", onChange: (e) => {
+                                setLoading(true);
+                                setKeyword(e.target.value);
+                            } })),
+                    data && !loading && (React.createElement(React.Fragment, null,
+                        data.collection.products.items.length === 0 && (React.createElement("div", null, "No product to display.")),
+                        React.createElement("div", { className: "flex justify-between" },
+                            React.createElement("div", null,
+                                React.createElement("i", null,
+                                    data.collection.products.total,
+                                    " items")),
+                            React.createElement("div", null, data.collection.products.total > 10 && (React.createElement("div", { className: "flex justify-between gap-2" },
+                                page > 1 && (React.createElement("a", { className: "text-interactive", href: "#", onClick: (e) => {
+                                        e.preventDefault();
+                                        setPage(page - 1);
+                                    } }, "Previous")),
+                                page < data.collection.products.total / 10 && (React.createElement("a", { className: "text-interactive", href: "#", onClick: (e) => {
+                                        e.preventDefault();
+                                        setPage(page + 1);
+                                    } }, "Next")))))),
+                        React.createElement("div", { className: "divide-y" }, data.collection.products.items.map((p) => {
+                            var _a, _b, _c;
+                            return (React.createElement("div", { key: p.uuid, className: "flex justify-between py-2 border-divider items-center" },
+                                React.createElement("div", { className: "flex justify-items-start gap-5" },
+                                    React.createElement("div", { className: "grid-thumbnail text-border border border-divider p-2 rounded flex justify-center w-10 h-10" },
+                                        ((_a = p.image) === null || _a === void 0 ? void 0 : _a.url) && (React.createElement("img", { className: "self-center", src: (_b = p.image) === null || _b === void 0 ? void 0 : _b.url, alt: "" })),
+                                        !((_c = p.image) === null || _c === void 0 ? void 0 : _c.url) && (React.createElement("svg", { className: "self-center", xmlns: "http://www.w3.org/2000/svg", width: "2rem", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor" },
+                                            React.createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z" })))),
+                                    React.createElement("div", null,
+                                        React.createElement("a", { href: p.editUrl || '', className: "font-semibold hover:underline" }, p.name))),
+                                React.createElement("div", { className: "text-right" },
+                                    React.createElement(Button, { variant: "destructive", onClick: async () => {
+                                            await removeProduct(p.removeFromCollectionUrl, p.uuid);
+                                        }, isLoading: removing.includes(p.uuid) }, "Remove"))));
+                        })))),
+                    (fetching || loading) && React.createElement(ProductListSkeleton, null)))),
+        React.createElement(DialogContent, { className: "sm:max-w-[90vw] lg:max-w-200" },
+            React.createElement(DialogHeader, null,
+                React.createElement(DialogTitle, null, "Add Products"),
+                React.createElement(DialogDescription, null, "Select products to add to this collection.")),
+            data && (React.createElement(ProductSelector, { onSelect: addProductFunction, selectedProducts: data.collection.products.items.map((p) => ({
                     sku: p.sku,
                     uuid: p.uuid,
                     productId: p.productId
-                })) }))),
-        React.createElement(Card.Session, null,
-            React.createElement("div", null,
-                React.createElement("div", { className: "mb-5" },
-                    React.createElement("div", { className: "form-field" },
-                        React.createElement("input", { className: "", type: "text", value: keyword, placeholder: "Search products", onChange: (e) => {
-                                setLoading(true);
-                                setKeyword(e.target.value);
-                            } }))),
-                data && !loading && (React.createElement(React.Fragment, null,
-                    data.collection.products.items.length === 0 && (React.createElement("div", null, "No product to display.")),
-                    React.createElement("div", { className: "flex justify-between" },
-                        React.createElement("div", null,
-                            React.createElement("i", null,
-                                data.collection.products.total,
-                                " items")),
-                        React.createElement("div", null, data.collection.products.total > 10 && (React.createElement("div", { className: "flex justify-between gap-2" },
-                            page > 1 && (React.createElement("a", { className: "text-interactive", href: "#", onClick: (e) => {
-                                    e.preventDefault();
-                                    setPage(page - 1);
-                                } }, "Previous")),
-                            page < data.collection.products.total / 10 && (React.createElement("a", { className: "text-interactive", href: "#", onClick: (e) => {
-                                    e.preventDefault();
-                                    setPage(page + 1);
-                                } }, "Next")))))),
-                    React.createElement("div", { className: "divide-y" }, data.collection.products.items.map((p) => {
-                        var _a, _b, _c;
-                        return (React.createElement("div", { key: p.uuid, className: "flex justify-between py-2 border-divider items-center" },
-                            React.createElement("div", { className: "flex justify-items-start gap-5" },
-                                React.createElement("div", { className: "grid-thumbnail text-border border border-divider p-2 rounded flex justify-center w-10 h-10" },
-                                    ((_a = p.image) === null || _a === void 0 ? void 0 : _a.url) && (React.createElement("img", { className: "self-center", src: (_b = p.image) === null || _b === void 0 ? void 0 : _b.url, alt: "" })),
-                                    !((_c = p.image) === null || _c === void 0 ? void 0 : _c.url) && (React.createElement("svg", { className: "self-center", xmlns: "http://www.w3.org/2000/svg", width: "2rem", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor" },
-                                        React.createElement("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z" })))),
-                                React.createElement("div", null,
-                                    React.createElement("a", { href: p.editUrl || '', className: "font-semibold hover:underline" }, p.name))),
-                            React.createElement("div", { className: "text-right" },
-                                React.createElement(Button, { title: "Remove", variant: "danger", onAction: async () => {
-                                        await removeProduct(p.removeFromCollectionUrl, p.uuid);
-                                    }, isLoading: removing.includes(p.uuid) }))));
-                    })))),
-                (fetching || loading) && React.createElement(ProductListSkeleton, null)))));
+                })) })))));
 }
 export const layout = {
     areaId: 'collectionFormInner',

package/dist/modules/catalog/pages/admin/collectionEdit/Products.js.map

@@ -1 +1 @@
-{"version":3,"file":"Products.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/collectionEdit/Products.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Products.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/collectionEdit/Products.tsx"],"names":[],"mappings":"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"}

package/dist/modules/catalog/pages/admin/collectionEdit+collectionNew/General.js

@@ -1,7 +1,7 @@
-import { Card } from '@components/admin/Card.js';
 import Area from '@components/common/Area.js';
 import { Editor } from '@components/common/form/Editor.js';
 import { InputField } from '@components/common/form/InputField.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import './General.scss';
 import React from 'react';
 export default function General({ collection }) {
@@ -15,7 +15,7 @@ export default function General({ collection }) {
         },
         {
             component: {
-                default: (React.createElement(InputField, { name: "code", label: "Collection Code", defaultValue: (collection === null || collection === void 0 ? void 0 : collection.code) || '', validation: {
+                default: (React.createElement(InputField, { name: "code", label: "Collection Code", defaultValue: (collection === null || collection === void 0 ? void 0 : collection.code) || '', required: true, validation: {
                         required: 'Collection code is required',
                         pattern: {
                             value: /^[a-zA-Z0-9_-]+$/,
@@ -34,8 +34,11 @@ export default function General({ collection }) {
         }
     ];
     return (React.createElement(Card, { title: "General" },
-        React.createElement(Card.Session, null,
-            React.createElement(Area, { id: "collectionEditGeneral", coreComponents: fields }))));
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "General Information"),
+            React.createElement(CardDescription, null, "Manage general information about the collection.")),
+        React.createElement(CardContent, null,
+            React.createElement(Area, { id: "collectionEditGeneral", coreComponents: fields, className: "space-y-2" }))));
 }
 export const layout = {
     areaId: 'collectionFormInner',

package/dist/modules/catalog/pages/admin/collectionEdit+collectionNew/General.js.map

@@ -1 +1 @@
-{"version":3,"file":"General.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/collectionEdit+collectionNew/General.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAO,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,gBAAgB,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAW1B,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,UAAU,EAAgB;IAC1D,MAAM,MAAM,GAAG;QACb;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,iBAAiB,EACvB,WAAW,EAAC,uBAAuB,EACnC,YAAY,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,KAAI,EAAE,EACpC,QAAQ,SACR,CACH;aACF;YACD,SAAS,EAAE,EAAE;YACb,EAAE,EAAE,MAAM;SACX;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,iBAAiB,EACvB,YAAY,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,KAAI,EAAE,EACpC,UAAU,EAAE;wBACV,QAAQ,EAAE,6BAA6B;wBACvC,OAAO,EAAE;4BACP,KAAK,EAAE,kBAAkB;4BACzB,OAAO,EACL,6EAA6E;yBAChF;qBACF,EACD,WAAW,EAAC,iBAAiB,GAC7B,CACH;aACF;YACD,SAAS,EAAE,EAAE;YACb,EAAE,EAAE,MAAM;SACX;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,MAAM,IACL,IAAI,EAAC,aAAa,EAClB,KAAK,EAAC,aAAa,EACnB,KAAK,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,KAAI,EAAE,GACpC,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;KACF,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,SAAS;QACnB,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,IAAI,IAAC,EAAE,EAAC,uBAAuB,EAAC,cAAc,EAAE,MAAM,GAAI,CAC9C,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;CASpB,CAAC"}
+{"version":3,"file":"General.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/collectionEdit+collectionNew/General.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAO,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,gBAAgB,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAW1B,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,UAAU,EAAgB;IAC1D,MAAM,MAAM,GAAG;QACb;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,iBAAiB,EACvB,WAAW,EAAC,uBAAuB,EACnC,YAAY,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,KAAI,EAAE,EACpC,QAAQ,SACR,CACH;aACF;YACD,SAAS,EAAE,EAAE;YACb,EAAE,EAAE,MAAM;SACX;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,iBAAiB,EACvB,YAAY,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,KAAI,EAAE,EACpC,QAAQ,QACR,UAAU,EAAE;wBACV,QAAQ,EAAE,6BAA6B;wBACvC,OAAO,EAAE;4BACP,KAAK,EAAE,kBAAkB;4BACzB,OAAO,EACL,6EAA6E;yBAChF;qBACF,EACD,WAAW,EAAC,iBAAiB,GAC7B,CACH;aACF;YACD,SAAS,EAAE,EAAE;YACb,EAAE,EAAE,MAAM;SACX;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,MAAM,IACL,IAAI,EAAC,aAAa,EAClB,KAAK,EAAC,aAAa,EACnB,KAAK,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,KAAI,EAAE,GACpC,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;KACF,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,SAAS;QACnB,oBAAC,UAAU;YACT,oBAAC,SAAS,8BAAgC;YAC1C,oBAAC,eAAe,2DAEE,CACP;QACb,oBAAC,WAAW;YACV,oBAAC,IAAI,IACH,EAAE,EAAC,uBAAuB,EAC1B,cAAc,EAAE,MAAM,EACtB,SAAS,EAAC,WAAW,GACrB,CACU,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;CASpB,CAAC"}

package/dist/modules/catalog/pages/admin/collectionEdit+collectionNew/General.scss

@@ -1,7 +1,10 @@
-.page-heading {
-  max-width: 62.5rem;
-}
-.main-content-inner {
-  max-width: 62.5rem;
-  margin: 1.875rem auto;
+body.collectionEdit,
+body.collectionNew {
+  .main-content-inner {
+    max-width: 62.5rem;
+    margin: 1.875rem auto;
+  }
+  .page-heading {
+    max-width: 62.5rem;
+  }
 }

package/dist/modules/catalog/pages/admin/collectionEdit+collectionNew/PageHeading.d.ts

@@ -5,13 +5,7 @@ export interface CollectionEditPageHeadingProps {
         name?: string;
     };
 }
-declare function CollectionEditPageHeading({ backUrl, collection }: CollectionEditPageHeadingProps): React.JSX.Element;
-declare namespace CollectionEditPageHeading {
-    var defaultProps: {
-        collection: {};
-    };
-}
-export default CollectionEditPageHeading;
+export default function CollectionEditPageHeading({ backUrl, collection }: CollectionEditPageHeadingProps): React.JSX.Element;
 export declare const layout: {
     areaId: string;
     sortOrder: number;

package/dist/modules/catalog/pages/admin/collectionEdit+collectionNew/PageHeading.js

@@ -1,12 +1,9 @@
 import { PageHeading } from '@components/admin/PageHeading.js';
 import React from 'react';
-export default function CollectionEditPageHeading({ backUrl, collection }) {
+export default function CollectionEditPageHeading({ backUrl, collection = {} }) {
     return (React.createElement("div", { className: "w-2/3", style: { margin: '0 auto' } },
         React.createElement(PageHeading, { backUrl: backUrl, heading: collection ? `Editing ${collection.name}` : 'Create a new collection' })));
 }
-CollectionEditPageHeading.defaultProps = {
-    collection: {}
-};
 export const layout = {
     areaId: 'content',
     sortOrder: 5

package/dist/modules/catalog/pages/admin/collectionEdit+collectionNew/PageHeading.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageHeading.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/collectionEdit+collectionNew/PageHeading.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EAChD,OAAO,EACP,UAAU,EACqB;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAC,OAAO,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAChD,oBAAC,WAAW,IACV,OAAO,EAAE,OAAO,EAChB,OAAO,EACL,UAAU,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,yBAAyB,GAEvE,CACE,CACP,CAAC;AACJ,CAAC;AAED,yBAAyB,CAAC,YAAY,GAAG;IACvC,UAAU,EAAE,EAAE;CACf,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,CAAC;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;CAOpB,CAAC"}
+{"version":3,"file":"PageHeading.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/collectionEdit+collectionNew/PageHeading.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EAChD,OAAO,EACP,UAAU,GAAG,EAAE,EACgB;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAC,OAAO,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAChD,oBAAC,WAAW,IACV,OAAO,EAAE,OAAO,EAChB,OAAO,EACL,UAAU,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,yBAAyB,GAEvE,CACE,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,CAAC;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;CAOpB,CAAC"}

package/dist/modules/catalog/pages/admin/collectionGrid/Grid.js

@@ -1,11 +1,15 @@
-import { Card } from '@components/admin/Card';
+import { GridPagination } from '@components/admin/grid/GridPagination';
 import { DummyColumnHeader } from '@components/admin/grid/header/Dummy';
 import { SortableHeader } from '@components/admin/grid/header/Sortable';
-import { Pagination } from '@components/admin/grid/Pagination';
 import Area from '@components/common/Area';
 import { Form } from '@components/common/form/Form.js';
 import { InputField } from '@components/common/form/InputField.js';
 import { useAlertContext } from '@components/common/modal/Alert';
+import { Button } from '@components/common/ui/Button.js';
+import { ButtonGroup } from '@components/common/ui/ButtonGroup.js';
+import { Card, CardAction, CardContent, CardHeader } from '@components/common/ui/Card.js';
+import { Checkbox } from '@components/common/ui/Checkbox.js';
+import { Table, TableCell, TableRow, TableHeader, TableHead, TableBody } from '@components/common/ui/Table.js';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
@@ -33,32 +37,26 @@ function Actions({ collections = [], selectedIds = [] }) {
                     primaryAction: {
                         title: 'Cancel',
                         onAction: closeAlert,
-                        variant: 'primary'
+                        variant: 'secondary'
                     },
                     secondaryAction: {
                         title: 'Delete',
                         onAction: async () => {
                             await deleteCategories();
                         },
-                        variant: 'critical',
-                        isLoading
+                        variant: 'destructive'
                     }
                 });
             }
         }
     ];
-    return (React.createElement("tr", null,
+    return (React.createElement(TableRow, null,
         selectedIds.length === 0 && null,
-        selectedIds.length > 0 && (React.createElement("td", { style: { borderTop: 0 }, colSpan: "100" },
-            React.createElement("div", { className: "inline-flex border border-divider rounded justify-items-start" },
-                React.createElement("a", { href: "#", className: "font-semibold pt-2 pb-2 pl-4 pr-4" },
-                    selectedIds.length,
-                    " selected"),
-                actions.map((action, index) => (React.createElement("a", { key: index, href: "#", onClick: (e) => {
-                        e.preventDefault();
-                        action.onAction();
-                    }, className: "font-semibold pt-2 pb-2 pl-4 pr-4 block border-l border-divider self-center" },
-                    React.createElement("span", null, action.name)))))))));
+        selectedIds.length > 0 && (React.createElement(TableCell, { colSpan: "100" },
+            React.createElement(ButtonGroup, null, actions.map((action, i) => (React.createElement(Button, { key: i, variant: 'outline', onClick: (e) => {
+                    e.preventDefault();
+                    action.onAction();
+                } }, action.name))))))));
 }
 Actions.propTypes = {
     selectedIds: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -77,7 +75,8 @@ export default function CollectionGrid({ collections: { items: collections, tota
     const [selectedRows, setSelectedRows] = useState([]);
     return (React.createElement("div", { className: "w-2/3", style: { margin: '0 auto' } },
         React.createElement(Card, null,
-            React.createElement(Card.Session, { title: React.createElement(Form, { submitBtn: false, id: "collectionGridFilter" },
+            React.createElement(CardHeader, { className: "flex justify-between" },
+                React.createElement(Form, { submitBtn: false, id: "collectionGridFilter" },
                     React.createElement(InputField, { name: "name", placeholder: "Search", defaultValue: (_a = currentFilters.find((f) => f.key === 'name')) === null || _a === void 0 ? void 0 : _a.value, onKeyPress: (e) => {
                             var _a;
                             // If the user press enter, we should submit the form
@@ -94,84 +93,81 @@ export default function CollectionGrid({ collections: { items: collections, tota
                                 }
                                 window.location.href = url;
                             }
-                        } })), actions: [
-                    {
-                        variant: 'interactive',
-                        name: 'Clear filter',
-                        onAction: () => {
+                        } })),
+                React.createElement(CardAction, null,
+                    React.createElement(Button, { variant: "link", onClick: () => {
                             // Just get the url and remove all query params
                             const url = new URL(document.location);
                             url.search = '';
                             window.location.href = url.href;
-                        }
-                    }
-                ] }),
-            React.createElement("table", { className: "listing sticky" },
-                React.createElement("thead", null,
-                    React.createElement("tr", null,
-                        React.createElement("th", { className: "align-bottom" },
-                            React.createElement("div", { className: "form-field mb-0" },
-                                React.createElement("input", { type: "checkbox", onChange: (e) => {
-                                        if (e.target.checked) {
-                                            setSelectedRows(collections.map((c) => c.uuid));
-                                        }
-                                        else {
-                                            setSelectedRows([]);
-                                        }
-                                    } }))),
-                        React.createElement(Area, { className: "", id: "collectionGridHeader", noOuter: true, coreComponents: [
-                                {
-                                    component: {
-                                        default: () => (React.createElement(DummyColumnHeader, { title: "ID", id: "collectionId", currentFilters: currentFilters }))
-                                    },
-                                    sortOrder: 5
-                                },
-                                {
-                                    component: {
-                                        default: () => (React.createElement(SortableHeader, { title: "Collection Name", name: "name", currentFilters: currentFilters }))
+                        } }, "Clear filters"))),
+            React.createElement(CardContent, null,
+                React.createElement(Table, null,
+                    React.createElement(TableHeader, null,
+                        React.createElement(TableRow, null,
+                            React.createElement(TableHead, null,
+                                React.createElement("div", { className: "form-field mb-0" },
+                                    React.createElement(Checkbox, { onCheckedChange: (checked) => {
+                                            if (checked) {
+                                                setSelectedRows(collections.map((c) => c.uuid));
+                                            }
+                                            else {
+                                                setSelectedRows([]);
+                                            }
+                                        } }))),
+                            React.createElement(Area, { className: "", id: "collectionGridHeader", noOuter: true, coreComponents: [
+                                    {
+                                        component: {
+                                            default: () => (React.createElement(DummyColumnHeader, { title: "ID", id: "collectionId", currentFilters: currentFilters }))
+                                        },
+                                        sortOrder: 5
                                     },
-                                    sortOrder: 10
-                                },
-                                {
-                                    component: {
-                                        default: () => (React.createElement(SortableHeader, { title: "Code", name: "code", currentFilters: currentFilters }))
+                                    {
+                                        component: {
+                                            default: () => (React.createElement(SortableHeader, { title: "Collection Name", name: "name", currentFilters: currentFilters }))
+                                        },
+                                        sortOrder: 10
                                     },
-                                    sortOrder: 15
-                                }
-                            ] }))),
-                React.createElement("tbody", null,
-                    React.createElement(Actions, { collections: collections, selectedIds: selectedRows, setSelectedRows: setSelectedRows }),
-                    collections.map((c) => (React.createElement("tr", { key: c.collectionId },
-                        React.createElement("td", { style: { width: '2rem' } },
-                            React.createElement("div", { className: "form-field mb-0" },
-                                React.createElement("input", { type: "checkbox", checked: selectedRows.includes(c.uuid), onChange: (e) => {
-                                        if (e.target.checked)
-                                            setSelectedRows(selectedRows.concat([c.uuid]));
-                                        else
-                                            setSelectedRows(selectedRows.filter((r) => r !== c.uuid));
-                                    } }))),
-                        React.createElement(Area, { className: "", id: "collectionGridRow", row: c, noOuter: true, coreComponents: [
-                                {
-                                    component: {
-                                        default: () => React.createElement("td", null, c.collectionId.toString())
+                                    {
+                                        component: {
+                                            default: () => (React.createElement(SortableHeader, { title: "Code", name: "code", currentFilters: currentFilters }))
+                                        },
+                                        sortOrder: 15
+                                    }
+                                ] }))),
+                    React.createElement(TableBody, null,
+                        React.createElement(Actions, { collections: collections, selectedIds: selectedRows, setSelectedRows: setSelectedRows }),
+                        collections.map((c) => (React.createElement(TableRow, { key: c.collectionId },
+                            React.createElement(TableCell, { style: { width: '2rem' } },
+                                React.createElement("div", { className: "form-field mb-0" },
+                                    React.createElement(Checkbox, { checked: selectedRows.includes(c.uuid), onCheckedChange: (checked) => {
+                                            if (checked)
+                                                setSelectedRows(selectedRows.concat([c.uuid]));
+                                            else
+                                                setSelectedRows(selectedRows.filter((r) => r !== c.uuid));
+                                        } }))),
+                            React.createElement(Area, { className: "", id: "collectionGridRow", row: c, noOuter: true, coreComponents: [
+                                    {
+                                        component: {
+                                            default: () => (React.createElement(TableCell, null, c.collectionId.toString()))
+                                        },
+                                        sortOrder: 5
                                     },
-                                    sortOrder: 5
-                                },
-                                {
-                                    component: {
-                                        default: () => (React.createElement(CollectionNameRow, { id: "name", name: c.name, url: c.editUrl }))
+                                    {
+                                        component: {
+                                            default: () => (React.createElement(CollectionNameRow, { id: "name", name: c.name, url: c.editUrl }))
+                                        },
+                                        sortOrder: 10
                                     },
-                                    sortOrder: 10
-                                },
-                                {
-                                    component: {
-                                        default: () => React.createElement("td", null, c.code)
-                                    },
-                                    sortOrder: 15
-                                }
-                            ] })))))),
-            collections.length === 0 && (React.createElement("div", { className: "flex w-full justify-center" }, "There is no collections to display")),
-            React.createElement(Pagination, { total: total, limit: limit, page: page }))));
+                                    {
+                                        component: {
+                                            default: () => React.createElement(TableCell, null, c.code)
+                                        },
+                                        sortOrder: 15
+                                    }
+                                ] })))))),
+                collections.length === 0 && (React.createElement("div", { className: "flex w-full justify-center mt-2" }, "There is no collections to display")),
+                React.createElement(GridPagination, { total: total, limit: limit, page: page })))));
 }
 CollectionGrid.propTypes = {
     collections: PropTypes.shape({