Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor list filter query functionality

Browse Source
This commit is contained in:
Infinite
2020-02-07 20:58:23 +01:00
parent 0fdde7726b
commit 690596aa34
4 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ui/v2.5/src/hooks/ListHook.tsx
View File

@@ -1,9 +1,10 @@
import _ from "lodash";
import queryString from "query-string";
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import { ApolloError } from "apollo-client";
import { useHistory } from "react-router-dom";
import { useHistory, useLocation } from "react-router-dom";
import {
SortDirectionEnum,
SlimSceneDataFragment,
SceneMarkerDataFragment,
GalleryDataFragment,
@@ -74,10 +75,11 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
options: IListHookOptions<QueryResult> & IQuery<QueryResult, QueryData>
): IListHookData => {
const history = useHistory();
const location = useLocation();
const [filter, setFilter] = useState<ListFilterModel>(
new ListFilterModel(
options.filterMode,
options.subComponent ? "" : queryString.parse(history.location.search)
options.subComponent ? "" : queryString.parse(location.search)
)
);
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
@@ -88,6 +90,15 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
const totalCount = options.getCount(result);
const items = options.getData(result);
useEffect(() => (
setFilter(
new ListFilterModel(
options.filterMode,
options.subComponent ? "" : queryString.parse(location.search)
)
)
), [location, options.filterMode, options.subComponent]);
function getFilter() {
if (!options.filterHook) {
return filter;
@@ -108,7 +119,6 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
const newFilter = _.cloneDeep(filter);
newFilter.itemsPerPage = pageSize;
newFilter.currentPage = 1;
setFilter(newFilter);
updateQueryParams(newFilter);
}
@@ -116,14 +126,12 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
const newFilter = _.cloneDeep(filter);
newFilter.searchTerm = query;
newFilter.currentPage = 1;
setFilter(newFilter);
updateQueryParams(newFilter);
}
function onChangeSortDirection(sortDirection: "asc" | "desc") {
function onChangeSortDirection(sortDirection: SortDirectionEnum) {
const newFilter = _.cloneDeep(filter);
newFilter.sortDirection = sortDirection;
setFilter(newFilter);
updateQueryParams(newFilter);
}
@@ -131,14 +139,12 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
const newFilter = _.cloneDeep(filter);
newFilter.sortBy = sortBy;
newFilter.currentPage = 1;
setFilter(newFilter);
updateQueryParams(newFilter);
}
function onChangeDisplayMode(displayMode: DisplayMode) {
const newFilter = _.cloneDeep(filter);
newFilter.displayMode = displayMode;
setFilter(newFilter);
updateQueryParams(newFilter);
}
@@ -165,7 +171,6 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
});
newFilter.currentPage = 1;
setFilter(newFilter);
updateQueryParams(newFilter);
}
@@ -175,14 +180,12 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
criterion => criterion.getId() !== removedCriterion.getId()
);
newFilter.currentPage = 1;
setFilter(newFilter);
updateQueryParams(newFilter);
}
function onChangePage(page: number) {
const newFilter = _.cloneDeep(filter);
newFilter.currentPage = page;
setFilter(newFilter);
updateQueryParams(newFilter);
}