vmi-virtual-memorial/vmi-wd-frontend / 9db9832

Browse files

resolve name spacing bug

Authored by mfwolffe <wolffemf@dukes.jmu.edu>
SHA
9db9832b7088216e444cb46ee3b715034dc0ce64
Parents
1512361
Tree
8fcd7ed

4 changed files

StatusFile+-
M app/memorial/conflict/[id]/page.tsx 8 3
M app/memorial/page.tsx 3 1
M app/memorial/person/[id]/page.tsx 7 3
M app/memorial/search/page.tsx 7 3
app/memorial/conflict/[id]/page.tsxmodified
@@ -144,9 +144,14 @@ useEffect(() => {
144144
                     className="block p-6 border-2 border-gray-200 rounded-lg hover:border-vmi-gold hover:bg-vmi-light-gold transition-all duration-200 group"
145145
                   >
146146
                     <h3 className="text-xl font-bold text-gray-800 group-hover:text-vmi-red transition-colors mb-2 flex items-center gap-2">
147
-                      {person.full_display_name ?
148
-                        person.full_display_name.replace(person.rank + ' ', '').replace(person.rank + ', ', '')
149
-                        : person.display_name.replace(person.rank + ' ', '').replace(person.rank + ', ', '')}
147
+                      {(() => {
148
+                        const name = person.full_display_name || person.display_name;
149
+                        // Only remove rank if it exists
150
+                        if (person.rank) {
151
+                          return name.replace(person.rank + ' ', '').replace(person.rank + ', ', '');
152
+                        }
153
+                        return name;
154
+                      })()}
150155
                       {person.pdf_key && <DocumentIcon className="flex-shrink-0" />}
151156
                     </h3>
152157
                     {person.rank && (
app/memorial/page.tsxmodified
@@ -176,7 +176,9 @@ export default function MemorialIndexPage() {
176176
                         className="block p-4 border border-gray-200 rounded hover:border-vmi-gold hover:bg-vmi-light-gold transition-all duration-200 group"
177177
                       >
178178
                         <h3 className="font-bold text-gray-800 group-hover:text-vmi-red transition-colors flex items-center gap-2">
179
-                          {person.display_name.replace(person.rank + ' ', '').replace(person.rank + ', ', '')}
179
+                          {person.rank
180
+                            ? person.display_name.replace(person.rank + ' ', '').replace(person.rank + ', ', '')
181
+                            : person.display_name}
180182
                           {person.pdf_key && <DocumentIcon className="flex-shrink-0" />}
181183
                         </h3>
182184
                         {person.rank && (
app/memorial/person/[id]/page.tsxmodified
@@ -85,9 +85,13 @@ export default function PersonPage() {
8585
     );
8686
   }
8787
88
-  const displayName = person.full_display_name ?
89
-    person.full_display_name.replace(person.rank + ' ', '').replace(person.rank + ', ', '')
90
-    : person.display_name;
88
+  const displayName = (() => {
89
+    const name = person.full_display_name || person.display_name;
90
+    if (person.rank && person.full_display_name) {
91
+      return name.replace(person.rank + ' ', '').replace(person.rank + ', ', '');
92
+    }
93
+    return person.full_display_name ? name : person.display_name;
94
+  })();
9195
9296
   return (
9397
     <div className="min-h-screen bg-vmi-cream">
app/memorial/search/page.tsxmodified
@@ -283,9 +283,13 @@ export default function MemorialSearchPage() {
283283
                       <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
284284
                         <div>
285285
                           <h3 className="text-xl font-bold text-gray-800 group-hover:text-vmi-red transition-colors flex items-center gap-2">
286
-                            {person.full_display_name ?
287
-                              person.full_display_name.replace(person.rank + ' ', '').replace(person.rank + ', ', '')
288
-                              : person.display_name}
286
+                            {(() => {
287
+                              const name = person.full_display_name || person.display_name;
288
+                              if (person.rank && person.full_display_name) {
289
+                                return name.replace(person.rank + ' ', '').replace(person.rank + ', ', '');
290
+                              }
291
+                              return person.full_display_name ? name : person.display_name;
292
+                            })()}
289293
                             {person.pdf_key && <DocumentIcon className="flex-shrink-0" />}
290294
                           </h3>
291295
                           {person.rank && (