@webiny/app-admin 6.5.0-beta.1 → 6.5.0-beta.11

package/presentation/listPresenter/QueryMatcher.js

@@ -1,4 +1,4 @@
-import { action, computed, makeObservable, observable } from "mobx";
+import { action, computed, makeObservable, observableRef } from "mobx";
 class QueryMatcher {
     constructor(config){
         this.config = config;
@@ -8,8 +8,8 @@ class QueryMatcher {
         this.localFilterKeys = new Set(Object.keys(config.localFilters));
         this.getSortValue = config.getSortValue ?? getValueByPath;
         makeObservable(this, {
-            _matcher: observable.ref,
-            _view: observable.ref,
+            _matcher: observableRef,
+            _view: observableRef,
             matcher: computed,
             updateFromQuery: action,
             appendResultKeys: action

package/presentation/listPresenter/QueryMatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/listPresenter/QueryMatcher.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.ts"],"sourcesContent":["import { makeObservable, observable, computed, action } from \"mobx\";\nimport type { IDataSourceQuery } from \"./abstractions.js\";\n\ntype ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;\n\ntype SortValueGetter<TRow> = (item: TRow, field: string) => unknown;\n\nexport interface QueryMatcherConfig<TRow> {\n    keyField: keyof TRow & string;\n    localFilters: Record<string, ItemPredicate<TRow>>;\n    /**\n     * Reads the value of a sort field from an item. Defaults to a dot-path lookup\n     * (e.g. `savedOn`, `values.title`). Override when the query's sort field name\n     * does not match the item's shape.\n     */\n    getSortValue?: SortValueGetter<TRow>;\n}\n\n/**\n * Decides which cached items belong in the current view.\n *\n * A DataSource backed by a shared cache (e.g., per-model entry cache) needs to\n * filter cached items to only those matching the active query. QueryMatcher does\n * this by splitting filters into two categories:\n *\n * - **Local filters** (e.g., folderId, status) — evaluated client-side against\n *   each item using predicates provided via `localFilters` config. Used when\n *   browsing without search or server-side filters.\n *\n * - **Server-side filters** (search, advanced search, any filter key not in\n *   `localFilters`) — cannot be evaluated locally. Instead, QueryMatcher tracks\n *   the set of item keys returned by the last server query (`_queryResultKeys`)\n *   and restricts the view to those items.\n *\n * The `matcher` getter is MobX-computed, so any DataSource `rows` getter that\n * reads it will recompute when the matcher changes after a query.\n *\n * Usage:\n * ```ts\n * const matcher = new QueryMatcher<MyItem>({\n *     keyField: \"id\",\n *     localFilters: {\n *         folderId: (item, value) => item.folderId === value,\n *         status: (item, value) => item.status === value,\n *     }\n * });\n *\n * // In DataSource.query(), after fetching:\n * matcher.updateFromQuery(params, result.data.map(item => item.id), result.meta.hasMoreItems);\n *\n * // In DataSource.rows getter (filters, sorts by the applied sort, and cuts off at the\n * // last loaded item):\n * return matcher.select(cache.getItems());\n * ```\n */\nexport class QueryMatcher<TRow> {\n    private _queryResultKeys: Set<string> | null = null;\n    private _matcher: (item: TRow) => boolean = () => true;\n    private localFilterKeys: Set<string>;\n    private getSortValue: SortValueGetter<TRow>;\n\n    // Ordering state of the current view: the keys the server returned for the active\n    // query (in server order, extended by `appendResultKeys`), the applied sort, and\n    // whether the server has more items beyond the loaded ones.\n    private _view: {\n        resultKeys: string[];\n        sort: IDataSourceQuery[\"sort\"];\n        searching: boolean;\n        hasMore: boolean;\n    } | null = null;\n\n    constructor(private config: QueryMatcherConfig<TRow>) {\n        this.localFilterKeys = new Set(Object.keys(config.localFilters));\n        this.getSortValue = config.getSortValue ?? getValueByPath;\n\n        makeObservable<QueryMatcher<TRow>, \"_matcher\" | \"_view\">(this, {\n            _matcher: observable.ref,\n            _view: observable.ref,\n            matcher: computed,\n            updateFromQuery: action,\n            appendResultKeys: action\n        });\n    }\n\n    get matcher(): (item: TRow) => boolean {\n        return this._matcher;\n    }\n\n    filter(items: TRow[]): TRow[] {\n        return items.filter(this._matcher);\n    }\n\n    /**\n     * Returns the items that belong in the current view, in the view's order.\n     *\n     * The cache is shared by views with different sorts, so its order means nothing to\n     * this view. Instead, matching items are sorted by the applied sort (ties keep the\n     * server order), and the result is cut off after the last item the server returned\n     * for this view. That keeps locally created or updated items in their sort position,\n     * and hides cached items that sort past the loaded pages until pagination reaches them.\n     *\n     * While searching, the server's (relevance) order is kept as is.\n     */\n    select(items: TRow[]): TRow[] {\n        const matched = this.filter(items);\n        const view = this._view;\n        if (!view) {\n            return matched;\n        }\n\n        const serverIndex = new Map(view.resultKeys.map((key, index) => [key, index]));\n        // Items the server did not return for this view (cached by other views, or created\n        // locally) sort after the server's items among equal sort values.\n        const indexOf = (item: TRow) =>\n            serverIndex.get(this.getKey(item)) ?? Number.POSITIVE_INFINITY;\n\n        const sort = view.searching ? undefined : view.sort;\n        const sorted = [...matched].sort((a, b) => {\n            if (sort) {\n                const result = compareValues(\n                    this.getSortValue(a, sort.field),\n                    this.getSortValue(b, sort.field)\n                );\n                if (result !== 0) {\n                    return sort.direction === \"ASC\" ? result : -result;\n                }\n            }\n            const left = indexOf(a);\n            const right = indexOf(b);\n            return left === right ? 0 : left < right ? -1 : 1;\n        });\n\n        if (!view.hasMore) {\n            return sorted;\n        }\n\n        let lastLoaded = -1;\n        sorted.forEach((item, index) => {\n            if (serverIndex.has(this.getKey(item))) {\n                lastLoaded = index;\n            }\n        });\n\n        return lastLoaded < 0 ? sorted : sorted.slice(0, lastLoaded + 1);\n    }\n\n    private getKey(item: TRow): string {\n        return String(item[this.config.keyField]);\n    }\n\n    hasServerSideFilters(params: IDataSourceQuery): boolean {\n        if (params.search) {\n            return true;\n        }\n        const filters = params.filters ?? {};\n        return Object.keys(filters).some(key => !this.localFilterKeys.has(key));\n    }\n\n    updateFromQuery(params: IDataSourceQuery, resultKeys: string[], hasMore = false): void {\n        if (this.hasServerSideFilters(params)) {\n            this._queryResultKeys = new Set(resultKeys);\n        } else {\n            this._queryResultKeys = null;\n        }\n        this._matcher = this.buildMatcher(params);\n        this._view = {\n            resultKeys: [...resultKeys],\n            sort: params.sort,\n            searching: !!params.search,\n            hasMore\n        };\n    }\n\n    appendResultKeys(keys: string[], hasMore = false): void {\n        if (this._queryResultKeys) {\n            for (const key of keys) {\n                this._queryResultKeys.add(key);\n            }\n        }\n        if (this._view) {\n            this._view = {\n                ...this._view,\n                resultKeys: [...this._view.resultKeys, ...keys],\n                hasMore\n            };\n        }\n    }\n\n    private buildMatcher(params: IDataSourceQuery): (item: TRow) => boolean {\n        const filters = params.filters ?? {};\n        const queryResultKeys = this._queryResultKeys;\n        const isSearching = !!params.search;\n        const { keyField, localFilters } = this.config;\n\n        const activeLocalFilters: Array<{ predicate: ItemPredicate<TRow>; value: unknown }> = [];\n        for (const [key, predicate] of Object.entries(localFilters)) {\n            const value = filters[key];\n            if (value !== undefined && value !== null) {\n                activeLocalFilters.push({ predicate, value });\n            }\n        }\n\n        return (item: TRow) => {\n            if (queryResultKeys) {\n                if (!queryResultKeys.has(String(item[keyField]))) {\n                    return false;\n                }\n            } else if (!isSearching) {\n                for (const { predicate, value } of activeLocalFilters) {\n                    if (!predicate(item, value)) {\n                        return false;\n                    }\n                }\n            }\n\n            return true;\n        };\n    }\n}\n\nfunction getValueByPath(item: unknown, path: string): unknown {\n    let current: unknown = item;\n    for (const part of path.split(\".\")) {\n        if (current === null || current === undefined || typeof current !== \"object\") {\n            return undefined;\n        }\n        current = (current as Record<string, unknown>)[part];\n    }\n    return current;\n}\n\n/**\n * Compares two sort values in ascending order, the same way the DDB and SQL storage sort\n * entries: `null` and `undefined` sort last (so first in descending order), and an empty\n * string is a regular string. Strings are compared by code point, which keeps ISO dates in\n * chronological order.\n */\nfunction compareValues(a: unknown, b: unknown): number {\n    const aEmpty = a === null || a === undefined;\n    const bEmpty = b === null || b === undefined;\n    if (aEmpty || bEmpty) {\n        return aEmpty === bEmpty ? 0 : aEmpty ? 1 : -1;\n    }\n\n    const left = a instanceof Date ? a.getTime() : a;\n    const right = b instanceof Date ? b.getTime() : b;\n\n    if (typeof left === \"number\" && typeof right === \"number\") {\n        return left - right;\n    }\n    if (typeof left === \"boolean\" && typeof right === \"boolean\") {\n        return Number(left) - Number(right);\n    }\n\n    const leftString = String(left);\n    const rightString = String(right);\n    return leftString < rightString ? -1 : leftString > rightString ? 1 : 0;\n}\n"],"names":["QueryMatcher","config","Set","Object","getValueByPath","makeObservable","observable","computed","action","items","matched","view","serverIndex","Map","key","index","indexOf","item","Number","sort","undefined","sorted","a","b","result","compareValues","left","right","lastLoaded","String","params","filters","resultKeys","hasMore","keys","queryResultKeys","isSearching","keyField","localFilters","activeLocalFilters","predicate","value","path","current","part","aEmpty","bEmpty","Date","leftString","rightString"],"mappings":"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"}
+{"version":3,"file":"presentation/listPresenter/QueryMatcher.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.ts"],"sourcesContent":["import { makeObservable, observableRef, computed, action } from \"mobx\";\nimport type { IDataSourceQuery } from \"./abstractions.js\";\n\ntype ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;\n\ntype SortValueGetter<TRow> = (item: TRow, field: string) => unknown;\n\nexport interface QueryMatcherConfig<TRow> {\n    keyField: keyof TRow & string;\n    localFilters: Record<string, ItemPredicate<TRow>>;\n    /**\n     * Reads the value of a sort field from an item. Defaults to a dot-path lookup\n     * (e.g. `savedOn`, `values.title`). Override when the query's sort field name\n     * does not match the item's shape.\n     */\n    getSortValue?: SortValueGetter<TRow>;\n}\n\n/**\n * Decides which cached items belong in the current view.\n *\n * A DataSource backed by a shared cache (e.g., per-model entry cache) needs to\n * filter cached items to only those matching the active query. QueryMatcher does\n * this by splitting filters into two categories:\n *\n * - **Local filters** (e.g., folderId, status) — evaluated client-side against\n *   each item using predicates provided via `localFilters` config. Used when\n *   browsing without search or server-side filters.\n *\n * - **Server-side filters** (search, advanced search, any filter key not in\n *   `localFilters`) — cannot be evaluated locally. Instead, QueryMatcher tracks\n *   the set of item keys returned by the last server query (`_queryResultKeys`)\n *   and restricts the view to those items.\n *\n * The `matcher` getter is MobX-computed, so any DataSource `rows` getter that\n * reads it will recompute when the matcher changes after a query.\n *\n * Usage:\n * ```ts\n * const matcher = new QueryMatcher<MyItem>({\n *     keyField: \"id\",\n *     localFilters: {\n *         folderId: (item, value) => item.folderId === value,\n *         status: (item, value) => item.status === value,\n *     }\n * });\n *\n * // In DataSource.query(), after fetching:\n * matcher.updateFromQuery(params, result.data.map(item => item.id), result.meta.hasMoreItems);\n *\n * // In DataSource.rows getter (filters, sorts by the applied sort, and cuts off at the\n * // last loaded item):\n * return matcher.select(cache.getItems());\n * ```\n */\nexport class QueryMatcher<TRow> {\n    private _queryResultKeys: Set<string> | null = null;\n    private _matcher: (item: TRow) => boolean = () => true;\n    private localFilterKeys: Set<string>;\n    private getSortValue: SortValueGetter<TRow>;\n\n    // Ordering state of the current view: the keys the server returned for the active\n    // query (in server order, extended by `appendResultKeys`), the applied sort, and\n    // whether the server has more items beyond the loaded ones.\n    private _view: {\n        resultKeys: string[];\n        sort: IDataSourceQuery[\"sort\"];\n        searching: boolean;\n        hasMore: boolean;\n    } | null = null;\n\n    constructor(private config: QueryMatcherConfig<TRow>) {\n        this.localFilterKeys = new Set(Object.keys(config.localFilters));\n        this.getSortValue = config.getSortValue ?? getValueByPath;\n\n        makeObservable<QueryMatcher<TRow>, \"_matcher\" | \"_view\">(this, {\n            _matcher: observableRef,\n            _view: observableRef,\n            matcher: computed,\n            updateFromQuery: action,\n            appendResultKeys: action\n        });\n    }\n\n    get matcher(): (item: TRow) => boolean {\n        return this._matcher;\n    }\n\n    filter(items: TRow[]): TRow[] {\n        return items.filter(this._matcher);\n    }\n\n    /**\n     * Returns the items that belong in the current view, in the view's order.\n     *\n     * The cache is shared by views with different sorts, so its order means nothing to\n     * this view. Instead, matching items are sorted by the applied sort (ties keep the\n     * server order), and the result is cut off after the last item the server returned\n     * for this view. That keeps locally created or updated items in their sort position,\n     * and hides cached items that sort past the loaded pages until pagination reaches them.\n     *\n     * While searching, the server's (relevance) order is kept as is.\n     */\n    select(items: TRow[]): TRow[] {\n        const matched = this.filter(items);\n        const view = this._view;\n        if (!view) {\n            return matched;\n        }\n\n        const serverIndex = new Map(view.resultKeys.map((key, index) => [key, index]));\n        // Items the server did not return for this view (cached by other views, or created\n        // locally) sort after the server's items among equal sort values.\n        const indexOf = (item: TRow) =>\n            serverIndex.get(this.getKey(item)) ?? Number.POSITIVE_INFINITY;\n\n        const sort = view.searching ? undefined : view.sort;\n        const sorted = [...matched].sort((a, b) => {\n            if (sort) {\n                const result = compareValues(\n                    this.getSortValue(a, sort.field),\n                    this.getSortValue(b, sort.field)\n                );\n                if (result !== 0) {\n                    return sort.direction === \"ASC\" ? result : -result;\n                }\n            }\n            const left = indexOf(a);\n            const right = indexOf(b);\n            return left === right ? 0 : left < right ? -1 : 1;\n        });\n\n        if (!view.hasMore) {\n            return sorted;\n        }\n\n        let lastLoaded = -1;\n        sorted.forEach((item, index) => {\n            if (serverIndex.has(this.getKey(item))) {\n                lastLoaded = index;\n            }\n        });\n\n        return lastLoaded < 0 ? sorted : sorted.slice(0, lastLoaded + 1);\n    }\n\n    private getKey(item: TRow): string {\n        return String(item[this.config.keyField]);\n    }\n\n    hasServerSideFilters(params: IDataSourceQuery): boolean {\n        if (params.search) {\n            return true;\n        }\n        const filters = params.filters ?? {};\n        return Object.keys(filters).some(key => !this.localFilterKeys.has(key));\n    }\n\n    updateFromQuery(params: IDataSourceQuery, resultKeys: string[], hasMore = false): void {\n        if (this.hasServerSideFilters(params)) {\n            this._queryResultKeys = new Set(resultKeys);\n        } else {\n            this._queryResultKeys = null;\n        }\n        this._matcher = this.buildMatcher(params);\n        this._view = {\n            resultKeys: [...resultKeys],\n            sort: params.sort,\n            searching: !!params.search,\n            hasMore\n        };\n    }\n\n    appendResultKeys(keys: string[], hasMore = false): void {\n        if (this._queryResultKeys) {\n            for (const key of keys) {\n                this._queryResultKeys.add(key);\n            }\n        }\n        if (this._view) {\n            this._view = {\n                ...this._view,\n                resultKeys: [...this._view.resultKeys, ...keys],\n                hasMore\n            };\n        }\n    }\n\n    private buildMatcher(params: IDataSourceQuery): (item: TRow) => boolean {\n        const filters = params.filters ?? {};\n        const queryResultKeys = this._queryResultKeys;\n        const isSearching = !!params.search;\n        const { keyField, localFilters } = this.config;\n\n        const activeLocalFilters: Array<{ predicate: ItemPredicate<TRow>; value: unknown }> = [];\n        for (const [key, predicate] of Object.entries(localFilters)) {\n            const value = filters[key];\n            if (value !== undefined && value !== null) {\n                activeLocalFilters.push({ predicate, value });\n            }\n        }\n\n        return (item: TRow) => {\n            if (queryResultKeys) {\n                if (!queryResultKeys.has(String(item[keyField]))) {\n                    return false;\n                }\n            } else if (!isSearching) {\n                for (const { predicate, value } of activeLocalFilters) {\n                    if (!predicate(item, value)) {\n                        return false;\n                    }\n                }\n            }\n\n            return true;\n        };\n    }\n}\n\nfunction getValueByPath(item: unknown, path: string): unknown {\n    let current: unknown = item;\n    for (const part of path.split(\".\")) {\n        if (current === null || current === undefined || typeof current !== \"object\") {\n            return undefined;\n        }\n        current = (current as Record<string, unknown>)[part];\n    }\n    return current;\n}\n\n/**\n * Compares two sort values in ascending order, the same way the DDB and SQL storage sort\n * entries: `null` and `undefined` sort last (so first in descending order), and an empty\n * string is a regular string. Strings are compared by code point, which keeps ISO dates in\n * chronological order.\n */\nfunction compareValues(a: unknown, b: unknown): number {\n    const aEmpty = a === null || a === undefined;\n    const bEmpty = b === null || b === undefined;\n    if (aEmpty || bEmpty) {\n        return aEmpty === bEmpty ? 0 : aEmpty ? 1 : -1;\n    }\n\n    const left = a instanceof Date ? a.getTime() : a;\n    const right = b instanceof Date ? b.getTime() : b;\n\n    if (typeof left === \"number\" && typeof right === \"number\") {\n        return left - right;\n    }\n    if (typeof left === \"boolean\" && typeof right === \"boolean\") {\n        return Number(left) - Number(right);\n    }\n\n    const leftString = String(left);\n    const rightString = String(right);\n    return leftString < rightString ? -1 : leftString > rightString ? 1 : 0;\n}\n"],"names":["QueryMatcher","config","Set","Object","getValueByPath","makeObservable","observableRef","computed","action","items","matched","view","serverIndex","Map","key","index","indexOf","item","Number","sort","undefined","sorted","a","b","result","compareValues","left","right","lastLoaded","String","params","filters","resultKeys","hasMore","keys","queryResultKeys","isSearching","keyField","localFilters","activeLocalFilters","predicate","value","path","current","part","aEmpty","bEmpty","Date","leftString","rightString"],"mappings":"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"}

package/presentation/trashBin/components/BulkActions/DeleteItems.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
-export declare const BulkActionsDeleteItems: (() => React.JSX.Element) & {
-    displayName: string;
+export declare const BulkActionsDeleteItems: (() => React.JSX.Element) & React.NamedExoticComponent<unknown> & {
+    readonly type: () => React.JSX.Element;
 };

package/presentation/trashBin/components/BulkActions/RestoreItems.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
-export declare const BulkActionsRestoreItems: (() => React.JSX.Element) & {
-    displayName: string;
+export declare const BulkActionsRestoreItems: (() => React.JSX.Element) & React.NamedExoticComponent<unknown> & {
+    readonly type: () => React.JSX.Element;
 };

package/presentation/trashBin/components/TrashBinOverlay.d.ts

@@ -6,7 +6,7 @@ interface TrashBinOverlayProps {
     onExited: () => void;
     onItemAfterRestore?: (item: TrashBinItem) => Promise<void>;
 }
-export declare const TrashBinOverlay: (({ presenter, title, onExited, onItemAfterRestore }: TrashBinOverlayProps) => React.JSX.Element) & {
-    displayName: string;
+export declare const TrashBinOverlay: (({ presenter, title, onExited, onItemAfterRestore }: TrashBinOverlayProps) => React.JSX.Element) & React.NamedExoticComponent<TrashBinOverlayProps> & {
+    readonly type: ({ presenter, title, onExited, onItemAfterRestore }: TrashBinOverlayProps) => React.JSX.Element;
 };
 export {};

package/base/Base/FieldRenderers/ObjectRenderer/TemplatePicker.js

@@ -1,68 +0,0 @@
-import react, { useState } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { Button, Dialog, Text } from "@webiny/admin-ui";
-import { ReactComponent } from "@webiny/icons/add.svg";
-import { ReactComponent as add_circle_outline_svg_ReactComponent } from "@webiny/icons/add_circle_outline.svg";
-const normalizeIcon = (icon)=>{
-    if (!icon) return;
-    return icon.name.split("/");
-};
-const AddTemplateButton = ({ templates, onSelect, label, size = "sm", variant = "tertiary" })=>/*#__PURE__*/ react.createElement("div", {
-        className: "flex justify-between items-center"
-    }, /*#__PURE__*/ react.createElement(Dialog, {
-        size: "lg",
-        className: "w-[800px]",
-        trigger: /*#__PURE__*/ react.createElement(Button, {
-            size: size,
-            variant: variant,
-            text: label,
-            icon: /*#__PURE__*/ react.createElement(ReactComponent, null)
-        }),
-        title: "Insert a template",
-        info: /*#__PURE__*/ react.createElement(react.Fragment, null)
-    }, /*#__PURE__*/ react.createElement(TemplateGallery, {
-        templates: templates,
-        onSelect: onSelect
-    })));
-const TemplateGallery = ({ templates, onSelect })=>/*#__PURE__*/ react.createElement("div", {
-        className: "gap-md flex flex-wrap p-xs"
-    }, templates.map((template)=>/*#__PURE__*/ react.createElement(TemplateCard, {
-            key: template.id,
-            template: template,
-            onSelect: onSelect
-        })));
-const TemplateCard = ({ template, onSelect })=>{
-    const [isHovered, setIsHovered] = useState(false);
-    const icon = normalizeIcon(template.icon);
-    return /*#__PURE__*/ react.createElement("div", {
-        onMouseEnter: ()=>setIsHovered(true),
-        onMouseLeave: ()=>setIsHovered(false),
-        className: "flex flex-col justify-between bg-neutral-base overflow-hidden rounded-lg w-[173px] relative shadow-sm"
-    }, /*#__PURE__*/ react.createElement("div", null, /*#__PURE__*/ react.createElement("div", {
-        className: "flex items-center justify-center py-xxl w-full bg-neutral-dimmed"
-    }, icon ? /*#__PURE__*/ react.createElement(FontAwesomeIcon, {
-        className: "text-neutral-xstrong",
-        icon: icon,
-        style: {
-            width: 40,
-            height: 40
-        }
-    }) : null), /*#__PURE__*/ react.createElement("div", {
-        className: "py-sm-extra px-md"
-    }, /*#__PURE__*/ react.createElement(Text, {
-        size: "md",
-        className: "mb-xs text-neutral-primary font-semibold"
-    }, template.label))), isHovered && /*#__PURE__*/ react.createElement(Dialog.Close, {
-        asChild: true
-    }, /*#__PURE__*/ react.createElement("div", {
-        className: "absolute inset-0 flex items-center justify-center bg-white/80 cursor-pointer",
-        onClick: ()=>onSelect(template)
-    }, /*#__PURE__*/ react.createElement(Button, {
-        size: "lg",
-        variant: "primary",
-        icon: /*#__PURE__*/ react.createElement(add_circle_outline_svg_ReactComponent, null)
-    }, "Insert"))));
-};
-export { AddTemplateButton };
-
-//# sourceMappingURL=TemplatePicker.js.map

package/base/Base/FieldRenderers/ObjectRenderer/TemplatePicker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"base/Base/FieldRenderers/ObjectRenderer/TemplatePicker.js","sources":["../../../../../src/base/Base/FieldRenderers/ObjectRenderer/TemplatePicker.tsx"],"sourcesContent":["import React, { useState } from \"react\";\nimport type { IconProp } from \"@fortawesome/fontawesome-svg-core\";\nimport { FontAwesomeIcon } from \"@fortawesome/react-fontawesome\";\nimport { Button, Dialog, Text } from \"@webiny/admin-ui\";\nimport { ReactComponent as AddIcon } from \"@webiny/icons/add.svg\";\nimport { ReactComponent as PlusIcon } from \"@webiny/icons/add_circle_outline.svg\";\nimport type { ITemplateIcon, ITemplateVM } from \"~/features/formModel/index.js\";\n\nconst normalizeIcon = (icon: ITemplateIcon | undefined): IconProp | undefined => {\n    if (!icon) {\n        return undefined;\n    }\n    return icon.name.split(\"/\") as IconProp;\n};\n\nexport interface AddTemplateButtonProps {\n    templates: ITemplateVM[];\n    onSelect: (template: ITemplateVM) => void;\n    label?: string;\n    size?: \"sm\" | \"md\" | \"lg\";\n    variant?: \"primary\" | \"secondary\" | \"tertiary\";\n}\n\nexport const AddTemplateButton = ({\n    templates,\n    onSelect,\n    label,\n    size = \"sm\",\n    variant = \"tertiary\"\n}: AddTemplateButtonProps) => {\n    return (\n        <div className={\"flex justify-between items-center\"}>\n            <Dialog\n                size={\"lg\"}\n                className={\"w-[800px]\"}\n                trigger={<Button size={size} variant={variant} text={label} icon={<AddIcon />} />}\n                title={\"Insert a template\"}\n                info={<></>}\n            >\n                <TemplateGallery templates={templates} onSelect={onSelect} />\n            </Dialog>\n        </div>\n    );\n};\n\ninterface TemplateGalleryProps {\n    templates: ITemplateVM[];\n    onSelect: (template: ITemplateVM) => void;\n}\n\nconst TemplateGallery = ({ templates, onSelect }: TemplateGalleryProps) => {\n    return (\n        <div className={\"gap-md flex flex-wrap p-xs\"}>\n            {templates.map(template => (\n                <TemplateCard key={template.id} template={template} onSelect={onSelect} />\n            ))}\n        </div>\n    );\n};\n\ninterface TemplateCardProps {\n    template: ITemplateVM;\n    onSelect: (template: ITemplateVM) => void;\n}\n\nconst TemplateCard = ({ template, onSelect }: TemplateCardProps) => {\n    const [isHovered, setIsHovered] = useState(false);\n    const icon = normalizeIcon(template.icon);\n\n    return (\n        <div\n            onMouseEnter={() => setIsHovered(true)}\n            onMouseLeave={() => setIsHovered(false)}\n            className={\n                \"flex flex-col justify-between bg-neutral-base overflow-hidden rounded-lg w-[173px] relative shadow-sm\"\n            }\n        >\n            <div>\n                <div className={\"flex items-center justify-center py-xxl w-full bg-neutral-dimmed\"}>\n                    {icon ? (\n                        <FontAwesomeIcon\n                            className={\"text-neutral-xstrong\"}\n                            icon={icon}\n                            style={{ width: 40, height: 40 }}\n                        />\n                    ) : null}\n                </div>\n                <div className={\"py-sm-extra px-md\"}>\n                    <Text size={\"md\"} className={\"mb-xs text-neutral-primary font-semibold\"}>\n                        {template.label}\n                    </Text>\n                </div>\n            </div>\n\n            {isHovered && (\n                <Dialog.Close asChild>\n                    <div\n                        className={\n                            \"absolute inset-0 flex items-center justify-center bg-white/80 cursor-pointer\"\n                        }\n                        onClick={() => onSelect(template)}\n                    >\n                        <Button size={\"lg\"} variant={\"primary\"} icon={<PlusIcon />}>\n                            Insert\n                        </Button>\n                    </div>\n                </Dialog.Close>\n            )}\n        </div>\n    );\n};\n"],"names":["normalizeIcon","icon","AddTemplateButton","templates","onSelect","label","size","variant","Dialog","Button","AddIcon","TemplateGallery","template","TemplateCard","isHovered","setIsHovered","useState","FontAwesomeIcon","Text","PlusIcon"],"mappings":";;;;;AAQA,MAAMA,gBAAgB,CAACC;IACnB,IAAI,CAACA,MACD;IAEJ,OAAOA,KAAK,IAAI,CAAC,KAAK,CAAC;AAC3B;AAUO,MAAMC,oBAAoB,CAAC,EAC9BC,SAAS,EACTC,QAAQ,EACRC,KAAK,EACLC,OAAO,IAAI,EACXC,UAAU,UAAU,EACC,GACd,WAAP,GACI,oBAAC;QAAI,WAAW;qBACZ,oBAACC,QAAMA;QACH,MAAM;QACN,WAAW;QACX,uBAAS,oBAACC,QAAMA;YAAC,MAAMH;YAAM,SAASC;YAAS,MAAMF;YAAO,oBAAM,oBAACK,gBAAOA;;QAC1E,OAAO;QACP,oBAAM;qBAEN,oBAACC,iBAAeA;QAAC,WAAWR;QAAW,UAAUC;;AAWjE,MAAMO,kBAAkB,CAAC,EAAER,SAAS,EAAEC,QAAQ,EAAwB,GAC3D,WAAP,GACI,oBAAC;QAAI,WAAW;OACXD,UAAU,GAAG,CAACS,CAAAA,WAAAA,WAAAA,GACX,oBAACC,cAAYA;YAAC,KAAKD,SAAS,EAAE;YAAE,UAAUA;YAAU,UAAUR;;AAW9E,MAAMS,eAAe,CAAC,EAAED,QAAQ,EAAER,QAAQ,EAAqB;IAC3D,MAAM,CAACU,WAAWC,aAAa,GAAGC,SAAS;IAC3C,MAAMf,OAAOD,cAAcY,SAAS,IAAI;IAExC,OAAO,WAAP,GACI,oBAAC;QACG,cAAc,IAAMG,aAAa;QACjC,cAAc,IAAMA,aAAa;QACjC,WACI;qBAGJ,oBAAC,2BACG,oBAAC;QAAI,WAAW;OACXd,OAAO,WAAPA,GACG,oBAACgB,iBAAeA;QACZ,WAAW;QACX,MAAMhB;QACN,OAAO;YAAE,OAAO;YAAI,QAAQ;QAAG;SAEnC,qBAER,oBAAC;QAAI,WAAW;qBACZ,oBAACiB,MAAIA;QAAC,MAAM;QAAM,WAAW;OACxBN,SAAS,KAAK,KAK1BE,aAAa,WAAbA,GACG,oBAACN,OAAO,KAAK;QAAC;qBACV,oBAAC;QACG,WACI;QAEJ,SAAS,IAAMJ,SAASQ;qBAExB,oBAACH,QAAMA;QAAC,MAAM;QAAM,SAAS;QAAW,oBAAM,oBAACU,uCAAQA;OAAK;AAQpF"}