correct uses of useListExportCallback and usePrefilledTemplateCallback

c3g · Dec 20, 2024 · 890310c · 890310c
1 parent ac4ad4b
commit 890310c
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 23 deletions.
diff --git a/frontend/src/components/containers/ContainersListContent.tsx b/frontend/src/components/containers/ContainersListContent.tsx
@@ -47,9 +47,9 @@ export default function ContainersListContent() {
 	const templateActions = useAppSelector(selectContainerTemplateActions)
 	const prefills = useAppSelector(selectContainerPrefillTemplates)
 
-	const prefillTemplate = usePrefilledTemplateCallback(api.containers.prefill.request, filters, sortByList[0])
+	const prefillTemplate = usePrefilledTemplateCallback(api.containers.prefill.request, filters, sortByList)
 
-	const listExport = useListExportCallback(api.containers.listExport, filters, sortByList[0])
+	const listExport = useListExportCallback(api.containers.listExport, filters, sortByList)
 
 	const containersTableCallbacks = usePagedItemsActionsCallbacks(ContainersTableActions)
 

diff --git a/frontend/src/components/indices/IndicesListContent.tsx b/frontend/src/components/indices/IndicesListContent.tsx
@@ -31,9 +31,9 @@ function IndicesListContent() {
 	const navigate = useNavigate()
 	const pagedItems = useAppSelector(selectIndicesTable)
 	const templateActions = useAppSelector(selectIndicesTemplateActions)
-	const { filters, sortBy, totalCount } = pagedItems
+	const { filters, sortByList, totalCount } = pagedItems
 
-	const listExport = useListExportCallback(api.indices.listExport, filters, sortBy)
+	const listExport = useListExportCallback(api.indices.listExport, filters, sortByList)
 
 	const pagedItemCallbacks = usePagedItemsActionsCallbacks(IndicesTableActions)
 

diff --git a/frontend/src/components/individuals/IndividualsListContent.tsx b/frontend/src/components/individuals/IndividualsListContent.tsx
@@ -32,9 +32,9 @@ function wrapIndividual(individual: Individual) {
 
 function IndividualsListContent() {
 	const individualsTableState = useAppSelector(selectIndividualsTable)
-	const { filters, sortBy, totalCount } = individualsTableState
+	const { filters, sortByList, totalCount } = individualsTableState
 
-	const listExport = useListExportCallback(api.individuals.listExport, filters, sortBy)
+	const listExport = useListExportCallback(api.individuals.listExport, filters, sortByList)
 
 	const mapIndividualIDs = useItemsByIDToDataObjects(selectIndividualsByID, wrapIndividual)
 

diff --git a/frontend/src/components/libraries/LibrariesListContent.tsx b/frontend/src/components/libraries/LibrariesListContent.tsx
@@ -48,14 +48,14 @@ function wrapLibrary(library: Library) {
 export default function LibariesListContent() {
 
 	const librariesTableState = useAppSelector(selectLibrariesTable)
-	const { filters, fixedFilters, sortBy, totalCount, isFetching } = librariesTableState
+	const { filters, fixedFilters, sortByList, totalCount, isFetching } = librariesTableState
 	const templateActions = useAppSelector(selectLibraryTemplateActions)
 	const prefills = useAppSelector(selectLibraryPrefillTemplates)
 	const [sampleCategory, setSampleCategory] = useState<SampleCategory>()
 
-	const prefillTemplate = usePrefilledTemplateCallback(api.libraries.prefill.request, {...filters, ...fixedFilters}, sortBy)
+	const prefillTemplate = usePrefilledTemplateCallback(api.libraries.prefill.request, {...filters, ...fixedFilters}, sortByList)
 
-	const listExport = useListExportCallback(api.libraries.listExport, {...filters, ...fixedFilters}, sortBy)
+	const listExport = useListExportCallback(api.libraries.listExport, {...filters, ...fixedFilters}, sortByList)
 
 	const librariesTableCallbacks = usePagedItemsActionsCallbacks(LibrariesTableActions)
 

diff --git a/frontend/src/components/pagedItemsTable/serializeFilterParamsTS.ts b/frontend/src/components/pagedItemsTable/serializeFilterParamsTS.ts
@@ -124,6 +124,6 @@ export function serializeSortByParams(...sortByList: SortBy[]) {
  * @param sortBy 
  * @returns 
  */
-export function filtersQueryParams(filters: FilterSet, sortBy: SortBy){
-	return {...serializeFilterParamsWithDescriptions(filters), ordering: serializeSortByParams(sortBy)}
+export function filtersQueryParams(filters: FilterSet, sortByList: SortBy[]){
+	return {...serializeFilterParamsWithDescriptions(filters), ordering: serializeSortByParams(...sortByList)}
   }
diff --git a/frontend/src/components/pagedItemsTable/useListExportCallback.tsx b/frontend/src/components/pagedItemsTable/useListExportCallback.tsx
@@ -21,12 +21,12 @@ type ListExportFunc = typeof api.samples.listExport		// Just letting typescript
  * @param sortBy 
  * @returns 
  */
-export default function useListExportCallback(listExport: ListExportFunc, filters: FilterSet, sortBy: SortBy) {
+export default function useListExportCallback(listExport: ListExportFunc, filters: FilterSet, sortByList: SortBy[]) {
 	const token = useAppSelector(selectAuthTokenAccess)
 
 	return useCallback(() => {
-		return withToken(token, listExport)(filtersQueryParams(filters, sortBy))
+		return withToken(token, listExport)(filtersQueryParams(filters, sortByList))
 		.then(response => response.data)
 
-	}, [filters, listExport, sortBy, token])
+	}, [filters, listExport, sortByList, token])
 }
diff --git a/frontend/src/components/pagedItemsTable/usePrefilledTemplateCallback.tsx b/frontend/src/components/pagedItemsTable/usePrefilledTemplateCallback.tsx
@@ -16,11 +16,11 @@ type PrefillFunc = typeof api.samples.prefill.request
  * @param sortBy 	The current sort order in a table
  * @returns 
  */
-export function usePrefilledTemplateCallback(prefillFunc: PrefillFunc, filters: FilterSet, sortBy: SortBy) {
+export function usePrefilledTemplateCallback(prefillFunc: PrefillFunc, filters: FilterSet, sortByList: SortBy[]) {
 	const token = useAppSelector(selectAuthTokenAccess)
 
 	return useCallback(({template}) =>
-		withToken(token, prefillFunc)(filtersQueryParams(filters, sortBy), template)
+		withToken(token, prefillFunc)(filtersQueryParams(filters, sortByList), template)
 		.then(response => response)
-	, [filters, prefillFunc, sortBy, token])
+	, [filters, prefillFunc, sortByList, token])
 }
diff --git a/frontend/src/components/projects/ProjectsListContent.tsx b/frontend/src/components/projects/ProjectsListContent.tsx
@@ -35,10 +35,10 @@ function wrapProject(project: Project) {
 
 const ProjectsListContent = () => {
 	const projectsTableState  = useAppSelector(selectProjectsTable)
-	const { filters, sortBy, totalCount } = projectsTableState
+	const { filters, sortByList, totalCount } = projectsTableState
 	const templateActions = useAppSelector(selectProjectTemplateActions)
 
-	const listExport = useListExportCallback(api.projects.listExport, filters, sortBy)
+	const listExport = useListExportCallback(api.projects.listExport, filters, sortByList)
 
 	const projectsTableCallbacks = usePagedItemsActionsCallbacks(ProjectsTableActions)
 

diff --git a/frontend/src/components/samples/SamplesListContent.tsx b/frontend/src/components/samples/SamplesListContent.tsx
@@ -56,16 +56,16 @@ function wrapSample(sample: Sample) {
 
 function SamplesListContent() {
 	const samplesTableState = useAppSelector(selectSamplesTable)
-	const { filters, fixedFilters, sortBy, totalCount, isFetching } = samplesTableState
+	const { filters, fixedFilters, sortByList, totalCount, isFetching } = samplesTableState
 	const templateActions = useAppSelector(selectSampleTemplateActions)
 	const prefills = useAppSelector(selectSamplePrefillTemplates)
 	const [sampleCategory, setSampleCategory] = useState<SampleCategory>()
 
-	const prefillTemplate = usePrefilledTemplateCallback(api.samples.prefill.request, {...filters, ...fixedFilters}, sortBy)
+	const prefillTemplate = usePrefilledTemplateCallback(api.samples.prefill.request, {...filters, ...fixedFilters}, sortByList)
 
-	const listExport = useListExportCallback(api.samples.listExport, {...filters, ...fixedFilters}, sortBy)
+	const listExport = useListExportCallback(api.samples.listExport, {...filters, ...fixedFilters}, sortByList)
 
-	const listExportMetadata = useListExportCallback(api.samples.listExportMetadata,  {...filters, ...fixedFilters}, sortBy)
+	const listExportMetadata = useListExportCallback(api.samples.listExportMetadata,  {...filters, ...fixedFilters}, sortByList)
 
 	const samplesTableCallbacks = usePagedItemsActionsCallbacks(SamplesTableActions)