openchs-models 1.30.27 → 1.30.30

package/Makefile

@@ -15,6 +15,9 @@ release:
 	git pull --tags
 	git pull --rebase
 	@echo "Ensure version changes follow semantic versioning - https://classic.yarnpkg.com/en/docs/dependency-versions#toc-semantic-versioning"
+	@echo "\033[1mLatest openchs-models version across branches:"
+	npm view openchs-models version
+	@echo "\033[0m"
 	yarn version
 	@echo "   Now please run \nmake publish"
 

package/dist/CustomDashboardCache.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
+var _ParseUtil = _interopRequireDefault(require("./utility/ParseUtil"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -105,21 +107,21 @@ class CustomDashboardCache extends _BaseEntity.default {
   }
 
   getSelectedValues() {
-    return this.selectedValuesJSON && JSON.parse(this.selectedValuesJSON) || {};
+    return this.selectedValuesJSON && _ParseUtil.default.parse(this.selectedValuesJSON) || {};
   }
 
   getFilterErrors() {
-    return this.filterErrorsJSON && JSON.parse(this.filterErrorsJSON) || {};
+    return this.filterErrorsJSON && _ParseUtil.default.parse(this.filterErrorsJSON) || {};
   }
 
   getRuleInput() {
-    return this.ruleInputJSON && JSON.parse(this.ruleInputJSON) || {
+    return this.ruleInputJSON && _ParseUtil.default.parse(this.ruleInputJSON) || {
       ruleInputArray: null
     };
   }
 
   getTransformedFilters() {
-    return this.transformedFiltersJSON && JSON.parse(this.transformedFiltersJSON) || {
+    return this.transformedFiltersJSON && _ParseUtil.default.parse(this.transformedFiltersJSON) || {
       date: new Date(),
       applied: false,
       selectedLocations: [],

package/dist/EntityMetaData.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.EntityApprovalStatusMetaData = void 0;
+exports.default = void 0;
 
 var _Concept = _interopRequireDefault(require("./Concept"));
 
@@ -186,39 +186,8 @@ const refDataNameTranslated = (clazz, attrs = {}) => refData(clazz, _objectSprea
 }));
 
 const txData = (clazz, {
-  res,
-  resUrl,
-  parent,
-  apiVersion,
-  syncWeight,
-  privilegeParam,
-  privilegeEntity,
-  privilegeName,
-  queryParam,
-  hasMoreThanOneAssociation,
-  apiQueryParams
-} = {}) => ({
-  schemaName: clazz.schema.name,
-  entityName: clazz.schema.name,
-  entityClass: clazz,
-  resourceName: res || _lodash.default.camelCase(clazz.schema.name),
-  resourceUrl: resUrl,
-  type: "tx",
-  nameTranslated: false,
-  parent: parent,
-  apiVersion,
-  syncWeight: syncWeight,
-  privilegeParam,
-  privilegeEntity,
-  privilegeName,
-  queryParam,
-  hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
-  apiQueryParams
-});
-
-const virtualTxData = (clazz, {
-  res,
   entityName,
+  res,
   resUrl,
   parent,
   apiVersion,
@@ -232,11 +201,11 @@ const virtualTxData = (clazz, {
   apiQueryParamKey
 } = {}) => ({
   schemaName: clazz.schema.name,
-  entityName: entityName,
+  entityName: entityName || clazz.schema.name,
   entityClass: clazz,
   resourceName: res || _lodash.default.camelCase(clazz.schema.name),
   resourceUrl: resUrl,
-  type: "virtualTx",
+  type: "tx",
   nameTranslated: false,
   parent: parent,
   apiVersion,
@@ -490,12 +459,7 @@ const groupDashboard = refData(_GroupDashboard.default, {
   res: "groupDashboard",
   syncWeight: 0
 });
-const EntityApprovalStatusMetaData = txData(_EntityApprovalStatus.default, {
-  res: "entityApprovalStatus",
-  entityName: "EntityApprovalStatus"
-});
-exports.EntityApprovalStatusMetaData = EntityApprovalStatusMetaData;
-const subjectEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const subjectEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'SubjectEntityApprovalStatus',
@@ -509,7 +473,7 @@ const subjectEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default,
   parent: individual,
   syncWeight: 2
 });
-const encounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const encounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'EncounterEntityApprovalStatus',
@@ -523,7 +487,7 @@ const encounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.defaul
   parent: encounter,
   syncWeight: 2
 });
-const programEncounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const programEncounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ProgramEncounterEntityApprovalStatus',
@@ -537,7 +501,7 @@ const programEncounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus
   parent: programEncounter,
   syncWeight: 2
 });
-const programEnrolmentEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const programEnrolmentEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ProgramEnrolmentEntityApprovalStatus',
@@ -551,7 +515,7 @@ const programEnrolmentEntityApprovalStatus = virtualTxData(_EntityApprovalStatus
   parent: programEnrolment,
   syncWeight: 2
 });
-const checklistItemEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const checklistItemEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ChecklistItemEntityApprovalStatus',
@@ -565,6 +529,10 @@ const checklistItemEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.de
   parent: checklistItem,
   syncWeight: 2
 });
+const entityApprovalStatus = txData(_EntityApprovalStatus.default, {
+  res: 'entityApprovalStatus',
+  syncWeight: 1
+});
 const news = txData(_News.default, {
   syncWeight: 0
 });
@@ -645,7 +613,7 @@ class EntityMetaData {
 
   //order is important. last entity in each (tx and ref) with be executed first. parent should be synced before the child.
   static model() {
-    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
+    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
   }
 
   static entitiesLoadedFromServer() {
@@ -653,16 +621,7 @@ class EntityMetaData {
   }
 
   static findByName(entityName) {
-    return EntityMetaData.findByNameIn(entityName, EntityMetaData.model());
-  }
-
-  static findByNameIn(entityName, modelCollection) {
-    return _lodash.default.find(modelCollection, //TODO check if this works
-    entityMetadata => entityMetadata.entityName === entityName);
-  }
-
-  static allModels() {
-    return _lodash.default.concat(EntityApprovalStatusMetaData, EntityMetaData.model());
+    return _lodash.default.find(EntityMetaData.model(), entityMetadata => entityMetadata.entityName === entityName);
   }
 
 }

package/dist/index.js

@@ -105,12 +105,6 @@ Object.defineProperty(exports, "EntityMetaData", {
     return _EntityMetaData.default;
   }
 });
-Object.defineProperty(exports, "EntityApprovalStatusMetaData", {
-  enumerable: true,
-  get: function () {
-    return _EntityMetaData.EntityApprovalStatusMetaData;
-  }
-});
 Object.defineProperty(exports, "EntityQueue", {
   enumerable: true,
   get: function () {
@@ -840,7 +834,7 @@ var _Encounter = _interopRequireDefault(require("./Encounter"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
-var _EntityMetaData = _interopRequireWildcard(require("./EntityMetaData"));
+var _EntityMetaData = _interopRequireDefault(require("./EntityMetaData"));
 
 var _EntityQueue = _interopRequireDefault(require("./EntityQueue"));
 

package/dist/utility/ParseUtil.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+class ParseUtil {
+  static parse(jsonValue) {
+    const iso8061 = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/;
+    return JSON.parse(jsonValue, function (key, value) {
+      if (typeof value != 'string') {
+        return value;
+      }
+
+      if (iso8061 && value.match(iso8061)) {
+        return new Date(value);
+      }
+
+      return value;
+    });
+  }
+
+}
+
+var _default = ParseUtil;
+exports.default = _default;

package/package.json

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