@onehat/ui 0.3.319 → 0.3.321

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.319",
+	"version": "0.3.321",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",

package/src/Components/Hoc/withFilters.js

@@ -273,7 +273,7 @@ export default function withFilters(WrappedComponent) {
 								type: filterType,
 								title,
 							} = filter;
-						
+							
 						if (!title) {
 							const propertyDef = Repository.getSchema().getPropertyDefinition(field);
 							title = propertyDef?.title;
@@ -282,7 +282,8 @@ export default function withFilters(WrappedComponent) {
 						if (_.isString(filterType)) {
 							if (filterType === FILTER_TYPE_ANCILLARY) {
 								title = modelFilterTypes[field].title;
-								filterType = Inflector.camelize(Inflector.pluralize(field)) + 'Combo'; // Convert field to PluralCamelCombo
+								const tagOrCombo = Repository.schema.model.ancillaryFiltersThatUseTags && inArray(field, Repository.schema.model.ancillaryFiltersThatUseTags) ? 'Tag' : 'Combo';
+								filterType = Inflector.camelize(Inflector.pluralize(field)) + tagOrCombo; // Convert field to PluralCamelCombo
 							}
 							Element = getComponentFromType(filterType);
 							if (filterType === 'Input') {

package/src/Functions/jsonValidator.js

@@ -1,13 +1,18 @@
 import * as yup from 'yup';
+import _ from 'lodash';
 
-export default function json() {
+export default function json(isRequired = false) {
 	return yup.mixed().test(
 		'is-json',
 		'${path} is not valid JSON',
 		value => {
 			try {
-				JSON.parse(value);
-				return true; // Valid JSON
+				const json = JSON.parse(value);
+				// Valid JSON
+				if (isRequired && _.isEmpty(json)) {
+					return false; // Empty JSON
+				}
+				return true;
 			} catch (error) {
 				return false; // Invalid JSON
 			}