Improve typings and export missing PineFilterOption interface

Change-type: patch
balena-io-modules · Jan 27, 2025 · 26680ac · 26680ac
1 parent 0107876
commit 26680ac
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/components/RJST/components/Filters/FocusSearch.tsx b/src/components/RJST/components/Filters/FocusSearch.tsx
@@ -53,7 +53,9 @@ export const FocusSearch = <T extends { id: number; [key: string]: any }>({
 	rowKey = 'id',
 }: FocusSearchProps<T>) => {
 	const navigate = useNavigate();
-	const [searchResults, setSearchResults] = React.useState<T[]>([]);
+	const [searchResults, setSearchResults] = React.useState<
+		T[] | null | undefined
+	>(null);
 	const [isLoading, setIsLoading] = React.useState<boolean>(false);
 	const inputSearch = rjstContext.sdk?.inputSearch;
 
@@ -76,7 +78,7 @@ export const FocusSearch = <T extends { id: number; [key: string]: any }>({
 				} else if (searchFilter) {
 					setSearchResults(ajvFilter(searchFilter, filtered) || []);
 				} else {
-					setSearchResults([]);
+					setSearchResults(null);
 				}
 				setIsLoading(false);
 			}, 300),

diff --git a/src/components/RJST/models/helpers.ts b/src/components/RJST/models/helpers.ts
@@ -23,7 +23,7 @@ export const rjstDefaultPermissions = {
 export const rjstRunTransformers = <
 	T extends Dictionary<any>,
 	TResult extends T,
-	TContext,
+	TContext = null,
 >(
 	data: T | undefined,
 	transformers: Transformers<T, Omit<TResult, keyof T>, TContext>,

diff --git a/src/components/RJST/schemaOps.ts b/src/components/RJST/schemaOps.ts
@@ -101,7 +101,9 @@ export interface RJSTAction<T> {
 
 export interface RJSTSdk<T> {
 	tags?: RJSTTagsSdk<T>;
-	inputSearch?: (filter?: PineFilterObject) => Promise<Array<Subset<T>>>;
+	inputSearch?: (
+		filter?: PineFilterObject,
+	) => Promise<Array<Subset<T>> | null | undefined>;
 }
 
 export interface RJSTContext<T> {

diff --git a/src/index.tsx b/src/index.tsx
@@ -137,6 +137,8 @@ export {
 	removeRefSchemeSeparatorsFromFilters,
 } from './components/RJST/Filters/utils';
 
+export type { PineFilterObject } from './components/RJST/oData/jsonToOData';
+
 export {
 	type FormData,
 	FULL_TEXT_SLUG,