payload 1.7.1 → 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.
- package/dist/admin/components/elements/DocumentDrawer/DrawerContent.js +49 -30
- package/dist/admin/components/elements/DocumentDrawer/DrawerContent.js.map +1 -1
- package/dist/admin/components/elements/ReactSelect/MultiValue/index.js +4 -3
- package/dist/admin/components/elements/ReactSelect/MultiValue/index.js.map +1 -1
- package/dist/admin/components/elements/ReactSelect/MultiValue/index.scss +5 -1
- package/dist/admin/components/forms/Form/buildStateFromSchema/iterateFields.d.ts +1 -1
- package/dist/admin/components/forms/Form/buildStateFromSchema/iterateFields.js +1 -1
- package/dist/admin/components/forms/Form/buildStateFromSchema/iterateFields.js.map +1 -1
- package/dist/admin/components/forms/Form/fieldReducer.js +2 -2
- package/dist/admin/components/forms/Form/fieldReducer.js.map +1 -1
- package/dist/admin/components/forms/Form/types.d.ts +3 -1
- package/dist/admin/components/forms/field-types/Blocks/BlocksDrawer/index.js +13 -8
- package/dist/admin/components/forms/field-types/Blocks/BlocksDrawer/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.d.ts +10 -0
- package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.js +17 -0
- package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.js.map +1 -0
- package/dist/admin/components/forms/field-types/RichText/elements/blockquote/index.scss +9 -0
- package/dist/admin/components/forms/field-types/RichText/elements/getCommonBlock.js +2 -0
- package/dist/admin/components/forms/field-types/RichText/elements/getCommonBlock.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/indent/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/index.d.ts +7 -0
- package/dist/admin/components/forms/field-types/RichText/elements/index.js +2 -0
- package/dist/admin/components/forms/field-types/RichText/elements/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/elements/injectVoid.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/index.scss +3 -2
- package/dist/admin/components/forms/field-types/Textarea/index.scss +11 -0
- package/dist/admin/components/forms/field-types/Upload/Input.js +7 -7
- package/dist/admin/components/forms/field-types/Upload/Input.js.map +1 -1
- package/dist/admin/components/forms/withCondition/index.js +10 -4
- package/dist/admin/components/forms/withCondition/index.js.map +1 -1
- package/dist/admin/components/utilities/Auth/index.js +2 -2
- package/dist/admin/components/utilities/Auth/index.js.map +1 -1
- package/dist/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.js +3 -0
- package/dist/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.js.map +1 -1
- package/dist/collections/config/schema.js +6 -2
- package/dist/collections/config/schema.js.map +1 -1
- package/dist/fields/config/types.d.ts +3 -1
- package/dist/fields/hooks/beforeChange/promise.js +1 -1
- package/dist/fields/hooks/beforeChange/promise.js.map +1 -1
- package/dist/fields/validations.d.ts +1 -1
- package/dist/mongoose/buildQuery.js +1 -1
- package/dist/mongoose/buildQuery.js.map +1 -1
- package/dist/uploads/generateFileData.js +5 -2
- package/dist/uploads/generateFileData.js.map +1 -1
- package/dist/uploads/imageResizer.js +5 -2
- package/dist/uploads/imageResizer.js.map +1 -1
- package/dist/uploads/types.d.ts +8 -0
- package/dist/versions/drafts/appendVersionToQueryKey.js +2 -2
- package/dist/versions/drafts/appendVersionToQueryKey.js.map +1 -1
- package/docs/fields/overview.mdx +3 -2
- package/docs/fields/rich-text.mdx +3 -1
- package/docs/getting-started/installation.mdx +1 -1
- package/docs/rest-api/overview.mdx +1 -1
- package/package.json +11 -11
|
@@ -31,6 +31,8 @@ const react_1 = __importStar(require("react"));
|
|
|
31
31
|
const context_1 = require("../Form/context");
|
|
32
32
|
const getSiblingData_1 = __importDefault(require("../Form/getSiblingData"));
|
|
33
33
|
const reduceFieldsToValues_1 = __importDefault(require("../Form/reduceFieldsToValues"));
|
|
34
|
+
const DocumentInfo_1 = require("../../utilities/DocumentInfo");
|
|
35
|
+
const Auth_1 = require("../../utilities/Auth");
|
|
34
36
|
const withCondition = (Field) => {
|
|
35
37
|
const CheckForCondition = (props) => {
|
|
36
38
|
const { admin: { condition, } = {}, } = props;
|
|
@@ -42,23 +44,27 @@ const withCondition = (Field) => {
|
|
|
42
44
|
const WithCondition = (props) => {
|
|
43
45
|
const { name, path: pathFromProps, admin: { condition, } = {}, } = props;
|
|
44
46
|
const path = typeof pathFromProps === 'string' ? pathFromProps : name;
|
|
47
|
+
const { user } = (0, Auth_1.useAuth)();
|
|
45
48
|
const [fields, dispatchFields] = (0, context_1.useAllFormFields)();
|
|
49
|
+
const { id } = (0, DocumentInfo_1.useDocumentInfo)();
|
|
46
50
|
const data = (0, reduceFieldsToValues_1.default)(fields, true);
|
|
47
51
|
const siblingData = (0, getSiblingData_1.default)(fields, path);
|
|
52
|
+
// Manually provide ID to `data`
|
|
53
|
+
data.id = id;
|
|
48
54
|
const hasCondition = Boolean(condition);
|
|
49
|
-
const currentlyPassesCondition = hasCondition ? condition(data, siblingData) : true;
|
|
55
|
+
const currentlyPassesCondition = hasCondition ? condition(data, siblingData, { user }) : true;
|
|
50
56
|
const field = fields[path];
|
|
51
57
|
const existingConditionPasses = field === null || field === void 0 ? void 0 : field.passesCondition;
|
|
52
58
|
(0, react_1.useEffect)(() => {
|
|
53
59
|
if (hasCondition) {
|
|
54
60
|
if (!existingConditionPasses && currentlyPassesCondition) {
|
|
55
|
-
dispatchFields({ type: 'MODIFY_CONDITION', path, result: true });
|
|
61
|
+
dispatchFields({ type: 'MODIFY_CONDITION', path, result: true, user });
|
|
56
62
|
}
|
|
57
63
|
if (!currentlyPassesCondition && (existingConditionPasses || typeof existingConditionPasses === 'undefined')) {
|
|
58
|
-
dispatchFields({ type: 'MODIFY_CONDITION', path, result: false });
|
|
64
|
+
dispatchFields({ type: 'MODIFY_CONDITION', path, result: false, user });
|
|
59
65
|
}
|
|
60
66
|
}
|
|
61
|
-
}, [currentlyPassesCondition, existingConditionPasses, dispatchFields, path, hasCondition]);
|
|
67
|
+
}, [currentlyPassesCondition, existingConditionPasses, dispatchFields, path, hasCondition, user]);
|
|
62
68
|
if (currentlyPassesCondition) {
|
|
63
69
|
return react_1.default.createElement(Field, { ...props });
|
|
64
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/forms/withCondition/index.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,+CAAyC;AAEzC,6CAAmD;AACnD,4EAAoD;AACpD,wFAAgE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/forms/withCondition/index.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,+CAAyC;AAEzC,6CAAmD;AACnD,4EAAoD;AACpD,wFAAgE;AAChE,+DAA+D;AAC/D,+CAA+C;AAE/C,MAAM,aAAa,GAAG,CAAoC,KAA6B,EAAe,EAAE;IACtG,MAAM,iBAAiB,GAAgB,CAAC,KAAK,EAAE,EAAE;QAC/C,MAAM,EACJ,KAAK,EAAE,EACL,SAAS,GACV,GAAG,EAAE,GACP,GAAG,KAA2B,CAAC;QAEhC,IAAI,SAAS,EAAE;YACb,OAAO,8BAAC,aAAa,OAAK,KAAK,GAAI,CAAC;SACrC;QAED,OAAO,8BAAC,KAAK,OAAK,KAAK,GAAI,CAAC;IAC9B,CAAC,CAAC;IAEF,MAAM,aAAa,GAAgB,CAAC,KAAK,EAAE,EAAE;QAC3C,MAAM,EACJ,IAAI,EACJ,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,EACL,SAAS,GACV,GAAG,EAAE,GACP,GAAG,KAEH,CAAC;QAEF,MAAM,IAAI,GAAG,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;QAEtE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,cAAO,GAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAA,0BAAgB,GAAE,CAAC;QACpD,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,8BAAe,GAAE,CAAC;QAEjC,MAAM,IAAI,GAAG,IAAA,8BAAoB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEjD,gCAAgC;QAChC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QAEb,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,wBAAwB,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9F,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,uBAAuB,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,eAAe,CAAC;QAGvD,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,uBAAuB,IAAI,wBAAwB,EAAE;oBACxD,cAAc,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;iBACxE;gBAED,IAAI,CAAC,wBAAwB,IAAI,CAAC,uBAAuB,IAAI,OAAO,uBAAuB,KAAK,WAAW,CAAC,EAAE;oBAC5G,cAAc,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;iBACzE;aACF;QACH,CAAC,EAAE,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QAElG,IAAI,wBAAwB,EAAE;YAC5B,OAAO,8BAAC,KAAK,OAAK,KAAK,GAAI,CAAC;SAC7B;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -93,7 +93,7 @@ const AuthProvider = ({ children }) => {
|
|
|
93
93
|
setPermissions(json);
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
96
|
-
throw new Error(
|
|
96
|
+
throw new Error(`Fetching permissions failed with status code ${request.status}`);
|
|
97
97
|
}
|
|
98
98
|
}, [serverURL, api, i18n]);
|
|
99
99
|
// On mount, get user and set
|
|
@@ -128,7 +128,7 @@ const AuthProvider = ({ children }) => {
|
|
|
128
128
|
if (id) {
|
|
129
129
|
refreshPermissions();
|
|
130
130
|
}
|
|
131
|
-
}, [i18n, id, api, serverURL]);
|
|
131
|
+
}, [i18n, id, api, serverURL, refreshPermissions]);
|
|
132
132
|
(0, react_1.useEffect)(() => {
|
|
133
133
|
let reminder;
|
|
134
134
|
const now = Math.round((new Date()).getTime() / 1000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":"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"}
|
package/dist/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.js
CHANGED
|
@@ -50,6 +50,9 @@ const richTextToHTML = (content) => {
|
|
|
50
50
|
case 'h6':
|
|
51
51
|
nodeHTML = `<h6>${(0, exports.richTextToHTML)(node.children)}</h6>`;
|
|
52
52
|
break;
|
|
53
|
+
case 'blockquote':
|
|
54
|
+
nodeHTML = `<blockquote>${(0, exports.richTextToHTML)(node.children)}</blockquote>`;
|
|
55
|
+
break;
|
|
53
56
|
case 'ul':
|
|
54
57
|
nodeHTML = `<ul>${(0, exports.richTextToHTML)(node.children)}</ul>`;
|
|
55
58
|
break;
|
package/dist/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"richTextToHTML.js","sourceRoot":"","sources":["../../../../../../../../src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"richTextToHTML.js","sourceRoot":"","sources":["../../../../../../../../src/admin/components/views/Version/RenderFieldsToDiff/fields/Text/richTextToHTML.ts"],"names":[],"mappings":"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"}
|
|
@@ -124,8 +124,8 @@ const collectionSchema = joi_1.default.object().keys({
|
|
|
124
124
|
adminThumbnail: joi_1.default.alternatives().try(joi_1.default.string(), joi_1.default.func()),
|
|
125
125
|
imageSizes: joi_1.default.array().items(joi_1.default.object().keys({
|
|
126
126
|
name: joi_1.default.string(),
|
|
127
|
-
width: joi_1.default.number().allow(null),
|
|
128
|
-
height: joi_1.default.number().allow(null),
|
|
127
|
+
width: joi_1.default.number().integer().allow(null),
|
|
128
|
+
height: joi_1.default.number().integer().allow(null),
|
|
129
129
|
crop: joi_1.default.string(), // TODO: add further specificity with joi.xor
|
|
130
130
|
}).unknown()),
|
|
131
131
|
mimeTypes: joi_1.default.array().items(joi_1.default.string()),
|
|
@@ -145,6 +145,10 @@ const collectionSchema = joi_1.default.object().keys({
|
|
|
145
145
|
format: joi_1.default.string(),
|
|
146
146
|
options: joi_1.default.object(),
|
|
147
147
|
}),
|
|
148
|
+
trimOptions: joi_1.default.alternatives().try(joi_1.default.object().keys({
|
|
149
|
+
format: joi_1.default.string(),
|
|
150
|
+
options: joi_1.default.object(),
|
|
151
|
+
}), joi_1.default.string(), joi_1.default.number()),
|
|
148
152
|
}), joi_1.default.boolean()),
|
|
149
153
|
custom: joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.any()),
|
|
150
154
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/collections/config/schema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/collections/config/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,9 @@ export type FieldAccess<T extends TypeWithID = any, P = any, U = any> = (args: {
|
|
|
39
39
|
siblingData?: Partial<P>;
|
|
40
40
|
doc?: T;
|
|
41
41
|
}) => Promise<boolean> | boolean;
|
|
42
|
-
export type Condition<T extends TypeWithID = any, P = any> = (data: Partial<T>, siblingData: Partial<P
|
|
42
|
+
export type Condition<T extends TypeWithID = any, P = any> = (data: Partial<T>, siblingData: Partial<P>, { user }: {
|
|
43
|
+
user: User;
|
|
44
|
+
}) => boolean;
|
|
43
45
|
export type FilterOptionsProps<T = any> = {
|
|
44
46
|
id: string | number;
|
|
45
47
|
user: Partial<User>;
|
|
@@ -21,7 +21,7 @@ const cloneDataFromOriginalDoc_1 = require("./cloneDataFromOriginalDoc");
|
|
|
21
21
|
// - Unflatten locales
|
|
22
22
|
const promise = async ({ data, doc, docWithLocales, errors, field, id, mergeLocaleActions, operation, path, req, siblingData, siblingDoc, siblingDocWithLocales, skipValidation, }) => {
|
|
23
23
|
var _a, _b, _c, _d;
|
|
24
|
-
const passesCondition = ((_a = field.admin) === null || _a === void 0 ? void 0 : _a.condition) ? field.admin.condition(data, siblingData) : true;
|
|
24
|
+
const passesCondition = ((_a = field.admin) === null || _a === void 0 ? void 0 : _a.condition) ? field.admin.condition(data, siblingData, { user: req.user }) : true;
|
|
25
25
|
let skipValidationFromHere = skipValidation || !passesCondition;
|
|
26
26
|
const defaultLocale = ((_b = req.payload.config) === null || _b === void 0 ? void 0 : _b.localization) ? (_c = req.payload.config.localization) === null || _c === void 0 ? void 0 : _c.defaultLocale : 'en';
|
|
27
27
|
const operationLocale = req.locale || defaultLocale;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../../src/fields/hooks/beforeChange/promise.ts"],"names":[],"mappings":";;;;;;AAAA,sCAAsC;AACtC,0DAA8B;AAC9B,8CAAqF;AAGrF,4EAAwD;AACxD,qDAAkD;AAClD,2DAAwD;AACxD,yEAAsE;AAmBtE,oEAAoE;AACpE,kBAAkB;AAClB,oDAAoD;AACpD,gDAAgD;AAChD,wBAAwB;AACxB,kBAAkB;AAClB,+BAA+B;AAC/B,sBAAsB;AAEf,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,IAAI,EACJ,GAAG,EACH,cAAc,EACd,MAAM,EACN,KAAK,EACL,EAAE,EACF,kBAAkB,EAClB,SAAS,EACT,IAAI,EACJ,GAAG,EACH,WAAW,EACX,UAAU,EACV,qBAAqB,EACrB,cAAc,GACT,EAAiB,EAAE;;IACxB,MAAM,eAAe,GAAG,CAAC,MAAA,KAAK,CAAC,KAAK,0CAAE,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../../src/fields/hooks/beforeChange/promise.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":";;;;;;AAAA,yCAAuC;AACvC,oDAA4B;AAC5B,gDAAwB;AACxB,0EAAyC;AACzC,kDAAqC;AAGrC,sCAAyD;AAEzD,kEAA0C;AAC1C,wEAAgD;AAChD,kEAA2C;AAE3C,sEAA8C;AAC9C,wDAAgC;AAgBzB,MAAM,gBAAgB,GAAG,KAAK,EAAK,EACxC,MAAM,EACN,UAAU,EAAE,EACV,MAAM,EAAE,gBAAgB,EACxB,KAAK,GACN,EACD,GAAG,EACH,IAAI,EACJ,kBAAkB,EAClB,sBAAsB,GACd,EAAa,EAAE;IACvB,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;QAC5B,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,EAAE;SACV,CAAC;KACH;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,kBAAkB;YAAE,MAAM,IAAI,oBAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAErD,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,EAAE;SACV,CAAC;KACH;IAED,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC;
|
|
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
|
|
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 =
|
|
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":";;;;;AACA,yCAAuC;AACvC,4CAAoB;AACpB,0EAAyC;AACzC,kDAA0B;AAG1B,8DAAsC;AA2BtC,SAAS,cAAc,CAAC,WAAmB,EAAE,IAAe;IAC1D,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAA,2BAAQ,EAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC;IAE7F,OAAO;QACL,IAAI;QACJ,SAAS;QACT,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,MAAM,EAAE,IAAI,CAAC,MAAM;KACpB,CAAC;AACJ,CAAC;AAEc,KAAK,UAAU,aAAa,CAAC,EAC1C,GAAG,EACH,IAAI,EACJ,UAAU,EACV,UAAU,EACV,MAAM,EACN,aAAa,GACR;IACL,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,MAAM,
|
|
1
|
+
{"version":3,"file":"imageResizer.js","sourceRoot":"","sources":["../../src/uploads/imageResizer.ts"],"names":[],"mappings":";;;;;AACA,yCAAuC;AACvC,4CAAoB;AACpB,0EAAyC;AACzC,kDAA0B;AAG1B,8DAAsC;AA2BtC,SAAS,cAAc,CAAC,WAAmB,EAAE,IAAe;IAC1D,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAA,2BAAQ,EAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC;IAE7F,OAAO;QACL,IAAI;QACJ,SAAS;QACT,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,MAAM,EAAE,IAAI,CAAC,MAAM;KACpB,CAAC;AACJ,CAAC;AAEc,KAAK,UAAU,aAAa,CAAC,EAC1C,GAAG,EACH,IAAI,EACJ,UAAU,EACV,UAAU,EACV,MAAM,EACN,aAAa,GACR;IACL,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,MAAM,WAAW,GAAiB,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,MAAM,SAAS,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,UAAU;SACxB,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;QACzB,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE;YACzC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG;gBAC3B,GAAG,EAAE,IAAI;gBACT,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,OAAO;SACR;QACD,IAAI,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAEpD,IAAI,WAAW,CAAC,aAAa,EAAE;YAC7B,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;SACjG;QAED,IAAI,WAAW,CAAC,WAAW,EAAE;YAC3B,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SACjD;QAED,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC;YAC1C,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,GAAG,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;QAE7D,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAA,sBAAU,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,cAAc,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,uBAAuB,GAAG,eAAe,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzF,MAAM,SAAS,GAAG,GAAG,UAAU,IAAI,uBAAuB,EAAE,CAAC;QAC7D,MAAM,iBAAiB,GAAG,MAAM,IAAA,oBAAU,EAAC,SAAS,CAAC,CAAC;QAEtD,IAAI,iBAAiB,EAAE;YACrB,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;SAC1B;QAED,WAAW,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,YAAY,CAAC,IAAI;SAC1B,CAAC,CAAC;QAEH,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG;YAC3B,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK;YAC9B,MAAM,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM;YAChC,QAAQ,EAAE,uBAAuB;YACjC,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI;YAChC,QAAQ,EAAE,QAAQ,CAAC,IAAI;SACxB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE5B,OAAO;QACL,QAAQ;QACR,WAAW;KACZ,CAAC;AACJ,CAAC;AAzED,gCAyEC;AACD,SAAS,eAAe,CACtB,WAAwB,EACxB,YAAsD,EACtD,SAAiB;IAEjB,OAAO,GAAG,WAAW,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;AACnG,CAAC;AAED,SAAS,WAAW,CAAC,WAAsB,EAAE,UAAsB;IACjE,OAAO,CAAC,OAAO,WAAW,CAAC,KAAK,KAAK,QAAQ,IAAI,WAAW,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC;WAClF,CAAC,OAAO,WAAW,CAAC,MAAM,KAAK,QAAQ,IAAI,WAAW,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;AAC3F,CAAC"}
|
package/dist/uploads/types.d.ts
CHANGED
|
@@ -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;
|
|
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"}
|
package/docs/fields/overview.mdx
CHANGED
|
@@ -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
|
|
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 {
|
|
@@ -55,6 +55,7 @@ The default `elements` available in Payload are:
|
|
|
55
55
|
- `h4`
|
|
56
56
|
- `h5`
|
|
57
57
|
- `h6`
|
|
58
|
+
- `blockquote`
|
|
58
59
|
- `link`
|
|
59
60
|
- `ol`
|
|
60
61
|
- `ul`
|
|
@@ -154,6 +155,7 @@ const ExampleCollection: CollectionConfig = {
|
|
|
154
155
|
'h3',
|
|
155
156
|
'h4',
|
|
156
157
|
'link',
|
|
158
|
+
'blockquote',
|
|
157
159
|
{
|
|
158
160
|
name: 'cta',
|
|
159
161
|
Button: CustomCallToActionButton,
|
|
@@ -271,7 +273,7 @@ const serialize = (children) => children.map((node, i) => {
|
|
|
271
273
|
{serialize(node.children)}
|
|
272
274
|
</h6>
|
|
273
275
|
);
|
|
274
|
-
case '
|
|
276
|
+
case 'blockquote':
|
|
275
277
|
return (
|
|
276
278
|
<blockquote key={i}>
|
|
277
279
|
{serialize(node.children)}
|
|
@@ -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#
|
|
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-
|
|
37
|
+
| `DELETE` | `/api/{collection-slug}/:id` | Delete an existing document by ID |
|
|
38
38
|
|
|
39
39
|
##### Additional `find` query parameters
|
|
40
40
|
|