@onehat/ui 0.3.252 → 0.3.254

package/package.json

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

package/src/Components/Grid/Grid.js

@@ -209,8 +209,7 @@ function GridComponent(props) {
 		[isReady, setIsReady] = useState(false),
 		[isLoading, setIsLoading] = useState(false),
 		[localColumnsConfig, setLocalColumnsConfigRaw] = useState([]),
-		[isDragMode, setIsDragMode] = useState(false),
-		[dragRow, setDragRow] = useState(),
+		[isReorderMode, setIsReorderMode] = useState(false),
 		[isColumnSelectorShown, setIsColumnSelectorShown] = useState(false),
 		getIsExpanded = (index) => {
 			return !!expandedRowsRef.current[index];
@@ -309,8 +308,8 @@ function GridComponent(props) {
 					key="reorderBtn"
 					parent={self}
 					reference="reorderBtn"
-					onPress={() => setIsDragMode(!isDragMode)}
-					icon={<Icon as={isDragMode ? NoReorderRows : ReorderRows} color={styles.GRID_TOOLBAR_ITEMS_COLOR} />}
+					onPress={() => setIsReorderMode(!isReorderMode)}
+					icon={<Icon as={isReorderMode ? NoReorderRows : ReorderRows} color={styles.GRID_TOOLBAR_ITEMS_COLOR} />}
 					tooltip="Reorder Rows"
 				/>);
 			}
@@ -339,7 +338,7 @@ function GridComponent(props) {
 						if (e.preventDefault && e.cancelable) {
 							e.preventDefault();
 						}
-						if (isHeaderRow || isDragMode) {
+						if (isHeaderRow || isReorderMode) {
 							return
 						}
 						if (CURRENT_MODE === UI_MODE_WEB) {
@@ -383,7 +382,7 @@ function GridComponent(props) {
 						if (e.preventDefault && e.cancelable) {
 							e.preventDefault();
 						}
-						if (isHeaderRow || isDragMode) {
+						if (isHeaderRow || isReorderMode) {
 							return
 						}
 						
@@ -454,7 +453,7 @@ function GridComponent(props) {
 							const getSelection = () => dragSelectionRef.current;
 
 							// assign event handlers
-							if (canRowsReorder && isDragMode) {
+							if (canRowsReorder && isReorderMode) {
 								WhichRow = DragSourceGridRow;
 								rowReorderProps.isDragSource = true;
 								rowReorderProps.dragSourceType = 'row';
@@ -894,7 +893,7 @@ function GridComponent(props) {
 
 	isAddingRef.current = isAdding;
 
-	const footerToolbarItemComponents = useMemo(() => getFooterToolbarItems(), [Repository?.hash, additionalToolbarButtons, isDragMode]);
+	const footerToolbarItemComponents = useMemo(() => getFooterToolbarItems(), [Repository?.hash, additionalToolbarButtons, isReorderMode]);
 
 	if (!isInited) {
 		// first time through, render a placeholder so we can get container dimensions
@@ -1000,7 +999,7 @@ function GridComponent(props) {
 	}
 
 	const gridContainerBorderProps = {};
-	if (isDragMode) {
+	if (isReorderMode) {
 		gridContainerBorderProps.borderWidth = styles.REORDER_BORDER_WIDTH;
 		gridContainerBorderProps.borderColor = styles.REORDER_BORDER_COLOR;
 		gridContainerBorderProps.borderStyle = styles.REORDER_BORDER_STYLE;
@@ -1056,7 +1055,7 @@ function GridComponent(props) {
 					minHeight={40}
 					{...gridContainerBorderProps}
 					onClick={() => {
-						if (!isDragMode && !isInlineEditorShown && deselectAll) {
+						if (!isReorderMode && !isInlineEditorShown && deselectAll) {
 							deselectAll();
 						}
 					}}

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

@@ -366,12 +366,11 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 					await SecondaryRepository.save(null, useStaged);
 					success = true;
 				} catch (e) {
-					// alert(e.context);
-					success = false;
+					success = e;
 				}
 				setIsSaving(false);
 
-				if (success) {
+				if (_.isBoolean(success) && success) {
 					if (secondaryOnChange) {
 						secondaryOnChange(secondarySelection);
 					}
@@ -476,7 +475,24 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				return () => {};
 			}
 
-			function handleError(msg) {
+			function handleError(msg, data = null) {
+				if (data) {
+					if (_.isPlainObject(data)) {
+						for (let key in data) { if (data.hasOwnProperty(key)) {
+							const val1 = data[key];
+							if (_.isPlainObject(val1)) {
+								for (let key2 in val1) { if (val1.hasOwnProperty(key2)) {
+									const val2 = val1[key2];
+									msg += "\n" + key2 + ': ' + val2;
+								} }
+							} else if (_.isString(data)) {
+								msg += "\n" + data;
+							}
+						} }
+					} else {
+						// not sure what to do with data!
+					}
+				}
 				alert(msg);
 			}
 

package/src/Components/Hoc/withEditor.js

@@ -365,12 +365,11 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					await Repository.save(null, useStaged);
 					success = true;
 				} catch (e) {
-					// alert(e.context);
-					success = false;
+					success = e;
 				}
 				setIsSaving(false);
 
-				if (success) {
+				if (_.isBoolean(success) && success) {
 					if (onChange) {
 						onChange(selection);
 					}
@@ -485,7 +484,24 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				return () => {};
 			}
 
-			function handleError(msg) {
+			function handleError(msg, data = null) {
+				if (data) {
+					if (_.isPlainObject(data)) {
+						for (let key in data) { if (data.hasOwnProperty(key)) {
+							const val1 = data[key];
+							if (_.isPlainObject(val1)) {
+								for (let key2 in val1) { if (val1.hasOwnProperty(key2)) {
+									const val2 = val1[key2];
+									msg += "\n" + key2 + ': ' + val2;
+								} }
+							} else if (_.isString(data)) {
+								msg += "\n" + data;
+							}
+						} }
+					} else {
+						// not sure what to do with data!
+					}
+				}
 				alert(msg);
 			}