@openmrs/esm-form-engine-lib 3.1.4-pre.1808 → 3.1.4-pre.1828
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/__mocks__/forms/rfe-forms/required-form.json +48 -48
- package/dist/openmrs-esm-form-engine-lib.js +1 -1
- package/package.json +3 -3
- package/src/components/field-label/field-label.component.tsx +34 -4
- package/src/components/field-label/field-label.scss +4 -0
- package/src/form-engine.test.tsx +4 -1
- package/src/components/inputs/tooltip/tooltip.component.tsx +0 -23
- package/src/components/inputs/tooltip/tooltip.scss +0 -8
|
@@ -1,50 +1,50 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
},
|
|
23
|
-
"validators": []
|
|
2
|
+
"name": "Required Field tester",
|
|
3
|
+
"pages": [
|
|
4
|
+
{
|
|
5
|
+
"label": "One",
|
|
6
|
+
"sections": [
|
|
7
|
+
{
|
|
8
|
+
"label": "Sec One",
|
|
9
|
+
"isExpanded": "true",
|
|
10
|
+
"questions": [
|
|
11
|
+
{
|
|
12
|
+
"label": "Text question",
|
|
13
|
+
"type": "obs",
|
|
14
|
+
"required": true,
|
|
15
|
+
"id": "id_text",
|
|
16
|
+
"questionInfo": "sample tooltip info for text",
|
|
17
|
+
"questionOptions": {
|
|
18
|
+
"rendering": "text",
|
|
19
|
+
"concept": "928def39-33c1-4ddb-8430-165db28448c8",
|
|
20
|
+
"conceptMappings": [],
|
|
21
|
+
"answers": []
|
|
24
22
|
},
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
"
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
23
|
+
"validators": []
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
"label": "Text question 2",
|
|
27
|
+
"type": "obs",
|
|
28
|
+
"required": "true",
|
|
29
|
+
"id": "id_text2",
|
|
30
|
+
"questionInfo": "sample tooltip info for text",
|
|
31
|
+
"questionOptions": {
|
|
32
|
+
"rendering": "text",
|
|
33
|
+
"concept": "938def39-33c1-4ddb-8430-165db28448c8",
|
|
34
|
+
"conceptMappings": [],
|
|
35
|
+
"answers": []
|
|
36
|
+
},
|
|
37
|
+
"validators": []
|
|
38
|
+
}
|
|
39
|
+
]
|
|
40
|
+
}
|
|
41
|
+
]
|
|
42
|
+
}
|
|
43
|
+
],
|
|
44
|
+
"processor": "EncounterFormProcessor",
|
|
45
|
+
"encounterType": "e22e39fd-7db2-45e7-80f1-60fa0d5a4378",
|
|
46
|
+
"referencedForms": [],
|
|
47
|
+
"uuid": "1859d9ad-2ed4-48db-96eb-7b0ce0c9903e",
|
|
48
|
+
"description": "A form containing most fields, to be used for testing purposes",
|
|
49
|
+
"version": "1.0"
|
|
50
|
+
}
|
|
@@ -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,y,w,_={8008:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(842),t.e(103),t.e(72),t.e(465),t.e(299),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,y,w,_={8008:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(842),t.e(103),t.e(72),t.e(465),t.e(299),t.e(689)]).then((()=>()=>t(3689)))},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})}},P={};function j(e){var r=P[e];if(void 0!==r)return r.exports;var t=P[e]={id:e,loaded:!1,exports:{}};return _[e].call(t.exports,t,t.exports,j),t.loaded=!0,t.exports}j.m=_,j.c=P,j.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return j.d(r,{a:r}),r},r=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,j.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);j.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,j.d(o,i),o},j.d=(e,r)=>{for(var t in r)j.o(r,t)&&!j.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},j.f={},j.e=e=>Promise.all(Object.keys(j.f).reduce(((r,t)=>(j.f[t](e,r),r)),[])),j.u=e=>e+".js",j.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),j.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t={},n="@openmrs/esm-form-engine-lib:",j.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,j.nc&&a.setAttribute("nonce",j.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)}},j.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},j.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),j.j=719,(()=>{j.S={};var e={},r={};j.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];j.o(j.S,t)||(j.S[t]={});var i=j.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","6.2.1-pre.2909",(()=>Promise.all([j.e(151),j.e(72),j.e(766)]).then((()=>()=>j(5151))))),l("@openmrs/esm-patient-common-lib","9.2.3-pre.7486",(()=>Promise.all([j.e(842),j.e(239),j.e(72),j.e(465),j.e(299),j.e(499)]).then((()=>()=>j(7239))))),l("dayjs","1.11.13",(()=>j.e(353).then((()=>()=>j(6734))))),l("i18next","23.16.0",(()=>j.e(635).then((()=>()=>j(2635))))),l("react-i18next","11.18.6",(()=>Promise.all([j.e(72),j.e(979)]).then((()=>()=>j(2979))))),l("react","18.3.1",(()=>j.e(540).then((()=>()=>j(6540))))),l("swr/_internal","2.2.5",(()=>Promise.all([j.e(993),j.e(72)]).then((()=>()=>j(4993))))),l("swr/immutable","2.2.5",(()=>Promise.all([j.e(72),j.e(465),j.e(606)]).then((()=>()=>j(4225))))),l("swr/infinite","2.2.5",(()=>Promise.all([j.e(72),j.e(465),j.e(422)]).then((()=>()=>j(3041)))))),e[t]=s.length?Promise.all(s).then((()=>e[t]=1)):1}}})(),(()=>{var e;j.g.importScripts&&(e=j.g.location+"");var r=j.g.document;if(!e&&r&&(r.currentScript&&"SCRIPT"===r.currentScript.tagName.toUpperCase()&&(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(/\/[^\/]+$/,"/"),j.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)=>e&&j.o(e,r),u=e=>(e.loaded=1,e.get()),f=e=>Object.keys(e).reduce(((r,t)=>(e[t].eager&&(r[t]=e[t]),r)),{}),p=(e,r,t)=>{var n=t?f(e[r]):e[r];return Object.keys(n).reduce(((e,r)=>!e||!n[e].loaded&&i(e,r)?r:e),0)},d=(e,r,t,n)=>"Unsatisfied version "+t+" from "+(t&&e[r][t].from)+" of shared singleton module "+r+" (required "+a(n)+")",c=e=>{throw new Error(e)},h=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},m=(e,r,t)=>t?t():((e,r)=>c("Shared module "+r+" doesn't exist in shared scope "+e))(e,r),v=(e=>function(r,t,n,o,i){var a=j.I(r);return a&&a.then&&!n?a.then(e.bind(e,r,j.S[r],t,!1,o,i)):e(r,j.S[r],t,n,o,i)})(((e,r,t,n,o,i)=>{if(!s(r,t))return m(e,t,i);var a=p(r,t,n);return l(o,a)||h(d(r,t,a,o)),u(r[t][a])})),g={},b={6072:()=>v("default","react",!1,[1,18],(()=>j.e(540).then((()=>()=>j(6540))))),6766:()=>v("default","i18next",!1,[1,23],(()=>j.e(635).then((()=>()=>j(2635))))),8465:()=>v("default","swr/_internal",!1,[1,2],(()=>j.e(993).then((()=>()=>j(4993))))),2731:()=>v("default","@openmrs/esm-patient-common-lib",!1,[1,9],(()=>j.e(239).then((()=>()=>j(7239))))),3941:()=>v("default","react-i18next",!1,[1,11],(()=>j.e(360).then((()=>()=>j(2979))))),9197:()=>v("default","@openmrs/esm-framework",!1,[1,6],(()=>Promise.all([j.e(151),j.e(766)]).then((()=>()=>j(5151))))),4209:()=>v("default","swr/immutable",!1,[1,2],(()=>j.e(225).then((()=>()=>j(4225))))),231:()=>v("default","dayjs",!1,[1,1],(()=>j.e(353).then((()=>()=>j(6734))))),6339:()=>v("default","swr/infinite",!1,[1,2],(()=>j.e(41).then((()=>()=>j(3041)))))},y={72:[6072],299:[2731,3941,9197],465:[8465],499:[4209],689:[231,4209,6339],766:[6766]},w={},j.f.consumes=(e,r)=>{j.o(y,e)&&y[e].forEach((e=>{if(j.o(g,e))return r.push(g[e]);if(!w[e]){var t=r=>{g[e]=0,j.m[e]=t=>{delete j.c[e],t.exports=r()}};w[e]=!0;var n=r=>{delete g[e],j.m[e]=t=>{throw delete j.c[e],r}};try{var o=b[e]();o.then?r.push(g[e]=o.then(t).catch(n)):t(o)}catch(e){n(e)}}}))},(()=>{var e={719:0};j.f.j=(r,t)=>{var n=j.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(299|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=j.p+j.u(r),a=new Error;j.l(i,(t=>{if(j.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)j.o(a,n)&&(j.m[n]=a[n]);l&&l(j)}for(r&&r(t);s<i.length;s++)o=i[s],j.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))})(),j.nc=void 0;var S=j(8008);_openmrs_esm_form_engine_lib=S})();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openmrs/esm-form-engine-lib",
|
|
3
|
-
"version": "3.1.4-pre.
|
|
3
|
+
"version": "3.1.4-pre.1828",
|
|
4
4
|
"description": "React Form Engine for O3",
|
|
5
5
|
"browser": "dist/openmrs-esm-form-engine-lib.js",
|
|
6
6
|
"main": "src/index.ts",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"sass": "^1.77.2",
|
|
92
92
|
"swc-loader": "^0.2.6",
|
|
93
93
|
"swr": "^2.2.5",
|
|
94
|
-
"turbo": "^2.
|
|
94
|
+
"turbo": "^2.5.2",
|
|
95
95
|
"typescript": "^4.9.5",
|
|
96
96
|
"webpack": "^5.91.0",
|
|
97
97
|
"webpack-bundle-analyzer": "^4.10.2",
|
|
@@ -102,6 +102,6 @@
|
|
|
102
102
|
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
|
|
103
103
|
"*.{css,scss,ts,tsx}": "prettier --write --list-different"
|
|
104
104
|
},
|
|
105
|
-
"packageManager": "yarn@4.
|
|
105
|
+
"packageManager": "yarn@4.9.1",
|
|
106
106
|
"stableVersion": "3.1.3"
|
|
107
107
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { Tooltip } from '@carbon/react';
|
|
2
3
|
import { useTranslation } from 'react-i18next';
|
|
3
4
|
import { type FormField } from '../../types';
|
|
4
|
-
import Tooltip from '../inputs/tooltip/tooltip.component';
|
|
5
5
|
|
|
6
6
|
import styles from './field-label.scss';
|
|
7
|
+
import { Information } from '@carbon/react/icons';
|
|
7
8
|
|
|
8
9
|
interface FieldLabelProps {
|
|
9
10
|
field: FormField;
|
|
@@ -13,20 +14,49 @@ interface FieldLabelProps {
|
|
|
13
14
|
customLabel?: string;
|
|
14
15
|
}
|
|
15
16
|
|
|
16
|
-
const
|
|
17
|
+
const TooltipWrapper: React.FC<{ field: FormField; children: React.ReactNode }> = ({ field, children }) => {
|
|
17
18
|
const { t } = useTranslation();
|
|
19
|
+
const hasTooltip = Boolean(field.questionInfo);
|
|
20
|
+
|
|
21
|
+
return hasTooltip ? (
|
|
22
|
+
<Tooltip align="top-start" label={t(field.questionInfo)}>
|
|
23
|
+
{children}
|
|
24
|
+
</Tooltip>
|
|
25
|
+
) : (
|
|
26
|
+
<>{children}</>
|
|
27
|
+
);
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
const FieldLabelContent: React.FC<FieldLabelProps> = ({ field, customLabel }) => {
|
|
31
|
+
const { t } = useTranslation();
|
|
32
|
+
const hasTooltip = Boolean(field.questionInfo);
|
|
18
33
|
const labelText = customLabel || t(field.label);
|
|
19
34
|
return (
|
|
20
|
-
<div className={styles.questionLabel}>
|
|
35
|
+
<div className={styles.questionLabel} data-testid={`${field.id}-label`}>
|
|
21
36
|
<span>{labelText}</span>
|
|
22
37
|
{field.isRequired && (
|
|
23
38
|
<span title={t('required', 'Required')} className={styles.required}>
|
|
24
39
|
*
|
|
25
40
|
</span>
|
|
26
41
|
)}
|
|
27
|
-
{
|
|
42
|
+
{hasTooltip && (
|
|
43
|
+
<Information
|
|
44
|
+
size={20}
|
|
45
|
+
aria-hidden="true"
|
|
46
|
+
className={styles.tooltipIcon}
|
|
47
|
+
data-testid={`${field.id}-information-icon`}
|
|
48
|
+
/>
|
|
49
|
+
)}
|
|
28
50
|
</div>
|
|
29
51
|
);
|
|
30
52
|
};
|
|
31
53
|
|
|
54
|
+
const FieldLabel: React.FC<FieldLabelProps> = (props) => {
|
|
55
|
+
return (
|
|
56
|
+
<TooltipWrapper field={props.field}>
|
|
57
|
+
<FieldLabelContent {...props} />
|
|
58
|
+
</TooltipWrapper>
|
|
59
|
+
);
|
|
60
|
+
};
|
|
61
|
+
|
|
32
62
|
export default FieldLabel;
|
package/src/form-engine.test.tsx
CHANGED
|
@@ -255,9 +255,12 @@ describe('Form engine component', () => {
|
|
|
255
255
|
|
|
256
256
|
screen.findByRole('textbox', { name: /text question/i });
|
|
257
257
|
|
|
258
|
-
const textFieldTooltip = screen.getByTestId('id_text');
|
|
258
|
+
const textFieldTooltip = screen.getByTestId('id_text-label');
|
|
259
259
|
expect(textFieldTooltip).toBeInTheDocument();
|
|
260
260
|
|
|
261
|
+
const informationIcon = screen.getByTestId('id_text-information-icon');
|
|
262
|
+
expect(informationIcon).toBeInTheDocument();
|
|
263
|
+
|
|
261
264
|
await user.hover(textFieldTooltip);
|
|
262
265
|
await screen.findByText(/sample tooltip info for text/i);
|
|
263
266
|
});
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
import { Tooltip as CarbonTooltip } from '@carbon/react';
|
|
3
|
-
import { Information } from '@carbon/react/icons';
|
|
4
|
-
import { type FormField } from '../../../types';
|
|
5
|
-
import { useTranslation } from 'react-i18next';
|
|
6
|
-
|
|
7
|
-
import styles from './tooltip.scss';
|
|
8
|
-
interface TooltipProps {
|
|
9
|
-
field: FormField;
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
const Tooltip: React.FC<TooltipProps> = ({ field }) => {
|
|
13
|
-
const { t } = useTranslation();
|
|
14
|
-
return (
|
|
15
|
-
<CarbonTooltip align="top" label={t(field.questionInfo)} description={t(field.questionInfo)}>
|
|
16
|
-
<button className={styles.tooltip} type="button" data-testid={field.id}>
|
|
17
|
-
<Information />
|
|
18
|
-
</button>
|
|
19
|
-
</CarbonTooltip>
|
|
20
|
-
);
|
|
21
|
-
};
|
|
22
|
-
|
|
23
|
-
export default Tooltip;
|