@onehat/ui 0.2.51 → 0.2.53

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.2.51",
+	"version": "0.2.53",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",
@@ -19,7 +19,7 @@
 	},
 	"license": "UNLICENSED",
 	"dependencies": {
-		"@onehat/data": "^1.16.0",
+		"@onehat/data": "^1.16.9",
 		"@hookform/resolvers": "^2.9.11",
 		"ckeditor5-custom-build": "file:ckeditor5",
 		"js-cookie": "^3.0.1",

package/src/Components/Container/Container.js

@@ -1,4 +1,4 @@
-import React, { useState, } from 'react';
+import React, { useState, useEffect, useId, } from 'react';
 import {
 	Column,
 	Row,
@@ -12,6 +12,8 @@ import {
 	UI_MODE_REACT_NATIVE,
 	CURRENT_MODE,
 } from '../../Constants/UiModes.js';
+import getSaved from '../../Functions/getSaved.js';
+import setSaved from '../../Functions/setSaved.js';
 import Splitter from './Splitter.js';
 
 export default function Container(props) {
@@ -31,15 +33,49 @@ export default function Container(props) {
 			isWestCollapsed,
 			setIsWestCollapsed,
 		} = props,
+		id = useId(),
 		canResize = CURRENT_MODE === UI_MODE_WEB,
-		[localIsNorthCollapsed, setLocalIsNorthCollapsed] = useState(north ? north.props.startsCollapsed : false),
-		[localIsSouthCollapsed, setLocalIsSouthCollapsed] = useState(south ? south.props.startsCollapsed : false),
-		[localIsEastCollapsed, setLocalIsEastCollapsed] = useState(east ? east.props.startsCollapsed : false),
-		[localIsWestCollapsed, setLocalIsWestCollapsed] = useState(west ? west.props.startsCollapsed : false),
-		[northHeight, setNorthHeight] = useState(north ? north.props.h : 0),
-		[southHeight, setSouthHeight] = useState(south ? south.props.h : 0),
-		[eastWidth, setEastWidth] = useState(east ? east.props.w : 0),
-		[westWidth, setWestWidth] = useState(west ? west.props.w : 0),
+		[isReady, setIsReady] = useState(false),
+		[localIsNorthCollapsed, setLocalIsNorthCollapsedRaw] = useState(north ? north.props.startsCollapsed : false),
+		[localIsSouthCollapsed, setLocalIsSouthCollapsedRaw] = useState(south ? south.props.startsCollapsed : false),
+		[localIsEastCollapsed, setLocalIsEastCollapsedRaw] = useState(east ? east.props.startsCollapsed : false),
+		[localIsWestCollapsed, setLocalIsWestCollapsedRaw] = useState(west ? west.props.startsCollapsed : false),
+		[northHeight, setNorthHeightRaw] = useState(north ? north.props.h : 0),
+		[southHeight, setSouthHeightRaw] = useState(south ? south.props.h : 0),
+		[eastWidth, setEastWidthRaw] = useState(east ? east.props.w : 0),
+		[westWidth, setWestWidthRaw] = useState(west ? west.props.w : 0),
+		setLocalIsNorthCollapsed = (bool) => {
+			setLocalIsNorthCollapsedRaw(bool);
+			setSaved(id + '-localIsNorthCollapsed', bool);
+		},
+		setLocalIsSouthCollapsed = (bool) => {
+			setLocalIsSouthCollapsedRaw(bool);
+			setSaved(id + '-localIsSouthCollapsed', bool);
+		},
+		setLocalIsEastCollapsed = (bool) => {
+			setLocalIsEastCollapsedRaw(bool);
+			setSaved(id + '-localIsEastCollapsed', bool);
+		},
+		setLocalIsWestCollapsed = (bool) => {
+			setLocalIsWestCollapsedRaw(bool);
+			setSaved(id + '-localIsWestCollapsed', bool);
+		},
+		setNorthHeight = (height) => {
+			setNorthHeightRaw(height);
+			setSaved(id + '-northHeight', height);
+		},
+		setSouthHeight = (height) => {
+			setSouthHeightRaw(height);
+			setSaved(id + '-southHeight', height);
+		},
+		setEastWidth = (width) => {
+			setEastWidthRaw(width);
+			setSaved(id + '-eastWidth', width);
+		},
+		setWestWidth = (width) => {
+			setWestWidthRaw(width);
+			setSaved(id + '-westWidth', width);
+		},
 		onNorthResize = (delta) => {
 			const newHeight = northHeight + delta;
 			setNorthHeight(newHeight);
@@ -56,6 +92,68 @@ export default function Container(props) {
 			const newWidth = westWidth + delta;
 			setWestWidth(newWidth);
 		};
+
+	useEffect(() => {
+		// Restore saved settings
+		(async () => {
+			let key, val;
+			key = id + '-localIsNorthCollapsed';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setLocalIsNorthCollapsedRaw(val);
+			}
+
+			key = id + '-localIsSouthCollapsed';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setLocalIsSouthCollapsedRaw(val);
+			}
+
+			key = id + '-localIsEastCollapsed';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setLocalIsEastCollapsedRaw(val);
+			}
+
+			key = id + '-localIsWestCollapsed';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setLocalIsWestCollapsedRaw(val);
+			}
+
+			key = id + '-northHeight';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setNorthHeightRaw(val);
+			}
+
+			key = id + '-southHeight';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setSouthHeightRaw(val);
+			}
+
+			key = id + '-eastWidth';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setEastWidthRaw(val);
+			}
+
+			key = id + '-westWidth';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setWestWidthRaw(val);
+			}
+
+			if (!isReady) {
+				setIsReady(true);
+			}
+		})();
+	}, []);
+
+	if (!isReady) {
+		return null;
+	}
 		
 	let componentProps = {},
 		centerComponent = null,

package/src/Components/Panel/TabPanel.js

@@ -1,4 +1,4 @@
-import React, { useState, } from 'react';
+import React, { useState, useEffect, useId, } from 'react';
 import {
 	Button,
 	Column,
@@ -16,6 +16,8 @@ import IconButton from '../Buttons/IconButton.js';
 import Minimize from '../Icons/Minimize.js';
 import Maximize from '../Icons/Maximize.js';
 import Panel from './Panel.js';
+import getSaved from '../../Functions/getSaved.js';
+import setSaved from '../../Functions/setSaved.js';
 import _ from 'lodash';
 
 
@@ -30,9 +32,12 @@ export default function TabPanel(props) {
 			startsCollapsed = true,
 			onChangeCurrentTab,
 			onChangeIsCollapsed,
+			saveCurrentTab = true,
 			...propsToPass
 		} = props,
 		styles = UiGlobals.styles,
+		id = useId(),
+		[isReady, setIsReady] = useState(false),
 		[currentTab, setCurrentTabRaw] = useState(initialTab),
 		[isCollapsed, setIsCollapsedRaw] = useState(startsCollapsed),
 		setIsCollapsed = (isCollapsed) => {
@@ -40,22 +45,25 @@ export default function TabPanel(props) {
 			if (onChangeIsCollapsed) {
 				onChangeIsCollapsed(isCollapsed);
 			}
+			if (setSaved) {
+				setSaved(id + '-isCollapsed', isCollapsed);
+			}
 		},
 		setCurrentTab = (ix) => {
 			setCurrentTabRaw(ix);
 			if (onChangeCurrentTab) {
 				onChangeCurrentTab(ix);
 			}
+			if (setSaved && saveCurrentTab) {
+				setSaved(id + '-currentTab', ix);
+			}
 		},
 		getButtonProps = () => {
 			const
 				iconProps = {
 					size: 'md',
 				},
-				textProps = {
-					ml: '-8px',
-					mr: '8px',
-				},
+				textProps = {},
 				buttonProps = {
 					bg: styles.TAB_BG,
 					color: styles.TAB_COLOR,
@@ -279,54 +287,81 @@ export default function TabPanel(props) {
 		onToggleCollapse = () => {
 			setIsCollapsed(!isCollapsed);
 		};
-		if (direction === VERTICAL) {
-			return <Panel {...propsToPass}>
-						<Row flex={1} w="100%">
-							<Column
-								alignItems="center"
-								justifyContent="flex-start"
-								py={2}
-								pl={isCollapsed ? 1 : 4}
-								bg={styles.TAB_BAR_BG}
-								w={isCollapsed ? '50px' : tabWidth}
-							>
-								{renderTabs()}
-								<Column flex={1} w="100%" justifyContent="flex-end">
-									{renderToggleButton()}
-								</Column>
-							</Column>
-							<Column
-								alignItems="center"
-								justifyContent="flex-start"
-								flex={1}
-							>
-								{renderCurrentTabContent()}
-							</Column>
-						</Row>
-					</Panel>;
-		}
 
-		// HORIZONTAL
-		return <Panel flex={1} w="100%" {...propsToPass} {...props._panel}>
-					<Column flex={1} w="100%">
-						<Row
+	useEffect(() => {
+		// Restore saved settings
+		(async () => {
+			let key, val;
+			key = id + '-isCollapsed';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setIsCollapsed(val);
+			}
+
+			key = id + '-currentTab';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setCurrentTab(val);
+			}
+
+			if (!isReady) {
+				setIsReady(true);
+			}
+		})();
+	}, []);
+
+	if (!isReady) {
+		return null;
+	}
+
+	if (direction === VERTICAL) {
+		return <Panel {...propsToPass}>
+					<Row flex={1} w="100%">
+						<Column
 							alignItems="center"
 							justifyContent="flex-start"
-							p={2}
-							pb={0}
+							py={2}
+							pl={isCollapsed ? 1 : 4}
 							bg={styles.TAB_BAR_BG}
-							h={isCollapsed ? '30px' : tabHeight}
+							w={isCollapsed ? '50px' : tabWidth}
 						>
 							{renderTabs()}
-							<Row flex={1} h="100%" justifyContent="flex-end">
-								<Row h="100%">
-									{renderToggleButton()}
-								</Row>
-							</Row>
-						</Row>
-						<Row flex={1}>
+							<Column flex={1} w="100%" justifyContent="flex-end">
+								{renderToggleButton()}
+							</Column>
+						</Column>
+						<Column
+							alignItems="center"
+							justifyContent="flex-start"
+							flex={1}
+						>
 							{renderCurrentTabContent()}
-						</Row>
-					</Column>
+						</Column>
+					</Row>
 				</Panel>;
+	}
+
+	// HORIZONTAL
+	return <Panel flex={1} w="100%" {...propsToPass} {...props._panel}>
+				<Column flex={1} w="100%">
+					<Row
+						alignItems="center"
+						justifyContent="flex-start"
+						p={2}
+						pb={0}
+						bg={styles.TAB_BAR_BG}
+						h={isCollapsed ? '30px' : tabHeight}
+					>
+						{renderTabs()}
+						<Row flex={1} h="100%" justifyContent="flex-end">
+							<Row h="100%">
+								{renderToggleButton()}
+							</Row>
+						</Row>
+					</Row>
+					<Row flex={1}>
+						{renderCurrentTabContent()}
+					</Row>
+				</Column>
+			</Panel>;
 }

package/src/Components/Screens/DataMgt.js

@@ -1,4 +1,4 @@
-import React, { useState, useMemo, } from 'react';
+import React, { useState, useEffect, useMemo, useId, } from 'react';
 import {
 	HORIZONTAL,
 	VERTICAL,
@@ -12,6 +12,8 @@ import Container from '../Container/Container.js';
 import Panel from '../Panel/Panel.js';
 import TabPanel from '../Panel/TabPanel.js';
 import UploadDownload from '../Panel/UploadDownload.js';
+import getSaved from '../../Functions/getSaved.js';
+import setSaved from '../../Functions/setSaved.js';
 import _ from 'lodash';
 
 export default function DataMgt(props) {
@@ -40,12 +42,26 @@ export default function DataMgt(props) {
 		} = props;
 
 	const
+		id = useId(),
 		// westRef = useRef(),
-		[isWestCollapsed, setIsWestCollapsed] = useState(westStartsCollapsed),
-		[isEastCollapsed, setIsEastCollapsed] = useState(eastStartsCollapsed),
-		[isFullscreen, setIsFullscreen] = useState(false),
+		[isReady, setIsReady] = useState(false),
+		[isWestCollapsed, setIsWestCollapsedRaw] = useState(westStartsCollapsed),
+		[isEastCollapsed, setIsEastCollapsedRaw] = useState(eastStartsCollapsed),
+		[isFullscreen, setIsFullscreenRaw] = useState(false),
 		[westSelected, setWestSelectedRaw] = useState(),
 		[centerSelected, setCenterSelected] = useState(),
+		setIsWestCollapsed = (bool) => {
+			setIsWestCollapsedRaw(bool);
+			setSaved(id + '-isWestCollapsed', bool);
+		},
+		setIsEastCollapsed = (bool) => {
+			setIsEastCollapsedRaw(bool);
+			setSaved(id + '-isEastCollapsed', bool);
+		},
+		setIsFullscreen = (bool) => {
+			setIsFullscreenRaw(bool);
+			setSaved(id + '-isFullscreen', isFullscreen);
+		},
 		setWestSelected = (selected) => {
 			setWestSelectedRaw(selected);
 			setCenterSelected(); // clear selection in center
@@ -85,6 +101,51 @@ export default function DataMgt(props) {
 			}
 		};
 
+	useEffect(() => {
+		if (!getSaved) {
+			setIsReady(true);
+			return () => {};
+		}
+
+		// Restore saved settings
+		(async () => {
+
+			let key, val;
+			key = id + '-isWestCollapsed';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setIsWestCollapsedRaw(val);
+			}
+
+			key = id + '-isEastCollapsed';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setIsEastCollapsedRaw(val);
+			}
+
+			key = id + '-isFullscreen';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setIsFullscreenRaw(val);
+			}
+
+			key = id + '-westSelected';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setWestSelectedRaw(val);
+			}
+
+			key = id + '-centerSelected';
+			val = await getSaved(key);
+			if (!_.isNil(val)) {
+				setCenterSelectedRaw(val);
+			}
+
+			if (!isReady) {
+				setIsReady(true);
+			}
+		})();
+	}, []);
 
 	//   REGIONS -------------------------------------------------------
 	// 	[				] [							] [					]
@@ -238,6 +299,10 @@ export default function DataMgt(props) {
 		}
 	}
 
+	if (!isReady) {
+		return null;
+	}
+
 	return <Container
 				west={west}
 				isWestCollapsed={isWestCollapsed}
@@ -246,5 +311,7 @@ export default function DataMgt(props) {
 				east={east}
 				isEastCollapsed={isEastCollapsed}
 				setIsEastCollapsed={setIsEastCollapsed}
+				getSaved={getSaved}
+				setSaved={setSaved}
 			/>;
 }

package/src/Functions/deleteSaved.js

@@ -0,0 +1,10 @@
+import oneHatData from '@onehat/data';
+import UiGlobals from '../UiGlobals.js';
+
+export default async function deleteSaved(key) {
+	const Repo = oneHatData.getRepository(UiGlobals.uiSavesRepo);
+	if (!Repo) {
+		return null;
+	}
+	await Repo.deleteById(key);
+}

package/src/Functions/getSaved.js

@@ -0,0 +1,38 @@
+import oneHatData from '@onehat/data';
+import UiGlobals from '../UiGlobals.js';
+import _ from 'lodash';
+
+export default async function getSaved(key) {
+	const
+		Repo = oneHatData.getRepository(UiGlobals.uiSavesRepo),
+		entity = Repo?.getById(key);
+
+	if (!entity) {
+		return null;
+	}
+
+	let value = entity.value;
+
+	if (entity.isJson) {
+		value = JSON.parse(value);
+		if (entity.isOneBuild) {
+			// Convert the data to an actual entity (or entities) of the correct type
+			const
+				Repository = oneHatData.getRepository(entity.model),
+				entities = [];
+			let i, data, entity;
+			if (_.isArray(value)) {
+				for (i = 0; i = value.length; i++) {
+					data = value[i];
+					entity = await Repository.createStandaloneEntity(data);
+					entities.push(entity);
+				}
+				value = entities;
+			} else {
+				value = await Repository.createStandaloneEntity(value);
+			}
+
+		}
+	}
+	return value;
+}

package/src/Functions/setSaved.js

@@ -0,0 +1,56 @@
+import oneHatData from '@onehat/data';
+import UiGlobals from '../UiGlobals.js';
+import _ from 'lodash';
+
+export default async function setSaved(key, value) {
+	const
+		Repo = oneHatData.getRepository(UiGlobals.uiSavesRepo),
+		entity = Repo?.getById(key);
+
+	if (!entity) {
+		return null;
+	}
+	
+	let isOneBuild = false,
+		isJson = false,
+		model = null;
+	if (!_.isNil(value) && typeof value !== 'string') {
+		if (_.isArray(value)) {
+			const objects = value;
+			if (objects[0]?.getDataForNewEntity) {
+				model = objects[0].repository.name;
+				isOneBuild = true;
+			}
+			const rawValues = [];
+			_.each(objects, (obj) => {
+				rawValues.push(isOneBuild ? obj.getDataForNewEntity() : obj);
+			});
+			value = JSON.stringify(rawValues);
+		} else {
+			if (value.getDataForNewEntity) {
+				model = value.repository.name;
+				value = value.getDataForNewEntity();
+				isOneBuild = true;
+			}
+			value = JSON.stringify(value);
+		}
+		isJson = true;
+	}
+	if (entity) {
+		entity.setValues({
+			value,
+			isOneBuild,
+			isJson,
+			model,
+		});
+		await Repo.save(entity);
+	} else {
+		await Repo.add({
+			key,
+			value,
+			isOneBuild,
+			isJson,
+			model,
+		});
+	}
+}

package/src/Functions/setUiSavesRepo.js

@@ -0,0 +1,5 @@
+import UiGlobals from '../UiGlobals.js';
+
+export default function setUiSavesRepo(name) {
+	UiGlobals.uiSavesRepo = name;
+}