Now relying on lib for model singleton

Author: perki

common-lib.js

@@ -4,33 +4,6 @@ let model;
 // following the APP GUIDELINES: https://api.pryv.com/guides/app-guidelines/
 export const serviceInfoUrl = HDSLib.pryv.Browser.serviceInfoFromUrl() || "https://demo.datasafe.dev/reg/service/info";
 
-export function hdsModel () {
-  if (!model) { throw new Error('Initialize model with `initHDSModel()` first') };
-  return model;
-}
-
-export async function initHDSModel () {
-  if (!model) {
-    console.log(HDSLib);
-    const service = new HDSLib.pryv.Service(serviceInfoUrl);
-    const serviceInfo = await service.info();
-    model = new HDSLib.HDSModel(serviceInfo.assets['hds-model']);
-    console.log('## model:', model);
-    await model.load();
-  }
-  return model;
-}
-
-/**
- * Return HDSLib.pryv.Connection with property HDSModel Loaded
- * @param {string} apiEndpoint 
- * @returns 
- */
-export async function connectAPIEndpoint (apiEndpoint) {
-  const connection = new HDSLib.pryv.Connection(apiEndpoint);
-  connection.hdsModel = await initHDSModel();
-  return connection;
-}
 
 // ---- state management to be replaced by framework logic
 

dr-controler.js

@@ -1,4 +1,4 @@
-import { hdsModel, initHDSModel, stateGetApp } from './common-lib.js';
+import { stateGetApp } from './common-lib.js';
 import { drLib } from './dr-lib.js';
 import { exportXLSFile } from './exporToXLS.js';
 
@@ -15,7 +15,7 @@ window.onload = (event) => {
 };
 
 async function stateChange(state) {
-  await initHDSModel();
+  await HDSLib.initHDSModel();
   if (state === 'loggedIN') {
     document.getElementById('please-login').style.display = 'none';
     document.getElementById('data-view').style.display = 'block';
@@ -109,7 +109,7 @@ async function showQuestionnary(questionaryId) {
       let content = form[key];
       if (key === 'itemKeys') {
         content = content.map((itemKey) => {
-          const itemDef = hdsModel().itemsDefs.forKey(itemKey);
+          const itemDef = HDSLib.model.itemsDefs.forKey(itemKey);
           return '- ' + HDSLib.l(itemDef.data.label);
         }).join('\n<br>');
       }

dr-lib.js

@@ -1,5 +1,5 @@
 import { dataDefs } from "./common-data-defs.js";
-import { hdsModel, serviceInfoUrl, initHDSModel, stateSaveApp } from "./common-lib.js"
+import { serviceInfoUrl, stateSaveApp } from "./common-lib.js"
 
 
 // NEW
@@ -49,7 +49,7 @@ function showLoginButton (loginSpanId, stateChangeCallBack) {
     // called each time the authentication state changes
     console.log("##pryvAuthStateChange", state);
     if (state.id === HDSLib.pryv.Browser.AuthStates.AUTHORIZED) {
-      await initHDSModel(); // hds model needs to be initialized 
+      await HDSLib.initHDSModel(); // hds model needs to be initialized 
       const appManaging = await HDSLib.appTemplates.AppManagingAccount.newFromApiEndpoint(APP_MANAGING_STREAMID, state.apiEndpoint, APP_MANAGING_NAME);
       stateSaveApp('managing', appManaging);
       await initDemoAccount(appManaging);
@@ -92,7 +92,7 @@ async function initDemoAccount (appManaging) {
     }
     // 2 - get the permissions with eventual preRequest 
     const preRequest = questionary.permissionsPreRequest || [];
-    const permissions = hdsModel().authorizations.forItemKeys(itemKeys, { preRequest });
+    const permissions = HDSLib.model.authorizations.forItemKeys(itemKeys, { preRequest });
 
     const requestContent = {
       version: '0',
@@ -141,7 +141,7 @@ async function getPatientsData (collector) {
   const firstForm = Object.values(requestContent.app.data.forms)[0];
   const itemDefs = [];
   for (const itemKey of firstForm.itemKeys) {
-    const itemDef = hdsModel().itemsDefs.forKey(itemKey);
+    const itemDef = HDSLib.model.itemsDefs.forKey(itemKey);
     itemDefs.push(itemDef);
     headers[itemDef.key] = HDSLib.l(itemDef.data.label);
   }
@@ -211,7 +211,7 @@ async function getPatientDetails(invite, itemDefs) {
  * @param {*} event
  */
 function dataFieldFromEvent(event) {
-  const itemDef = hdsModel().itemsDefs.forEvent(event, false);
+  const itemDef = HDSLib.model.itemsDefs.forEvent(event, false);
   if (!itemDef) {
     console.error("## itemDef not found for event", event);
     return null;

dr-patient-view-controler.js

@@ -1,4 +1,4 @@
-import { initHDSModel, stateGetApp } from "./common-lib.js";
+import { stateGetApp } from "./common-lib.js";
 import { drPatientLib  } from "./dr-patient-view-lib.js";
 import { exportXLSFile } from './exporToXLS.js';
 
@@ -14,7 +14,7 @@ import { exportXLSFile } from './exporToXLS.js';
 
 let invite;
 window.onload = async (event) => {
-  await initHDSModel();
+  await HDSLib.initHDSModel();
   // get collectorId & inviteKey from URL
   const params = new URLSearchParams(document.location.search);
   const collectorId = params.get('collectorId');

dr-patient-view-lib.js

@@ -1,7 +1,5 @@
 
 
-import { connectAPIEndpoint, hdsModel } from './common-lib.js';
-
 export const drPatientLib = {
   setRefresh
 }
@@ -37,7 +35,7 @@ async function getPatientData (invite) {
 
 
 function getLineForEvent (event) {
-  const model = hdsModel();
+  const model = HDSLib.model;
   const line = {
     time: (new Date(event.time * 1000)).toISOString(),
     formLabel: 'Unkown',

patient-lib.js

@@ -1,5 +1,3 @@
-import { hdsModel, initHDSModel } from "./common-lib.js"
-
 
 export const patientLib = {
   handleFormSubmit,
@@ -43,11 +41,11 @@ async function navGetPages(collectorClient) {
 
 
 async function getFormHistorical (collectorClient, formKey) {
-  await initHDSModel();
+  await HDSLib.initHDSModel();
   const requestData = collectorClient.requestData;
   const form = requestData.app.data.forms[formKey];
   const formFields = form.itemKeys.map((itemKey) => {
-    const itemDef = (hdsModel().itemsDefs.forKey(itemKey));
+    const itemDef = HDSLib.model.itemsDefs.forKey(itemKey);
 
     return {
       id: itemDef.key,
@@ -67,12 +65,12 @@ async function getFormHistorical (collectorClient, formKey) {
  * @returns 
  */
 async function getFormPermanentContent (collectorClient, formKey) {
-  await initHDSModel();
+  await HDSLib.initHDSModel();
   const requestData = collectorClient.requestData;
   const form = requestData.app.data.forms[formKey];
   console.log('## getFormPermanentContent ', {form, formKey, collectorClient})
   // get formItems
-  const formItemDefs = form.itemKeys.map((itemKey) => (hdsModel().itemsDefs.forKey(itemKey)));
+  const formItemDefs = form.itemKeys.map((itemKey) => (HDSLib.model.itemsDefs.forKey(itemKey)));
   // get the values from the API
   const apiCalls = formItemDefs.map(itemDef => ({
     method: 'events.get',
@@ -114,10 +112,10 @@ async function getFormPermanentContent (collectorClient, formKey) {
 
 
 async function getHistoricalContent(collectorClient, formKey) {
-  await initHDSModel();
+  await HDSLib.initHDSModel();
   const requestData = collectorClient.requestData;
   const form = requestData.app.data.forms[formKey];
-  const itemDefs = form.itemKeys.map((itemKey) => (hdsModel().itemsDefs.forKey(itemKey)));
+  const itemDefs = form.itemKeys.map((itemKey) => (HDSLib.model.itemsDefs.forKey(itemKey)));
   const tableHeaders = itemDefs.map(itemDef => ({
     fieldId: itemDef.key,
     label: itemDef.data.label.en,
@@ -126,7 +124,7 @@ async function getHistoricalContent(collectorClient, formKey) {
 
   const valuesByDateStr = {};
   function addEntry (event) {
-    const itemDef = hdsModel().itemsDefs.forEvent(event, false);
+    const itemDef = HDSLib.model.itemsDefs.forEvent(event, false);
     if (itemDef == null) {
       console.log('Historical content -- unkown event', event);
       return;