@onehat/ui 0.4.6 → 0.4.8

package/package.json

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

package/src/Components/Container/Container.js

@@ -325,13 +325,13 @@ function Container(props) {
 		componentProps = {};
 	}
 	
-	return <VStack className="w-full flex-1">
+	return <VStack className="Container-all w-full flex-1">
 				{northComponent}
 				{(!isNorthCollapsed && !localIsNorthCollapsed) && northSplitter}
-				<HStack className="w-full" style={{ flex: 100 }}>
+				<HStack className="Container-mid w-full" style={{ flex: 100 }}>
 					{westComponent}
 					{(!isWestCollapsed && !localIsWestCollapsed) && westSplitter}
-					<VStack className="h-full overflow-auto" style={{ flex: 100 }}>
+					<VStack className="Container-center h-full overflow-auto" style={{ flex: 100 }}>
 						{centerComponent}
 					</VStack>
 					{(!isEastCollapsed && !localIsEastCollapsed) && eastSplitter}

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

@@ -681,6 +681,7 @@ export function ComboComponent(props) {
 			'disablePrint',
 			'selectorId',
 			'selectorSelected',
+			'selectorSelectedField',
 			'usePermissions',
 		]);
 		if (!Repository) {

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

@@ -245,10 +245,12 @@ function TagComponent(props) {
 	if (propsToPass.selectorId) {
 		_combo.selectorId = propsToPass.selectorId;
 		_combo.selectorSelected = propsToPass.selectorSelected;
+		_combo.selectorSelectedField = propsToPass.selectorSelectedField;
 	}
 
 	let className = `
 		Tag
+		w-full
 		p-0
 	`;
 	if (props.className) {
@@ -271,6 +273,7 @@ function TagComponent(props) {
 	let valueBoxesClassName = `
 		Tag-valueBoxes-container
 		w-full
+		min-h-[40px]
 		flex-wrap
 		max-h-[200px]
 		overflow-auto

package/src/Components/Form/Form.js

@@ -125,6 +125,7 @@ function Form(props) {
 			// parent container
 			selectorId,
 			selectorSelected,
+			selectorSelectedField,
 
 			// withAlert
 			alert,
@@ -297,7 +298,7 @@ function Form(props) {
 						}
 					}
 
-					let elementClassName = '';
+					let elementClassName = 'Form-ElementFromColumnsConfig';
 					const
 						boxFlex = configPropsToPass.flex,
 						boxW = configPropsToPass.w;
@@ -365,6 +366,7 @@ function Form(props) {
 
 										if (useSelectorId) { // This causes the whole form to use selectorId
 											editorTypeProps.selectorId = selectorId;
+											editorTypeProps.selectorSelectedField = selectorSelectedField;
 										}
 										if (configPropsToPass.selectorId || editorTypeProps.selectorId) { // editorTypeProps.selectorId causes just this one field to use selectorId
 											if (_.isNil(configPropsToPass.selectorSelected)) {
@@ -376,7 +378,7 @@ function Form(props) {
 											dynamicProps = getDynamicProps({ fieldState, formSetValue, formGetValues, formState });
 										}
 
-										let elementClassName = 'flex-1';
+										let elementClassName = 'Form-Element flex-1';
 										if (type.match(/Tag/)) {
 											elementClassName += ' overflow-auto';
 										}
@@ -433,6 +435,7 @@ function Form(props) {
 										return <HStack
 													key={ix}
 													className={`
+														Form-HStack1
 														flex-${flex}
 														${error ? "bg-[#fdd]" : "bg-white"}
 														${columnClassName}
@@ -551,9 +554,9 @@ function Form(props) {
 						}
 						delete itemPropsToPass.w;
 					}
-					if (!style.flex && !style.width) {
-						style.flex = 1;
-					}
+					// if (!style.flex && !style.width) {
+					// 	style.flex = 1;
+					// }
 					itemPropsToPass.className += ' Column';
 				}
 				if (type === 'Row') {
@@ -564,7 +567,7 @@ function Form(props) {
 					return buildFromItem(item, ix, {...defaults, ...itemDefaults});
 				});
 
-				let elementClassName = '';
+				let elementClassName = 'Form-ElementFromItem';
 				const defaultsClassName = defaults.className;
 				if (defaultsClassName) {
 					elementClassName += ' ' + defaultsClassName;
@@ -644,18 +647,18 @@ function Form(props) {
 						style.width = '50px';
 					}
 					if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-						element = <HStack className="HStackA py-1">
+						element = <HStack className="Form-HStack1 w-full py-1">
 										<Label style={style}>{label}</Label>
 										{element}
 									</HStack>;
 					} else {
-						element = <VStack className="HStackA w-full py-1 mt-3">
+						element = <VStack className="Form-VStack2 w-full py-1 mt-3">
 										<Label style={style}>{label}</Label>
 										{element}
 									</VStack>;
 					}
 				}
-				return <HStack key={ix} className="HStackB px-2 pb-1">{element}</HStack>;
+				return <HStack key={ix} className="Form-HStack3 w-full px-2 pb-1">{element}</HStack>;
 			}
 
 		
@@ -709,6 +712,7 @@ function Form(props) {
 
 							if (useSelectorId) { // This causes the whole form to use selectorId
 								editorTypeProps.selectorId = selectorId;
+								editorTypeProps.selectorSelectedField = selectorSelectedField;
 							}
 							if (itemPropsToPass.selectorId || editorTypeProps.selectorId) { // editorTypeProps.selectorId causes just this one field to use selectorId
 								if (_.isNil(itemPropsToPass.selectorSelected)) {
@@ -720,7 +724,7 @@ function Form(props) {
 								dynamicProps = getDynamicProps({ fieldState, formSetValue, formGetValues, formState });
 							}
 
-							let elementClassName = 'field-' + name + ' flex-1 Form-Element';
+							let elementClassName = 'Form-Element field-' + name + ' flex-1';
 							const defaultsClassName = defaults.className;
 							if (defaultsClassName) {
 								elementClassName += ' ' + defaultsClassName;
@@ -770,7 +774,7 @@ function Form(props) {
 							if (message) {
 								message = <Text className="text-[#f00]">{message}</Text>;
 							}
-							element = <VStack className="Form-messageContainer pt-1 flex-1">
+							element = <VStack className="Form-VStack4 pt-1 flex-1">
 											{element}
 											{message}
 										</VStack>;
@@ -778,14 +782,14 @@ function Form(props) {
 							if (item.additionalEditButtons) {
 								const buttons = buildAdditionalButtons(item.additionalEditButtons, self, { fieldState, formSetValue, formGetValues, formState });
 								if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-									element = <HStack className="Form-additionalEditButtons flex-1 flex-wrap">
+									element = <HStack className="Form-HStack5 flex-1 flex-wrap">
 													{element}
 													{buttons}
 												</HStack>;
 								} else {
-									element = <VStack className="Form-additionalEditButtons flex-1 w-full">
+									element = <VStack className="Form-VStack6 flex-1 w-full">
 												{element}
-												<HStack className="Form-additionalEditButtons-VStack flex-1 w-full mt-1 flex-wrap">
+												<HStack className="Form-HStack7-VStack flex-1 w-full mt-1 flex-wrap">
 													{buttons}
 												</HStack>
 											</VStack>;
@@ -819,18 +823,18 @@ function Form(props) {
 									style.width = '50px';
 								}
 								if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-									element = <HStack className="HStack3 flex-1">
+									element = <HStack className="Form-HStack8 flex-1">
 								 					<Label style={style}>{requiredIndicator}{label}</Label>
 													{element}
 								 				</HStack>;
 								} else {
-									element = <VStack className="VStack3 flex-1 mt-3">
+									element = <VStack className="Form-VStack9 flex-1 mt-3">
 													<Label style={style}>{requiredIndicator}{label}</Label>
 													{element}
 												</VStack>;
 								}
 							} else if (disableLabels && requiredIndicator) {
-								element = <HStack className="HStack3 flex-1">
+								element = <HStack className="Form-HStack10 flex-1">
 												{requiredIndicator}
 												{element}
 											</HStack>;
@@ -850,7 +854,7 @@ function Form(props) {
 							return <HStack
 										key={ix}
 										className={`
-											HStack4
+											Form-HStack11
 											flex-none
 											pb-2
 											h-[50px]
@@ -872,6 +876,7 @@ function Form(props) {
 						title = null,
 						description = null,
 						selectorId,
+						selectorSelectedField,
 						...itemPropsToPass
 					} = item;
 					if (isMultiple && type !== 'Attachments') {
@@ -886,6 +891,7 @@ function Form(props) {
 						element = <Element
 										{...testProps('ancillary-' + type)}
 										selectorId={selectorId}
+										selectorSelectedField={selectorSelectedField}
 										selectorSelected={selectorSelected || record}
 										uniqueRepository={true}
 										parent={self}
@@ -897,6 +903,7 @@ function Form(props) {
 						}
 						title = <Text
 									className={`
+										Form-Ancillary-Title
 										font-bold
 										${styles.FORM_ANCILLARY_TITLE_FONTSIZE}
 									`}
@@ -905,6 +912,7 @@ function Form(props) {
 					if (description) {
 						description = <Text
 										className={`
+											Form-Ancillary-Description
 											italic
 											${styles.FORM_ANCILLARY_DESCRIPTION_FONTSIZE}
 										`}
@@ -913,6 +921,7 @@ function Form(props) {
 					components.push(<VStack
 										key={'ancillary-' + ix}
 										className={`
+											Form-VStack12
 											mx-1
 											my-3
 										`}

package/src/Components/Grid/Grid.js

@@ -128,7 +128,6 @@ function GridComponent(props) {
 			hideNavColumn = true,
 			noneFoundText,
 			autoAdjustPageSizeToHeight = true,
-			disableSelectorSelected = false,
 			showRowExpander = false,
 			getExpandedRowContent,
 			showHeaders = true,
@@ -154,6 +153,22 @@ function GridComponent(props) {
 			alternateRowBackgrounds = true,
 			alternatingInterval = 2,
 			defaultRowHeight = 48,
+			
+			// The selectorSelected mechanism allows us to filter results of the primary model, (e.g. WorkOrders)
+			//   by the selection on the secondary model (e.g. Equipment). It's used on Grids, Trees, Forms, etc.
+			// The 'selectorId' is the name of the primary model's filter (e.g. 'WorkOrders.equipment_id').
+			//   which gets submitted to the server as a condition (e.g. 'conditions[WorkOrders.equipment_id]').
+			// The 'selectorSelected' is the Entity on the secondary model which is selected (e.g. Equipment).
+			// The 'selectorSelectedField' is the field on the secondary model to use as the value for the filter
+			//   (e.g. 'fleet_id'). If not given, it defaults to 'id'.
+			// It can be disabled altogether for a specific grid ('disableSelectorSelected'), and configured
+			//   so that no selection means no results ('noSelectorMeansNoResults').
+
+			selectorId,
+			selectorSelected,
+			selectorSelectedField = 'id',
+			noSelectorMeansNoResults = false,
+			disableSelectorSelected = false,
 
 			// withComponent
 			self,
@@ -201,16 +216,11 @@ function GridComponent(props) {
 			deselectAll,
 			selectRangeTo,
 			isInSelection,
-			noSelectorMeansNoResults = false,
 			selectNext,
 			selectPrev,
 			addNextToSelection,
 			addPrevToSelection,
 
-			// DataMgt
-			selectorId,
-			selectorSelected,
-
 			// withInlineEditor
 			inlineEditor = null,
 			isInlineEditorShown = false,
@@ -231,6 +241,7 @@ function GridComponent(props) {
 		expandedRowsRef = useRef({}),
 		cachedDragElements = useRef(),
 		dragSelectionRef = useRef([]),
+		previousSelectorId = useRef(),
 		[isInited, setIsInited] = useState(false),
 		[isReady, setIsReady] = useState(false),
 		[isLoading, setIsLoading] = useState(false),
@@ -760,11 +771,23 @@ function GridComponent(props) {
 			if (disableSelectorSelected || !selectorId) {
 				return
 			}
-			let id = selectorSelected?.id;
-			if (_.isEmpty(selectorSelected)) {
-				id = noSelectorMeansNoResults ? 'NO_MATCHES' : null;
+
+			if (previousSelectorId.current && selectorId !== previousSelectorId.current) {
+				Repository.pauseEvents();
+				Repository.clearFilters(previousSelectorId.current);
+				Repository.resumeEvents();
+			}
+			previousSelectorId.current = selectorId;
+
+			let value = null;
+			if (selectorSelected) {
+				value = selectorSelected[selectorSelectedField];
+			}
+			if (noSelectorMeansNoResults && _.isEmpty(selectorSelected)) {
+				value = 'NO_MATCHES';
 			}
-			Repository.filter(selectorId, id, false); // so it doesn't clear existing filters
+
+			Repository.filter(selectorId, value, false); // false so it doesn't clear existing filters
 		},
 		onGridKeyDown = (e) => {
 			if (isInlineEditorShown) {
@@ -1035,7 +1058,7 @@ function GridComponent(props) {
 
 		applySelectorSelected();
 
-	}, [selectorSelected]);
+	}, [selectorId, selectorSelected]);
 
 	if (canUser && !canUser('view')) {
 		return <Unauthorized />;

package/src/Components/Hoc/Secondary/withSecondaryEditor.js

@@ -59,6 +59,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				// parent container
 				secondarySelectorId,
 				secondarySelectorSelected,
+				secondarySelectorSelectedField = 'id',
 
 				// withSecondaryData
 				SecondaryRepository,
@@ -149,7 +150,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				}
 
 				if (secondarySelectorId && !_.isEmpty(secondarySelectorSelected)) {
-					addValues[secondarySelectorId] = secondarySelectorSelected.id;
+					addValues[secondarySelectorId] = secondarySelectorSelected[secondarySelectorSelectedField];
 				}
 
 				if (getNewEntityDisplayValue()) {

package/src/Components/Hoc/Secondary/withSecondarySideEditor.js

@@ -35,6 +35,7 @@ export default function withSecondarySideEditor(WrappedComponent, isTree = false
 				// pull these out, as we don't want them going to the Editor
 				secondarySelectorId,
 				secondarySelectorSelected,
+				secondarySelectorSelectedField,
 				
 				...propsToPass
 			} = props;

package/src/Components/Hoc/Secondary/withSecondaryWindowedEditor.js

@@ -39,6 +39,7 @@ export default function withSecondaryWindowedEditor(WrappedComponent, isTree = f
 				// pull these out, as we don't want them going to the SecondaryEditor
 				secondarySelectorId,
 				secondarySelectorSelected,
+				secondarySelectorSelectedField,
 				h,
 
 				...propsToPass

package/src/Components/Hoc/withEditor.js

@@ -58,6 +58,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				// parent container
 				selectorId,
 				selectorSelected,
+				selectorSelectedField = 'id',
 
 				// withData
 				Repository,
@@ -147,7 +148,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				}
 
 				if (selectorId && !_.isEmpty(selectorSelected)) {
-					addValues[selectorId] = selectorSelected.id;
+					addValues[selectorId] = selectorSelected[selectorSelectedField];
 				}
 
 				if (getNewEntityDisplayValue()) {

package/src/Components/Hoc/withInlineEditor.js

@@ -35,6 +35,7 @@ export default function withInlineEditor(WrappedComponent, skipWrappers = false)
 				// pull these out, as we don't want them going to the Editor
 				selectorId,
 				selectorSelected,
+				selectorSelectedField,
 				h,
 
 				...propsToPass

package/src/Components/Hoc/withSideEditor.js

@@ -35,6 +35,8 @@ export default function withSideEditor(WrappedComponent, isTree = false) {
 				// pull these out, as we don't want them going to the Editor
 				selectorId,
 				selectorSelected,
+				selectorSelectedField,
+				style,
 				
 				...propsToPass
 			} = props;

package/src/Components/Hoc/withWindowedEditor.js

@@ -56,6 +56,7 @@ export default function withWindowedEditor(WrappedComponent, isTree = false) {
 				// pull these out, as we don't want them going to the Editor
 				selectorId,
 				selectorSelected,
+				selectorSelectedField,
 				h,
 
 				...propsToPass

package/src/Components/Tree/Tree.js

@@ -114,6 +114,10 @@ function TreeComponent(props) {
 			initialSelection,
 			canRecordBeEdited,
 			onTreeLoad,
+			
+			selectorId,
+			selectorSelected,
+			selectorSelectedField = 'id',
 
 			// withComponent
 			self,
@@ -160,10 +164,6 @@ function TreeComponent(props) {
 			isInSelection,
 			noSelectorMeansNoResults = false,
 
-			// DataMgt
-			selectorId,
-			selectorSelected,
-
 		} = props,
 		styles = UiGlobals.styles,
 		forceUpdate = useForceUpdate(),
@@ -1275,7 +1275,7 @@ function TreeComponent(props) {
 			return () => {};
 		}
 		if (!disableSelectorSelected && selectorId) {
-			let id = selectorSelected?.id;
+			let id = selectorSelected?.[selectorSelectedField] ?? null;
 			if (_.isEmpty(selectorSelected)) {
 				id = noSelectorMeansNoResults ? 'NO_MATCHES' : null;
 			}

package/src/Components/Viewer/Viewer.js

@@ -62,6 +62,7 @@ function Viewer(props) {
 			// parent container
 			selectorId,
 			selectorSelected,
+			selectorSelectedField,
 
 		} = props,
 		scrollViewRef = useRef(),
@@ -150,9 +151,9 @@ function Viewer(props) {
 						}
 						delete itemPropsToPass.w;
 					}
-					if (!style.flex && !style.width) {
-						style.flex = 1;
-					}
+					// if (!style.flex && !style.width) {
+					// 	style.flex = 1;
+					// }
 					itemPropsToPass.className += ' Column';
 					// if (containerWidth < styles.FORM_ONE_COLUMN_THRESHOLD) {
 					// 	// everything is in one column
@@ -310,6 +311,7 @@ function Viewer(props) {
 										{...testProps('ancillary-' + type)}
 										selectorId={selectorId}
 										selectorSelected={selectorSelected || record}
+										selectorSelectedField={selectorSelectedField}
 										canEditorViewOnly={true}
 										canCrud={false}
 										uniqueRepository={true}

package/src/PlatformImports/Web/Attachments.js

@@ -89,6 +89,7 @@ function AttachmentsElement(props) {
 
 			// parentContainer
 			selectorSelected,
+			selectorSelectedField = 'id',
 
 			// withData
 			Repository,
@@ -100,7 +101,7 @@ function AttachmentsElement(props) {
 		} = props,
 		styles = UiGlobals.styles,
 		model = _.isArray(selectorSelected) && selectorSelected[0] ? selectorSelected[0].repository?.name : selectorSelected?.repository?.name,
-		modelidCalc = _.isArray(selectorSelected) ? _.map(selectorSelected, (entity) => entity.id) : selectorSelected?.id,
+		modelidCalc = _.isArray(selectorSelected) ? _.map(selectorSelected, (entity) => entity[selectorSelectedField]) : selectorSelected?.[selectorSelectedField],
 		modelid = useRef(modelidCalc),
 		[isReady, setIsReady] = useState(false),
 		[isUploading, setIsUploading] = useState(false),