Skip to content
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { createFileRoute } from '@tanstack/react-router'
import { useDeployEnvironment } from '@qovery/domains/environments/feature'
import { VariableList } from '@qovery/domains/variables/feature'
import { ENVIRONMENT_LOGS_URL, ENVIRONMENT_STAGES_URL } from '@qovery/shared/routes'
import { toast } from '@qovery/shared/ui'
import { useDocumentTitle } from '@qovery/shared/util-hooks'

Expand All @@ -16,8 +15,9 @@ function RouteComponent() {
useDocumentTitle('Built-in variables - Environment')

const { mutate: deployEnvironment } = useDeployEnvironment({
organizationId,
projectId,
logsLink: ENVIRONMENT_LOGS_URL(organizationId, projectId, environmentId) + ENVIRONMENT_STAGES_URL(),
environmentId,
})

const toasterCallback = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useFeatureFlagEnabled } from 'posthog-js/react'
import { useEffect } from 'react'
import { useDeployEnvironment } from '@qovery/domains/environments/feature'
import { ExternalSecretsTab, SecretManagerFeatureFlagEntryPoint } from '@qovery/domains/variables/feature'
import { ENVIRONMENT_LOGS_URL, ENVIRONMENT_STAGES_URL } from '@qovery/shared/routes'
import { toast } from '@qovery/shared/ui'
import { useDocumentTitle } from '@qovery/shared/util-hooks'

Expand All @@ -29,8 +28,9 @@ function RouteComponent() {
}, [organizationId, projectId, environmentId])

const { mutate: deployEnvironment } = useDeployEnvironment({
organizationId,
projectId,
logsLink: ENVIRONMENT_LOGS_URL(organizationId, projectId, environmentId) + ENVIRONMENT_STAGES_URL(),
environmentId,
})

const redeployEnvironmentAction = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { createFileRoute } from '@tanstack/react-router'
import { useDeployEnvironment } from '@qovery/domains/environments/feature'
import { VariableList, VariablesActionToolbar } from '@qovery/domains/variables/feature'
import { ENVIRONMENT_LOGS_URL, ENVIRONMENT_STAGES_URL } from '@qovery/shared/routes'
import { toast } from '@qovery/shared/ui'
import { useDocumentTitle } from '@qovery/shared/util-hooks'

Expand All @@ -16,8 +15,9 @@ function RouteComponent() {
useDocumentTitle('Custom variables - Environment')

const { mutate: deployEnvironment } = useDeployEnvironment({
organizationId,
projectId,
logsLink: ENVIRONMENT_LOGS_URL(organizationId, projectId, environmentId) + ENVIRONMENT_STAGES_URL(),
environmentId,
})

const toasterCallback = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const mockCancel = jest.fn()
const mockOpenModalConfirmation = jest.fn()

jest.mock('@qovery/domains/services/feature', () => ({
useDeployAllServices: () => ({ mutate: mockDeployAllServices }),
useRestartAllServices: () => ({ mutate: mockRestartAllServices }),
useStopAllServices: () => ({ mutate: mockStopAllServices }),
useUninstallAllServices: () => ({ mutate: mockUninstallAllServices }),
Expand All @@ -24,6 +23,7 @@ jest.mock('@qovery/domains/services/feature', () => ({
jest.mock('@qovery/domains/environments/feature', () => ({
...jest.requireActual('@qovery/domains/environments/feature'),
useCancelDeploymentEnvironment: () => ({ mutate: mockCancel }),
useDeployAllServices: () => ({ mutate: mockDeployAllServices }),
}))

jest.mock('@qovery/shared/ui', () => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { type DeploymentHistoryEnvironmentV2, type Environment, type StateEnum } from 'qovery-typescript-axios'
import { match } from 'ts-pattern'
import { useCancelDeploymentEnvironment } from '@qovery/domains/environments/feature'
import { useCancelDeploymentEnvironment, useDeployAllServices } from '@qovery/domains/environments/feature'
import {
useDeleteAllServices,
useDeployAllServices,
useRestartAllServices,
useStopAllServices,
useUninstallAllServices,
} from '@qovery/domains/services/feature'
import { ENVIRONMENT_LOGS_URL, ENVIRONMENT_STAGES_URL } from '@qovery/shared/routes'
import { Button, Icon, Tooltip, useModalConfirmation } from '@qovery/shared/ui'
import { isCancelBuildAvailable } from '@qovery/shared/util-js'

Expand All @@ -21,12 +19,10 @@ export interface DeploymentActionButtonProps {
export function DeploymentActionButton({ environment, deploymentHistory, state }: DeploymentActionButtonProps) {
const { openModalConfirmation } = useModalConfirmation()

const logsLink =
ENVIRONMENT_LOGS_URL(environment.organization.id, environment.project.id, environment.id) + ENVIRONMENT_STAGES_URL()

const { mutate: cancelDeploymentEnvironment } = useCancelDeploymentEnvironment({
organizationId: environment.organization.id,
projectId: environment.project.id,
logsLink,
environmentId: environment.id,
})
const { mutate: deployAllServices } = useDeployAllServices()
const { mutate: restartAllServices } = useRestartAllServices()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ export function EnvironmentPipeline() {
},
enabled:
Boolean(organizationId) && Boolean(environment?.cluster_id) && Boolean(projectId) && Boolean(environmentId),
shouldReconnect: true,
onMessage: messageHandler,
})

Expand Down
Loading
Loading