Merge pull request #50 from the-commons-project/develop

surfdoc · web-flow · commit fa75f60e1da5 · 2023-09-13T14:19:14.000-04:00
Develop to Main
diff --git a/README.md b/README.md
@@ -100,6 +100,3 @@ You can accomplish this by using the following commands. Note that this should b
 ```
 git tag v0.4.4-dev2
 ```
-
-# TO DO:
-* Add github workflows for production deployment
diff --git a/public/captureQR.html b/public/captureQR.html
@@ -4,30 +4,39 @@
 
     <title>SHC Reader Capture Window</title>
     <script src='qr-scanner.umd.min.js'></script>
+	<script src="switchCamera.js"></script>
 
   </head>
   <body>
 
 	<video id='video' style='width: 400px; height: 225px;'></video>
+	<div id='switchCamera' style='display: none; margin-top: 8px;'>
+	  <button onclick='sc.switchCameraClick()'>Switch Camera</button>
+	</div>
   
     <script>
 
 	  const handleQR = (result) => {
 		window.opener.openCameraResult(result.data);
 		window.close();
 	  }
+
+	  const hash = window.location.hash;
+	  const defaultMode = (hash ? hash.substring(1) : 'environment');
 	  
 	  const qrScanner = new QrScanner(
 		document.getElementById('video'),
 		handleQR,
 		{
-		  preferredCamera: 'user',
+		  preferredCamera: sc.getSelectedCamera(defaultMode),
 		  highlightScanRegion: true,
 		  highlightCodeOutline: true,
 		  returnDetailedScanResult: true
 		});
 
-	  qrScanner.start();
+	  qrScanner.start().then(() => {
+		sc.maybeShowSwitchCamera(qrScanner, 'switchCamera');
+	  });
 	  
     </script>
 
diff --git a/public/index.html b/public/index.html
@@ -5,6 +5,7 @@
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content="Web site created using create-react-app" />
+	<script type="text/javascript" src="%PUBLIC_URL%/switchCamera.js"></script>
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/public/switchCamera.js b/public/switchCamera.js
@@ -0,0 +1,135 @@
+
+// +--------------------------+
+// | sc.maybeShowSwitchCamera |
+// +--------------------------+
+
+async function maybeShowSwitchCamera(qrScanner, divId) {
+
+  const camIds = await listCameraIds();
+  if (camIds.length === 1) return;
+
+  window.sc._scanner = qrScanner;
+  document.getElementById(divId).style.display = 'block';
+}
+
+// +--------------------+
+// | getSelectedCamera  |
+// | saveSelectedCamera |
+// +--------------------+
+
+function getSelectedCamera(defaultIdMode) {
+  const cached = localStorage.getItem('cameraIdMode');
+  return(cached || defaultIdMode);
+}
+
+function saveSelectedCamera(cameraIdMode) {
+  try { localStorage.setItem('cameraIdMode', cameraIdMode); }
+  catch (err) { console.error(err.toString()); }
+}
+
+// +---------------------------+
+// | switchCameraClick         |
+// | switchCameraClickInternal |
+// +---------------------------+
+
+// deal with double-clickness and defer actual work to switchCameraAction
+
+let switchTimer = undefined;
+const dblClickMillis = 250;
+
+async function switchCameraClick() {
+  switchCameraClickInternal(false);
+}
+
+async function switchCameraClickInternal(isTimer) {
+
+  if (isTimer) {
+	// double-click timeout --- single
+	switchTimer = undefined;
+	await switchCameraAction(false);
+  }
+  else if (switchTimer) {
+	// second click within period --- double
+	clearTimeout(switchTimer);
+	switchTimer = undefined;
+	await switchCameraAction(true);
+  }
+  else {
+	// first click --- set timer
+	switchTimer = setTimeout(() => {
+	  switchCameraClickInternal(true);
+	}, dblClickMillis);
+  }
+}
+
+// +-------------------+
+// | switchCamerAction |
+// +-------------------+
+
+async function switchCameraAction(isDouble) {
+  
+  let currentCam = getSelectedCamera();
+  let newCam = undefined;
+
+  if (isDouble) {
+	// switch by id
+	if (isFacingMode(currentCam)) currentCam = findCurrentCam(true);
+	newCam = await findNextCameraId(currentCam);
+  }
+  else {
+	// switch by mode
+	if (!isFacingMode(currentCam)) currentCam = findCurrentCam(false);
+	newCam = (currentCam === 'user' ? 'environment' : 'user');
+  }
+
+  console.log(`Switching camera from ${currentCam} to ${newCam}`);
+  
+  saveSelectedCamera(newCam);
+  window.sc._scanner.setCamera(newCam);
+}
+
+// +---------+
+// | Helpers |
+// +---------+
+
+async function listCameraIds() {
+
+  const devs = await navigator.mediaDevices.enumerateDevices();
+  return(devs.filter((d) => (d.kind === 'videoinput')).map((c,i) => c.deviceId));
+}
+
+function findCurrentCam(getId) {
+
+  const vid = document.getElementById('video');
+  const track = vid.srcObject.getTracks().find(t => t.kind === 'video');
+  const settings = track.getSettings();
+  return(getId ? settings.deviceId : settings.facingMode);
+}
+
+async function findNextCameraId(currentId) {
+
+  const camIds = await listCameraIds();
+
+  let i = 0;
+  while (i < camIds.length) {
+	if (camIds[i] === currentId) break;
+	++i;
+  }
+
+  return(camIds[(i >= (camIds.length - 1)) ? 0 : i + 1]);
+}
+
+function isFacingMode(s) {
+  return(s === 'user' || s === 'environment');
+}
+
+// +-----------+
+// | "Exports" |
+// +-----------+
+
+window.sc = {
+  'maybeShowSwitchCamera': maybeShowSwitchCamera,
+  'getSelectedCamera': getSelectedCamera,
+  'switchCameraClick': switchCameraClick
+};
+
diff --git a/src/PatientSummary.js b/src/PatientSummary.js
@@ -27,7 +27,7 @@ export default function PatientSummary({ organized, dcr }) {
   const comp = organized.byType.Composition[0];
   const rmap = organized.byId;
 
-  const authors = comp.author.map((a) => futil.renderPerson(a, rmap));
+  const authors = comp.author.map((a) => futil.renderOrgOrPerson(a, rmap));
   
   return(
     <div className={styles.container}>
diff --git a/src/Photo.js b/src/Photo.js
@@ -9,8 +9,10 @@ export default function Photo({ viewData }) {
   const [paused, setPaused] = useState(false);
 
   const openCameraClick = () => {
+	const cameraIdMode = window.sc.getSelectedCamera(config("cameraIdMode"));
+	const url = 'captureQR.html#' + escape(cameraIdMode);
 	window.openCameraResult = openCameraResult;
-	window.open('captureQR.html', 'captureQR', 'width=500,height=300');
+	window.open(url, 'captureQR', 'width=500,height=300');
   }
 
   const unPauseCameraClick = () => { setPaused(false); }
@@ -22,6 +24,10 @@ export default function Photo({ viewData }) {
 	viewData(shx);
   }
 
+  // +-----------+
+  // | useEffect |
+  // +-----------+
+
   useEffect(() => {
 
 	if (!haveCamera || paused) return;
@@ -30,13 +36,16 @@ export default function Photo({ viewData }) {
 	  document.getElementById('video'),
 	  result => viewData(result.data), 
 	  {
-		preferredCamera: 'user',
+		preferredCamera: window.sc.getSelectedCamera(config("cameraIdMode")),
 		highlightScanRegion: true,
 		highlightCodeOutline: true,
 		returnDetailedScanResult: true
 	  });
 
-	qrScanner.start().catch((err) => {
+	qrScanner.start().then(() => {
+	  window.sc.maybeShowSwitchCamera(qrScanner, 'switchCamera');
+	})
+	.catch((err) => {
 	  console.error(err);
 	  setHaveCamera(false);
 	});
@@ -52,6 +61,10 @@ export default function Photo({ viewData }) {
 	
   }, [haveCamera, setHaveCamera, paused, viewData]);
 	
+  // +--------+
+  // | render |
+  // +--------+
+
   return (
 	<div>
 
@@ -64,8 +77,16 @@ export default function Photo({ viewData }) {
 		</div> }
 
 	  { haveCamera &&
-		<video id='video' style={{ width: '400px', height: '225px' }}></video> }
-	  
+		<>
+		  <video id='video' style={{ width: '400px', height: '225px' }}></video>
+		  <div id='switchCamera' style={{ display: 'none' }}>
+			<Button variant='text' onClick={ window.sc.switchCameraClick }>
+			  Change Camera
+			</Button> 
+		  </div>
+		</>
+	  }
+
 	  { !haveCamera &&
 		<Button variant='contained' onClick={openCameraClick}>Open Camera</Button> }
 	  
diff --git a/src/lib/SHX.js b/src/lib/SHX.js
@@ -138,8 +138,10 @@ async function _verifySHX(shx, passcode) {
   
     const dir = await getDirectory();
 
+	const permissive = config("permissive");
 	for (const i in resolved.verifiableCredentials) {
 	  const vres = await verify(resolved.verifiableCredentials[i], dir);
+	  if (permissive) bePermissive(vres);
 	  addVerifiableBundle(statusObj, vres);
 	}
   }
@@ -172,6 +174,23 @@ async function getDirectory() {
   return(_verifyDir);
 }
 
+function bePermissive(vres) {
+
+  if (vres.verified) return;
+  if (!vres.data || !vres.data.errors) return;
+
+  let anyFatal = false;
+  for (const i in vres.data.errors) {
+	if (vres.data.errors[i].fatal) {
+	  anyFatal = true;
+	  break;
+	}
+  }
+
+  if (anyFatal) return;
+  vres.verified = true;
+}
+
 // +------------+
 // | resolveSHX |
 // +------------+
diff --git a/src/lib/defaults.js b/src/lib/defaults.js
@@ -16,6 +16,9 @@ export const DEFAULT_CONFIG = {
 	'https://raw.githubusercontent.com/seanno/shc-demo-data/main/keystore/directory.json'
   ],
 
+  // default camera mode ('environment' or 'user') or ID
+  "cameraIdMode": 'environment',
+
   // stop camera scanning after this many millis (default 120 seconds).
   // this is to work around what appear to be memory leaks in the
   // camera module
@@ -28,6 +31,10 @@ export const DEFAULT_CONFIG = {
   // in local storage (default 500k characters of serialized JSON)
   "terminologyCacheItemCeiling": (1024 * 500),
 
+  // allow display of SHCs that have validation errors as long as
+  // they are not "fatal" ... e.g., fullUrl values not in resource:# format
+  "permissive": false,
+  
   // true = show TCP privacy, disclaimer, etc.
   "tcpFooter": true
 };
diff --git a/src/lib/fhirTables.js b/src/lib/fhirTables.js
@@ -217,8 +217,15 @@ function renderMedXNameJSX(r, rmap, dcr) {
   let nameJSX = "Unknown";
   
   if (r.medicationReference) {
-	const m = rmap[r.medicationReference.reference];
-	nameJSX = futil.renderCodeableJSX(m.code, dcr);
+	const ref = r.medicationReference;
+	const m = rmap[ref.reference];
+	if (m) {
+	  nameJSX = futil.renderCodeableJSX(m.code, dcr);
+	}
+	else {
+	  if (ref.display) nameJSX = ref.display;
+	  console.error(`medicationReference.reference not found: ${ref.reference}`);
+	}
   }
   else if (r.medicationCodeableConcept) {
 	nameJSX = futil.renderCodeableJSX(r.medicationCodeableConcept, dcr);
diff --git a/src/lib/fhirUtil.js b/src/lib/fhirUtil.js
@@ -3,6 +3,7 @@ const NA = "Unknown";
 
 // +--------------------+
 // | renderOrganization |
+// | renderOrgOrPerson  | |
 // +--------------------+
 
 export function renderOrganization(org, resources) {
@@ -13,6 +14,16 @@ function renderOrganizationResource(org) {
   return(<div>{org.name}</div>);
 }
 
+export function renderOrgOrPerson(oop, resources) {
+
+  const renderMap = {
+	"Organization": renderOrganization,
+	"any": renderPerson
+  };
+
+  return(renderReferenceMap(oop, resources, renderMap));
+}
+
 // +---------------+
 // | renderContact |
 // +---------------+
@@ -687,7 +698,7 @@ export function renderReferenceMap(o, resources, refRenderFuncMap) {
 	return(renderReferenceMapThrow(o, resources, refRenderFuncMap));
   }
   catch (err) {
-	return(<div>{o.display ? o.display : NA}</div>);
+	return(<div>{o && o.display ? o.display : NA}</div>);
   }
 }
 
