@openmrs/esm-patient-search-app 3.0.2-pre.309 → 3.0.2-pre.310

package/dist/745.js

@@ -1,2 +1,2 @@
-(self.webpackChunk_openmrs_esm_patient_search_app=self.webpackChunk_openmrs_esm_patient_search_app||[]).push([[745],{7745:(e,t,n)=>{"use strict";n.r(t),n.d(t,{backendDependencies:()=>i,frontendDependencies:()=>p,importTranslation:()=>s,setupOpenMRS:()=>o});var a=n(9035);const r={search:{patientResultUrl:{_default:"${openmrsSpaBase}/patient/${patientUuid}/chart",_description:"Where clicking a patient result takes the user. Accepts template parameter ${patientUuid}",_validators:[a.validators.isUrlWithTemplateParameters(["patientUuid"])]}}},s=n(3979),i={"webservices.rest":"^2.2.0"},p={"@openmrs/esm-framework":"^3.1.15-pre.861"};function o(){const e="@openmrs/esm-patient-search-app",t={featureName:"patient-search",moduleName:e};return(0,a.defineConfigSchema)(e,r),{extensions:[{id:"patient-search-icon",slot:"top-nav-actions-slot",order:0,load:(0,a.getAsyncLifecycle)((()=>Promise.all([n.e(852),n.e(902),n.e(60)]).then(n.bind(n,5238))),t)}]}}},3979:(e,t,n)=>{var a={"./en.json":[3574,574],"./es.json":[8319,319]};function r(e){if(!n.o(a,e))return Promise.resolve().then((()=>{var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}));var t=a[e],r=t[0];return n.e(t[1]).then((()=>n(r)))}r.keys=()=>Object.keys(a),r.id=3979,e.exports=r}}]);
+(self.webpackChunk_openmrs_esm_patient_search_app=self.webpackChunk_openmrs_esm_patient_search_app||[]).push([[745],{7745:(e,t,n)=>{"use strict";n.r(t),n.d(t,{backendDependencies:()=>i,frontendDependencies:()=>p,importTranslation:()=>r,setupOpenMRS:()=>o});var a=n(9035);const s={search:{patientResultUrl:{_default:"${openmrsSpaBase}/patient/${patientUuid}/chart",_description:"Where clicking a patient result takes the user. Accepts template parameter ${patientUuid}",_validators:[a.validators.isUrlWithTemplateParameters(["patientUuid"])]}},includeDead:{_type:a.Type.Boolean,_default:!0,_description:"Whether to include dead patients in search results"}},r=n(3979),i={"webservices.rest":"^2.2.0"},p={"@openmrs/esm-framework":"^3.1.15-pre.861"};function o(){const e="@openmrs/esm-patient-search-app",t={featureName:"patient-search",moduleName:e};return(0,a.defineConfigSchema)(e,s),{extensions:[{id:"patient-search-icon",slot:"top-nav-actions-slot",order:0,load:(0,a.getAsyncLifecycle)((()=>Promise.all([n.e(852),n.e(902),n.e(60)]).then(n.bind(n,5238))),t)}]}}},3979:(e,t,n)=>{var a={"./en.json":[3574,574],"./es.json":[8319,319]};function s(e){if(!n.o(a,e))return Promise.resolve().then((()=>{var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}));var t=a[e],s=t[0];return n.e(t[1]).then((()=>n(s)))}s.keys=()=>Object.keys(a),s.id=3979,e.exports=s}}]);
 //# sourceMappingURL=745.js.map

package/dist/745.js.map

@@ -1 +1 @@
-{"version":3,"file":"745.js","mappings":"+QACO,MAAMA,EAAe,CAC1BC,OAAQ,CACNC,iBAAkB,CAChBC,SAAU,iDACVC,aAAc,4FACdC,YAAa,CAACC,EAAAA,WAAAA,4BAAuC,CAAC,oBCHtDC,EAAoBC,EAAAA,MAEpBC,EAAsB,CAC1B,mBAAoB,UAGhBC,EAAuB,CAC3B,yBAA0BC,mBAG5B,SAASC,IACP,MAAMC,EAAa,kCAEbC,EAAU,CACdC,YAAa,iBACbF,WAAAA,GAKF,OAFAG,EAAAA,EAAAA,oBAAmBH,EAAYb,GAExB,CACLiB,WAAY,CACV,CACEC,GAAI,sBACJC,KAAM,uBACNC,MAAO,EACPC,MAAMC,EAAAA,EAAAA,oBAAkB,IAAM,+DAA+DR,Q,eC7BrG,IAAIS,EAAM,CACT,YAAa,CACZ,KACA,KAED,YAAa,CACZ,KACA,MAGF,SAASC,EAAoBC,GAC5B,IAAIC,EAAoBC,EAAEJ,EAAKE,GAC9B,OAAOG,QAAQC,UAAUC,MAAK,KAC7B,IAAIC,EAAI,IAAIC,MAAM,uBAAyBP,EAAM,KAEjD,MADAM,EAAEE,KAAO,mBACHF,KAIR,IAAIG,EAAMX,EAAIE,GAAMP,EAAKgB,EAAI,GAC7B,OAAOR,EAAoBK,EAAEG,EAAI,IAAIJ,MAAK,IAClCJ,EAAoBR,KAG7BM,EAAoBW,KAAO,IAAOC,OAAOD,KAAKZ,GAC9CC,EAAoBN,GAAK,KACzBmB,EAAOC,QAAUd","sources":["webpack://@openmrs/esm-patient-search-app/./src/config-schema.ts","webpack://@openmrs/esm-patient-search-app/./src/index.ts","webpack://@openmrs/esm-patient-search-app//home/runner/work/openmrs-esm-patient-management/openmrs-esm-patient-management/packages/esm-patient-search-app/translations|lazy|nonrecursive|/.json$/"],"sourcesContent":["import { Type, validators } from '@openmrs/esm-framework';\nexport const configSchema = {\n  search: {\n    patientResultUrl: {\n      _default: '${openmrsSpaBase}/patient/${patientUuid}/chart',\n      _description: 'Where clicking a patient result takes the user. Accepts template parameter ${patientUuid}',\n      _validators: [validators.isUrlWithTemplateParameters(['patientUuid'])],\n    },\n  },\n};\n","import { defineConfigSchema, getAsyncLifecycle } from '@openmrs/esm-framework';\nimport { configSchema } from './config-schema';\n\nconst importTranslation = require.context('../translations', false, /.json$/, 'lazy');\n\nconst backendDependencies = {\n  'webservices.rest': '^2.2.0',\n};\n\nconst frontendDependencies = {\n  '@openmrs/esm-framework': process.env.FRAMEWORK_VERSION,\n};\n\nfunction setupOpenMRS() {\n  const moduleName = '@openmrs/esm-patient-search-app';\n\n  const options = {\n    featureName: 'patient-search',\n    moduleName,\n  };\n\n  defineConfigSchema(moduleName, configSchema);\n\n  return {\n    extensions: [\n      {\n        id: 'patient-search-icon',\n        slot: 'top-nav-actions-slot',\n        order: 0,\n        load: getAsyncLifecycle(() => import('./patient-search-icon/patient-search-icon.component'), options),\n      },\n    ],\n  };\n}\n\nexport { backendDependencies, frontendDependencies, importTranslation, setupOpenMRS };\n","var map = {\n\t\"./en.json\": [\n\t\t3574,\n\t\t574\n\t],\n\t\"./es.json\": [\n\t\t8319,\n\t\t319\n\t]\n};\nfunction webpackAsyncContext(req) {\n\tif(!__webpack_require__.o(map, req)) {\n\t\treturn Promise.resolve().then(() => {\n\t\t\tvar e = new Error(\"Cannot find module '\" + req + \"'\");\n\t\t\te.code = 'MODULE_NOT_FOUND';\n\t\t\tthrow e;\n\t\t});\n\t}\n\n\tvar ids = map[req], id = ids[0];\n\treturn __webpack_require__.e(ids[1]).then(() => {\n\t\treturn __webpack_require__(id);\n\t});\n}\nwebpackAsyncContext.keys = () => (Object.keys(map));\nwebpackAsyncContext.id = 3979;\nmodule.exports = webpackAsyncContext;"],"names":["configSchema","search","patientResultUrl","_default","_description","_validators","validators","importTranslation","require","backendDependencies","frontendDependencies","process","setupOpenMRS","moduleName","options","featureName","defineConfigSchema","extensions","id","slot","order","load","getAsyncLifecycle","map","webpackAsyncContext","req","__webpack_require__","o","Promise","resolve","then","e","Error","code","ids","keys","Object","module","exports"],"sourceRoot":""}
+{"version":3,"file":"745.js","mappings":"+QACO,MAAMA,EAAe,CAC1BC,OAAQ,CACNC,iBAAkB,CAChBC,SAAU,iDACVC,aAAc,4FACdC,YAAa,CAACC,EAAAA,WAAAA,4BAAuC,CAAC,mBAG1DC,YAAa,CACXC,MAAOC,EAAAA,KAAAA,QACPN,UAAU,EACVC,aAAc,uDCTZM,EAAoBC,EAAAA,MAEpBC,EAAsB,CAC1B,mBAAoB,UAGhBC,EAAuB,CAC3B,yBAA0BC,mBAG5B,SAASC,IACP,MAAMC,EAAa,kCAEbC,EAAU,CACdC,YAAa,iBACbF,WAAAA,GAKF,OAFAG,EAAAA,EAAAA,oBAAmBH,EAAYhB,GAExB,CACLoB,WAAY,CACV,CACEC,GAAI,sBACJC,KAAM,uBACNC,MAAO,EACPC,MAAMC,EAAAA,EAAAA,oBAAkB,IAAM,+DAA+DR,Q,eC7BrG,IAAIS,EAAM,CACT,YAAa,CACZ,KACA,KAED,YAAa,CACZ,KACA,MAGF,SAASC,EAAoBC,GAC5B,IAAIC,EAAoBC,EAAEJ,EAAKE,GAC9B,OAAOG,QAAQC,UAAUC,MAAK,KAC7B,IAAIC,EAAI,IAAIC,MAAM,uBAAyBP,EAAM,KAEjD,MADAM,EAAEE,KAAO,mBACHF,KAIR,IAAIG,EAAMX,EAAIE,GAAMP,EAAKgB,EAAI,GAC7B,OAAOR,EAAoBK,EAAEG,EAAI,IAAIJ,MAAK,IAClCJ,EAAoBR,KAG7BM,EAAoBW,KAAO,IAAOC,OAAOD,KAAKZ,GAC9CC,EAAoBN,GAAK,KACzBmB,EAAOC,QAAUd","sources":["webpack://@openmrs/esm-patient-search-app/./src/config-schema.ts","webpack://@openmrs/esm-patient-search-app/./src/index.ts","webpack://@openmrs/esm-patient-search-app//home/runner/work/openmrs-esm-patient-management/openmrs-esm-patient-management/packages/esm-patient-search-app/translations|lazy|nonrecursive|/.json$/"],"sourcesContent":["import { Type, validators } from '@openmrs/esm-framework';\nexport const configSchema = {\n  search: {\n    patientResultUrl: {\n      _default: '${openmrsSpaBase}/patient/${patientUuid}/chart',\n      _description: 'Where clicking a patient result takes the user. Accepts template parameter ${patientUuid}',\n      _validators: [validators.isUrlWithTemplateParameters(['patientUuid'])],\n    },\n  },\n  includeDead: {\n    _type: Type.Boolean,\n    _default: true,\n    _description: 'Whether to include dead patients in search results',\n  },\n};\n","import { defineConfigSchema, getAsyncLifecycle } from '@openmrs/esm-framework';\nimport { configSchema } from './config-schema';\n\nconst importTranslation = require.context('../translations', false, /.json$/, 'lazy');\n\nconst backendDependencies = {\n  'webservices.rest': '^2.2.0',\n};\n\nconst frontendDependencies = {\n  '@openmrs/esm-framework': process.env.FRAMEWORK_VERSION,\n};\n\nfunction setupOpenMRS() {\n  const moduleName = '@openmrs/esm-patient-search-app';\n\n  const options = {\n    featureName: 'patient-search',\n    moduleName,\n  };\n\n  defineConfigSchema(moduleName, configSchema);\n\n  return {\n    extensions: [\n      {\n        id: 'patient-search-icon',\n        slot: 'top-nav-actions-slot',\n        order: 0,\n        load: getAsyncLifecycle(() => import('./patient-search-icon/patient-search-icon.component'), options),\n      },\n    ],\n  };\n}\n\nexport { backendDependencies, frontendDependencies, importTranslation, setupOpenMRS };\n","var map = {\n\t\"./en.json\": [\n\t\t3574,\n\t\t574\n\t],\n\t\"./es.json\": [\n\t\t8319,\n\t\t319\n\t]\n};\nfunction webpackAsyncContext(req) {\n\tif(!__webpack_require__.o(map, req)) {\n\t\treturn Promise.resolve().then(() => {\n\t\t\tvar e = new Error(\"Cannot find module '\" + req + \"'\");\n\t\t\te.code = 'MODULE_NOT_FOUND';\n\t\t\tthrow e;\n\t\t});\n\t}\n\n\tvar ids = map[req], id = ids[0];\n\treturn __webpack_require__.e(ids[1]).then(() => {\n\t\treturn __webpack_require__(id);\n\t});\n}\nwebpackAsyncContext.keys = () => (Object.keys(map));\nwebpackAsyncContext.id = 3979;\nmodule.exports = webpackAsyncContext;"],"names":["configSchema","search","patientResultUrl","_default","_description","_validators","validators","includeDead","_type","Type","importTranslation","require","backendDependencies","frontendDependencies","process","setupOpenMRS","moduleName","options","featureName","defineConfigSchema","extensions","id","slot","order","load","getAsyncLifecycle","map","webpackAsyncContext","req","__webpack_require__","o","Promise","resolve","then","e","Error","code","ids","keys","Object","module","exports"],"sourceRoot":""}

package/dist/openmrs-esm-patient-search-app.js.buildmanifest.json

@@ -5,9 +5,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 184219,
+      "size": 184515,
       "sizes": {
-        "javascript": 184135,
+        "javascript": 184431,
         "consume-shared": 84
       },
       "names": [],
@@ -21,7 +21,7 @@
       "auxiliaryFiles": [
         "60.js.map"
       ],
-      "hash": "36f04835100161f76493",
+      "hash": "d1a616751a03d596b0ea",
       "childrenByOrder": {}
     },
     {
@@ -199,9 +199,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1492,
+      "size": 1636,
       "sizes": {
-        "javascript": 1450,
+        "javascript": 1594,
         "consume-shared": 42
       },
       "names": [],
@@ -215,7 +215,7 @@
       "auxiliaryFiles": [
         "745.js.map"
       ],
-      "hash": "8dee4a855d31f72297d1",
+      "hash": "9861ab69372bd723d02a",
       "childrenByOrder": {}
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-search-app",
-  "version": "3.0.2-pre.309",
+  "version": "3.0.2-pre.310",
   "description": "Patient search microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-search-app.js",
   "main": "src/index.ts",
@@ -49,5 +49,5 @@
     "react-router-dom": "5.x",
     "rxjs": "6.x"
   },
-  "gitHead": "58591548ef12622e3ebcffe32efe586a4dc77788"
+  "gitHead": "1b1d001b93abb0971ab8c730f5fc0580430dc3e1"
 }

package/src/config-schema.ts

@@ -7,4 +7,9 @@ export const configSchema = {
       _validators: [validators.isUrlWithTemplateParameters(['patientUuid'])],
     },
   },
+  includeDead: {
+    _type: Type.Boolean,
+    _default: true,
+    _description: 'Whether to include dead patients in search results',
+  },
 };

package/src/patient-search/patient-search.resource.tsx

@@ -1,7 +1,8 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
 
-export function performPatientSearch(query: string, objectVersion: string, ac: AbortController) {
-  return openmrsFetch(`/ws/rest/v1/patient?q=${query}&v=${objectVersion}`, {
+export function performPatientSearch(query: string, objectVersion: string, ac: AbortController, includeDead: boolean) {
+  const url = `/ws/rest/v1/patient?q=${query}&v=${objectVersion}&includeDead=${includeDead}`;
+  return openmrsFetch(url, {
     method: 'GET',
     signal: ac.signal,
   });

package/src/patient-search-icon/patient-search-icon.component.scss

@@ -41,15 +41,15 @@ $inverse-02:#393939;
 }
 
 .searchIconButton {
-  background-color: $brand-01;
+  background-color: var(--brand-01);
 }
 
 .activeSearchIconButton {
-  background-color: $brand-02;
+  background-color: var(--brand-02);
 }
 
 .closeButton {
-  background-color: $brand-02;
+  background-color: var(--brand-02);
 }
 
 .searchButton {

package/src/patient-search-icon/patient-search-icon.component.tsx

@@ -5,7 +5,7 @@ import { Button, HeaderGlobalAction, Search } from 'carbon-components-react';
 import PatientSearch from '../patient-search/patient-search.component';
 import { useTranslation } from 'react-i18next';
 import debounce from 'lodash-es/debounce';
-import { useLayoutType } from '@openmrs/esm-framework';
+import { useConfig, useLayoutType } from '@openmrs/esm-framework';
 import { performPatientSearch } from '../patient-search/patient-search.resource';
 import isEmpty from 'lodash-es/isEmpty';
 import { SearchedPatient } from '../types';
@@ -59,10 +59,11 @@ const searchTimeout = 300;
 const customRepresentation =
   'custom:(patientId,uuid,identifiers,display,' +
   'patientIdentifier:(uuid,identifier),' +
-  'person:(gender,age,birthdate,birthdateEstimated,personName,addresses,display),' +
+  'person:(gender,age,birthdate,birthdateEstimated,personName,addresses,display,dead,deathDate),' +
   'attributes:(value,attributeType:(name)))';
 
 const PatientSearchLaunch: React.FC<PatientSearchLaunchProps> = () => {
+  const config = useConfig();
   const { t } = useTranslation();
   const layout = useLayoutType();
   const [open, setOpen] = useState<boolean>(false);
@@ -77,7 +78,7 @@ const PatientSearchLaunch: React.FC<PatientSearchLaunchProps> = () => {
   useEffect(() => {
     if (searchTerm && status === 'searching') {
       const ac = new AbortController();
-      performPatientSearch(searchTerm, customRepresentation, ac).then(
+      performPatientSearch(searchTerm, customRepresentation, ac, config.includeDead).then(
         ({ data }) => {
           const results: Array<SearchedPatient> = data.results.map((res, i) => ({
             ...res,
@@ -91,7 +92,7 @@ const PatientSearchLaunch: React.FC<PatientSearchLaunchProps> = () => {
       );
       return () => ac.abort();
     }
-  }, [searchTerm, status]);
+  }, [config.includeDead, searchTerm, status]);
 
   const handleEnterKeyPressed = (event: React.KeyboardEvent<HTMLInputElement>) =>
     event.key.toLowerCase() === 'enter' && performSearch();

package/src/patient-search-result/patient-search-result.component.tsx

@@ -28,6 +28,8 @@ const PatientSearchResults: React.FC<PatientSearchResultsProps> = ({ patients, h
         ],
         gender: patient.person.gender,
         birthDate: patient.person.birthdate,
+        deceasedDateTime: patient.person.deathDate,
+        deceasedBoolean: patient.person.death,
         identifier: [
           {
             value: patient.patientIdentifier.identifier,

package/src/types/index.ts

@@ -9,6 +9,8 @@ export interface SearchedPatient {
     birthdate: string;
     display: string;
     gender: string;
+    death: boolean;
+    deathDate: string;
     personName: {
       givenName: string;
       familyName: string;