@onehat/ui 0.3.35 → 0.3.36

package/package.json

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

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

@@ -38,6 +38,7 @@ export function ComboComponent(props) {
 			hideMenuOnSelection = true,
 			_input = {},
 			isEditor = false,
+			isDisabled = false,
 
 			// withValue
 			value,
@@ -258,6 +259,10 @@ export function ComboComponent(props) {
 		},
 		searchForMatches = async (value) => {
 
+			if (_.isEmpty(value)) {
+				return;
+			}
+
 			let found;
 			if (Repository) {
 				
@@ -275,9 +280,7 @@ export function ComboComponent(props) {
 						searchField = displayFieldName + ' LIKE';
 					}
 
-					if (!_.isEmpty(value)) {
-						value += '%';
-					}
+					value += '%';
 
 					await Repository.filter(searchField, value);
 					if (!this.isAutoLoad) {
@@ -408,6 +411,7 @@ export function ComboComponent(props) {
 										ref={inputRef}
 										value={textValue}
 										autoSubmit={true}
+										isDisabled={isDisabled}
 										onChangeValue={onInputChangeText}
 										onKeyPress={onInputKeyPress}
 										onBlur={onInputBlur}
@@ -453,6 +457,7 @@ export function ComboComponent(props) {
 										color: 'primary.800',
 										size: 'sm',
 									}}
+									isDisabled={isDisabled}
 									onPress={onTriggerPress}
 									onBlur={onTriggerBlur}
 									h="100%"

package/src/Components/Form/Form.js

@@ -307,8 +307,12 @@ function Form(props) {
 					type = 'Text';
 				}
 			}
-			if (type?.match && type.match(/Combo$/) && Repository?.isRemote && !Repository?.isLoaded) {
-				editorTypeProps.autoLoad = true;
+			if (item.hasOwnProperty('autoLoad')) {
+				editorTypeProps.autoLoad = item.autoLoad;
+			} else {
+				if (type?.match && type.match(/Combo$/) && Repository?.isRemote && !Repository?.isLoaded) {
+					editorTypeProps.autoLoad = true;
+				}
 			}
 			const Element = getComponentFromType(type);
 			let children;

package/src/Components/Hoc/withData.js

@@ -18,8 +18,9 @@ export default function withData(WrappedComponent) {
 				setRepository,
 				uniqueRepository = false,
 				model,
-				autoLoad = false,
+				autoLoad, // bool
 				pageSize,
+				baseParams,
 
 				// For plain JS data
 				data,
@@ -46,11 +47,14 @@ export default function withData(WrappedComponent) {
 				return () => {};
 			}
 
+			let repositoryId;
+
 			(async () => {
 				let Repository;
 				if (uniqueRepository) {
 					const schema = oneHatData.getSchema(model);
 					Repository = await oneHatData.createRepository({ schema });
+					repositoryId = Repository.id;
 				} else {
 					Repository = oneHatData.getRepository(model);
 				}
@@ -59,8 +63,19 @@ export default function withData(WrappedComponent) {
 					Repository.setPageSize(pageSize);
 				}
 
-				if (Repository && (autoLoad || Repository.autoLoad) && !Repository.isLoaded && Repository.isRemote && !Repository.isAutoLoad && !Repository.isLoading) {
-					await Repository.load();
+				if (baseParams) {
+					Repository.setBaseParams(baseParams);
+				}
+
+
+				if (Repository && !Repository.isLoaded && Repository.isRemote && !Repository.isAutoLoad && !Repository.isLoading) {
+					let doAutoLoad = Repository.autoLoad;
+					if (!_.isNil(autoLoad)) { // prop can override schema setting for autoLoad
+						doAutoLoad = autoLoad;
+					}
+					if (doAutoLoad) {
+						await Repository.load();
+					}
 				}
 	
 				setLocalRepository(Repository);
@@ -73,7 +88,13 @@ export default function withData(WrappedComponent) {
 				setIsReady(true);
 			})();
 
-		}, [LocalRepository]);
+			return () => {
+				if (repositoryId) {
+					oneHatData.deleteRepository(repositoryId);
+				}
+			}
+
+		}, []);
 
 		if (!isReady) {
 			return null;

package/src/Components/Hoc/withPdfButton.js

@@ -154,6 +154,7 @@ export default function withPdfButton(WrappedComponent) {
 			key: 'viewPdfBtn',
 			text: 'View PDF',
 			icon: Pdf,
+			isDisabled: selection.length !== 1,
 			handler: () => {
 				setIsModalShown(true);
 			},

package/src/Components/Hoc/withSelection.js

@@ -281,7 +281,7 @@ export default function withSelection(WrappedComponent) {
 			(async () => {
 
 				if (usesWithValue && Repository?.isRemote 
-					&& !Repository.isAutoLoad && !Repository.isLoaded && !Repository.isLoading) {
+					&& !Repository.isAutoLoad && !Repository.isLoaded && !Repository.isLoading && (!_.isNil(value) || !_.isEmpty(selection)) || autoSelectFirstItem) {
 					// on initialization, we can't conformSelectionToValue if the repository is not yet loaded, 
 					// so first load repo, then conform to value
 					await Repository.load();

package/src/Components/Panel/Panel.js

@@ -35,7 +35,7 @@ function Panel(props) {
 			onLayout = null,
 			
 			// Header
-			title = UiGlobals.customInflect(Inflector.camel2words(Inflector.underscore(props.model))),
+			title = props.model ? UiGlobals.customInflect(Inflector.camel2words(Inflector.underscore(props.model))) : '',
 			showHeader = true,
 			header = null,
 			isClosable = false,