refactor fetched users into single array and replace Image tag with img

src/components/ApprovalWorkflows/RequestedBy.tsx

@@ -18,12 +18,12 @@ export default function RequestedBy({ prefix, name, profileImage }: Props) {
                 <p className="text-sm font-medium text-gray-800">Requested by</p>
                 <div className="flex items-center space-x-2">
                     <p className="text-xs font-medium text-gray-800">{prefix} {name}</p>
-                    <Image
+                    <img
                         src={profileImage ? profileImage : "/defaultAvatar.png"}
                         alt={name}
                         width={24}
                         height={24}
-                        className="w-6 h-6 rounded-full"
+                        className="w-6 h-6 rounded-full border-[1px] border-gray-400 border-opacity-50"
                     />
                 </div>
             </div>

src/components/ApprovalWorkflows/UserWithProfilePic.tsx

@@ -12,12 +12,12 @@ export default function UserWithProfilePic({ prefix, name, profileImage, textSiz
     return (
         <div className="flex items-center space-x-2">
             <p className={textClassName}>{prefix} {name}</p>
-            <Image
+            <img
                 src={profileImage ? profileImage : "/defaultAvatar.png"}
                 alt={name}
                 width={24}
                 height={24}
-                className="rounded-full h-auto"
+                className="rounded-full h-auto border-[1px] border-gray-400 border-opacity-50"
             />
         </div>
     );

src/components/ApprovalWorkflows/WorkflowEditableStepComponent.tsx

@@ -1,6 +1,6 @@
 import { EditableWorkflowStep } from "@/interfaces/approval.workflow";
 import Option from "@/interfaces/option";
-import { CorporateUser, TeacherUser } from "@/interfaces/user";
+import { CorporateUser, DeveloperUser, MasterCorporateUser, TeacherUser } from "@/interfaces/user";
 import Image from "next/image";
 import { useEffect, useMemo, useState } from "react";
 import { AiOutlineUserAdd } from "react-icons/ai";
@@ -10,8 +10,7 @@ import WorkflowStepNumber from "./WorkflowStepNumber";
 import WorkflowStepSelects from "./WorkflowStepSelects";
 
 interface Props extends Pick<EditableWorkflowStep, 'stepNumber' | 'assignees' | 'finalStep' | 'onDelete'> {
-    entityTeachers: TeacherUser[];
-    entityCorporates: CorporateUser[];
+    entityApprovers: (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[];
     onSelectChange: (numberOfSelects: number, index: number, value: Option | null) => void;
 }
 
@@ -21,41 +20,27 @@ export default function WorkflowEditableStepComponent({
     finalStep,
     onDelete,
     onSelectChange,
-    entityTeachers,
-    entityCorporates,
+    entityApprovers,
 }: Props) {
 
     const [selects, setSelects] = useState<(Option | null | undefined)[]>([null]);
     const [isAdding, setIsAdding] = useState(false);
 
-    const teacherOptions: Option[] = useMemo(() => 
-        entityTeachers
-            .map((teacher) => ({
-                value: teacher.id,
-                label: teacher.name,
-                icon: () => <Image src={teacher.profilePicture} alt={teacher.name} />
+    const approverOptions: Option[] = useMemo(() => 
+        entityApprovers
+            .map((approver) => ({
+                value: approver.id,
+                label: approver.name,
+                icon: () => <img src={approver.profilePicture} alt={approver.name} />
             }))
             .sort((a, b) => a.label.localeCompare(b.label)),
-        [entityTeachers]
+        [entityApprovers]
     );
 
-    const corporateOptions: Option[] = useMemo(() => 
-        entityCorporates
-            .map((corporate) => ({
-                value: corporate.id,
-                label: corporate.name,
-                icon: () => <Image src={corporate.profilePicture} alt={corporate.name} />
-            }))
-            .sort((a, b) => a.label.localeCompare(b.label)),
-        [entityCorporates]
-    );
-
-    const allOptions = useMemo(() => [...teacherOptions, ...corporateOptions], [teacherOptions, corporateOptions]);
-
     useEffect(() => {
         if (assignees && assignees.length > 0) {
             const initialSelects = assignees.map((assignee) =>
-                typeof assignee === 'string' ? allOptions.find(opt => opt.value === assignee) || null : null
+                typeof assignee === 'string' ? approverOptions.find(option => option.value === assignee) || null : null
             );
     
             setSelects((prevSelects) => {
@@ -68,21 +53,16 @@ export default function WorkflowEditableStepComponent({
                 return prevSelects;
             });
         } 
-    }, [assignees, allOptions]);
+    }, [assignees, approverOptions]);
 
     const selectedValues = useMemo(() => 
         selects.filter((opt): opt is Option => !!opt).map(opt => opt.value),
         [selects]
     );
 
-    const availableTeacherOptions = useMemo(() => 
-        teacherOptions.filter(opt => !selectedValues.includes(opt.value)),
-        [teacherOptions, selectedValues]
-    );
-
-    const availableCorporateOptions = useMemo(() => 
-        corporateOptions.filter(opt => !selectedValues.includes(opt.value)),
-        [corporateOptions, selectedValues]
+    const availableApproverOptions = useMemo(() => 
+        approverOptions.filter(opt => !selectedValues.includes(opt.value)),
+        [approverOptions, selectedValues]
     );
 
     const handleAddSelectComponent = () => {
@@ -122,8 +102,7 @@ export default function WorkflowEditableStepComponent({
 
             <div className="ml-10 mb-12">
                 <WorkflowStepSelects
-                    teachers={availableTeacherOptions}
-                    corporates={availableCorporateOptions}
+                    approvers={availableApproverOptions}
                     selects={selects}
                     placeholder={stepNumber === 1 ? "Form Intake By:" : "Approval By:"}
                     onSelectChange={handleSelectChangeAt}

src/components/ApprovalWorkflows/WorkflowForm.tsx

@@ -1,7 +1,7 @@
 import { EditableApprovalWorkflow, EditableWorkflowStep } from "@/interfaces/approval.workflow";
 import Option from "@/interfaces/option";
-import { CorporateUser, TeacherUser } from "@/interfaces/user";
-import { AnimatePresence, Reorder, motion } from "framer-motion";
+import { CorporateUser, DeveloperUser, MasterCorporateUser, TeacherUser } from "@/interfaces/user";
+import { AnimatePresence, Reorder } from "framer-motion";
 import { useState } from "react";
 import { FaRegCheckCircle, FaSpinner } from "react-icons/fa";
 import { IoIosAddCircleOutline } from "react-icons/io";
@@ -12,13 +12,12 @@ import WorkflowEditableStepComponent from "./WorkflowEditableStepComponent";
 interface Props {
     workflow: EditableApprovalWorkflow;
     onWorkflowChange: (workflow: EditableApprovalWorkflow) => void;
-    entityTeachers: TeacherUser[];
-    entityCorporates: CorporateUser[];
+    entityApprovers: (TeacherUser | CorporateUser | MasterCorporateUser | DeveloperUser)[];
     isLoading: boolean;
     isRedirecting: boolean;
 }
 
-export default function WorkflowForm({ workflow, onWorkflowChange, entityTeachers, entityCorporates, isLoading, isRedirecting }: Props) {
+export default function WorkflowForm({ workflow, onWorkflowChange, entityApprovers, isLoading, isRedirecting }: Props) {
     const [stepCounter, setStepCounter] = useState<number>(3); // to guarantee unique keys used for animations
     const lastStep = workflow.steps[workflow.steps.length - 1];
 
@@ -138,8 +137,7 @@ export default function WorkflowForm({ workflow, onWorkflowChange, entityTeacher
                                         finalStep={step.finalStep}
                                         onDelete={() => handleDelete(step.key)}
                                         onSelectChange={(numberOfSelects, idx, option) => handleSelectChange(step.key, numberOfSelects, idx, option)}
-                                        entityTeachers={entityTeachers}
-                                        entityCorporates={entityCorporates}
+                                        entityApprovers={entityApprovers}
                                     />
 
                                     {step.finalStep &&

src/components/ApprovalWorkflows/WorkflowStepSelects.tsx

@@ -2,16 +2,14 @@ import Option from "@/interfaces/option";
 import Select from "../Low/Select";
 
 interface Props {
-    teachers: Option[];
-    corporates: Option[];
+    approvers: Option[];
     selects: (Option | null | undefined)[];
     placeholder: string;
     onSelectChange: (numberOfSelects: number, index: number, value: Option | null) => void;
 }
 
 export default function WorkflowStepSelects({
-    teachers,
-    corporates,
+    approvers,
     selects,
     placeholder,
     onSelectChange,
@@ -34,7 +32,7 @@ export default function WorkflowStepSelects({
                 return (
                     <div key={index} className="w-[275px]">
                         <Select
-                            options={[...teachers, ...corporates]}
+                            options={approvers}
                             value={option}
                             onChange={(option) => onSelectChange(selects.length, index, option)}
                             placeholder={placeholder}