openchs-models 1.31.21 → 1.31.23

package/dist/DashboardCache.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
+var _DashboardCacheFilter = _interopRequireDefault(require("./application/DashboardCacheFilter"));
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
 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; }
@@ -18,14 +20,6 @@ class DashboardCache extends _BaseEntity.default {
     super(that);
   }
 
-  get updatedAt() {
-    return this.that.updatedAt;
-  }
-
-  set updatedAt(x) {
-    this.that.updatedAt = x;
-  }
-
   get cardJSON() {
     return this.that.cardJSON;
   }
@@ -42,43 +36,34 @@ class DashboardCache extends _BaseEntity.default {
     this.that.filterJSON = x;
   }
 
-  static create(updatedAt, cardJSON, filterJSON) {
+  static createEmptyInstance() {
     const dashboardCache = new DashboardCache();
     dashboardCache.uuid = this.rowUUID;
-    dashboardCache.updatedAt = updatedAt;
-    dashboardCache.cardJSON = cardJSON;
-    dashboardCache.filterJSON = filterJSON;
+    dashboardCache.filterJSON = JSON.stringify(_DashboardCacheFilter.default.createEmptyInstance());
+    dashboardCache.cardJSON = "{}";
     return dashboardCache;
   }
 
-  static getFilterJSONFromState(state) {
-    const filterCache = {
-      date: state.date,
-      selectedPrograms: state.selectedPrograms,
-      selectedEncounterTypes: state.selectedEncounterTypes,
-      selectedGeneralEncounterTypes: state.selectedGeneralEncounterTypes,
-      selectedCustomFilters: state.selectedCustomFilters,
-      selectedGenders: state.selectedGenders,
-      programs: state.programs,
-      individualFilters: state.individualFilters,
-      encountersFilters: state.encountersFilters,
-      enrolmentFilters: state.enrolmentFilters,
-      generalEncountersFilters: state.generalEncountersFilters,
-      selectedSubjectType: state.subjectType
-    };
-    return state.subjectType && _lodash.default.isEmpty(state.subjectType.name) ? _lodash.default.omit(filterCache, ['selectedSubjectType']) : filterCache;
+  getCard() {
+    return this.cardJSON && JSON.parse(this.cardJSON) || {};
   }
 
-  static createEmptyInstance() {
-    return new DashboardCache();
+  getFilter() {
+    const filter = this.filterJSON && JSON.parse(this.filterJSON) || {};
+
+    if (!_lodash.default.isEmpty(filter.filterDate)) {
+      filter.filterDate = new Date(filter.filterDate);
+    }
+
+    return filter;
   }
 
-  getCardJSON() {
-    return this.cardJSON && JSON.parse(this.cardJSON) || {};
+  setFilter(value) {
+    this.filterJSON = JSON.stringify(value);
   }
 
-  getFilterJSON() {
-    return this.filterJSON && JSON.parse(this.filterJSON) || {};
+  setCard(value) {
+    this.cardJSON = JSON.stringify(value);
   }
 
 }
@@ -90,7 +75,6 @@ _defineProperty(DashboardCache, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    updatedAt: "date",
     cardJSON: "string",
     filterJSON: "string"
   }

package/dist/Schema.js

@@ -202,7 +202,7 @@ const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.de
 function createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 182,
+    schemaVersion: 183,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 
@@ -805,6 +805,11 @@ function createRealmConfig() {
           rc.initCountOfCards = 1;
         });
       }
+
+      if (newDB.schemaVersion < 183) {
+        const newObjects = newDB.objects("DashboardCache");
+        newDB.delete(newObjects);
+      }
     }
   };
 }

package/dist/application/DashboardCacheFilter.js

@@ -0,0 +1,80 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+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; }
+
+function overwriteField(field, source, destination, force) {
+  if (_lodash.default.isNil(destination[field]) || force) destination[field] = source[field];
+}
+
+class DashboardCacheFilter {
+  constructor() {
+    _defineProperty(this, "filterDate", void 0);
+
+    _defineProperty(this, "selectedPrograms", void 0);
+
+    _defineProperty(this, "selectedEncounterTypes", void 0);
+
+    _defineProperty(this, "selectedGeneralEncounterTypes", void 0);
+
+    _defineProperty(this, "selectedCustomFilters", void 0);
+
+    _defineProperty(this, "selectedGenders", void 0);
+
+    _defineProperty(this, "individualFilters", void 0);
+
+    _defineProperty(this, "encountersFilters", void 0);
+
+    _defineProperty(this, "enrolmentFilters", void 0);
+
+    _defineProperty(this, "dueChecklistFilter", void 0);
+
+    _defineProperty(this, "generalEncountersFilters", void 0);
+
+    _defineProperty(this, "selectedSubjectTypeUUID", void 0);
+
+    _defineProperty(this, "selectedLocations", void 0);
+
+    _defineProperty(this, "selectedAddressesInfo", void 0);
+  }
+
+  static overwriteFields(from, dashboardCacheFilter, force) {
+    overwriteField("filterDate", from, dashboardCacheFilter, force);
+    overwriteField("selectedPrograms", from, dashboardCacheFilter, force);
+    overwriteField("selectedEncounterTypes", from, dashboardCacheFilter, force);
+    overwriteField("selectedGeneralEncounterTypes", from, dashboardCacheFilter, force);
+    overwriteField("selectedCustomFilters", from, dashboardCacheFilter, force);
+    overwriteField("selectedGenders", from, dashboardCacheFilter, force);
+    overwriteField("individualFilters", from, dashboardCacheFilter, force);
+    overwriteField("encountersFilters", from, dashboardCacheFilter, force);
+    overwriteField("enrolmentFilters", from, dashboardCacheFilter, force);
+    overwriteField("generalEncountersFilters", from, dashboardCacheFilter, force);
+    overwriteField("selectedSubjectTypeUUID", from, dashboardCacheFilter, force);
+    overwriteField("dueChecklistFilter", from, dashboardCacheFilter, force);
+    overwriteField("selectedLocations", from, dashboardCacheFilter, force);
+    overwriteField("selectedAddressesInfo", from, dashboardCacheFilter, force);
+  }
+
+  static createEmptyInstance() {
+    const dashboardCacheFilter = new DashboardCacheFilter();
+    dashboardCacheFilter.selectedPrograms = [];
+    dashboardCacheFilter.selectedEncounterTypes = [];
+    dashboardCacheFilter.selectedGeneralEncounterTypes = [];
+    dashboardCacheFilter.selectedCustomFilters = [];
+    dashboardCacheFilter.selectedGenders = [];
+    dashboardCacheFilter.selectedLocations = [];
+    return dashboardCacheFilter;
+  }
+
+}
+
+var _default = DashboardCacheFilter;
+exports.default = _default;

package/dist/framework/RealmProxy.js

@@ -70,7 +70,7 @@ class RealmProxy {
       });
 
       if (emptyMandatoryProperties.length > 0) {
-        throw new Error(`${emptyMandatoryProperties.join(",")} are mandatory for ${schemaName}, Keys being saved - ${saveObjectKeys}`);
+        throw new Error(`${emptyMandatoryProperties.join(",")} are mandatory for ${schemaName}, Keys being saved - ${saveObjectKeys}. UUID: ${underlyingObject.uuid}`);
       }
     }
 

package/dist/index.js

@@ -807,6 +807,12 @@ Object.defineProperty(exports, "AgeUtil", {
     return _AgeUtil.default;
   }
 });
+Object.defineProperty(exports, "DashboardCacheFilter", {
+  enumerable: true,
+  get: function () {
+    return _DashboardCacheFilter.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1068,6 +1074,8 @@ var _CustomDashboardCache = _interopRequireDefault(require("./CustomDashboardCac
 
 var _AgeUtil = _interopRequireDefault(require("./utility/AgeUtil"));
 
+var _DashboardCacheFilter = _interopRequireDefault(require("./application/DashboardCacheFilter"));
+
 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; }

package/package.json

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