Move the toMilitaryName util method to Person

NCI-Agency · Nov 27, 2024 · 67d7fa6 · 67d7fa6
1 parent 77417a0
commit 67d7fa6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/client/src/components/SecurityBanner.js b/client/src/components/SecurityBanner.js
@@ -92,7 +92,7 @@ const SecurityBanner = ({ onLogout, handleSecurityBannerBottom }) => {
                 width={25}
                 height={25}
               />{" "}
-              {utils.toMilitaryName(currentUser.name)}
+              {Person.formattedMilitaryName(currentUser.name)}
             </LinkTo>
             {Settings.keycloakConfiguration.showLogoutLink && (
               <Dropdown.Toggle

diff --git a/client/src/components/previews/PersonPreview.js b/client/src/components/previews/PersonPreview.js
@@ -124,7 +124,7 @@ const PersonPreview = ({ className, uuid }) => {
   return (
     <div className={`${className} preview-content-scroll`}>
       <div className="preview-sticky-title">
-        <h4 className="ellipsized-text">{`${person.rank} ${utils.toMilitaryName(person.name)}`}</h4>
+        <h4 className="ellipsized-text">{`${person.rank} ${Person.formattedMilitaryName(person.name)}`}</h4>
       </div>
       <div className="preview-section">
         <Row>

diff --git a/client/src/models/Person.js b/client/src/models/Person.js
@@ -324,7 +324,7 @@ export default class Person extends Model {
   }
 
   toString() {
-    const militaryName = utils.toMilitaryName(this.name)
+    const militaryName = Person.formattedMilitaryName(this.name)
     if (this.rank) {
       return this.rank + " " + militaryName
     } else {
@@ -376,6 +376,20 @@ export default class Person extends Model {
     }
   }
 
+  static formattedMilitaryName(name) {
+    const delimiter = name.indexOf(Person.delimiter)
+    let lastName = name
+    let firstName = ""
+
+    if (delimiter > -1) {
+      lastName = name.substring(0, delimiter)
+      firstName = name.substring(delimiter + 1, name.length)
+      return `${lastName.toUpperCase()}, ${firstName}`
+    }
+
+    return lastName.toUpperCase()
+  }
+
   getNumberOfFieldsInLeftColumn() {
     return Settings.fields[this.user ? "advisor" : "regular"].person
       .numberOfFieldsInLeftColumn

diff --git a/client/src/pages/people/Edit.js b/client/src/pages/people/Edit.js
@@ -115,7 +115,7 @@ const PersonEdit = ({ pageDispatchers }) => {
   const person = new Person(data ? data.person : {})
   const isPending =
     person.isPendingVerification() && Person.isEqual(currentUser, person)
-  const legendText = isPending ? "Create your account" : `Edit ${utils.toMilitaryName(person.name)}`
+  const legendText = isPending ? "Create your account" : `Edit ${Person.formattedMilitaryName(person.name)}`
   const saveText = isPending ? "Update profile" : "Save Person"
 
   // mutates the object

diff --git a/client/src/pages/people/Show.js b/client/src/pages/people/Show.js
@@ -324,7 +324,7 @@ const PersonShow = ({ pageDispatchers }) => {
                         persistent
                       />
                     }{" "}
-                    {person.rank} {utils.toMilitaryName(person.name)}
+                    {person.rank} {Person.formattedMilitaryName(person.name)}
                   </>
                 }
                 action={action}

diff --git a/client/src/utils.js b/client/src/utils.js
@@ -400,20 +400,6 @@ export default {
       value,
       label
     }))
-  },
-
-  toMilitaryName: function(name) {
-    const delimiter = name.indexOf(",")
-    let lastName = name
-    let firstName = ""
-
-    if (delimiter > -1) {
-      lastName = name.substring(0, delimiter)
-      firstName = name.substring(delimiter + 1, name.length)
-      return `${lastName.toUpperCase()}, ${firstName}`
-    }
-
-    return lastName.toUpperCase()
   }
 }