From 8b87353bf87f9c741271c3c1e01f0feb0d06f691 Mon Sep 17 00:00:00 2001 From: sanmont3drepo Date: Tue, 16 Jan 2024 17:01:53 -0300 Subject: [PATCH] ISSUE #4642 - reseting the viewpoint once the ticket is deselected --- frontend/src/v5/helpers/viewpoint.helpers.ts | 8 -------- frontend/src/v5/store/tickets/card/ticketsCard.sagas.ts | 8 +++++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/frontend/src/v5/helpers/viewpoint.helpers.ts b/frontend/src/v5/helpers/viewpoint.helpers.ts index c21deade289..866b0dff186 100644 --- a/frontend/src/v5/helpers/viewpoint.helpers.ts +++ b/frontend/src/v5/helpers/viewpoint.helpers.ts @@ -149,18 +149,10 @@ export const viewpointV5ToV4 = (viewpoint: Viewpoint) => { v4Viewpoint.clippingPlanes = viewpoint.clippingPlanes; } - // if (!isEmpty(viewpoint.state?.colored)) { - // v4Viewpoint.override_groups = viewpoint.state.colored.map(convertToV4Group); - // } - if (!isEmpty(viewpoint.state?.transformed)) { v4Viewpoint.transformation_groups = viewpoint.state.transformed.map(convertToV4Group); } - // if (!isEmpty(viewpoint.state?.hidden)) { - // v4Viewpoint.hidden_group = mergeGroups(viewpoint.state.hidden.map(convertToV4Group)); - // } - return { viewpoint: v4Viewpoint }; }; diff --git a/frontend/src/v5/store/tickets/card/ticketsCard.sagas.ts b/frontend/src/v5/store/tickets/card/ticketsCard.sagas.ts index 2112a04e425..281d9df9499 100644 --- a/frontend/src/v5/store/tickets/card/ticketsCard.sagas.ts +++ b/frontend/src/v5/store/tickets/card/ticketsCard.sagas.ts @@ -15,11 +15,12 @@ * along with this program. If not, see . */ -import { put, takeLatest } from 'redux-saga/effects'; +import { put, takeEvery, takeLatest } from 'redux-saga/effects'; import { VIEWER_PANELS } from '@/v4/constants/viewerGui'; import { TicketsCardViews } from '@/v5/ui/routes/viewer/tickets/tickets.constants'; import { ViewerGuiActions } from '@/v4/modules/viewerGui/viewerGui.redux'; import { OpenTicketAction, TicketsCardActions, TicketsCardTypes } from './ticketsCard.redux'; +import { ViewpointsActions } from '@/v4/modules/viewpoints'; export function* openTicket({ ticketId }: OpenTicketAction) { yield put(TicketsCardActions.setSelectedTicket(ticketId)); @@ -27,6 +28,11 @@ export function* openTicket({ ticketId }: OpenTicketAction) { yield put(ViewerGuiActions.setPanelVisibility(VIEWER_PANELS.TICKETS, true)); } +function * resetState() { + yield put(ViewpointsActions.setActiveViewpoint(null)); +} + export default function* ticketsCardSaga() { yield takeLatest(TicketsCardTypes.OPEN_TICKET, openTicket); + yield takeEvery(TicketsCardTypes.RESET_STATE, resetState); }