openchs-models 1.30.73 → 1.30.75

package/dist/EntityMetaData.js

@@ -167,7 +167,9 @@ const refData = (clazz, {
   translated,
   parent,
   syncWeight,
-  resUrl
+  resUrl,
+  syncPushRequired = true,
+  syncPullRequired = true
 } = {}) => ({
   schemaName: clazz.schema.name,
   entityName: clazz.schema.name,
@@ -178,20 +180,14 @@ const refData = (clazz, {
   resourceSearchFilterURL: filter,
   parent: parent,
   syncWeight: syncWeight,
-  resourceUrl: resUrl
+  resourceUrl: resUrl,
+  syncPushRequired,
+  syncPullRequired
 });
 
 const refDataNameTranslated = (clazz, attrs = {}) => refData(clazz, _objectSpread({}, attrs, {
   translated: true
 }));
-/*
-const userInfo = txData(UserInfo, {
-  resUrl: "me",
-  apiVersion: "v2",
-  syncWeight: 1,
-});
- */
-
 
 const txData = (clazz, {
   entityName,
@@ -206,7 +202,9 @@ const txData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey
+  apiQueryParamKey,
+  syncPushRequired = true,
+  syncPullRequired = true
 } = {}) => ({
   schemaName: clazz.schema.name,
   entityName: entityName || clazz.schema.name,
@@ -224,7 +222,9 @@ const txData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey
+  apiQueryParamKey,
+  syncPushRequired,
+  syncPullRequired
 });
 
 const checklistDetail = refData(_ChecklistDetail.default, {
@@ -394,10 +394,10 @@ const syncTelemetry = txData(_SyncTelemetry.default, {
   syncWeight: 1,
   syncPullRequired: false
 });
-const userInfo = refData(_UserInfo.default, {
-  resUrl: "v2/me",
-  syncWeight: 1,
-  filter: ""
+const userInfo = txData(_UserInfo.default, {
+  resUrl: "me",
+  apiVersion: "v2",
+  syncWeight: 1
 });
 const identifierAssignment = txData(_IdentifierAssignment.default, {
   syncWeight: 0

package/dist/IdentifierAssignment.js

@@ -68,6 +68,14 @@ class IdentifierAssignment extends _BaseEntity.default {
     this.that.programEnrolment = this.fromObject(x);
   }
 
+  get used() {
+    return this.that.used;
+  }
+
+  set used(x) {
+    this.that.used = x;
+  }
+
   static fromResource(identifierAssignmentResource, entityService) {
     const identifierAssignment = _General.default.assignFields(identifierAssignmentResource, new IdentifierAssignment(), ["uuid", "identifier", "assignmentOrder", "voided"]);
 
@@ -120,6 +128,11 @@ _defineProperty(IdentifierAssignment, "schema", {
     programEnrolment: {
       type: "ProgramEnrolment",
       optional: true
+    },
+    used: {
+      type: "bool",
+      default: false,
+      optional: false
     }
   }
 });

package/dist/Schema.js

@@ -200,7 +200,7 @@ const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.de
 function createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 178,
+    schemaVersion: 179,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 
@@ -766,6 +766,14 @@ function createRealmConfig() {
         const pushOnlyEntities = newDB.objects(_SchemaNames.default.EntitySyncStatus).filtered("entityName = 'EntityApprovalStatus' OR entityName = 'SyncTelemetry' OR entityName = 'VideoTelemetric' OR entityName = 'RuleFailureTelemetry'");
         newDB.delete(pushOnlyEntities);
       }
+
+      if (oldDB.schemaVersion < 179) {
+        _lodash.default.forEach(newDB.objects(_IdentifierAssignment.default.schema.name), identifierAssignment => {
+          if (identifierAssignment.individual !== null || identifierAssignment.programEnrolment !== null) {
+            identifierAssignment.used = true;
+          }
+        });
+      }
     }
   };
 }

package/dist/application/FormElementGroup.js

@@ -140,6 +140,7 @@ class FormElementGroup extends _BaseEntity.default {
   }
 
   addFormElement(formElement) {
+    formElement.formElementGroup = this;
     this.formElements.push(formElement);
   }
 

package/dist/application/ValidationResult.js

@@ -64,7 +64,8 @@ class ValidationResult {
 
 _defineProperty(ValidationResult, "ValidationTypes", {
   Form: "Form",
-  Rule: "Rule"
+  Rule: "Rule",
+  Database: "Database"
 });
 
 var _default = ValidationResult;

package/dist/framework/RealmResultsProxy.js

@@ -59,7 +59,9 @@ class RealmResultsProxy {
   }
 
   getAt(index) {
-    return this.createEntity(this.realmCollection[index]);
+    const realmCollectionElement = this.realmCollection[index];
+    if (_lodash.default.isNil(realmCollectionElement)) return null;
+    return this.createEntity(realmCollectionElement);
   }
 
   forEach(callback, thisArg) {

package/package.json

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