payload 0.10.3-beta.0 → 0.10.6

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

@@ -25,14 +25,11 @@ const insertRelationship = (editor, { value, relationTo }) => {
             text,
         ],
     };
-    const nodes = [relationship, { children: [{ text: '' }] }];
+    const nodes = [relationship, { type: 'p', children: [{ text: '' }] }];
     if (editor.blurSelection) {
         Transforms.select(editor, editor.blurSelection);
     }
     Transforms.insertNodes(editor, nodes);
-    const currentPath = editor.selection.anchor.path[0];
-    const newSelection = { anchor: { path: [currentPath + 1, 0], offset: 0 }, focus: { path: [currentPath + 1, 0], offset: 0 } };
-    Transforms.select(editor, newSelection);
     ReactEditor.focus(editor);
 };
 const RelationshipButton = ({ path }) => {

package/dist/admin/components/forms/field-types/RichText/elements/relationship/Element/index.d.ts

@@ -1,8 +1,4 @@
 /// <reference types="react" />
 import './index.scss';
-declare const Element: ({ attributes, children, element }: {
-    attributes: any;
-    children: any;
-    element: any;
-}) => JSX.Element;
+declare const Element: (props: any) => JSX.Element;
 export default Element;

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

@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { useFocused, useSelected } from 'slate-react';
 import { useConfig } from '@payloadcms/config-provider';
 import RelationshipIcon from '../../../../../../icons/Relationship';
 import usePayloadAPI from '../../../../../../../hooks/usePayloadAPI';
@@ -7,13 +8,19 @@ const baseClass = 'rich-text-relationship';
 const initialParams = {
     depth: 0,
 };
-const Element = ({ attributes, children, element }) => {
+const Element = (props) => {
     var _a;
+    const { attributes, children, element } = props;
     const { relationTo, value } = element;
     const { collections, serverURL, routes: { api } } = useConfig();
     const [relatedCollection] = useState(() => collections.find((coll) => coll.slug === relationTo));
+    const selected = useSelected();
+    const focused = useFocused();
     const [{ data }] = usePayloadAPI(`${serverURL}${api}/${relatedCollection.slug}/${value === null || value === void 0 ? void 0 : value.id}`, { initialParams });
-    return (React.createElement("div", { className: baseClass, contentEditable: false, ...attributes },
+    return (React.createElement("div", { className: [
+            baseClass,
+            (selected && focused) && `${baseClass}--selected`,
+        ].filter(Boolean).join(' '), contentEditable: false, ...attributes },
         React.createElement(RelationshipIcon, null),
         React.createElement("div", { className: `${baseClass}__wrap` },
             React.createElement("div", { className: `${baseClass}__label` },

package/dist/admin/components/forms/field-types/RichText/elements/relationship/Element/index.scss

@@ -19,4 +19,9 @@
     text-overflow: ellipsis;
     overflow: hidden;
   }
+
+  &--selected {
+    box-shadow: $focus-box-shadow;
+    outline: none;
+  }
 }

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

@@ -3,11 +3,7 @@ declare const _default: {
     Button: import("react").FC<{
         path: string;
     }>;
-    Element: ({ attributes, children, element }: {
-        attributes: any;
-        children: any;
-        element: any;
-    }) => JSX.Element;
+    Element: (props: any) => JSX.Element;
     plugins: ((incomingEditor: any) => any)[];
 };
 export default _default;

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

@@ -1,4 +1,4 @@
-import { Transforms } from 'slate';
+import { Element, Transforms } from 'slate';
 import { ReactEditor } from 'slate-react';
 import isElementActive from './isActive';
 import listTypes from './listTypes';
@@ -16,7 +16,7 @@ const toggleElement = (editor, format) => {
         Transforms.select(editor, editor.blurSelection);
     }
     Transforms.unwrapNodes(editor, {
-        match: (n) => listTypes.includes(n.type),
+        match: (n) => Element.isElement(n) && listTypes.includes(n.type),
         split: true,
     });
     Transforms.setNodes(editor, { type });

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import './index.scss';
+import '../modal.scss';
+declare const UploadButton: React.FC<{
+    path: string;
+}>;
+export default UploadButton;

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

@@ -0,0 +1,124 @@
+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 '@payloadcms/config-provider';
+import ElementButton from '../../Button';
+import UploadIcon from '../../../../../../icons/Upload';
+import usePayloadAPI from '../../../../../../../hooks/usePayloadAPI';
+import UploadGallery from '../../../../../../elements/UploadGallery';
+import ListControls from '../../../../../../elements/ListControls';
+import ReactSelect from '../../../../../../elements/ReactSelect';
+import Paginator from '../../../../../../elements/Paginator';
+import formatFields from '../../../../../../views/collections/List/formatFields';
+import Label from '../../../../../Label';
+import MinimalTemplate from '../../../../../../templates/Minimal';
+import Button from '../../../../../../elements/Button';
+import './index.scss';
+import '../modal.scss';
+const baseClass = 'upload-rich-text-button';
+const baseModalClass = 'rich-text-upload-modal';
+const insertUpload = (editor, { value, relationTo }) => {
+    const text = { text: ' ' };
+    const upload = {
+        type: 'upload',
+        value,
+        relationTo,
+        children: [
+            text,
+        ],
+    };
+    const nodes = [upload, { type: 'p', children: [{ text: '' }] }];
+    if (editor.blurSelection) {
+        Transforms.select(editor, editor.blurSelection);
+    }
+    Transforms.insertNodes(editor, nodes);
+    ReactEditor.focus(editor);
+};
+const UploadButton = ({ path }) => {
+    const { open, closeAll, currentModal } = useModal();
+    const editor = useSlate();
+    const { serverURL, routes: { api }, collections } = useConfig();
+    const [availableCollections] = useState(() => collections.filter(({ admin: { enableRichTextRelationship }, upload }) => (Boolean(upload) && enableRichTextRelationship)));
+    const [renderModal, setRenderModal] = useState(false);
+    const [modalCollectionOption, setModalCollectionOption] = useState(() => {
+        const firstAvailableCollection = collections.find(({ admin: { enableRichTextRelationship }, upload }) => (Boolean(upload) && enableRichTextRelationship));
+        return { label: firstAvailableCollection.labels.singular, value: firstAvailableCollection.slug };
+    });
+    const [modalCollection, setModalCollection] = useState(() => collections.find(({ admin: { enableRichTextRelationship }, upload }) => (Boolean(upload) && enableRichTextRelationship)));
+    const [listControls, setListControls] = useState({});
+    const [page, setPage] = useState(null);
+    const [sort, setSort] = useState(null);
+    const [fields, setFields] = useState(formatFields(modalCollection));
+    const [hasEnabledCollections] = useState(() => collections.find(({ upload, admin: { enableRichTextRelationship } }) => upload && enableRichTextRelationship));
+    const modalSlug = `${path}-add-upload`;
+    const moreThanOneAvailableCollection = availableCollections.length > 1;
+    const isOpen = currentModal === modalSlug;
+    // If modal is open, get active page of upload gallery
+    const apiURL = isOpen ? `${serverURL}${api}/${modalCollection.slug}` : null;
+    const [{ data }, { setParams }] = usePayloadAPI(apiURL, {});
+    useEffect(() => {
+        setFields(formatFields(modalCollection));
+    }, [modalCollection]);
+    useEffect(() => {
+        if (renderModal) {
+            open(modalSlug);
+        }
+    }, [renderModal, open, modalSlug]);
+    useEffect(() => {
+        const params = {};
+        if (page)
+            params.page = page;
+        if (listControls === null || listControls === void 0 ? void 0 : listControls.where)
+            params.where = listControls.where;
+        if (sort)
+            params.sort = sort;
+        setParams(params);
+    }, [setParams, page, listControls, sort]);
+    useEffect(() => {
+        setModalCollection(collections.find(({ slug }) => modalCollectionOption.value === slug));
+    }, [modalCollectionOption, collections]);
+    if (!hasEnabledCollections)
+        return null;
+    return (React.createElement(Fragment, null,
+        React.createElement(ElementButton, { className: baseClass, format: "upload", onClick: () => setRenderModal(true) },
+            React.createElement(UploadIcon, null)),
+        renderModal && (React.createElement(Modal, { className: baseModalClass, slug: modalSlug }, isOpen && (React.createElement(MinimalTemplate, { width: "wide" },
+            React.createElement("header", { className: `${baseModalClass}__header` },
+                React.createElement("h1", null,
+                    "Add",
+                    ' ',
+                    modalCollection.labels.singular),
+                React.createElement(Button, { icon: "x", round: true, buttonStyle: "icon-label", iconStyle: "with-border", onClick: () => {
+                        closeAll();
+                        setRenderModal(false);
+                    } })),
+            moreThanOneAvailableCollection && (React.createElement("div", { className: `${baseModalClass}__select-collection-wrap` },
+                React.createElement(Label, { label: "Select a Collection to Browse" }),
+                React.createElement(ReactSelect, { className: `${baseClass}__select-collection`, value: modalCollectionOption, onChange: setModalCollectionOption, options: availableCollections.map((coll) => ({ label: coll.labels.singular, value: coll.slug })) }))),
+            React.createElement(ListControls, { handleChange: setListControls, collection: {
+                    ...modalCollection,
+                    fields,
+                }, enableColumns: false, setSort: setSort, enableSort: true }),
+            React.createElement(UploadGallery, { docs: data === null || data === void 0 ? void 0 : data.docs, collection: modalCollection, onCardClick: (doc) => {
+                    insertUpload(editor, {
+                        value: {
+                            id: doc.id,
+                        },
+                        relationTo: modalCollection.slug,
+                    });
+                    setRenderModal(false);
+                    closeAll();
+                } }),
+            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 }),
+                (data === null || data === void 0 ? void 0 : data.totalDocs) > 0 && (React.createElement("div", { className: `${baseClass}__page-info` },
+                    data.page,
+                    "-",
+                    data.totalPages > 1 ? data.limit : data.totalDocs,
+                    ' ',
+                    "of",
+                    ' ',
+                    data.totalDocs)))))))));
+};
+export default UploadButton;

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

@@ -0,0 +1,7 @@
+@import '../../../../../../../scss/styles.scss';
+
+.upload-rich-text-button {
+  .btn {
+    margin-right: base(1);
+  }
+}

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import './index.scss';
+import '../modal.scss';
+declare const Element: ({ attributes, children, element, path }: {
+    attributes: any;
+    children: any;
+    element: any;
+    path: any;
+}) => JSX.Element;
+export default Element;

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

@@ -0,0 +1,132 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { Modal, useModal } from '@faceless-ui/modal';
+import { Transforms } from 'slate';
+import { ReactEditor, useSlateStatic, useFocused, useSelected } from 'slate-react';
+import { useConfig } from '@payloadcms/config-provider';
+import usePayloadAPI from '../../../../../../../hooks/usePayloadAPI';
+import FileGraphic from '../../../../../../graphics/File';
+import useThumbnail from '../../../../../../../hooks/useThumbnail';
+import MinimalTemplate from '../../../../../../templates/Minimal';
+import UploadGallery from '../../../../../../elements/UploadGallery';
+import ListControls from '../../../../../../elements/ListControls';
+import Button from '../../../../../../elements/Button';
+import ReactSelect from '../../../../../../elements/ReactSelect';
+import Paginator from '../../../../../../elements/Paginator';
+import formatFields from '../../../../../../views/collections/List/formatFields';
+import Label from '../../../../../Label';
+import './index.scss';
+import '../modal.scss';
+const baseClass = 'rich-text-upload';
+const baseModalClass = 'rich-text-upload-modal';
+const initialParams = {
+    depth: 0,
+};
+const Element = ({ attributes, children, element, path }) => {
+    const { relationTo, value } = element;
+    const { closeAll, currentModal, open } = useModal();
+    const { collections, serverURL, routes: { api } } = useConfig();
+    const [availableCollections] = useState(() => collections.filter(({ admin: { enableRichTextRelationship }, upload }) => (Boolean(upload) && enableRichTextRelationship)));
+    const [renderModal, setRenderModal] = useState(false);
+    const [relatedCollection, setRelatedCollection] = useState(() => collections.find((coll) => coll.slug === relationTo));
+    const [modalCollectionOption, setModalCollectionOption] = useState({ label: relatedCollection.labels.singular, value: relatedCollection.slug });
+    const [modalCollection, setModalCollection] = useState(relatedCollection);
+    const [listControls, setListControls] = useState({});
+    const [page, setPage] = useState(null);
+    const [sort, setSort] = useState(null);
+    const [fields, setFields] = useState(formatFields(relatedCollection));
+    const editor = useSlateStatic();
+    const selected = useSelected();
+    const focused = useFocused();
+    const modalSlug = `${path}-edit-upload`;
+    const isOpen = currentModal === modalSlug;
+    const moreThanOneAvailableCollection = availableCollections.length > 1;
+    // Get the referenced document
+    const [{ data: upload }] = usePayloadAPI(`${serverURL}${api}/${relatedCollection.slug}/${value === null || value === void 0 ? void 0 : value.id}`, { initialParams });
+    // If modal is open, get active page of upload gallery
+    const apiURL = isOpen ? `${serverURL}${api}/${modalCollection.slug}` : null;
+    const [{ data }, { setParams }] = usePayloadAPI(apiURL, {});
+    const thumbnailSRC = useThumbnail(relatedCollection, upload);
+    const handleUpdateUpload = useCallback((doc) => {
+        const newNode = {
+            type: 'upload',
+            value: { id: doc.id },
+            relationTo: modalCollection.slug,
+            children: [
+                { text: ' ' },
+            ],
+        };
+        const elementPath = ReactEditor.findPath(editor, element);
+        Transforms.setNodes(editor, newNode, { at: elementPath });
+        closeAll();
+    }, [closeAll, editor, element, modalCollection]);
+    useEffect(() => {
+        setFields(formatFields(relatedCollection));
+    }, [relatedCollection]);
+    useEffect(() => {
+        if (renderModal && modalSlug) {
+            open(modalSlug);
+        }
+    }, [renderModal, open, modalSlug]);
+    useEffect(() => {
+        const params = {};
+        if (page)
+            params.page = page;
+        if (listControls === null || listControls === void 0 ? void 0 : listControls.where)
+            params.where = listControls.where;
+        if (sort)
+            params.sort = sort;
+        setParams(params);
+    }, [setParams, page, listControls, sort]);
+    useEffect(() => {
+        setModalCollection(collections.find(({ slug }) => modalCollectionOption.value === slug));
+    }, [modalCollectionOption, collections]);
+    return (React.createElement("div", { className: [
+            baseClass,
+            (selected && focused) && `${baseClass}--selected`,
+        ].filter(Boolean).join(' '), contentEditable: false, ...attributes },
+        React.createElement("div", { className: `${baseClass}__thumbnail` },
+            thumbnailSRC && (React.createElement("img", { src: thumbnailSRC, alt: upload === null || upload === void 0 ? void 0 : upload.filename })),
+            !thumbnailSRC && (React.createElement(FileGraphic, null))),
+        React.createElement("div", { className: `${baseClass}__wrap` },
+            React.createElement("div", { className: `${baseClass}__label` }, relatedCollection.labels.singular),
+            React.createElement("h5", null, upload === null || upload === void 0 ? void 0 : upload.filename)),
+        React.createElement(Button, { icon: "edit", round: true, buttonStyle: "icon-label", iconStyle: "with-border", className: `${baseClass}__button`, onClick: (e) => {
+                e.preventDefault();
+                setRenderModal(true);
+            } }),
+        children,
+        renderModal && (React.createElement(Modal, { className: baseModalClass, slug: modalSlug }, isOpen && (React.createElement(MinimalTemplate, { width: "wide" },
+            React.createElement("header", { className: `${baseModalClass}__header` },
+                React.createElement("h1", null,
+                    "Choose",
+                    ' ',
+                    modalCollection.labels.singular),
+                React.createElement(Button, { icon: "x", round: true, buttonStyle: "icon-label", iconStyle: "with-border", onClick: () => {
+                        closeAll();
+                        setRenderModal(false);
+                    } })),
+            moreThanOneAvailableCollection && (React.createElement("div", { className: `${baseModalClass}__select-collection-wrap` },
+                React.createElement(Label, { label: "Select a Collection to Browse" }),
+                React.createElement(ReactSelect, { className: `${baseClass}__select-collection`, value: modalCollectionOption, onChange: setModalCollectionOption, options: availableCollections.map((coll) => ({ label: coll.labels.singular, value: coll.slug })) }))),
+            React.createElement(ListControls, { handleChange: setListControls, collection: {
+                    ...modalCollection,
+                    fields,
+                }, enableColumns: false, setSort: setSort, enableSort: true }),
+            React.createElement(UploadGallery, { docs: data === null || data === void 0 ? void 0 : data.docs, collection: modalCollection, onCardClick: (doc) => {
+                    handleUpdateUpload(doc);
+                    setRelatedCollection(modalCollection);
+                    setRenderModal(false);
+                    closeAll();
+                } }),
+            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 }),
+                (data === null || data === void 0 ? void 0 : data.totalDocs) > 0 && (React.createElement("div", { className: `${baseClass}__page-info` },
+                    data.page,
+                    "-",
+                    data.totalPages > 1 ? data.limit : data.totalDocs,
+                    ' ',
+                    "of",
+                    ' ',
+                    data.totalDocs)))))))));
+};
+export default Element;

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

@@ -0,0 +1,45 @@
+@import '../../../../../../../scss/styles.scss';
+
+.rich-text-upload {
+  max-width: base(15);
+  display: flex;
+  align-items: center;
+  background: $color-background-gray;
+  position: relative;
+
+  &__button {
+    margin: 0;
+    position: absolute;
+    top: base(.5);
+    right: base(.5);
+  }
+
+  h5 {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  &__thumbnail {
+    width: base(4);
+    max-height: base(4);
+
+    img, svg {
+      object-fit: cover;
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &__wrap {
+    padding: base(.5) base(.5) base(.5) base(1);
+    text-align: left;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  &--selected {
+    box-shadow: $focus-box-shadow;
+    outline: none;
+  }
+}

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

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+declare const _default: {
+    Button: import("react").FC<{
+        path: string;
+    }>;
+    Element: ({ attributes, children, element, path }: {
+        attributes: any;
+        children: any;
+        element: any;
+        path: any;
+    }) => JSX.Element;
+    plugins: ((incomingEditor: any) => any)[];
+};
+export default _default;

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

@@ -0,0 +1,10 @@
+import plugin from './plugin';
+import Element from './Element';
+import Button from './Button';
+export default {
+    Button,
+    Element,
+    plugins: [
+        plugin,
+    ],
+};

package/dist/admin/components/forms/field-types/RichText/elements/upload/modal.scss

@@ -0,0 +1,29 @@
+@import '../../../../../../scss/styles.scss';
+
+.rich-text-upload-modal {
+  @include blur-bg;
+  display: flex;
+  align-items: center;
+
+  .template-minimal {
+    padding-top: base(4);
+    align-items: flex-start;
+  }
+
+  &__header {
+    margin-bottom: $baseline;
+    display: flex;
+
+    h1 {
+      margin: 0 auto 0 0;
+    }
+
+    .btn {
+      margin: 0 0 0 $baseline;
+    }
+  }
+
+  &__select-collection-wrap {
+    margin-bottom: base(1);
+  }
+}

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

@@ -0,0 +1,2 @@
+declare const withRelationship: (incomingEditor: any) => any;
+export default withRelationship;

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

@@ -0,0 +1,7 @@
+const withRelationship = (incomingEditor) => {
+    const editor = incomingEditor;
+    const { isVoid } = editor;
+    editor.isVoid = (element) => (element.type === 'upload' ? true : isVoid(element));
+    return editor;
+};
+export default withRelationship;

package/dist/admin/components/icons/Edit/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.scss';
+declare const Edit: React.FC;
+export default Edit;

package/dist/admin/components/icons/Edit/index.js

@@ -0,0 +1,7 @@
+import React from 'react';
+import './index.scss';
+const Edit = () => (React.createElement("svg", { className: "icon icon--edit", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 25 25" },
+    React.createElement("polygon", { className: "fill", points: "16.92 16.86 8.25 16.86 8.25 8.21 12.54 8.21 12.54 6.63 6.68 6.63 6.68 18.43 18.5 18.43 18.5 12.53 16.92 12.53 16.92 16.86" }),
+    React.createElement("polygon", { className: "fill", points: "16.31 7.33 17.42 8.44 12.66 13.2 11.51 13.24 11.55 12.09 16.31 7.33" }),
+    React.createElement("rect", { className: "fill", x: "16.94", y: "6.44", width: "1.58", height: "1.15", transform: "translate(10.16 -10.48) rotate(45)" })));
+export default Edit;

package/dist/admin/components/icons/Edit/index.scss

@@ -0,0 +1,12 @@
+@import '../../../scss/styles';
+
+.icon--edit {
+  height: $baseline;
+  width: $baseline;
+  shape-rendering: auto;
+
+  .fill {
+    fill: $color-dark-gray;
+    stroke: none;
+  }
+}

package/dist/admin/components/icons/Upload/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.scss';
+declare const Upload: React.FC;
+export default Upload;

package/dist/admin/components/icons/Upload/index.js

@@ -0,0 +1,6 @@
+import React from 'react';
+import './index.scss';
+const Upload = () => (React.createElement("svg", { className: "icon icon--upload", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 25 25" },
+    React.createElement("path", { d: "M20.06,5.12h-15v15h15Zm-2,2v7L15.37,11l-3.27,4.1-2-1.58-3,3.74V7.12Z", className: "fill" }),
+    React.createElement("circle", { cx: "9.69", cy: "9.47", r: "0.97", className: "fill" })));
+export default Upload;

package/dist/admin/components/icons/Upload/index.scss

@@ -0,0 +1,11 @@
+@import '../../../scss/styles';
+
+.icon--upload {
+  height: $baseline;
+  width: $baseline;
+
+  .fill {
+    fill: $color-dark-gray;
+    stroke: none;
+  }
+}

package/dist/admin/components/views/collections/List/formatFields.d.ts

@@ -1,8 +1,4 @@
 import { SanitizedCollectionConfig } from '../../../../../collections/config/types';
 import { Field } from '../../../../../fields/config/types';
-declare const formatFields: (config: SanitizedCollectionConfig) => (Field | {
-    name: string;
-    label: string;
-    type: string;
-})[];
+declare const formatFields: (config: SanitizedCollectionConfig) => Field[];
 export default formatFields;

package/dist/collections/buildSchema.js

@@ -7,10 +7,12 @@ const mongoose_paginate_v2_1 = __importDefault(require("mongoose-paginate-v2"));
 const buildQuery_1 = __importDefault(require("../mongoose/buildQuery"));
 const buildSchema_1 = __importDefault(require("../mongoose/buildSchema"));
 const buildCollectionSchema = (collection, config, schemaOptions = {}) => {
-    const schema = buildSchema_1.default(config, collection.fields, { timestamps: collection.timestamps !== false, ...schemaOptions });
+    const schema = buildSchema_1.default(config, collection.fields, {
+        options: { timestamps: collection.timestamps !== false, ...schemaOptions },
+    });
     schema.plugin(mongoose_paginate_v2_1.default, { useEstimatedCount: true })
         .plugin(buildQuery_1.default);
     return schema;
 };
 exports.default = buildCollectionSchema;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRTY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29sbGVjdGlvbnMvYnVpbGRTY2hlbWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnRkFBNEM7QUFHNUMsd0VBQXNEO0FBQ3RELDBFQUFrRDtBQUdsRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsVUFBcUMsRUFBRSxNQUF1QixFQUFFLGFBQWEsR0FBRyxFQUFFLEVBQVUsRUFBRTtJQUMzSCxNQUFNLE1BQU0sR0FBRyxxQkFBVyxDQUN4QixNQUFNLEVBQ04sVUFBVSxDQUFDLE1BQU0sRUFDakIsRUFBRSxVQUFVLEVBQUUsVUFBVSxDQUFDLFVBQVUsS0FBSyxLQUFLLEVBQUUsR0FBRyxhQUFhLEVBQUUsQ0FDbEUsQ0FBQztJQUVGLE1BQU0sQ0FBQyxNQUFNLENBQUMsOEJBQVEsRUFBRSxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRSxDQUFDO1NBQ2pELE1BQU0sQ0FBQyxvQkFBZ0IsQ0FBQyxDQUFDO0lBRTVCLE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMsQ0FBQztBQUVGLGtCQUFlLHFCQUFxQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRTY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29sbGVjdGlvbnMvYnVpbGRTY2hlbWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnRkFBNEM7QUFHNUMsd0VBQXNEO0FBQ3RELDBFQUFrRDtBQUdsRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsVUFBcUMsRUFBRSxNQUF1QixFQUFFLGFBQWEsR0FBRyxFQUFFLEVBQVUsRUFBRTtJQUMzSCxNQUFNLE1BQU0sR0FBRyxxQkFBVyxDQUN4QixNQUFNLEVBQ04sVUFBVSxDQUFDLE1BQU0sRUFDakI7UUFDRSxPQUFPLEVBQUUsRUFBRSxVQUFVLEVBQUUsVUFBVSxDQUFDLFVBQVUsS0FBSyxLQUFLLEVBQUUsR0FBRyxhQUFhLEVBQUU7S0FDM0UsQ0FDRixDQUFDO0lBRUYsTUFBTSxDQUFDLE1BQU0sQ0FBQyw4QkFBUSxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFLENBQUM7U0FDakQsTUFBTSxDQUFDLG9CQUFnQixDQUFDLENBQUM7SUFFNUIsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyxDQUFDO0FBRUYsa0JBQWUscUJBQXFCLENBQUMifQ==

package/dist/collections/operations/find.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const executeAccess_1 = __importDefault(require("../../auth/executeAccess"));
 const sanitizeInternalFields_1 = __importDefault(require("../../utilities/sanitizeInternalFields"));
 const types_1 = require("../../auth/types");
+const flattenWhereConstraints_1 = __importDefault(require("../../utilities/flattenWhereConstraints"));
 async function find(incomingArgs) {
     let args = incomingArgs;
     // /////////////////////////////////////
@@ -23,6 +24,7 @@ async function find(incomingArgs) {
     // Access
     // /////////////////////////////////////
     const queryToBuild = {};
+    let useEstimatedCount = false;
     if (where) {
         let and = [];
         if (Array.isArray(where.and))
@@ -35,6 +37,8 @@ async function find(incomingArgs) {
                 ...and,
             ],
         };
+        const constraints = flattenWhereConstraints_1.default(queryToBuild);
+        useEstimatedCount = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'));
     }
     if (!overrideAccess) {
         const accessResults = await executeAccess_1.default({ req }, collectionConfig.access.read);
@@ -73,7 +77,7 @@ async function find(incomingArgs) {
         sort,
         lean: true,
         leanWithId: true,
-        useEstimatedCount: true,
+        useEstimatedCount,
     };
     const paginatedDocs = await Model.paginate(query, optionsToExecute);
     // /////////////////////////////////////
@@ -132,4 +136,4 @@ async function find(incomingArgs) {
     return result;
 }
 exports.default = find;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb2xsZWN0aW9ucy9vcGVyYXRpb25zL2ZpbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSw2RUFBcUQ7QUFDckQsb0dBQTRFO0FBRTVFLDRDQUF3RDtBQWN4RCxLQUFLLFVBQVUsSUFBSSxDQUFDLFlBQXVCO0lBQ3pDLElBQUksSUFBSSxHQUFHLFlBQVksQ0FBQztJQUV4Qix3Q0FBd0M7SUFDeEMsK0JBQStCO0lBQy9CLHdDQUF3QztJQUV4QyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEVBQUU7UUFDbEYsTUFBTSxTQUFTLENBQUM7UUFFaEIsSUFBSSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUM7WUFDakIsSUFBSTtZQUNKLFNBQVMsRUFBRSxNQUFNO1NBQ2xCLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQztJQUNkLENBQUMsRUFBRSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUV0QixNQUFNLEVBQ0osS0FBSyxFQUNMLElBQUksRUFDSixLQUFLLEVBQ0wsS0FBSyxFQUNMLFVBQVUsRUFBRSxFQUNWLEtBQUssRUFDTCxNQUFNLEVBQUUsZ0JBQWdCLEdBQ3pCLEVBQ0QsR0FBRyxFQUNILEdBQUcsRUFBRSxFQUNILE1BQU0sR0FDUCxFQUNELGNBQWMsRUFDZCxnQkFBZ0IsR0FDakIsR0FBRyxJQUFJLENBQUM7SUFFVCx3Q0FBd0M7SUFDeEMsU0FBUztJQUNULHdDQUF3QztJQUV4QyxNQUFNLFlBQVksR0FBcUIsRUFBRSxDQUFDO0lBRTFDLElBQUksS0FBSyxFQUFFO1FBQ1QsSUFBSSxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBRWIsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUM7WUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb2xsZWN0aW9ucy9vcGVyYXRpb25zL2ZpbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSw2RUFBcUQ7QUFDckQsb0dBQTRFO0FBRTVFLDRDQUF3RDtBQUN4RCxzR0FBOEU7QUFjOUUsS0FBSyxVQUFVLElBQUksQ0FBQyxZQUF1QjtJQUN6QyxJQUFJLElBQUksR0FBRyxZQUFZLENBQUM7SUFFeEIsd0NBQXdDO0lBQ3hDLCtCQUErQjtJQUMvQix3Q0FBd0M7SUFFeEMsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxFQUFFO1FBQ2xGLE1BQU0sU0FBUyxDQUFDO1FBRWhCLElBQUksR0FBRyxDQUFDLE1BQU0sSUFBSSxDQUFDO1lBQ2pCLElBQUk7WUFDSixTQUFTLEVBQUUsTUFBTTtTQUNsQixDQUFDLENBQUMsSUFBSSxJQUFJLENBQUM7SUFDZCxDQUFDLEVBQUUsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFFdEIsTUFBTSxFQUNKLEtBQUssRUFDTCxJQUFJLEVBQ0osS0FBSyxFQUNMLEtBQUssRUFDTCxVQUFVLEVBQUUsRUFDVixLQUFLLEVBQ0wsTUFBTSxFQUFFLGdCQUFnQixHQUN6QixFQUNELEdBQUcsRUFDSCxHQUFHLEVBQUUsRUFDSCxNQUFNLEdBQ1AsRUFDRCxjQUFjLEVBQ2QsZ0JBQWdCLEdBQ2pCLEdBQUcsSUFBSSxDQUFDO0lBRVQsd0NBQXdDO0lBQ3hDLFNBQVM7SUFDVCx3Q0FBd0M7SUFFeEMsTUFBTSxZQUFZLEdBQXFCLEVBQUUsQ0FBQztJQUMxQyxJQUFJLGlCQUFpQixHQUFHLEtBQUssQ0FBQztJQUU5QixJQUFJLEtBQUssRUFBRTtRQUNULElBQUksR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUViLElB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