Fixes for invalidating shl on request and when more recent summary is ready

Author: daniellrgn

src/lib/AddFileLTT.svelte

@@ -56,9 +56,10 @@
         // TODO: Get summary DocumentReferences from resourcesToReview
         let summaryDocRefs: any[] = resourcesToReview.filter((r) => r.resourceType === "DocumentReference" && !(r.type?.coding[0]?.code === "34108-1"));
         // Compare sessionIDs in most recent DocRef with sessionID in most recent SHL
-        let mostRecentDocRef = summaryDocRefs.sort((a, b) => b.date - a.date)[0];
+        // let mostRecentDocRef = summaryDocRefs.sort((a, b) => b.date - a.date)[0];
+        let mostRecentDocRef = summaryDocRefs[summaryDocRefs.length-1];
         // TODO: Get shl DocumentReferences from resourcesToReview
-        let shlDocRefs: any[] = resourcesToReview.filter((r) => r.resourceType === "DocumentReference" && r.type?.coding[0]?.code === "34108-1");
+        let shlDocRefs: any[] = resourcesToReview.filter((r) => r.resourceType === "DocumentReference" && r.type?.coding[0]?.code === "34108-1").reverse();
 
         patientId = sofClient.getPatientID();
         sessionId = mostRecentDocRef.id;
@@ -114,8 +115,8 @@
         }
       }
 
-      console.log("Successfully retrieved SHL and Resources");
       if (found) {
+        console.log("Successfully retrieved SHL and Resources");
         // The current SHL is most recent, so use it
         shlReadyDispatch('shl-ready', true);
       } else if (mostRecentDocRef) {

src/lib/HealthLinkLTT.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import QRCode from 'qrcode';
-  import { getContext } from 'svelte';
+  import { getContext, setContext } from 'svelte';
   import {
     Button,
     Card,
@@ -21,7 +21,6 @@
     Row
   } from 'sveltestrap';
   import { fade } from 'svelte/transition';
-  import { goto } from '$app/navigation';
   import type { Writable } from 'svelte/store';
   import type { SHLAdminParams, SHLClient } from './managementClient';
 
@@ -38,7 +37,6 @@
   let exp: Date;
   let today: Date;
   let expDisplay: string;
-  let inactive = false;
 
   $: {
     href = getUrl($shlStore);
@@ -86,7 +84,7 @@
     shlClient.deleteShl($shlStore);
     toggle();
     // TODO: Implement post-deactivation flow
-    goto('/share');
+    location.reload(true);
   }
 
   async function renewShl() {}
@@ -213,25 +211,6 @@
 </div>
 
 <style>
-  img.qr {
-    height: 100%;
-  }
-  p.logo {
-    position: relative;
-    width: 250px;
-    height: 250px;
-  }
-  .logo {
-    position: absolute;
-    background: #325c33;
-    width: 110px;
-    height: 27px;
-    /* padding: 2px; */
-    left: calc(50% - 55px);
-    top: calc(50% - 2em);
-    border: 5px solid #325c33;
-    box-sizing: border-box;
-  }
   :global(.shlbutton) {
     width: 300px !important;
   }

src/lib/managementClient.ts

@@ -81,7 +81,7 @@ export class SHLClient {
       }
     });
     const res = await req.json();
-    return true;
+    return res;
   }
 
   async updateShl(shl: SHLAdminParams): Promise<boolean> {

src/lib/sofClient.js

@@ -105,15 +105,15 @@ export class SOFClient {
         const shlData = {
             id: shl.id,
             label: label,
-            patientId: shl.userId,
+            userId: shl.userId,
             sessionId: docRef.id,//shl.sessionId,
             managementToken: shl.managementToken,
             encryptionKey: shl.encryptionKey
         };
         const shlPayload = btoa(JSON.stringify(shlData));
         let shlDocRefInputs = {
             date: new Date().toISOString(),
-            patientId: shl.userId,
+            userId: shl.userId,
             documentReferenceId: docRef.id,
             data: shlPayload,
             label: label,
@@ -133,7 +133,7 @@ export class SOFClient {
                 ]
             },
             "subject": {
-                "reference": `Patient/${shl.userId}`
+                "reference": `Patient?identifier=${shl.userId}`
             },
             "date": shlDocRefInputs.date,
             "description": "SMART Health Link Metadata",