payload 1.7.0 → 1.7.2

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 (98) hide show
  1. package/dist/admin/Root.js +1 -0
  2. package/dist/admin/Root.js.map +1 -1
  3. package/dist/admin/components/elements/DocumentDrawer/DrawerContent.js +49 -30
  4. package/dist/admin/components/elements/DocumentDrawer/DrawerContent.js.map +1 -1
  5. package/dist/admin/components/elements/ReactSelect/MultiValue/index.js +4 -3
  6. package/dist/admin/components/elements/ReactSelect/MultiValue/index.js.map +1 -1
  7. package/dist/admin/components/elements/ReactSelect/MultiValue/index.scss +5 -1
  8. package/dist/admin/components/forms/Form/buildStateFromSchema/iterateFields.d.ts +1 -1
  9. package/dist/admin/components/forms/Form/buildStateFromSchema/iterateFields.js +1 -1
  10. package/dist/admin/components/forms/Form/buildStateFromSchema/iterateFields.js.map +1 -1
  11. package/dist/admin/components/forms/Form/fieldReducer.js +2 -2
  12. package/dist/admin/components/forms/Form/fieldReducer.js.map +1 -1
  13. package/dist/admin/components/forms/Form/types.d.ts +3 -1
  14. package/dist/admin/components/forms/field-types/Blocks/BlocksDrawer/index.js +13 -8
  15. package/dist/admin/components/forms/field-types/Blocks/BlocksDrawer/index.js.map +1 -1
  16. package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.d.ts +10 -0
  17. package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.js +17 -0
  18. package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.js.map +1 -0
  19. package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.scss +9 -0
  20. package/dist/admin/components/forms/field-types/RichText/elements/getCommonBlock.js +2 -0
  21. package/dist/admin/components/forms/field-types/RichText/elements/getCommonBlock.js.map +1 -1
  22. package/dist/admin/components/forms/field-types/RichText/elements/indent/index.js.map +1 -1
  23. package/dist/admin/components/forms/field-types/RichText/elements/index.d.ts +7 -0
  24. package/dist/admin/components/forms/field-types/RichText/elements/index.js +2 -0
  25. package/dist/admin/components/forms/field-types/RichText/elements/index.js.map +1 -1
  26. package/dist/admin/components/forms/field-types/RichText/elements/injectVoid.js.map +1 -1
  27. package/dist/admin/components/forms/field-types/RichText/index.scss +3 -2
  28. package/dist/admin/components/forms/field-types/Textarea/index.scss +11 -0
  29. package/dist/admin/components/forms/field-types/Upload/Input.js +7 -7
  30. package/dist/admin/components/forms/field-types/Upload/Input.js.map +1 -1
  31. package/dist/admin/components/forms/withCondition/index.js +10 -4
  32. package/dist/admin/components/forms/withCondition/index.js.map +1 -1
  33. package/dist/admin/components/utilities/Auth/index.js +2 -2
  34. package/dist/admin/components/utilities/Auth/index.js.map +1 -1
  35. package/dist/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.js +3 -0
  36. package/dist/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.js.map +1 -1
  37. package/dist/collections/config/defaults.d.ts +1 -0
  38. package/dist/collections/config/defaults.js +1 -0
  39. package/dist/collections/config/defaults.js.map +1 -1
  40. package/dist/collections/config/schema.js +7 -2
  41. package/dist/collections/config/schema.js.map +1 -1
  42. package/dist/collections/config/types.d.ts +4 -1
  43. package/dist/config/defaults.js +1 -0
  44. package/dist/config/defaults.js.map +1 -1
  45. package/dist/config/schema.js +2 -0
  46. package/dist/config/schema.js.map +1 -1
  47. package/dist/config/types.d.ts +6 -1
  48. package/dist/fields/config/schema.js +1 -0
  49. package/dist/fields/config/schema.js.map +1 -1
  50. package/dist/fields/config/types.d.ts +7 -1
  51. package/dist/fields/config/types.js.map +1 -1
  52. package/dist/fields/hooks/beforeChange/promise.js +1 -1
  53. package/dist/fields/hooks/beforeChange/promise.js.map +1 -1
  54. package/dist/fields/validations.d.ts +1 -1
  55. package/dist/globals/config/sanitize.js +2 -0
  56. package/dist/globals/config/sanitize.js.map +1 -1
  57. package/dist/globals/config/schema.js +1 -0
  58. package/dist/globals/config/schema.js.map +1 -1
  59. package/dist/globals/config/types.d.ts +4 -1
  60. package/dist/graphql/registerSchema.js +2 -2
  61. package/dist/graphql/registerSchema.js.map +1 -1
  62. package/dist/mongoose/buildQuery.js +1 -1
  63. package/dist/mongoose/buildQuery.js.map +1 -1
  64. package/dist/uploads/generateFileData.js +5 -2
  65. package/dist/uploads/generateFileData.js.map +1 -1
  66. package/dist/uploads/imageResizer.js +5 -2
  67. package/dist/uploads/imageResizer.js.map +1 -1
  68. package/dist/uploads/types.d.ts +8 -0
  69. package/dist/versions/drafts/appendVersionToQueryKey.js +2 -2
  70. package/dist/versions/drafts/appendVersionToQueryKey.js.map +1 -1
  71. package/docs/configuration/collections.mdx +3 -2
  72. package/docs/configuration/globals.mdx +1 -0
  73. package/docs/configuration/overview.mdx +1 -0
  74. package/docs/fields/array.mdx +2 -1
  75. package/docs/fields/blocks.mdx +1 -0
  76. package/docs/fields/checkbox.mdx +1 -0
  77. package/docs/fields/code.mdx +1 -0
  78. package/docs/fields/collapsible.mdx +1 -0
  79. package/docs/fields/date.mdx +1 -0
  80. package/docs/fields/email.mdx +1 -0
  81. package/docs/fields/group.mdx +1 -0
  82. package/docs/fields/json.mdx +1 -0
  83. package/docs/fields/number.mdx +1 -0
  84. package/docs/fields/overview.mdx +3 -2
  85. package/docs/fields/point.mdx +1 -0
  86. package/docs/fields/radio.mdx +1 -0
  87. package/docs/fields/relationship.mdx +2 -1
  88. package/docs/fields/rich-text.mdx +4 -1
  89. package/docs/fields/row.mdx +1 -0
  90. package/docs/fields/select.mdx +1 -0
  91. package/docs/fields/tabs.mdx +1 -0
  92. package/docs/fields/text.mdx +1 -0
  93. package/docs/fields/textarea.mdx +1 -0
  94. package/docs/fields/ui.mdx +1 -0
  95. package/docs/fields/upload.mdx +1 -0
  96. package/docs/getting-started/installation.mdx +1 -1
  97. package/docs/rest-api/overview.mdx +2 -1
  98. package/package.json +11 -12
@@ -88,14 +88,14 @@ function registerSchema(payload) {
88
88
  mutation,
89
89
  };
90
90
  payload.schema = new graphql_1.GraphQLSchema(schema);
91
- payload.validationRules = (variables) => ([
91
+ payload.validationRules = ({ variableValues }) => ([
92
92
  (0, graphql_query_complexity_1.default)({
93
93
  estimators: [
94
94
  (0, graphql_query_complexity_1.fieldExtensionsEstimator)(),
95
95
  (0, graphql_query_complexity_1.simpleEstimator)({ defaultComplexity: 1 }), // Fallback if complexity not set
96
96
  ],
97
97
  maximumComplexity: payload.config.graphQL.maxComplexity,
98
- variables,
98
+ variables: variableValues,
99
99
  // onComplete: (complexity) => { console.log('Query Complexity:', complexity); },
100
100
  }),
101
101
  ]);
@@ -1 +1 @@
1
- {"version":3,"file":"registerSchema.js","sourceRoot":"","sources":["../../src/graphql/registerSchema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"registerSchema.js","sourceRoot":"","sources":["../../src/graphql/registerSchema.ts"],"names":[],"mappings":"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"}
@@ -318,7 +318,7 @@ class ParamParser {
318
318
  i += 1;
319
319
  currentPath = `${currentPath}.${nextSegment}`;
320
320
  }
321
- else if ('localized' in matchedField && matchedField.localized) {
321
+ else if (this.localizationConfig && 'localized' in matchedField && matchedField.localized) {
322
322
  currentPath = `${currentPath}.${this.req.locale}`;
323
323
  }
324
324
  switch (matchedField.type) {
@@ -1 +1 @@
1
- {"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../src/mongoose/buildQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../src/mongoose/buildQuery.ts"],"names":[],"mappings":"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"}
@@ -31,7 +31,7 @@ const generateFileData = async ({ config, collection: { config: collectionConfig
31
31
  files: [],
32
32
  };
33
33
  }
34
- const { staticDir, imageSizes, disableLocalStorage, resizeOptions, formatOptions } = collectionConfig.upload;
34
+ const { staticDir, imageSizes, disableLocalStorage, resizeOptions, formatOptions, trimOptions } = collectionConfig.upload;
35
35
  let staticPath = staticDir;
36
36
  if (staticDir.indexOf('/') !== 0) {
37
37
  staticPath = path_1.default.resolve(config.paths.configDir, staticDir);
@@ -54,7 +54,7 @@ const generateFileData = async ({ config, collection: { config: collectionConfig
54
54
  const sharpOptions = {};
55
55
  if (fileIsAnimated)
56
56
  sharpOptions.animated = true;
57
- if (fileSupportsResize && (resizeOptions || formatOptions)) {
57
+ if (fileSupportsResize && (resizeOptions || formatOptions || trimOptions)) {
58
58
  if (file.tempFilePath) {
59
59
  sharpFile = (0, sharp_1.default)(file.tempFilePath, sharpOptions);
60
60
  }
@@ -68,6 +68,9 @@ const generateFileData = async ({ config, collection: { config: collectionConfig
68
68
  if (formatOptions) {
69
69
  sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options);
70
70
  }
71
+ if (trimOptions) {
72
+ sharpFile = sharpFile.trim(trimOptions);
73
+ }
71
74
  }
72
75
  if ((0, isImage_1.default)(file.mimetype)) {
73
76
  dimensions = await (0, getImageSize_1.default)(file);
@@ -1 +1 @@
1
- {"version":3,"file":"generateFileData.js","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateFileData.js","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"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"}
@@ -22,7 +22,7 @@ async function resizeAndSave({ req, file, dimensions, staticPath, config, savedF
22
22
  const { imageSizes } = config.upload;
23
23
  const sizesToSave = [];
24
24
  const sizeData = {};
25
- const sharpInstance = (0, sharp_1.default)(file.tempFilePath || file.data);
25
+ const sharpBase = (0, sharp_1.default)(file.tempFilePath || file.data);
26
26
  const promises = imageSizes
27
27
  .map(async (desiredSize) => {
28
28
  if (!needsResize(desiredSize, dimensions)) {
@@ -36,10 +36,13 @@ async function resizeAndSave({ req, file, dimensions, staticPath, config, savedF
36
36
  };
37
37
  return;
38
38
  }
39
- let resized = sharpInstance.resize(desiredSize);
39
+ let resized = sharpBase.clone().resize(desiredSize);
40
40
  if (desiredSize.formatOptions) {
41
41
  resized = resized.toFormat(desiredSize.formatOptions.format, desiredSize.formatOptions.options);
42
42
  }
43
+ if (desiredSize.trimOptions) {
44
+ resized = resized.trim(desiredSize.trimOptions);
45
+ }
43
46
  const bufferObject = await resized.toBuffer({
44
47
  resolveWithObject: true,
45
48
  });
@@ -1 +1 @@
1
- {"version":3,"file":"imageResizer.js","sourceRoot":"","sources":["../../src/uploads/imageResizer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"imageResizer.js","sourceRoot":"","sources":["../../src/uploads/imageResizer.ts"],"names":[],"mappings":"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"}
@@ -35,9 +35,15 @@ export type ImageUploadFormatOptions = {
35
35
  format: Parameters<Sharp['toFormat']>[0];
36
36
  options?: Parameters<Sharp['toFormat']>[1];
37
37
  };
38
+ /**
39
+ * Params sent to the sharp trim() function
40
+ * @link https://sharp.pixelplumbing.com/api-resize#trim
41
+ */
42
+ export type ImageUploadTrimOptions = Parameters<Sharp['trim']>[0];
38
43
  export type ImageSize = ResizeOptions & {
39
44
  name: string;
40
45
  formatOptions?: ImageUploadFormatOptions;
46
+ trimOptions?: ImageUploadTrimOptions;
41
47
  /**
42
48
  * @deprecated prefer position
43
49
  */
@@ -58,6 +64,7 @@ export type IncomingUploadType = {
58
64
  resizeOptions?: ResizeOptions;
59
65
  /** Options for original upload file only. For sizes, set each formatOptions individually. */
60
66
  formatOptions?: ImageUploadFormatOptions;
67
+ trimOptions?: ImageUploadTrimOptions;
61
68
  };
62
69
  export type Upload = {
63
70
  imageSizes?: ImageSize[];
@@ -70,6 +77,7 @@ export type Upload = {
70
77
  handlers?: any[];
71
78
  resizeOptions?: ResizeOptions;
72
79
  formatOptions?: ImageUploadFormatOptions;
80
+ trimOptions?: ImageUploadTrimOptions;
73
81
  };
74
82
  export type File = {
75
83
  data: Buffer;
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.appendVersionToQueryKey = void 0;
4
4
  const appendVersionToQueryKey = (query) => {
5
5
  return Object.entries(query).reduce((res, [key, val]) => {
6
- if (['and', 'or'].includes(key) && Array.isArray(val)) {
6
+ if (['and', 'or', 'AND', 'OR'].includes(key) && Array.isArray(val)) {
7
7
  return {
8
8
  ...res,
9
- [key]: val.map((subQuery) => (0, exports.appendVersionToQueryKey)(subQuery)),
9
+ [key.toLowerCase()]: val.map((subQuery) => (0, exports.appendVersionToQueryKey)(subQuery)),
10
10
  };
11
11
  }
12
12
  if (key !== 'id') {
@@ -1 +1 @@
1
- {"version":3,"file":"appendVersionToQueryKey.js","sourceRoot":"","sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"names":[],"mappings":";;;AAEO,MAAM,uBAAuB,GAAG,CAAC,KAAY,EAAS,EAAE;IAC7D,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;QACtD,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACrD,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,+BAAuB,EAAC,QAAQ,CAAC,CAAC;aAChE,CAAC;SACH;QAED,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,WAAW,GAAG,EAAE,CAAC,EAAE,GAAG;aACxB,CAAC;SACH;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC"}
1
+ {"version":3,"file":"appendVersionToQueryKey.js","sourceRoot":"","sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"names":[],"mappings":";;;AAEO,MAAM,uBAAuB,GAAG,CAAC,KAAY,EAAS,EAAE;IAC7D,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;QACtD,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClE,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,+BAAuB,EAAC,QAAQ,CAAC,CAAC;aAC9E,CAAC;SACH;QAED,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,WAAW,GAAG,EAAE,CAAC,EAAE,GAAG;aACxB,CAAC;SACH;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC"}
@@ -27,8 +27,9 @@ It's often best practice to write your Collections in separate files and then im
27
27
  | **`endpoints`** | Add custom routes to the REST API. [More](/docs/rest-api/overview#custom-endpoints) |
28
28
  | **`graphQL`** | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. |
29
29
  | **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
30
- | **`defaultSort`** | Pass a top-level field to sort by default in the collection List view. Prefix the name of the field with a minus symbol ("-") to sort in descending order. |
31
- | **`pagination`** | Set pagination-specific options for this collection. [More](#pagination) |
30
+ | **`defaultSort`** | Pass a top-level field to sort by default in the collection List view. Prefix the name of the field with a minus symbol ("-") to sort in descending order. |
31
+ | **`pagination`** | Set pagination-specific options for this collection. [More](#pagination) |
32
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
32
33
 
33
34
  *\* An asterisk denotes that a property is required.*
34
35
 
@@ -25,6 +25,7 @@ As with Collection configs, it's often best practice to write your Globals in se
25
25
  | **`endpoints`** | Add custom routes to the REST API. [More](/docs/rest-api/overview#custom-endpoints) |
26
26
  | **`graphQL.name`** | Text used in schema generation. Auto-generated from slug if not defined. |
27
27
  | **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
28
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
28
29
 
29
30
  _\* An asterisk denotes that a property is required._
30
31
 
@@ -43,6 +43,7 @@ Payload is a _config-based_, code-first CMS and application framework. The Paylo
43
43
  | `hooks` | Tap into Payload-wide hooks. [More](/docs/hooks/overview) |
44
44
  | `plugins` | An array of Payload plugins. [More](/docs/plugins/overview) |
45
45
  | `endpoints` | An array of custom API endpoints added to the Payload router. [More](/docs/rest-api/overview#custom-endpoints) |
46
+ | `custom` | Extension point for adding custom data (e.g. for plugins) |
46
47
 
47
48
  #### Simple example
48
49
 
@@ -35,7 +35,8 @@ keywords: array, fields, config, configuration, documentation, Content Managemen
35
35
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this Array will be kept, so there is no need to specify each nested field as `localized`. |
36
36
  | **`required`** | Require this field to have a value. |
37
37
  | **`labels`** | Customize the row labels appearing in the Admin dashboard. |
38
- | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
38
+ | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
39
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
39
40
 
40
41
  *\* An asterisk denotes that a property is required.*
41
42
 
@@ -37,6 +37,7 @@ keywords: blocks, fields, config, configuration, documentation, Content Manageme
37
37
  | **`unique`** | Enforce that each entry in the Collection has a unique value for this field. |
38
38
  | **`labels`** | Customize the block row labels appearing in the Admin dashboard. |
39
39
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
40
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
40
41
 
41
42
  *\* An asterisk denotes that a property is required.*
42
43
 
@@ -26,6 +26,7 @@ keywords: checkbox, fields, config, configuration, documentation, Content Manage
26
26
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
27
27
  | **`required`** | Require this field to have a value. |
28
28
  | **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
29
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
29
30
 
30
31
  *\* An asterisk denotes that a property is required.*
31
32
 
@@ -32,6 +32,7 @@ This field uses the `monaco-react` editor syntax highlighting.
32
32
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
33
33
  | **`required`** | Require this field to have a value. |
34
34
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
35
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
35
36
 
36
37
  _\* An asterisk denotes that a property is required._
37
38
 
@@ -17,6 +17,7 @@ keywords: row, fields, config, configuration, documentation, Content Management
17
17
  | **`label`** * | A label to render within the header of the collapsible component. This can be a string, function or react component. Function/components receive `({ data, path })` as args. |
18
18
  | **`fields`** * | Array of field types to nest within this Collapsible. |
19
19
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
20
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
20
21
 
21
22
  *\* An asterisk denotes that a property is required.*
22
23
 
@@ -29,6 +29,7 @@ This field uses [`react-datepicker`](https://www.npmjs.com/package/react-datepic
29
29
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
30
30
  | **`required`** | Require this field to have a value. |
31
31
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
32
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
32
33
 
33
34
  _\* An asterisk denotes that a property is required._
34
35
 
@@ -27,6 +27,7 @@ keywords: email, fields, config, configuration, documentation, Content Managemen
27
27
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
28
28
  | **`required`** | Require this field to have a value. |
29
29
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
30
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
30
31
 
31
32
  *\* An asterisk denotes that a property is required.*
32
33
 
@@ -25,6 +25,7 @@ keywords: group, fields, config, configuration, documentation, Content Managemen
25
25
  | **`defaultValue`** | Provide an object of data to be used for this field's default value. [More](/docs/fields/overview#default-values) |
26
26
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. If enabled, a separate, localized set of all data within this Group will be kept, so there is no need to specify each nested field as `localized`. |
27
27
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
28
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
28
29
 
29
30
  *\* An asterisk denotes that a property is required.*
30
31
 
@@ -30,6 +30,7 @@ This field uses the `monaco-react` editor syntax highlighting.
30
30
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
31
31
  | **`required`** | Require this field to have a value. |
32
32
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
33
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
33
34
 
34
35
  _\* An asterisk denotes that a property is required._
35
36
 
@@ -29,6 +29,7 @@ keywords: number, fields, config, configuration, documentation, Content Manageme
29
29
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
30
30
  | **`required`** | Require this field to have a value. |
31
31
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
32
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
32
33
 
33
34
  *\* An asterisk denotes that a property is required.*
34
35
 
@@ -175,10 +175,11 @@ All Payload fields support the ability to swap in your own React components with
175
175
 
176
176
  ### Conditional logic
177
177
 
178
- You can show and hide fields based on what other fields are doing by utilizing conditional logic on a field by field basis. The `condition` property on a field's admin config accepts a function which takes two arguments:
178
+ You can show and hide fields based on what other fields are doing by utilizing conditional logic on a field by field basis. The `condition` property on a field's admin config accepts a function which takes three arguments:
179
179
 
180
180
  - `data` - the entire document's data that is currently being edited
181
181
  - `siblingData` - only the fields that are direct siblings to the field with the condition
182
+ - `{ user }` - the final argument is an object containing the currently authenticated user
182
183
 
183
184
  The `condition` function should return a boolean that will control if the field should be displayed or not.
184
185
 
@@ -197,7 +198,7 @@ The `condition` function should return a boolean that will control if the field
197
198
  type: 'text',
198
199
  admin: {
199
200
  // highlight-start
200
- condition: (data, siblingData) => {
201
+ condition: (data, siblingData, { user }) => {
201
202
  if (data.enableGreeting) {
202
203
  return true;
203
204
  } else {
@@ -30,6 +30,7 @@ The data structure in the database matches the GeoJSON structure to represent po
30
30
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
31
31
  | **`required`** | Require this field to have a value. |
32
32
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
33
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
33
34
 
34
35
  *\* An asterisk denotes that a property is required.*
35
36
 
@@ -27,6 +27,7 @@ keywords: radio, fields, config, configuration, documentation, Content Managemen
27
27
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
28
28
  | **`required`** | Require this field to have a value. |
29
29
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
30
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
30
31
 
31
32
  *\* An asterisk denotes that a property is required.*
32
33
 
@@ -26,7 +26,7 @@ keywords: relationship, fields, config, configuration, documentation, Content Ma
26
26
  | **`filterOptions`** | A query to filter which options appear in the UI and validate against. [More](#filtering-relationship-options). |
27
27
  | **`hasMany`** | Boolean when, if set to `true`, allows this field to have many relations instead of only one. |
28
28
  | **`min`** | A number for the fewest allowed items during validation when a value is present. Used with `hasMany`. |
29
- | **`max`** | A number for the most allowed items during validation when a value is present. Used with `hasMany`. |
29
+ | **`max`** | A number for the most allowed items during validation when a value is present. Used with `hasMany`. |
30
30
  | **`maxDepth`** | Sets a number limit on iterations of related documents to populate when queried. [Depth](/docs/getting-started/concepts#depth) |
31
31
  | **`label`** | Text used as a field label in the Admin panel or an object with keys for each language. |
32
32
  | **`unique`** | Enforce that each entry in the Collection has a unique value for this field. |
@@ -40,6 +40,7 @@ keywords: relationship, fields, config, configuration, documentation, Content Ma
40
40
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
41
41
  | **`required`** | Require this field to have a value. |
42
42
  | **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
43
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
43
44
 
44
45
  _\* An asterisk denotes that a property is required._
45
46
 
@@ -31,6 +31,7 @@ The Admin component is built on the powerful [`slatejs`](https://docs.slatejs.or
31
31
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
32
32
  | **`required`** | Require this field to have a value. |
33
33
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
34
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
34
35
 
35
36
  *\* An asterisk denotes that a property is required.*
36
37
 
@@ -54,6 +55,7 @@ The default `elements` available in Payload are:
54
55
  - `h4`
55
56
  - `h5`
56
57
  - `h6`
58
+ - `blockquote`
57
59
  - `link`
58
60
  - `ol`
59
61
  - `ul`
@@ -153,6 +155,7 @@ const ExampleCollection: CollectionConfig = {
153
155
  'h3',
154
156
  'h4',
155
157
  'link',
158
+ 'blockquote',
156
159
  {
157
160
  name: 'cta',
158
161
  Button: CustomCallToActionButton,
@@ -270,7 +273,7 @@ const serialize = (children) => children.map((node, i) => {
270
273
  {serialize(node.children)}
271
274
  </h6>
272
275
  );
273
- case 'quote':
276
+ case 'blockquote':
274
277
  return (
275
278
  <blockquote key={i}>
276
279
  {serialize(node.children)}
@@ -16,6 +16,7 @@ keywords: row, fields, config, configuration, documentation, Content Management
16
16
  | ---------------- | ----------- |
17
17
  | **`fields`** * | Array of field types to nest within this Row. |
18
18
  | **`admin`** | Admin-specific configuration excluding `description`, `readOnly`, and `hidden`. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
19
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
19
20
 
20
21
  *\* An asterisk denotes that a property is required.*
21
22
 
@@ -30,6 +30,7 @@ keywords: select, multi-select, fields, config, configuration, documentation, Co
30
30
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
31
31
  | **`required`** | Require this field to have a value. |
32
32
  | **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
33
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
33
34
 
34
35
  _\* An asterisk denotes that a property is required._
35
36
 
@@ -19,6 +19,7 @@ keywords: tabs, fields, config, configuration, documentation, Content Management
19
19
  | ---------------- | ----------- |
20
20
  | **`tabs`** * | Array of tabs to render within this Tabs field. |
21
21
  | **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
22
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
22
23
 
23
24
  #### Tab-specific Config
24
25
 
@@ -29,6 +29,7 @@ keywords: text, fields, config, configuration, documentation, Content Management
29
29
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
30
30
  | **`required`** | Require this field to have a value. |
31
31
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
32
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
32
33
 
33
34
  *\* An asterisk denotes that a property is required.*
34
35
 
@@ -29,6 +29,7 @@ keywords: textarea, fields, config, configuration, documentation, Content Manage
29
29
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
30
30
  | **`required`** | Require this field to have a value. |
31
31
  | **`admin`** | Admin-specific configuration. See below for [more detail](#admin-config). |
32
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
32
33
 
33
34
  *\* An asterisk denotes that a property is required.*
34
35
 
@@ -29,6 +29,7 @@ With this field, you can also inject custom `Cell` components that appear as add
29
29
  | **`label`** | Human-readable label for this UI field. |
30
30
  | **`admin.components.Field`** | React component to be rendered for this field within the Edit view. [More](/docs/admin/components/#field-component) |
31
31
  | **`admin.components.Cell`** | React component to be rendered as a Cell within collection List views. [More](/docs/admin/components/#field-component) |
32
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
32
33
 
33
34
  *\* An asterisk denotes that a property is required.*
34
35
 
@@ -41,6 +41,7 @@ keywords: upload, images media, fields, config, configuration, documentation, Co
41
41
  | **`localized`** | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
42
42
  | **`required`** | Require this field to have a value. |
43
43
  | **`admin`** | Admin-specific configuration. See the [default field admin config](/docs/fields/overview#admin-config) for more details. |
44
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
44
45
 
45
46
  *\* An asterisk denotes that a property is required.*
46
47
 
@@ -144,4 +144,4 @@ After it starts, you can go to `http://localhost:3000/admin` to create your firs
144
144
 
145
145
  ### Docker
146
146
 
147
- Looking to deploy Payload with Docker? New projects with `create-payload-app` come with a Dockerfile and docker-compose.yml file ready to go. Examples of these files can be seen in our [Deployment docs](/docs/deployment#Docker).
147
+ Looking to deploy Payload with Docker? New projects with `create-payload-app` come with a Dockerfile and docker-compose.yml file ready to go. Examples of these files can be seen in our [Deployment docs](/docs/production/deployment#docker).
@@ -34,7 +34,7 @@ Note: Collection slugs must be formatted in kebab-case
34
34
  | `PATCH` | `/api/{collection-slug}` | Update all documents matching the `where` query |
35
35
  | `PATCH` | `/api/{collection-slug}/:id` | Update a document by ID |
36
36
  | `DELETE` | `/api/{collection-slug}` | Delete all documents matching the `where` query |
37
- | `DELETE` | `/api/{collection-sldug}/:id` | Delete an existing document by ID |
37
+ | `DELETE` | `/api/{collection-slug}/:id` | Delete an existing document by ID |
38
38
 
39
39
  ##### Additional `find` query parameters
40
40
 
@@ -91,6 +91,7 @@ Each endpoint object needs to have:
91
91
  | **`method`** | The lowercase HTTP verb to use: 'get', 'head', 'post', 'put', 'delete', 'connect' or 'options' |
92
92
  | **`handler`** | A function or array of functions to be called with **req**, **res** and **next** arguments. [Express](https://expressjs.com/en/guide/routing.html#route-handlers) |
93
93
  | **`root`** | When `true`, defines the endpoint on the root Express app, bypassing Payload handlers and the `routes.api` subpath. Note: this only applies to top-level endpoints of your Payload config, endpoints defined on `collections` or `globals` cannot be root. |
94
+ | **`custom`** | Extension point for adding custom data (e.g. for plugins) |
94
95
 
95
96
  Example:
96
97