@openmrs/esm-form-engine-lib 2.1.0-pre.1523 → 2.1.0-pre.1526
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/openmrs-esm-form-engine-lib.js +1 -1
- package/package.json +1 -1
- package/src/components/renderer/form/form-renderer.component.tsx +2 -2
- package/src/components/renderer/page/page.renderer.component.tsx +66 -19
- package/src/components/renderer/page/page.renderer.scss +18 -1
- package/src/form-engine.component.tsx +5 -0
- package/src/processors/encounter/encounter-form-processor.ts +9 -7
- package/src/provider/form-factory-provider.tsx +7 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
var _openmrs_esm_form_engine_lib;(()=>{"use strict";var e,r,t,n,o,i,a,l,s,u,f,p,d,c,h,m,v,g,b={8008:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(901),t.e(420),t.e(72),t.e(385),t.e(
|
|
1
|
+
var _openmrs_esm_form_engine_lib;(()=>{"use strict";var e,r,t,n,o,i,a,l,s,u,f,p,d,c,h,m,v,g,b={8008:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(901),t.e(420),t.e(72),t.e(385),t.e(343)]).then((()=>()=>t(3343)))},o=(e,r)=>(t.R=r,r=t.o(n,e)?n[e]():Promise.resolve().then((()=>{throw new Error('Module "'+e+'" does not exist in container.')})),t.R=void 0,r),i=(e,r)=>{if(t.S){var n="default",o=t.S[n];if(o&&o!==e)throw new Error("Container initialization failed as it has already been initialized with a different share scope");return t.S[n]=e,t.I(n,r)}};t.d(r,{get:()=>o,init:()=>i})}},y={};function w(e){var r=y[e];if(void 0!==r)return r.exports;var t=y[e]={id:e,loaded:!1,exports:{}};return b[e].call(t.exports,t,t.exports,w),t.loaded=!0,t.exports}w.m=b,w.c=y,w.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return w.d(r,{a:r}),r},r=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,w.t=function(t,n){if(1&n&&(t=this(t)),8&n)return t;if("object"==typeof t&&t){if(4&n&&t.__esModule)return t;if(16&n&&"function"==typeof t.then)return t}var o=Object.create(null);w.r(o);var i={};e=e||[null,r({}),r([]),r(r)];for(var a=2&n&&t;"object"==typeof a&&!~e.indexOf(a);a=r(a))Object.getOwnPropertyNames(a).forEach((e=>i[e]=()=>t[e]));return i.default=()=>t,w.d(o,i),o},w.d=(e,r)=>{for(var t in r)w.o(r,t)&&!w.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},w.f={},w.e=e=>Promise.all(Object.keys(w.f).reduce(((r,t)=>(w.f[t](e,r),r)),[])),w.u=e=>e+".js",w.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),w.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t={},n="@openmrs/esm-form-engine-lib:",w.l=(e,r,o,i)=>{if(t[e])t[e].push(r);else{var a,l;if(void 0!==o)for(var s=document.getElementsByTagName("script"),u=0;u<s.length;u++){var f=s[u];if(f.getAttribute("src")==e||f.getAttribute("data-webpack")==n+o){a=f;break}}a||(l=!0,(a=document.createElement("script")).charset="utf-8",a.timeout=120,w.nc&&a.setAttribute("nonce",w.nc),a.setAttribute("data-webpack",n+o),a.src=e),t[e]=[r];var p=(r,n)=>{a.onerror=a.onload=null,clearTimeout(d);var o=t[e];if(delete t[e],a.parentNode&&a.parentNode.removeChild(a),o&&o.forEach((e=>e(n))),r)return r(n)},d=setTimeout(p.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=p.bind(null,a.onerror),a.onload=p.bind(null,a.onload),l&&document.head.appendChild(a)}},w.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},w.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{w.S={};var e={},r={};w.I=(t,n)=>{n||(n=[]);var o=r[t];if(o||(o=r[t]={}),!(n.indexOf(o)>=0)){if(n.push(o),e[t])return e[t];w.o(w.S,t)||(w.S[t]={});var i=w.S[t],a="@openmrs/esm-form-engine-lib",l=(e,r,t,n)=>{var o=i[e]=i[e]||{},l=o[r];(!l||!l.loaded&&(!n!=!l.eager?n:a>l.from))&&(o[r]={get:t,from:a,eager:!!n})},s=[];return"default"===t&&(l("@openmrs/esm-framework","5.8.2-pre.2394",(()=>Promise.all([w.e(151),w.e(72),w.e(766)]).then((()=>()=>w(5151))))),l("@openmrs/esm-patient-common-lib","8.1.1-pre.5183",(()=>Promise.all([w.e(617),w.e(901),w.e(72),w.e(465),w.e(385),w.e(70)]).then((()=>()=>w(8617))))),l("dayjs","1.11.11",(()=>w.e(353).then((()=>()=>w(4353))))),l("i18next","23.11.4",(()=>w.e(635).then((()=>()=>w(2635))))),l("react-i18next","11.18.6",(()=>Promise.all([w.e(422),w.e(72)]).then((()=>()=>w(4422))))),l("react","18.3.1",(()=>w.e(540).then((()=>()=>w(6540))))),l("swr/_internal","2.2.5",(()=>Promise.all([w.e(993),w.e(72)]).then((()=>()=>w(4993))))),l("swr/immutable","2.2.5",(()=>Promise.all([w.e(225),w.e(72),w.e(465)]).then((()=>()=>w(4225))))),l("swr/infinite","2.2.5",(()=>Promise.all([w.e(41),w.e(72),w.e(465)]).then((()=>()=>w(3041)))))),e[t]=s.length?Promise.all(s).then((()=>e[t]=1)):1}}})(),(()=>{var e;w.g.importScripts&&(e=w.g.location+"");var r=w.g.document;if(!e&&r&&(r.currentScript&&(e=r.currentScript.src),!e)){var t=r.getElementsByTagName("script");if(t.length)for(var n=t.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=t[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),w.p=e})(),o=e=>{var r=e=>e.split(".").map((e=>+e==e?+e:e)),t=/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(e),n=t[1]?r(t[1]):[];return t[2]&&(n.length++,n.push.apply(n,r(t[2]))),t[3]&&(n.push([]),n.push.apply(n,r(t[3]))),n},i=(e,r)=>{e=o(e),r=o(r);for(var t=0;;){if(t>=e.length)return t<r.length&&"u"!=(typeof r[t])[0];var n=e[t],i=(typeof n)[0];if(t>=r.length)return"u"==i;var a=r[t],l=(typeof a)[0];if(i!=l)return"o"==i&&"n"==l||"s"==l||"u"==i;if("o"!=i&&"u"!=i&&n!=a)return n<a;t++}},a=e=>{var r=e[0],t="";if(1===e.length)return"*";if(r+.5){t+=0==r?">=":-1==r?"<":1==r?"^":2==r?"~":r>0?"=":"!=";for(var n=1,o=1;o<e.length;o++)n--,t+="u"==(typeof(l=e[o]))[0]?"-":(n>0?".":"")+(n=2,l);return t}var i=[];for(o=1;o<e.length;o++){var l=e[o];i.push(0===l?"not("+s()+")":1===l?"("+s()+" || "+s()+")":2===l?i.pop()+" "+i.pop():a(l))}return s();function s(){return i.pop().replace(/^\((.+)\)$/,"$1")}},l=(e,r)=>{if(0 in e){r=o(r);var t=e[0],n=t<0;n&&(t=-t-1);for(var i=0,a=1,s=!0;;a++,i++){var u,f,p=a<e.length?(typeof e[a])[0]:"";if(i>=r.length||"o"==(f=(typeof(u=r[i]))[0]))return!s||("u"==p?a>t&&!n:""==p!=n);if("u"==f){if(!s||"u"!=p)return!1}else if(s)if(p==f)if(a<=t){if(u!=e[a])return!1}else{if(n?u>e[a]:u<e[a])return!1;u!=e[a]&&(s=!1)}else if("s"!=p&&"n"!=p){if(n||a<=t)return!1;s=!1,a--}else{if(a<=t||f<p!=n)return!1;s=!1}else"s"!=p&&"n"!=p&&(s=!1,a--)}}var d=[],c=d.pop.bind(d);for(i=1;i<e.length;i++){var h=e[i];d.push(1==h?c()|c():2==h?c()&c():h?l(h,r):!c())}return!!c()},s=(e,r)=>{var t=e[r];return Object.keys(t).reduce(((e,r)=>!e||!t[e].loaded&&i(e,r)?r:e),0)},u=(e,r,t,n)=>"Unsatisfied version "+t+" from "+(t&&e[r][t].from)+" of shared singleton module "+r+" (required "+a(n)+")",f=(e,r,t,n)=>{var o=s(e,t);return l(n,o)||p(u(e,t,o,n)),d(e[t][o])},p=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},d=e=>(e.loaded=1,e.get()),c=(e=>function(r,t,n,o){var i=w.I(r);return i&&i.then?i.then(e.bind(e,r,w.S[r],t,n,o)):e(0,w.S[r],t,n,o)})(((e,r,t,n,o)=>r&&w.o(r,t)?f(r,0,t,n):o())),h={},m={6072:()=>c("default","react",[1,18],(()=>w.e(540).then((()=>()=>w(6540))))),6766:()=>c("default","i18next",[1,23],(()=>w.e(635).then((()=>()=>w(2635))))),8465:()=>c("default","swr/_internal",[1,2],(()=>w.e(993).then((()=>()=>w(4993))))),3941:()=>c("default","react-i18next",[1,11],(()=>w.e(422).then((()=>()=>w(4422))))),5972:()=>c("default","@openmrs/esm-framework",[1,5],(()=>Promise.all([w.e(151),w.e(766)]).then((()=>()=>w(5151))))),6656:()=>c("default","@openmrs/esm-patient-common-lib",[1,8],(()=>Promise.all([w.e(617),w.e(465)]).then((()=>()=>w(8617))))),4209:()=>c("default","swr/immutable",[1,2],(()=>Promise.all([w.e(225),w.e(465)]).then((()=>()=>w(4225))))),231:()=>c("default","dayjs",[1,1],(()=>w.e(353).then((()=>()=>w(4353))))),6339:()=>c("default","swr/infinite",[1,2],(()=>Promise.all([w.e(41),w.e(465)]).then((()=>()=>w(3041)))))},v={70:[4209],72:[6072],343:[231,4209,6339],385:[3941,5972,6656],465:[8465],766:[6766]},g={},w.f.consumes=(e,r)=>{w.o(v,e)&&v[e].forEach((e=>{if(w.o(h,e))return r.push(h[e]);if(!g[e]){var t=r=>{h[e]=0,w.m[e]=t=>{delete w.c[e],t.exports=r()}};g[e]=!0;var n=r=>{delete h[e],w.m[e]=t=>{throw delete w.c[e],r}};try{var o=m[e]();o.then?r.push(h[e]=o.then(t).catch(n)):t(o)}catch(e){n(e)}}}))},(()=>{var e={719:0};w.f.j=(r,t)=>{var n=w.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(385|465|72|766)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var i=w.p+w.u(r),a=new Error;w.l(i,(t=>{if(w.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src;a.message="Loading chunk "+r+" failed.\n("+o+": "+i+")",a.name="ChunkLoadError",a.type=o,a.request=i,n[1](a)}}),"chunk-"+r,r)}};var r=(r,t)=>{var n,o,[i,a,l]=t,s=0;if(i.some((r=>0!==e[r]))){for(n in a)w.o(a,n)&&(w.m[n]=a[n]);l&&l(w)}for(r&&r(t);s<i.length;s++)o=i[s],w.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=globalThis.webpackChunk_openmrs_esm_form_engine_lib=globalThis.webpackChunk_openmrs_esm_form_engine_lib||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),w.nc=void 0;var _=w(8008);_openmrs_esm_form_engine_lib=_})();
|
package/package.json
CHANGED
|
@@ -24,7 +24,7 @@ export const FormRenderer = ({
|
|
|
24
24
|
setIsLoadingFormDependencies,
|
|
25
25
|
}: FormRendererProps) => {
|
|
26
26
|
const { evaluatedFields, evaluatedFormJson } = useEvaluateFormFieldExpressions(initialValues, processorContext);
|
|
27
|
-
const { registerForm, setIsFormDirty, workspaceLayout } = useFormFactory();
|
|
27
|
+
const { registerForm, setIsFormDirty, workspaceLayout, isFormExpanded } = useFormFactory();
|
|
28
28
|
const methods = useForm({
|
|
29
29
|
defaultValues: initialValues,
|
|
30
30
|
});
|
|
@@ -97,7 +97,7 @@ export const FormRenderer = ({
|
|
|
97
97
|
/>
|
|
98
98
|
);
|
|
99
99
|
}
|
|
100
|
-
return <PageRenderer key={page.label} page={page} />;
|
|
100
|
+
return <PageRenderer key={page.label} page={page} isFormExpanded={isFormExpanded} />;
|
|
101
101
|
})}
|
|
102
102
|
</FormProvider>
|
|
103
103
|
);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import React, { useMemo, useState } from 'react';
|
|
2
|
-
import { type FormPage } from '../../../types';
|
|
1
|
+
import React, { useEffect, useMemo, useState } from 'react';
|
|
2
|
+
import { type FormSection, type FormPage } from '../../../types';
|
|
3
3
|
import { isTrue } from '../../../utils/boolean-utils';
|
|
4
4
|
import { useTranslation } from 'react-i18next';
|
|
5
5
|
import { SectionRenderer } from '../section/section-renderer.component';
|
|
@@ -8,24 +8,41 @@ import styles from './page.renderer.scss';
|
|
|
8
8
|
import { Accordion, AccordionItem } from '@carbon/react';
|
|
9
9
|
import { useFormFactory } from '../../../provider/form-factory-provider';
|
|
10
10
|
import { ChevronDownIcon, ChevronUpIcon } from '@openmrs/esm-framework';
|
|
11
|
+
import classNames from 'classnames';
|
|
11
12
|
|
|
12
13
|
interface PageRendererProps {
|
|
13
14
|
page: FormPage;
|
|
15
|
+
isFormExpanded: boolean;
|
|
14
16
|
}
|
|
15
17
|
|
|
16
|
-
|
|
18
|
+
interface CollapsibleSectionContainerProps {
|
|
19
|
+
section: FormSection;
|
|
20
|
+
sectionIndex: number;
|
|
21
|
+
visibleSections: FormSection[];
|
|
22
|
+
isFormExpanded: boolean;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function PageRenderer({ page, isFormExpanded }: PageRendererProps) {
|
|
17
26
|
const { t } = useTranslation();
|
|
18
27
|
const pageId = useMemo(() => page.label.replace(/\s/g, ''), [page.label]);
|
|
19
28
|
const [isCollapsed, setIsCollapsed] = useState(false);
|
|
20
29
|
|
|
21
30
|
const { setCurrentPage } = useFormFactory();
|
|
22
|
-
const visibleSections =
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
31
|
+
const visibleSections = useMemo(
|
|
32
|
+
() =>
|
|
33
|
+
page.sections.filter((section) => {
|
|
34
|
+
const hasVisibleQuestions = section.questions.some((question) => !isTrue(question.isHidden));
|
|
35
|
+
return !isTrue(section.isHidden) && hasVisibleQuestions;
|
|
36
|
+
}),
|
|
37
|
+
[page.sections],
|
|
38
|
+
);
|
|
26
39
|
|
|
27
40
|
const toggleCollapse = () => setIsCollapsed(!isCollapsed);
|
|
28
41
|
|
|
42
|
+
useEffect(() => {
|
|
43
|
+
setIsCollapsed(!isFormExpanded);
|
|
44
|
+
}, [isFormExpanded]);
|
|
45
|
+
|
|
29
46
|
return (
|
|
30
47
|
<div>
|
|
31
48
|
<Waypoint onEnter={() => setCurrentPage(pageId)} topOffset="50%" bottomOffset="60%">
|
|
@@ -42,25 +59,55 @@ function PageRenderer({ page }: PageRendererProps) {
|
|
|
42
59
|
</span>
|
|
43
60
|
</p>
|
|
44
61
|
</div>
|
|
45
|
-
|
|
62
|
+
<div
|
|
63
|
+
className={classNames({
|
|
64
|
+
[styles.hiddenAccordion]: isCollapsed,
|
|
65
|
+
[styles.accordionContainer]: !isCollapsed,
|
|
66
|
+
})}>
|
|
46
67
|
<Accordion>
|
|
47
|
-
{visibleSections.map((section) => (
|
|
48
|
-
<
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
</div>
|
|
56
|
-
</AccordionItem>
|
|
68
|
+
{visibleSections.map((section, index) => (
|
|
69
|
+
<CollapsibleSectionContainer
|
|
70
|
+
key={`section-${section.label}`}
|
|
71
|
+
section={section}
|
|
72
|
+
sectionIndex={index}
|
|
73
|
+
visibleSections={visibleSections}
|
|
74
|
+
isFormExpanded={isFormExpanded}
|
|
75
|
+
/>
|
|
57
76
|
))}
|
|
58
77
|
</Accordion>
|
|
59
|
-
|
|
78
|
+
</div>
|
|
60
79
|
</div>
|
|
61
80
|
</Waypoint>
|
|
62
81
|
</div>
|
|
63
82
|
);
|
|
64
83
|
}
|
|
65
84
|
|
|
85
|
+
function CollapsibleSectionContainer({
|
|
86
|
+
section,
|
|
87
|
+
sectionIndex,
|
|
88
|
+
visibleSections,
|
|
89
|
+
isFormExpanded,
|
|
90
|
+
}: CollapsibleSectionContainerProps) {
|
|
91
|
+
const { t } = useTranslation();
|
|
92
|
+
const [isSectionOpen, setIsSectionOpen] = useState(isFormExpanded);
|
|
93
|
+
|
|
94
|
+
useEffect(() => {
|
|
95
|
+
setIsSectionOpen(isFormExpanded);
|
|
96
|
+
}, [isFormExpanded]);
|
|
97
|
+
|
|
98
|
+
return (
|
|
99
|
+
<AccordionItem
|
|
100
|
+
title={t(section.label)}
|
|
101
|
+
open={isSectionOpen}
|
|
102
|
+
className={classNames(styles.sectionContainer, {
|
|
103
|
+
[styles.firstSection]: sectionIndex === 0,
|
|
104
|
+
[styles.lastSection]: sectionIndex === visibleSections.length - 1,
|
|
105
|
+
})}>
|
|
106
|
+
<div className={styles.formSection}>
|
|
107
|
+
<SectionRenderer section={section} />
|
|
108
|
+
</div>
|
|
109
|
+
</AccordionItem>
|
|
110
|
+
);
|
|
111
|
+
}
|
|
112
|
+
|
|
66
113
|
export default PageRenderer;
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
transition: background-color 0.1s;
|
|
11
11
|
border-radius: 1px;
|
|
12
12
|
padding: 0.5rem 1rem;
|
|
13
|
-
|
|
13
|
+
border-top: 1px solid colors.$gray-20;
|
|
14
|
+
border-bottom: 1px solid colors.$gray-20;
|
|
14
15
|
&:hover {
|
|
15
16
|
background-color: colors.$gray-20;
|
|
16
17
|
}
|
|
@@ -38,10 +39,26 @@
|
|
|
38
39
|
background-color: colors.$gray-10;
|
|
39
40
|
}
|
|
40
41
|
|
|
42
|
+
.accordionContainer {
|
|
43
|
+
width: 95%;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
.firstSection {
|
|
47
|
+
border-top: none;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
.lastSection {
|
|
51
|
+
border-bottom: none !important;
|
|
52
|
+
}
|
|
53
|
+
|
|
41
54
|
.formSection {
|
|
42
55
|
flex: 1 1 65%;
|
|
43
56
|
}
|
|
44
57
|
|
|
58
|
+
.hiddenAccordion {
|
|
59
|
+
display: none;
|
|
60
|
+
}
|
|
61
|
+
|
|
45
62
|
.formSection > div > fieldset {
|
|
46
63
|
margin-bottom: 0 !important;
|
|
47
64
|
}
|
|
@@ -16,6 +16,7 @@ import MarkdownWrapper from './components/inputs/markdown/markdown-wrapper.compo
|
|
|
16
16
|
import { init, teardown } from './lifecycle';
|
|
17
17
|
import { reportError } from './utils/error-utils';
|
|
18
18
|
import { moduleName } from './globals';
|
|
19
|
+
import { useFormCollapse } from './hooks/useFormCollapse';
|
|
19
20
|
|
|
20
21
|
interface FormEngineProps {
|
|
21
22
|
patientUUID: string;
|
|
@@ -62,6 +63,8 @@ const FormEngine = ({
|
|
|
62
63
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
|
63
64
|
const [isFormDirty, setIsFormDirty] = useState(false);
|
|
64
65
|
const sessionMode = !isEmpty(mode) ? mode : !isEmpty(encounterUUID) ? 'edit' : 'enter';
|
|
66
|
+
const { isFormExpanded, hideFormCollapseToggle } = useFormCollapse(sessionMode);
|
|
67
|
+
|
|
65
68
|
// TODO: Updating this prop triggers a rerender of the entire form. This means whenever we scroll into a new page, the form is rerendered.
|
|
66
69
|
// Figure out a way to avoid this. Maybe use a ref with an observer instead of a state?
|
|
67
70
|
const [currentPage, setCurrentPage] = useState('');
|
|
@@ -118,6 +121,7 @@ const FormEngine = ({
|
|
|
118
121
|
provider={session?.currentProvider}
|
|
119
122
|
visit={visit}
|
|
120
123
|
handleConfirmQuestionDeletion={handleConfirmQuestionDeletion}
|
|
124
|
+
isFormExpanded={isFormExpanded}
|
|
121
125
|
formSubmissionProps={{
|
|
122
126
|
isSubmitting,
|
|
123
127
|
setIsSubmitting,
|
|
@@ -125,6 +129,7 @@ const FormEngine = ({
|
|
|
125
129
|
onError: () => {},
|
|
126
130
|
handleClose: () => {},
|
|
127
131
|
}}
|
|
132
|
+
hideFormCollapseToggle={hideFormCollapseToggle}
|
|
128
133
|
setIsFormDirty={setIsFormDirty}
|
|
129
134
|
setCurrentPage={setCurrentPage}>
|
|
130
135
|
<div className={styles.formContainer}>
|
|
@@ -273,13 +273,15 @@ export class EncounterFormProcessor extends FormProcessor {
|
|
|
273
273
|
}
|
|
274
274
|
}),
|
|
275
275
|
);
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
276
|
+
await Promise.all(
|
|
277
|
+
fieldsWithCalculateExpressions.map(async (field) => {
|
|
278
|
+
try {
|
|
279
|
+
await evaluateCalculateExpression(field, initialValues, context);
|
|
280
|
+
} catch (error) {
|
|
281
|
+
console.error(error);
|
|
282
|
+
}
|
|
283
|
+
}),
|
|
284
|
+
);
|
|
283
285
|
}
|
|
284
286
|
return initialValues;
|
|
285
287
|
}
|
|
@@ -26,6 +26,7 @@ interface FormFactoryProviderContextProps {
|
|
|
26
26
|
visit: OpenmrsResource;
|
|
27
27
|
location: OpenmrsResource;
|
|
28
28
|
provider: OpenmrsResource;
|
|
29
|
+
isFormExpanded: boolean;
|
|
29
30
|
registerForm: (formId: string, isSubForm: boolean, context: FormContextProps) => void;
|
|
30
31
|
setCurrentPage: (page: string) => void;
|
|
31
32
|
handleConfirmQuestionDeletion?: (question: Readonly<FormField>) => Promise<void>;
|
|
@@ -41,6 +42,7 @@ interface FormFactoryProviderProps {
|
|
|
41
42
|
location: OpenmrsResource;
|
|
42
43
|
provider: OpenmrsResource;
|
|
43
44
|
visit: OpenmrsResource;
|
|
45
|
+
isFormExpanded: boolean;
|
|
44
46
|
children: React.ReactNode;
|
|
45
47
|
formSubmissionProps: {
|
|
46
48
|
isSubmitting: boolean;
|
|
@@ -49,6 +51,7 @@ interface FormFactoryProviderProps {
|
|
|
49
51
|
onError: (error: any) => void;
|
|
50
52
|
handleClose: () => void;
|
|
51
53
|
};
|
|
54
|
+
hideFormCollapseToggle: () => void;
|
|
52
55
|
setCurrentPage: (page: string) => void;
|
|
53
56
|
handleConfirmQuestionDeletion?: (question: Readonly<FormField>) => Promise<void>;
|
|
54
57
|
setIsFormDirty: (isFormDirty: boolean) => void;
|
|
@@ -65,8 +68,10 @@ export const FormFactoryProvider: React.FC<FormFactoryProviderProps> = ({
|
|
|
65
68
|
location,
|
|
66
69
|
provider,
|
|
67
70
|
visit,
|
|
71
|
+
isFormExpanded = true,
|
|
68
72
|
children,
|
|
69
73
|
formSubmissionProps,
|
|
74
|
+
hideFormCollapseToggle,
|
|
70
75
|
setCurrentPage,
|
|
71
76
|
handleConfirmQuestionDeletion,
|
|
72
77
|
setIsFormDirty,
|
|
@@ -121,6 +126,7 @@ export const FormFactoryProvider: React.FC<FormFactoryProviderProps> = ({
|
|
|
121
126
|
if (postSubmissionHandlers) {
|
|
122
127
|
await processPostSubmissionActions(postSubmissionHandlers, results, patient, sessionMode, t);
|
|
123
128
|
}
|
|
129
|
+
hideFormCollapseToggle();
|
|
124
130
|
if (onSubmit) {
|
|
125
131
|
onSubmit(results);
|
|
126
132
|
} else {
|
|
@@ -162,6 +168,7 @@ export const FormFactoryProvider: React.FC<FormFactoryProviderProps> = ({
|
|
|
162
168
|
visit,
|
|
163
169
|
location,
|
|
164
170
|
provider,
|
|
171
|
+
isFormExpanded,
|
|
165
172
|
registerForm,
|
|
166
173
|
setCurrentPage,
|
|
167
174
|
handleConfirmQuestionDeletion,
|