@onehat/ui 0.4.42 → 0.4.44

package/package.json

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

package/src/Components/Form/Form.js

@@ -1303,7 +1303,7 @@ function Form(props) {
 							Form-inlineFooter
 							absolute
 							top-[5px]
-							left-[100px]
+							left-[40px]
 							w-[100px]
 							min-w-[300px]
 							py-2

package/src/Components/Hoc/withData.js

@@ -16,8 +16,7 @@ export default function withData(WrappedComponent) {
 			return <WrappedComponent {...props} ref={ref} />;
 		}
 		
-		const
-			{
+		const {
 				// For @onehat/data repositories
 				Repository,
 				setRepository,

package/src/Components/Hoc/withModal.js

@@ -189,7 +189,7 @@ export default function withModal(WrappedComponent) {
 					{isModalShown && 
 						<Modal
 							isOpen={true}
-							onClose={onCancel}
+							onClose={onCancel || (canClose ? hideModal : null)}
 							className="withModal-Modal"
 							{...testProps(testID)}
 						>

package/src/Components/Hoc/withPresetButtons.js

@@ -50,6 +50,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				useUploadDownload = false,
 				uploadHeaders,
 				uploadParams,
+				onUpload,
 				downloadHeaders,
 				downloadParams,
 				onChangeColumnsConfig,
@@ -369,6 +370,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 								columnsConfig={props.columnsConfig}
 								uploadHeaders={uploadHeaders}
 								uploadParams={uploadParams}
+								onUpload={onUpload}
 								downloadHeaders={downloadHeaders}
 								downloadParams={downloadParams}
 							/>,

package/src/Components/Tree/Tree.js

@@ -736,8 +736,8 @@ function TreeComponent(props) {
 				}
 
 				const
-					depthChildren = await datum.item.loadChildren(depth),
-					directChildren = _.filter(depthChildren, (child) => { // narrow list to only direct descendants, so buildTreeNodeData can work correctly
+					node = await datum.item.loadChildren(depth),
+					directChildren = _.filter(node.children, (child) => { // narrow list to only direct descendants, so buildTreeNodeData can work correctly
 						return child.depth === datum.item.depth + 1;
 					});
 

package/src/Components/Window/UploadsDownloadsWindow.js

@@ -18,14 +18,14 @@ import Cookies from 'js-cookie';
 import _ from 'lodash';
 
 function UploadsDownloadsWindow(props) {
-	const
-		{
+	const {
 			Repository,
 			columnsConfig = [],
 			uploadHeaders,
 			downloadHeaders,
 			uploadParams = {},
 			downloadParams = {},
+			onUpload,
 
 			// withComponent
 			self,
@@ -70,21 +70,21 @@ function UploadsDownloadsWindow(props) {
 						...downloadParams,
 					}),
 					headers: _.merge({ 'Content-Type': 'application/json' }, Repository.headers, downloadHeaders),
-				},
-				fetchWindow = downloadWithFetch(url, options, win),
-				interval = setInterval(function() {
-					const cookie = Cookies.get(download_token);
-					if (fetchWindow.window && cookie) {
-						clearInterval(interval);
-						Cookies.remove(download_token);
-						fetchWindow.window.close();
-					}
-				}, 1000);
+				};
+			downloadWithFetch(url, options);
+			const interval = setInterval(function() {
+				const cookie = Cookies.get(download_token);
+				if (win.window && cookie) {
+					clearInterval(interval);
+					Cookies.remove(download_token);
+					win.window.close();
+				}
+			}, 1000);
 		},
 		onDownloadTemplate = () => {
 			onDownload(true);
 		},
-		onUpload = async () => {
+		onUploadLocal = async () => {
 			const
 				url = Repository.api.baseURL + Repository.name + '/uploadBatch',
 				result = await Repository._send('POST', url, { importFile, ...uploadParams, }, uploadHeaders)
@@ -123,6 +123,9 @@ function UploadsDownloadsWindow(props) {
 				setImportFile(null);
 				self.formSetValue('file', null);
 				showInfo("Upload successful.\n");
+				if (onUpload) {
+					onUpload();
+				}
 			}
 		};
 	
@@ -191,7 +194,7 @@ function UploadsDownloadsWindow(props) {
 												size: 'md',
 											},
 											isDisabled: !importFile,
-											onPress: onUpload,
+											onPress: onUploadLocal,
 										},
 										{
 											type: 'Button',

package/src/Functions/downloadWithFetch.js

@@ -1,8 +1,18 @@
 const downloadWithFetch = (url, options = {}, win = null) => {
 	let obj = {};
 	fetch(url, options)
-		.then( res => res.blob() )
-		.then( blob => {
+		.then((res) => {
+			const contentDisposition = res.headers.get('Content-Disposition');
+			let filename = 'download';
+			if (contentDisposition && contentDisposition.indexOf('attachment') !== -1) {
+				const matches = /filename="([^"]*)"/.exec(contentDisposition);
+				if (matches != null && matches[1]) { 
+					filename = matches[1];
+				}
+			}
+			return res.blob().then((blob) => ({ blob, filename }));
+		})
+		.then(({ blob, filename }) => {
 			// if (!win) {
 			// 	const
 			// 		winName = 'Download',
@@ -17,7 +27,7 @@ const downloadWithFetch = (url, options = {}, win = null) => {
 			// const link = win.document.createElement('a');
 			const link = document.createElement('a');
 			link.href = file;
-			// link.download = true;
+			link.download = filename; // Set the filename from the Content-Disposition header
 			link.target = "_blank";
 			link.click();