openchs-models 1.31.31 → 1.31.32

package/dist/Concept.js

@@ -127,9 +127,6 @@ 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;

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/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;

package/package.json

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