openchs-models 1.30.3 → 1.30.5

package/dist/reports/DashboardFilterConfig.js

@@ -111,8 +111,6 @@ const dateFilterTypes = [_CustomFilter.default.type.RegistrationDate, _CustomFil
 
 class DashboardFilterConfig {
   constructor() {
-    _defineProperty(this, "subjectType", void 0);
-
     _defineProperty(this, "type", void 0);
 
     _defineProperty(this, "widget", void 0);
@@ -143,14 +141,13 @@ class DashboardFilterConfig {
   }
 
   isValid() {
-    const valid = !(_lodash.default.isNil(this.type) || _lodash.default.isNil(this.subjectType));
+    const valid = !_lodash.default.isNil(this.type);
     if (!valid) return valid;
     if (this.isConceptTypeFilter()) return this.observationBasedFilter.isValid();else if (this.isGroupSubjectTypeFilter()) return this.groupSubjectTypeFilter.isValid();else if (this.isWidgetRequired()) return !_lodash.default.isNil(this.widget);else return true;
   }
 
   toServerRequest() {
     const request = {
-      subjectTypeUUID: this.subjectType.uuid,
       type: this.type,
       widget: this.widget
     };
@@ -178,19 +175,6 @@ class DashboardFilterConfig {
     return [RegistrationDate, EnrolmentDate, ProgramEncounterDate, EncounterDate].includes(this.type) || this.isConceptTypeFilter() && this.observationBasedFilter.isWidgetRequired();
   }
 
-  setSubjectType(subjectType) {
-    if (_lodash.default.get(subjectType, "uuid") !== _lodash.default.get(this.subjectType, "uuid")) {
-      this.subjectType = subjectType;
-
-      if (!_lodash.default.isNil(this.observationBasedFilter)) {
-        this.observationBasedFilter.programs = [];
-        this.observationBasedFilter.encounterTypes = [];
-      } else if (!_lodash.default.isNil(this.groupSubjectTypeFilter)) {
-        this.groupSubjectTypeFilter.subjectType = null;
-      }
-    }
-  }
-
   willObservationBeInScopeOfProgramEnrolment() {
     return this.isConceptTypeFilter() && this.observationBasedFilter.willObservationBeInScopeOfProgramEnrolment();
   }
@@ -212,7 +196,6 @@ class DashboardFilterConfig {
   clone() {
     const clone = new DashboardFilterConfig();
     clone.type = this.type;
-    clone.subjectType = this.subjectType;
     clone.widget = this.widget;
     clone.groupSubjectTypeFilter = this.groupSubjectTypeFilter;
     clone.observationBasedFilter = this.observationBasedFilter;

package/package.json

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