Skip to content

Commit 168d87d

Browse files
committed
More debug microweb
1 parent 991b89c commit 168d87d

File tree

3 files changed

+41
-19
lines changed

3 files changed

+41
-19
lines changed

CHANGES

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 15.2.0-beta8
2+
3+
---
4+
5+
16
## 15.2.0-beta7
27

38
---

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@helsenorge/refero",
3-
"version": "15.2.0-beta7",
3+
"version": "15.2.0-beta8",
44
"engines": {
55
"node": "^18.0.0",
66
"npm": ">=9.0.0"

src/components/index.tsx

+35-18
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class Refero extends React.Component<StateProps & DispatchProps & ReferoProps, S
8585
componentDidMount(): void {
8686
this.props.mount();
8787
// eslint-disable-next-line no-console
88-
console.log("******** Refero loaded OK v.3 **********");
88+
console.log("******** Refero loaded OK v.4 **********");
8989
// eslint-disable-next-line no-console
9090
console.log("Refero: Is microweb? " + this.props.isMicroweb);
9191
// eslint-disable-next-line no-console
@@ -99,17 +99,30 @@ class Refero extends React.Component<StateProps & DispatchProps & ReferoProps, S
9999
IE11HackToWorkAroundBug187484();
100100
}
101101

102+
componentWillUnmount(): void {
103+
// eslint-disable-next-line no-console
104+
console.log("Refero Component will unmount");
105+
}
106+
102107
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+
}
111123
}
112124
}
125+
113126
onAnswerChange = (newState: GlobalState, _path: Array<Path>, item: QuestionnaireItem, answer: QuestionnaireResponseItemAnswer): void => {
114127
if (this.props.onChange && newState.refero.form.FormDefinition.Content && newState.refero.form.FormData.Content) {
115128
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
198211
};
199212

200213
renderFormItems(pdf?: boolean): Array<JSX.Element> | undefined {
214+
215+
// eslint-disable-next-line no-console
216+
console.log("Render form items called");
201217
const { formDefinition, resources, formData, promptLoginMessage } = this.props;
202218
if (!formDefinition || !formDefinition.Content || !formDefinition.Content.item) {
203219
return undefined;
@@ -377,15 +393,16 @@ class Refero extends React.Component<StateProps & DispatchProps & ReferoProps, S
377393
onStepChange={onStepChange}
378394
/>
379395
) : (
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></>
389406
)}
390407
</>
391408
);

0 commit comments

Comments
 (0)