Merge pull request #1100 from metabrainz/ac-order

BB-803: Sort author credits by their position
metabrainz · Jun 25, 2024 · adaed67 · adaed67
2 parents 529da3c + 782074a
commit adaed67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/...lient/components/author-credit-display.js → ...ient/components/author-credit-display.tsx b/...lient/components/author-credit-display.js → ...ient/components/author-credit-display.tsx
@@ -16,13 +16,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import PropTypes from 'prop-types';
+import {map as _map, sortBy} from 'lodash';
+import {AuthorCreditRow} from '../entity-editor/author-credit-editor/actions';
 import React from 'react';
-import {map as _map} from 'lodash';
 
 
-function AuthorCreditDisplay({names}) {
-	const nameElements = _map(names, (name) => {
+function AuthorCreditDisplay({names}:{names:AuthorCreditRow[]}) {
+	const nameElements = _map(sortBy(names, 'position'), (name) => {
 		const authorBBID = name.authorBBID ?? name.author?.id;
 		return (
 			<span key={`author-credit-${authorBBID}`}>
@@ -42,11 +42,5 @@ function AuthorCreditDisplay({names}) {
 }
 
 AuthorCreditDisplay.displayName = 'AuthorCreditDisplay';
-AuthorCreditDisplay.propTypes = {
-	names: PropTypes.oneOfType([
-		PropTypes.array,
-		PropTypes.object
-	]).isRequired
-};
 
 export default AuthorCreditDisplay;
diff --git a/src/client/entity-editor/author-credit-editor/actions.ts b/src/client/entity-editor/author-credit-editor/actions.ts
@@ -47,7 +47,7 @@ export type AuthorCreditRow = {
 	author: Author,
 	authorBBID: string,
 	position: number,
-	authohrCreditID: number
+	authorCreditID: number
 };
 export type AuthorCredit = {
 	authorCount: number,