Merge branch 'refs/heads/10.0'

avniproject · Aug 28, 2024 · d66b2bd · d66b2bd
2 parents 5c21e77 + 8dd8c8d
commit d66b2bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/openchs-android/src/service/query/RealmQueryService.js b/packages/openchs-android/src/service/query/RealmQueryService.js
@@ -19,7 +19,7 @@ genderQueryKeys.set(Encounter.schema.name, "individual.gender.uuid");
 
 class RealmQueryService {
     static orQuery(array) {
-        const nonEmptyList = array.filter((x) => !_.isEmpty(x));
+        const nonEmptyList = _.filter(array, (x) => !_.isEmpty(x));
         return nonEmptyList.length > 0 ? '( ' + nonEmptyList.join(' OR ') + ' )' : '';
     }
 

diff --git a/packages/openchs-android/src/views/common/formMetaData/SubjectTypeSelect.js b/packages/openchs-android/src/views/common/formMetaData/SubjectTypeSelect.js
@@ -1,6 +1,7 @@
 import AbstractComponent from "../../../framework/view/AbstractComponent";
 import SubjectTypeService from "../../../service/SubjectTypeService";
 import SelectableItemGroup from "../../primitives/SelectableItemGroup";
+import {Text} from "react-native";
 import React from "react";
 import NamedSelectableEntities from "../../../model/NamedSelectableEntities";
 import PropTypes from "prop-types";
@@ -28,7 +29,7 @@ class SubjectTypeSelect extends AbstractComponent {
         const options = subjectTypes.getOptions();
 
         if (options.length === 0) {
-            return <Text>Not subject types found with permission</Text>;
+            return <Text>No subject types found</Text>;
         }
 
         return <SelectableItemGroup labelKey={"subjectTypes"}