openchs-models 1.30.8 → 1.30.11

package/dist/EntityMetaData.js

@@ -178,8 +178,7 @@ const refData = (clazz, {
   resourceSearchFilterURL: filter,
   parent: parent,
   syncWeight: syncWeight,
-  resourceUrl: resUrl,
-  childToParentAssociation: true
+  resourceUrl: resUrl
 });
 
 const refDataNameTranslated = (clazz, attrs = {}) => refData(clazz, _objectSpread({}, attrs, {
@@ -197,8 +196,7 @@ const txData = (clazz, {
   privilegeName,
   queryParam,
   hasMoreThanOneAssociation,
-  apiQueryParams,
-  childToParentAssociation = true
+  apiQueryParams
 } = {}) => ({
   schemaName: clazz.schema.name,
   entityName: clazz.schema.name,
@@ -231,8 +229,7 @@ const virtualTxData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey,
-  childToParentAssociation = true
+  apiQueryParamKey
 } = {}) => ({
   schemaName: clazz.schema.name,
   entityName: entityName,
@@ -250,8 +247,7 @@ const virtualTxData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey,
-  childToParentAssociation
+  apiQueryParamKey
 });
 
 const checklistDetail = refData(_ChecklistDetail.default, {
@@ -506,7 +502,6 @@ const subjectEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default,
   privilegeEntity: _Privilege.default.privilegeEntityType.subject,
   privilegeName: _Privilege.default.privilegeName.viewSubject,
   parent: individual,
-  childToParentAssociation: false,
   syncWeight: 2
 });
 const encounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
@@ -521,7 +516,6 @@ const encounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.defaul
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: encounter,
-  childToParentAssociation: false,
   syncWeight: 2
 });
 const programEncounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
@@ -536,7 +530,6 @@ const programEncounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: programEncounter,
-  childToParentAssociation: false,
   syncWeight: 2
 });
 const programEnrolmentEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
@@ -551,7 +544,6 @@ const programEnrolmentEntityApprovalStatus = virtualTxData(_EntityApprovalStatus
   privilegeEntity: _Privilege.default.privilegeEntityType.enrolment,
   privilegeName: _Privilege.default.privilegeName.viewEnrolmentDetails,
   parent: programEnrolment,
-  childToParentAssociation: false,
   syncWeight: 2
 });
 const checklistItemEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
@@ -566,7 +558,6 @@ const checklistItemEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.de
   privilegeEntity: _Privilege.default.privilegeEntityType.checklist,
   privilegeName: _Privilege.default.privilegeName.viewChecklist,
   parent: checklistItem,
-  childToParentAssociation: false,
   syncWeight: 2
 });
 const news = txData(_News.default, {

package/dist/Individual.js

@@ -377,7 +377,7 @@ class Individual extends _BaseEntity.default {
 
     let realmIndividual = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, parentIdField, Individual.schema.name);
 
-    realmIndividual = _General.default.pick(realmIndividual, ["uuid"], ["enrolments", "encounters", "relationships", "groupSubjects", "comments", "groups", "approvalStatuses", "latestEntityApprovalStatus"]);
+    realmIndividual = _General.default.pick(realmIndividual, ["uuid", "latestEntityApprovalStatus"], ["enrolments", "encounters", "relationships", "groupSubjects", "comments", "groups", "approvalStatuses"]);
     if (childEntityClass === _ProgramEnrolment.default) _BaseEntity.default.addNewChild(child, realmIndividual.enrolments);else if (childEntityClass === _Encounter.default) _BaseEntity.default.addNewChild(child, realmIndividual.encounters);else if (childEntityClass === _Comment.default) _BaseEntity.default.addNewChild(child, realmIndividual.comments);else if (childEntityClass === _EntityApprovalStatus.default) {
       _BaseEntity.default.addNewChild(child, realmIndividual.approvalStatuses);
 

package/dist/Settings.js

@@ -162,6 +162,14 @@ class Settings extends _BaseEntity.default {
     this.that.refreshToken = x;
   }
 
+  get devSkipValidation() {
+    return this.that.devSkipValidation;
+  }
+
+  set devSkipValidation(x) {
+    this.that.devSkipValidation = x;
+  }
+
   clone() {
     const settings = new Settings();
     settings.uuid = this.uuid;
@@ -174,6 +182,12 @@ class Settings extends _BaseEntity.default {
     settings.devSkipValidation = this.devSkipValidation;
     settings.captureLocation = this.captureLocation;
     settings.userId = this.userId;
+    settings.idpType = this.idpType;
+    settings.keycloakRealm = this.keycloakRealm;
+    settings.keycloakScope = this.keycloakScope;
+    settings.keycloakAuthServerUrl = this.keycloakAuthServerUrl;
+    settings.keycloakClientId = this.keycloakClientId;
+    settings.keycloakGrantType = this.keycloakGrantType;
     return settings;
   }
 
@@ -182,6 +196,7 @@ class Settings extends _BaseEntity.default {
     if (_lodash.default.isEmpty(this.serverURL)) validationResults.addOrReplace(_ValidationResult.default.failureForEmpty("serverURL"));
     if (_lodash.default.isEmpty(this.locale)) validationResults.addOrReplace(_ValidationResult.default.failureForEmpty("locale"));
     if (!_General.default.isNumeric(this.logLevel)) validationResults.addOrReplace(_ValidationResult.default.failureForNumeric("logLevel"));
+    if (_lodash.default.isEmpty(this.idpType)) validationResults.addOrReplace(_ValidationResult.default.failureForEmpty("idpType"));
     return validationResults;
   }
 

package/package.json

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