Merge pull request #660 from akashgp09/fix-revision

fix(revision): show type changes in revision page
metabrainz · Jul 15, 2021 · c7421f4 · c7421f4
2 parents e46af6b + a510820
commit c7421f4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git 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) => 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) {

diff --git 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, ['type'])) {
+	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, ['type'])) {
+	if (_.isEqual(change.path, ['publisherType']) ||
+			_.isEqual(change.path, ['publisherType', 'label'])) {
 		return baseFormatter.formatTypeChange(change, 'Publisher Type');
 	}
 
@@ -146,16 +148,17 @@ function formatWorkChange(change) {
 	if (languageSetFormatter.changed(change)) {
 		return languageSetFormatter.format(change);
 	}
-
-	if (_.isEqual(change.path, ['type'])) {
+	if (_.isEqual(change.path, ['workType']) ||
+			_.isEqual(change.path, ['workType', 'label'])) {
 		return baseFormatter.formatTypeChange(change, 'Work Type');
 	}
 
 	return null;
 }
 
 function formatEditionGroupChange(change) {
-	if (_.isEqual(change.path, ['type'])) {
+	if (_.isEqual(change.path, ['editionGroupType']) ||
+			_.isEqual(change.path, ['editionGroupType', 'label'])) {
 		return baseFormatter.formatTypeChange(change, 'Edition Group Type');
 	}