payload 1.0.34 → 1.1.0

package/dist/admin/components/forms/field-types/RichText/elements/relationship/Button/index.js

@@ -1,6 +1,5 @@
 import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import { Modal, useModal } from '@faceless-ui/modal';
-import { Transforms } from 'slate';
 import { ReactEditor, useSlate } from 'slate-react';
 import { useConfig } from '../../../../../../utilities/Config';
 import ElementButton from '../../Button';
@@ -26,14 +25,11 @@ const insertRelationship = (editor, { value, relationTo }) => {
             text,
         ],
     };
-    if (editor.blurSelection) {
-        Transforms.select(editor, editor.blurSelection);
-    }
     injectVoidElement(editor, relationship);
     ReactEditor.focus(editor);
 };
 const RelationshipButton = ({ path }) => {
-    const { open, closeAll } = useModal();
+    const { toggleModal } = useModal();
     const editor = useSlate();
     const { serverURL, routes: { api }, collections } = useConfig();
     const [renderModal, setRenderModal] = useState(false);
@@ -45,15 +41,15 @@ const RelationshipButton = ({ path }) => {
         const res = await requests.get(`${serverURL}${api}/${relationTo}/${value}?depth=0`);
         const json = await res.json();
         insertRelationship(editor, { value: { id: json.id }, relationTo });
-        closeAll();
+        toggleModal(modalSlug);
         setRenderModal(false);
         setLoading(false);
-    }, [editor, closeAll, api, serverURL]);
+    }, [editor, toggleModal, modalSlug, api, serverURL]);
     useEffect(() => {
         if (renderModal) {
-            open(modalSlug);
+            toggleModal(modalSlug);
         }
-    }, [renderModal, open, modalSlug]);
+    }, [renderModal, toggleModal, modalSlug]);
     if (!hasEnabledCollections)
         return null;
     return (React.createElement(Fragment, null,
@@ -64,7 +60,7 @@ const RelationshipButton = ({ path }) => {
                 React.createElement("header", { className: `${baseClass}__header` },
                     React.createElement("h3", null, "Add Relationship"),
                     React.createElement(Button, { buttonStyle: "none", onClick: () => {
-                            closeAll();
+                            toggleModal(modalSlug);
                             setRenderModal(false);
                         } },
                         React.createElement(X, null))),

package/dist/admin/components/forms/field-types/RichText/elements/toggle.js

@@ -12,9 +12,6 @@ const toggleElement = (editor, format) => {
     else if (isList) {
         type = 'li';
     }
-    if (editor.blurSelection) {
-        Transforms.select(editor, editor.blurSelection);
-    }
     Transforms.unwrapNodes(editor, {
         match: (n) => Element.isElement(n) && listTypes.includes(n.type),
         split: true,

package/dist/admin/components/forms/field-types/RichText/elements/upload/Button/index.js

@@ -1,6 +1,5 @@
 import React, { Fragment, useEffect, useState } from 'react';
 import { Modal, useModal } from '@faceless-ui/modal';
-import { Transforms } from 'slate';
 import { ReactEditor, useSlate } from 'slate-react';
 import { useConfig } from '../../../../../../utilities/Config';
 import ElementButton from '../../Button';
@@ -30,15 +29,12 @@ const insertUpload = (editor, { value, relationTo }) => {
             text,
         ],
     };
-    if (editor.blurSelection) {
-        Transforms.select(editor, editor.blurSelection);
-    }
     injectVoidElement(editor, upload);
     ReactEditor.focus(editor);
 };
 const UploadButton = ({ path }) => {
-    var _a, _b;
-    const { open, closeAll, currentModal } = useModal();
+    var _a, _b, _c;
+    const { toggleModal, modalState } = useModal();
     const editor = useSlate();
     const { serverURL, routes: { api }, collections } = useConfig();
     const [availableCollections] = useState(() => collections.filter(({ admin: { enableRichTextRelationship }, upload }) => (Boolean(upload) && enableRichTextRelationship)));
@@ -58,7 +54,7 @@ const UploadButton = ({ path }) => {
     const [page, setPage] = useState(null);
     const modalSlug = `${path}-add-upload`;
     const moreThanOneAvailableCollection = availableCollections.length > 1;
-    const isOpen = currentModal === modalSlug;
+    const isOpen = (_a = modalState[modalSlug]) === null || _a === void 0 ? void 0 : _a.isOpen;
     // If modal is open, get active page of upload gallery
     const apiURL = isOpen ? `${serverURL}${api}/${modalCollection.slug}` : null;
     const [{ data }, { setParams }] = usePayloadAPI(apiURL, {});
@@ -69,9 +65,9 @@ const UploadButton = ({ path }) => {
     }, [modalCollection]);
     useEffect(() => {
         if (renderModal) {
-            open(modalSlug);
+            toggleModal(modalSlug);
         }
-    }, [renderModal, open, modalSlug]);
+    }, [renderModal, toggleModal, modalSlug]);
     useEffect(() => {
         const params = {};
         if (page)
@@ -102,7 +98,7 @@ const UploadButton = ({ path }) => {
                     ' ',
                     modalCollection.labels.singular),
                 React.createElement(Button, { icon: "x", round: true, buttonStyle: "icon-label", iconStyle: "with-border", onClick: () => {
-                        closeAll();
+                        toggleModal(modalSlug);
                         setRenderModal(false);
                     } })),
             moreThanOneAvailableCollection && (React.createElement("div", { className: `${baseModalClass}__select-collection-wrap` },
@@ -120,7 +116,7 @@ const UploadButton = ({ path }) => {
                         relationTo: modalCollection.slug,
                     });
                     setRenderModal(false);
-                    closeAll();
+                    toggleModal(modalSlug);
                 } }),
             React.createElement("div", { className: `${baseModalClass}__page-controls` },
                 React.createElement(Paginator, { limit: data.limit, totalPages: data.totalPages, page: data.page, hasPrevPage: data.hasPrevPage, hasNextPage: data.hasNextPage, prevPage: data.prevPage, nextPage: data.nextPage, numberOfNeighbors: 1, onChange: setPage, disableHistoryChange: true }),
@@ -133,6 +129,6 @@ const UploadButton = ({ path }) => {
                         "of",
                         ' ',
                         data.totalDocs),
-                    React.createElement(PerPage, { limits: (_b = (_a = modalCollection === null || modalCollection === void 0 ? void 0 : modalCollection.admin) === null || _a === void 0 ? void 0 : _a.pagination) === null || _b === void 0 ? void 0 : _b.limits, limit: limit, modifySearchParams: false, handleChange: setLimit }))))))))));
+                    React.createElement(PerPage, { limits: (_c = (_b = modalCollection === null || modalCollection === void 0 ? void 0 : modalCollection.admin) === null || _b === void 0 ? void 0 : _b.pagination) === null || _c === void 0 ? void 0 : _c.limits, limit: limit, modifySearchParams: false, handleChange: setLimit }))))))))));
 };
 export default UploadButton;

package/dist/admin/components/forms/field-types/RichText/elements/upload/Element/EditModal/index.js

@@ -9,7 +9,6 @@ import Button from '../../../../../../../elements/Button';
 import RenderFields from '../../../../../../RenderFields';
 import fieldTypes from '../../../../..';
 import Form from '../../../../../../Form';
-import reduceFieldsToValues from '../../../../../../Form/reduceFieldsToValues';
 import Submit from '../../../../../../Submit';
 import { useLocale } from '../../../../../../../utilities/Locale';
 import './index.scss';
@@ -19,9 +18,9 @@ export const EditModal = ({ slug, closeModal, relatedCollectionConfig, fieldSche
     const [initialState, setInitialState] = useState({});
     const { user } = useAuth();
     const locale = useLocale();
-    const handleUpdateEditData = useCallback((fields) => {
+    const handleUpdateEditData = useCallback((_, data) => {
         const newNode = {
-            fields: reduceFieldsToValues(fields, true),
+            fields: data,
         };
         const elementPath = ReactEditor.findPath(editor, element);
         Transforms.setNodes(editor, newNode, { at: elementPath });

package/dist/admin/components/forms/field-types/RichText/elements/upload/Element/index.js

@@ -17,7 +17,7 @@ const initialParams = {
 const Element = ({ attributes, children, element, path, fieldProps }) => {
     var _a, _b, _c, _d;
     const { relationTo, value } = element;
-    const { closeAll, open } = useModal();
+    const { toggleModal } = useModal();
     const { collections, serverURL, routes: { api } } = useConfig();
     const [modalToRender, setModalToRender] = useState(undefined);
     const [relatedCollection, setRelatedCollection] = useState(() => collections.find((coll) => coll.slug === relationTo));
@@ -33,14 +33,14 @@ const Element = ({ attributes, children, element, path, fieldProps }) => {
         Transforms.removeNodes(editor, { at: elementPath });
     }, [editor, element]);
     const closeModal = useCallback(() => {
-        closeAll();
+        toggleModal(modalSlug);
         setModalToRender(null);
-    }, [closeAll]);
+    }, [toggleModal, modalSlug]);
     useEffect(() => {
-        if (modalToRender && modalSlug) {
-            open(`${modalSlug}`);
+        if (modalToRender) {
+            toggleModal(modalSlug);
         }
-    }, [modalToRender, open, modalSlug]);
+    }, [modalToRender, toggleModal, modalSlug]);
     const fieldSchema = (_d = (_c = (_b = (_a = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.admin) === null || _a === void 0 ? void 0 : _a.upload) === null || _b === void 0 ? void 0 : _b.collections) === null || _c === void 0 ? void 0 : _c[relatedCollection.slug]) === null || _d === void 0 ? void 0 : _d.fields;
     return (React.createElement("div", { className: [
             baseClass,

package/dist/admin/components/forms/field-types/RichText/types.d.ts

@@ -1,8 +1,4 @@
-import { BaseEditor, Selection } from 'slate';
 import { RichTextField } from '../../../../../fields/config/types';
 export declare type Props = Omit<RichTextField, 'type'> & {
     path?: string;
 };
-export interface BlurSelectionEditor extends BaseEditor {
-    blurSelection?: Selection;
-}

package/dist/admin/components/forms/field-types/Tabs/index.js

@@ -1,11 +1,11 @@
 import React, { useState } from 'react';
 import RenderFields from '../../RenderFields';
 import withCondition from '../../withCondition';
+import { fieldAffectsData, tabHasName } from '../../../../../fields/config/types';
 import FieldDescription from '../../FieldDescription';
 import toKebabCase from '../../../../../utilities/toKebabCase';
 import { useCollapsible } from '../../../elements/Collapsible/provider';
 import { TabsProvider } from './provider';
-import { getFieldPath } from '../getFieldPath';
 import './index.scss';
 const baseClass = 'tabs-field';
 const TabsField = (props) => {
@@ -24,16 +24,16 @@ const TabsField = (props) => {
                     return (React.createElement("button", { key: i, type: "button", className: [
                             `${baseClass}__tab-button`,
                             active === i && `${baseClass}__tab-button--active`,
-                        ].filter(Boolean).join(' '), onClick: () => setActive(i) }, tab.label));
+                        ].filter(Boolean).join(' '), onClick: () => setActive(i) }, tab.label ? tab.label : (tabHasName(tab) && tab.name)));
                 }))),
             React.createElement("div", { className: `${baseClass}__content-wrap` }, activeTab && (React.createElement("div", { className: [
                     `${baseClass}__tab`,
                     `${baseClass}__tab-${toKebabCase(activeTab.label)}`,
                 ].join(' ') },
                 React.createElement(FieldDescription, { className: `${baseClass}__description`, description: activeTab.description }),
-                React.createElement(RenderFields, { key: activeTab.label, forceRender: true, readOnly: readOnly, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldTypes: fieldTypes, fieldSchema: activeTab.fields.map((field) => ({
+                React.createElement(RenderFields, { forceRender: true, readOnly: readOnly, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldTypes: fieldTypes, fieldSchema: activeTab.fields.map((field) => ({
                         ...field,
-                        path: getFieldPath(path, field),
+                        path: `${path ? `${path}.` : ''}${tabHasName(activeTab) ? `${activeTab.name}.` : ''}${fieldAffectsData(field) ? field.name : ''}`,
                     })) })))))));
 };
 export default withCondition(TabsField);

package/dist/admin/components/forms/field-types/Text/Input.d.ts

@@ -11,10 +11,12 @@ export declare type TextInputProps = Omit<TextField, 'type'> & {
     value?: string;
     description?: Description;
     onChange?: (e: ChangeEvent<HTMLInputElement>) => void;
+    onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>;
     placeholder?: string;
     style?: React.CSSProperties;
     className?: string;
     width?: string;
+    inputRef?: React.MutableRefObject<HTMLInputElement>;
 };
 declare const TextInput: React.FC<TextInputProps>;
 export default TextInput;

package/dist/admin/components/forms/field-types/Text/Input.js

@@ -2,10 +2,9 @@ import React from 'react';
 import Label from '../../Label';
 import Error from '../../Error';
 import FieldDescription from '../../FieldDescription';
-// import { FieldType } from '../../useField/types';
 import './index.scss';
 const TextInput = (props) => {
-    const { showError, errorMessage, placeholder, readOnly, path, label, required, value, onChange, description, style, className, width, } = props;
+    const { showError, errorMessage, placeholder, readOnly, path, label, required, value, onChange, onKeyDown, description, style, className, width, inputRef, } = props;
     const classes = [
         'field-type',
         'text',
@@ -19,7 +18,7 @@ const TextInput = (props) => {
         } },
         React.createElement(Error, { showError: showError, message: errorMessage }),
         React.createElement(Label, { htmlFor: `field-${path.replace(/\./gi, '__')}`, label: label, required: required }),
-        React.createElement("input", { id: `field-${path.replace(/\./gi, '__')}`, value: value || '', onChange: onChange, disabled: readOnly, placeholder: placeholder, type: "text", name: path }),
+        React.createElement("input", { ref: inputRef, id: `field-${path.replace(/\./gi, '__')}`, value: value || '', onChange: onChange, onKeyDown: onKeyDown, disabled: readOnly, placeholder: placeholder, type: "text", name: path }),
         React.createElement(FieldDescription, { value: value, description: description })));
 };
 export default TextInput;

package/dist/admin/components/forms/field-types/Text/index.js

@@ -4,7 +4,7 @@ import withCondition from '../../withCondition';
 import { text } from '../../../../../fields/validations';
 import TextInput from './Input';
 const Text = (props) => {
-    const { path: pathFromProps, name, required, validate = text, label, minLength, maxLength, admin: { placeholder, readOnly, style, className, width, description, condition, } = {}, } = props;
+    const { path: pathFromProps, name, required, validate = text, label, minLength, maxLength, admin: { placeholder, readOnly, style, className, width, description, condition, } = {}, inputRef, } = props;
     const path = pathFromProps || name;
     const memoizedValidate = useCallback((value, options) => {
         return validate(value, { ...options, minLength, maxLength, required });
@@ -18,6 +18,6 @@ const Text = (props) => {
     const { value, showError, setValue, errorMessage, } = field;
     return (React.createElement(TextInput, { path: path, name: name, onChange: (e) => {
             setValue(e.target.value);
-        }, showError: showError, errorMessage: errorMessage, required: required, label: label, value: value, placeholder: placeholder, readOnly: readOnly, style: style, className: className, width: width, description: description }));
+        }, showError: showError, errorMessage: errorMessage, required: required, label: label, value: value, placeholder: placeholder, readOnly: readOnly, style: style, className: className, width: width, description: description, inputRef: inputRef }));
 };
 export default withCondition(Text);

package/dist/admin/components/forms/field-types/Text/types.d.ts

@@ -1,4 +1,7 @@
+/// <reference types="react" />
 import { TextField } from '../../../../../fields/config/types';
 export declare type Props = Omit<TextField, 'type'> & {
     path?: string;
+    inputRef?: React.MutableRefObject<HTMLInputElement>;
+    onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>;
 };

package/dist/admin/components/forms/field-types/Upload/Add/index.js

@@ -16,11 +16,11 @@ const AddUploadModal = (props) => {
     const { collection, collection: { admin: { description, } = {}, } = {}, slug, fieldTypes, setValue, } = props;
     const { permissions } = useAuth();
     const { serverURL, routes: { api } } = useConfig();
-    const { closeAll } = useModal();
+    const { toggleModal } = useModal();
     const onSuccess = useCallback((json) => {
-        closeAll();
+        toggleModal(slug);
         setValue(json.doc);
-    }, [closeAll, setValue]);
+    }, [toggleModal, slug, setValue]);
     const classes = [
         baseClass,
     ].filter(Boolean).join(' ');
@@ -35,7 +35,7 @@ const AddUploadModal = (props) => {
                             ' ',
                             collection.labels.singular),
                         React.createElement(FormSubmit, null, "Save"),
-                        React.createElement(Button, { icon: "x", round: true, buttonStyle: "icon-label", iconStyle: "with-border", onClick: closeAll })),
+                        React.createElement(Button, { icon: "x", round: true, buttonStyle: "icon-label", iconStyle: "with-border", onClick: () => toggleModal(slug) })),
                     description && (React.createElement("div", { className: `${baseClass}__sub-header` },
                         React.createElement(ViewDescription, { description: description })))),
                 React.createElement(Upload, { collection: collection }),

package/dist/admin/components/forms/field-types/Upload/Input.js

@@ -11,7 +11,7 @@ import './index.scss';
 const baseClass = 'upload';
 const UploadInput = (props) => {
     const { path, required, readOnly, style, className, width, description, label, relationTo, fieldTypes, value, onChange, showError, serverURL = 'http://localhost:3000', api = '/api', collection, errorMessage, filterOptions, } = props;
-    const { toggle } = useModal();
+    const { toggleModal } = useModal();
     const addModalSlug = `${path}-add`;
     const selectExistingModalSlug = `${path}-select-existing`;
     const [file, setFile] = useState(undefined);
@@ -59,13 +59,13 @@ const UploadInput = (props) => {
                 } })),
             (!file || missingFile) && (React.createElement("div", { className: `${baseClass}__wrap` },
                 React.createElement(Button, { buttonStyle: "secondary", onClick: () => {
-                        toggle(addModalSlug);
+                        toggleModal(addModalSlug);
                     } },
                     "Upload new",
                     ' ',
                     collection.labels.singular),
                 React.createElement(Button, { buttonStyle: "secondary", onClick: () => {
-                        toggle(selectExistingModalSlug);
+                        toggleModal(selectExistingModalSlug);
                     } }, "Choose from existing"))),
             React.createElement(AddModal, { ...{
                     collection,

package/dist/admin/components/forms/field-types/Upload/SelectExisting/index.js

@@ -18,13 +18,13 @@ import ViewDescription from '../../../../elements/ViewDescription';
 import './index.scss';
 const baseClass = 'select-existing-upload-modal';
 const SelectExistingUploadModal = (props) => {
-    var _a, _b;
+    var _a, _b, _c;
     const { setValue, collection, collection: { slug: collectionSlug, admin: { description, pagination: { defaultLimit, }, } = {}, } = {}, slug: modalSlug, path, filterOptions, } = props;
     const { serverURL, routes: { api } } = useConfig();
     const { id } = useDocumentInfo();
     const { user } = useAuth();
     const { getData, getSiblingData } = useWatchForm();
-    const { closeAll, currentModal } = useModal();
+    const { toggleModal, modalState } = useModal();
     const [fields] = useState(() => formatFields(collection));
     const [limit, setLimit] = useState(defaultLimit);
     const [sort, setSort] = useState(null);
@@ -34,7 +34,7 @@ const SelectExistingUploadModal = (props) => {
     const classes = [
         baseClass,
     ].filter(Boolean).join(' ');
-    const isOpen = currentModal === modalSlug;
+    const isOpen = (_a = modalState[modalSlug]) === null || _a === void 0 ? void 0 : _a.isOpen;
     const apiURL = isOpen ? `${serverURL}${api}/${collectionSlug}` : null;
     const [{ data }, { setParams }] = usePayloadAPI(apiURL, {});
     useEffect(() => {
@@ -72,7 +72,7 @@ const SelectExistingUploadModal = (props) => {
                     "Select existing",
                     ' ',
                     collection.labels.singular),
-                React.createElement(Button, { icon: "x", round: true, buttonStyle: "icon-label", iconStyle: "with-border", onClick: closeAll })),
+                React.createElement(Button, { icon: "x", round: true, buttonStyle: "icon-label", iconStyle: "with-border", onClick: () => toggleModal(modalSlug) })),
             description && (React.createElement("div", { className: `${baseClass}__sub-header` },
                 React.createElement(ViewDescription, { description: description })))),
         React.createElement(ListControls, { collection: {
@@ -81,7 +81,7 @@ const SelectExistingUploadModal = (props) => {
             }, enableColumns: false, enableSort: true, modifySearchQuery: false, handleSortChange: setSort, handleWhereChange: setWhere }),
         React.createElement(UploadGallery, { docs: data === null || data === void 0 ? void 0 : data.docs, collection: collection, onCardClick: (doc) => {
                 setValue(doc);
-                closeAll();
+                toggleModal(modalSlug);
             } }),
         React.createElement("div", { className: `${baseClass}__page-controls` },
             React.createElement(Paginator, { limit: data.limit, totalPages: data.totalPages, page: data.page, hasPrevPage: data.hasPrevPage, hasNextPage: data.hasNextPage, prevPage: data.prevPage, nextPage: data.nextPage, numberOfNeighbors: 1, onChange: setPage, disableHistoryChange: true }),
@@ -94,6 +94,6 @@ const SelectExistingUploadModal = (props) => {
                     "of",
                     ' ',
                     data.totalDocs),
-                React.createElement(PerPage, { limits: (_b = (_a = collection === null || collection === void 0 ? void 0 : collection.admin) === null || _a === void 0 ? void 0 : _a.pagination) === null || _b === void 0 ? void 0 : _b.limits, limit: limit, modifySearchParams: false, handleChange: setLimit }))))))));
+                React.createElement(PerPage, { limits: (_c = (_b = collection === null || collection === void 0 ? void 0 : collection.admin) === null || _b === void 0 ? void 0 : _b.pagination) === null || _c === void 0 ? void 0 : _c.limits, limit: limit, modifySearchParams: false, handleChange: setLimit }))))))));
 };
 export default SelectExistingUploadModal;

package/dist/admin/components/forms/field-types/rowReducer.d.ts

@@ -11,6 +11,7 @@ declare type SET_ALL = {
     }[];
     collapsedState?: string[];
     blockType?: string;
+    initCollapsed?: boolean;
 };
 declare type SET_COLLAPSE = {
     type: 'SET_COLLAPSE';

package/dist/admin/components/forms/field-types/rowReducer.js

@@ -3,12 +3,12 @@ const reducer = (currentState, action) => {
     const stateCopy = [...currentState || []];
     switch (action.type) {
         case 'SET_ALL': {
-            const { data, collapsedState } = action;
+            const { data, collapsedState, initCollapsed } = action;
             if (Array.isArray(data)) {
                 return data.map((dataRow, i) => {
                     const row = {
                         id: (dataRow === null || dataRow === void 0 ? void 0 : dataRow.id) || new ObjectID().toHexString(),
-                        collapsed: (collapsedState || []).includes(dataRow === null || dataRow === void 0 ? void 0 : dataRow.id),
+                        collapsed: Array.isArray(collapsedState) ? collapsedState.includes(dataRow === null || dataRow === void 0 ? void 0 : dataRow.id) : initCollapsed,
                         blockType: dataRow === null || dataRow === void 0 ? void 0 : dataRow.blockType,
                     };
                     return row;

package/dist/admin/components/graphics/Account/Gravatar.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const Gravatar: React.FC;
+export default Gravatar;

package/dist/admin/components/graphics/Account/Gravatar.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import md5 from 'md5';
+import qs from 'qs';
+import { useAuth } from '../../utilities/Auth';
+const Gravatar = () => {
+    const { user } = useAuth();
+    const hash = md5(user.email.trim().toLowerCase());
+    const query = qs.stringify({
+        s: 50,
+        r: 'g',
+        default: 'mp',
+    });
+    return (React.createElement("img", { className: "gravatar-account", style: { borderRadius: '50%' }, src: `https://www.gravatar.com/avatar/${hash}?${query}`, alt: "yas", width: 25, height: 25 }));
+};
+export default Gravatar;

package/dist/admin/components/graphics/Account/index.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const Account: React.FC;
+/// <reference types="react" />
+declare const Account: () => JSX.Element;
 export default Account;

package/dist/admin/components/graphics/Account/index.js

@@ -1,4 +1,7 @@
 import React from 'react';
+import { useAuth } from '../../utilities/Auth';
+import { useConfig } from '../../utilities/Config';
+import Gravatar from './Gravatar';
 const css = `
   .graphic-account .circle1 {
     fill: var(--theme-elevation-100);
@@ -8,9 +11,29 @@ const css = `
     fill: var(--theme-elevation-300);
   }
 `;
-const Account = () => (React.createElement("svg", { className: "graphic-account", width: "25", height: "25", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 25 25" },
+const Default = () => (React.createElement("svg", { className: "graphic-account", width: "25", height: "25", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 25 25" },
     React.createElement("style", null, css),
     React.createElement("circle", { className: "circle1", cx: "12.5", cy: "12.5", r: "11.5" }),
     React.createElement("circle", { className: "circle2", cx: "12.5", cy: "10.73", r: "3.98" }),
     React.createElement("path", { d: "M12.5,24a11.44,11.44,0,0,0,7.66-2.94c-.5-2.71-3.73-4.8-7.66-4.8s-7.16,2.09-7.66,4.8A11.44,11.44,0,0,0,12.5,24Z" })));
+const Account = () => {
+    const { admin: { avatar: Avatar }, } = useConfig();
+    const { user } = useAuth();
+    if (!user.email || Avatar === 'default')
+        return React.createElement(Default, null);
+    if (Avatar === 'gravatar')
+        return React.createElement(Gravatar, null);
+    if (Avatar)
+        return React.createElement(Avatar, null);
+    return React.createElement(Default, null);
+};
 export default Account;
+function isClassComponent(component) {
+    return typeof component === 'function' && !!component.prototype.isReactComponent;
+}
+function isFunctionComponent(component) {
+    return typeof component === 'function' && String(component).includes('return React.createElement');
+}
+function isReactComponent(component) {
+    return isClassComponent(component) || isFunctionComponent(component);
+}

package/dist/admin/components/modals/StayLoggedIn/index.js

@@ -6,23 +6,24 @@ import MinimalTemplate from '../../templates/Minimal';
 import Button from '../../elements/Button';
 import './index.scss';
 const baseClass = 'stay-logged-in';
+const modalSlug = 'stay-logged-in';
 const StayLoggedInModal = (props) => {
     const { refreshCookie } = props;
     const history = useHistory();
     const { routes: { admin } } = useConfig();
-    const { closeAll: closeAllModals } = useModal();
+    const { toggleModal } = useModal();
     return (React.createElement(Modal, { className: baseClass, slug: "stay-logged-in" },
         React.createElement(MinimalTemplate, { className: `${baseClass}__template` },
             React.createElement("h1", null, "Stay logged in"),
             React.createElement("p", null, "You haven't been active in a little while and will shortly be automatically logged out for your own security. Would you like to stay logged in?"),
             React.createElement("div", { className: `${baseClass}__actions` },
                 React.createElement(Button, { buttonStyle: "secondary", onClick: () => {
-                        closeAllModals();
+                        toggleModal(modalSlug);
                         history.push(`${admin}/logout`);
                     } }, "Log out"),
                 React.createElement(Button, { onClick: () => {
                         refreshCookie();
-                        closeAllModals();
+                        toggleModal(modalSlug);
                     } }, "Stay logged in")))));
 };
 export default StayLoggedInModal;

package/dist/admin/components/utilities/Auth/index.js

@@ -16,7 +16,7 @@ export const AuthProvider = ({ children }) => {
     const { admin: { user: userSlug, }, serverURL, routes: { admin, api, }, } = config;
     const exp = user === null || user === void 0 ? void 0 : user.exp;
     const [permissions, setPermissions] = useState();
-    const { open: openModal, closeAll: closeAllModals } = useModal();
+    const { openModal, closeAllModals } = useModal();
     const [lastLocationChange, setLastLocationChange] = useState(0);
     const debouncedLocationChange = useDebounce(lastLocationChange, 10000);
     const id = user === null || user === void 0 ? void 0 : user.id;

package/dist/admin/components/views/Account/index.js

@@ -24,7 +24,7 @@ const AccountView = () => {
     }, } = {}, } = {
         user: 'users',
     }, } = useConfig();
-    const collection = collections.find((coll) => coll.slug === user.collection);
+    const collection = collections.find((coll) => coll.slug === adminUser);
     const { fields } = collection;
     const collectionPermissions = (_a = permissions === null || permissions === void 0 ? void 0 : permissions.collections) === null || _a === void 0 ? void 0 : _a[adminUser];
     const [{ data }] = usePayloadAPI(`${serverURL}${api}/${collection === null || collection === void 0 ? void 0 : collection.slug}/${user === null || user === void 0 ? void 0 : user.id}?depth=0`, { initialParams: { 'fallback-locale': 'null' } });

package/dist/admin/components/views/Dashboard/Default.js

@@ -1,31 +1,63 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useConfig } from '../../utilities/Config';
 import Eyebrow from '../../elements/Eyebrow';
 import Card from '../../elements/Card';
 import Button from '../../elements/Button';
 import { Gutter } from '../../elements/Gutter';
+import { groupNavItems, EntityType } from '../../../utilities/groupNavItems';
 import './index.scss';
 const baseClass = 'dashboard';
 const Dashboard = (props) => {
     const { collections, globals, permissions, } = props;
     const { push } = useHistory();
     const { routes: { admin, }, admin: { components: { afterDashboard, beforeDashboard, }, }, } = useConfig();
+    const [groups, setGroups] = useState([]);
+    useEffect(() => {
+        setGroups(groupNavItems([
+            ...collections.map((collection) => {
+                const entityToGroup = {
+                    type: EntityType.collection,
+                    entity: collection,
+                };
+                return entityToGroup;
+            }),
+            ...globals.map((global) => {
+                const entityToGroup = {
+                    type: EntityType.global,
+                    entity: global,
+                };
+                return entityToGroup;
+            }),
+        ], permissions));
+    }, [collections, globals, permissions]);
     return (React.createElement("div", { className: baseClass },
         React.createElement(Eyebrow, null),
         React.createElement(Gutter, { className: `${baseClass}__wrap` },
             Array.isArray(beforeDashboard) && beforeDashboard.map((Component, i) => React.createElement(Component, { key: i })),
-            React.createElement("h2", { className: `${baseClass}__label` }, "Collections"),
-            React.createElement("ul", { className: `${baseClass}__card-list` }, collections.map((collection) => {
-                var _a, _b, _c;
-                const hasCreatePermission = (_c = (_b = (_a = permissions === null || permissions === void 0 ? void 0 : permissions.collections) === null || _a === void 0 ? void 0 : _a[collection.slug]) === null || _b === void 0 ? void 0 : _b.create) === null || _c === void 0 ? void 0 : _c.permission;
-                return (React.createElement("li", { key: collection.slug },
-                    React.createElement(Card, { title: collection.labels.plural, id: `card-${collection.slug}`, onClick: () => push({ pathname: `${admin}/collections/${collection.slug}` }), actions: hasCreatePermission ? (React.createElement(Button, { el: "link", to: `${admin}/collections/${collection.slug}/create`, icon: "plus", round: true, buttonStyle: "icon-label", iconStyle: "with-border" })) : undefined })));
-            })),
-            (globals.length > 0) && (React.createElement(React.Fragment, null,
-                React.createElement("h2", { className: `${baseClass}__label` }, "Globals"),
-                React.createElement("ul", { className: `${baseClass}__card-list` }, globals.map((global) => (React.createElement("li", { key: global.slug },
-                    React.createElement(Card, { title: global.label, onClick: () => push({ pathname: `${admin}/globals/${global.slug}` }) }))))))),
+            groups.map(({ label, entities }, groupIndex) => {
+                return (React.createElement(React.Fragment, { key: groupIndex },
+                    React.createElement("h2", { className: `${baseClass}__label` }, label),
+                    React.createElement("ul", { className: `${baseClass}__card-list` }, entities.map(({ entity, type }, entityIndex) => {
+                        var _a, _b, _c;
+                        let title;
+                        let createHREF;
+                        let onClick;
+                        let hasCreatePermission;
+                        if (type === EntityType.collection) {
+                            title = entity.labels.plural;
+                            onClick = () => push({ pathname: `${admin}/collections/${entity.slug}` });
+                            createHREF = `${admin}/collections/${entity.slug}/create`;
+                            hasCreatePermission = (_c = (_b = (_a = permissions === null || permissions === void 0 ? void 0 : permissions.collections) === null || _a === void 0 ? void 0 : _a[entity.slug]) === null || _b === void 0 ? void 0 : _b.create) === null || _c === void 0 ? void 0 : _c.permission;
+                        }
+                        if (type === EntityType.global) {
+                            title = entity.label;
+                            onClick = () => push({ pathname: `${admin}/globals/${global.slug}` });
+                        }
+                        return (React.createElement("li", { key: entityIndex },
+                            React.createElement(Card, { title: title, id: `card-${entity.slug}`, onClick: onClick, actions: (hasCreatePermission && type === EntityType.collection) ? (React.createElement(Button, { el: "link", to: createHREF, icon: "plus", round: true, buttonStyle: "icon-label", iconStyle: "with-border" })) : undefined })));
+                    }))));
+            }),
             Array.isArray(afterDashboard) && afterDashboard.map((Component, i) => React.createElement(Component, { key: i })))));
 };
 export default Dashboard;

package/dist/admin/components/views/Dashboard/index.scss

@@ -57,4 +57,4 @@
       margin: 0 base(.25) base(.5);
     }
   }
-}
+}