From d336d8548de39d1c9368453a277777932e901f96 Mon Sep 17 00:00:00 2001 From: Alessandro Amantini Date: Wed, 2 Oct 2024 15:03:04 +0100 Subject: [PATCH] ISSUE #5173 - fix: going from vertical calibration to drawing calibration erases horizontal calibration data --- .../components/viewer/drawingViewer/viewer2D.component.tsx | 2 -- .../projects/calibration/calibrationHandler.component.tsx | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/v5/ui/components/viewer/drawingViewer/viewer2D.component.tsx b/frontend/src/v5/ui/components/viewer/drawingViewer/viewer2D.component.tsx index 9248506a97..b33e0617c4 100644 --- a/frontend/src/v5/ui/components/viewer/drawingViewer/viewer2D.component.tsx +++ b/frontend/src/v5/ui/components/viewer/drawingViewer/viewer2D.component.tsx @@ -134,8 +134,6 @@ export const Viewer2D = () => { useEffect(() => { if (hasCalibration) { DrawingsActionsDispatchers.fetchCalibration(teamspace, project, drawingId); - } else { - DrawingsActionsDispatchers.fetchDrawingSettings(teamspace, project, drawingId); } }, [hasCalibration, revisionId]); diff --git a/frontend/src/v5/ui/routes/dashboard/projects/calibration/calibrationHandler.component.tsx b/frontend/src/v5/ui/routes/dashboard/projects/calibration/calibrationHandler.component.tsx index 85b94f71fc..0e46d9c029 100644 --- a/frontend/src/v5/ui/routes/dashboard/projects/calibration/calibrationHandler.component.tsx +++ b/frontend/src/v5/ui/routes/dashboard/projects/calibration/calibrationHandler.component.tsx @@ -16,7 +16,7 @@ */ import { useContext, useEffect } from 'react'; -import { CompareActionsDispatchers, ContainersActionsDispatchers, FederationsActionsDispatchers } from '@/v5/services/actionsDispatchers'; +import { CompareActionsDispatchers, ContainersActionsDispatchers, DrawingsActionsDispatchers, FederationsActionsDispatchers } from '@/v5/services/actionsDispatchers'; import { useParams } from 'react-router-dom'; import { ContainersHooksSelectors, DrawingsHooksSelectors, FederationsHooksSelectors } from '@/v5/services/selectorsHooks'; import { UnityUtil } from '@/globals/unity-util'; @@ -28,6 +28,7 @@ import { CalibrationContext } from './calibrationContext'; import { VerticalSpatialBoundariesHandler } from './calibrationStep/verticalSpatialBoundariesHandler/verticalSpatialBoundariesHandler.component'; import { ViewerParams } from '../../../routes.constants'; import { viewerRoute } from '@/v5/services/routing/routing'; +import { isNull } from 'lodash'; export const CalibrationHandler = () => { const { teamspace, project, revision, containerOrFederation } = useParams(); @@ -62,6 +63,10 @@ export const CalibrationHandler = () => { setOrigin(viewerRoute(teamspace, project, containerOrFederation, revision, { drawingId }, false)); } + if (verticalRange.some(isNull)) { + DrawingsActionsDispatchers.fetchDrawingSettings(teamspace, project, drawingId); + } + return () => { UnityUtil.setCalibrationToolVector(null, null); UnityUtil.setCalibrationToolMode('None');