@onehat/ui 0.4.74 → 0.4.76

package/package.json

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

package/src/Components/Editor/InlineEditor.js

@@ -33,6 +33,7 @@ function InlineEditor(props) {
 			onEditorSave,
 			onEditorClose,
 			editorStateRef,
+			showSelectHandle = true,
 
 			// withComponent
 			self,
@@ -152,6 +153,7 @@ function InlineEditor(props) {
 						onClose={onEditorClose}
 						parent={self}
 						reference="form"
+						showSelectHandle={showSelectHandle}
 						className={clsx(
 							'InlineEditor-Form',
 							'flex-1',

package/src/Components/Form/Field/Combo/Combo.js

@@ -88,6 +88,7 @@ export const ComboComponent = forwardRef((props, ref) => {
 			isInTag = false,
 			minimizeForRow = false,
 			reloadOnTrigger = false,
+			searchHasInitialPercent = false,
 			menuHeight,
 			placeholder,
 			onRowPress,
@@ -483,7 +484,7 @@ export const ComboComponent = forwardRef((props, ref) => {
 						filterName = getFilterName(isId);
 					if (Repository.isRemote) {
 						// remote
-						const filterValue = _.isEmpty(value) ? null : (isId ? value.match(idRegex)[1] : value + '%');
+						const filterValue = _.isEmpty(value) ? null : (isId ? value.match(idRegex)[1] : (searchHasInitialPercent ? '%' : '') + value + '%');
 						await Repository.filter(filterName, filterValue);
 						if (!Repository.isAutoLoad) {
 							await Repository.reload();

package/src/Components/Form/Form.js

@@ -112,6 +112,7 @@ function Form(props) {
 			additionalFooterButtons,
 			disableFooter = false,
 			hideResetButton = false,
+			showSelectHandle = false,
 			
 			// sizing of outer container
 			maxHeight,
@@ -414,6 +415,9 @@ function Form(props) {
 										}
 
 										let elementClassName = 'Form-Element';
+										if (showSelectHandle && ix === 0) {
+											elementClassName += ' ml-[40px]';
+										}
 										if (type.match(/Tag/)) {
 											elementClassName += ' overflow-auto';
 										}

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();

package/src/Components/Report/Report.js

@@ -133,7 +133,7 @@ function Report(props) {
 				reportType: REPORT_TYPES__EXCEL,
 				showReportHeaders,
 			}),
-			disabledOnInvalid: true,
+			disableOnInvalid: true,
 		});
 	}
 	if (!disablePdf) {