openchs-models 1.31.30 → 1.31.32

package/dist/Concept.js

@@ -127,9 +127,7 @@ 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;
   }
@@ -155,20 +153,18 @@ class Concept extends _BaseEntity.default {
     concept.name = name;
     concept.datatype = dataType;
     concept.uuid = uuid;
-    concept.keyValues = keyValues;
+    concept.keyValues = _lodash.default.map(keyValues, _KeyValue.default.fromResource);
     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() {
-    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;
+    return this;
   }
 
   _valuePresent(value) {

package/dist/EntityMetaData.js

@@ -147,18 +147,6 @@ var _UserSubjectAssignment = _interopRequireDefault(require("./assignment/UserSu
 
 var _DashboardFilter = _interopRequireDefault(require("./reports/DashboardFilter"));
 
-var _KeyValue = _interopRequireDefault(require("./application/KeyValue"));
-
-var _Observation = _interopRequireDefault(require("./Observation"));
-
-var _Format = _interopRequireDefault(require("./application/Format"));
-
-var _StringKeyNumericValue = _interopRequireDefault(require("./application/StringKeyNumericValue"));
-
-var _ChecklistItemStatus = _interopRequireDefault(require("./ChecklistItemStatus"));
-
-var _Point = _interopRequireDefault(require("./geo/Point"));
-
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -650,7 +638,7 @@ class EntityMetaData {
   }
 
   static embeddedEntities() {
-    return [_KeyValue.default, _Observation.default, _Format.default, _StringKeyNumericValue.default, _ChecklistItemStatus.default, _Point.default];
+    return _lodash.default.filter(_Schema.default.getInstance().getEntities(), entity => entity.schema.embedded);
   }
 
   static findByName(entityName) {

package/dist/Observation.js

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

package/dist/application/FormElement.js

@@ -143,9 +143,7 @@ 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; //remove orphan keyValues (because KeyValue doesn't have primary key
-
-    entityService.deleteObjects(resource["uuid"], FormElement.schema.name, "keyValues");
+    formElement.concept = concept;
     formElement.keyValues = _lodash.default.map(resource.keyValues, _KeyValue.default.fromResource);
     formElement.validFormat = _Format.default.fromResource(resource["validFormat"]);
     return formElement;
@@ -394,7 +392,7 @@ class FormElement extends _BaseEntity.default {
     formElement.name = this.name;
     formElement.displayOrder = this.displayOrder;
     formElement.mandatory = this.mandatory;
-    formElement.keyValues = this.keyValues;
+    formElement.keyValues = _lodash.default.map(this.keyValues, _KeyValue.default.fromResource);
     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 = JSON.stringify(resource.value);
+    keyValue.value = typeof resource.value !== "string" ? JSON.stringify(resource.value) : resource.value;
     return keyValue;
   }
 

package/dist/framework/RealmProxy.js

@@ -55,6 +55,14 @@ 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.30",
+    "version": "1.31.32",
     "private": false,
     "repository": {
         "type": "git",