fix(jobs): get service type

Qovery · Nov 30, 2022 · 8574d8a · 8574d8a
1 parent 9d65c94
commit 8574d8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/libs/pages/services/src/lib/feature/page-deployments-feature/page-deployments-feature.tsx b/libs/pages/services/src/lib/feature/page-deployments-feature/page-deployments-feature.tsx
@@ -1,3 +1,4 @@
+import { JobScheduleEvent } from 'qovery-typescript-axios'
 import { useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useParams } from 'react-router-dom'
@@ -66,7 +67,8 @@ export function PageDeploymentsFeature() {
         const j: DeploymentService = {
           ...job,
           execution_id: deployment.id,
-          type: ServiceTypeEnum.CRON_JOB,
+          type:
+            job.schedule?.event === JobScheduleEvent.CRON ? ServiceTypeEnum.CRON_JOB : ServiceTypeEnum.LIFECYCLE_JOB,
         }
         merged.push(j)
       })

diff --git a/libs/shared/enums/src/lib/utils/get-service-type.ts b/libs/shared/enums/src/lib/utils/get-service-type.ts
@@ -1,3 +1,4 @@
+import { JobScheduleEvent } from 'qovery-typescript-axios'
 import {
   ApplicationEntity,
   ContainerApplicationEntity,
@@ -16,9 +17,9 @@ export const getServiceType = (data: ApplicationEntity | DatabaseEntity) => {
     currentType = ServiceTypeEnum.CONTAINER
   } else if (!(data as GitApplicationEntity).build_mode && !(data as ContainerApplicationEntity).image_name && !isJob) {
     currentType = ServiceTypeEnum.DATABASE
-  } else if (isJob && !(data as JobApplicationEntity).schedule) {
+  } else if (isJob && (data as JobApplicationEntity).schedule?.event !== JobScheduleEvent.CRON) {
     currentType = ServiceTypeEnum.CRON_JOB
-  } else if (isJob && (data as JobApplicationEntity).schedule) {
+  } else if (isJob && (data as JobApplicationEntity).schedule?.event === JobScheduleEvent.CRON) {
     currentType = ServiceTypeEnum.LIFECYCLE_JOB
   } else {
     currentType = ServiceTypeEnum.APPLICATION