@onehat/ui 0.3.13 → 0.3.18

package/package.json

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

package/src/Components/Editor/Editor.js

@@ -33,9 +33,13 @@ export default function Editor(props) {
 
 	// Repository?.isRemotePhantomMode && selection.length === 1 && 
 	if (editorMode === EDITOR_MODE__VIEW) {
+		const record = selection[0];
+		if (record.isDestroyed) {
+			return null;
+		}
 		return <Viewer
 					{...props}
-					record={selection[0]}
+					record={record}
 					onEditMode={isEditorViewOnly ? null : onEditMode}
 					onClose={onClose}
 					onDelete={onDelete}

package/src/Components/Editor/Viewer.js

@@ -37,19 +37,23 @@ export default function Viewer(props) {
 			onClose,
 			onDelete,
 		} = props,
+		isMultiple = _.isArray(record),
 		isSideEditor = editorType === EDITOR_TYPE__SIDE,
 		styles = UiGlobals.styles,
 		flex = props.flex || 1,
 		buildAncillary = () => {
-			let components = [];
+			const components = [];
 			if (ancillaryItems.length) {
-				components = _.map(ancillaryItems, (item, ix) => {
+				_.each(ancillaryItems, (item, ix) => {
 					let {
 						type,
 						title = null,
 						selectorId = null,
 						...propsToPass
 					} = item;
+					if (isMultiple && type !== 'Attachments') {
+						return;
+					}
 					if (!propsToPass.h) {
 						propsToPass.h = 400;
 					}
@@ -61,6 +65,7 @@ export default function Viewer(props) {
 										flex={1}
 										h={350}
 										canEditorViewOnly={true}
+										uniqueRepository={true}
 										{...propsToPass}
 									/>;
 					if (title) {
@@ -69,7 +74,7 @@ export default function Viewer(props) {
 									fontWeight="bold"
 								>{title}</Text>;
 					}
-					return <Column key={'ancillary-' + ix} my={5}>{title}{element}</Column>;
+					components.push(<Column key={'ancillary-' + ix} my={5}>{title}{element}</Column>);
 				});
 			}
 			return components;

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

@@ -34,7 +34,6 @@ export function ComboComponent(props) {
 			tooltip = null,
 			menuMinWidth = 150,
 			disableDirectEntry = false,
-			disablePagination = false,
 			hideMenuOnSelection = true,
 			_input = {},
 			isEditor = false,
@@ -55,7 +54,7 @@ export function ComboComponent(props) {
 			selectionMode,
 			selectNext,
 			selectPrev,
-			getDisplayFromSelection,
+			getDisplayValuesFromSelection,
 
 			tooltipPlacement = 'bottom',
 		} = props,
@@ -318,7 +317,7 @@ export function ComboComponent(props) {
 				if (found) {
 					const
 						newSelection = [found],
-						newTextValue = getDisplayFromSelection(newSelection);
+						newTextValue = getDisplayValuesFromSelection(newSelection);
 
 					setTextValue(newTextValue);
 					setSelection(newSelection);
@@ -351,7 +350,7 @@ export function ComboComponent(props) {
 		}
 
 		// Adjust text input to match selection
-		let localTextValue = getDisplayFromSelection(selection);
+		let localTextValue = getDisplayValuesFromSelection(selection);
 		if (!_.isEqual(localTextValue, textValue)) {
 			setTextValue(localTextValue);
 		}
@@ -510,10 +509,11 @@ export function ComboComponent(props) {
 														w: '100%',
 													};
 												}}
+												allowToggleSelection={true}
+												disableAdjustingPageSizeToHeight={true}
 												{...props}
 												h={styles.FORM_COMBO_MENU_HEIGHT + 'px'}
 												disablePresetButtons={!isEditor}
-												disablePagination={disablePagination}
 												setSelection={(selection) => {
 													// Decorator fn to add local functionality
 													// Close the menu when row is selected on grid

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

@@ -1,12 +1,23 @@
 import {
 	SELECTION_MODE_MULTI,
 } from '../../../../Constants/Selection.js';
-import Combo from './Combo.js';
+import Combo, { ComboEditor } from './Combo.js';
 
-export default function Tag(props) {
-	return <Combo
-				selectionMode={SELECTION_MODE_MULTI}
-				disableDirectEntry={true}
-				{...props}
-			/>;
+function withAdditionalProps(WrappedComponent) {
+	return (props) => {
+		return <WrappedComponent
+					selectionMode={SELECTION_MODE_MULTI}
+					valueIsAlwaysArray={true}
+					valueAsIdAndText={true}
+					valueAsStringifiedJson={true}
+					disableDirectEntry={true}
+					pageSize={500}
+					{...props}
+				/>;
+	};
 }
+
+const Tag = withAdditionalProps(Combo);
+export const TagEditor = withAdditionalProps(ComboEditor);
+
+export default Tag;

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

@@ -4,7 +4,6 @@ import {
 } from 'native-base';
 import UiGlobals from '../../../UiGlobals.js';
 import withTooltip from '../../Hoc/withTooltip.js';
-import withValue from '../../Hoc/withValue.js';
 
 const
 	TextElement = (props) => {
@@ -21,7 +20,7 @@ const
 					{...props}
 				>{props.value}</Text>;
 	},
-	TextField = withValue(TextElement);
+	TextField = TextElement; // NOT using withValue on Text element, as this element is simply for display purposes!
 
 // Tooltip needs us to forwardRef
 export default withTooltip(React.forwardRef((props, ref) => {

package/src/Components/Form/Form.js

@@ -82,6 +82,7 @@ function Form(props) {
 			
 			// withEditor
 			isEditorViewOnly = false,
+			isSaving = false,
 			editorMode,
 			onCancel,
 			onSave,
@@ -163,6 +164,7 @@ function Form(props) {
 						renderer,
 						w,
 						flex,
+						useSelectorId = false,
 					} = config;
 
 				if (!isEditable) {
@@ -214,6 +216,11 @@ function Form(props) {
 											}
 											const Element = getComponentFromType(editor);
 
+											if (useSelectorId) {
+												editorProps.selectorId = selectorId;
+												editorProps.selectorSelected = editorProps;
+											}
+											
 											let element = <Element
 																name={name}
 																value={value}
@@ -224,8 +231,6 @@ function Form(props) {
 																	}
 																}}
 																onBlur={onBlur}
-																selectorId={selectorId}
-																selectorSelected={selectorSelected}
 																flex={1}
 																{...editorProps}
 																// {...defaults}
@@ -262,6 +267,7 @@ function Form(props) {
 					label,
 					items,
 					onChange: onEditorChange,
+					useSelectorId = false,
 					...propsToPass
 				} = item;
 			let editorTypeProps = {};
@@ -366,6 +372,11 @@ function Form(props) {
 							if (isValidElement(Element)) {
 								throw new Error('Should not yet be valid React element. Did you use <Element> instead of () => <Element> when defining it?')
 							}
+
+							if (useSelectorId) {
+								editorTypeProps.selectorId = selectorId;
+								editorTypeProps.selectorSelected = editorProps;
+							}
 							let element = <Element
 												name={name}
 												value={value}
@@ -376,8 +387,6 @@ function Form(props) {
 													}
 												}}
 												onBlur={onBlur}
-												selectorId={selectorId}
-												selectorSelected={selectorSelected}
 												flex={1}
 												{...defaults}
 												{...propsToPass}
@@ -412,15 +421,18 @@ function Form(props) {
 					/>;
 		},
 		buildAncillary = () => {
-			let components = [];
+			const components = [];
 			if (ancillaryItems.length) {
-				components = _.map(ancillaryItems, (item, ix) => {
+				_.each(ancillaryItems, (item, ix) => {
 					let {
 						type,
 						title = null,
 						selectorId,
 						...propsToPass
 					} = item;
+					if (isMultiple && type !== 'Attachments') {
+						return;
+					}
 					if (!propsToPass.h) {
 						propsToPass.h = 400;
 					}
@@ -430,6 +442,7 @@ function Form(props) {
 										selectorId={selectorId}
 										selectorSelected={selectorSelected || record}
 										flex={1}
+										uniqueRepository={true}
 										{...propsToPass}
 									/>;
 					if (title) {
@@ -438,7 +451,7 @@ function Form(props) {
 									fontWeight="bold"
 								>{title}</Text>;
 					}
-					return <Column key={'ancillary-' + ix} mx={2} my={5}>{title}{element}</Column>;
+					components.push(<Column key={'ancillary-' + ix} mx={2} my={5}>{title}{element}</Column>);
 				});
 			}
 			return components;
@@ -506,6 +519,13 @@ function Form(props) {
 		sizeProps.maxHeight = maxHeight;
 	}
 
+	const savingProps = {};
+	if (isSaving) {
+		savingProps.borderTopWidth = 2;
+		savingProps.borderTopColor = '#f00';
+	}
+
+
 	let formComponents,
 		editor;
 	if (editorType === EDITOR_TYPE__INLINE) {
@@ -589,8 +609,8 @@ function Form(props) {
 				
 				{editor}
 
-				<Footer justifyContent="flex-end" {...footerProps}>
-					{onDelete && editorMode === EDITOR_MODE__EDIT && 
+				<Footer justifyContent="flex-end" {...footerProps}  {...savingProps}>
+					{onDelete && editorMode === EDITOR_MODE__EDIT && isSingle &&
 						<Row flex={1} justifyContent="flex-start">
 							<Button
 								key="deleteBtn"
@@ -614,7 +634,7 @@ function Form(props) {
 											}}
 											icon={<Rotate color="#fff" />}
 										/>}
-						{!isEditorViewOnly && onCancel && <Button
+						{!isEditorViewOnly && isSingle && onCancel && <Button
 														key="cancelBtn"
 														variant="ghost"
 														onPress={onCancel}

package/src/Components/Grid/Grid.js

@@ -86,7 +86,7 @@ function GridComponent(props) {
 			canColumnsReorder = true,
 			canColumnsResize = true,
 			canRowsReorder = false,
-			allowToggleSelection = true, // i.e. single click with no shift key toggles the selection of the item clicked on
+			allowToggleSelection = false, // i.e. single click with no shift key toggles the selection of the item clicked on
 			disableBottomToolbar = false,
 			disablePagination = false,
 			bottomToolbar = 'pagination',
@@ -164,6 +164,10 @@ function GridComponent(props) {
 					shiftKey,
 					metaKey,
 				 } = e;
+			let allowToggle = allowToggleSelection;
+			if (metaKey) {
+				allowToggle = true;
+			}
 				
 			if (selectionMode === SELECTION_MODE_MULTI) {
 				if (shiftKey) {
@@ -172,28 +176,18 @@ function GridComponent(props) {
 					} else {
 						selectRangeTo(item);
 					}
-				} else if (metaKey) {
-					if (isInSelection(item)) {
-						// Already selected
-						if (allowToggleSelection) {
-							removeFromSelection(item);
-						} else {
-							// Do nothing.
-						}
-					} else {
-						addToSelection(item);
-					}
 				} else {
-					if (isInSelection(item)) {
-						// Already selected
-						if (allowToggleSelection) {
+					if (allowToggle) {
+						if (isInSelection(item)) {
 							removeFromSelection(item);
 						} else {
-							// Do nothing.
+							addToSelection(item);
 						}
 					} else {
-						// select just this one
-						setSelection([item]);
+						if (!isInSelection(item)) {
+							// select just this one
+							setSelection([item]);
+						}
 					}
 				}
 			} else {
@@ -201,7 +195,7 @@ function GridComponent(props) {
 				let newSelection = selection;
 				if (isInSelection(item)) {
 					// Already selected
-					if (allowToggleSelection) {
+					if (allowToggle) {
 						// Create empty selection
 						newSelection = [];
 					} else {
@@ -826,7 +820,7 @@ function GridComponent(props) {
 						deselectAll();
 					}
 				}}>
-					{!entities.length ? <NoRecordsFound text={noneFoundText} onRefresh={onRefresh} /> :
+					{!entities?.length ? <NoRecordsFound text={noneFoundText} onRefresh={onRefresh} /> :
 						<FlatList
 							ref={gridRef}
 							// ListHeaderComponent={listHeaderComponent}

package/src/Components/Grid/GridHeaderRow.js

@@ -285,7 +285,7 @@ export default function GridHeaderRow(props) {
 
 				// These header Components should match the columns exactly
 				// so we can drag/drop them to control the columns.
-				const headerColumns = _.map(localColumnsConfig, (config, ix) => {
+				const headerColumns = _.map(localColumnsConfig, (config, ix, all) => {
 					let {
 							columnId,
 							fieldName,
@@ -305,15 +305,21 @@ export default function GridHeaderRow(props) {
 							borderRightColor: '#fff',
 						}
 
-					if (w) {
-						propsToPass.w = w;
-					} else if (flex) {
-						propsToPass.flex = flex;
-						propsToPass.minWidth = 100;
-					} else if (localColumnsConfig.length === 1) {
-						// Only one column and flex is not set
-						propsToPass.flex = 1;
-						if (!header) {
+					if (all.length === 1) {
+						propsToPass.w = '100%';
+						isReorderable = false;
+						isResizable = false;
+					} else {
+						if (w) {
+							propsToPass.w = w;
+						} else if (flex) {
+							propsToPass.flex = flex;
+							propsToPass.minWidth = 100;
+						} else if (localColumnsConfig.length === 1) {
+							// Only one column and flex is not set
+							propsToPass.flex = 1;
+							if (!header) {
+							}
 						}
 					}
 

package/src/Components/Grid/GridRow.js

@@ -32,15 +32,19 @@ export default function GridRow(props) {
 		return useMemo(() => {
 			const renderColumns = (item) => {
 				if (_.isArray(columnsConfig)) {
-					return _.map(columnsConfig, (config, key) => {
+					return _.map(columnsConfig, (config, key, all) => {
 						const propsToPass = columnProps[key] || {};
-						if (config.w) {
-							propsToPass.w = config.w;
-						} else if (config.flex) {
-							propsToPass.flex = config.flex;
-							propsToPass.minWidth = 100;
+						if (all.length === 1) {
+							propsToPass.w = '100%';
 						} else {
-							propsToPass.flex = 1;
+							if (config.w) {
+								propsToPass.w = config.w;
+							} else if (config.flex) {
+								propsToPass.flex = config.flex;
+								propsToPass.minWidth = 100;
+							} else {
+								propsToPass.flex = 1;
+							}
 						}
 						propsToPass.p = 1;
 						propsToPass.justifyContent = 'center';

package/src/Components/Hoc/withEditor.js

@@ -50,6 +50,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			editorStateRef = useRef(),
 			[currentRecord, setCurrentRecord] = useState(null),
 			[isAdding, setIsAdding] = useState(false),
+			[isSaving, setIsSaving] = useState(false),
 			[isEditorShown, setIsEditorShown] = useState(false),
 			[isEditorViewOnly, setIsEditorViewOnly] = useState(canEditorViewOnly), // current state of whether editor is in view-only mode
 			[lastSelection, setLastSelection] = useState(),
@@ -107,7 +108,9 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				addValues = Repository.unmapData(addValues);
 
 				setIsAdding(true);
+				setIsSaving(true);
 				const entity = await Repository.add(addValues, false, true);
+				setIsSaving(false);
 				setSelection([entity]);
 				setIsEditorViewOnly(false);
 				setEditorMode(EDITOR_MODE__ADD);
@@ -185,6 +188,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				if (getListeners().onAfterDelete) {
 					await getListeners().onAfterDelete(selection);
 				}
+				setSelection([]);
 				if (cb) {
 					cb();
 				}
@@ -246,10 +250,13 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					await getListeners().onBeforeEditSave(what);
 				}
 
+				setIsSaving(true);
 				await Repository.save();
+				setIsSaving(false);
 
 				setIsAdding(false);
-				setIsEditorShown(false);
+				setEditorMode(EDITOR_MODE__EDIT);
+				// setIsEditorShown(false);
 				
 				if (getListeners().onAfterEdit) {
 					await getListeners().onAfterEdit(what);
@@ -339,6 +346,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					isEditorShown={isEditorShown}
 					isEditorViewOnly={isEditorViewOnly}
 					isAdding={isAdding}
+					isSaving={isSaving}
 					editorMode={editorMode}
 					onEditMode={onEditMode}
 					onViewMode={onViewMode}

package/src/Components/Hoc/withFilters.js

@@ -59,7 +59,7 @@ export default function withFilters(WrappedComponent) {
 					defaultFilters: modelDefaultFilters,
 					ancillaryFilters: modelAncillaryFilters,
 				} = Repository.getSchema().model,
-				id = useId(),
+				id = props.id || useId(),
 
 				// determine the starting filters
 				startingFilters = !_.isEmpty(customFilters) ? customFilters : // custom filters override component filters
@@ -235,6 +235,9 @@ export default function withFilters(WrappedComponent) {
 					const
 						filterProps = {
 							mx: 1,
+							disableAdjustingPageSizeToHeight: true,
+							pageSize: 20,
+							uniqueRepository: true,
 						},
 						filterElements = [];
 					_.each(filters, (filter, ix) => {

package/src/Components/Hoc/withSelection.js

@@ -38,9 +38,14 @@ export default function withSelection(WrappedComponent) {
 				displayIx,
 			} = props,
 			usesWithValue = !!setValue,
-			[localSelection, setLocalSelection] = useState(selection || defaultSelection || []),
+			initialSelection = selection || defaultSelection || [],
+			[localSelection, setLocalSelection] = useState(initialSelection),
 			[isReady, setIsReady] = useState(selection || false), // if selection is already defined, or value is not null and we don't need to load repository, it's ready
 			setSelection = (selection) => {
+				if (_.isEqual(selection, localSelection)) {
+					return;
+				}
+
 				setLocalSelection(selection);
 				if (onChangeSelection) {
 					onChangeSelection(selection);
@@ -175,7 +180,7 @@ export default function withSelection(WrappedComponent) {
 				});
 				return found;
 			},
-			getIdFromSelection = () => {
+			getIdsFromLocalSelection = () => {
 				if (!localSelection[0]) {
 					return null;
 				}
@@ -190,7 +195,7 @@ export default function withSelection(WrappedComponent) {
 				}
 				return values;
 			},
-			getDisplayFromSelection = (selection) => {
+			getDisplayValuesFromLocalSelection = (selection) => {
 				if (!selection[0]) {
 					return '';
 				}
@@ -203,18 +208,17 @@ export default function withSelection(WrappedComponent) {
 						})
 						.join(', ');
 			},
-			conformValueToSelection = () => {
+			conformValueToLocalSelection = () => {
 				if (!setValue) {
 					return;
 				}
-				// Adjust the value to match the selection
-				const localValue = getIdFromSelection();
+				
+				const localValue = getIdsFromLocalSelection();
 				if (!_.isEqual(localValue, value)) {
 					setValue(localValue);
 				}
 			},
 			conformSelectionToValue = async () => {
-				// adjust the selection to match the value
 				let newSelection = [];
 				if (Repository) {
 					// Get entity or entities that match value
@@ -273,7 +277,8 @@ export default function withSelection(WrappedComponent) {
 
 			(async () => {
 
-				if (Repository && usesWithValue && !Repository.isLoaded && Repository.isRemote && !Repository.isAutoLoad && !Repository.isLoading) {
+				if (usesWithValue && Repository?.isRemote 
+					&& !Repository.isAutoLoad && !Repository.isLoaded && !Repository.isLoading) {
 					// on initialization, we can't conformSelectionToValue if the repository is not yet loaded, 
 					// so first load repo, then conform to value
 					await Repository.load();
@@ -283,6 +288,10 @@ export default function withSelection(WrappedComponent) {
 
 					await conformSelectionToValue();
 
+				} else if (!_.isEmpty(selection)) {
+
+					conformValueToLocalSelection();
+
 				} else if (autoSelectFirstItem) {
 					let newSelection = [];
 					if (Repository) {
@@ -300,7 +309,6 @@ export default function withSelection(WrappedComponent) {
 
 		}, []);
 
-
 		if (usesWithValue) {
 			useEffect(() => {
 				if (!isReady) {
@@ -309,15 +317,16 @@ export default function withSelection(WrappedComponent) {
 	
 				conformSelectionToValue();
 	
-			}, [value, isReady]);
+			}, [value]);
 	
 			useEffect(() => {
 				if (!isReady) {
 					return () => {};
 				}
 	
-				conformValueToSelection();
-			}, [selection, isReady]);
+				conformValueToLocalSelection();
+				
+			}, [selection]);
 		}
 
 		if (!isReady) {
@@ -336,8 +345,8 @@ export default function withSelection(WrappedComponent) {
 					deselectAll={deselectAll}
 					selectRangeTo={selectRangeTo}
 					isInSelection={isInSelection}
-					getIdFromSelection={getIdFromSelection}
-					getDisplayFromSelection={getDisplayFromSelection}
+					getIdsFromSelection={getIdsFromLocalSelection}
+					getDisplayValuesFromSelection={getDisplayValuesFromLocalSelection}
 				/>;
 	};
 }

package/src/Components/Hoc/withValue.js

@@ -1,5 +1,5 @@
 import { useState, useEffect, } from 'react';
-import isJson from '../../Functions/isJson.js';
+import natsort from 'natsort';
 import _ from 'lodash';
 
 // This HOC gives the component value props, primarily for a Form Field.
@@ -19,6 +19,9 @@ export default function withValue(WrappedComponent) {
 				onChangeValue,
 				value,
 				startingValue = null,
+				valueIsAlwaysArray = false,
+				valueAsIdAndText = false,
+				valueAsStringifiedJson = false,
 
 				// withData
 				Repository,
@@ -26,6 +29,39 @@ export default function withValue(WrappedComponent) {
 			} = props,
 			[localValue, setLocalValue] = useState(startingValue || value),
 			setValue = (newValue) => {
+				if (valueIsAlwaysArray && !_.isArray(newValue)) {
+					newValue = _.isNil(newValue) ? [] : [newValue];
+				}
+				if (_.isArray(newValue)) {
+					// TODO: sort by the sortProperty, whatever that is, instead of just value
+					newValue.sort(natsort()); // Only sort if we're using id/text arrangement. Otherwise, keep sort order as specified in Repository.
+				}
+				if (valueAsIdAndText) {
+					if (_.isArray(newValue)) {
+						newValue = _.map(newValue, (id) => {
+							if (_.isNil(id)) {
+								return id;
+							}
+							const record = Repository.getById(id);
+							return {
+								id: record.getId(),
+								text: record.getDisplayValue(),
+							};
+						})
+					} else {
+						if (!_.isNil(id)) {
+							const record = Repository.getById(newValue);
+							newValue = {
+								id: record.getId(),
+								text: record.getDisplayValue(),
+							};
+						}
+					}
+				}
+				if (valueAsStringifiedJson) {
+					newValue = JSON.stringify(newValue);
+				}
+
 				if (newValue === localValue) {
 					return;
 				}
@@ -33,10 +69,6 @@ export default function withValue(WrappedComponent) {
 				setLocalValue(newValue);
 				
 				if (onChangeValue) {
-					if (_.isArray(newValue)) {
-						// convert from inner value to outer value
-						newValue = JSON.stringify(newValue);
-					}
 					onChangeValue(newValue);
 				}
 			},
@@ -71,10 +103,26 @@ export default function withValue(WrappedComponent) {
 		}, [value]);
 
 		
+		// Convert localValue to normal JS primitives for field components
 		let convertedValue = localValue;
-		if (_.isString(localValue) && isJson(localValue) && !_.isNil(localValue)) {
-			// convert from outer value to inner value
-			convertedValue = JSON.parse(localValue);
+		if (_.isString(convertedValue) && valueAsStringifiedJson && !_.isNil(convertedValue)) {
+			convertedValue = JSON.parse(convertedValue);
+		}
+		if (valueIsAlwaysArray) {
+			if (_.isEmpty(convertedValue) || _.isNil(convertedValue)) {
+				convertedValue = null;
+			} else if (convertedValue.length === 1) {
+				convertedValue = convertedValue[0];
+			}
+		}
+		if (valueAsIdAndText && !_.isNil(convertedValue)) {
+			if (_.isArray(convertedValue)) {
+				convertedValue = _.map(convertedValue, (value) => {
+					return value?.id;
+				});
+			} else {
+				convertedValue = convertedValue?.id;
+			}
 		}
 
 		return <WrappedComponent

package/src/Components/Icons/ChartPie.js

@@ -0,0 +1,14 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" {...props}>
+      <Path d="M304 240V16.6c0-9 7-16.6 16-16.6 123.7 0 224 100.3 224 224 0 9-7.6 16-16.6 16H304zM32 272c0-121.3 90.1-221.7 207-237.7 9.2-1.3 17 6.1 17 15.4V288l156.5 156.5c6.7 6.7 6.2 17.7-1.5 23.1-39.2 28-87.2 44.4-139 44.4-132.5 0-240-107.4-240-240zm526.4 16c9.3 0 16.6 7.8 15.4 17-7.7 55.9-34.6 105.6-73.9 142.3-6 5.6-15.4 5.2-21.2-.7L320 288h238.4z" />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Components/Icons/Gears.js

@@ -0,0 +1,14 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" {...props}>
+      <Path d="M308.5 135.3c7.1-6.3 9.9-16.2 6.2-25-2.3-5.3-4.8-10.5-7.6-15.5l-3.1-5.4c-3-5-6.3-9.9-9.8-14.6-5.7-7.6-15.7-10.1-24.7-7.1L241.3 77c-10.7-8.8-23-16-36.2-20.9l-6.1-29c-1.9-9.3-9.1-16.7-18.5-17.8-6.6-.9-13.3-1.3-20.1-1.3h-.7c-6.8 0-13.5.4-20.1 1.2-9.4 1.1-16.6 8.6-18.5 17.8L115 56.1c-13.3 5-25.5 12.1-36.2 20.9l-28.3-9.2c-9-3-19-.5-24.7 7.1-3.5 4.7-6.8 9.6-9.9 14.6l-3 5.3c-2.8 5-5.3 10.2-7.6 15.6-3.7 8.7-.9 18.6 6.2 25l22.2 19.8c-1.1 6.7-1.7 13.7-1.7 20.8s.6 14.1 1.7 20.9l-22.2 19.8c-7.1 6.3-9.9 16.2-6.2 25 2.3 5.3 4.8 10.5 7.6 15.6l3 5.2c3 5.1 6.3 9.9 9.9 14.6 5.7 7.6 15.7 10.1 24.7 7.1l28.2-9.3c10.7 8.8 23 16 36.2 20.9l6.1 29.1c1.9 9.3 9.1 16.7 18.5 17.8 6.7.8 13.5 1.2 20.4 1.2s13.7-.4 20.4-1.2c9.4-1.1 16.6-8.6 18.5-17.8l6.1-29.1c13.3-5 25.5-12.1 36.2-20.9l28.2 9.3c9 3 19 .5 24.7-7.1 3.5-4.7 6.8-9.5 9.8-14.6l3.1-5.4c2.8-5 5.3-10.2 7.6-15.5 3.7-8.7.9-18.6-6.2-25l-22.2-19.8c1.1-6.8 1.7-13.8 1.7-20.9s-.6-14.1-1.7-20.9l22.2-19.8zM112 176a48 48 0 1196 0 48 48 0 11-96 0zm392.7 324.5c6.3 7.1 16.2 9.9 25 6.2 5.3-2.3 10.5-4.8 15.5-7.6l5.4-3.1c5-3 9.9-6.3 14.6-9.8 7.6-5.7 10.1-15.7 7.1-24.7l-9.3-28.2c8.8-10.7 16-23 20.9-36.2L613 391c9.3-1.9 16.7-9.1 17.8-18.5.8-6.7 1.2-13.5 1.2-20.4s-.4-13.7-1.2-20.4c-1.1-9.4-8.6-16.6-17.8-18.5l-29.1-6.2c-5-13.3-12.1-25.5-20.9-36.2l9.3-28.2c3-9 .5-19-7.1-24.7-4.7-3.5-9.6-6.8-14.6-9.9l-5.3-3c-5-2.8-10.2-5.3-15.6-7.6-8.7-3.7-18.6-.9-25 6.2l-19.8 22.2c-6.8-1.1-13.8-1.7-20.9-1.7s-14.1.6-20.9 1.7l-19.8-22.2c-6.3-7.1-16.2-9.9-25-6.2-5.3 2.3-10.5 4.8-15.6 7.6l-5.2 3c-5.1 3-9.9 6.3-14.6 9.9-7.6 5.7-10.1 15.7-7.1 24.7l9.3 28.2c-8.8 10.7-16 23-20.9 36.2l-29.1 6c-9.3 1.9-16.7 9.1-17.8 18.5-.8 6.7-1.2 13.5-1.2 20.4s.4 13.7 1.2 20.4c1.1 9.4 8.6 16.6 17.8 18.5l29.1 6.1c5 13.3 12.1 25.5 20.9 36.2l-9.3 28.2c-3 9-.5 19 7.1 24.7 4.7 3.5 9.5 6.8 14.6 9.8l5.4 3.1c5 2.8 10.2 5.3 15.5 7.6 8.7 3.7 18.6.9 25-6.2l19.8-22.2c6.8 1.1 13.8 1.7 20.9 1.7s14.1-.6 20.9-1.7l19.8 22.2zM464 304a48 48 0 110 96 48 48 0 110-96z" />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Components/Panel/Panel.js

@@ -14,6 +14,7 @@ import Header from './Header.js';
 import Mask from './Mask.js';
 import withCollapsible from '../Hoc/withCollapsible.js';
 import emptyFn from '../../Functions/emptyFn.js';
+import UiGlobals from '../../UiGlobals.js';
 import _ from 'lodash';
 
 // Note on collapseDirections:
@@ -34,7 +35,7 @@ function Panel(props) {
 			onLayout = null,
 			
 			// Header
-			title = Inflector.humanize(Inflector.underscore(props.model)),
+			title = UiGlobals.customInflect(Inflector.camel2words(Inflector.underscore(props.model))),
 			showHeader = true,
 			header = null,
 			isClosable = false,

package/src/Functions/setCustomInflector.js

@@ -0,0 +1,6 @@
+import UiGlobals from '../UiGlobals.js';
+import _ from 'lodash';
+
+export default function setCustomInflector(customInflector) {
+	UiGlobals.customInflect = customInflector;
+}

package/src/PlatformImports/Web/Attachments.js

@@ -1,4 +1,4 @@
-import { useState, useEffect, } from 'react';
+import { useState, useEffect, useRef, } from 'react';
 import {
 	Box,
 	Button,
@@ -49,8 +49,9 @@ function AttachmentsElement(props) {
 
 		} = props,
 		styles = UiGlobals.styles,
-		model = selectorSelected?.repository?.name,
-		modelid = selectorSelected?.id,
+		model = _.isArray(selectorSelected) && selectorSelected[0] ? selectorSelected[0].repository?.name : selectorSelected?.repository?.name,
+		modelidCalc = _.isArray(selectorSelected) ? _.map(selectorSelected, (entity) => entity.id) : selectorSelected?.id,
+		modelid = useRef(modelidCalc),
 		[isReady, setIsReady] = useState(false),
 		[isUploading, setIsUploading] = useState(false),
 		[showAll, setShowAll] = useState(false),
@@ -78,6 +79,9 @@ function AttachmentsElement(props) {
 			});
 			setFiles(files);
 		},
+		clearFiles = () => {
+			setFiles([]);
+		},
 		toggleShowAll = () => {
 			setShowAll(!showAll);
 		},
@@ -86,7 +90,7 @@ function AttachmentsElement(props) {
 			_.each(files, (file) => {
 				file.extraUploadData = {
 					model,
-					modelid,
+					modelid: modelid.current,
 				};
 			});
 		},
@@ -112,6 +116,10 @@ function AttachmentsElement(props) {
 			Repository.deleteById(id);
 		};
 
+	if (!_.isEqual(modelidCalc, modelid.current)) {
+		modelid.current = modelidCalc;
+	}
+
 	useEffect(() => {
 
 		if (!model) {
@@ -120,37 +128,43 @@ function AttachmentsElement(props) {
 
 		(async () => {
 
-			// Load Repository
-			const filters = [
-				{
-					name: 'model',
-					value: model,
-				},
-				{
-					name: 'modelid',
-					value: modelid,
-				},
-			];
-			if (accept) {
-				let name,
-					mimetypes;
-				if (_.isString(accept)) {
-					name = 'mimetype LIKE';
-					mimetypes = accept.replace('*', '%');
-				} else if (_.isArray(accept)) {
-					name = 'mimetype IN';
-					mimetypes = accept;
+			if (!_.isArray(modelid.current)) {
+
+				// Load Repository
+				const filters = [
+					{
+						name: 'model',
+						value: model,
+					},
+					{
+						name: 'modelid',
+						value: modelid.current,
+					},
+				];
+				if (accept) {
+					let name,
+						mimetypes;
+					if (_.isString(accept)) {
+						name = 'mimetype LIKE';
+						mimetypes = accept.replace('*', '%');
+					} else if (_.isArray(accept)) {
+						name = 'mimetype IN';
+						mimetypes = accept;
+					}
+					filters.push({
+						name,
+						value: mimetypes,
+					});
 				}
-				filters.push({
-					name,
-					value: mimetypes,
-				});
+				Repository.filter(filters);
+				Repository.setPageSize(showAll ? EXPANDED_MAX : COLLAPSED_MAX);
+				await Repository.load();
+
+				buildFiles();
+			} else {
+				clearFiles();
 			}
-			Repository.filter(filters);
-			Repository.setPageSize(showAll ? EXPANDED_MAX : COLLAPSED_MAX);
-			await Repository.load();
 
-			buildFiles();
 
 			if (!isReady) {
 				setIsReady(true);
@@ -162,7 +176,7 @@ function AttachmentsElement(props) {
 		return () => {
 			Repository.off('load', buildFiles);
 		};
-	}, [model, modelid, showAll]);
+	}, [model, modelid.current, showAll]);
 
 	if (!isReady) {
 		return null;

package/src/UiGlobals.js

@@ -4,6 +4,7 @@ import _ from 'lodash';
 
 const Globals = {
 	mode: CURRENT_MODE,
+	customInflect: (str) => str,
 };
 
 export default Globals;

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

@@ -1,11 +0,0 @@
-import {
-	SELECTION_MODE_MULTI,
-} from '../../../Constants/Selection.js';
-import Combo from './Combo/Combo.js';
-
-export default function Tag(props) {
-	return <Combo
-				selectionMode={SELECTION_MODE_MULTI}
-				{...props}
-			/>;
-}