@openmrs/esm-form-engine-lib 3.0.1-pre.1649 → 3.0.1-pre.1655
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/5281376ec77fd3a6/5281376ec77fd3a6.gz +0 -0
- package/73669f5073ab15df/73669f5073ab15df.gz +0 -0
- package/8203097338284f98/8203097338284f98.gz +0 -0
- package/90a8030fcf05324e/90a8030fcf05324e.gz +0 -0
- package/dist/openmrs-esm-form-engine-lib.js +1 -1
- package/package.json +1 -1
- package/src/components/inputs/ui-select-extended/ui-select-extended.component.tsx +0 -7
- package/src/components/inputs/ui-select-extended/ui-select-extended.test.tsx +14 -5
- package/src/hooks/usePatientPrograms.ts +27 -31
- package/src/processors/encounter/encounter-form-processor.ts +19 -22
- package/src/types/domain.ts +4 -0
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -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(
|
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(277),t.e(260),t.e(72),t.e(465),t.e(299),t.e(219)]).then((()=>()=>t(7219)))},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 S(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,S),t.loaded=!0,t.exports}S.m=_,S.c=P,S.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return S.d(r,{a:r}),r},r=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,S.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);S.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,S.d(o,i),o},S.d=(e,r)=>{for(var t in r)S.o(r,t)&&!S.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},S.f={},S.e=e=>Promise.all(Object.keys(S.f).reduce(((r,t)=>(S.f[t](e,r),r)),[])),S.u=e=>e+".js",S.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),S.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t={},n="@openmrs/esm-form-engine-lib:",S.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,S.nc&&a.setAttribute("nonce",S.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)}},S.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},S.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{S.S={};var e={},r={};S.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];S.o(S.S,t)||(S.S[t]={});var i=S.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.0.3-pre.2587",(()=>Promise.all([S.e(151),S.e(72),S.e(766)]).then((()=>()=>S(5151))))),l("@openmrs/esm-patient-common-lib","9.0.1-pre.6367",(()=>Promise.all([S.e(727),S.e(277),S.e(72),S.e(465),S.e(299),S.e(499)]).then((()=>()=>S(7727))))),l("dayjs","1.11.13",(()=>S.e(353).then((()=>()=>S(4353))))),l("i18next","23.16.0",(()=>S.e(635).then((()=>()=>S(2635))))),l("react-i18next","11.18.6",(()=>Promise.all([S.e(979),S.e(72)]).then((()=>()=>S(2979))))),l("react","18.3.1",(()=>S.e(540).then((()=>()=>S(6540))))),l("swr/_internal","2.2.5",(()=>Promise.all([S.e(993),S.e(72)]).then((()=>()=>S(4993))))),l("swr/immutable","2.2.5",(()=>Promise.all([S.e(72),S.e(465),S.e(225)]).then((()=>()=>S(4225))))),l("swr/infinite","2.2.5",(()=>Promise.all([S.e(72),S.e(465),S.e(41)]).then((()=>()=>S(3041)))))),e[t]=s.length?Promise.all(s).then((()=>e[t]=1)):1}}})(),(()=>{var e;S.g.importScripts&&(e=S.g.location+"");var r=S.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(/\/[^\/]+$/,"/"),S.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&&S.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=S.I(r);return a&&a.then&&!n?a.then(e.bind(e,r,S.S[r],t,!1,o,i)):e(r,S.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],(()=>S.e(540).then((()=>()=>S(6540))))),6766:()=>v("default","i18next",!1,[1,23],(()=>S.e(635).then((()=>()=>S(2635))))),8465:()=>v("default","swr/_internal",!1,[1,2],(()=>S.e(993).then((()=>()=>S(4993))))),2731:()=>v("default","@openmrs/esm-patient-common-lib",!1,[1,9],(()=>S.e(727).then((()=>()=>S(7727))))),3941:()=>v("default","react-i18next",!1,[1,11],(()=>S.e(979).then((()=>()=>S(2979))))),9197:()=>v("default","@openmrs/esm-framework",!1,[1,6],(()=>Promise.all([S.e(151),S.e(766)]).then((()=>()=>S(5151))))),4209:()=>v("default","swr/immutable",!1,[1,2],(()=>S.e(606).then((()=>()=>S(4225))))),231:()=>v("default","dayjs",!1,[1,1],(()=>S.e(353).then((()=>()=>S(4353))))),6339:()=>v("default","swr/infinite",!1,[1,2],(()=>S.e(422).then((()=>()=>S(3041)))))},y={72:[6072],219:[231,4209,6339],299:[2731,3941,9197],465:[8465],499:[4209],766:[6766]},w={},S.f.consumes=(e,r)=>{S.o(y,e)&&y[e].forEach((e=>{if(S.o(g,e))return r.push(g[e]);if(!w[e]){var t=r=>{g[e]=0,S.m[e]=t=>{delete S.c[e],t.exports=r()}};w[e]=!0;var n=r=>{delete g[e],S.m[e]=t=>{throw delete S.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};S.f.j=(r,t)=>{var n=S.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=S.p+S.u(r),a=new Error;S.l(i,(t=>{if(S.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)S.o(a,n)&&(S.m[n]=a[n]);l&&l(S)}for(r&&r(t);s<i.length;s++)o=i[s],S.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))})(),S.nc=void 0;var j=S(8008);_openmrs_esm_form_engine_lib=j})();
|
package/package.json
CHANGED
@@ -169,13 +169,6 @@ const UiSelectExtended: React.FC<FormFieldInputProps> = ({ field, errors, warnin
|
|
169
169
|
itemToString={(item) => item?.display}
|
170
170
|
selectedItem={selectedItem}
|
171
171
|
placeholder={isSearchable ? t('search', 'Search') + '...' : null}
|
172
|
-
shouldFilterItem={({ item, inputValue }) => {
|
173
|
-
if (!inputValue) {
|
174
|
-
// Carbon's initial call at component mount
|
175
|
-
return true;
|
176
|
-
}
|
177
|
-
return item.display?.toLowerCase().includes(inputValue.toLowerCase());
|
178
|
-
}}
|
179
172
|
onChange={({ selectedItem }) => {
|
180
173
|
isProcessingSelection.current = true;
|
181
174
|
setFieldValue(selectedItem?.uuid);
|
@@ -252,18 +252,27 @@ describe('UiSelectExtended', () => {
|
|
252
252
|
);
|
253
253
|
});
|
254
254
|
|
255
|
-
it('should
|
255
|
+
it('should display all items regardless of user input', async () => {
|
256
256
|
await act(async () => {
|
257
257
|
renderForm();
|
258
258
|
});
|
259
259
|
|
260
|
-
const transferLocationSelect = await findSelectInput(screen, 'Transfer Location');
|
260
|
+
const transferLocationSelect = await findSelectInput(screen, 'Transfer Location');
|
261
|
+
// Open the dropdown
|
261
262
|
await user.click(transferLocationSelect);
|
263
|
+
|
264
|
+
// Verify all items are displayed initially
|
265
|
+
expect(screen.getByText('Kololo')).toBeInTheDocument();
|
266
|
+
expect(screen.getByText('Naguru')).toBeInTheDocument();
|
267
|
+
expect(screen.getByText('Muyenga')).toBeInTheDocument();
|
268
|
+
|
269
|
+
// Type input
|
262
270
|
await user.type(transferLocationSelect, 'Nag');
|
263
|
-
|
271
|
+
|
272
|
+
// Verify all items are still displayed
|
273
|
+
expect(screen.getByText('Kololo')).toBeInTheDocument();
|
264
274
|
expect(screen.getByText('Naguru')).toBeInTheDocument();
|
265
|
-
expect(screen.
|
266
|
-
expect(screen.queryByText('Muyenga')).not.toBeInTheDocument();
|
275
|
+
expect(screen.getByText('Muyenga')).toBeInTheDocument();
|
267
276
|
});
|
268
277
|
});
|
269
278
|
|
@@ -1,42 +1,38 @@
|
|
1
|
+
import useSWR from 'swr';
|
1
2
|
import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
|
2
|
-
import {
|
3
|
-
import { type FormSchema, type PatientProgram } from '../types';
|
4
|
-
const customRepresentation = `custom:(uuid,display,program:(uuid,name,allWorkflows),dateEnrolled,dateCompleted,location:(uuid,display),states:(startDate,endDate,state:(uuid,name,retired,concept:(uuid),programWorkflow:(uuid)))`;
|
3
|
+
import type { FormSchema, ProgramsFetchResponse } from '../types';
|
5
4
|
|
6
|
-
|
7
|
-
const
|
8
|
-
const
|
9
|
-
const [error, setError] = useState(null);
|
5
|
+
const useActiveProgramEnrollments = (patientUuid: string) => {
|
6
|
+
const customRepresentation = `custom:(uuid,display,program:(uuid,name,allWorkflows),dateEnrolled,dateCompleted,location:(uuid,display),states:(startDate,endDate,state:(uuid,name,retired,concept:(uuid),programWorkflow:(uuid)))`;
|
7
|
+
const apiUrl = `${restBaseUrl}/programenrollment?patient=${patientUuid}&v=${customRepresentation}`;
|
10
8
|
|
11
|
-
|
12
|
-
|
9
|
+
const { data, error, isLoading } = useSWR<{ data: ProgramsFetchResponse }, Error>(
|
10
|
+
patientUuid ? apiUrl : null,
|
11
|
+
openmrsFetch,
|
12
|
+
);
|
13
13
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
.then((response) => {
|
19
|
-
setPatientPrograms(response.data.results.filter((enrollment) => enrollment.dateCompleted === null));
|
20
|
-
setIsLoading(false);
|
21
|
-
})
|
22
|
-
.catch((error) => {
|
23
|
-
if (error.name !== 'AbortError') {
|
24
|
-
setError(error);
|
25
|
-
setIsLoading(false);
|
26
|
-
}
|
27
|
-
});
|
28
|
-
} else {
|
29
|
-
setIsLoading(false);
|
30
|
-
}
|
14
|
+
const sortedEnrollments =
|
15
|
+
data?.data?.results.length > 0
|
16
|
+
? data?.data.results.sort((a, b) => (b.dateEnrolled > a.dateEnrolled ? 1 : -1))
|
17
|
+
: null;
|
31
18
|
|
32
|
-
|
33
|
-
abortController.abort();
|
34
|
-
};
|
35
|
-
}, [formJson]);
|
19
|
+
const activePrograms = sortedEnrollments?.filter((enrollment) => !enrollment.dateCompleted);
|
36
20
|
|
37
21
|
return {
|
38
|
-
|
22
|
+
activePrograms,
|
39
23
|
error,
|
40
24
|
isLoading,
|
41
25
|
};
|
42
26
|
};
|
27
|
+
|
28
|
+
export const usePatientPrograms = (patientUuid: string, formJson: FormSchema) => {
|
29
|
+
const { activePrograms, error, isLoading } = useActiveProgramEnrollments(
|
30
|
+
formJson.meta?.programs?.hasProgramFields ? patientUuid : null,
|
31
|
+
);
|
32
|
+
|
33
|
+
return {
|
34
|
+
patientPrograms: activePrograms,
|
35
|
+
errorFetchingPatientPrograms: error,
|
36
|
+
isLoadingPatientPrograms: isLoading,
|
37
|
+
};
|
38
|
+
};
|
@@ -1,17 +1,5 @@
|
|
1
|
-
import {
|
2
|
-
type FormField,
|
3
|
-
type FormPage,
|
4
|
-
type FormProcessorContextProps,
|
5
|
-
type FormSchema,
|
6
|
-
type FormSection,
|
7
|
-
type ValueAndDisplay,
|
8
|
-
} from '../../types';
|
9
|
-
import { usePatientPrograms } from '../../hooks/usePatientPrograms';
|
10
1
|
import { useEffect, useState } from 'react';
|
11
|
-
import {
|
12
|
-
import { isEmpty } from '../../validators/form-validator';
|
13
|
-
import { type FormContextProps } from '../../provider/form-provider';
|
14
|
-
import { FormProcessor } from '../form-processor';
|
2
|
+
import { type OpenmrsResource, showSnackbar, translateFrom } from '@openmrs/esm-framework';
|
15
3
|
import {
|
16
4
|
getMutableSessionProps,
|
17
5
|
hydrateRepeatField,
|
@@ -23,23 +11,32 @@ import {
|
|
23
11
|
savePatientIdentifiers,
|
24
12
|
savePatientPrograms,
|
25
13
|
} from './encounter-processor-helper';
|
26
|
-
import {
|
27
|
-
|
14
|
+
import {
|
15
|
+
type FormField,
|
16
|
+
type FormPage,
|
17
|
+
type FormProcessorContextProps,
|
18
|
+
type FormSchema,
|
19
|
+
type FormSection,
|
20
|
+
type ValueAndDisplay,
|
21
|
+
} from '../../types';
|
22
|
+
import { evaluateAsyncExpression, type FormNode } from '../../utils/expression-runner';
|
28
23
|
import { extractErrorMessagesFromResponse } from '../../utils/error-utils';
|
24
|
+
import { extractObsValueAndDisplay } from '../../utils/form-helper';
|
25
|
+
import { FormProcessor } from '../form-processor';
|
29
26
|
import { getPreviousEncounter, saveEncounter } from '../../api';
|
30
|
-
import { useEncounterRole } from '../../hooks/useEncounterRole';
|
31
|
-
import { evaluateAsyncExpression, type FormNode } from '../../utils/expression-runner';
|
32
27
|
import { hasRendering } from '../../utils/common-utils';
|
33
|
-
import {
|
28
|
+
import { isEmpty } from '../../validators/form-validator';
|
29
|
+
import { moduleName } from '../../globals';
|
30
|
+
import { type FormContextProps } from '../../provider/form-provider';
|
31
|
+
import { useEncounter } from '../../hooks/useEncounter';
|
32
|
+
import { useEncounterRole } from '../../hooks/useEncounterRole';
|
33
|
+
import { usePatientPrograms } from '../../hooks/usePatientPrograms';
|
34
34
|
|
35
35
|
function useCustomHooks(context: Partial<FormProcessorContextProps>) {
|
36
36
|
const [isLoading, setIsLoading] = useState(true);
|
37
37
|
const { encounter, isLoading: isLoadingEncounter } = useEncounter(context.formJson);
|
38
38
|
const { encounterRole, isLoading: isLoadingEncounterRole } = useEncounterRole();
|
39
|
-
const {
|
40
|
-
context.patient?.id,
|
41
|
-
context.formJson,
|
42
|
-
);
|
39
|
+
const { isLoadingPatientPrograms, patientPrograms } = usePatientPrograms(context.patient?.id, context.formJson);
|
43
40
|
|
44
41
|
useEffect(() => {
|
45
42
|
setIsLoading(isLoadingPatientPrograms || isLoadingEncounter || isLoadingEncounterRole);
|
package/src/types/domain.ts
CHANGED
@@ -165,6 +165,10 @@ export interface PatientProgram extends OpenmrsResource {
|
|
165
165
|
states?: Array<ProgramWorkflowState>;
|
166
166
|
}
|
167
167
|
|
168
|
+
export interface ProgramsFetchResponse {
|
169
|
+
results: Array<PatientProgram>;
|
170
|
+
}
|
171
|
+
|
168
172
|
export interface PatientProgramPayload {
|
169
173
|
program?: string;
|
170
174
|
uuid?: string;
|