using permissions from model helper

Author: perki

common-data-defs.js

@@ -1,67 +1,12 @@
 
-
-const patientBasePermissionsX = [
-  {id: 'profile', name: 'Profile'},
-  {id: 'family', name: 'Family'},
-  {id: 'fertility', name: 'Fertility'},
-  {id: 'body-height', name: 'Body height'},
-  {id: 'body-weight', name: 'Body weight'},
-];
-
-const patientBasePermissionsB = [
-  {id: 'profile', name: 'Profile'},
-  {id: 'fertility-cycles', name: 'Fertility Cycles'},
-  {id: 'body-vulva', name: 'Vulva'},
-  {id: 'body-weight', name: 'Body weight'},
-]
-
-
-const questionnaires = {
-  'questionary-x': {
-    title: 'Demo with Profile and TTC-TTA',
-    permissions: patientBasePermissionsX.map(perm => ({
-      streamId: perm.id,
-      level: 'read',
-      name: perm.name,
-    })),
-    forms: {
-      profile: {
-        type: 'permanent',
-        key: 'profile-x',
-        name: 'Profile',
-      },
-      history: {
-        type: 'recurring',
-        key: 'recurring-x',
-        name: 'History',
-      }
-    }
-  },
-  'questionnary-basic': {
-    title: 'Basic Profile and Cycle Information',
-    permissions: patientBasePermissionsB.map(perm => ({
-      streamId: perm.id,
-      level: 'read',
-      name: perm.name,
-    })),
-    forms: {
-      profile: {
-        type: 'permanent',
-        key: 'profile-b',
-        name: 'Profile'
-      },
-      history: {
-        type: 'recurring',
-        key: 'recurring-b',
-        name: 'History'
-      }
-    }
-  }
-}
-
+import { hdsModel } from './common-lib.js';
 const v2 = {
   'questionary-x': {
     title: 'Demo with Profile and TTC-TTA',
+    permissionsPreRequest: [
+      {streamId: 'profile'},
+      {streamId: 'fertility'},
+    ],
     forms: {
       profile: {
         type: 'permanent',
@@ -88,6 +33,9 @@ const v2 = {
   },
   'questionnary-basic': {
     title: 'Basic Profile and Cycle Information',
+    permissionsPreRequest: [
+      {streamId: 'profile'}
+    ],
     forms: {
       profile: {
         type: 'permanent',
@@ -116,6 +64,15 @@ const v2 = {
   }
 }
 
+
+function utilGetPermissions (questionaryId) {
+  const preRequest = v2[questionaryId].permissionsPreRequest || [];
+  const itemKeys = utilGetAllItemKeys(questionaryId);
+  const permissions = hdsModel().authorizationForItemKeys(itemKeys, { preRequest });
+  return permissions
+}
+
+
 /**
  * get all itemKeys of a questionnary
  * @param {*} questionaryId 
@@ -131,7 +88,7 @@ function utilGetAllItemKeys (questionaryId) {
 
 export const dataDefs = {
   appId: 'demo-dr-forms',
-  questionnaires,
   v2questionnaires: v2,
-  utilGetAllItemKeys
+  utilGetAllItemKeys,
+  utilGetPermissions
 };

dr-lib.js

@@ -317,6 +317,11 @@ async function getSharingToken(questionaryId) {
             feature: "selfRevoke",
             setting: "forbidden",
           },
+          {
+            // for "publicly shared access" always forbid the selfAudit feature
+            feature: "selfAudit",
+            setting: "forbidden",
+          },
         ],
         clientData: {
           [dataDefs.appId]: {

patient-home-controler.js

@@ -1,5 +1,6 @@
 import { patientLib } from './patient-lib.js';
 import { patientHomeLib } from './patient-home-lib.js';
+import { dataDefs } from './common-data-defs.js';
 
 /**
  * UI management code. 
@@ -110,7 +111,7 @@ async function showFormDetails(formInfo) {
   for (const permission of formDetails.permissions) {
     const row = tbody.insertRow(-1);
     const cellStream = row.insertCell(-1);
-    cellStream.innerHTML = permission.name;
+    cellStream.innerHTML = permission.defaultName;
     const cellLevel = row.insertCell(-1);
     cellLevel.innerHTML = permission.level;
   }

patient-home-lib.js

@@ -94,6 +94,7 @@ async function createsPatientAccountStreams (connection, streams) {
 
 // ---- if first connection to the app create a sharing for the Dr and submit it ---- //
 async function grantAccess (formInfo, formDetails) {
+  console.log('#FormDetails', {formInfo, formDetails});
   // create needed base streams
   const itemKeys = dataDefs.utilGetAllItemKeys(formInfo.questionaryId);
   const baseStreams = hdsModel().streamsGetNecessaryListForItemKeys(itemKeys);
@@ -210,7 +211,7 @@ async function getQuestionnaryDetails (formInfo) {
    const questionaryId = appInfos.questionaryId;
    console.log('## Questionnary ID', questionaryId);
 
-   details.permissions = dataDefs.questionnaires[questionaryId]?.permissions;
+   details.permissions = dataDefs.utilGetPermissions(questionaryId);
    return details;
 }