openchs-models 1.27.27 → 1.27.29

package/Makefile

@@ -1,20 +1,17 @@
-set_node_version:
-	. ${NVM_DIR}/nvm.sh && nvm use
-
 clean:
 	rm -rf node_modules
 
-deps: set_node_version
+deps:
 	@rm -f package-lock.json
 	yarn install
 
-tests: set_node_version
+tests:
 	yarn test
 
-build: set_node_version
+build:
 	yarn run build
 
-release: set_node_version
+release:
 	git pull --tags
 	git pull --rebase
 	@echo "Ensure version changes follow semantic versioning - https://classic.yarnpkg.com/en/docs/dependency-versions#toc-semantic-versioning"

package/dist/EntityMetaData.js

@@ -236,6 +236,7 @@ const virtualTxData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation,
   apiQueryParams,
+  apiQueryParamKey,
   parentDbClass
 } = {}) => ({
   schemaName: clazz.schema.name,
@@ -253,7 +254,8 @@ const virtualTxData = (clazz, {
   privilegeName,
   queryParam,
   hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
-  apiQueryParams
+  apiQueryParams,
+  apiQueryParamKey
 });
 
 const parentOfVirtualTxData = (clazz, {
@@ -516,7 +518,10 @@ const subjectEntityApprovalStatus = virtualTxData(_SubjectEntityApprovalStatus.d
   apiQueryParams: {
     "entityType": "Subject"
   },
-  privilegeParam: "entityTypeUuid",
+  apiQueryParamKey: "entityTypeUuid",
+  privilegeParam: "subjectTypeUuid",
+  privilegeEntity: _Privilege.default.privilegeEntityType.subject,
+  privilegeName: _Privilege.default.privilegeName.viewSubject,
   parentDbClass: _EntityApprovalStatus.default,
   syncWeight: 2
 });
@@ -526,7 +531,10 @@ const encounterEntityApprovalStatus = virtualTxData(_EncounterEntityApprovalStat
   apiQueryParams: {
     "entityType": "Encounter"
   },
-  privilegeParam: "entityTypeUuid",
+  apiQueryParamKey: "entityTypeUuid",
+  privilegeParam: "encounterTypeUuid",
+  privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
+  privilegeName: _Privilege.default.privilegeName.viewVisit,
   parentDbClass: _EntityApprovalStatus.default,
   syncWeight: 2
 });
@@ -536,7 +544,10 @@ const programEncounterEntityApprovalStatus = virtualTxData(_ProgramEncounterEnti
   apiQueryParams: {
     "entityType": "ProgramEncounter"
   },
-  privilegeParam: "entityTypeUuid",
+  apiQueryParamKey: "entityTypeUuid",
+  privilegeParam: "programEncounterTypeUuid",
+  privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
+  privilegeName: _Privilege.default.privilegeName.viewVisit,
   parentDbClass: _EntityApprovalStatus.default,
   syncWeight: 2
 });
@@ -546,7 +557,10 @@ const programEnrolmentEntityApprovalStatus = virtualTxData(_ProgramEnrolmentEnti
   apiQueryParams: {
     "entityType": "ProgramEnrolment"
   },
-  privilegeParam: "entityTypeUuid",
+  apiQueryParamKey: "entityTypeUuid",
+  privilegeParam: "programUuid",
+  privilegeEntity: _Privilege.default.privilegeEntityType.enrolment,
+  privilegeName: _Privilege.default.privilegeName.viewEnrolmentDetails,
   parentDbClass: _EntityApprovalStatus.default,
   syncWeight: 2
 });
@@ -556,7 +570,10 @@ const checklistItemEntityApprovalStatus = virtualTxData(_ChecklistItemEntityAppr
   apiQueryParams: {
     "entityType": "ChecklistItem"
   },
-  privilegeParam: "entityTypeUuid",
+  apiQueryParamKey: "entityTypeUuid",
+  privilegeParam: "checklistDetailUuid",
+  privilegeEntity: _Privilege.default.privilegeEntityType.checklist,
+  privilegeName: _Privilege.default.privilegeName.viewChecklist,
   parentDbClass: _EntityApprovalStatus.default,
   syncWeight: 2
 });
@@ -616,6 +633,28 @@ const userSubjectAssignment = txData(_UserSubjectAssignment.default, {
 });
 
 class EntityMetaData {
+  constructor() {
+    _defineProperty(this, "schemaName", void 0);
+
+    _defineProperty(this, "entityName", void 0);
+
+    _defineProperty(this, "entityClass", void 0);
+
+    _defineProperty(this, "resourceName", void 0);
+
+    _defineProperty(this, "type", void 0);
+
+    _defineProperty(this, "nameTranslated", void 0);
+
+    _defineProperty(this, "resourceSearchFilterURL", void 0);
+
+    _defineProperty(this, "parent", void 0);
+
+    _defineProperty(this, "syncWeight", void 0);
+
+    _defineProperty(this, "resourceUrl", void 0);
+  }
+
   //order is important. last entity in each (tx and ref) with be executed first. parent should be synced before the child.
   static model() {
     return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];

package/dist/EntityQueue.js

@@ -37,7 +37,7 @@ class EntityQueue extends _PersistedObject.default {
   }
 
   static create(entity, schema, savedAt = new Date()) {
-    var entityQueue = new EntityQueue();
+    const entityQueue = new EntityQueue();
     entityQueue.entityUUID = entity.uuid;
     entityQueue.entity = schema;
     entityQueue.savedAt = savedAt;

package/dist/Schema.js

@@ -204,7 +204,7 @@ const entities = [_LocaleMapping.default, _Settings.default, _ConceptAnswer.defa
 function createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 170,
+    schemaVersion: 171,
     migration: function (oldDB, newDB) {
       if (oldDB.schemaVersion < 10) {
         const oldObjects = oldDB.objects("DecisionConfig");
@@ -708,7 +708,18 @@ function createRealmConfig() {
         if (entityApprovalStatusSyncStatus[0]) {
           newDB.delete(entityApprovalStatusSyncStatus);
         }
-      }
+      } // console.log('----------------oldDB.schemaVersion', oldDB.schemaVersion);
+      // if (oldDB.schemaVersion < 171) {
+      //   _.forEach([...newDB.objects("Settings")], (settings) => {
+      //       settings.idpType = "";
+      //       settings.keycloakGrantType = "";
+      //       settings.keycloakScope = "";
+      //       settings.keycloakClientId = "";
+      //       settings.keycloakAuthServerUrl = "";
+      //       settings.keycloakRealm = "";
+      //   });
+      // }
+
     }
   };
 }

package/dist/Settings.js

@@ -98,6 +98,70 @@ class Settings extends _BaseEntity.default {
     this.that.userId = x;
   }
 
+  get idpType() {
+    return this.that.idpType;
+  }
+
+  set idpType(x) {
+    this.that.idpType = x;
+  }
+
+  get keycloakAuthServerUrl() {
+    return this.that.keycloakAuthServerUrl;
+  }
+
+  set keycloakAuthServerUrl(x) {
+    this.that.keycloakAuthServerUrl = x;
+  }
+
+  get keycloakClientId() {
+    return this.that.keycloakClientId;
+  }
+
+  set keycloakClientId(x) {
+    this.that.keycloakClientId = x;
+  }
+
+  get keycloakRealm() {
+    return this.that.keycloakRealm;
+  }
+
+  set keycloakRealm(x) {
+    this.that.keycloakRealm = x;
+  }
+
+  get keycloakScope() {
+    return this.that.keycloakScope;
+  }
+
+  set keycloakScope(x) {
+    this.that.keycloakScope = x;
+  }
+
+  get keycloakGrantType() {
+    return this.that.keycloakGrantType;
+  }
+
+  set keycloakGrantType(x) {
+    this.that.keycloakGrantType = x;
+  }
+
+  get accessToken() {
+    return this.that.accessToken;
+  }
+
+  set accessToken(x) {
+    this.that.accessToken = x;
+  }
+
+  get refreshToken() {
+    return this.that.refreshToken;
+  }
+
+  set refreshToken(x) {
+    this.that.refreshToken = x;
+  }
+
   clone() {
     const settings = new Settings();
     settings.uuid = this.uuid;
@@ -138,6 +202,30 @@ _defineProperty(Settings, "schema", {
     pageSize: "int",
     poolId: "string",
     clientId: "string",
+    idpType: {
+      type: "string",
+      optional: true
+    },
+    keycloakAuthServerUrl: {
+      type: "string",
+      optional: true
+    },
+    keycloakClientId: {
+      type: "string",
+      optional: true
+    },
+    keycloakScope: {
+      type: "string",
+      optional: true
+    },
+    keycloakGrantType: {
+      type: "string",
+      optional: true
+    },
+    keycloakRealm: {
+      type: "string",
+      optional: true
+    },
     devSkipValidation: {
       type: "bool",
       default: false
@@ -149,6 +237,14 @@ _defineProperty(Settings, "schema", {
     userId: {
       type: "string",
       optional: true
+    },
+    accessToken: {
+      type: "string",
+      optional: true
+    },
+    refreshToken: {
+      type: "string",
+      optional: true
     }
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.27.27",
+    "version": "1.27.29",
     "private": false,
     "repository": {
         "type": "git",