openchs-models 1.31.32 → 1.31.33

package/dist/Concept.js

@@ -127,7 +127,9 @@ class Concept extends _BaseEntity.default {
     concept.hiNormal = conceptResource.highNormal;
     concept.unit = conceptResource.unit;
     concept.voided = conceptResource.voided || false; //This change should be independently deployable irrespective of server
+    //remove orphan keyValues (because KeyValue doesn't have primary key
 
+    entityService && entityService.deleteObjects(conceptResource["uuid"], Concept.schema.name, "keyValues");
     concept.keyValues = _lodash.default.map(conceptResource.keyValues, _KeyValue.default.fromResource);
     return concept;
   }
@@ -153,18 +155,20 @@ class Concept extends _BaseEntity.default {
     concept.name = name;
     concept.datatype = dataType;
     concept.uuid = uuid;
-    concept.keyValues = _lodash.default.map(keyValues, _KeyValue.default.fromResource);
+    concept.keyValues = keyValues;
     return concept;
   }
-  /**
-   * This should never be cloned and used for reference as this is metadata which is not to be modified during transactional data operations
-   *
-   * @returns {Concept}
-   */
-
 
   cloneForReference() {
-    return this;
+    const concept = Concept.create(this.name, this.datatype, this.keyValues);
+    concept.uuid = this.uuid;
+    concept.unit = this.unit;
+    concept.lowAbsolute = this.lowAbsolute;
+    concept.lowNormal = this.lowNormal;
+    concept.hiNormal = this.hiNormal;
+    concept.hiAbsolute = this.hiAbsolute;
+    concept.answers = this.answers || [];
+    return concept;
   }
 
   _valuePresent(value) {

package/dist/EntityMetaData.js

@@ -634,11 +634,7 @@ class EntityMetaData {
   }
 
   static entitiesLoadedFromServer() {
-    return _lodash.default.differenceBy(_Schema.default.getInstance().getEntities(), [_Settings.default, _LocaleMapping.default].concat(EntityMetaData.embeddedEntities()), "schema.name");
-  }
-
-  static embeddedEntities() {
-    return _lodash.default.filter(_Schema.default.getInstance().getEntities(), entity => entity.schema.embedded);
+    return _lodash.default.differenceBy(_Schema.default.getInstance().getEntities(), [_Settings.default, _LocaleMapping.default], "schema.name");
   }
 
   static findByName(entityName) {

package/dist/Observation.js

@@ -164,7 +164,7 @@ class Observation extends _PersistedObject.default {
   }
 
   cloneForEdit() {
-    return clone(this.concept, this.getValueWrapper().cloneForEdit());
+    return clone(this.concept.cloneForReference(), this.getValueWrapper().cloneForEdit());
   }
 
   shallowClone() {

package/dist/application/Form.js

@@ -66,6 +66,14 @@ class Form extends _BaseEntity.default {
     this.that.decisionRule = x;
   }
 
+  get editFormRule() {
+    return this.that.editFormRule;
+  }
+
+  set editFormRule(x) {
+    this.that.editFormRule = x;
+  }
+
   get visitScheduleRule() {
     return this.that.visitScheduleRule;
   }
@@ -118,7 +126,7 @@ class Form extends _BaseEntity.default {
       this.deleteOutOfSyncDrafts(entityService, resource.uuid);
     }
 
-    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
+    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
   }
 
   static deleteOutOfSyncDrafts(entityService, formUUID) {
@@ -348,6 +356,10 @@ _defineProperty(Form, "schema", {
       type: "string",
       optional: true
     },
+    editFormRule: {
+      type: "string",
+      optional: true
+    },
     visitScheduleRule: {
       type: "string",
       optional: true

package/dist/application/FormElement.js

@@ -143,7 +143,9 @@ class FormElement extends _BaseEntity.default {
     formElement.formElementGroup = formElementGroup;
     formElement.groupUuid = _ResourceUtil.default.getUUIDFor(resource, "groupQuestionUUID");
     formElement.documentation = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "documentationUUID"), _Documentation.default.schema.name);
-    formElement.concept = concept;
+    formElement.concept = concept; //remove orphan keyValues (because KeyValue doesn't have primary key
+
+    entityService.deleteObjects(resource["uuid"], FormElement.schema.name, "keyValues");
     formElement.keyValues = _lodash.default.map(resource.keyValues, _KeyValue.default.fromResource);
     formElement.validFormat = _Format.default.fromResource(resource["validFormat"]);
     return formElement;
@@ -392,7 +394,7 @@ class FormElement extends _BaseEntity.default {
     formElement.name = this.name;
     formElement.displayOrder = this.displayOrder;
     formElement.mandatory = this.mandatory;
-    formElement.keyValues = _lodash.default.map(this.keyValues, _KeyValue.default.fromResource);
+    formElement.keyValues = this.keyValues;
     formElement.concept = this.concept;
     formElement.type = this.type;
     formElement.formElementGroup = this.formElementGroup;

package/dist/application/KeyValue.js

@@ -17,7 +17,7 @@ class KeyValue extends _PersistedObject.default {
   static fromResource(resource) {
     const keyValue = new KeyValue();
     keyValue.key = resource.key;
-    keyValue.value = typeof resource.value !== "string" ? JSON.stringify(resource.value) : resource.value;
+    keyValue.value = JSON.stringify(resource.value);
     return keyValue;
   }
 

package/dist/framework/RealmProxy.js

@@ -55,14 +55,6 @@ class RealmProxy {
   close() {
     return this.realmDb.close();
   }
-  /**
-   *
-   * @param schemaName
-   * @param properties
-   * @param updateMode , all === true, modified , never === false
-   * @returns {*}
-   */
-
 
   create(schemaName, properties, updateMode = "never") {
     const underlyingObject = _lodash.default.isNil(properties.that) ? properties : properties.that;

package/package.json

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