@onehat/ui 0.4.72 → 0.4.73

package/src/Components/Report/Report.js

@@ -41,6 +41,7 @@ function Report(props) {
 			disableExcel = false,
 			showReportHeaders = true,
 			isQuickReport = false,
+			additionalData = {},
 			quickReportData = {},
 			alert,
 		} = props,
@@ -50,7 +51,10 @@ function Report(props) {
 				reportId,
 				reportType: REPORT_TYPES__EXCEL,
 				showReportHeaders,
-				data: quickReportData,
+				data: {
+					...additionalData,
+					...quickReportData,
+				},
 			});
 		},
 		downloadReport = (args) => {
@@ -74,8 +78,8 @@ function Report(props) {
 
 	if (isQuickReport) {
 		let className = clsx(
-			'Report',
-			'max-w-[100px]',
+			'QuickReport',
+			'flex-1',
 			'm-2',
 		);
 		if (props.className) {
@@ -122,7 +126,10 @@ function Report(props) {
 			icon: Excel,
 			onPress: (data) => downloadReport({
 				reportId,
-				data,
+				data: {
+					...data,
+					...additionalData,
+				},
 				reportType: REPORT_TYPES__EXCEL,
 				showReportHeaders,
 			}),
@@ -137,7 +144,10 @@ function Report(props) {
 			icon: Pdf,
 			onPress: (data) => downloadReport({
 				reportId,
-				data,
+				data: {
+					...data,
+					...additionalData,
+				},
 				reportType: REPORT_TYPES__PDF,
 				showReportHeaders,
 			}),

package/src/Components/Toolbar/Pagination.js

@@ -212,7 +212,7 @@ export default function Pagination(props) {
 						'Pagination',
 						'items-center',
 						'shrink-0',
-						'gap-2',
+						'gap-1',
 					)}
 				>
 					{items}

package/src/Components/Toolbar/Toolbar.js

@@ -1,7 +1,12 @@
 import {
 	HStackNative,
+	ScrollView,
 } from '@project-components/Gluestack';
 import clsx from 'clsx';
+import {
+	CURRENT_MODE,
+	UI_MODE_NATIVE,
+} from '../../Constants/UiModes.js';
 import UiGlobals from '../../UiGlobals.js';
 
 export default function Toolbar(props) {
@@ -20,13 +25,28 @@ export default function Toolbar(props) {
 		'border-b-grey-400',
 		styles.TOOLBAR_CLASSNAME,
 	);
+	if (CURRENT_MODE === UI_MODE_NATIVE) {
+		className += ' min-w-[100%]';
+	}
 	if (props.className) {
 		className += ' ' + props.className
 	}
-	return <HStackNative
-				className={className}
-				style={props.style || {}}
-			>
-				{props.children}
-			</HStackNative>;
+	let toolbar = <HStackNative
+						className={className}
+						style={props.style || {}}
+					>
+						{props.children}
+					</HStackNative>;	
+
+	if (CURRENT_MODE === UI_MODE_NATIVE) {
+		toolbar = <ScrollView
+						horizontal={true}
+						className={clsx(
+							'min-w-[100%]',
+							'max-h-[50px]',
+						)}
+					>{toolbar}</ScrollView>;
+	}
+
+	return toolbar;
 };

package/src/Components/Viewer/TextWithLinks.js

@@ -8,6 +8,7 @@ import {
 } from '@project-components/Gluestack';
 import clsx from 'clsx';
 import {
+	CURRENT_MODE,
 	UI_MODE_WEB,
 } from '../../Constants/UiModes.js';
 import UiGlobals from '../../UiGlobals.js';
@@ -78,7 +79,7 @@ function TextWithLinksElement(props) {
 		};
   
 	const elementProps = {};
-	if (UiGlobals.mode === UI_MODE_WEB) {
+	if (CURRENT_MODE === UI_MODE_WEB) {
 		elementProps.textOverflow = 'ellipsis';
 	}
 	let className = clsx(

package/src/Constants/Dates.js

@@ -10,8 +10,11 @@ export const ONE_MONTH_AGO = moment().add(-1, 'months');
 export const TWO_MONTHS_AGO = moment().add(-2, 'months');
 export const SIX_MONTHS_AGO = moment().add(-6, 'months');
 export const ONE_MONTH_FROM_NOW = moment().add(1, 'months');
+export const START_OF_THIS_MONTH = moment().startOf('months');
+export const END_OF_LAST_MONTH = moment().subtract(1, 'months').endOf('month');
 export const ONE_YEAR_AGO = moment().add(-1, 'years');
 export const MOMENT_DATE_FORMAT_1 = 'YYYY-MM-DD HH:mm:ss';
-export const MOMENT_DATE_FORMAT_2 = 'MMMM Do YYYY, h:mm:ss a';
-export const MOMENT_DATE_FORMAT_3 = 'h:mm A';
+export const MOMENT_DATE_FORMAT_2 = 'MMMM Do YYYY, h:mm:ss a'; // pretty datetime
+export const MOMENT_DATE_FORMAT_3 = 'h:mm A'; // pretty time
 export const MOMENT_DATE_FORMAT_4 = 'YYYY-MM-DD';
+export const MOMENT_DATE_FORMAT_5 = 'HH:mm:ss';

package/src/Functions/downloadInBackground.js

@@ -1,11 +1,51 @@
 import qs from 'qs';
 
-const downloadInBackground = (url, data) => {
-	const a = document.createElement('A');
-	a.href = url + '?' + qs.stringify(data);
-	a.download = true;
-	document.body.appendChild(a);
-	a.click();
-	document.body.removeChild(a);
+const downloadInBackground = async (url, data, authHeaders = {}) => {
+	try {
+		// Use fetch to make the request with headers
+		const response = await fetch(url, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				...authHeaders,
+			},
+			body: qs.stringify(data),
+		});
+
+		if (!response.ok) {
+			throw new Error(`HTTP error! status: ${response.status}`);
+		}
+
+		// Get the blob from the response
+		const blob = await response.blob();
+		
+		// Create a download link
+		const downloadUrl = window.URL.createObjectURL(blob);
+		const a = document.createElement('A');
+		a.href = downloadUrl;
+		
+		// Try to get filename from response headers
+		const contentDisposition = response.headers.get('Content-Disposition');
+		let filename = 'download';
+		if (contentDisposition) {
+			const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
+			if (matches != null && matches[1]) {
+				filename = matches[1].replace(/['"]/g, '');
+			}
+		}
+		
+		a.download = filename;
+		document.body.appendChild(a);
+		a.click();
+		document.body.removeChild(a);
+		
+		// Clean up the object URL
+		window.URL.revokeObjectURL(downloadUrl);
+		
+	} catch (error) {
+		console.error('Download failed:', error);
+		throw error;
+	}
 };
+
 export default downloadInBackground;

package/src/Functions/getReport.js

@@ -4,6 +4,7 @@ import {
 } from '../Constants/ReportTypes.js';
 import downloadInBackground from './downloadInBackground.js';
 import downloadWithFetch from './downloadWithFetch.js';
+import getTokenHeaders from './getTokenHeaders.js';
 import UiGlobals from '../UiGlobals.js';
 
 export default function getReport(args) {
@@ -25,15 +26,17 @@ export default function getReport(args) {
 			outputFileType: reportType,
 			showReportHeaders,
 			...data,
-		};
+		},
+		authHeaders = getTokenHeaders();
 
 	if (reportType === REPORT_TYPES__EXCEL) {
-		downloadInBackground(url, params);
+		downloadInBackground(url, params, authHeaders);
 	} else {
 		const options = {
 			method: 'POST',
 			headers: {
 				'Content-Type': 'application/json',
+				...authHeaders,
 			},
 			body: JSON.stringify(params),
 		};

package/src/Functions/trackEngagementHit.js

@@ -1,5 +1,6 @@
 export default function trackEngagementHit(repository, data) {
-	const method = 'POST',
+	const
+		method = 'POST',
 		url = 'Engagements/trackEngagementHit';
 
 	return repository._send(method, url, data)