Cleanup and download works again

Author: perki

common-data-defs.js

@@ -1,5 +1,4 @@
 
-import { hdsModel } from './common-lib.js';
 const v2 = {
   'questionary-x': {
     title: 'Demo with Profile and TTC-TTA 3',
@@ -64,31 +63,6 @@ const v2 = {
   }
 }
 
-
-function utilGetPermissions (questionaryId) {
-  const preRequest = v2[questionaryId].permissionsPreRequest || [];
-  const itemKeys = utilGetAllItemKeys(questionaryId);
-  const permissions = hdsModel().authorizations.forItemKeys(itemKeys, { preRequest });
-  return permissions
-}
-
-
-/**
- * get all itemKeys of a questionnary
- * @param {*} questionaryId 
- */
-function utilGetAllItemKeys (questionaryId) {
-  const questionary = v2[questionaryId];
-  const itemKeys = [];
-  for (const formContent of Object.values(questionary.forms)) {
-    itemKeys.push(...formContent.itemKeys);
-  }
-  return itemKeys;
-}
-
 export const dataDefs = {
-  appId: 'demo-dr-forms',
   v2questionnaires: v2,
-  utilGetAllItemKeys,
-  utilGetPermissions
 };

dr-controler.js

@@ -1,3 +1,4 @@
+import { stateGetApp } from './common-lib.js';
 import { drLib } from './dr-lib.js';
 import { exportXLSFile } from './exporToXLS.js';
 
@@ -36,7 +37,7 @@ async function setQuestionnaries() {
     tbody.removeChild(tbody.firstChild);
   }
 
-  const appManaging = drLib.getAppManaging();
+  const appManaging = await stateGetApp('managing');
 
   const collectors = await appManaging.getCollectors();
   for (const collector of collectors) {
@@ -76,7 +77,7 @@ async function showQuestionnary(questionaryId) {
     return;
   }
 
-  const appManaging = drLib.getAppManaging();
+  const appManaging = await stateGetApp('managing');
   // get questionnary (Controller) 
   const collector = await appManaging.getCollectorById(questionaryId);
   await collector.init(); // load controller data only when needed
@@ -103,7 +104,7 @@ async function showQuestionnary(questionaryId) {
   await refreshInviteList(collector);
 
   // show current patients 
-  await refreshPatientList(collector);
+  const {headers, patientsData} = await refreshPatientList(collector);
 
   //const {headers, patientsData} = await refreshPatientList(questionaryId);
   document.getElementById('button-download').onclick = async () => {

dr-lib.js

@@ -7,26 +7,13 @@ import { hdsModel, serviceInfoUrl, initHDSModel, stateSaveApp } from "./common-l
 const APP_MANAGING_STREAMID = 'app-dr-hds';
 /** The name of this application */
 const APP_MANAGING_NAME = 'HDS Dr App PoC';
-/** The app Manging */
-let appManaging; // initalized during pryvAuthStateChange
 
 export const drLib = {
-  // OK for v2
   showLoginButton,
-  getAppManaging,
   getPatientsData,
-  getPatientDetails,
-  // OLD
-  getFirstFormFields
+  getPatientDetails
 };
 
-/**
- * exposes appManaging for the app 
- */
-function getAppManaging () {
-  return appManaging;
-}
-
 function showLoginButton (loginSpanId, stateChangeCallBack) {
   const authSettings = {
     spanButtonID: loginSpanId, // div id the DOM that will be replaced by the Service specific button
@@ -63,13 +50,12 @@ function showLoginButton (loginSpanId, stateChangeCallBack) {
     console.log("##pryvAuthStateChange", state);
     if (state.id === HDSLib.pryv.Browser.AuthStates.AUTHORIZED) {
       await initHDSModel(); // hds model needs to be initialized 
-      appManaging = await HDSLib.appTemplates.AppManagingAccount.newFromApiEndpoint(APP_MANAGING_STREAMID, state.apiEndpoint, APP_MANAGING_NAME);
+      const appManaging = await HDSLib.appTemplates.AppManagingAccount.newFromApiEndpoint(APP_MANAGING_STREAMID, state.apiEndpoint, APP_MANAGING_NAME);
       stateSaveApp('managing', appManaging);
       await initDemoAccount(appManaging);
       stateChangeCallBack("loggedIN");
     }
     if (state.id === HDSLib.pryv.Browser.AuthStates.INITIALIZED) {
-      appManaging = null;
       stateSaveApp('managing', null);
       stateChangeCallBack("loggedOUT");
     }
@@ -152,8 +138,11 @@ async function getPatientsData (collector) {
     createdAt: 'Date'
   }
   // headers from first form 
-  const itemDefs = getFirstFormFields(requestContent.app.data.forms);
-  for (const itemDef of itemDefs) {
+  const firstForm = Object.values(requestContent.app.data.forms)[0];
+  const itemDefs = [];
+  for (const itemKey of firstForm.itemKeys) {
+    const itemDef = hdsModel().itemsDefs.forKey(itemKey);
+    itemDefs.push(itemDef);
     headers[itemDef.key] = HDSLib.l(itemDef.data.label);
   }
 
@@ -220,19 +209,6 @@ async function getPatientDetails(invite, itemDefs) {
   return patient;
 }
 
-/**
- * get the list of rows for the initial table
- */
-function getFirstFormFields(forms) {
-  const firstForm = Object.values(forms)[0];
-  const itemDefs = [];
-  for (const itemKey of firstForm.itemKeys) {
-    itemDefs.push(hdsModel().itemsDefs.forKey(itemKey));
-  }
-  
-  return itemDefs;
-}
-
 /**
  * Link an event to a data field from form
  * @param {*} event