removed duplicates

Author: yur4uwe

src/components/active-students/ActiveStudentsBlock.tsx

@@ -81,16 +81,6 @@ const ActiveStudentsBlock = () => {
       </>
     )
 
-  // const activeStudents = data.items.map((cooperation) => (
-  //     <ActiveStudent
-  //         cooperationId={cooperation._id}
-  //         firstName={cooperation.user.firstName}
-  //         key={cooperation._id}
-  //         lastName={cooperation.user.lastName}
-  //         photo={cooperation.user.photo}
-  //         subjectName={cooperation.offer.subject.name}
-  //     />
-  // ))
   return (
     <>
       <Typography sx={styles.title}>{t('activeStudents.title')}</Typography>

src/containers/my-cooperations/cooperation-card/CooperationCard.tsx

@@ -34,7 +34,9 @@ const CooperationCard: FC<CooperationCardProps> = ({
   const { userRole } = useAppSelector((state) => state.appMain)
 
   const roleBasedStatus =
-    needAction === userRole ? StatusEnum.NeedAction : StatusEnum.RequestToClose
+    needAction.role === userRole
+      ? StatusEnum.NeedAction
+      : StatusEnum.RequestToClose
 
   const cooperationStatus =
     status === StatusEnum.RequestToClose ? roleBasedStatus : cooperation.status
@@ -48,7 +50,7 @@ const CooperationCard: FC<CooperationCardProps> = ({
           firstName={user.firstName}
           lastName={user.lastName}
           photo={user.photo}
-          role={user.role}
+          role={user.role[0]}
           sx={styles.userProfileInfo}
         />
         <Box sx={styles.priceWithStatus}>

src/containers/my-cooperations/cooperations-container/CooperationContainer.constants.tsx

@@ -25,7 +25,7 @@ export const columns: TableColumn<Cooperation>[] = [
           firstName={item.user.firstName}
           lastName={item.user.lastName}
           photo={item.user.photo}
-          role={item.user.role}
+          role={item.user.role[0]}
           sx={styles.profileInfo}
         />
       )
@@ -63,45 +63,7 @@ export const columns: TableColumn<Cooperation>[] = [
     label: 'cooperationsPage.tableHeaders.status',
     calculatedCellValue: ({ user, needAction, status }: Cooperation) => {
       const cooperationStatus =
-        user.role !== needAction && status === StatusEnum.Pending
-          ? StatusEnum.NeedAction
-          : status
-      return <StatusChip status={cooperationStatus} />
-    }
-  },
-  {
-    label: 'cooperationsPage.tableHeaders.title',
-    calculatedCellValue: (item: Cooperation) => (
-      <Typography sx={styles.title}>{item.title}</Typography>
-    )
-  },
-  {
-    label: 'cooperationsPage.tableHeaders.subject',
-    calculatedCellValue: (item: Cooperation) => (
-      <SubjectLevelChips
-        proficiencyLevel={item.proficiencyLevel}
-        subject={item.subject.name}
-        sx={styles.chips}
-      />
-    )
-  },
-  {
-    label: 'cooperationsPage.tableHeaders.price',
-    field: 'price',
-    calculatedCellValue: (item: Cooperation, { t }: AdditionalPropsInterface) =>
-      `${item.price} ${t('common.uah')}`
-  },
-  {
-    label: 'cooperationsPage.tableHeaders.updated',
-    field: 'updatedAt',
-    calculatedCellValue: (item: Cooperation) =>
-      getFormattedDate({ date: item.updatedAt })
-  },
-  {
-    label: 'cooperationsPage.tableHeaders.status',
-    calculatedCellValue: ({ user, needAction, status }: Cooperation) => {
-      const cooperationStatus =
-        user.role !== needAction && status === StatusEnum.Pending
+        user.role[0] !== needAction.role && status === StatusEnum.Pending
           ? StatusEnum.NeedAction
           : status
       return <StatusChip status={cooperationStatus} />

src/containers/my-cooperations/my-cooperations-details/MyCooperationsDetails.tsx

@@ -232,46 +232,9 @@ const MyCooperationsDetails = () => {
             </Typography>
             <Typography>{`${cooperationDetails.price} UAH/hour`}</Typography>
           </Box>
-          <CooperationCompletion
-            cooperationStatus={cooperationDetails.status}
-            onCloseCooperation={handleCloseCooperation}
-            userRole={userRole}
-          />
+          {cooperationCompletion}
         </Box>
-        <Typography sx={style.titles}>
-          {t('cooperationDetailsPage.tutoringSubject')}
-        </Typography>
-        <Box sx={style.subjectContainer}>
-          <Box sx={style.categoryContainer}>
-            <CategoryIcon sx={style.iconColor(categoryColor)} />
-            <Typography>{cooperationDetails.category.name}</Typography>
-          </Box>
-          <SubjectLevelChips
-            color={cooperationDetails.category.appearance.color}
-            proficiencyLevel={cooperationDetails.proficiencyLevel}
-            subject={cooperationDetails.subject.name}
-          />
-        </Box>
-        <Typography sx={style.titles}>
-          {t('cooperationDetailsPage.aboutCooperation')}
-        </Typography>
-        <ShowMoreCollapse
-          collapsedSize={28}
-          collapsedTextLength={100}
-          description={cooperationDetails.description}
-          sx={style.aboutCooperation}
-          withoutTitle
-        />
-        <Typography sx={style.titles}>
-          {t('cooperationDetailsPage.tutoringLanguages')}
-        </Typography>
-        <Box sx={style.languageContainer}>{languages}</Box>
-        <Typography sx={style.titles}>
-          {t('cooperationDetailsPage.pricing')}
-        </Typography>
-        <Typography>{`${cooperationDetails.price} UAH/hour`}</Typography>
       </Box>
-      {cooperationCompletion}
     </Box>
   )
 }

src/containers/offer-details/enroll-offer/EnrollOffer.tsx

@@ -65,19 +65,6 @@ const EnrollOffer: React.FC<EnrollOfferProps> = ({ offer, enrollOffer }) => {
     void enrollOffer()
   }
 
-  // const postOffer = () => {
-  //     return cooperationService.createCooperation({
-  //         ...data,
-  //         receiver: offer.author._id,
-  //         receiverRole: offer.authorRole,
-  //         offer: offer._id,
-  //         subject: offer.subject._id,
-  //         category: offer.category._id,
-  //         description: offer.description,
-  //         languages: offer.languages
-  //     })
-  // }
-
   const { isPending, mutate: createCooperation } = useMutation({
     mutationFn: cooperationService.createCooperation,
     queryKey: ['cooperations'],
@@ -108,7 +95,7 @@ const EnrollOffer: React.FC<EnrollOfferProps> = ({ offer, enrollOffer }) => {
     handleSubmit
   } = useForm<EnrollOfferForm>({
     initialValues: {
-      proficiencyLevel: offer.proficiencyLevel,
+      proficiencyLevel: offer.proficiencyLevel[0],
       price: offer.price,
       additionalInfo: '',
       title: offer.title
@@ -133,7 +120,7 @@ const EnrollOffer: React.FC<EnrollOfferProps> = ({ offer, enrollOffer }) => {
 
   const levelOptions = offer.proficiencyLevel.map((level) => ({
     title: level,
-    value: [level]
+    value: level
   }))
 
   const handleFieldChange =

src/types/cooperation/interfaces/cooperation.interface.ts

@@ -77,7 +77,7 @@ export interface CreateCooperationsParams extends EnrollOfferForm {
   receiverRole: UserRoleEnum
   subject: string
   category: string
-  proficiencyLevel: ProficiencyLevelEnum[]
+  proficiencyLevel: ProficiencyLevelEnum
   description: string
   languages: LanguagesEnum[]
 }

src/types/offer-details/interfaces/offerDetails.interfaces.ts

@@ -1,7 +1,7 @@
 import { Offer, ProficiencyLevelEnum } from '~/types'
 
 export interface EnrollOfferForm extends Pick<Offer, 'price'> {
-  proficiencyLevel: ProficiencyLevelEnum[]
+  proficiencyLevel: ProficiencyLevelEnum
   title: string
   additionalInfo?: string
 }

tests/unit/containers/my-cooperations/my-cooperations-details/MyCooperationsDetails.spec.jsx

@@ -4,7 +4,7 @@ import { URLs } from '~/constants/request'
 import MyCooperationsDetails from '~/containers/my-cooperations/my-cooperations-details/MyCooperationsDetails.tsx'
 
 import { screen, fireEvent } from '@testing-library/react'
-import { vi } from 'vitest'
+import { expect, vi } from 'vitest'
 
 const mockedCooperation = { ...getCooperationByIdMockResponse }
 mockedCooperation.languages = ['Ukrainian', 'English']
@@ -31,20 +31,21 @@ describe('MyCooperationsDetails component', () => {
   })
 
   it('should render title', async () => {
+    const imgUserUrl = import.meta.env.VITE_APP_IMG_USER_URL
+    console.log('Imported VITE_APP_IMG_USER_URL:', imgUserUrl)
+
     const title = await screen.findAllByText('cooperationDetailsPage.details')
 
     expect(title).toHaveLength(2)
     expect(...title).toBeInTheDocument()
   })
 
   it('should render languages', async () => {
-    const language1 = await screen.findAllByText('Ukrainian')
-    expect(language1).toHaveLength(2)
-    expect(...language1).toBeInTheDocument()
+    const language1 = await screen.findByText('Ukrainian')
+    expect(language1).toBeInTheDocument()
 
-    const language2 = await screen.findAllByText('English')
-    expect(language2).toHaveLength(2)
-    expect(...language2).toBeInTheDocument()
+    const language2 = await screen.findByText('English')
+    expect(language2).toBeInTheDocument()
   })
 
   it('should open chat after clicking on chat-button', async () => {