gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: properly detect changes (#947)

Browse Source
This commit is contained in:
Daniel Lautzenheiser 2023-10-23 10:58:09 -04:00 committed by GitHub
parent 55022af2d1
commit c1ccc150fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/core/src/reducers/entryDraft.ts
View File

@ -161,20 +161,13 @@ function entryDraftReducer(
} }
case DRAFT_UPDATE: { case DRAFT_UPDATE: {
let newState = { ...state }; if (!state.entry) {
if (!newState.entry) {
return state; return state;
} }
const { data } = action.payload; const { data } = action.payload;
newState = { const newState = set(state, 'entry.data', data);
...newState,
entry: {
...newState.entry,
data,
},
};
let hasChanged = let hasChanged =
!isEqual(newState.entry?.meta, newState.original?.meta) || !isEqual(newState.entry?.meta, newState.original?.meta) ||
@ -194,8 +187,7 @@ function entryDraftReducer(
} }
case DRAFT_CHANGE_FIELD: { case DRAFT_CHANGE_FIELD: {
let newState = { ...state }; if (!state.entry) {
if (!newState.entry) {
return state; return state;
} }
@ -204,26 +196,21 @@ function entryDraftReducer(
? ['meta'] ? ['meta']
: (i18n && getDataPath(i18n.currentLocale, i18n.defaultLocale)) || ['data']; : (i18n && getDataPath(i18n.currentLocale, i18n.defaultLocale)) || ['data'];
const newEntry = cloneDeep(newState.entry); let newState = set(state, `entry.${dataPath.join('.')}.${path}`, value);
newState = {
...newState,
entry: set(newEntry, `${dataPath.join('.')}.${path}`, value),
};
if (i18n) { if (i18n) {
newState = duplicateI18nFields(newState, field, i18n.locales, i18n.defaultLocale, path); newState = duplicateI18nFields(newState, field, i18n.locales, i18n.defaultLocale, path);
} }
let hasChanged = let hasChanged =
!isEqual(newEntry?.meta, newState.original?.meta) || !isEqual(newState.entry?.meta, newState.original?.meta) ||
!isEqual(newEntry?.data, newState.original?.data); !isEqual(newState.entry?.data, newState.original?.data);
const i18nData = newEntry?.i18n ?? {}; const i18nData = newState.entry?.i18n ?? {};
for (const locale in i18nData) { for (const locale in i18nData) {
hasChanged = hasChanged =
hasChanged || hasChanged ||
!isEqual(newEntry?.i18n?.[locale]?.data, newState.original?.i18n?.[locale]?.data); !isEqual(newState.entry?.i18n?.[locale]?.data, newState.original?.i18n?.[locale]?.data);
} }
return { return {