Update Transition to latest main

Let the Survey and ValidateSurvey components load preferences from server when the component is mounted.
greenscientist · May 16, 2023 · 825692d · 825692d
1 parent 58e772e
commit 825692d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/packages/evolution-legacy/src/components/admin/ValidateSurvey.js b/packages/evolution-legacy/src/components/admin/ValidateSurvey.js
@@ -11,11 +11,11 @@ import moment              from 'moment-business-days';
 import _get                from 'lodash.get';
 
 import config                 from 'chaire-lib-common/lib/config/shared/project.config';
+import Preferences from 'chaire-lib-common/lib/config/Preferences';
 import * as surveyHelperNew   from 'evolution-common/lib/utils/helpers';
 import Section                from '../survey/Section';
 import SectionNav             from '../survey/SectionNav';
 import { withSurveyContext } from 'evolution-frontend/lib/components/hoc/WithSurveyContextHoc';
-import ConfirmModal           from '../survey/modal/ConfirmModal';
 import LoadingPage            from '../shared/LoadingPage';
 import { startSetSurveyValidateInterview, startUpdateSurveyValidateInterview, startResetSurveyValidateInterview, startSurveyValidateAddGroupedObjects, startSurveyValidateRemoveGroupedObjects } from '../../actions/survey/survey';
 import { InterviewContext } from 'evolution-frontend/lib/contexts/InterviewContext';
@@ -26,7 +26,8 @@ export class ValidateSurvey extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      confirmModalOpenedShortname: null
+      confirmModalOpenedShortname: null,
+      preferencesLoaded: false
     };
     // set language if empty and change locale:
     if (!props.i18n.language || config.languages.indexOf(props.i18n.language) <= -1)
@@ -61,6 +62,9 @@ export class ValidateSurvey extends React.Component {
   componentDidMount() {
     const interviewUuid = this.props.interviewUuid;
     this.props.startSetSurveyValidateInterview(interviewUuid);
+    Preferences.load().then(() => {
+        this.setState({ preferencesLoaded: true })
+    })
   }
 
   onKeyPress(e) {

diff --git a/packages/evolution-legacy/src/components/survey/Survey.js b/packages/evolution-legacy/src/components/survey/Survey.js
@@ -11,6 +11,7 @@ import moment              from 'moment-business-days';
 import _get                from 'lodash.get';
 
 import config                                                                                         from 'chaire-lib-common/lib/config/shared/project.config';
+import Preferences from 'chaire-lib-common/lib/config/Preferences';
 import * as surveyHelperNew from 'evolution-common/lib/utils/helpers';
 import Section                                                                                        from './Section';
 import SectionNav                                                                                     from './SectionNav';
@@ -28,7 +29,8 @@ export class Survey extends React.Component {
     super(props);
     surveyHelperNew.devLog('params_survey', props.location.search)
     this.state = {
-      confirmModalOpenedShortname: null
+      confirmModalOpenedShortname: null,
+      preferencesLoaded: false
     };
     // set language if empty and change locale:
     if (!props.i18n.language || config.languages.indexOf(props.i18n.language) <= -1)
@@ -67,6 +69,9 @@ export class Survey extends React.Component {
     const pathSectionParentSection = pathSectionShortname && this.surveyContext.sections[pathSectionShortname] ? this.surveyContext.sections[pathSectionShortname].parentSection : null;
     const { state } = this.context;
     this.props.startSetInterview(existingActiveSection || pathSectionParentSection, surveyUuid, state.status === 'entering' && Object.keys(state.responses).length > 0 ? state.responses : undefined);
+    Preferences.load().then(() => {
+        this.setState({ preferencesLoaded: true })
+    });
   }
 
   onKeyPress(e) {

diff --git a/transition b/transition
+10 −7		packages/chaire-lib-backend/src/api/__tests__/preferences.socketRoutes.test.ts
+18 −8		packages/chaire-lib-backend/src/api/auth.routes.ts
+5 −13		packages/chaire-lib-backend/src/api/preferences.socketRoutes.ts
+95 −24		packages/chaire-lib-common/src/config/Preferences.ts
+112 −6		packages/chaire-lib-common/src/config/__tests__/Preferences.test.ts
+12 −5		packages/chaire-lib-frontend/src/components/pageParts/Header.tsx
+6 −0		packages/chaire-lib-frontend/src/config/application.config.ts
+14 −6		packages/chaire-lib-frontend/src/services/map/events/GlobalMapEvents.ts
+7 −3		packages/transition-common/src/services/accessibilityMap/TransitAccessibilityMapRouting.ts
+7 −3		packages/transition-common/src/services/transitDemand/TransitDemandFromCsv.ts
+7 −3		packages/transition-common/src/services/transitRouting/TransitRouting.ts
+8 −4		packages/transition-frontend/src/services/map/PathMapLayerManager.ts