Merge pull request #42 from langaracpsc/pull-request

fix exec positions not showing
langaracpsc · Apr 19, 2024 · 6e10362 · 6e10362
2 parents fa1fe0c + 01e2640
commit 6e10362
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/frontend/src/app/ExecProfile.tsx b/frontend/src/app/ExecProfile.tsx
@@ -14,7 +14,7 @@ interface ExecProfileProps
 
     ImageBuffer: string;
 
-    Position: string;
+    Position: Array<string>;
 
     Description: string;
 }
@@ -90,15 +90,15 @@ export default function ExecProfile({ID, Name, ImageBuffer, Position, Descriptio
                                         <ProfileModal
                                             ID={ID}
                                             Name={Name}
-                                            Position={Position}
+                                            Position={Position.join(" & ")}
                                             ImageBuffer={ImageBuffer}
                                             Description={Description}
                                             imageWidth={imageWidth} />
                                     </Dialog.Content>
                                 </Dialog.Overlay>
                             </Dialog.Portal>
                         </Dialog.Root>
-                        <p>{Position}</p>
+                        <p>{Position.join(" & ")}</p>
                     </div>
                 </div>
             </div>

diff --git a/frontend/src/app/ExecProfiles.tsx b/frontend/src/app/ExecProfiles.tsx
@@ -6,8 +6,7 @@ import { selectProfile, ExecProfileObject } from './slices/execProfileSlice';
 export default function ExecProfiles() {
     const profiles = useAppSelector(selectProfile);
 
-    // TODO: don't hardcode the value of 1000
-    const profilesSorted = [...profiles].sort((a, b) => (a.Position.ID - b.Position.ID)).slice(0, 1000);
+    const profilesSorted = profiles;
 
     const [profileSections, setProfileSections] = useState<ExecProfileObject[][]>([]);
 
@@ -74,7 +73,7 @@ export default function ExecProfiles() {
                             profiles.map(profile => (
                                 <ExecProfile
                                     key={profile.ID}
-                                    Position={profile.Position.Title}
+                                    Position={profile.Position}
                                     ID={profile.ID}
                                     Name={profile.Name}
                                     ImageBuffer= {(profile.ImageBuffer != null) ? `https://api3.langaracs.tech/executives/image/${profile.ImageBuffer}` : "https://via.placeholder.com/200x200"}

diff --git a/frontend/src/app/about/AboutPage.tsx b/frontend/src/app/about/AboutPage.tsx
@@ -31,7 +31,7 @@ export default function AboutPage({} : AboutPageProps)
                 const promise: UnknownAction = mainDispatch(loadProfilesAsync() as AppDispatch);
 
                 ((await promise) as unknown as any[]).forEach((element) => {
-                    mainDispatch(AddExecProfile({ ...element, Position: { ID: element.Position.ID, Title: element.Position.Name} } as ExecProfileObject)); 
+                    mainDispatch(AddExecProfile({ ...element} as ExecProfileObject)); 
                 });
             }
 

diff --git a/frontend/src/app/slices/execProfileSlice.ts b/frontend/src/app/slices/execProfileSlice.ts
@@ -16,7 +16,7 @@ export interface ExecProfileObject
 
     ImageBuffer: string;
 
-    Position: ExecPosition; 
+    Position: Array<string>; 
 
     Description: string;
 }