@onehat/ui 0.3.373 → 0.3.375

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.373",
+	"version": "0.3.375",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",
@@ -31,7 +31,7 @@
 		"@gluestack-ui/themed": "^1.1.26",
 		"@hookform/resolvers": "^3.3.1",
 		"@k-renwick/colour-mixer": "^1.2.1",
-		"@onehat/data": "^1.21.0",
+		"@onehat/data": "^1.21.18",
 		"@react-native-community/slider": "^4.5.2",
 		"@reduxjs/toolkit": "^1.9.5",
 		"inflector-js": "^1.0.1",

package/src/Components/Form/Field/Toggle.js

@@ -82,7 +82,8 @@ const
 					>
 						<Text
 							{...testProps('readout')}
-							mx={2}
+							ml={1}
+							mr={2}
 							fontSize={styles.FORM_TOGGLE_FONTSIZE}
 						>{_.isNil(value) ? 'N/A' : (!!value ? onText : offText)}</Text>
 					</Pressable>

package/src/Components/Hoc/withFilters.js

@@ -238,10 +238,17 @@ export default function withFilters(WrappedComponent) {
 					return filter?.type;
 				},
 				getIsFilterRange = (filter) => {
-					let field = _.isString(filter) ? filter : filter.field;
-					const filterType = getFilterType(field);
+					let filterType;
+					if (filter.type) {
+						// filter type is already determined
+						filterType = filter.type;
+					} else {
+						// try to find filter type from field name
+						const field = _.isString(filter) ? filter : filter.field;
+						filterType = getFilterType(field);
+					}
 					if (filterType?.type) {
-						return inArray(filterType.type, ['NumberRange', 'DateRange'])
+						filterType = filterType.type;
 					}
 					return inArray(filterType, ['NumberRange', 'DateRange']);
 				},

package/src/Components/Hoc/withPresetButtons.js

@@ -55,6 +55,10 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 				canRecordBeEdited,
 				canRecordBeDeleted,
 				canRecordBeDuplicated,
+				uploadHeaders,
+				uploadParams,
+				downloadHeaders,
+				downloadParams,
 				...propsToPass
 			} = props,
 			{
@@ -382,6 +386,10 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 								onClose={onModalClose}
 								Repository={Repository}
 								columnsConfig={props.columnsConfig}
+								uploadHeaders={uploadHeaders}
+								uploadParams={uploadParams}
+								downloadHeaders={downloadHeaders}
+								downloadParams={downloadParams}
 							/>
 						</Modal>}
 				</>;

package/src/Components/Window/UploadsDownloadsWindow.js

@@ -23,6 +23,10 @@ function UploadsDownloadsWindow(props) {
 		{
 			Repository,
 			columnsConfig = [],
+			uploadHeaders,
+			downloadHeaders,
+			uploadParams = {},
+			downloadParams = {},
 
 			// withComponent
 			self,
@@ -64,8 +68,9 @@ function UploadsDownloadsWindow(props) {
 						order,
 						model,
 						isTemplate,
+						...downloadParams,
 					}),
-					headers: _.merge({ 'Content-Type': 'application/json' }, Repository.headers),
+					headers: _.merge({ 'Content-Type': 'application/json' }, Repository.headers, downloadHeaders),
 				},
 				fetchWindow = downloadWithFetch(url, options, win),
 				interval = setInterval(function() {
@@ -83,7 +88,7 @@ function UploadsDownloadsWindow(props) {
 		onUpload = async () => {
 			const
 				url = Repository.api.baseURL + Repository.name + '/uploadBatch',
-				result = await Repository._send('POST', url, { importFile })
+				result = await Repository._send('POST', url, { importFile, ...uploadParams, }, uploadHeaders)
 										.catch(error => {
 											if (Repository.debugMode) {
 												console.log(url + ' error', error);