From f876e316416b230a3a6d4661b9985177d6390732 Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Fri, 2 Jul 2021 11:25:34 +0530 Subject: [PATCH 1/4] fix(revision): incorrect type path --- src/server/routes/revision.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/routes/revision.js b/src/server/routes/revision.js index 3ffe4886ec..e0b5ceeddb 100644 --- a/src/server/routes/revision.js +++ b/src/server/routes/revision.js @@ -59,7 +59,7 @@ function formatAuthorChange(change) { return baseFormatter.formatEndedChange(change); } - if (_.isEqual(change.path, ['type'])) { + if (_.isEqual(change.path, ['authorType'])) { return baseFormatter.formatTypeChange(change, 'Author Type'); } @@ -130,7 +130,7 @@ function formatPublisherChange(change) { return baseFormatter.formatEndedChange(change); } - if (_.isEqual(change.path, ['type'])) { + if (_.isEqual(change.path, ['publisherType'])) { return baseFormatter.formatTypeChange(change, 'Publisher Type'); } @@ -147,7 +147,7 @@ function formatWorkChange(change) { return languageSetFormatter.format(change); } - if (_.isEqual(change.path, ['type'])) { + if (_.isEqual(change.path, ['workType'])) { return baseFormatter.formatTypeChange(change, 'Work Type'); } @@ -155,7 +155,7 @@ function formatWorkChange(change) { } function formatEditionGroupChange(change) { - if (_.isEqual(change.path, ['type'])) { + if (_.isEqual(change.path, ['editionGroupType'])) { return baseFormatter.formatTypeChange(change, 'Edition Group Type'); } From b4cf9ee7cfec24e700a2591c0caf7b4b3f496994 Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Fri, 2 Jul 2021 12:49:20 +0530 Subject: [PATCH 2/4] improve: show type change in revision when edited when type value is edited revision for it isn't shown. Modified the conditional accordingly to include this case --- src/server/routes/revision.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/server/routes/revision.js b/src/server/routes/revision.js index e0b5ceeddb..00de13055a 100644 --- a/src/server/routes/revision.js +++ b/src/server/routes/revision.js @@ -58,8 +58,8 @@ function formatAuthorChange(change) { if (_.isEqual(change.path, ['ended'])) { return baseFormatter.formatEndedChange(change); } - - if (_.isEqual(change.path, ['authorType'])) { + if (_.isEqual(change.path, ['authorType']) || + _.isEqual(change.path, ['authorType', 'label'])) { return baseFormatter.formatTypeChange(change, 'Author Type'); } @@ -106,11 +106,13 @@ function formatEditionChange(change) { return baseFormatter.formatScalarChange(change, 'Page Count'); } - if (_.isEqual(change.path, ['editionFormat'])) { + if (_.isEqual(change.path, ['editionFormat']) || + _.isEqual(change.path, ['editionFormat', 'label'])) { return baseFormatter.formatTypeChange(change, 'Edition Format'); } - if (_.isEqual(change.path, ['editionStatus'])) { + if (_.isEqual(change.path, ['editionStatus']) || + _.isEqual(change.path, ['editionStatus', 'label'])) { return baseFormatter.formatTypeChange(change, 'Edition Status'); } @@ -129,8 +131,8 @@ function formatPublisherChange(change) { if (_.isEqual(change.path, ['ended'])) { return baseFormatter.formatEndedChange(change); } - - if (_.isEqual(change.path, ['publisherType'])) { + if (_.isEqual(change.path, ['publisherType']) || + _.isEqual(change.path, ['publisherType', 'label'])) { return baseFormatter.formatTypeChange(change, 'Publisher Type'); } @@ -146,8 +148,8 @@ function formatWorkChange(change) { if (languageSetFormatter.changed(change)) { return languageSetFormatter.format(change); } - - if (_.isEqual(change.path, ['workType'])) { + if (_.isEqual(change.path, ['workType']) || + _.isEqual(change.path, ['workType', 'label'])) { return baseFormatter.formatTypeChange(change, 'Work Type'); } @@ -155,7 +157,8 @@ function formatWorkChange(change) { } function formatEditionGroupChange(change) { - if (_.isEqual(change.path, ['editionGroupType'])) { + if (_.isEqual(change.path, ['editionGroupType']) || + _.isEqual(change.path, ['editionGroupType', 'label'])) { return baseFormatter.formatTypeChange(change, 'Edition Group Type'); } From 9770453bf7bd9ba4bf465cf882538bac9dc595d6 Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Fri, 2 Jul 2021 12:49:28 +0530 Subject: [PATCH 3/4] improve(revision): updated formatChange callback --- src/server/helpers/diffFormatters/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/helpers/diffFormatters/base.js b/src/server/helpers/diffFormatters/base.js index 5ae4626b37..e6bd9fa646 100644 --- a/src/server/helpers/diffFormatters/base.js +++ b/src/server/helpers/diffFormatters/base.js @@ -76,7 +76,7 @@ export function formatEndedChange(change) { } export function formatTypeChange(change, label) { - return formatChange(change, label, (side) => side && [side.label]); + return formatChange(change, label, (side) => (typeof side === 'string' ? [side] : side && [side.label])); } export function formatScalarChange(change, label) { From a510820e28cbcb62a39043312b9865002f87558c Mon Sep 17 00:00:00 2001 From: Akash Gupta Date: Thu, 15 Jul 2021 19:57:14 +0530 Subject: [PATCH 4/4] refactor code style --- src/server/helpers/diffFormatters/base.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/server/helpers/diffFormatters/base.js b/src/server/helpers/diffFormatters/base.js index e6bd9fa646..68eade479b 100644 --- a/src/server/helpers/diffFormatters/base.js +++ b/src/server/helpers/diffFormatters/base.js @@ -76,7 +76,15 @@ export function formatEndedChange(change) { } export function formatTypeChange(change, label) { - return formatChange(change, label, (side) => (typeof side === 'string' ? [side] : side && [side.label])); + // eslint-disable-next-line consistent-return + return formatChange(change, label, (side) => { + if (typeof side === 'string') { + return [side]; + } + else if (side) { + return [side.label]; + } + }); } export function formatScalarChange(change, label) {