Merge pull request #575 from NASA-IMPACT/fix/remove-sort

Revert corresponding author being listed first
NASA-IMPACT · Mar 8, 2024 · 4d4ce68 · 4d4ce68
2 parents bc9cc5c + bcc5a7e
commit 4d4ce68
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 34 deletions.
diff --git a/app/assets/scripts/components/documents/journal-pdf-preview/index.js b/app/assets/scripts/components/documents/journal-pdf-preview/index.js
@@ -26,7 +26,6 @@ import {
 import { applyNumberCaptionsToDocument } from '../../../utils/apply-number-captions-to-document';
 import { VariableItem } from '../single-view/document-body';
 import { variableNodeType } from '../../../types';
-import { sortContacts } from '../../../utils/sort-contacts';
 
 const ReferencesList = styled.ol`
   && {
@@ -451,36 +450,34 @@ function JournalPdfPreview() {
       (c) => !c.roles?.includes('Document Reviewer')
     ); // Remove any reviewer from the authors list
 
-    authors
-      ?.sort(sortContacts)
-      .forEach(({ contact, affiliations: contactAffiliations }, i) => {
-        const hasAffiliation =
-          contactAffiliations && contactAffiliations.length > 0;
-
-        const item = (
-          <span key={contact.id}>
-            <strong>
-              {getContactName(contact, { full: true })}
-              {hasAffiliation &&
-                contactAffiliations.map((affiliation, j) => {
-                  return (
-                    <>
-                      <sup>
-                        {Array.from(affiliations).indexOf(affiliation) + 1}
-                      </sup>
-                      <sup>
-                        {j < contactAffiliations.length - 1 && <span>, </span>}
-                      </sup>
-                    </>
-                  );
-                })}
-              {i < authors.length - 1 && <span>, </span>}
-              {i === authors.length - 2 && <span>and </span>}
-            </strong>
-          </span>
-        );
-        contacts.push(item);
-      });
+    authors?.forEach(({ contact, affiliations: contactAffiliations }, i) => {
+      const hasAffiliation =
+        contactAffiliations && contactAffiliations.length > 0;
+
+      const item = (
+        <span key={contact.id}>
+          <strong>
+            {getContactName(contact, { full: true })}
+            {hasAffiliation &&
+              contactAffiliations.map((affiliation, j) => {
+                return (
+                  <>
+                    <sup>
+                      {Array.from(affiliations).indexOf(affiliation) + 1}
+                    </sup>
+                    <sup>
+                      {j < contactAffiliations.length - 1 && <span>, </span>}
+                    </sup>
+                  </>
+                );
+              })}
+            {i < authors.length - 1 && <span>, </span>}
+            {i === authors.length - 2 && <span>and </span>}
+          </strong>
+        </span>
+      );
+      contacts.push(item);
+    });
 
     // create corresponding authors list component
     const correspondingAuthors =

diff --git a/app/assets/scripts/components/documents/single-view/document-body.js b/app/assets/scripts/components/documents/single-view/document-body.js
@@ -27,7 +27,6 @@ import { useCommentCenter } from '../../../context/comment-center';
 import { isJournalPublicationIntended } from '../status';
 import serializeSlateToString from '../../slate/serialize-to-string';
 import { useContextualAbility } from '../../../a11n';
-import { sortContacts } from '../../../utils/sort-contacts';
 
 const PDFPreview = styled.iframe`
   width: 100%;
@@ -1056,7 +1055,6 @@ const htmlAtbdContentSections = [
             // Remove reviewers that have the role 'Document Reviewer'
             !roles.includes('Document Reviewer')
         )
-        .sort(sortContacts)
         .map(({ contact, roles, affiliations }, idx) => ({
           label: getContactName(contact),
           id: `contacts_${idx + 1}`,
@@ -1117,7 +1115,6 @@ const htmlAtbdContentSections = [
           // Include reviewers that have the role 'Document Reviewer'
           roles.includes('Document Reviewer')
         )
-        .sort(sortContacts)
         .map(({ contact, roles, affiliations }, idx) => ({
           label: getContactName(contact),
           id: `contacts_${idx + 1}`,