@onehat/ui 0.4.75 → 0.4.77

package/package.json

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

package/src/Components/Form/Form.js

@@ -185,7 +185,27 @@ function Form(props) {
 		}),
 		initialValues = _.merge(startingValues, (record && !record.isDestroyed ? record.submitValues : {})),
 		defaultValues = isMultiple ? getNullFieldValues(initialValues, Repository) : initialValues, // when multiple entities, set all default values to null
-		validatorToUse = validator || (isMultiple ? disableRequiredYupFields(Repository?.schema?.model?.validator) : Repository?.schema?.model?.validator) || yup.object(),
+		validatorToUse = (() => {
+			// If a custom validator is provided, use it
+			if (validator) {
+				return validator;
+			}
+			
+			// If we have a Repository with a schema, use it (with modifications for multiple records)
+			if (Repository?.schema?.model?.validator) {
+				return isMultiple 
+					? disableRequiredYupFields(Repository.schema.model.validator)
+					: Repository.schema.model.validator;
+			}
+			
+			// For forms with no fields (like reports), create a schema that defaults to valid
+			if (!items || items.length === 0) {
+				return yup.object().default({}); // This will make the form valid by default
+			}
+			
+			// Fallback to empty schema that allows any fields and defaults to valid
+			return yup.object().noUnknown(false).default({});
+		})(),
 		{
 			control,
 			formState,
@@ -1131,6 +1151,20 @@ function Form(props) {
 		}, [formState.isDirty]);
 	}
 
+	useEffect(() => {
+		// For forms with no items (like some reports), manually trigger validation to set valid state
+		if ((!items || items.length === 0) && !columnsConfig) {
+			setTimeout(() => { // ensure the form is fully initialized
+				trigger().then(() => {
+					// Force validity to true for empty forms
+					if (onValidityChange) {
+						onValidityChange(true);
+					}
+				});
+			}, 0);
+		}
+	}, [items, columnsConfig, trigger, onValidityChange]);
+
 	if (skipAll) {
 		return null;
 	}

package/src/Components/Hoc/withPresetButtons.js

@@ -10,6 +10,7 @@ import {
 	UPLOAD_DOWNLOAD,
 	DOWNLOAD,
 } from '../../Constants/Commands.js';
+import Inflector from 'inflector-js';
 import Clipboard from '../Icons/Clipboard.js';
 import Duplicate from '../Icons/Duplicate.js';
 import Edit from '../Icons/Edit.js';
@@ -78,7 +79,10 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				disableDuplicate = !isEditor,
 				disablePrint = !isGrid,
 				protectedValues, // records with these values cannot be edited or deleted
-			
+				addDisplayMsg,
+				editDisplayMsg,
+				deleteDisplayMsg,
+
 				// withAlert
 				showInfo,
 
@@ -90,6 +94,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				self,
 
 				// withData
+				model,
 				Repository,
 
 				// withPermissions
@@ -219,7 +224,16 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				switch(type) {
 					case ADD:
 						key = 'addBtn';
-						text = 'Add';
+						if (addDisplayMsg) {
+							text = addDisplayMsg;
+						} else {
+							text = 'Add';
+							if (model) {
+								let inflected = Inflector.singularize(model); // can only add one at a time
+								inflected = Inflector.camel2words(Inflector.humanize(Inflector.underscore(inflected))); // Separate with spaces, capitalize each word
+								text += ' ' + inflected;
+							}
+						}
 						handler = (parent, e) => {
 							onAdd();
 						};
@@ -232,7 +246,21 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						break;
 					case EDIT:
 						key = 'editBtn';
-						text = 'Edit';
+						if (editDisplayMsg) {
+							text = editDisplayMsg;
+						} else {
+							text = 'Edit';
+							if (model) {
+								let inflected = model;
+								if (selection.length <= 1) {
+									inflected = Inflector.singularize(inflected);
+								} else {
+									inflected = Inflector.pluralize(inflected);
+								}
+								inflected = Inflector.camel2words(Inflector.humanize(Inflector.underscore(inflected))); // Separate with spaces, capitalize each word
+								text += ' ' + inflected;
+							}
+						}
 						handler = (parent, e) => {
 							onEdit();
 						};
@@ -248,7 +276,21 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						break;
 					case DELETE:
 						key = 'deleteBtn';
-						text = 'Delete';
+						if (deleteDisplayMsg) {
+							text = deleteDisplayMsg;
+						} else {
+							text = 'Delete';
+							if (model) {
+								let inflected = model;
+								if (selection.length <= 1) {
+									inflected = Inflector.singularize(inflected);
+								} else {
+									inflected = Inflector.pluralize(inflected);
+								}
+								inflected = Inflector.camel2words(Inflector.humanize(Inflector.underscore(inflected))); // Separate with spaces, capitalize each word
+								text += ' ' + inflected;
+							}
+						}
 						handler = onDelete;
 						handler = (parent, e) => {
 							onDelete();