@@ -85,7 +85,7 @@ class Refero extends React.Component<StateProps & DispatchProps & ReferoProps, S
85
85
componentDidMount ( ) : void {
86
86
this . props . mount ( ) ;
87
87
// eslint-disable-next-line no-console
88
- console . log ( "******** Refero loaded OK v.3 **********" ) ;
88
+ console . log ( "******** Refero loaded OK v.4 **********" ) ;
89
89
// eslint-disable-next-line no-console
90
90
console . log ( "Refero: Is microweb? " + this . props . isMicroweb ) ;
91
91
// eslint-disable-next-line no-console
@@ -99,17 +99,30 @@ class Refero extends React.Component<StateProps & DispatchProps & ReferoProps, S
99
99
IE11HackToWorkAroundBug187484 ( ) ;
100
100
}
101
101
102
+ componentWillUnmount ( ) : void {
103
+ // eslint-disable-next-line no-console
104
+ console . log ( "Refero Component will unmount" ) ;
105
+ }
106
+
102
107
UNSAFE_componentWillReceiveProps ( nextProps : ReferoProps ) : void {
103
- if ( nextProps . questionnaire && nextProps . questionnaire !== this . props . questionnaire ) {
104
- this . props . updateSkjema (
105
- nextProps . questionnaire ,
106
- nextProps . questionnaireResponse ,
107
- nextProps . language ,
108
- nextProps . syncQuestionnaireResponse
109
- ) ;
110
- this . setState ( { scoringCalculator : this . getScoringCalculator ( nextProps . questionnaire ) } ) ;
108
+ // eslint-disable-next-line no-console
109
+ console . log ( "Refero: componentWillReceiveProps called" ) ;
110
+ if ( ( nextProps . questionnaire && nextProps . questionnaire !== this . props . questionnaire ) ||
111
+ ( nextProps . skjemanavn && nextProps . skjemanavn !== this . props . skjemanavn ) ) {
112
+ if ( nextProps . questionnaire ) {
113
+ // eslint-disable-next-line no-console
114
+ console . log ( "Properties changes, calling updateSkjema..." ) ;
115
+ this . props . updateSkjema (
116
+ nextProps . questionnaire ,
117
+ nextProps . questionnaireResponse ,
118
+ nextProps . language ,
119
+ nextProps . syncQuestionnaireResponse
120
+ ) ;
121
+ this . setState ( { scoringCalculator : this . getScoringCalculator ( nextProps . questionnaire ) } ) ;
122
+ }
111
123
}
112
124
}
125
+
113
126
onAnswerChange = ( newState : GlobalState , _path : Array < Path > , item : QuestionnaireItem , answer : QuestionnaireResponseItemAnswer ) : void => {
114
127
if ( this . props . onChange && newState . refero . form . FormDefinition . Content && newState . refero . form . FormData . Content ) {
115
128
const actionRequester = new ActionRequester ( newState . refero . form . FormDefinition . Content , newState . refero . form . FormData . Content ) ;
@@ -198,6 +211,9 @@ class Refero extends React.Component<StateProps & DispatchProps & ReferoProps, S
198
211
} ;
199
212
200
213
renderFormItems ( pdf ?: boolean ) : Array < JSX . Element > | undefined {
214
+
215
+ // eslint-disable-next-line no-console
216
+ console . log ( "Render form items called" ) ;
201
217
const { formDefinition, resources, formData, promptLoginMessage } = this . props ;
202
218
if ( ! formDefinition || ! formDefinition . Content || ! formDefinition . Content . item ) {
203
219
return undefined ;
@@ -377,15 +393,16 @@ class Refero extends React.Component<StateProps & DispatchProps & ReferoProps, S
377
393
onStepChange = { onStepChange }
378
394
/>
379
395
) : (
380
- < RenderForm
381
- isAuthorized = { authorized }
382
- isStepView = { false }
383
- referoProps = { referoProps }
384
- resources = { resources }
385
- formItemsToBeRendered = { this . renderFormItems ( ) }
386
- onSave = { this . onSave }
387
- onSubmit = { this . onSubmit }
388
- />
396
+ < > < RenderForm
397
+ isAuthorized = { authorized }
398
+ isStepView = { false }
399
+ referoProps = { referoProps }
400
+ resources = { resources }
401
+ formItemsToBeRendered = { this . renderFormItems ( ) }
402
+ onSave = { this . onSave }
403
+ onSubmit = { this . onSubmit } />
404
+
405
+ < div > { "Skjemanavn to render: " + this . props . skjemanavn } </ div > </ >
389
406
) }
390
407
</ >
391
408
) ;
0 commit comments