diff --git a/src/app/(routegroups)/(projectroutes)/projects/(projects-page)/page.tsx b/src/app/(routegroups)/(projectroutes)/projects/(projects-page)/page.tsx index 676db7e0..8f4f4417 100644 --- a/src/app/(routegroups)/(projectroutes)/projects/(projects-page)/page.tsx +++ b/src/app/(routegroups)/(projectroutes)/projects/(projects-page)/page.tsx @@ -3,6 +3,7 @@ import { Metadata } from 'next'; import ProjectsPage from '@/components/pages/projects/ProjectsPage'; import { getClient } from '@/lib/apolloClient'; import allProjectsQuery from '@/lib/query/allProjectsQuery'; +import { Deployment } from '../[projectSlug]/[environmentSlug]/deployments/[deploymentSlug]/page'; export const dynamic = 'force-dynamic'; @@ -23,6 +24,7 @@ export type ProjectType = { name: string; route: string; updated: string; + deployments?: Deployment[]; kubernetes: { id: number; name: string; diff --git a/src/components/pages/environments/ProjectEnvironmentsPage.tsx b/src/components/pages/environments/ProjectEnvironmentsPage.tsx index 7837db6f..a9635f01 100644 --- a/src/components/pages/environments/ProjectEnvironmentsPage.tsx +++ b/src/components/pages/environments/ProjectEnvironmentsPage.tsx @@ -93,7 +93,7 @@ export default function ProjectEnvironmentsPage({ deployType: environment.deployType, activeRoutes: {createLinks(routesToUse)}, envType: envType as any, - last_deployment: environment.updated ?? '', + last_deployment: environment.deployments?.[0]?.created ?? '', region: environment.openshift?.cloudRegion ?? '', project: environment.project, }; diff --git a/src/components/pages/projects/DataTableColumns.tsx b/src/components/pages/projects/DataTableColumns.tsx index 4875ef26..11431c04 100644 --- a/src/components/pages/projects/DataTableColumns.tsx +++ b/src/components/pages/projects/DataTableColumns.tsx @@ -14,7 +14,7 @@ dayjs.extend(relativeTime); const getLatestDate = (environments: ProjectType['environments']) => { return environments - .map(env => env.updated) + .map(env => env.deployments?.[0]?.created) .filter(date => date != null) .sort() .pop(); diff --git a/src/lib/query/allProjectsQuery.ts b/src/lib/query/allProjectsQuery.ts index ddd234c3..e54b5a5b 100644 --- a/src/lib/query/allProjectsQuery.ts +++ b/src/lib/query/allProjectsQuery.ts @@ -13,7 +13,9 @@ export default gql` environments(type: PRODUCTION) { name route - updated + deployments(limit: 1) { + created + } kubernetes { id name diff --git a/src/lib/query/projectEnvironmentsQuery.ts b/src/lib/query/projectEnvironmentsQuery.ts index e158bb51..567305be 100644 --- a/src/lib/query/projectEnvironmentsQuery.ts +++ b/src/lib/query/projectEnvironmentsQuery.ts @@ -15,7 +15,9 @@ export default gql` deployType environmentType routes - updated + deployments(limit: 1) { + created + } openshiftProjectName project { problemsUi