tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: forces fallbackLocale to null in update ops

Browse Source
This commit is contained in:
James
2021-02-05 14:47:09 -05:00
parent 79c3ca8611
commit 300536033f
7 changed files with 78 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/collections/operations/update.ts
View File

@@ -104,7 +104,7 @@ async function update(incomingArgs: Arguments): Promise<Document> {
if (!doc && hasWherePolicy) throw new Forbidden();
if (locale && doc.setLocale) {
doc.setLocale(locale, fallbackLocale);
doc.setLocale(locale, null);
}
let originalDoc: Document = doc.toJSON({ virtuals: true });
@@ -250,6 +250,10 @@ async function update(incomingArgs: Arguments): Promise<Document> {
await doc.save();
if (locale && doc.setLocale) {
doc.setLocale(locale, fallbackLocale);
}
let result: Document = doc.toJSON({ virtuals: true });
result = removeInternalFields(result);

61
src/collections/tests/collections.spec.js
View File

@@ -44,6 +44,26 @@ describe('Collections - REST', () => {
title: 'title',
description: englishPostDesc,
priority: 1,
nonLocalizedGroup: {
text: 'english',
},
localizedGroup: {
text: 'english',
},
nonLocalizedArray: [
{
localizedEmbeddedText: 'english',
},
],
richTextBlocks: [
{
blockType: 'richTextBlock',
blockName: 'Test Block Name',
content: [{
children: [{ text: 'english' }],
}],
},
],
}),
headers,
method: 'post',
@@ -54,6 +74,11 @@ describe('Collections - REST', () => {
expect(response.status).toBe(201);
expect(data.doc.title).not.toBeNull();
expect(data.doc.id).not.toBeNull();
expect(data.doc.nonLocalizedGroup.text).toStrictEqual('english');
expect(data.doc.localizedGroup.text).toStrictEqual('english');
expect(data.doc.nonLocalizedArray[0].localizedEmbeddedText).toStrictEqual('english');
expect(data.doc.richTextBlocks[0].content[0].children[0].text).toStrictEqual('english');
const timestampRegex = /^(\d{4})(?:-?W(\d+)(?:-?(\d+)D?)?|(?:-(\d+))?-(\d+))(?:[T ](\d+):(\d+)(?::(\d+)(?:\.(\d+))?)?)?(?:Z(-?\d*))?$/;
expect(data.doc.createdAt).toStrictEqual(expect.stringMatching(timestampRegex));
expect(data.doc.updatedAt).toStrictEqual(expect.stringMatching(timestampRegex));
@@ -101,6 +126,26 @@ describe('Collections - REST', () => {
title: 'title',
description: spanishPostDesc,
priority: 1,
nonLocalizedGroup: {
text: 'spanish',
},
localizedGroup: {
text: 'spanish',
},
nonLocalizedArray: [
{
localizedEmbeddedText: 'spanish',
},
],
richTextBlocks: [
{
blockType: 'richTextBlock',
blockName: 'Test Block Name',
content: [{
children: [{ text: 'spanish' }],
}],
},
],
}),
headers,
method: 'put',
@@ -110,6 +155,10 @@ describe('Collections - REST', () => {
expect(response.status).toBe(200);
expect(data.doc.description).toBe(spanishPostDesc);
expect(data.doc.nonLocalizedGroup.text).toStrictEqual('spanish');
expect(data.doc.localizedGroup.text).toStrictEqual('spanish');
expect(data.doc.nonLocalizedArray[0].localizedEmbeddedText).toStrictEqual('spanish');
expect(data.doc.richTextBlocks[0].content[0].children[0].text).toStrictEqual('spanish');
});
});
@@ -121,6 +170,10 @@ describe('Collections - REST', () => {
expect(response.status).toBe(200);
expect(data.description).toBe(englishPostDesc);
expect(data.nonLocalizedGroup.text).toStrictEqual('english');
expect(data.localizedGroup.text).toStrictEqual('english');
expect(data.nonLocalizedArray[0].localizedEmbeddedText).toStrictEqual('english');
expect(data.richTextBlocks[0].content[0].children[0].text).toStrictEqual('english');
});
it('should allow a localized post to be retrieved in specified English locale', async () => {
@@ -129,6 +182,10 @@ describe('Collections - REST', () => {
expect(response.status).toBe(200);
expect(data.description).toBe(englishPostDesc);
expect(data.nonLocalizedGroup.text).toStrictEqual('english');
expect(data.localizedGroup.text).toStrictEqual('english');
expect(data.nonLocalizedArray[0].localizedEmbeddedText).toStrictEqual('english');
expect(data.richTextBlocks[0].content[0].children[0].text).toStrictEqual('english');
});
it('should allow a localized post to be retrieved in Spanish', async () => {
@@ -137,6 +194,10 @@ describe('Collections - REST', () => {
expect(response.status).toBe(200);
expect(data.description).toBe(spanishPostDesc);
expect(data.nonLocalizedGroup.text).toStrictEqual('spanish');
expect(data.localizedGroup.text).toStrictEqual('spanish');
expect(data.nonLocalizedArray[0].localizedEmbeddedText).toStrictEqual('spanish');
expect(data.richTextBlocks[0].content[0].children[0].text).toStrictEqual('spanish');
});
it('should allow a localized post to be retrieved in all locales', async () => {

10
src/globals/operations/update.ts
View File

@@ -1,8 +1,8 @@
import deepmerge from 'deepmerge';
import merge from 'lodash.merge';
import overwriteMerge from '../../utilities/overwriteMerge';
import executeAccess from '../../auth/executeAccess';
import removeInternalFields from '../../utilities/removeInternalFields';
import { AfterChangeHook, BeforeValidateHook } from '../../collections/config/types';
async function update(args) {
const { globals: { Model } } = this;
@@ -39,7 +39,7 @@ async function update(args) {
}
if (locale && global.setLocale) {
global.setLocale(locale, fallbackLocale);
global.setLocale(locale, null);
}
const globalJSON = global.toJSON({ virtuals: true });
@@ -100,10 +100,14 @@ async function update(args) {
// 7. Perform database operation
// /////////////////////////////////////
Object.assign(global, data);
merge(global, data);
await global.save();
if (locale && global.setLocale) {
global.setLocale(locale, fallbackLocale);
}
global = global.toJSON({ virtuals: true });
// /////////////////////////////////////

2
src/localization/sanitizeFallbackLocale.ts
View File

@@ -1,5 +1,5 @@
const sanitizeFallbackLocale = (fallbackLocale) => {
if (fallbackLocale === 'null' || fallbackLocale === 'none' || fallbackLocale === 'false' || fallbackLocale === false) {
if (fallbackLocale === 'null' || fallbackLocale === 'none' || fallbackLocale === 'false' || fallbackLocale === false || fallbackLocale === null) {
return null;
}