revert: removed sorting operations

metabrainz · Jul 30, 2021 · fa4b202 · fa4b202
1 parent 957bed3
commit fa4b202
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/src/client/entity-editor/series-section/series-section.tsx b/src/client/entity-editor/series-section/series-section.tsx
@@ -26,7 +26,6 @@ import CustomInput from '../../input';
 import type {Dispatch} from 'redux';
 import Select from 'react-select';
 import {connect} from 'react-redux';
-import {sortRelationships} from '../relationship-editor/actions';
 
 
 type SeriesOrderingType = {
@@ -144,12 +143,7 @@ function mapStateToProps(rootState): StateProps {
 
 function mapDispatchToProps(dispatch: Dispatch<Action>): DispatchProps {
 	return {
-		onOrderTypeChange: (value) => {
-			dispatch(updateOrderType(value && value.value));
-			if (value && value.value === 1) {
-				dispatch(sortRelationships(null, null));
-			}
-		},
+		onOrderTypeChange: (value) => dispatch(updateOrderType(value && value.value)),
 		onSeriesTypeChange: (value) => dispatch(updateSeriesType(value && value.value))
 	};
 }

diff --git a/src/server/helpers/middleware.ts b/src/server/helpers/middleware.ts
@@ -79,13 +79,6 @@ export function loadSeriesItems(req: $Request, res: $Response, next: NextFunctio
 		const {entity} = res.locals;
 		if (entity.dataId) {
 			const {relationships} = entity;
-
-			if (entity.seriesOrderingType.label === 'Manual') {
-				relationships.sort(commonUtils.sortRelationshipOrdinal('position'));
-			}
-			else {
-				relationships.sort(commonUtils.sortRelationshipOrdinal('number'));
-			}
 			const seriesItems = relationships.map((rel) => (
 				{...rel.source, displayNumber: true,
 					number: rel.number,

diff --git a/src/server/routes/entity/series.js b/src/server/routes/entity/series.js
@@ -194,18 +194,7 @@ function seriesToFormState(series) {
 		relationshipEditorVisible: false,
 		relationships: {}
 	};
-	series.relationships.forEach((relationship) => {
-		relationship.attributeSet.relationshipAttributes.forEach(attribute => {
-			relationship[`${attribute.type.name}`] = attribute.value.textValue;
-		});
-	});
-
-	if (series.seriesOrderingType.label === 'Manual') {
-		series.relationships.sort(sortRelationshipOrdinal('position'));
-	}
-	else {
-		series.relationships.sort(sortRelationshipOrdinal('number'));
-	}
+
 	series.relationships.forEach((relationship) => (
 		relationshipSection.relationships[`n${relationship.id}`] = {
 			attributeSetId: relationship.attributeSetId,