payload 1.2.2 → 1.2.4
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/CHANGELOG.md +14 -0
- package/dist/admin/components/forms/field-types/RichText/elements/link/Modal/baseFields.js +19 -8
- package/dist/admin/components/forms/field-types/RichText/elements/link/Modal/index.js +4 -2
- package/dist/admin/components/views/Account/Default.js +1 -1
- package/dist/admin/components/views/collections/Edit/Auth/index.js +1 -1
- package/dist/collections/operations/update.js +9 -6
- package/dist/config/types.d.ts +0 -2
- package/dist/translations/en.json +11 -2
- package/dist/translations/index.d.ts +11 -2
- package/dist/versions/getLatestCollectionVersion.d.ts +2 -1
- package/dist/versions/getLatestCollectionVersion.js +4 -4
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [1.2.4](https://github.com/payloadcms/payload/compare/v1.2.3...v1.2.4) (2022-12-03)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* missing translation richText link modal ([#1573](https://github.com/payloadcms/payload/issues/1573)) ([2dcada1](https://github.com/payloadcms/payload/commit/2dcada199c21bee97eca88aa6bc8ba1bc2b45e7c))
|
|
9
|
+
|
|
10
|
+
## [1.2.3](https://github.com/payloadcms/payload/compare/v1.2.2...v1.2.3) (2022-12-02)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* reset password regression ([#1574](https://github.com/payloadcms/payload/issues/1574)) ([396ea0b](https://github.com/payloadcms/payload/commit/396ea0bd53dc9e1ae1e348d6fe1eb3c36232b35b))
|
|
16
|
+
|
|
3
17
|
## [1.2.2](https://github.com/payloadcms/payload/compare/v1.2.1...v1.2.2) (2022-12-02)
|
|
4
18
|
|
|
5
19
|
|
|
@@ -1,33 +1,44 @@
|
|
|
1
|
+
import { extractTranslations } from '../../../../../../../../translations/extractTranslations';
|
|
2
|
+
const translations = extractTranslations([
|
|
3
|
+
'fields:textToDisplay',
|
|
4
|
+
'fields:linkType',
|
|
5
|
+
'fields:chooseBetweenCustomTextOrDocument',
|
|
6
|
+
'fields:customURL',
|
|
7
|
+
'fields:internalLink',
|
|
8
|
+
'fields:enterURL',
|
|
9
|
+
'fields:chooseDocumentToLink',
|
|
10
|
+
'fields:openInNewTab',
|
|
11
|
+
]);
|
|
1
12
|
export const getBaseFields = (config) => [
|
|
2
13
|
{
|
|
3
14
|
name: 'text',
|
|
4
|
-
label: '
|
|
15
|
+
label: translations['fields:textToDisplay'],
|
|
5
16
|
type: 'text',
|
|
6
17
|
required: true,
|
|
7
18
|
},
|
|
8
19
|
{
|
|
9
20
|
name: 'linkType',
|
|
10
|
-
label: '
|
|
21
|
+
label: translations['fields:linkType'],
|
|
11
22
|
type: 'radio',
|
|
12
23
|
required: true,
|
|
13
24
|
admin: {
|
|
14
|
-
description: '
|
|
25
|
+
description: translations['fields:chooseBetweenCustomTextOrDocument'],
|
|
15
26
|
},
|
|
16
27
|
defaultValue: 'custom',
|
|
17
28
|
options: [
|
|
18
29
|
{
|
|
19
|
-
label: '
|
|
30
|
+
label: translations['fields:customURL'],
|
|
20
31
|
value: 'custom',
|
|
21
32
|
},
|
|
22
33
|
{
|
|
23
|
-
label: '
|
|
34
|
+
label: translations['fields:internalLink'],
|
|
24
35
|
value: 'internal',
|
|
25
36
|
},
|
|
26
37
|
],
|
|
27
38
|
},
|
|
28
39
|
{
|
|
29
40
|
name: 'url',
|
|
30
|
-
label: '
|
|
41
|
+
label: translations['fields:enterURL'],
|
|
31
42
|
type: 'text',
|
|
32
43
|
required: true,
|
|
33
44
|
admin: {
|
|
@@ -38,7 +49,7 @@ export const getBaseFields = (config) => [
|
|
|
38
49
|
},
|
|
39
50
|
{
|
|
40
51
|
name: 'doc',
|
|
41
|
-
label: '
|
|
52
|
+
label: translations['fields:chooseDocumentToLink'],
|
|
42
53
|
type: 'relationship',
|
|
43
54
|
required: true,
|
|
44
55
|
relationTo: config.collections.map(({ slug }) => slug),
|
|
@@ -50,7 +61,7 @@ export const getBaseFields = (config) => [
|
|
|
50
61
|
},
|
|
51
62
|
{
|
|
52
63
|
name: 'newTab',
|
|
53
|
-
label: '
|
|
64
|
+
label: translations['fields:openInNewTab'],
|
|
54
65
|
type: 'checkbox',
|
|
55
66
|
},
|
|
56
67
|
];
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Modal } from '@faceless-ui/modal';
|
|
2
2
|
import React from 'react';
|
|
3
|
+
import { useTranslation } from 'react-i18next';
|
|
3
4
|
import { MinimalTemplate } from '../../../../../..';
|
|
4
5
|
import Button from '../../../../../../elements/Button';
|
|
5
6
|
import X from '../../../../../../icons/X';
|
|
@@ -10,13 +11,14 @@ import RenderFields from '../../../../../RenderFields';
|
|
|
10
11
|
import './index.scss';
|
|
11
12
|
const baseClass = 'rich-text-link-edit-modal';
|
|
12
13
|
export const EditModal = ({ close, handleModalSubmit, initialState, fieldSchema, modalSlug, }) => {
|
|
14
|
+
const { t } = useTranslation('fields');
|
|
13
15
|
return (React.createElement(Modal, { slug: modalSlug, className: baseClass },
|
|
14
16
|
React.createElement(MinimalTemplate, { className: `${baseClass}__template` },
|
|
15
17
|
React.createElement("header", { className: `${baseClass}__header` },
|
|
16
|
-
React.createElement("h3", null,
|
|
18
|
+
React.createElement("h3", null, t('editLink')),
|
|
17
19
|
React.createElement(Button, { buttonStyle: "none", onClick: close },
|
|
18
20
|
React.createElement(X, null))),
|
|
19
21
|
React.createElement(Form, { onSubmit: handleModalSubmit, initialState: initialState },
|
|
20
22
|
React.createElement(RenderFields, { fieldTypes: fieldTypes, readOnly: false, fieldSchema: fieldSchema, forceRender: true }),
|
|
21
|
-
React.createElement(FormSubmit, null,
|
|
23
|
+
React.createElement(FormSubmit, null, t('general:submit'))))));
|
|
22
24
|
};
|
|
@@ -60,7 +60,7 @@ const DefaultAccount = (props) => {
|
|
|
60
60
|
React.createElement(Link, { to: `${admin}/collections/${slug}/create` }, t('general:createNew')))))),
|
|
61
61
|
React.createElement("div", { className: `${baseClass}__document-actions${preview ? ` ${baseClass}__document-actions--with-preview` : ''}` },
|
|
62
62
|
React.createElement(PreviewButton, { generatePreviewURL: preview, data: data }),
|
|
63
|
-
hasSavePermission && (React.createElement(FormSubmit,
|
|
63
|
+
hasSavePermission && (React.createElement(FormSubmit, { buttonId: "action-save" }, t('general:save')))),
|
|
64
64
|
React.createElement("div", { className: `${baseClass}__sidebar-fields` },
|
|
65
65
|
React.createElement(RenderFields, { permissions: permissions.fields, readOnly: !hasSavePermission, filter: (field) => { var _a; return ((_a = field === null || field === void 0 ? void 0 : field.admin) === null || _a === void 0 ? void 0 : _a.position) === 'sidebar'; }, fieldTypes: fieldTypes, fieldSchema: fields })),
|
|
66
66
|
React.createElement("ul", { className: `${baseClass}__meta` },
|
|
@@ -60,7 +60,7 @@ const Auth = (props) => {
|
|
|
60
60
|
React.createElement(Password, { autoComplete: "off", required: true, name: "password", label: t('newPassword') }),
|
|
61
61
|
React.createElement(ConfirmPassword, null),
|
|
62
62
|
!requirePassword && (React.createElement(Button, { size: "small", buttonStyle: "secondary", onClick: () => handleChangePassword(false) }, t('general:cancel'))))),
|
|
63
|
-
(!changingPassword && !requirePassword) && (React.createElement(Button, { size: "small", buttonStyle: "secondary", onClick: () => handleChangePassword(true) }, t('changePassword'))),
|
|
63
|
+
(!changingPassword && !requirePassword) && (React.createElement(Button, { id: "change-password", size: "small", buttonStyle: "secondary", onClick: () => handleChangePassword(true) }, t('changePassword'))),
|
|
64
64
|
operation === 'update' && (React.createElement(Button, { size: "small", buttonStyle: "secondary", onClick: () => unlock() }, t('forceUnlock'))),
|
|
65
65
|
useAPIKey && (React.createElement("div", { className: `${baseClass}__api-key` },
|
|
66
66
|
React.createElement(Checkbox, { label: t('enableAPIKey'), name: "enableAPIKey" }),
|
|
@@ -32,11 +32,14 @@ async function update(incomingArgs) {
|
|
|
32
32
|
})) || args;
|
|
33
33
|
}, Promise.resolve());
|
|
34
34
|
const { depth, collection, collection: { Model, config: collectionConfig, }, id, req, req: { t, locale, payload, payload: { config, }, }, overrideAccess, showHiddenFields, overwriteExistingFiles = false, draft: draftArg = false, autosave = false, } = args;
|
|
35
|
-
let { data } = args;
|
|
36
35
|
if (!id) {
|
|
37
36
|
throw new errors_1.APIError('Missing ID of document to update.', http_status_1.default.BAD_REQUEST);
|
|
38
37
|
}
|
|
38
|
+
let { data } = args;
|
|
39
|
+
const { password } = data;
|
|
39
40
|
const shouldSaveDraft = Boolean(draftArg && collectionConfig.versions.drafts);
|
|
41
|
+
const shouldSavePassword = Boolean(password && collectionConfig.auth && !shouldSaveDraft);
|
|
42
|
+
const lean = !shouldSavePassword;
|
|
40
43
|
// /////////////////////////////////////
|
|
41
44
|
// Access
|
|
42
45
|
// /////////////////////////////////////
|
|
@@ -60,12 +63,13 @@ async function update(incomingArgs) {
|
|
|
60
63
|
queryToBuild.where.and.push(accessResults);
|
|
61
64
|
}
|
|
62
65
|
const query = await Model.buildQuery(queryToBuild, locale);
|
|
63
|
-
const doc = await (0, getLatestCollectionVersion_1.getLatestCollectionVersion)({ payload, collection, id, query });
|
|
66
|
+
const doc = await (0, getLatestCollectionVersion_1.getLatestCollectionVersion)({ payload, collection, id, query, lean });
|
|
64
67
|
if (!doc && !hasWherePolicy)
|
|
65
68
|
throw new errors_1.NotFound(t);
|
|
66
69
|
if (!doc && hasWherePolicy)
|
|
67
70
|
throw new errors_1.Forbidden(t);
|
|
68
|
-
|
|
71
|
+
let docWithLocales = JSON.stringify(lean ? doc : doc.toJSON({ virtuals: true }));
|
|
72
|
+
docWithLocales = JSON.parse(docWithLocales);
|
|
69
73
|
const originalDoc = await (0, afterRead_1.afterRead)({
|
|
70
74
|
depth: 0,
|
|
71
75
|
doc: docWithLocales,
|
|
@@ -144,8 +148,7 @@ async function update(incomingArgs) {
|
|
|
144
148
|
// /////////////////////////////////////
|
|
145
149
|
// Handle potential password update
|
|
146
150
|
// /////////////////////////////////////
|
|
147
|
-
|
|
148
|
-
if (password && collectionConfig.auth && !shouldSaveDraft) {
|
|
151
|
+
if (shouldSavePassword) {
|
|
149
152
|
await doc.setPassword(password);
|
|
150
153
|
await doc.save();
|
|
151
154
|
delete data.password;
|
|
@@ -255,4 +258,4 @@ async function update(incomingArgs) {
|
|
|
255
258
|
return result;
|
|
256
259
|
}
|
|
257
260
|
exports.default = update;
|
|
258
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
261
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/collections/operations/update.ts"],"names":[],"mappings":"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"}
|
package/dist/config/types.d.ts
CHANGED
|
@@ -267,14 +267,12 @@ export declare type Config = {
|
|
|
267
267
|
Icon?: React.ComponentType<any>;
|
|
268
268
|
/** Replace the logo on the login page */
|
|
269
269
|
Logo?: React.ComponentType<any>;
|
|
270
|
-
v: any;
|
|
271
270
|
};
|
|
272
271
|
views?: {
|
|
273
272
|
/** Replace the account screen */
|
|
274
273
|
Account?: React.ComponentType<any>;
|
|
275
274
|
/** Replace the admin homepage */
|
|
276
275
|
Dashboard?: React.ComponentType<any>;
|
|
277
|
-
v: any;
|
|
278
276
|
};
|
|
279
277
|
};
|
|
280
278
|
/**
|
|
@@ -90,23 +90,31 @@
|
|
|
90
90
|
"verificationTokenInvalid": "Verification token is invalid."
|
|
91
91
|
},
|
|
92
92
|
"fields": {
|
|
93
|
-
"block": "block",
|
|
94
|
-
"blocks": "blocks",
|
|
95
93
|
"addLabel": "Add {{label}}",
|
|
96
94
|
"addNew": "Add new",
|
|
97
95
|
"addNewLabel": "Add new {{label}}",
|
|
98
96
|
"addRelationship": "Add relationship",
|
|
97
|
+
"block": "block",
|
|
99
98
|
"blockType": "Block Type",
|
|
99
|
+
"blocks": "blocks",
|
|
100
|
+
"chooseBetweenCustomTextOrDocument": "Choose between entering a custom text URL or linking to another document.",
|
|
101
|
+
"chooseDocumentToLink": "Choose a document to link to",
|
|
100
102
|
"chooseFromExisting": "Choose from existing",
|
|
101
103
|
"chooseLabel": "Choose {{label}}",
|
|
102
104
|
"collapseAll": "Collapse All",
|
|
105
|
+
"customURL": "Custom URL",
|
|
103
106
|
"editLabelData": "Edit {{label}} data",
|
|
107
|
+
"editLink": "Edit Link",
|
|
108
|
+
"enterURL": "Enter a URL",
|
|
109
|
+
"internalLink": "Internal Link",
|
|
104
110
|
"itemsAndMore": "{{items}} and {{count}} more",
|
|
105
111
|
"labelRelationship": "{{label}} Relationship",
|
|
106
112
|
"latitude": "Latitude",
|
|
113
|
+
"linkType": "Link Type",
|
|
107
114
|
"linkedTo": "Linked to <0>{{label}}</0>",
|
|
108
115
|
"longitude": "Longitude",
|
|
109
116
|
"newLabel": "New {{label}}",
|
|
117
|
+
"openInNewTab": "Open in new tab",
|
|
110
118
|
"passwordsDoNotMatch": "Passwords do not match.",
|
|
111
119
|
"relatedDocument": "Related Document",
|
|
112
120
|
"relationTo": "Relation To",
|
|
@@ -116,6 +124,7 @@
|
|
|
116
124
|
"selectExistingLabel": "Select existing {{label}}",
|
|
117
125
|
"showAll": "Show All",
|
|
118
126
|
"swapUpload": "Swap Upload",
|
|
127
|
+
"textToDisplay": "Text to display",
|
|
119
128
|
"toggleBlock": "Toggle block",
|
|
120
129
|
"uploadNewLabel": "Upload new {{label}}"
|
|
121
130
|
},
|
|
@@ -381,23 +381,31 @@ declare const _default: {
|
|
|
381
381
|
verificationTokenInvalid: string;
|
|
382
382
|
};
|
|
383
383
|
fields: {
|
|
384
|
-
block: string;
|
|
385
|
-
blocks: string;
|
|
386
384
|
addLabel: string;
|
|
387
385
|
addNew: string;
|
|
388
386
|
addNewLabel: string;
|
|
389
387
|
addRelationship: string;
|
|
388
|
+
block: string;
|
|
390
389
|
blockType: string;
|
|
390
|
+
blocks: string;
|
|
391
|
+
chooseBetweenCustomTextOrDocument: string;
|
|
392
|
+
chooseDocumentToLink: string;
|
|
391
393
|
chooseFromExisting: string;
|
|
392
394
|
chooseLabel: string;
|
|
393
395
|
collapseAll: string;
|
|
396
|
+
customURL: string;
|
|
394
397
|
editLabelData: string;
|
|
398
|
+
editLink: string;
|
|
399
|
+
enterURL: string;
|
|
400
|
+
internalLink: string;
|
|
395
401
|
itemsAndMore: string;
|
|
396
402
|
labelRelationship: string;
|
|
397
403
|
latitude: string;
|
|
404
|
+
linkType: string;
|
|
398
405
|
linkedTo: string;
|
|
399
406
|
longitude: string;
|
|
400
407
|
newLabel: string;
|
|
408
|
+
openInNewTab: string;
|
|
401
409
|
passwordsDoNotMatch: string;
|
|
402
410
|
relatedDocument: string;
|
|
403
411
|
relationTo: string;
|
|
@@ -407,6 +415,7 @@ declare const _default: {
|
|
|
407
415
|
selectExistingLabel: string;
|
|
408
416
|
showAll: string;
|
|
409
417
|
swapUpload: string;
|
|
418
|
+
textToDisplay: string;
|
|
410
419
|
toggleBlock: string;
|
|
411
420
|
uploadNewLabel: string;
|
|
412
421
|
};
|
|
@@ -5,6 +5,7 @@ declare type Args = {
|
|
|
5
5
|
collection: Collection;
|
|
6
6
|
query: Record<string, unknown>;
|
|
7
7
|
id: string | number;
|
|
8
|
+
lean?: boolean;
|
|
8
9
|
};
|
|
9
|
-
export declare const getLatestCollectionVersion: <T extends TypeWithID = any>({ payload, collection: { config, Model, }, query, id, }: Args) => Promise<T>;
|
|
10
|
+
export declare const getLatestCollectionVersion: <T extends TypeWithID = any>({ payload, collection: { config, Model, }, query, id, lean, }: Args) => Promise<T>;
|
|
10
11
|
export {};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getLatestCollectionVersion = void 0;
|
|
4
|
-
const getLatestCollectionVersion = async ({ payload, collection: { config, Model, }, query, id, }) => {
|
|
4
|
+
const getLatestCollectionVersion = async ({ payload, collection: { config, Model, }, query, id, lean = true, }) => {
|
|
5
5
|
var _a;
|
|
6
6
|
let version;
|
|
7
7
|
if ((_a = config.versions) === null || _a === void 0 ? void 0 : _a.drafts) {
|
|
@@ -9,10 +9,10 @@ const getLatestCollectionVersion = async ({ payload, collection: { config, Model
|
|
|
9
9
|
parent: id,
|
|
10
10
|
}, {}, {
|
|
11
11
|
sort: { updatedAt: 'desc' },
|
|
12
|
-
lean
|
|
12
|
+
lean,
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
|
-
const collection = await Model.findOne(query
|
|
15
|
+
const collection = await Model.findOne(query, {}, { lean });
|
|
16
16
|
version = await version;
|
|
17
17
|
if (!version || version.updatedAt < collection.updatedAt) {
|
|
18
18
|
return collection;
|
|
@@ -24,4 +24,4 @@ const getLatestCollectionVersion = async ({ payload, collection: { config, Model
|
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
26
|
exports.getLatestCollectionVersion = getLatestCollectionVersion;
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0TGF0ZXN0Q29sbGVjdGlvblZlcnNpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmVyc2lvbnMvZ2V0TGF0ZXN0Q29sbGVjdGlvblZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBWU8sTUFBTSwwQkFBMEIsR0FBRyxLQUFLLEVBQThCLEVBQzNFLE9BQU8sRUFDUCxVQUFVLEVBQUUsRUFDVixNQUFNLEVBQ04sS0FBSyxHQUNOLEVBQ0QsS0FBSyxFQUNMLEVBQUUsRUFDRixJQUFJLEdBQUcsSUFBSSxHQUNOLEVBQWMsRUFBRTs7SUFDckIsSUFBSSxPQUFPLENBQUM7SUFDWixJQUFJLE1BQUEsTUFBTSxDQUFDLFFBQVEsMENBQUUsTUFBTSxFQUFFO1FBQzNCLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUM7WUFDOUMsTUFBTSxFQUFFLEVBQUU7U0FDWCxFQUFFLEVBQUUsRUFBRTtZQUNMLElBQUksRUFBRSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUU7WUFDM0IsSUFBSTtTQUNMLENBQUMsQ0FBQztLQUNKO0lBQ0QsTUFBTSxVQUFVLEdBQUcsTUFBTSxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBYSxDQUFDO0lBQ3hFLE9BQU8sR0FBRyxNQUFNLE9BQU8sQ0FBQztJQUN4QixJQUFJLENBQUMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxTQUFTLEdBQUcsVUFBVSxDQUFDLFNBQVMsRUFBRTtRQUN4RCxPQUFPLFVBQVUsQ0FBQztLQUNuQjtJQUNELE9BQU87UUFDTCxHQUFHLE9BQU8sQ0FBQyxPQUFPO1FBQ2xCLFNBQVMsRUFBRSxPQUFPLENBQUMsU0FBUztRQUM1QixTQUFTLEVBQUUsT0FBTyxDQUFDLFNBQVM7S0FDN0IsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTdCVyxRQUFBLDBCQUEwQiw4QkE2QnJDIn0=
|