@onehat/ui 0.2.42 → 0.2.43

package/package.json

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

package/src/Components/Form/Form.js

@@ -83,7 +83,7 @@ function Form(props) {
 			onSave = onEditorSave,
 			onClose,
 
-			// withSelection
+			// DataMgt
 			selectorId,
 			selectorSelected,
 

package/src/Components/Grid/Grid.js

@@ -82,6 +82,7 @@ export function Grid(props) {
 			hideNavColumn = true,
 			noneFoundText,
 			disableLoadingIndicator = false,
+			disableSelectorSelected = false,
 			showRowExpander = false,
 			rowExpanderTpl = '',
 			showHeaders = true,
@@ -129,10 +130,9 @@ export function Grid(props) {
 			isInSelection,
 			noSelectorMeansNoResults = false,
 
-			// selectorSelected
+			// DataMgt
 			selectorId,
 			selectorSelected,
-			disableSelectorSelected = false,
 
 			// withInlineEditor
 			inlineEditorRef,

package/src/Components/Hoc/withEditor.js

@@ -27,6 +27,10 @@ export default function withEditor(WrappedComponent) {
 				},
 				record,
 
+				// DataMgt
+				selectorId,
+				selectorSelected,
+
 				// withData
 				Repository,
 
@@ -47,7 +51,13 @@ export default function withEditor(WrappedComponent) {
 				}
 				const
 					defaultValues = Repository.getSchema().model.defaultValues,
-					entity = await Repository.add(defaultValues, false, true, true);
+					addValues = _.clone(defaultValues);
+
+				if (selectorId && !_.isEmpty(selectorSelected)) {
+					addValues[selectorId] = selectorSelected.id;
+				}
+
+				const entity = await Repository.add(addValues, false, true, true);
 				setSelection([entity]);
 				setIsEditorViewOnly(false);
 				setEditorMode(EDITOR_MODE__ADD);
@@ -118,11 +128,15 @@ export default function withEditor(WrappedComponent) {
 				} else if (selection.length > 1) {
 					// Edit multiple entities
 
-
-					debugger;
-
-
-
+					// Loop through all entities and change fields that are not null
+					const propertyNames = Object.getOwnPropertyNames(data);
+					_.each(propertyNames, (propertyName) => {
+						if (!_.isNil(data[propertyName])) {
+							_.each(what, (rec) => {
+								rec[propertyName] = data[propertyName]
+							});
+						}
+					});
 				}
 				await Repository.save();
 				setIsEditorShown(false);

package/src/Components/Hoc/withPresetButtons.js

@@ -33,12 +33,6 @@ export default function withPresetButtons(WrappedComponent) {
 			} = props,
 			{
 				// for local use
-				selection,
-				onAdd,
-				onEdit,
-				onDelete,
-				onView,
-				onDuplicate,
 				useEditor = true,
 				disableAdd = false,
 				disableEdit = false,
@@ -51,6 +45,19 @@ export default function withPresetButtons(WrappedComponent) {
 				// withEditor
 				userCanEdit = true,
 				userCanView = true,
+				onAdd,
+				onEdit,
+				onDelete,
+				onView,
+				onDuplicate,
+
+				// withSelection
+				selection,
+				setSelection,
+
+				// DataMgt
+				selectorId,
+				selectorSelected,
 			} = props,
 			[isReady, setIsReady] = useState(false),
 			[localContextMenuItems, setLocalContextMenuItems] = useState([]),
@@ -210,7 +217,7 @@ export default function withPresetButtons(WrappedComponent) {
 			if (!isReady) {
 				setIsReady(true);
 			}
-		}, [selection, localColumnsConfig]);
+		}, [selection, selectorSelected, localColumnsConfig]);
 
 		if (!isReady) {
 			return null;
@@ -229,6 +236,7 @@ export default function withPresetButtons(WrappedComponent) {
 		if (additionalToolbarButtons) {
 			additionalToolbarButtonsToPass.concat(additionalToolbarButtons);
 		}
+
 		return <WrappedComponent
 					{...propsToPass}
 					contextMenuItems={contextMenuItemsToPass}

package/src/Components/Screens/DataMgt.js

@@ -44,8 +44,8 @@ export default function DataMgt(props) {
 		[isWestCollapsed, setIsWestCollapsed] = useState(westStartsCollapsed),
 		[isEastCollapsed, setIsEastCollapsed] = useState(eastStartsCollapsed),
 		[isFullscreen, setIsFullscreen] = useState(false),
-		[westSelected, setWestSelectedRaw] = useState([]),
-		[centerSelected, setCenterSelected] = useState([]),
+		[westSelected, setWestSelectedRaw] = useState(),
+		[centerSelected, setCenterSelected] = useState(),
 		setWestSelected = (selected) => {
 			setWestSelectedRaw(selected);
 			setCenterSelected(); // clear selection in center
@@ -156,7 +156,7 @@ export default function DataMgt(props) {
 					autoLoad={!showSelector}
 					uniqueRepository={true}
 					selectorId={showSelector ? westSelector_id : null}
-					selectorSelected={westSelected}
+					selectorSelected={westSelected?.[0]}
 					noSelectorMeansNoResults={centerNoSelectorMeansNoResults}
 					onChangeSelection={setCenterSelected}
 					onEvent={onEvent}
@@ -167,7 +167,7 @@ export default function DataMgt(props) {
 		isFullscreen,
 		showSelector,
 		westSelected,
-		westSelected?.hash,
+		westSelected?.[0].hash,
 		centerNoSelectorMeansNoResults,
 		// {...centerProps}
 	])
@@ -191,7 +191,7 @@ export default function DataMgt(props) {
 					controlledByCenter = typeof associatedPanel.props.controlledByCenter === 'undefined' ? true : associatedPanel.props.controlledByCenter,
 					thisAssociatedPanelProps = {
 						selectorId: controlledByCenter ? centerSelector_id : westSelector_id,
-						selectorSelected: controlledByCenter ? centerSelected : westSelected,
+						selectorSelected: controlledByCenter ? centerSelected?.[0] : westSelected?.[0],
 						...associatedPanel.props,
 					};
 				return React.cloneElement(associatedPanel, { key: ix, reference: 'associatedPanel' + ix, ...allAssociatedPanelProps, ...thisAssociatedPanelProps, });