oro-sdk 6.0.2 → 6.2.0

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "6.0.2",
+    "version": "6.2.0",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "form-data": "^4.0.0",
         "formdata-node": "^4.3.1",
         "idb-keyval": "^5.0.6",
-        "oro-sdk-apis": "~6.0.2",
+        "oro-sdk-apis": "~6.1.0",
         "oro-toolbox": "0.0.6",
         "uuid": "^8.3.2"
     }

package/src/helpers/patient-registration.ts

@@ -21,6 +21,7 @@ import {
     WorkflowData,
 } from 'oro-sdk-apis'
 import {
+    detectChangesInWorkflowAnswers,
     filterTriggeredAnsweredWithKind,
     getImagesFromIndexDb,
     getWorkflowDataByCategory,
@@ -81,6 +82,9 @@ export async function registerPatient(
     const stepsTotalNum = 9
     let currentStep: number
 
+    // toggle all changed statuses if this workflow has previous/revision data 
+    workflow = detectChangesInWorkflowAnswers(workflow)
+
     for (; retry > 0; retry--) {
         try {
             currentStep = 0
@@ -168,10 +172,10 @@ export async function registerPatient(
                 oroClient,
                 onProgress
                     ? {
-                          onProgress,
-                          currentStep,
-                          stepsTotalNum,
-                      }
+                        onProgress,
+                        currentStep,
+                        stepsTotalNum,
+                    }
                     : undefined
             ).catch((err) => {
                 console.error('[SDK: registration] Some errors happened during image upload', err)
@@ -246,9 +250,9 @@ export async function registerPatient(
 
             if (errorsThrown.length > 0) throw errorsThrown
 
-            if( consult.statusMedical === MedicalStatus.Assigning ){
+            if (consult.statusMedical === MedicalStatus.Assigning) {
                 //hopefully svelte query received all updates
-                console.warn( 'Consult assignation took too much time, moving to new anyway')
+                console.warn('Consult assignation took too much time, moving to new anyway')
             }
             // Deem the consultation as ready
             await oroClient.consultClient.updateConsultByUUID(consult.uuid, {
@@ -443,11 +447,11 @@ async function storeImageAliases(
                         Math.round(
                             ((progress.currentStep + 1) / progress.stepsTotalNum -
                                 progress.currentStep / progress.stepsTotalNum) *
-                                100
+                            100
                         ) / 100
                     progress.onProgress(
                         progress.currentStep / progress.stepsTotalNum +
-                            progressStepValue * (storedImagesNum / totalImagesNum),
+                        progressStepValue * (storedImagesNum / totalImagesNum),
                         'store_images',
                         {
                             storedImagesNum,

package/src/helpers/workflow.ts

@@ -4,6 +4,7 @@ import {
     MetadataCategory,
     PopulatedWorkflowData,
     PopulatedWorkflowField,
+    PreviousAnswerData,
     QuestionData,
     SelectedAnswerData,
     SelectedAnswersData,
@@ -85,14 +86,30 @@ export async function getWorkflowDataByCategory(
 
     const fields: Record<string, PopulatedWorkflowField> = {}
 
+    let answersPerPage = (workflowData.selectedAnswers ?? [])
+        .map((pageAnswers, _) =>
+            Object.entries(pageAnswers)
+                .map(([k, v]) => [k, v, undefined]) as [string, SelectedAnswerData, PreviousAnswerData | undefined][])
+
+    if (workflowData.previousAnswers) {
+        // Since the selectedAnswers and previousAnswers should be a 1-1, we can map them together
+        answersPerPage = answersPerPage
+            .map((pageAnswers, pageIndex) => pageAnswers
+                .map(([questionId, v]): [string, SelectedAnswerData, PreviousAnswerData | undefined] => {
+                    if (workflowData.previousAnswers && workflowData.previousAnswers[pageIndex][questionId])
+                        return [questionId, v, workflowData.previousAnswers[pageIndex][questionId]]
+                    return [questionId, v, undefined]
+                }
+                ))
+    }
+
     // Generates the answers of the specified category and adds the appropriate values if any are missing
     return Promise.all(
-        workflowData.selectedAnswers
-            .map((e) => Object.entries(e))
-            .flat()
-            .filter(([k, v]) => triggeredQuestions[k] && triggeredQuestions[k]['metaCategory'] === category)
-            .map(([k, v]) => {
-                return populateWorkflowField(triggeredQuestions[k], v).then((populatedValue) => {
+        answersPerPage
+            .flat(1) // remove the pages, we want the answers all together
+            .filter(([k]) => triggeredQuestions[k] && triggeredQuestions[k]['metaCategory'] === category)
+            .map(([k, v, p]) => {
+                return populateWorkflowField(triggeredQuestions[k], v, p).then((populatedValue) => {
                     fields[k] = populatedValue
                 })
             })
@@ -127,7 +144,8 @@ export async function getImagesFromIndexDb(answer: SelectedAnswerData): Promise<
  */
 async function populateWorkflowField(
     question: QuestionData,
-    answerValue: SelectedAnswerData
+    answerValue: SelectedAnswerData,
+    previousAnswer?: PreviousAnswerData
 ): Promise<PopulatedWorkflowField> {
     let answer: any
     let displayedAnswer: string | string[] | undefined = undefined
@@ -175,6 +193,7 @@ async function populateWorkflowField(
     return Promise.resolve({
         answer,
         displayedAnswer,
+        previousAnswer,
         kind: question.kind,
     })
 }
@@ -297,3 +316,29 @@ export function fillWorkflowFromPopulatedWorkflow(workflow: WorkflowData, popula
 
     return filledWorkflow
 }
+
+/**
+ * Checks and toggles the changed status for every answer in the workflow
+ * by comparing the previous answer with the selected answer of the same question
+ * 
+ * @param workflow 
+ * @returns the workflow with the updated `changed` statuses
+ */
+export function detectChangesInWorkflowAnswers(workflow: WorkflowData): WorkflowData {
+    return {
+        ...workflow,
+        previousAnswers: workflow.previousAnswers ?
+            workflow.previousAnswers
+                .map((pageAnswers, pageId) => Object.fromEntries(Object.entries(pageAnswers).map(([question, answer]) => {
+                    let selectedAnswer = undefined
+                    if (workflow.selectedAnswers && workflow.selectedAnswers[pageId][question])
+                        selectedAnswer = workflow.selectedAnswers[pageId][question]
+                    let changed = !!selectedAnswer && !equalsAnswer(selectedAnswer, answer.previousAnswer)
+                    return [question, { ...answer, changed }]
+                }))) : undefined
+    }
+}
+
+function equalsAnswer<T = SelectedAnswerData | WorkflowUploadedImage[]>(answer1: T, answer2: T): boolean {
+    return JSON.stringify(answer1) === JSON.stringify(answer2)
+}