payload 1.2.5 → 1.3.0

package/dist/admin/components/elements/WhereBuilder/field-types.js

@@ -1,114 +1,114 @@
-const boolean = [
-    {
-        label: 'equals',
-        value: 'equals',
-    },
-    {
-        label: 'is not equal to',
-        value: 'not_equals',
-    },
-];
-const base = [
-    ...boolean,
-    {
-        label: 'is in',
-        value: 'in',
-    },
-    {
-        label: 'is not in',
-        value: 'not_in',
-    },
-    {
-        label: 'exists',
-        value: 'exists',
-    },
-];
-const numeric = [
-    ...base,
-    {
-        label: 'is greater than',
-        value: 'greater_than',
-    },
-    {
-        label: 'is less than',
-        value: 'less_than',
-    },
-    {
-        label: 'is less than or equal to',
-        value: 'less_than_equal',
-    },
-    {
-        label: 'is greater than or equal to',
-        value: 'greater_than_equals',
-    },
-];
-const geo = [
-    ...boolean,
-    {
-        label: 'exists',
-        value: 'exists',
-    },
-    {
-        label: 'near',
-        value: 'near',
-    },
-];
-const like = {
-    label: 'is like',
-    value: 'like',
-};
-const contains = {
-    label: 'contains',
-    value: 'contains',
-};
-const fieldTypeConditions = {
-    text: {
-        component: 'Text',
-        operators: [...base, like, contains],
-    },
-    email: {
-        component: 'Text',
-        operators: [...base, contains],
-    },
-    textarea: {
-        component: 'Text',
-        operators: [...base, like, contains],
-    },
-    code: {
-        component: 'Text',
-        operators: [...base, like, contains],
-    },
-    richText: {
-        component: 'Text',
-        operators: [...base, like, contains],
-    },
-    number: {
-        component: 'Number',
-        operators: [...base, ...numeric],
-    },
-    date: {
-        component: 'Date',
-        operators: [...base, ...numeric],
-    },
-    point: {
-        component: 'Point',
-        operators: [...geo],
-    },
-    upload: {
-        component: 'Text',
-        operators: [...base],
-    },
-    relationship: {
-        component: 'Relationship',
-        operators: [...base],
-    },
-    select: {
-        component: 'Text',
-        operators: [...base],
-    },
-    checkbox: {
-        component: 'Text',
-        operators: boolean,
-    },
-};
-export default fieldTypeConditions;
+const boolean = [
+    {
+        label: 'equals',
+        value: 'equals',
+    },
+    {
+        label: 'is not equal to',
+        value: 'not_equals',
+    },
+];
+const base = [
+    ...boolean,
+    {
+        label: 'is in',
+        value: 'in',
+    },
+    {
+        label: 'is not in',
+        value: 'not_in',
+    },
+    {
+        label: 'exists',
+        value: 'exists',
+    },
+];
+const numeric = [
+    ...base,
+    {
+        label: 'is greater than',
+        value: 'greater_than',
+    },
+    {
+        label: 'is less than',
+        value: 'less_than',
+    },
+    {
+        label: 'is less than or equal to',
+        value: 'less_than_equal',
+    },
+    {
+        label: 'is greater than or equal to',
+        value: 'greater_than_equals',
+    },
+];
+const geo = [
+    ...boolean,
+    {
+        label: 'exists',
+        value: 'exists',
+    },
+    {
+        label: 'near',
+        value: 'near',
+    },
+];
+const like = {
+    label: 'is like',
+    value: 'like',
+};
+const contains = {
+    label: 'contains',
+    value: 'contains',
+};
+const fieldTypeConditions = {
+    text: {
+        component: 'Text',
+        operators: [...base, like, contains],
+    },
+    email: {
+        component: 'Text',
+        operators: [...base, contains],
+    },
+    textarea: {
+        component: 'Text',
+        operators: [...base, like, contains],
+    },
+    code: {
+        component: 'Text',
+        operators: [...base, like, contains],
+    },
+    richText: {
+        component: 'Text',
+        operators: [...base, like, contains],
+    },
+    number: {
+        component: 'Number',
+        operators: [...base, ...numeric],
+    },
+    date: {
+        component: 'Date',
+        operators: [...base, ...numeric],
+    },
+    point: {
+        component: 'Point',
+        operators: [...geo],
+    },
+    upload: {
+        component: 'Text',
+        operators: [...base],
+    },
+    relationship: {
+        component: 'Relationship',
+        operators: [...base],
+    },
+    select: {
+        component: 'Text',
+        operators: [...base],
+    },
+    checkbox: {
+        component: 'Text',
+        operators: boolean,
+    },
+};
+export default fieldTypeConditions;

package/dist/admin/components/elements/WhereBuilder/index.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { Props } from './types';
-import './index.scss';
-declare const WhereBuilder: React.FC<Props>;
-export default WhereBuilder;
+import React from 'react';
+import { Props } from './types';
+import './index.scss';
+declare const WhereBuilder: React.FC<Props>;
+export default WhereBuilder;

package/dist/admin/components/elements/WhereBuilder/index.js

@@ -1,91 +1,91 @@
-import React, { useState, useReducer } from 'react';
-import queryString from 'qs';
-import { useHistory } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
-import useThrottledEffect from '../../../hooks/useThrottledEffect';
-import Button from '../Button';
-import reducer from './reducer';
-import Condition from './Condition';
-import fieldTypes from './field-types';
-import flattenTopLevelFields from '../../../../utilities/flattenTopLevelFields';
-import { useSearchParams } from '../../utilities/SearchParams';
-import validateWhereQuery from './validateWhereQuery';
-import { getTranslation } from '../../../../utilities/getTranslation';
-import './index.scss';
-const baseClass = 'where-builder';
-const reduceFields = (fields, i18n) => flattenTopLevelFields(fields).reduce((reduced, field) => {
-    if (typeof fieldTypes[field.type] === 'object') {
-        const formattedField = {
-            label: getTranslation(field.label || field.name, i18n),
-            value: field.name,
-            ...fieldTypes[field.type],
-            props: {
-                ...field,
-            },
-        };
-        return [
-            ...reduced,
-            formattedField,
-        ];
-    }
-    return reduced;
-}, []);
-const WhereBuilder = (props) => {
-    const { collection, modifySearchQuery = true, handleChange, collection: { labels: { plural, } = {}, } = {}, } = props;
-    const history = useHistory();
-    const params = useSearchParams();
-    const { t, i18n } = useTranslation('general');
-    const [conditions, dispatchConditions] = useReducer(reducer, params.where, (whereFromSearch) => {
-        if (modifySearchQuery && validateWhereQuery(whereFromSearch)) {
-            return whereFromSearch.or;
-        }
-        return [];
-    });
-    const [reducedFields] = useState(() => reduceFields(collection.fields, i18n));
-    useThrottledEffect(() => {
-        const currentParams = queryString.parse(history.location.search, { ignoreQueryPrefix: true, depth: 10 });
-        const paramsToKeep = typeof (currentParams === null || currentParams === void 0 ? void 0 : currentParams.where) === 'object' && 'or' in currentParams.where ? currentParams.where.or.reduce((keptParams, param) => {
-            const newParam = { ...param };
-            if (param.and) {
-                delete newParam.and;
-            }
-            return [
-                ...keptParams,
-                newParam,
-            ];
-        }, []) : [];
-        const newWhereQuery = {
-            ...typeof (currentParams === null || currentParams === void 0 ? void 0 : currentParams.where) === 'object' ? currentParams.where : {},
-            or: [
-                ...conditions,
-                ...paramsToKeep,
-            ],
-        };
-        if (handleChange)
-            handleChange(newWhereQuery);
-        const hasExistingConditions = typeof (currentParams === null || currentParams === void 0 ? void 0 : currentParams.where) === 'object' && 'or' in currentParams.where;
-        const hasNewWhereConditions = conditions.length > 0;
-        if (modifySearchQuery && ((hasExistingConditions && !hasNewWhereConditions) || hasNewWhereConditions)) {
-            history.replace({
-                search: queryString.stringify({
-                    ...currentParams,
-                    page: 1,
-                    where: newWhereQuery,
-                }, { addQueryPrefix: true }),
-            });
-        }
-    }, 500, [conditions, modifySearchQuery, handleChange]);
-    return (React.createElement("div", { className: baseClass },
-        conditions.length > 0 && (React.createElement(React.Fragment, null,
-            React.createElement("div", { className: `${baseClass}__label` }, t('filterWhere', { label: getTranslation(plural, i18n) })),
-            React.createElement("ul", { className: `${baseClass}__or-filters` }, conditions.map((or, orIndex) => (React.createElement("li", { key: orIndex },
-                orIndex !== 0 && (React.createElement("div", { className: `${baseClass}__label` }, t('or'))),
-                React.createElement("ul", { className: `${baseClass}__and-filters` }, Array.isArray(or === null || or === void 0 ? void 0 : or.and) && or.and.map((_, andIndex) => (React.createElement("li", { key: andIndex },
-                    andIndex !== 0 && (React.createElement("div", { className: `${baseClass}__label` }, t('and'))),
-                    React.createElement(Condition, { value: conditions[orIndex].and[andIndex], orIndex: orIndex, andIndex: andIndex, key: andIndex, fields: reducedFields, dispatch: dispatchConditions }))))))))),
-            React.createElement(Button, { className: `${baseClass}__add-or`, icon: "plus", buttonStyle: "icon-label", iconPosition: "left", iconStyle: "with-border", onClick: () => dispatchConditions({ type: 'add', field: reducedFields[0].value }) }, t('or')))),
-        conditions.length === 0 && (React.createElement("div", { className: `${baseClass}__no-filters` },
-            React.createElement("div", { className: `${baseClass}__label` }, t('noFiltersSet')),
-            React.createElement(Button, { className: `${baseClass}__add-first-filter`, icon: "plus", buttonStyle: "icon-label", iconPosition: "left", iconStyle: "with-border", onClick: () => dispatchConditions({ type: 'add', field: reducedFields[0].value }) }, t('addFilter'))))));
-};
-export default WhereBuilder;
+import React, { useState, useReducer } from 'react';
+import queryString from 'qs';
+import { useHistory } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+import useThrottledEffect from '../../../hooks/useThrottledEffect';
+import Button from '../Button';
+import reducer from './reducer';
+import Condition from './Condition';
+import fieldTypes from './field-types';
+import flattenTopLevelFields from '../../../../utilities/flattenTopLevelFields';
+import { useSearchParams } from '../../utilities/SearchParams';
+import validateWhereQuery from './validateWhereQuery';
+import { getTranslation } from '../../../../utilities/getTranslation';
+import './index.scss';
+const baseClass = 'where-builder';
+const reduceFields = (fields, i18n) => flattenTopLevelFields(fields).reduce((reduced, field) => {
+    if (typeof fieldTypes[field.type] === 'object') {
+        const formattedField = {
+            label: getTranslation(field.label || field.name, i18n),
+            value: field.name,
+            ...fieldTypes[field.type],
+            props: {
+                ...field,
+            },
+        };
+        return [
+            ...reduced,
+            formattedField,
+        ];
+    }
+    return reduced;
+}, []);
+const WhereBuilder = (props) => {
+    const { collection, modifySearchQuery = true, handleChange, collection: { labels: { plural, } = {}, } = {}, } = props;
+    const history = useHistory();
+    const params = useSearchParams();
+    const { t, i18n } = useTranslation('general');
+    const [conditions, dispatchConditions] = useReducer(reducer, params.where, (whereFromSearch) => {
+        if (modifySearchQuery && validateWhereQuery(whereFromSearch)) {
+            return whereFromSearch.or;
+        }
+        return [];
+    });
+    const [reducedFields] = useState(() => reduceFields(collection.fields, i18n));
+    useThrottledEffect(() => {
+        const currentParams = queryString.parse(history.location.search, { ignoreQueryPrefix: true, depth: 10 });
+        const paramsToKeep = typeof (currentParams === null || currentParams === void 0 ? void 0 : currentParams.where) === 'object' && 'or' in currentParams.where ? currentParams.where.or.reduce((keptParams, param) => {
+            const newParam = { ...param };
+            if (param.and) {
+                delete newParam.and;
+            }
+            return [
+                ...keptParams,
+                newParam,
+            ];
+        }, []) : [];
+        const newWhereQuery = {
+            ...typeof (currentParams === null || currentParams === void 0 ? void 0 : currentParams.where) === 'object' ? currentParams.where : {},
+            or: [
+                ...conditions,
+                ...paramsToKeep,
+            ],
+        };
+        if (handleChange)
+            handleChange(newWhereQuery);
+        const hasExistingConditions = typeof (currentParams === null || currentParams === void 0 ? void 0 : currentParams.where) === 'object' && 'or' in currentParams.where;
+        const hasNewWhereConditions = conditions.length > 0;
+        if (modifySearchQuery && ((hasExistingConditions && !hasNewWhereConditions) || hasNewWhereConditions)) {
+            history.replace({
+                search: queryString.stringify({
+                    ...currentParams,
+                    page: 1,
+                    where: newWhereQuery,
+                }, { addQueryPrefix: true }),
+            });
+        }
+    }, 500, [conditions, modifySearchQuery, handleChange]);
+    return (React.createElement("div", { className: baseClass },
+        conditions.length > 0 && (React.createElement(React.Fragment, null,
+            React.createElement("div", { className: `${baseClass}__label` }, t('filterWhere', { label: getTranslation(plural, i18n) })),
+            React.createElement("ul", { className: `${baseClass}__or-filters` }, conditions.map((or, orIndex) => (React.createElement("li", { key: orIndex },
+                orIndex !== 0 && (React.createElement("div", { className: `${baseClass}__label` }, t('or'))),
+                React.createElement("ul", { className: `${baseClass}__and-filters` }, Array.isArray(or === null || or === void 0 ? void 0 : or.and) && or.and.map((_, andIndex) => (React.createElement("li", { key: andIndex },
+                    andIndex !== 0 && (React.createElement("div", { className: `${baseClass}__label` }, t('and'))),
+                    React.createElement(Condition, { value: conditions[orIndex].and[andIndex], orIndex: orIndex, andIndex: andIndex, key: andIndex, fields: reducedFields, dispatch: dispatchConditions }))))))))),
+            React.createElement(Button, { className: `${baseClass}__add-or`, icon: "plus", buttonStyle: "icon-label", iconPosition: "left", iconStyle: "with-border", onClick: () => dispatchConditions({ type: 'add', field: reducedFields[0].value }) }, t('or')))),
+        conditions.length === 0 && (React.createElement("div", { className: `${baseClass}__no-filters` },
+            React.createElement("div", { className: `${baseClass}__label` }, t('noFiltersSet')),
+            React.createElement(Button, { className: `${baseClass}__add-first-filter`, icon: "plus", buttonStyle: "icon-label", iconPosition: "left", iconStyle: "with-border", onClick: () => dispatchConditions({ type: 'add', field: reducedFields[0].value }) }, t('addFilter'))))));
+};
+export default WhereBuilder;

package/dist/admin/components/elements/WhereBuilder/reducer.d.ts

@@ -1,4 +1,4 @@
-import { Action } from './types';
-import { Where } from '../../../../types';
-declare const reducer: (state: Where[], action: Action) => Where[];
-export default reducer;
+import { Action } from './types';
+import { Where } from '../../../../types';
+declare const reducer: (state: Where[], action: Action) => Where[];
+export default reducer;

package/dist/admin/components/elements/WhereBuilder/reducer.js

@@ -1,65 +1,65 @@
-const reducer = (state, action) => {
-    const newState = [
-        ...state,
-    ];
-    const { orIndex, andIndex, } = action;
-    switch (action.type) {
-        case 'add': {
-            const { relation, field } = action;
-            if (relation === 'and') {
-                newState[orIndex].and.splice(andIndex, 0, { [field]: {} });
-                return newState;
-            }
-            return [
-                ...newState,
-                {
-                    and: [{
-                            [field]: {},
-                        }],
-                },
-            ];
-        }
-        case 'remove': {
-            newState[orIndex].and.splice(andIndex, 1);
-            if (newState[orIndex].and.length === 0) {
-                newState.splice(orIndex, 1);
-            }
-            return newState;
-        }
-        case 'update': {
-            const { field, operator, value } = action;
-            if (typeof newState[orIndex].and[andIndex] === 'object') {
-                newState[orIndex].and[andIndex] = {
-                    ...newState[orIndex].and[andIndex],
-                };
-                const [existingFieldName, existingCondition] = Object.entries(newState[orIndex].and[andIndex])[0] || [undefined, undefined];
-                if (operator) {
-                    newState[orIndex].and[andIndex] = {
-                        [existingFieldName]: {
-                            [operator]: Object.values(existingCondition)[0],
-                        },
-                    };
-                }
-                if (field) {
-                    newState[orIndex].and[andIndex] = {
-                        [field]: {
-                            [Object.keys(existingCondition)[0]]: Object.values(existingCondition)[0],
-                        },
-                    };
-                }
-                if (value !== undefined) {
-                    newState[orIndex].and[andIndex] = {
-                        [existingFieldName]: {
-                            [Object.keys(existingCondition)[0]]: value,
-                        },
-                    };
-                }
-            }
-            return newState;
-        }
-        default: {
-            return newState;
-        }
-    }
-};
-export default reducer;
+const reducer = (state, action) => {
+    const newState = [
+        ...state,
+    ];
+    const { orIndex, andIndex, } = action;
+    switch (action.type) {
+        case 'add': {
+            const { relation, field } = action;
+            if (relation === 'and') {
+                newState[orIndex].and.splice(andIndex, 0, { [field]: {} });
+                return newState;
+            }
+            return [
+                ...newState,
+                {
+                    and: [{
+                            [field]: {},
+                        }],
+                },
+            ];
+        }
+        case 'remove': {
+            newState[orIndex].and.splice(andIndex, 1);
+            if (newState[orIndex].and.length === 0) {
+                newState.splice(orIndex, 1);
+            }
+            return newState;
+        }
+        case 'update': {
+            const { field, operator, value } = action;
+            if (typeof newState[orIndex].and[andIndex] === 'object') {
+                newState[orIndex].and[andIndex] = {
+                    ...newState[orIndex].and[andIndex],
+                };
+                const [existingFieldName, existingCondition] = Object.entries(newState[orIndex].and[andIndex])[0] || [undefined, undefined];
+                if (operator) {
+                    newState[orIndex].and[andIndex] = {
+                        [existingFieldName]: {
+                            [operator]: Object.values(existingCondition)[0],
+                        },
+                    };
+                }
+                if (field) {
+                    newState[orIndex].and[andIndex] = {
+                        [field]: {
+                            [Object.keys(existingCondition)[0]]: Object.values(existingCondition)[0],
+                        },
+                    };
+                }
+                if (value !== undefined) {
+                    newState[orIndex].and[andIndex] = {
+                        [existingFieldName]: {
+                            [Object.keys(existingCondition)[0]]: value,
+                        },
+                    };
+                }
+            }
+            return newState;
+        }
+        default: {
+            return newState;
+        }
+    }
+};
+export default reducer;

package/dist/admin/components/elements/WhereBuilder/types.d.ts

@@ -1,43 +1,43 @@
-import { SanitizedCollectionConfig } from '../../../../collections/config/types';
-import { Field } from '../../../../fields/config/types';
-import { Operator, Where } from '../../../../types';
-export declare type Props = {
-    collection: SanitizedCollectionConfig;
-    handleChange?: (where: Where) => void;
-    modifySearchQuery?: boolean;
-};
-export declare type FieldCondition = {
-    label: string;
-    value: string;
-    operators: {
-        label: string;
-        value: Operator;
-    }[];
-    component?: string;
-    props: Field;
-};
-export declare type Relation = 'and' | 'or';
-export declare type ADD = {
-    type: 'add';
-    field: string;
-    relation?: Relation;
-    andIndex?: number;
-    orIndex?: number;
-};
-export declare type REMOVE = {
-    type: 'remove';
-    andIndex: number;
-    orIndex: number;
-};
-export declare type UPDATE = {
-    type: 'update';
-    andIndex: number;
-    orIndex: number;
-    operator?: string;
-    field?: string;
-    value?: unknown;
-};
-export declare type Action = ADD | REMOVE | UPDATE;
-export declare type State = {
-    or: Where[];
-};
+import { SanitizedCollectionConfig } from '../../../../collections/config/types';
+import { Field } from '../../../../fields/config/types';
+import { Operator, Where } from '../../../../types';
+export declare type Props = {
+    collection: SanitizedCollectionConfig;
+    handleChange?: (where: Where) => void;
+    modifySearchQuery?: boolean;
+};
+export declare type FieldCondition = {
+    label: string;
+    value: string;
+    operators: {
+        label: string;
+        value: Operator;
+    }[];
+    component?: string;
+    props: Field;
+};
+export declare type Relation = 'and' | 'or';
+export declare type ADD = {
+    type: 'add';
+    field: string;
+    relation?: Relation;
+    andIndex?: number;
+    orIndex?: number;
+};
+export declare type REMOVE = {
+    type: 'remove';
+    andIndex: number;
+    orIndex: number;
+};
+export declare type UPDATE = {
+    type: 'update';
+    andIndex: number;
+    orIndex: number;
+    operator?: string;
+    field?: string;
+    value?: unknown;
+};
+export declare type Action = ADD | REMOVE | UPDATE;
+export declare type State = {
+    or: Where[];
+};

package/dist/admin/components/elements/WhereBuilder/types.js

@@ -1 +1 @@
-export {};
+export {};

package/dist/admin/components/elements/WhereBuilder/validateWhereQuery.d.ts

@@ -1,3 +1,3 @@
-import { Where } from '../../../../types';
-declare const validateWhereQuery: (whereQuery: any) => whereQuery is Where;
-export default validateWhereQuery;
+import { Where } from '../../../../types';
+declare const validateWhereQuery: (whereQuery: any) => whereQuery is Where;
+export default validateWhereQuery;