@openmrs/esm-patient-conditions-app 8.2.1-pre.6243 → 8.2.1-pre.6248
Sign up to get free protection for your applications and to get access to all the features.
- package/.turbo/turbo-build.log +1 -1
- package/dist/436.js +1 -1
- package/dist/436.js.map +1 -1
- package/dist/688.js +1 -1
- package/dist/688.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/openmrs-esm-patient-conditions-app.js +1 -1
- package/dist/openmrs-esm-patient-conditions-app.js.buildmanifest.json +10 -10
- package/dist/routes.json +1 -1
- package/package.json +3 -3
- package/src/conditions/conditions-widget.component.tsx +76 -43
- package/src/conditions/conditions.resource.ts +4 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
var _openmrs_esm_patient_conditions_app;(()=>{"use strict";var e,r,t,n,o,a,i,s,l,u,p,d,f,c,h,m={3801:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(917),t.e(163),t.e(343),t.e(112),t.e(853),t.e(688)]).then((()=>()=>t(9688)))},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),a=(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:()=>a})}},v={};function g(e){var r=v[e];if(void 0!==r)return r.exports;var t=v[e]={id:e,loaded:!1,exports:{}};return m[e].call(t.exports,t,t.exports,g),t.loaded=!0,t.exports}g.m=m,g.c=v,g.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return g.d(r,{a:r}),r},g.d=(e,r)=>{for(var t in r)g.o(r,t)&&!g.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},g.f={},g.e=e=>Promise.all(Object.keys(g.f).reduce(((r,t)=>(g.f[t](e,r),r)),[])),g.u=e=>e+".js",g.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),g.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),e={},r="@openmrs/esm-patient-conditions-app:",g.l=(t,n,o,a)=>{if(e[t])e[t].push(n);else{var i,s;if(void 0!==o)for(var l=document.getElementsByTagName("script"),u=0;u<l.length;u++){var p=l[u];if(p.getAttribute("src")==t||p.getAttribute("data-webpack")==r+o){i=p;break}}i||(s=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,g.nc&&i.setAttribute("nonce",g.nc),i.setAttribute("data-webpack",r+o),i.src=t),e[t]=[n];var d=(r,n)=>{i.onerror=i.onload=null,clearTimeout(f);var o=e[t];if(delete e[t],i.parentNode&&i.parentNode.removeChild(i),o&&o.forEach((e=>e(n))),r)return r(n)},f=setTimeout(d.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=d.bind(null,i.onerror),i.onload=d.bind(null,i.onload),s&&document.head.appendChild(i)}},g.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},g.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{g.S={};var e={},r={};g.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];g.o(g.S,t)||(g.S[t]={});var a=g.S[t],i="@openmrs/esm-patient-conditions-app",s=(e,r,t,n)=>{var o=a[e]=a[e]||{},s=o[r];(!s||!s.loaded&&(!n!=!s.eager?n:i>s.from))&&(o[r]={get:t,from:i,eager:!!n})},l=[];return"default"===t&&(s("@openmrs/esm-framework","6.0.1-pre.2537",(()=>Promise.all([g.e(367),g.e(343)]).then((()=>()=>g(367))))),s("@openmrs/esm-patient-common-lib","8.2.1-pre.
|
|
1
|
+
var _openmrs_esm_patient_conditions_app;(()=>{"use strict";var e,r,t,n,o,a,i,s,l,u,p,d,f,c,h,m={3801:(e,r,t)=>{var n={"./start":()=>Promise.all([t.e(917),t.e(163),t.e(343),t.e(112),t.e(853),t.e(688)]).then((()=>()=>t(9688)))},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),a=(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:()=>a})}},v={};function g(e){var r=v[e];if(void 0!==r)return r.exports;var t=v[e]={id:e,loaded:!1,exports:{}};return m[e].call(t.exports,t,t.exports,g),t.loaded=!0,t.exports}g.m=m,g.c=v,g.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return g.d(r,{a:r}),r},g.d=(e,r)=>{for(var t in r)g.o(r,t)&&!g.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},g.f={},g.e=e=>Promise.all(Object.keys(g.f).reduce(((r,t)=>(g.f[t](e,r),r)),[])),g.u=e=>e+".js",g.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),g.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),e={},r="@openmrs/esm-patient-conditions-app:",g.l=(t,n,o,a)=>{if(e[t])e[t].push(n);else{var i,s;if(void 0!==o)for(var l=document.getElementsByTagName("script"),u=0;u<l.length;u++){var p=l[u];if(p.getAttribute("src")==t||p.getAttribute("data-webpack")==r+o){i=p;break}}i||(s=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,g.nc&&i.setAttribute("nonce",g.nc),i.setAttribute("data-webpack",r+o),i.src=t),e[t]=[n];var d=(r,n)=>{i.onerror=i.onload=null,clearTimeout(f);var o=e[t];if(delete e[t],i.parentNode&&i.parentNode.removeChild(i),o&&o.forEach((e=>e(n))),r)return r(n)},f=setTimeout(d.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=d.bind(null,i.onerror),i.onload=d.bind(null,i.onload),s&&document.head.appendChild(i)}},g.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},g.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{g.S={};var e={},r={};g.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];g.o(g.S,t)||(g.S[t]={});var a=g.S[t],i="@openmrs/esm-patient-conditions-app",s=(e,r,t,n)=>{var o=a[e]=a[e]||{},s=o[r];(!s||!s.loaded&&(!n!=!s.eager?n:i>s.from))&&(o[r]={get:t,from:i,eager:!!n})},l=[];return"default"===t&&(s("@openmrs/esm-framework","6.0.1-pre.2537",(()=>Promise.all([g.e(367),g.e(343)]).then((()=>()=>g(367))))),s("@openmrs/esm-patient-common-lib","8.2.1-pre.6248",(()=>Promise.all([g.e(917),g.e(163),g.e(343),g.e(112),g.e(433),g.e(853)]).then((()=>()=>g(2433))))),s("dayjs","1.11.11",(()=>g.e(464).then((()=>()=>g(3464))))),s("react-i18next","11.18.6",(()=>Promise.all([g.e(343),g.e(449)]).then((()=>()=>g(7449))))),s("react-router-dom","6.16.0",(()=>Promise.all([g.e(913),g.e(343)]).then((()=>()=>g(2913))))),s("react","18.3.1",(()=>g.e(41).then((()=>()=>g(4041))))),s("swr/_internal","2.2.4",(()=>Promise.all([g.e(74),g.e(343)]).then((()=>()=>g(9074))))),s("swr/immutable","2.2.4",(()=>Promise.all([g.e(917),g.e(343),g.e(112),g.e(610)]).then((()=>()=>g(2610)))))),e[t]=l.length?Promise.all(l).then((()=>e[t]=1)):1}}})(),(()=>{var e;g.g.importScripts&&(e=g.g.location+"");var r=g.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(/\/[^\/]+$/,"/"),g.p=e})(),t=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},n=(e,r)=>{e=t(e),r=t(r);for(var n=0;;){if(n>=e.length)return n<r.length&&"u"!=(typeof r[n])[0];var o=e[n],a=(typeof o)[0];if(n>=r.length)return"u"==a;var i=r[n],s=(typeof i)[0];if(a!=s)return"o"==a&&"n"==s||"s"==s||"u"==a;if("o"!=a&&"u"!=a&&o!=i)return o<i;n++}},o=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,a=1;a<e.length;a++)n--,t+="u"==(typeof(s=e[a]))[0]?"-":(n>0?".":"")+(n=2,s);return t}var i=[];for(a=1;a<e.length;a++){var s=e[a];i.push(0===s?"not("+l()+")":1===s?"("+l()+" || "+l()+")":2===s?i.pop()+" "+i.pop():o(s))}return l();function l(){return i.pop().replace(/^\((.+)\)$/,"$1")}},a=(e,r)=>{if(0 in e){r=t(r);var n=e[0],o=n<0;o&&(n=-n-1);for(var i=0,s=1,l=!0;;s++,i++){var u,p,d=s<e.length?(typeof e[s])[0]:"";if(i>=r.length||"o"==(p=(typeof(u=r[i]))[0]))return!l||("u"==d?s>n&&!o:""==d!=o);if("u"==p){if(!l||"u"!=d)return!1}else if(l)if(d==p)if(s<=n){if(u!=e[s])return!1}else{if(o?u>e[s]:u<e[s])return!1;u!=e[s]&&(l=!1)}else if("s"!=d&&"n"!=d){if(o||s<=n)return!1;l=!1,s--}else{if(s<=n||p<d!=o)return!1;l=!1}else"s"!=d&&"n"!=d&&(l=!1,s--)}}var f=[],c=f.pop.bind(f);for(i=1;i<e.length;i++){var h=e[i];f.push(1==h?c()|c():2==h?c()&c():h?a(h,r):!c())}return!!c()},i=(e,r)=>{var t=e[r];return Object.keys(t).reduce(((e,r)=>!e||!t[e].loaded&&n(e,r)?r:e),0)},s=(e,r,t,n)=>"Unsatisfied version "+t+" from "+(t&&e[r][t].from)+" of shared singleton module "+r+" (required "+o(n)+")",l=(e,r,t,n)=>{var o=i(e,t);return a(n,o)||u(s(e,t,o,n)),p(e[t][o])},u=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},p=e=>(e.loaded=1,e.get()),d=(e=>function(r,t,n,o){var a=g.I(r);return a&&a.then?a.then(e.bind(e,r,g.S[r],t,n,o)):e(0,g.S[r],t,n,o)})(((e,r,t,n,o)=>r&&g.o(r,t)?l(r,0,t,n):o())),f={},c={1343:()=>d("default","react",[1,18],(()=>g.e(41).then((()=>()=>g(4041))))),6112:()=>d("default","swr/_internal",[1,2],(()=>g.e(74).then((()=>()=>g(9074))))),5260:()=>d("default","swr/immutable",[1,2],(()=>g.e(229).then((()=>()=>g(2610))))),8877:()=>d("default","react-router-dom",[1,6],(()=>g.e(913).then((()=>()=>g(2913))))),1083:()=>d("default","@openmrs/esm-framework",[1,5],(()=>g.e(367).then((()=>()=>g(367))))),3150:()=>d("default","react-i18next",[1,11],(()=>g.e(830).then((()=>()=>g(7449))))),6966:()=>d("default","@openmrs/esm-patient-common-lib",[1,8],(()=>g.e(433).then((()=>()=>g(2433))))),6372:()=>d("default","dayjs",[1,1],(()=>g.e(464).then((()=>()=>g(3464)))))},h={112:[6112],343:[1343],433:[5260,8877],436:[6372],853:[1083,3150,6966]},g.f.consumes=(e,r)=>{g.o(h,e)&&h[e].forEach((e=>{if(g.o(f,e))return r.push(f[e]);var t=r=>{f[e]=0,g.m[e]=t=>{delete g.c[e],t.exports=r()}},n=r=>{delete f[e],g.m[e]=t=>{throw delete g.c[e],r}};try{var o=c[e]();o.then?r.push(f[e]=o.then(t).catch(n)):t(o)}catch(e){n(e)}}))},(()=>{var e={0:0};g.f.j=(r,t)=>{var n=g.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(112|343|853)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var a=g.p+g.u(r),i=new Error;g.l(a,(t=>{if(g.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+o+": "+a+")",i.name="ChunkLoadError",i.type=o,i.request=a,n[1](i)}}),"chunk-"+r,r)}};var r=(r,t)=>{var n,o,[a,i,s]=t,l=0;if(a.some((r=>0!==e[r]))){for(n in i)g.o(i,n)&&(g.m[n]=i[n]);s&&s(g)}for(r&&r(t);l<a.length;l++)o=a[l],g.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=globalThis.webpackChunk_openmrs_esm_patient_conditions_app=globalThis.webpackChunk_openmrs_esm_patient_conditions_app||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),g.nc=void 0;var b=g(3801);_openmrs_esm_patient_conditions_app=b})();
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"auxiliaryFiles": [
|
|
25
25
|
"openmrs-esm-patient-conditions-app.js.map"
|
|
26
26
|
],
|
|
27
|
-
"hash": "
|
|
27
|
+
"hash": "2087ccf74d9e2f0b",
|
|
28
28
|
"childrenByOrder": {}
|
|
29
29
|
},
|
|
30
30
|
{
|
|
@@ -526,9 +526,9 @@
|
|
|
526
526
|
"entry": false,
|
|
527
527
|
"recorded": false,
|
|
528
528
|
"reason": "reused as split chunk (cache group: default)",
|
|
529
|
-
"size":
|
|
529
|
+
"size": 75215,
|
|
530
530
|
"sizes": {
|
|
531
|
-
"javascript":
|
|
531
|
+
"javascript": 75173,
|
|
532
532
|
"consume-shared": 42
|
|
533
533
|
},
|
|
534
534
|
"names": [],
|
|
@@ -543,7 +543,7 @@
|
|
|
543
543
|
"auxiliaryFiles": [
|
|
544
544
|
"436.js.map"
|
|
545
545
|
],
|
|
546
|
-
"hash": "
|
|
546
|
+
"hash": "71343cf8a97d5b06",
|
|
547
547
|
"childrenByOrder": {}
|
|
548
548
|
},
|
|
549
549
|
{
|
|
@@ -755,9 +755,9 @@
|
|
|
755
755
|
"initial": false,
|
|
756
756
|
"entry": false,
|
|
757
757
|
"recorded": false,
|
|
758
|
-
"size":
|
|
758
|
+
"size": 146044,
|
|
759
759
|
"sizes": {
|
|
760
|
-
"javascript":
|
|
760
|
+
"javascript": 146044
|
|
761
761
|
},
|
|
762
762
|
"names": [],
|
|
763
763
|
"idHints": [],
|
|
@@ -770,7 +770,7 @@
|
|
|
770
770
|
"auxiliaryFiles": [
|
|
771
771
|
"688.js.map"
|
|
772
772
|
],
|
|
773
|
-
"hash": "
|
|
773
|
+
"hash": "3fe12dbda294b8e5",
|
|
774
774
|
"childrenByOrder": {}
|
|
775
775
|
},
|
|
776
776
|
{
|
|
@@ -846,10 +846,10 @@
|
|
|
846
846
|
"initial": true,
|
|
847
847
|
"entry": true,
|
|
848
848
|
"recorded": false,
|
|
849
|
-
"size":
|
|
849
|
+
"size": 2532469,
|
|
850
850
|
"sizes": {
|
|
851
851
|
"consume-shared": 210,
|
|
852
|
-
"javascript":
|
|
852
|
+
"javascript": 2510517,
|
|
853
853
|
"share-init": 336,
|
|
854
854
|
"runtime": 21406
|
|
855
855
|
},
|
|
@@ -866,7 +866,7 @@
|
|
|
866
866
|
"auxiliaryFiles": [
|
|
867
867
|
"main.js.map"
|
|
868
868
|
],
|
|
869
|
-
"hash": "
|
|
869
|
+
"hash": "feac46279d4e2843",
|
|
870
870
|
"childrenByOrder": {}
|
|
871
871
|
},
|
|
872
872
|
{
|
package/dist/routes.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"extensions":[{"name":"conditions-overview-widget","slot":"patient-chart-summary-dashboard-slot","component":"conditionsOverview","order":3,"meta":{"fullWidth":false}},{"name":"conditions-details-widget","slot":"patient-chart-conditions-dashboard-slot","component":"conditionsDetailedSummary","meta":{"fullWidth":false}},{"name":"conditions-summary-dashboard","component":"conditionsDashboardLink","slot":"patient-chart-dashboard-slot","order":7,"meta":{"slot":"patient-chart-conditions-dashboard-slot","path":"Conditions"}},{"name":"conditions-widget","component":"conditionsWidget"},{"name":"condition-delete-confirmation-dialog","component":"conditionDeleteConfirmationDialog"}],"workspaces":[{"name":"conditions-form-workspace","title":"recordCondition","component":"conditionsFormWorkspace"}],"version":"8.2.1-pre.
|
|
1
|
+
{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"extensions":[{"name":"conditions-overview-widget","slot":"patient-chart-summary-dashboard-slot","component":"conditionsOverview","order":3,"meta":{"fullWidth":false}},{"name":"conditions-details-widget","slot":"patient-chart-conditions-dashboard-slot","component":"conditionsDetailedSummary","meta":{"fullWidth":false}},{"name":"conditions-summary-dashboard","component":"conditionsDashboardLink","slot":"patient-chart-dashboard-slot","order":7,"meta":{"slot":"patient-chart-conditions-dashboard-slot","path":"Conditions"}},{"name":"conditions-widget","component":"conditionsWidget"},{"name":"condition-delete-confirmation-dialog","component":"conditionDeleteConfirmationDialog"}],"workspaces":[{"name":"conditions-form-workspace","title":"recordCondition","component":"conditionsFormWorkspace"}],"version":"8.2.1-pre.6248"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openmrs/esm-patient-conditions-app",
|
|
3
|
-
"version": "8.2.1-pre.
|
|
3
|
+
"version": "8.2.1-pre.6248",
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
5
|
"description": "Patient conditions microfrontend for the OpenMRS SPA",
|
|
6
6
|
"browser": "dist/openmrs-esm-patient-conditions-app.js",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@carbon/react": "^1.12.0",
|
|
41
|
-
"@openmrs/esm-patient-common-lib": "^8.2.1-pre.
|
|
41
|
+
"@openmrs/esm-patient-common-lib": "^8.2.1-pre.6248",
|
|
42
42
|
"lodash-es": "^4.17.21"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"swr": "2.x"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@openmrs/esm-patient-common-lib": "8.2.1-pre.
|
|
55
|
+
"@openmrs/esm-patient-common-lib": "8.2.1-pre.6248",
|
|
56
56
|
"webpack": "^5.94.0"
|
|
57
57
|
},
|
|
58
58
|
"stableVersion": "8.2.0"
|
|
@@ -49,6 +49,15 @@ interface RequiredFieldLabelProps {
|
|
|
49
49
|
t: TFunction;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
+
interface SearchResultsProps {
|
|
53
|
+
isSearching: boolean;
|
|
54
|
+
onConditionChange: (condition: CodedCondition) => void;
|
|
55
|
+
searchResults: CodedCondition[];
|
|
56
|
+
selectedCondition: CodedCondition;
|
|
57
|
+
t: TFunction;
|
|
58
|
+
value: string;
|
|
59
|
+
}
|
|
60
|
+
|
|
52
61
|
const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
|
|
53
62
|
closeWorkspaceWithSavedChanges,
|
|
54
63
|
conditionToEdit,
|
|
@@ -101,8 +110,8 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
|
|
|
101
110
|
|
|
102
111
|
const payload: FormFields = {
|
|
103
112
|
clinicalStatus: getValues('clinicalStatus'),
|
|
104
|
-
conceptId: selectedCondition?.
|
|
105
|
-
display: selectedCondition?.
|
|
113
|
+
conceptId: selectedCondition?.uuid,
|
|
114
|
+
display: selectedCondition?.display,
|
|
106
115
|
abatementDateTime: getValues('abatementDateTime') ? dayjs(getValues('abatementDateTime')).format() : null,
|
|
107
116
|
onsetDateTime: getValues('onsetDateTime') ? dayjs(getValues('onsetDateTime')).format() : null,
|
|
108
117
|
patientId: patientUuid,
|
|
@@ -187,7 +196,9 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
|
|
|
187
196
|
searchInputRef?.current?.focus();
|
|
188
197
|
};
|
|
189
198
|
|
|
190
|
-
const handleSearchTermChange = (
|
|
199
|
+
const handleSearchTermChange = (searchTerm: string) => {
|
|
200
|
+
setSearchTerm(searchTerm);
|
|
201
|
+
};
|
|
191
202
|
|
|
192
203
|
useEffect(() => {
|
|
193
204
|
if (errors?.conditionName) {
|
|
@@ -218,24 +229,24 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
|
|
|
218
229
|
<ResponsiveWrapper>
|
|
219
230
|
<Search
|
|
220
231
|
autoFocus
|
|
221
|
-
ref={searchInputRef}
|
|
222
|
-
size="md"
|
|
223
|
-
id="conditionsSearch"
|
|
224
|
-
labelText={t('enterCondition', 'Enter condition')}
|
|
225
|
-
placeholder={t('searchConditions', 'Search conditions')}
|
|
226
232
|
className={classNames({
|
|
227
233
|
[styles.conditionsError]: errors?.conditionName,
|
|
228
234
|
})}
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
235
|
+
disabled={isEditing}
|
|
236
|
+
id="conditionsSearch"
|
|
237
|
+
labelText={t('enterCondition', 'Enter condition')}
|
|
238
|
+
onChange={(event) => {
|
|
239
|
+
const value = event.target.value;
|
|
240
|
+
onChange(value);
|
|
241
|
+
handleSearchTermChange(value);
|
|
232
242
|
}}
|
|
233
|
-
renderIcon={errors?.conditionName && ((props) => <WarningFilled fill="red" {...props} />)}
|
|
234
243
|
onClear={() => {
|
|
235
244
|
setSearchTerm('');
|
|
236
245
|
setSelectedCondition(null);
|
|
237
246
|
}}
|
|
238
|
-
|
|
247
|
+
placeholder={t('searchConditions', 'Search conditions')}
|
|
248
|
+
ref={searchInputRef}
|
|
249
|
+
renderIcon={errors?.conditionName && ((props) => <WarningFilled fill="red" {...props} />)}
|
|
239
250
|
value={(() => {
|
|
240
251
|
if (selectedCondition) {
|
|
241
252
|
return selectedCondition.display;
|
|
@@ -249,36 +260,14 @@ const ConditionsWidget: React.FC<ConditionsWidgetProps> = ({
|
|
|
249
260
|
)}
|
|
250
261
|
/>
|
|
251
262
|
{errors?.conditionName && <p className={styles.errorMessage}>{errors?.conditionName?.message}</p>}
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
<li
|
|
261
|
-
role="menuitem"
|
|
262
|
-
className={styles.condition}
|
|
263
|
-
key={searchResult?.concept?.uuid}
|
|
264
|
-
onClick={() => handleConditionChange(searchResult)}
|
|
265
|
-
>
|
|
266
|
-
{searchResult.display}
|
|
267
|
-
</li>
|
|
268
|
-
))}
|
|
269
|
-
</ul>
|
|
270
|
-
);
|
|
271
|
-
}
|
|
272
|
-
return (
|
|
273
|
-
<Layer>
|
|
274
|
-
<Tile className={styles.emptyResults}>
|
|
275
|
-
<span>
|
|
276
|
-
{t('noResultsFor', 'No results for')} <strong>"{debouncedSearchTerm}"</strong>
|
|
277
|
-
</span>
|
|
278
|
-
</Tile>
|
|
279
|
-
</Layer>
|
|
280
|
-
);
|
|
281
|
-
})()}
|
|
263
|
+
<SearchResults
|
|
264
|
+
isSearching={isSearching}
|
|
265
|
+
onConditionChange={handleConditionChange}
|
|
266
|
+
searchResults={searchResults}
|
|
267
|
+
selectedCondition={selectedCondition}
|
|
268
|
+
t={t}
|
|
269
|
+
value={searchTerm}
|
|
270
|
+
/>
|
|
282
271
|
</>
|
|
283
272
|
)}
|
|
284
273
|
</FormGroup>
|
|
@@ -368,4 +357,48 @@ function RequiredFieldLabel({ label, t }: RequiredFieldLabelProps) {
|
|
|
368
357
|
);
|
|
369
358
|
}
|
|
370
359
|
|
|
360
|
+
function SearchResults({
|
|
361
|
+
isSearching,
|
|
362
|
+
onConditionChange,
|
|
363
|
+
searchResults,
|
|
364
|
+
selectedCondition,
|
|
365
|
+
t,
|
|
366
|
+
value,
|
|
367
|
+
}: SearchResultsProps) {
|
|
368
|
+
if (!value || selectedCondition) {
|
|
369
|
+
return null;
|
|
370
|
+
}
|
|
371
|
+
|
|
372
|
+
if (isSearching) {
|
|
373
|
+
return <InlineLoading className={styles.loader} description={t('searching', 'Searching') + '...'} />;
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
if (!isSearching && searchResults?.length > 0) {
|
|
377
|
+
return (
|
|
378
|
+
<ul className={styles.conditionsList}>
|
|
379
|
+
{searchResults?.map((searchResult) => (
|
|
380
|
+
<li
|
|
381
|
+
className={styles.condition}
|
|
382
|
+
key={searchResult?.uuid}
|
|
383
|
+
onClick={() => onConditionChange(searchResult)}
|
|
384
|
+
role="menuitem"
|
|
385
|
+
>
|
|
386
|
+
{searchResult.display}
|
|
387
|
+
</li>
|
|
388
|
+
))}
|
|
389
|
+
</ul>
|
|
390
|
+
);
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
return (
|
|
394
|
+
<Layer>
|
|
395
|
+
<Tile className={styles.emptyResults}>
|
|
396
|
+
<span>
|
|
397
|
+
{t('noResultsFor', 'No results for')} <strong>"{value}"</strong>
|
|
398
|
+
</span>
|
|
399
|
+
</Tile>
|
|
400
|
+
</Layer>
|
|
401
|
+
);
|
|
402
|
+
}
|
|
403
|
+
|
|
371
404
|
export default ConditionsWidget;
|
|
@@ -25,15 +25,8 @@ export interface ConditionDataTableRow {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
export type CodedCondition = {
|
|
28
|
-
concept: {
|
|
29
|
-
uuid: string;
|
|
30
|
-
display: string;
|
|
31
|
-
};
|
|
32
|
-
conceptName: {
|
|
33
|
-
uuid: string;
|
|
34
|
-
display: string;
|
|
35
|
-
};
|
|
36
28
|
display: string;
|
|
29
|
+
uuid: string;
|
|
37
30
|
};
|
|
38
31
|
|
|
39
32
|
type CreatePayload = {
|
|
@@ -106,7 +99,8 @@ export function useConditions(patientUuid: string) {
|
|
|
106
99
|
export function useConditionsSearch(conditionToLookup: string) {
|
|
107
100
|
const config = useConfig();
|
|
108
101
|
const conditionConceptClassUuid = config?.conditionConceptClassUuid;
|
|
109
|
-
const conditionsSearchUrl = `${restBaseUrl}/
|
|
102
|
+
const conditionsSearchUrl = `${restBaseUrl}/concept?name=${conditionToLookup}&searchType=fuzzy&class=${conditionConceptClassUuid}&v=custom:(uuid,display)`;
|
|
103
|
+
|
|
110
104
|
const { data, error, isLoading } = useSWR<{ data: { results: Array<CodedCondition> } }, Error>(
|
|
111
105
|
conditionToLookup ? conditionsSearchUrl : null,
|
|
112
106
|
openmrsFetch,
|
|
@@ -114,7 +108,7 @@ export function useConditionsSearch(conditionToLookup: string) {
|
|
|
114
108
|
|
|
115
109
|
return {
|
|
116
110
|
searchResults: data?.data?.results ?? [],
|
|
117
|
-
error
|
|
111
|
+
error,
|
|
118
112
|
isSearching: isLoading,
|
|
119
113
|
};
|
|
120
114
|
}
|