@openmrs/esm-form-engine-lib 2.1.0-pre.1422 → 2.1.0-pre.1433

package/__mocks__/forms/rfe-forms/conditional-required-form.json

@@ -52,8 +52,7 @@
                 "concept": "dc1942b2-5e50-4adc-949d-ad6c905f054e"
               },
               "validators": [],
-              "hide": {
-              }
+              "hide": {}
             },
             {
               "label": "If Unscheduled, actual text area scheduled date",
@@ -278,4 +277,4 @@
   "version": "1.0",
   "description": "des",
   "encounterType": "181820aa-88c9-479b-9077-af92f5364329"
-}
+}

package/__mocks__/forms/rfe-forms/labour_and_delivery_test_form.json

@@ -328,10 +328,7 @@
                   "readonly": "true",
                   "questionOptions": {
                     "concept": "164803AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "rendering": "text",
-                    "calculate": {
-                      "calculateExpression": "!isEmpty('MotherPtracker_id') ? myValue = customGenerateInfantPTrackerId(node.value.id, MotherPtracker_id) : ''"
-                    }
+                    "rendering": "text"
                   },
                   "behaviours": [
                     {

package/dist/openmrs-esm-form-engine-lib.js

@@ -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(733),t.e(72),t.e(346),t.e(572)]).then((()=>()=>t(8572)))},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.7.3-pre.2161",(()=>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(346),w.e(3)]).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))))),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))))),5972:()=>c("default","@openmrs/esm-framework",[1,5],(()=>Promise.all([w.e(151),w.e(766)]).then((()=>()=>w(5151))))),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={3:[4209,5972],72:[6072],346:[3941,6656],465:[8465],572:[231,4209,5972,6339],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(/^(346|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=_})();
+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(501),t.e(72),t.e(346),t.e(572)]).then((()=>()=>t(8572)))},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.7.3-pre.2161",(()=>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(346),w.e(3)]).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))))),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))))),5972:()=>c("default","@openmrs/esm-framework",[1,5],(()=>Promise.all([w.e(151),w.e(766)]).then((()=>()=>w(5151))))),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={3:[4209,5972],72:[6072],346:[3941,6656],465:[8465],572:[231,4209,5972,6339],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(/^(346|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/jest.config.js

@@ -20,7 +20,7 @@ module.exports = {
     '^dexie$': require.resolve('dexie'),
     '\\.(s?css)$': 'identity-obj-proxy',
     '@openmrs/esm-framework': '@openmrs/esm-framework/mock',
-    'react-i18next': '<rootDir>/__mocks__/react-i18next.js',
+    '^react-i18next$': '<rootDir>/__mocks__/react-i18next.js',
     'lodash-es': 'lodash',
     'react-markdown': '<rootDir>/__mocks__/react-markdown.tsx',
     '^uuid$': '<rootDir>/node_modules/uuid/dist/index.js',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "2.1.0-pre.1422",
+  "version": "2.1.0-pre.1433",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",

package/src/components/inputs/select/dropdown.component.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Dropdown as DropdownInput, Layer } from '@carbon/react';
 import { shouldUseInlineLayout } from '../../../utils/form-helper';

package/src/components/inputs/unspecified/unspecified.component.tsx

@@ -29,10 +29,10 @@ const UnspecifiedField: React.FC<UnspecifiedFieldProps> = ({ field, fieldValue,
   }, []);
 
   useEffect(() => {
-    if (field.meta.submission?.newValue) {
+    if (field.meta.submission?.unspecified && field.meta.submission.newValue) {
       setIsUnspecified(false);
       field.meta.submission.unspecified = false;
-      updateFormField({ ...field });
+      updateFormField(field);
     }
   }, [field.meta?.submission]);
 

package/src/components/processor-factory/form-processor-factory.component.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import useProcessorDependencies from '../../hooks/useProcessorDependencies';
 import useInitialValues from '../../hooks/useInitialValues';
 import { FormRenderer } from '../renderer/form/form-renderer.component';
-import { type FormSchema, type FormProcessorContextProps } from '../../types';
+import { type FormProcessorContextProps, type FormSchema } from '../../types';
 import { CustomHooksRenderer } from '../renderer/custom-hooks-renderer.component';
 import { useFormFields } from '../../hooks/useFormFields';
 import { useConcepts } from '../../hooks/useConcepts';
@@ -31,9 +31,6 @@ const FormProcessorFactory = ({
 
   const processor = useMemo(() => {
     const ProcessorClass = formProcessors[formJson.processor];
-    if (processor) {
-      return processor;
-    }
     if (ProcessorClass) {
       return new ProcessorClass(formJson);
     }
@@ -65,7 +62,6 @@ const FormProcessorFactory = ({
   const useCustomHooks = processor.getCustomHooks().useCustomHooks;
   const [isLoadingCustomHooks, setIsLoadingCustomHooks] = useState(!!useCustomHooks);
   const [isLoadingProcessorDependencies, setIsLoadingProcessorDependencies] = useState(true);
-
   const {
     isLoadingInitialValues,
     initialValues,

package/src/components/renderer/custom-hooks-renderer.component.tsx

@@ -9,11 +9,11 @@ export const CustomHooksRenderer = ({
 }: {
   context: FormProcessorContextProps;
   setContext: (context: FormProcessorContextProps) => void;
-  useCustomHooks: (context: FormProcessorContextProps) => {
+  useCustomHooks: (context: Partial<FormProcessorContextProps>) => {
     data: any;
     isLoading: boolean;
     error: any;
-    updateContext: (setContext: (context: FormProcessorContextProps) => void) => void;
+    updateContext: (setContext: React.Dispatch<React.SetStateAction<FormProcessorContextProps>>) => void;
   };
   setIsLoadingCustomHooks: (isLoading: boolean) => void;
 }) => {

package/src/components/renderer/field/form-field-renderer.component.tsx

@@ -1,17 +1,18 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import {
   type FormField,
-  type RenderType,
-  type ValidationResult,
+  type FormFieldInputProps,
   type FormFieldValidator,
+  type FormFieldValueAdapter,
+  type RenderType,
   type SessionMode,
+  type ValidationResult,
   type ValueAndDisplay,
 } from '../../../types';
 import { Controller, useWatch } from 'react-hook-form';
 import { ToastNotification } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { ErrorBoundary } from 'react-error-boundary';
-import { type FormFieldValueAdapter, type FormFieldInputProps } from '../../../types';
 import { hasRendering } from '../../../utils/common-utils';
 import { useFormProviderContext } from '../../../provider/form-provider';
 import { isEmpty } from '../../../validators/form-validator';
@@ -112,7 +113,7 @@ export const FormFieldRenderer = ({ fieldId, valueAdapter, repeatOptions }: Form
       value,
       formFieldValidators,
       {
-        fields: formFields,
+        formFields: formFields,
         values: getValues(),
         expressionContext: { patient, mode: sessionMode },
       },
@@ -217,7 +218,7 @@ function ErrorFallback({ error }) {
 }
 
 export interface ValidatorConfig {
-  fields: FormField[];
+  formFields: FormField[];
   values: Record<string, any>;
   expressionContext: {
     patient: fhir.Patient;

package/src/form-engine.component.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import type { FormField, SessionMode, FormSchema } from './types';
+import type { FormField, FormSchema, SessionMode } from './types';
 import { useSession, type Visit } from '@openmrs/esm-framework';
 import { useFormJson } from '.';
 import FormProcessorFactory from './components/processor-factory/form-processor-factory.component';
@@ -9,7 +9,7 @@ import { useWorkspaceLayout } from './hooks/useWorkspaceLayout';
 import { FormFactoryProvider } from './provider/form-factory-provider';
 import classNames from 'classnames';
 import styles from './form-engine.scss';
-import { ButtonSet, Button, InlineLoading } from '@carbon/react';
+import { Button, ButtonSet, InlineLoading } from '@carbon/react';
 import { I18nextProvider, useTranslation } from 'react-i18next';
 import PatientBanner from './components/patient-banner/patient-banner.component';
 import MarkdownWrapper from './components/inputs/markdown/markdown-wrapper.component';

package/src/form-engine.test.tsx

@@ -1,9 +1,15 @@
 import React from 'react';
 import dayjs from 'dayjs';
 import userEvent from '@testing-library/user-event';
-import { act, cleanup, render, screen, within, fireEvent, waitFor } from '@testing-library/react';
-import { restBaseUrl } from '@openmrs/esm-framework';
-import { parseDate } from '@internationalized/date';
+import { act, cleanup, render, screen, within } from '@testing-library/react';
+import {
+  ExtensionSlot,
+  OpenmrsDatePicker,
+  openmrsFetch,
+  restBaseUrl,
+  usePatient,
+  useSession,
+} from '@openmrs/esm-framework';
 import { when } from 'jest-when';
 import * as api from './api';
 import { assertFormHasAllFields, findMultiSelectInput, findSelectInput } from './utils/test-utils';
@@ -11,72 +17,63 @@ import { evaluatePostSubmissionExpression } from './utils/post-submission-action
 import { mockPatient } from '__mocks__/patient.mock';
 import { mockSessionDataResponse } from '__mocks__/session.mock';
 import { mockVisit } from '__mocks__/visit.mock';
-import ageValidationForm from '__mocks__/forms/rfe-forms/age-validation-form.json';
-import bmiForm from '__mocks__/forms/rfe-forms/bmi-test-form.json';
-import bsaForm from '__mocks__/forms/rfe-forms/bsa-test-form.json';
 import demoHtsForm from '__mocks__/forms/rfe-forms/demo_hts-form.json';
 import demoHtsOpenmrsForm from '__mocks__/forms/afe-forms/demo_hts-form.json';
-import eddForm from '__mocks__/forms/rfe-forms/edd-test-form.json';
-import externalDataSourceForm from '__mocks__/forms/rfe-forms/external_data_source_form.json';
 import filterAnswerOptionsTestForm from '__mocks__/forms/rfe-forms/filter-answer-options-test-form.json';
 import htsPocForm from '__mocks__/packages/hiv/forms/hts_poc/1.1.json';
 import labourAndDeliveryTestForm from '__mocks__/forms/rfe-forms/labour_and_delivery_test_form.json';
 import mockConceptsForm from '__mocks__/concepts.mock.json';
-import monthsOnArtForm from '__mocks__/forms/rfe-forms/months-on-art-form.json';
-import nextVisitForm from '__mocks__/forms/rfe-forms/next-visit-test-form.json';
 import obsGroupTestForm from '__mocks__/forms/rfe-forms/obs-group-test_form.json';
 import postSubmissionTestForm from '__mocks__/forms/rfe-forms/post-submission-test-form.json';
 import referenceByMappingForm from '__mocks__/forms/rfe-forms/reference-by-mapping-form.json';
 import sampleFieldsForm from '__mocks__/forms/rfe-forms/sample_fields.json';
 import testEnrolmentForm from '__mocks__/forms/rfe-forms/test-enrolment-form.json';
-import viralLoadStatusForm from '__mocks__/forms/rfe-forms/viral-load-status-form.json';
 import historicalExpressionsForm from '__mocks__/forms/rfe-forms/historical-expressions-form.json';
 import mockHxpEncounter from '__mocks__/forms/rfe-forms/mockHistoricalvisitsEncounter.json';
 import requiredTestForm from '__mocks__/forms/rfe-forms/required-form.json';
 import conditionalRequiredTestForm from '__mocks__/forms/rfe-forms/conditional-required-form.json';
 import conditionalAnsweredForm from '__mocks__/forms/rfe-forms/conditional-answered-form.json';
+import ageValidationForm from '__mocks__/forms/rfe-forms/age-validation-form.json';
+import bmiForm from '__mocks__/forms/rfe-forms/bmi-test-form.json';
+import bsaForm from '__mocks__/forms/rfe-forms/bsa-test-form.json';
+import eddForm from '__mocks__/forms/rfe-forms/edd-test-form.json';
+import externalDataSourceForm from '__mocks__/forms/rfe-forms/external_data_source_form.json';
+import monthsOnArtForm from '__mocks__/forms/rfe-forms/months-on-art-form.json';
+import nextVisitForm from '__mocks__/forms/rfe-forms/next-visit-test-form.json';
+import viralLoadStatusForm from '__mocks__/forms/rfe-forms/viral-load-status-form.json';
+
 import FormEngine from './form-engine.component';
 
 const patientUUID = '8673ee4f-e2ab-4077-ba55-4980f408773e';
 const visit = mockVisit;
-const mockOpenmrsFetch = jest.fn();
 const formsResourcePath = when((url: string) => url.includes(`${restBaseUrl}/form/`));
-const clobdataResourcePath = when((url: string) => url.includes(`${restBaseUrl}/clobdata/`));
+const clobDataResourcePath = when((url: string) => url.includes(`${restBaseUrl}/clobdata/`));
 global.ResizeObserver = require('resize-observer-polyfill');
 
+const mockOpenmrsFetch = jest.mocked(openmrsFetch);
+const mockExtensionSlot = jest.mocked(ExtensionSlot);
+const mockUsePatient = jest.mocked(usePatient);
+const mockUseSession = jest.mocked(useSession);
+const mockOpenmrsDatePicker = jest.mocked(OpenmrsDatePicker);
+
+mockOpenmrsDatePicker.mockImplementation(({ id, labelText, value, onChange, isInvalid, invalidText }) => {
+  return (
+    <>
+      <label htmlFor={id}>{labelText}</label>
+      <input
+        id={id}
+        value={value ? dayjs(value as unknown as string).format('DD/MM/YYYY') : ''}
+        onChange={(evt) => {
+          onChange(dayjs(evt.target.value).toDate());
+        }}
+      />
+      {isInvalid && <span>{invalidText}</span>}
+    </>
+  );
+});
+
 when(mockOpenmrsFetch).calledWith(formsResourcePath).mockReturnValue({ data: demoHtsOpenmrsForm });
-when(mockOpenmrsFetch).calledWith(clobdataResourcePath).mockReturnValue({ data: demoHtsForm });
-
-const locale = window.i18next.language == 'en' ? 'en-GB' : window.i18next.language;
-
-// jest.mock('@openmrs/esm-framework', () => {
-//   const originalModule = jest.requireActual('@openmrs/esm-framework');
-
-//   return {
-//     ...originalModule,
-//     createErrorHandler: jest.fn(),
-//     showNotification: jest.fn(),
-//     showToast: jest.fn(),
-//     getAsyncLifecycle: jest.fn(),
-//     usePatient: jest.fn().mockImplementation(() => ({ patient: mockPatient })),
-//     registerExtension: jest.fn(),
-//     useSession: jest.fn().mockImplementation(() => mockSessionDataResponse.data),
-//     openmrsFetch: jest.fn().mockImplementation((args) => mockOpenmrsFetch(args)),
-//     OpenmrsDatePicker: jest.fn().mockImplementation(({ id, labelText, value, onChange, isInvalid, invalidText }) => {
-//       return (
-//         <>
-//           <label htmlFor={id}>{labelText}</label>
-//           <input
-//             id={id}
-//             value={value ? dayjs(value).format('DD/MM/YYYY') : undefined}
-//             onChange={(evt) => onChange(parseDate(dayjs(evt.target.value).format('YYYY-MM-DD')))}
-//           />
-//           {isInvalid && invalidText && <span>{invalidText}</span>}
-//         </>
-//       );
-//     }),
-//   };
-// });
+when(mockOpenmrsFetch).calledWith(clobDataResourcePath).mockReturnValue({ data: demoHtsForm });
 
 jest.mock('../src/api', () => {
   const originalModule = jest.requireActual('../src/api');
@@ -92,10 +89,54 @@ jest.mock('../src/api', () => {
 });
 
 jest.mock('./hooks/useRestMaxResultsCount', () => jest.fn().mockReturnValue({ systemSetting: { value: '50' } }));
-
-xdescribe('Form engine component', () => {
+jest.mock('./hooks/useEncounterRole', () => ({
+  useEncounterRole: jest.fn().mockReturnValue({
+    isLoading: false,
+    encounterRole: { name: 'Clinician', uuid: 'clinician-uuid' },
+    error: undefined,
+  }),
+}));
+
+jest.mock('./hooks/useConcepts', () => ({
+  useConcepts: jest.fn().mockImplementation((references: Set<string>) => {
+    if ([...references].join(',').includes('PIH:Occurrence of trauma,PIH:Yes,PIH:No,PIH:COUGH')) {
+      return {
+        isLoading: false,
+        concepts: mockConceptsForm.results,
+        error: undefined,
+      };
+    }
+    return {
+      isLoading: false,
+      concepts: undefined,
+      error: undefined,
+    };
+  }),
+}));
+
+describe('Form engine component', () => {
   const user = userEvent.setup();
 
+  beforeEach(() => {
+    Object.defineProperty(window, 'i18next', {
+      writable: true,
+      configurable: true,
+      value: {
+        language: 'en',
+        t: jest.fn(),
+      },
+    });
+
+    mockExtensionSlot.mockImplementation((ext) => <>{ext.name}</>);
+    mockUsePatient.mockImplementation(() => ({
+      patient: mockPatient,
+      isLoading: false,
+      error: undefined,
+      patientUuid: mockPatient.id,
+    }));
+    mockUseSession.mockImplementation(() => mockSessionDataResponse.data);
+  });
+
   afterEach(() => {
     jest.useRealTimers();
   });
@@ -187,23 +228,24 @@ xdescribe('Form engine component', () => {
         name: /reason for hospitalization:/i,
       });
 
-      expect(hospitalizationHistoryDropdown);
-      expect(hospitalizationReasonDropdown);
+      expect(hospitalizationHistoryDropdown).toBeInTheDocument();
+      expect(hospitalizationReasonDropdown).toBeInTheDocument();
 
-      fireEvent.click(hospitalizationHistoryDropdown);
+      await user.click(hospitalizationHistoryDropdown);
 
       expect(screen.getByText(/yes/i)).toBeInTheDocument();
       expect(screen.getByText(/no/i)).toBeInTheDocument();
 
-      fireEvent.click(screen.getByText(/no/i));
+      await user.click(screen.getByRole('option', { name: /no/i }));
+      await user.click(screen.getByText(/No/i));
 
-      fireEvent.click(hospitalizationReasonDropdown);
+      await user.click(hospitalizationReasonDropdown);
 
       expect(screen.getByText(/Maternal Visit/i)).toBeInTheDocument();
       expect(screen.getByText(/Emergency Visit/i)).toBeInTheDocument();
       expect(screen.getByText(/Unscheduled visit late/i)).toBeInTheDocument();
 
-      fireEvent.click(screen.getByText(/Maternal Visit/i));
+      await user.click(screen.getByText(/Maternal Visit/i));
 
       const errorMessage = screen.getByText(
         /Providing diagnosis but didn't answer that patient was hospitalized in question/i,
@@ -211,8 +253,8 @@ xdescribe('Form engine component', () => {
 
       expect(errorMessage).toBeInTheDocument();
 
-      fireEvent.click(hospitalizationHistoryDropdown);
-      fireEvent.click(screen.getByText(/yes/i));
+      await user.click(hospitalizationHistoryDropdown);
+      await user.click(screen.getByText(/yes/i));
 
       expect(errorMessage).not.toBeInTheDocument();
     });
@@ -231,11 +273,8 @@ xdescribe('Form engine component', () => {
       expect(api.getPreviousEncounter).toHaveBeenCalled();
       expect(api.getPreviousEncounter).toHaveReturnedWith(Promise.resolve(mockHxpEncounter));
 
-      const reuseValueButton = screen.getByRole('button', { name: /reuse value/i });
-      const evaluatedHistoricalValue = screen.getByText(/Entry into a country/i);
-
-      expect(reuseValueButton).toBeInTheDocument;
-      expect(evaluatedHistoricalValue).toBeInTheDocument;
+      expect(screen.getByRole('button', { name: /reuse value/i })).toBeInTheDocument;
+      expect(screen.getByText(/Entry into a country/i));
     });
   });
 
@@ -306,10 +345,9 @@ xdescribe('Form engine component', () => {
       // const dateInputField = await screen.getByLabelText(/If Unscheduled, actual scheduled date/i);
       // expect(dateInputField).toHaveClass('cds--date-picker__input--invalid');
       const errorMessage = await screen.findByText(
-        'Patient visit marked as unscheduled. Please provide the scheduled date.',
+        /Patient visit marked as unscheduled. Please provide the scheduled date./i,
       );
       expect(errorMessage).toBeInTheDocument();
-
       // Validate text field
       const textInputField = screen.getByLabelText(/If Unscheduled, actual text scheduled date/i);
       expect(textInputField).toHaveClass('cds--text-input--invalid');
@@ -618,20 +656,30 @@ xdescribe('Form engine component', () => {
 
       const eddField = screen.getByRole('textbox', { name: /edd/i });
       const lmpField = screen.getByRole('textbox', { name: /lmp/i });
-
       await user.click(lmpField);
       await user.paste('2022-07-06T00:00:00.000Z');
       await user.tab();
 
-      expect(lmpField).toHaveValue(dayjs('2022-07-06').toDate().toLocaleDateString(locale));
-      expect(eddField).toHaveValue(dayjs('2023-04-12').toDate().toLocaleDateString(locale));
+      expect(lmpField).toHaveValue('06/07/2022');
+      expect(eddField).toHaveValue('12/04/2023');
     });
 
     it('should evaluate months on ART', async () => {
       await act(async () => renderForm(null, monthsOnArtForm));
 
-      jest.useFakeTimers();
-      jest.setSystemTime(new Date(2022, 9, 1));
+      jest
+        .useFakeTimers({
+          doNotFake: [
+            'nextTick',
+            'setImmediate',
+            'clearImmediate',
+            'setInterval',
+            'clearInterval',
+            'setTimeout',
+            'clearTimeout',
+          ],
+        })
+        .setSystemTime(new Date(2022, 9, 1));
 
       let artStartDateField = screen.getByRole('textbox', {
         name: /antiretroviral treatment start date/i,
@@ -643,12 +691,11 @@ xdescribe('Form engine component', () => {
       expect(artStartDateField).not.toHaveValue();
       expect(monthsOnArtField).not.toHaveValue();
 
-      fireEvent.change(artStartDateField, { target: { value: '02/05/2022' } });
-      fireEvent.blur(artStartDateField, { target: { value: '02/05/2022' } });
+      await user.click(artStartDateField);
+      await user.paste('2022-02-05');
+      await user.tab();
 
-      await waitFor(() => {
-        expect(monthsOnArtField).toHaveValue(7);
-      });
+      expect(monthsOnArtField).toHaveValue(7);
     });
 
     it('should evaluate viral load status', async () => {
@@ -664,13 +711,12 @@ xdescribe('Form engine component', () => {
         name: /unsuppressed/i,
       });
 
-      fireEvent.blur(viralLoadCountField, { target: { value: 30 } });
+      await user.type(viralLoadCountField, '30');
+      await user.tab();
 
-      await waitFor(() => {
-        expect(viralLoadCountField).toHaveValue(30);
-        expect(suppressedField).toBeChecked();
-        expect(unsuppressedField).not.toBeChecked();
-      });
+      expect(viralLoadCountField).toHaveValue(30);
+      expect(suppressedField).toBeChecked();
+      expect(unsuppressedField).not.toBeChecked();
     });
 
     it('should only show question when age is under 5', async () => {
@@ -689,7 +735,7 @@ xdescribe('Form engine component', () => {
         name: /mrn/i,
       });
 
-      expect(enrollmentDate).toHaveValue(new Date('1975-07-06T00:00:00.000Z').toLocaleDateString(locale));
+      expect(enrollmentDate).toHaveValue('06/07/1975');
 
       expect(mrn).toBeVisible();
     });
@@ -701,7 +747,7 @@ xdescribe('Form engine component', () => {
         name: /body weight/i,
       });
 
-      await waitFor(() => expect(bodyWeightField).toHaveValue(60));
+      expect(bodyWeightField).toHaveValue(60);
     });
 
     it('should evaluate next visit date', async () => {
@@ -731,12 +777,6 @@ xdescribe('Form engine component', () => {
   });
 
   describe('Concept references', () => {
-    const conceptResourcePath = when((url: string) =>
-      url.includes(`${restBaseUrl}/concept?references=PIH:Occurrence of trauma,PIH:Yes,PIH:No,PIH:COUGH`),
-    );
-
-    when(mockOpenmrsFetch).calledWith(conceptResourcePath).mockReturnValue({ data: mockConceptsForm });
-
     it('should add default labels based on concept display and substitute mapping references with uuids', async () => {
       await act(async () => renderForm(null, referenceByMappingForm));
 
@@ -811,6 +851,7 @@ xdescribe('Form engine component', () => {
         patientUUID={patientUUID}
         formSessionIntent={intent}
         visit={visit}
+        mode="enter"
       />,
     );
   }

package/src/hooks/useFormStateHelpers.ts

@@ -1,13 +1,14 @@
 import { type Dispatch, useCallback } from 'react';
-import { type FormSchema, type FormField } from '../types';
+import { type FormField, type FormSchema } from '../types';
 import { type Action } from '../components/renderer/form/state';
+import cloneDeep from 'lodash/cloneDeep';
 
 export function useFormStateHelpers(dispatch: Dispatch<Action>, formFields: FormField[]) {
   const addFormField = useCallback((field: FormField) => {
     dispatch({ type: 'ADD_FORM_FIELD', value: field });
   }, []);
   const updateFormField = useCallback((field: FormField) => {
-    dispatch({ type: 'UPDATE_FORM_FIELD', value: structuredClone(field) });
+    dispatch({ type: 'UPDATE_FORM_FIELD', value: cloneDeep(field) });
   }, []);
 
   const getFormField = useCallback(

package/src/hooks/useInitialValues.ts

@@ -31,7 +31,7 @@ const useInitialValues = (
           setIsLoadingInitialValues(false);
         });
     }
-  }, [formProcessor, isLoadingContextDependencies, context]);
+  }, [formProcessor, isLoadingContextDependencies, context, initialValues]);
 
   return { isLoadingInitialValues, initialValues, error };
 };

package/src/hooks/useProcessorDependencies.ts

@@ -1,6 +1,7 @@
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { type FormProcessorContextProps } from '../types';
 import { type FormProcessor } from '../processors/form-processor';
+import { reportError } from '../utils/error-utils';
 
 const useProcessorDependencies = (
   formProcessor: FormProcessor,
@@ -20,9 +21,10 @@ const useProcessorDependencies = (
         })
         .catch((error) => {
           setError(error);
+          reportError(error, 'Encountered error while loading dependencies');
         });
     }
-  }, []);
+  }, [loadDependencies]);
 
   return { isLoading, error };
 };

package/src/processors/encounter/encounter-form-processor.ts

@@ -1,15 +1,15 @@
 import {
-  type ValueAndDisplay,
   type FormField,
-  type FormProcessorContextProps,
   type FormPage,
+  type FormProcessorContextProps,
+  type FormSchema,
   type FormSection,
+  type ValueAndDisplay,
 } from '../../types';
 import { usePatientPrograms } from '../../hooks/usePatientPrograms';
 import { useEffect, useState } from 'react';
 import { useEncounter } from '../../hooks/useEncounter';
 import { isEmpty } from '../../validators/form-validator';
-import { type FormSchema } from '../../types';
 import { type FormContextProps } from '../../provider/form-provider';
 import { FormProcessor } from '../form-processor';
 import {
@@ -28,8 +28,9 @@ import { moduleName } from '../../globals';
 import { extractErrorMessagesFromResponse } from '../../utils/error-utils';
 import { getPreviousEncounter, saveEncounter } from '../../api';
 import { useEncounterRole } from '../../hooks/useEncounterRole';
-import { type FormNode, evaluateAsyncExpression, evaluateExpression } from '../../utils/expression-runner';
+import { evaluateAsyncExpression, evaluateExpression, type FormNode } from '../../utils/expression-runner';
 import { hasRendering } from '../../utils/common-utils';
+import { extractObsValueAndDisplay } from '../../utils/form-helper';
 
 function useCustomHooks(context: Partial<FormProcessorContextProps>) {
   const [isLoading, setIsLoading] = useState(true);
@@ -77,8 +78,9 @@ const contextInitializableTypes = [
   'encounterLocation',
   'patientIdentifier',
   'encounterRole',
-  'programState'
+  'programState',
 ];
+
 export class EncounterFormProcessor extends FormProcessor {
   prepareFormSchema(schema: FormSchema) {
     schema.pages.forEach((page) => {
@@ -105,6 +107,7 @@ export class EncounterFormProcessor extends FormProcessor {
         });
       }
     }
+
     return schema;
   }
 
@@ -309,7 +312,7 @@ export class EncounterFormProcessor extends FormProcessor {
         patient: patient,
         previousEncounter: previousDomainObjectValue,
       });
-      return value;
+      return extractObsValueAndDisplay(field, value);
     }
     if (previousDomainObjectValue && field.questionOptions.enablePreviousValue) {
       return await adapter.getPreviousValue(field, previousDomainObjectValue, context);

package/src/provider/form-factory-helper.ts

@@ -13,6 +13,7 @@ export function validateForm(context: FormContextProps) {
     patient,
     sessionMode,
     addInvalidField,
+    updateFormField,
     methods: { getValues, trigger },
   } = context;
   const values = getValues();
@@ -34,7 +35,7 @@ export function validateForm(context: FormContextProps) {
           const errors = validationResults.filter((result) => result.resultType === 'error');
           if (errors.length) {
             field.meta.submission = { ...field.meta.submission, errors };
-            trigger(field.id);
+            updateFormField(field);
             addInvalidField(field);
           }
           return errors;

package/src/registry/registry.ts

@@ -1,7 +1,9 @@
 import {
   type FormField,
   type DataSource,
+  type FormFieldInputProps,
   type FormFieldValidator,
+  type FormFieldValueAdapter,
   type FormSchemaTransformer,
   type PostSubmissionAction,
 } from '../types';
@@ -13,7 +15,6 @@ import { inbuiltDataSources } from './inbuilt-components/inbuiltDataSources';
 import { getControlTemplate } from './inbuilt-components/control-templates';
 import { inbuiltPostSubmissionActions } from './inbuilt-components/InbuiltPostSubmissionActions';
 import { inbuiltFormTransformers } from './inbuilt-components/inbuiltTransformers';
-import { type FormFieldInputProps, type FormFieldValueAdapter } from '../types';
 import { inbuiltFieldValueAdapters } from './inbuilt-components/inbuiltFieldValueAdapters';
 
 /**

package/src/utils/form-helper.ts

@@ -1,7 +1,8 @@
 import { type LayoutType } from '@openmrs/esm-framework';
-import { type FormField, type FormPage, type FormSection, type SessionMode } from '../types';
+import { type OpenmrsObs, type FormField, type FormPage, type FormSection, type SessionMode } from '../types';
 import { isEmpty } from '../validators/form-validator';
-import { getRegisteredControl } from '../registry/registry';
+import { parseToLocalDateTime } from './common-utils';
+import dayjs from 'dayjs';
 
 export function shouldUseInlineLayout(
   renderingType: 'single-line' | 'multiline' | 'automatic',
@@ -170,3 +171,25 @@ export function scrollIntoView(viewId: string, shouldFocus: boolean = false) {
     currentElement?.focus();
   }
 }
+
+export const extractObsValueAndDisplay = (field: FormField, obs: OpenmrsObs) => {
+  const rendering = field.questionOptions.rendering;
+
+  if (typeof obs.value === 'string' || typeof obs.value === 'number') {
+    if (rendering === 'date' || rendering === 'datetime') {
+      const dateObj = parseToLocalDateTime(`${obs.value}`);
+      return { value: dateObj, display: dayjs(dateObj).format('YYYY-MM-DD HH:mm') };
+    }
+    return { value: obs.value, display: obs.value };
+  } else if (['toggle', 'checkbox'].includes(rendering)) {
+    return {
+      value: obs.value?.uuid,
+      display: obs.value?.name?.name,
+    };
+  } else {
+    return {
+      value: obs.value?.uuid,
+      display: field.questionOptions.answers?.find((option) => option.concept === obs.value?.uuid)?.label,
+    };
+  }
+};