ISSUE #5156 - Remove v4 getstate/dispatch in favour of v5 getstate/dispatch

frontend/src/main.tsx

@@ -25,7 +25,7 @@ import '@/v4/services/fontAwesome';
 import 'simplebar/dist/simplebar.min.css';
 
 import 'simplebar';
-import { dispatch, history, sagaMiddleware, store } from '@/v4/modules/store';
+import { history, sagaMiddleware, store } from '@/v4/modules/store';
 import { Root as V5Root } from '@/v5/ui/routes';
 
 import { UnityUtil } from '@/globals/unity-util';
@@ -46,6 +46,7 @@ import { NotFound } from '@/v5/ui/routes/notFound';
 import { AuthenticatedRoute } from './v5/services/routing/authenticatedRoute.component';
 import { initializeGoogleTagManager } from './v5/services/googleTagManager';
 import { initializeHotjar } from './v5/services/hotjar';
+import { dispatch } from './v5/helpers/redux.helpers';
 
 window.UnityUtil = UnityUtil;
 

frontend/src/v4/helpers/measurements.ts

@@ -15,9 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { BimActions } from '../modules/bim';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { MEASURE_TYPE_NAME } from '../modules/measurements/measurements.constants';
-import { dispatch } from '../modules/store';
 import { ViewerGuiActions } from '../modules/viewerGui';
 
 export const generateName = (measurement, measurements) => {

frontend/src/v4/helpers/viewpoints.ts

@@ -17,8 +17,8 @@
 
 import { UnityUtil } from "@/globals/unity-util";
 import { isEqual } from "lodash";
+import { getState } from "@/v5/helpers/redux.helpers";
 import { hexToRgb } from "@/v5/helpers/colors.helper";
-import { getState } from "../modules/store";
 import { selectGetMeshesByIds, selectGetSharedIdsFromNodeIds, selectHiddenGeometryVisible, selectNodesBySharedIdsMap, selectTreeNodesList } from "../modules/tree";
 import { selectColorOverrides } from "../modules/viewerGui";
 import { Viewer } from "../services/viewer/viewer";

frontend/src/v4/modules/chat/chat.sagas.ts

@@ -19,8 +19,8 @@ import { invoke } from 'lodash';
 import { takeLatest } from 'redux-saga/effects';
 
 import { setSocketIdHeader } from '@/v4/services/api/default';
-import { dispatch } from '../store';
 
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { IS_DEVELOPMENT } from '../../constants/environment';
 import { clientConfigService } from '../../services/clientConfig';
 import { ChatActions, ChatTypes } from './chat.redux';

frontend/src/v4/modules/groups/groups.sagas.ts

@@ -19,6 +19,7 @@ import { cloneDeep } from 'lodash';
 import { call, all, put, select, take, takeLatest } from 'redux-saga/effects';
 
 import { takeEveryInOrder } from '@/v5/helpers/sagas.helpers';
+import { dispatch, getState } from '@/v5/helpers/redux.helpers';
 import { getRandomRgbColor, hexToGLColor } from '@/v5/helpers/colors.helper';
 import { CHAT_CHANNELS } from '../../constants/chat';
 import { GROUPS_TYPES } from '../../constants/groups';
@@ -31,7 +32,6 @@ import { ChatActions } from '../chat';
 import { selectCurrentUser } from '../currentUser';
 import { DialogActions } from '../dialog';
 import { SnackbarActions } from '../snackbar';
-import { dispatch, getState } from '../store';
 import { TreeActions, TreeTypes } from '../tree';
 import { ViewpointsActions } from '../viewpoints';
 import { selectNodesBySharedIds, showNodesBySharedIds } from '../tree/tree.sagas';
@@ -45,7 +45,6 @@ import {
 	selectGroups,
 	selectGroupsMap,
 	selectIsAllOverridden,
-	selectSelectedFilters,
 	selectShowDetails
 } from './groups.selectors';
 

frontend/src/v4/modules/issues/issues.sagas.ts

@@ -18,13 +18,14 @@
 import { push } from 'connected-react-router';
 import filesize from 'filesize';
 import { isEmpty, isEqual, map, omit} from 'lodash';
-import { all, put, select, takeEvery, takeLatest, take  } from 'redux-saga/effects';
+import { put, select, takeEvery, takeLatest, take  } from 'redux-saga/effects';
 
 import * as queryString from 'query-string';
 import { generatePath } from 'react-router';
 import { generateViewpoint } from '@/v4/helpers/viewpoints';
 import { waitForAddons } from '@/v5/store/teamspaces/teamspaces.sagas';
 import { selectIssuesEnabled } from '@/v5/store/teamspaces/teamspaces.selectors';
+import { dispatch, getState } from '@/v5/helpers/redux.helpers';
 import { CHAT_CHANNELS } from '../../constants/chat';
 import { DEFAULT_PROPERTIES, ISSUE_DEFAULT_HIDDEN_STATUSES, PRIORITIES, STATUSES } from '../../constants/issues';
 import { EXTENSION_RE } from '../../constants/resources';
@@ -51,7 +52,6 @@ import { selectCurrentModel, selectCurrentModelTeamspace } from '../model';
 import { selectQueryParams, selectUrlParams } from '../router/router.selectors';
 import { selectSelectedSequence, selectSelectedStartingDate, SequencesActions } from '../sequences';
 import { SnackbarActions } from '../snackbar';
-import { dispatch, getState } from '../store';
 import { selectTopicTypes } from '../teamspace';
 import { TreeActions } from '../tree';
 import { ViewpointsActions } from '../viewpoints';

frontend/src/v4/modules/measurements/measurements.sagas.ts

@@ -17,11 +17,11 @@
 
  import { all, put, select, takeLatest } from 'redux-saga/effects';
 
+import { dispatch } from '@/v5/helpers/redux.helpers';
  import { VIEWER_EVENTS } from '../../constants/viewer';
  import { disableConflictingMeasurementActions, generateName } from '../../helpers/measurements';
  import { Viewer } from '../../services/viewer/viewer';
  import { DialogActions } from '../dialog';
- import { dispatch } from '../store';
  import { MEASURE_TYPE_STATE_MAP } from './measurements.constants';
  import {
 	 selectAreaMeasurements,

frontend/src/v4/modules/model/model.sagas.ts

@@ -19,14 +19,14 @@ import { cloneDeep } from 'lodash';
 import { put, select, take, takeEvery, takeLatest } from 'redux-saga/effects';
 
 import { getAPIUrl } from '@/v4/services/api/default';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { CHAT_CHANNELS } from '../../constants/chat';
 import * as API from '../../services/api';
 import { clientConfigService } from '../../services/clientConfig';
 import { ChatActions } from '../chat';
 import { selectCurrentUser } from '../currentUser';
 import { DialogActions } from '../dialog';
 import { SnackbarActions } from '../snackbar';
-import { dispatch } from '../store';
 import { TeamspacesActions } from '../teamspaces';
 import { uploadFileStatuses } from './model.helpers';
 import { ModelActions, ModelTypes } from './model.redux';

frontend/src/v4/modules/notifications/notifications.sagas.ts

@@ -17,6 +17,7 @@
 
 import { put, select, takeLatest} from 'redux-saga/effects';
 
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { CHAT_CHANNELS } from '../../constants/chat';
 import {
 	DeleteAllNotificationsDialog
@@ -25,7 +26,6 @@ import * as API from '../../services/api';
 import { ChatActions } from '../chat';
 import { selectCurrentUser } from '../currentUser';
 import { DialogActions } from '../dialog';
-import { dispatch } from '../store';
 import { selectNotifications, NotificationsActions, NotificationsTypes } from './index';
 
 const getNotificationById = (notifications, id) => {

frontend/src/v4/modules/risks/risks.sagas.ts

@@ -25,6 +25,7 @@ import { generatePath } from 'react-router';
 import { generateViewpoint } from '@/v4/helpers/viewpoints';
 import { waitForAddons } from '@/v5/store/teamspaces/teamspaces.sagas';
 import { selectRisksEnabled } from '@/v5/store/teamspaces/teamspaces.selectors';
+import { dispatch, getState } from '@/v5/helpers/redux.helpers';
 import { CHAT_CHANNELS } from '../../constants/chat';
 import { RISK_DEFAULT_HIDDEN_LEVELS } from '../../constants/risks';
 import { ROUTES } from '../../constants/routes';
@@ -52,7 +53,6 @@ import { selectCurrentModel, selectCurrentModelTeamspace } from '../model';
 import { selectQueryParams, selectUrlParams } from '../router/router.selectors';
 import { selectSelectedSequence, selectSelectedStartingDate, SequencesActions } from '../sequences';
 import { SnackbarActions } from '../snackbar';
-import { dispatch, getState } from '../store';
 import { TreeActions } from '../tree';
 import { ViewpointsActions } from '../viewpoints';
 import { RisksActions, RisksTypes } from './risks.redux';

frontend/src/v4/modules/sequences/sequences.helper.ts

@@ -16,10 +16,10 @@
  */
 import { isEqual, partition } from 'lodash';
 import { formatMessage } from '@/v5/services/intl';
+import { getState } from '@/v5/helpers/redux.helpers';
 import { GLToHexColor } from '@/v5/helpers/colors.helper';
 import { STEP_SCALE } from '../../constants/sequences';
 import { Viewer } from '../../services/viewer/viewer';
-import { getState } from '../store';
 import { selectGetMeshesByIds, selectGetNodesIdsFromSharedIds } from '../tree';
 import { IStateDefinitions } from './sequences.redux';
 

frontend/src/v4/modules/store.ts

@@ -61,9 +61,4 @@ function configureStore() {
 
 export const store = configureStore();
 
-
-export const dispatch = store.dispatch;
-
-export const getState = store.getState;
-
 setStore(store);

frontend/src/v4/modules/teamspaces/teamspaces.sagas.ts

@@ -18,14 +18,14 @@
 import { normalize } from 'normalizr';
 import { all, put, select, takeLatest } from 'redux-saga/effects';
 
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { CHAT_CHANNELS } from '../../constants/chat';
 import * as API from '../../services/api';
 import { ChatActions } from '../chat';
 import { selectCurrentUser } from '../currentUser';
 import { DialogActions } from '../dialog';
 import { SnackbarActions } from '../snackbar';
 import { selectStarredModels, StarredActions } from '../starred';
-import { dispatch } from '../store';
 import { UserManagementActions } from '../userManagement';
 import { TeamspacesActions, TeamspacesTypes } from './teamspaces.redux';
 import { teamspacesSchema } from './teamspaces.schema';

frontend/src/v4/modules/tree/tree.sagas.ts

@@ -18,12 +18,12 @@ import { all, call, put, select, take, takeLatest, delay } from 'redux-saga/effe
 
 import { selectHasViewerAccess } from '@/v5/store/containers/containers.selectors';
 import _ from 'lodash';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { VIEWER_EVENTS } from '../../constants/viewer';
 import * as API from '../../services/api';
 import { Viewer } from '../../services/viewer/viewer';
 import { DialogActions } from '../dialog';
 import { GroupsActions } from '../groups';
-import { dispatch } from '../store';
 
 import { SELECTION_STATES, VISIBILITY_STATES } from '../../constants/tree';
 import { VIEWER_PANELS } from '../../constants/viewerGui';

frontend/src/v4/modules/userManagement/userManagement.sagas.ts

@@ -22,10 +22,10 @@ import { all, put, select, takeLatest } from 'redux-saga/effects';
 
 import { TeamspacesActions } from '@/v5/store/teamspaces/teamspaces.redux';
 import { selectCurrentQuotaSeats } from '@/v5/store/teamspaces/teamspaces.selectors';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { updatePermissionsOrTriggerModal } from '@components/shared/updatePermissionModal/updatePermissionModal.component';
 import { getProjectPermissionLabelFromType } from '@/v4/constants/project-permissions';
 import { getModelPermissionLabelFromType } from '@/v4/constants/model-permissions';
-import { TEAMSPACE_PERMISSIONS } from '@/v4/constants/teamspace-permissions';
 import {
 	FederationReminderDialog
 } from '../../routes/modelsPermissions/components/federationReminderDialog/federationReminderDialog.component';
@@ -34,7 +34,6 @@ import { selectCurrentUser } from '../currentUser';
 import { DialogActions } from '../dialog';
 import { JobsActions } from '../jobs';
 import { SnackbarActions } from '../snackbar';
-import { dispatch } from '../store';
 import {
 	selectCurrentTeamspace,
 	selectInvitations,

frontend/src/v4/modules/viewerGui/viewerGui.sagas.ts

@@ -22,6 +22,7 @@ import { all, put, select, take, takeLatest } from 'redux-saga/effects';
 
 import { TicketsCardActions } from '@/v5/store/tickets/card/ticketsCard.redux';
 import { TicketsActions } from '@/v5/store/tickets/tickets.redux';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { INITIAL_HELICOPTER_SPEED, VIEWER_GIZMO_MODES, VIEWER_EVENTS, VIEWER_CLIP_MODES } from '../../constants/viewer';
 import * as API from '../../services/api';
 import { MultiSelect } from '../../services/viewer/multiSelect';
@@ -41,7 +42,6 @@ import { selectRisksMap, RisksActions } from '../risks';
 import { selectUrlParams } from '../router/router.selectors';
 import { SequencesActions } from '../sequences';
 import { StarredActions } from '../starred';
-import { dispatch } from '../store';
 import { TreeActions } from '../tree';
 import { selectInitialView, selectViewpointsDomain, ViewpointsActions, ViewpointsTypes } from '../viewpoints';
 import { ViewerGuiActions, ViewerGuiTypes } from './viewerGui.redux';

frontend/src/v4/modules/viewpoints/viewpoints.sagas.ts

@@ -23,6 +23,7 @@ import { generatePath } from 'react-router-dom';
 import { prefixBaseDomain } from '@/v5/helpers/url.helper';
 import { getAPIUrl } from '@/v4/services/api/default';
 import { CHAT_CHANNELS } from '@/v4/constants/chat';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { VIEWER_CLIP_MODES } from '@/v4/constants/viewer';
 import { ROUTES } from '../../constants/routes';
 import { prepareGroup } from '../../helpers/groups';
@@ -35,7 +36,6 @@ import { ModelActions } from '../model';
 import { selectCurrentRevisionId } from '../model';
 import { SequencesActions } from '../sequences';
 import { SnackbarActions } from '../snackbar';
-import { dispatch } from '../store';
 import { TreeActions } from '../tree';
 import { waitForTreeToBeReady } from '../tree/tree.sagas';
 import { ViewerGuiActions } from '../viewerGui';

frontend/src/v4/routes/components/dialogContainer/components/dialog/dialog.component.tsx

@@ -25,9 +25,9 @@ import CloseIcon from '@assets/icons/outlined/close-outlined.svg';
 import { V4DialogsAdapter } from '@/v5/ui/v4Adapter/dialogs/v4DialogsAdapter.component';
 
 import { RouteComponentProps } from 'react-router';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { renderWhenTrue } from '../../../../../helpers/rendering';
 import { IDialogConfig } from '../../../../../modules/dialog/dialog.redux';
-import { dispatch } from '../../../../../modules/store';
 import { COLOR } from '../../../../../styles';
 import { SearchButton } from '../../../../viewerGui/components/panelBarActions/searchButton';
 import { DialogActions, DialogTitle, TopDialogActions } from './dialog.styles';

frontend/src/v4/routes/viewer3D/viewer3D.component.tsx

@@ -16,11 +16,11 @@
  */
 import { PureComponent, createRef, useContext } from 'react';
 import { difference, differenceBy, isEqual } from 'lodash';
-import { dispatch } from '@/v4/modules/store';
 import { DialogActions } from '@/v4/modules/dialog';
 import { Toolbar } from '@/v5/ui/routes/viewer/toolbar/toolbar.component';
 import { CalibrationToolbar } from '@/v5/ui/routes/dashboard/projects/calibration/calibrationToolbar/calibrationToolbar.component';
 import { LifoQueue } from '@/v5/helpers/functions.helpers';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { CalibrationContext } from '@/v5/ui/routes/dashboard/projects/calibration/calibrationContext';
 import { useViewerCalibrationSetup } from '@/v5/ui/routes/dashboard/projects/calibration/useViewerCalibrationSetup';
 import {queuableFunction} from '../../helpers/async';

frontend/src/v4/services/api/config-axios.ts

@@ -17,7 +17,7 @@
 
 import { ROUTES } from '@/v4/constants/routes';
 import { DialogActions } from '@/v4/modules/dialog';
-import { dispatch } from '@/v4/modules/store';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 import { AuthActionsDispatchers } from '@/v5/services/actionsDispatchers';
 import axios from 'axios';
 import { push } from 'connected-react-router';

frontend/src/v5/helpers/viewpoint.helpers.ts

@@ -17,10 +17,10 @@
 import { Viewpoint, Group, ViewpointGroupOverrideType, GroupOverride, ViewpointState, V4GroupObjects, OverridesDicts } from '@/v5/store/tickets/tickets.types';
 import { generateViewpoint as generateViewpointV4, getNodesIdsFromSharedIds, toSharedIds } from '@/v4/helpers/viewpoints';
 import { formatMessage } from '@/v5/services/intl';
-import { getState } from '@/v4/modules/store';
 import { isEmpty, isString } from 'lodash';
 import { selectCurrentTeamspace } from '../store/teamspaces/teamspaces.selectors';
 import { ViewpointsActionsDispatchers } from '../services/actionsDispatchers';
+import { getState } from './redux.helpers';
 import { getGroupHexColor, rgbToHex } from './colors.helper';
 
 export const convertToV5GroupNodes = (objects) => objects.map((object) => ({

frontend/src/v5/ui/components/shared/containerRevisionDetails/containerRevisionDetails.component.tsx

@@ -40,13 +40,13 @@ import {
 } from '../revisionDetails/revisionDetails.styles';
 import { getRevisionFileUrl } from '@/v5/services/api/containerRevisions';
 import { selectHasCollaboratorAccess } from '@/v5/store/containers/containers.selectors';
-import { getState } from '@/v4/modules/store';
 import { RevisionsListItemText } from '../revisionDetails/components/revisionsListItem/revisionsListItemText/revisionsListItemText.component';
 import { RevisionsListItemAuthor } from '../revisionDetails/components/revisionsListItem/revisionsListItemAuthor/revisionsListItemAuthor.component';
 import { RevisionsListItemTag } from '../revisionDetails/components/revisionsListItem/revisionsListItem.styles';
 import { viewerRoute } from '@/v5/services/routing/routing';
 import { downloadFile } from '@components/authenticatedResource/authenticatedResource.hooks';
 import { formatDateTime } from '@/v5/helpers/intl.helper';
+import { getState } from '@/v5/helpers/redux.helpers';
 
 interface IContainerRevisionDetails {
 	containerId: string;

frontend/src/v5/ui/components/shared/drawingRevisionDetails/drawingRevisionDetails.component.tsx

@@ -39,14 +39,14 @@ import {
 } from '../revisionDetails/revisionDetails.styles';
 import { getRevisionFileUrl } from '@/v5/services/api/drawingRevisions';
 import { selectHasCollaboratorAccess } from '@/v5/store/drawings/drawings.selectors';
-import { getState } from '@/v4/modules/store';
 import { RevisionsListItemText } from '../revisionDetails/components/revisionsListItem/revisionsListItemText/revisionsListItemText.component';
 import { RevisionsListItemAuthor } from '../revisionDetails/components/revisionsListItem/revisionsListItemAuthor/revisionsListItemAuthor.component';
 import { RevisionsListItemTag } from '../revisionDetails/components/revisionsListItem/revisionsListItem.styles';
 import { IDrawingRevision } from '@/v5/store/drawings/revisions/drawingRevisions.types';
 import { formatDateTime } from '@/v5/helpers/intl.helper';
 import { UploadStatus } from '@/v5/store/containers/containers.types';
 import { downloadFile } from '@components/authenticatedResource/authenticatedResource.hooks';
+import { getState } from '@/v5/helpers/redux.helpers';
 
 interface IDrawingRevisionDetails {
 	drawingId: string;

frontend/src/v5/ui/components/shared/userMenu/userMenu.component.tsx

@@ -28,7 +28,6 @@ import { ActionMenuSection, ActionMenuItem, ActionMenuItemLink } from '@controls
 import { selectSettings, ViewerActions } from '@/v4/modules/viewer';
 import { CurrentUserHooksSelectors } from '@/v5/services/selectorsHooks';
 import { useSelector } from 'react-redux';
-import { dispatch } from '@/v4/modules/store';
 import {
 	ActionMenu,
 	AvatarContainer,
@@ -41,6 +40,7 @@ import {
 } from './userMenu.styles';
 import { EditProfileModal } from './editProfileModal/editProfileModal.component';
 import { VisualSettingsModal } from './visualSettingsModal/visualSettingsModal.component';
+import { dispatch } from '@/v5/helpers/redux.helpers';
 
 type UserMenuProps = {
 	user: ICurrentUser;

frontend/src/v5/validation/containerAndFederationSchemes/validators.ts

@@ -18,9 +18,9 @@
 import * as Yup from 'yup';
 import { formatMessage } from '@/v5/services/intl';
 import { alphaNumericHyphens, stripIfBlankString } from '../shared/validators';
-import { getState } from '@/v4/modules/store';
 import { selectRevisions, selectRevisionsPending } from '@/v5/store/containers/revisions/containerRevisions.selectors';
 import { ContainerRevisionsActionsDispatchers } from '@/v5/services/actionsDispatchers';
+import { getState } from '@/v5/helpers/redux.helpers';
 
 export const nullableNumberField = Yup.number()
 	.transform((value) => (Number.isNaN(value) ? null : value))

frontend/src/v5/validation/drawingSchemes/drawingSchemes.ts

@@ -19,7 +19,7 @@ import { revisionDesc } from '../containerAndFederationSchemes/validators';
 import { desc, name, alphaNumericHyphens, uploadFile, trimmedString, requiredNumber } from '../shared/validators';
 import { formatMessage } from '@/v5/services/intl';
 import { selectRevisions } from '@/v5/store/drawings/revisions/drawingRevisions.selectors';
-import { getState } from '@/v4/modules/store';
+import { getState } from '@/v5/helpers/redux.helpers';
 
 const number = Yup.string()
 	.matches(alphaNumericHyphens,