payload 0.20.7-beta.0 → 0.20.8-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/CHANGELOG.md +3 -38
  2. package/dist/admin/components/elements/ColumnSelector/index.js +1 -1
  3. package/dist/admin/components/elements/WhereBuilder/index.js +1 -1
  4. package/dist/admin/components/forms/field-types/Array/Array.js +1 -1
  5. package/dist/admin/components/forms/field-types/Array/index.scss +1 -1
  6. package/dist/admin/components/forms/field-types/Blocks/Blocks.js +1 -1
  7. package/dist/admin/components/forms/field-types/Blocks/index.scss +1 -1
  8. package/dist/admin/components/forms/field-types/Group/index.js +3 -0
  9. package/dist/admin/components/forms/field-types/Group/index.scss +12 -0
  10. package/dist/admin/components/forms/field-types/Tabs/index.js +17 -15
  11. package/dist/admin/components/forms/field-types/Tabs/provider.d.ts +8 -0
  12. package/dist/admin/components/forms/field-types/Tabs/provider.js +7 -0
  13. package/dist/admin/components/views/collections/List/buildColumns.js +1 -1
  14. package/dist/mongoose/buildSchema.js +3 -2
  15. package/dist/{admin/utilities → utilities}/flattenTopLevelFields.d.ts +1 -1
  16. package/dist/utilities/flattenTopLevelFields.js +33 -0
  17. package/package.json +1 -1
  18. package/dist/admin/utilities/flattenTopLevelFields.js +0 -30
package/CHANGELOG.md CHANGED
@@ -1,46 +1,10 @@
1
- ## [0.20.7-beta.0](https://github.com/payloadcms/payload/compare/v0.19.2...v0.20.7-beta.0) (2022-07-16)
2
-
3
-
4
- ### Bug Fixes
5
-
6
- * bug with base colors ([4bb0d39](https://github.com/payloadcms/payload/commit/4bb0d3994f630a6111f18ab6a1a2e9a9a83d2a98))
7
- * ensures duplicated rows have properly created ids ([3ae1c26](https://github.com/payloadcms/payload/commit/3ae1c26a074c74585162a9938e67e3c7bcc087fa))
8
- * upload e2e file path ([a664b62](https://github.com/payloadcms/payload/commit/a664b627f67207f520b16b705017c72838039f64))
9
-
10
-
11
- ### Features
12
-
13
- * add card ids ([baf4664](https://github.com/payloadcms/payload/commit/baf46640737d8aca6fead1568ba15f11769a76f2))
14
- * adds collapsible field type ([98676be](https://github.com/payloadcms/payload/commit/98676bea69a37c6521dea1dfafa4c4a9967efc1e))
15
- * e2e test upload ([#755](https://github.com/payloadcms/payload/issues/755)) ([1160093](https://github.com/payloadcms/payload/commit/11600930b78dbae50fd093529b727101d83561fa))
16
- * ensures nested fields not affecting data can be traversed properly ([3b9fdf3](https://github.com/payloadcms/payload/commit/3b9fdf3ffdc49ff9a2c0e56f5438810c5f397f86))
17
- * ensures tabs and collapsibles render in version diff ([54162b5](https://github.com/payloadcms/payload/commit/54162b52cc8211e100d4ad901339b7982666389c))
18
- * finishes block field ([41a0ba5](https://github.com/payloadcms/payload/commit/41a0ba57805b4b06e5310659263ee59ae0828f34))
19
- * finishes collapsible field ([60bfb1c](https://github.com/payloadcms/payload/commit/60bfb1c3b801c89de055d11cee50a1b51e864b7b))
20
- * finishes tabs field ([68e7c41](https://github.com/payloadcms/payload/commit/68e7c41fdc07df04dcc3caaf486d2d596354039d))
21
- * initializes useField internalValue with incoming field value ([c995f79](https://github.com/payloadcms/payload/commit/c995f797fec76e78eafb323cdf4219caebdfa6c7))
22
- * more maintainable colors ([5fc4f3a](https://github.com/payloadcms/payload/commit/5fc4f3adadc8f7ec3eaf99021dccf7060926c7f1))
23
- * only renders arrays and blocks once they are initialized ([735e385](https://github.com/payloadcms/payload/commit/735e385537a505db00b21b2567f829bcb1718c3c))
24
- * point field int test ([c75c67e](https://github.com/payloadcms/payload/commit/c75c67ec86bc5ff42d4965631d7f7e80fb01cb1f))
25
- * refactors z index methodology ([2fa680c](https://github.com/payloadcms/payload/commit/2fa680cdf8daeff42ac0724d895e8c4130ade725))
26
- * remove duplication of config in tests ([40b6aff](https://github.com/payloadcms/payload/commit/40b6afff2d1a5f263eae4da5fe477a0fd738b701))
27
- * reorganizes mongo connection ([8589fde](https://github.com/payloadcms/payload/commit/8589fdefdad4856f4d642c2d9ed8d6ca815c81f6))
28
- * restores built-in fields into table column builder ([7a6f239](https://github.com/payloadcms/payload/commit/7a6f2392fa63532a8556ec0dc0e1186057291fea))
29
- * retrofits array to new collapsible component ([aa89251](https://github.com/payloadcms/payload/commit/aa89251a3b6990460ac03e0a33d9aab3ceeadd9d))
30
- * revises e2e field testing ([31ca363](https://github.com/payloadcms/payload/commit/31ca3639828ddf572033023bd6a350f5b4a2eb9a))
31
- * scaffolds tabs field ([85b7a49](https://github.com/payloadcms/payload/commit/85b7a490eb6fa53424986d78b893284096c040d4))
32
- * styles nested groups and adds gutter back to richText ([3a17a8a](https://github.com/payloadcms/payload/commit/3a17a8a001a1aaaa52b119faf4740c50367b4049))
33
- * testing refactor (e2e/int) ([#748](https://github.com/payloadcms/payload/issues/748)) ([90ba15f](https://github.com/payloadcms/payload/commit/90ba15f9bdf834a55861551e43c4dc55ca81565b))
34
- * updates block field to use new collapsible ([49d09a3](https://github.com/payloadcms/payload/commit/49d09a349fe6cdc45c429b77e9d60943b7db851f))
35
- * updates styling of group field ([8c4e0fa](https://github.com/payloadcms/payload/commit/8c4e0fa7b28fd68be1b20374d5d8cfaff923db11))
36
- * upload integration tests ([#759](https://github.com/payloadcms/payload/issues/759)) ([e75cca4](https://github.com/payloadcms/payload/commit/e75cca4512e16647b6e0371706b33ad4f486c26d))
37
-
38
- ## [0.20.6-beta.0](https://github.com/payloadcms/payload/compare/v0.19.2...v0.20.6-beta.0) (2022-07-16)
1
+ ## [0.20.8-beta.0](https://github.com/payloadcms/payload/compare/v0.19.2...v0.20.8-beta.0) (2022-07-16)
39
2
 
40
3
 
41
4
  ### Bug Fixes
42
5
 
43
6
  * bug with base colors ([4bb0d39](https://github.com/payloadcms/payload/commit/4bb0d3994f630a6111f18ab6a1a2e9a9a83d2a98))
7
+ * ensures blocks can be nested within tabs / rows / collapsibles ([2707af1](https://github.com/payloadcms/payload/commit/2707af1d45d3234ba6e495bf9e0eb0d0f43f866a))
44
8
  * ensures duplicated rows have properly created ids ([3ae1c26](https://github.com/payloadcms/payload/commit/3ae1c26a074c74585162a9938e67e3c7bcc087fa))
45
9
  * upload e2e file path ([a664b62](https://github.com/payloadcms/payload/commit/a664b627f67207f520b16b705017c72838039f64))
46
10
 
@@ -50,6 +14,7 @@
50
14
  * add card ids ([baf4664](https://github.com/payloadcms/payload/commit/baf46640737d8aca6fead1568ba15f11769a76f2))
51
15
  * adds collapsible field type ([98676be](https://github.com/payloadcms/payload/commit/98676bea69a37c6521dea1dfafa4c4a9967efc1e))
52
16
  * e2e test upload ([#755](https://github.com/payloadcms/payload/issues/755)) ([1160093](https://github.com/payloadcms/payload/commit/11600930b78dbae50fd093529b727101d83561fa))
17
+ * ensures groups within blocks render properly ([3a98c6a](https://github.com/payloadcms/payload/commit/3a98c6ad531c86ec7a3a4163650068a157d56746))
53
18
  * ensures nested fields not affecting data can be traversed properly ([3b9fdf3](https://github.com/payloadcms/payload/commit/3b9fdf3ffdc49ff9a2c0e56f5438810c5f397f86))
54
19
  * ensures tabs and collapsibles render in version diff ([54162b5](https://github.com/payloadcms/payload/commit/54162b52cc8211e100d4ad901339b7982666389c))
55
20
  * finishes block field ([41a0ba5](https://github.com/payloadcms/payload/commit/41a0ba57805b4b06e5310659263ee59ae0828f34))
package/dist/admin/components/elements/ColumnSelector/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import React, { useState } from 'react';
2
- import flattenTopLevelFields from '../../../utilities/flattenTopLevelFields';
2
+ import flattenTopLevelFields from '../../../../utilities/flattenTopLevelFields';
3
3
  import Pill from '../Pill';
4
4
  import Plus from '../../icons/Plus';
5
5
  import X from '../../icons/X';
package/dist/admin/components/elements/WhereBuilder/index.js CHANGED
@@ -6,7 +6,7 @@ import Button from '../Button';
6
6
  import reducer from './reducer';
7
7
  import Condition from './Condition';
8
8
  import fieldTypes from './field-types';
9
- import flattenTopLevelFields from '../../../utilities/flattenTopLevelFields';
9
+ import flattenTopLevelFields from '../../../../utilities/flattenTopLevelFields';
10
10
  import { useSearchParams } from '../../utilities/SearchParams';
11
11
  import validateWhereQuery from './validateWhereQuery';
12
12
  import './index.scss';
package/dist/admin/components/forms/field-types/Array/Array.js CHANGED
@@ -174,7 +174,7 @@ const ArrayFieldType = (props) => {
174
174
  return (React.createElement(Draggable, { key: row.id, draggableId: row.id, index: i, isDragDisabled: readOnly }, (providedDrag) => (React.createElement("div", { id: `${path}-row-${i}`, ref: providedDrag.innerRef, ...providedDrag.draggableProps },
175
175
  React.createElement(Collapsible, { collapsed: row.collapsed, onToggle: (collapsed) => setCollapse(row.id, collapsed), className: `${baseClass}__row`, key: row.id, dragHandleProps: providedDrag.dragHandleProps, header: `${labels.singular} ${rowNumber >= 10 ? rowNumber : `0${rowNumber}`}`, actions: !readOnly ? (React.createElement(ArrayAction, { rowCount: rows.length, duplicateRow: duplicateRow, addRow: addRow, moveRow: moveRow, removeRow: removeRow, index: i })) : undefined },
176
176
  React.createElement(HiddenInput, { name: `${path}.${i}.id`, value: row.id }),
177
- React.createElement(RenderFields, { forceRender: true, readOnly: readOnly, fieldTypes: fieldTypes, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldSchema: fields.map((field) => ({
177
+ React.createElement(RenderFields, { className: `${baseClass}__fields`, forceRender: true, readOnly: readOnly, fieldTypes: fieldTypes, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldSchema: fields.map((field) => ({
178
178
  ...field,
179
179
  path: `${path}.${i}${fieldAffectsData(field) ? `.${field.name}` : ''}`,
180
180
  })) }))))));
package/dist/admin/components/forms/field-types/Array/index.scss CHANGED
@@ -55,7 +55,7 @@
55
55
  }
56
56
  }
57
57
 
58
- .field-type:last-child {
58
+ &__fields>.field-type:last-child {
59
59
  margin-bottom: 0;
60
60
  }
61
61
  }
package/dist/admin/components/forms/field-types/Blocks/Blocks.js CHANGED
@@ -185,7 +185,7 @@ const Blocks = (props) => {
185
185
  React.createElement(Popup, { key: `${blockType}-${i}`, forceOpen: selectorIndexOpen === i, onToggleOpen: onAddPopupToggle, buttonType: "none", size: "large", horizontalAlign: "right", render: ({ close }) => (React.createElement(BlockSelector, { blocks: blocks, addRow: addRow, addRowIndex: i, close: close })) }),
186
186
  React.createElement(ArrayAction, { rowCount: rows.length, duplicateRow: () => duplicateRow(i, blockType), addRow: () => setSelectorIndexOpen(i), moveRow: moveRow, removeRow: removeRow, index: i }))) : undefined },
187
187
  React.createElement(HiddenInput, { name: `${path}.${i}.id`, value: row.id }),
188
- React.createElement(RenderFields, { forceRender: true, readOnly: readOnly, fieldTypes: fieldTypes, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldSchema: blockToRender.fields.map((field) => ({
188
+ React.createElement(RenderFields, { className: `${baseClass}__fields`, forceRender: true, readOnly: readOnly, fieldTypes: fieldTypes, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldSchema: blockToRender.fields.map((field) => ({
189
189
  ...field,
190
190
  path: `${path}.${i}${fieldAffectsData(field) ? `.${field.name}` : ''}`,
191
191
  })) }))))));
package/dist/admin/components/forms/field-types/Blocks/index.scss CHANGED
@@ -74,7 +74,7 @@
74
74
  }
75
75
  }
76
76
 
77
- .field-type:last-child {
77
+ &__fields>.field-type:last-child {
78
78
  margin-bottom: 0;
79
79
  }
80
80
  }
package/dist/admin/components/forms/field-types/Group/index.js CHANGED
@@ -6,17 +6,20 @@ import { fieldAffectsData } from '../../../../../fields/config/types';
6
6
  import { useCollapsible } from '../../../elements/Collapsible/provider';
7
7
  import './index.scss';
8
8
  import { GroupProvider, useGroup } from './provider';
9
+ import { useTabs } from '../Tabs/provider';
9
10
  const baseClass = 'group-field';
10
11
  const Group = (props) => {
11
12
  const { label, fields, name, path: pathFromProps, fieldTypes, admin: { readOnly, style, className, width, description, hideGutter = false, }, permissions, } = props;
12
13
  const isWithinCollapsible = useCollapsible();
13
14
  const isWithinGroup = useGroup();
15
+ const isWithinTab = useTabs();
14
16
  const path = pathFromProps || name;
15
17
  return (React.createElement("div", { id: `field-${path}`, className: [
16
18
  'field-type',
17
19
  baseClass,
18
20
  isWithinCollapsible && `${baseClass}--within-collapsible`,
19
21
  isWithinGroup && `${baseClass}--within-group`,
22
+ isWithinTab && `${baseClass}--within-tab`,
20
23
  (!hideGutter && isWithinGroup) && `${baseClass}--gutter`,
21
24
  className,
22
25
  ].filter(Boolean).join(' '), style: {
package/dist/admin/components/forms/field-types/Group/index.scss CHANGED
@@ -29,6 +29,18 @@
29
29
  border-bottom: 0;
30
30
  }
31
31
 
32
+ &--within-tab:first-child {
33
+ margin-top: 0;
34
+ border-top: 0;
35
+ padding-top: 0;
36
+ }
37
+
38
+ &--within-tab:last-child {
39
+ margin-bottom: 0;
40
+ border-bottom: 0;
41
+ padding-bottom: 0;
42
+ }
43
+
32
44
  &--gutter {
33
45
  border-left: 1px solid var(--theme-elevation-100);
34
46
  padding: 0 0 0 $baseline;
package/dist/admin/components/forms/field-types/Tabs/index.js CHANGED
@@ -5,6 +5,7 @@ import { fieldAffectsData } from '../../../../../fields/config/types';
5
5
  import FieldDescription from '../../FieldDescription';
6
6
  import toKebabCase from '../../../../../utilities/toKebabCase';
7
7
  import { useCollapsible } from '../../../elements/Collapsible/provider';
8
+ import { TabsProvider } from './provider';
8
9
  import './index.scss';
9
10
  const baseClass = 'tabs-field';
10
11
  const TabsField = (props) => {
@@ -17,20 +18,21 @@ const TabsField = (props) => {
17
18
  baseClass,
18
19
  isWithinCollapsible && `${baseClass}--within-collapsible`,
19
20
  ].filter(Boolean).join(' ') },
20
- React.createElement("div", { className: `${baseClass}__tabs` }, tabs.map((tab, i) => {
21
- return (React.createElement("button", { key: i, type: "button", className: [
22
- `${baseClass}__tab-button`,
23
- active === i && `${baseClass}__tab-button--active`,
24
- ].filter(Boolean).join(' '), onClick: () => setActive(i) }, tab.label));
25
- })),
26
- React.createElement("div", { className: `${baseClass}__content-wrap` }, activeTab && (React.createElement("div", { className: [
27
- `${baseClass}__tab`,
28
- `${baseClass}__tab-${toKebabCase(activeTab.label)}`,
29
- ].join(' ') },
30
- React.createElement(FieldDescription, { className: `${baseClass}__description`, description: activeTab.description }),
31
- React.createElement(RenderFields, { forceRender: true, readOnly: readOnly, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldTypes: fieldTypes, fieldSchema: activeTab.fields.map((field) => ({
32
- ...field,
33
- path: `${path ? `${path}.` : ''}${fieldAffectsData(field) ? field.name : ''}`,
34
- })) }))))));
21
+ React.createElement(TabsProvider, null,
22
+ React.createElement("div", { className: `${baseClass}__tabs` }, tabs.map((tab, i) => {
23
+ return (React.createElement("button", { key: i, type: "button", className: [
24
+ `${baseClass}__tab-button`,
25
+ active === i && `${baseClass}__tab-button--active`,
26
+ ].filter(Boolean).join(' '), onClick: () => setActive(i) }, tab.label));
27
+ })),
28
+ React.createElement("div", { className: `${baseClass}__content-wrap` }, activeTab && (React.createElement("div", { className: [
29
+ `${baseClass}__tab`,
30
+ `${baseClass}__tab-${toKebabCase(activeTab.label)}`,
31
+ ].join(' ') },
32
+ React.createElement(FieldDescription, { className: `${baseClass}__description`, description: activeTab.description }),
33
+ React.createElement(RenderFields, { forceRender: true, readOnly: readOnly, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldTypes: fieldTypes, fieldSchema: activeTab.fields.map((field) => ({
34
+ ...field,
35
+ path: `${path ? `${path}.` : ''}${fieldAffectsData(field) ? field.name : ''}`,
36
+ })) })))))));
35
37
  };
36
38
  export default withCondition(TabsField);
package/dist/admin/components/forms/field-types/Tabs/provider.d.ts ADDED
@@ -0,0 +1,8 @@
1
+ import React from 'react';
2
+ declare const Context: React.Context<boolean>;
3
+ export declare const TabsProvider: React.FC<{
4
+ children?: React.ReactNode;
5
+ withinTab?: boolean;
6
+ }>;
7
+ export declare const useTabs: () => boolean;
8
+ export default Context;
package/dist/admin/components/forms/field-types/Tabs/provider.js ADDED
@@ -0,0 +1,7 @@
1
+ import React, { createContext, useContext, } from 'react';
2
+ const Context = createContext(false);
3
+ export const TabsProvider = ({ children, withinTab = true }) => {
4
+ return (React.createElement(Context.Provider, { value: withinTab }, children));
5
+ };
6
+ export const useTabs = () => useContext(Context);
7
+ export default Context;
package/dist/admin/components/views/collections/List/buildColumns.js CHANGED
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import Cell from './Cell';
3
3
  import SortColumn from '../../../elements/SortColumn';
4
4
  import { fieldIsPresentationalOnly } from '../../../../../fields/config/types';
5
- import flattenFields from '../../../../utilities/flattenTopLevelFields';
5
+ import flattenFields from '../../../../../utilities/flattenTopLevelFields';
6
6
  const buildColumns = (collection, columns) => {
7
7
  const flattenedFields = flattenFields([
8
8
  ...collection.fields,
package/dist/mongoose/buildSchema.js CHANGED
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
10
10
  const mongoose_1 = require("mongoose");
11
11
  const types_1 = require("../fields/config/types");
12
12
  const sortableFieldTypes_1 = __importDefault(require("../fields/sortableFieldTypes"));
13
+ const flattenTopLevelFields_1 = __importDefault(require("../utilities/flattenTopLevelFields"));
13
14
  const setBlockDiscriminators = (fields, schema, config, buildSchemaOptions) => {
14
15
  fields.forEach((field) => {
15
16
  const blockFieldType = field;
@@ -100,7 +101,7 @@ const buildSchema = (config, configFields, buildSchemaOptions = {}) => {
100
101
  indexFields.forEach((index) => {
101
102
  schema.index(index);
102
103
  });
103
- setBlockDiscriminators(configFields, schema, config, buildSchemaOptions);
104
+ setBlockDiscriminators((0, flattenTopLevelFields_1.default)(configFields), schema, config, buildSchemaOptions);
104
105
  return schema;
105
106
  };
106
107
  const fieldIndexMap = {
@@ -375,4 +376,4 @@ const fieldToSchemaMap = {
375
376
  },
376
377
  };
377
378
  exports.default = buildSchema;
378
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"buildSchema.js","sourceRoot":"","sources":["../../src/mongoose/buildSchema.ts"],"names":[],"mappings":"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"}
379
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"buildSchema.js","sourceRoot":"","sources":["../../src/mongoose/buildSchema.ts"],"names":[],"mappings":"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"}
package/dist/{admin/utilities → utilities}/flattenTopLevelFields.d.ts RENAMED
@@ -1,3 +1,3 @@
1
- import { Field, FieldAffectingData, FieldPresentationalOnly } from '../../fields/config/types';
1
+ import { Field, FieldAffectingData, FieldPresentationalOnly } from '../fields/config/types';
2
2
  declare const flattenFields: (fields: Field[], keepPresentationalFields?: boolean) => (FieldAffectingData | FieldPresentationalOnly)[];
3
3
  export default flattenFields;
package/dist/utilities/flattenTopLevelFields.js ADDED
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const types_1 = require("../fields/config/types");
4
+ const flattenFields = (fields, keepPresentationalFields) => {
5
+ return fields.reduce((fieldsToUse, field) => {
6
+ if ((0, types_1.fieldAffectsData)(field) || (keepPresentationalFields && (0, types_1.fieldIsPresentationalOnly)(field))) {
7
+ return [
8
+ ...fieldsToUse,
9
+ field,
10
+ ];
11
+ }
12
+ if ((0, types_1.fieldHasSubFields)(field)) {
13
+ return [
14
+ ...fieldsToUse,
15
+ ...flattenFields(field.fields, keepPresentationalFields),
16
+ ];
17
+ }
18
+ if (field.type === 'tabs') {
19
+ return [
20
+ ...fieldsToUse,
21
+ ...field.tabs.reduce((tabFields, tab) => {
22
+ return [
23
+ ...tabFields,
24
+ ...flattenFields(tab.fields, keepPresentationalFields),
25
+ ];
26
+ }, []),
27
+ ];
28
+ }
29
+ return fieldsToUse;
30
+ }, []);
31
+ };
32
+ exports.default = flattenFields;
33
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmxhdHRlblRvcExldmVsRmllbGRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxpdGllcy9mbGF0dGVuVG9wTGV2ZWxGaWVsZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxrREFBNEo7QUFFNUosTUFBTSxhQUFhLEdBQUcsQ0FBQyxNQUFlLEVBQUUsd0JBQWtDLEVBQW9ELEVBQUU7SUFDOUgsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsV0FBVyxFQUFFLEtBQUssRUFBRSxFQUFFO1FBQzFDLElBQUksSUFBQSx3QkFBZ0IsRUFBQyxLQUFLLENBQUMsSUFBSSxDQUFDLHdCQUF3QixJQUFJLElBQUEsaUNBQXlCLEVBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtZQUM3RixPQUFPO2dCQUNMLEdBQUcsV0FBVztnQkFDZCxLQUFLO2FBQ04sQ0FBQztTQUNIO1FBRUQsSUFBSSxJQUFBLHlCQUFpQixFQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzVCLE9BQU87Z0JBQ0wsR0FBRyxXQUFXO2dCQUNkLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsd0JBQXdCLENBQUM7YUFDekQsQ0FBQztTQUNIO1FBRUQsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLE1BQU0sRUFBRTtZQUN6QixPQUFPO2dCQUNMLEdBQUcsV0FBVztnQkFDZCxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxFQUFFLEdBQUcsRUFBRSxFQUFFO29CQUN0QyxPQUFPO3dCQUNMLEdBQUcsU0FBUzt3QkFDWixHQUFHLGFBQWEsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLHdCQUF3QixDQUFDO3FCQUN2RCxDQUFDO2dCQUNKLENBQUMsRUFBRSxFQUFFLENBQUM7YUFDUCxDQUFDO1NBQ0g7UUFFRCxPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7QUFDVCxDQUFDLENBQUM7QUFFRixrQkFBZSxhQUFhLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "payload",
3
- "version": "0.20.7-beta.0",
3
+ "version": "0.20.8-beta.0",
4
4
  "description": "Node, React and MongoDB Headless CMS and Application Framework",
5
5
  "license": "MIT",
6
6
  "author": {
package/dist/admin/utilities/flattenTopLevelFields.js DELETED
@@ -1,30 +0,0 @@
1
- import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from '../../fields/config/types';
2
- const flattenFields = (fields, keepPresentationalFields) => {
3
- return fields.reduce((fieldsToUse, field) => {
4
- if (fieldAffectsData(field) || (keepPresentationalFields && fieldIsPresentationalOnly(field))) {
5
- return [
6
- ...fieldsToUse,
7
- field,
8
- ];
9
- }
10
- if (fieldHasSubFields(field)) {
11
- return [
12
- ...fieldsToUse,
13
- ...flattenFields(field.fields, keepPresentationalFields),
14
- ];
15
- }
16
- if (field.type === 'tabs') {
17
- return [
18
- ...fieldsToUse,
19
- ...field.tabs.reduce((tabFields, tab) => {
20
- return [
21
- ...tabFields,
22
- ...flattenFields(tab.fields, keepPresentationalFields),
23
- ];
24
- }, []),
25
- ];
26
- }
27
- return fieldsToUse;
28
- }, []);
29
- };
30
- export default flattenFields;