refactor: better handling of common request components having two types

NIAEFEUP · Nov 30, 2024 · 517aa9c · 517aa9c
1 parent 54cfdbd
commit 517aa9c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/components/exchange/requests/issue/cards/CreateRequestCard.tsx b/src/components/exchange/requests/issue/cards/CreateRequestCard.tsx
@@ -148,7 +148,7 @@ export const CreateRequestCard = ({
               <div className="flex flex-col gap-y-2">
                 <p className="text-left font-bold">Estudante</p>
                 <Button variant="outline" className="w-full">
-                  {selectedDestinationStudent ? selectedDestinationStudent.nome : "Escolher estudante..."}
+                  {selectedDestinationStudent ? selectedDestinationStudent.name : "Escolher estudante..."}
                 </Button>
               </div>
             </DropdownMenuTrigger>

diff --git a/src/components/exchange/requests/view/cards/CommonCardHeader.tsx b/src/components/exchange/requests/view/cards/CommonCardHeader.tsx
@@ -1,7 +1,7 @@
 import { ArchiveBoxIcon, CheckCircleIcon, CheckIcon, ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/outline"
 import { Hourglass } from "lucide-react"
 import { useState } from "react"
-import { MarketplaceRequest } from "../../../../../@types"
+import { DirectExchangeRequest, MarketplaceRequest } from "../../../../../@types"
 import { Button } from "../../../../ui/button"
 import { CardDescription, CardHeader, CardTitle } from "../../../../ui/card"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../../../../ui/tooltip"
@@ -11,7 +11,7 @@ type Props = {
     name: string
     username: string
     hovered: boolean
-    request: MarketplaceRequest
+    request: MarketplaceRequest | DirectExchangeRequest
     openHook: [boolean, React.Dispatch<React.SetStateAction<boolean>>]
     showRequestStatus?: boolean
     hideAbility?: boolean

diff --git a/src/components/exchange/requests/view/cards/ListRequestChanges.tsx b/src/components/exchange/requests/view/cards/ListRequestChanges.tsx
@@ -51,9 +51,9 @@ export const ListRequestChanges = ({
                             {option.course_info.acronym} - {option.course_info.name}
                         </p>
                         <div className="flex flex-row gap-x-2 items-center font-bold">
-                            <p>{type === "directexchange" ? option.class_participant_goes_from.name : option.class_issuer_goes_from.name}</p>
+                            <p>{type === "directexchange" ? (option as DirectExchangeParticipant).class_participant_goes_from.name : (option as ExchangeOption).class_issuer_goes_from.name}</p>
                             <ArrowRightIcon className="w-5 h-5" />
-                            <p>{type === "directexchange" ? option.class_participant_goes_to.name : option.class_issuer_goes_to.name}</p>
+                            <p>{type === "directexchange" ? (option as DirectExchangeParticipant).class_participant_goes_to.name : (option as ExchangeOption).class_issuer_goes_to.name}</p>
                         </div>
                     </div>
                 </label>

diff --git a/src/components/exchange/requests/view/cards/RequestCard.tsx b/src/components/exchange/requests/view/cards/RequestCard.tsx
@@ -8,6 +8,7 @@ import { ListRequestChanges } from "./ListRequestChanges";
 import ExchangeRequestCommonContext from "../../../../../contexts/ExchangeRequestCommonContext";
 import { CommonCardHeader } from "./CommonCardHeader";
 import ConflictsContext from "../../../../../contexts/ConflictsContext";
+import { ExchangeOption } from "../../../../../@types";
 
 export const RequestCard = ({ }) => {
   const {
@@ -48,8 +49,8 @@ export const RequestCard = ({ }) => {
           {
             courseUnitId: option.course_info.id,
             courseUnitName: option.course_info.name,
-            classNameRequesterGoesFrom: option.class_issuer_goes_from.name,
-            classNameRequesterGoesTo: option.class_issuer_goes_to.name,
+            classNameRequesterGoesFrom: (option as ExchangeOption).class_issuer_goes_from.name,
+            classNameRequesterGoesTo: (option as ExchangeOption).class_issuer_goes_to.name,
             other_student: {
               name: request.issuer_name,
               mecNumber: request.issuer_nmec