fix(skilavottord): Fix issue with numberplate count (#16120)

* TS-916 Fix issue with numberplate count * TS-916 Fix code after code rabbit review * TS-916 Fix code after code rabbit review --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Sep 24, 2024 · 4b8a6aa · 4b8a6aa
1 parent f92833b
commit 4b8a6aa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/apps/skilavottord/web/components/CarDetailsBox2/CarDetailsBox2.tsx b/apps/skilavottord/web/components/CarDetailsBox2/CarDetailsBox2.tsx
@@ -33,6 +33,7 @@ interface BoxProps {
   vinNumber?: string
   outInStatus: number
   useStatus: string
+  reloadFlag: boolean // To force reload of the component to make sure the data in the parent is correct
 }
 
 export const CarDetailsBox2: FC<React.PropsWithChildren<BoxProps>> = ({

diff --git a/apps/skilavottord/web/screens/DeregisterVehicle/Confirm/Confirm.tsx b/apps/skilavottord/web/screens/DeregisterVehicle/Confirm/Confirm.tsx
@@ -1,7 +1,7 @@
 import { useMutation, useQuery } from '@apollo/client'
 import gql from 'graphql-tag'
 import { useRouter } from 'next/router'
-import React, { FC, useContext, useEffect } from 'react'
+import React, { FC, useContext, useEffect, useState } from 'react'
 
 import {
   Box,
@@ -33,7 +33,7 @@ import {
   Role,
 } from '@island.is/skilavottord-web/graphql/schema'
 import { useI18n } from '@island.is/skilavottord-web/i18n'
-import { OutInUsage } from '@island.is/skilavottord-web/utils/consts'
+import { OutInUsage, UseStatus } from '@island.is/skilavottord-web/utils/consts'
 import { getYear } from '@island.is/skilavottord-web/utils/dateUtils'
 import { FormProvider, useForm } from 'react-hook-form'
 
@@ -100,6 +100,17 @@ const UpdateSkilavottordVehicleInfoMutation = gql`
 `
 
 const Confirm: FC<React.PropsWithChildren<unknown>> = () => {
+  const [reloadFlag, setReloadFlag] = useState(false)
+
+  // Update reloadFlag to trigger the child component to reload
+  const triggerReload = () => {
+    setReloadFlag(true)
+  }
+
+  useEffect(() => {
+    triggerReload()
+  }, [setReloadFlag])
+
   const methods = useForm({
     mode: 'onChange',
   })
@@ -184,19 +195,25 @@ const Confirm: FC<React.PropsWithChildren<unknown>> = () => {
 
   const handleConfirm = () => {
     let newMileage = mileageValue
+    let plateCount = plateCountValue
 
     if (mileageValue !== undefined) {
       newMileage = +mileageValue.trim().replace(/\./g, '')
     } else {
       newMileage = vehicle?.mileage
     }
 
+    // If vehicle is out of use and not using ticket, set plate count to 0
+    if (outInStatus === OutInUsage.OUT && useStatus !== UseStatus.OUT_TICKET) {
+      plateCount = 0
+    }
+
     // Update vehicle table with latests information
     setVehicleRequest({
       variables: {
         permno: vehicle?.vehicleId,
         mileage: newMileage,
-        plateCount: plateCountValue === 0 ? 0 : plateCountValue,
+        plateCount,
         plateLost: !!plateLost?.length,
       },
     }).then(() => {
@@ -274,6 +291,7 @@ const Confirm: FC<React.PropsWithChildren<unknown>> = () => {
                 mileage={vehicle.mileage || 0}
                 outInStatus={outInStatus}
                 useStatus={useStatus || ''}
+                reloadFlag={reloadFlag}
               />
             </FormProvider>
           </Stack>

diff --git a/apps/skilavottord/ws/src/app/modules/vehicle/vehicle.resolver.ts b/apps/skilavottord/ws/src/app/modules/vehicle/vehicle.resolver.ts
@@ -108,7 +108,7 @@ export class VehicleResolver {
     @CurrentUser() user: User,
     @Args('permno') permno: string,
     @Args('mileage') mileage: number,
-    @Args('plateCount') plateCount: number,
+    @Args('plateCount', { nullable: true }) plateCount: number,
     @Args('plateLost') plateLost: boolean,
   ) {
     return await this.vehicleService.updateVehicleInfo(

diff --git a/apps/skilavottord/ws/src/app/modules/vehicle/vehicle.service.ts b/apps/skilavottord/ws/src/app/modules/vehicle/vehicle.service.ts
@@ -69,7 +69,7 @@ export class VehicleService {
     const findVehicle = await this.findByVehicleId(permno)
     if (findVehicle) {
       findVehicle.mileage = mileage ?? 0
-      findVehicle.plateCount = plateCount ?? 0
+      findVehicle.plateCount = plateCount
       findVehicle.plateLost = plateLost
 
       await findVehicle.save()
@@ -85,7 +85,6 @@ export class VehicleService {
       throw new Error(errorMsg)
     }
   }
-
   async create(vehicle: VehicleModel): Promise<boolean> {
     try {
       // check if vehicle is already in db