Removing consolidated hook because values were not being passed up.

This commit is contained in:
Roland 2022-02-02 14:02:51 -07:00
parent 2053dc46f9
commit 3f08bce9ea
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
11 changed files with 106 additions and 98 deletions

View file

@ -1,7 +1,6 @@
import {useEffect, useState} from "react";
import {fetchDomains, filesSearch, getFiles, getVersion, searchArchives, searchVideos} from "../api";
import {useHistory} from "react-router-dom";
import {secondsToDateTime} from "../components/Common";
export const useSearchParam = (key, defaultValue = null) => {
// Get a window.location.search param.
@ -22,23 +21,6 @@ export const useSearchParam = (key, defaultValue = null) => {
return [value, setValue];
}
export const useSearchParams = ({defaultLimit = 20}) => {
let [limit, setLimit] = useSearchParam('l', defaultLimit);
let [offset, setOffset] = useSearchParam('o');
let [searchStr, setSearchStr] = useSearchParam('q');
let [activePage, setActivePage] = useState(1);
const setPage = (i) => {
i = parseInt(i);
let l = parseInt(limit);
setOffset((l * i) - l);
setActivePage(i);
}
return {limit, setLimit, offset, setOffset, searchStr, setSearchStr, activePage, setPage};
}
export const useSearch = () => {
let [searchStr, setSearchStr] = useSearchParam('q');
@ -86,28 +68,36 @@ export const useDomains = () => {
return [domains, total];
}
export const useArchives = (defaultLimit = 20) => {
const [archivesData, setArchives] = useState({archives: null, total: 0});
const [totalPages, setTotalPages] = useState(0);
const [activePage, setActivePage] = useState(1);
let {limit, setLimit, offset, setOffset, searchStr, setSearchStr, setPage} = useSearchParams(defaultLimit);
export const useArchives = ({defaultLimit = 20}) => {
let [limit, setLimit] = useSearchParam('l', defaultLimit);
let [offset, setOffset] = useSearchParam('o');
let [searchStr, setSearchStr] = useSearchParam('q');
let [domain, setDomain] = useSearchParam('domain');
const search = async (term) => {
setArchives({archives: null, total: 0});
setTotalPages(0);
const [archives, total] = await searchArchives(offset, limit, domain, term);
const [archives, setArchives] = useState(null);
const [totalPages, setTotalPages] = useState(0);
const [activePage, setActivePage] = useState((offset / limit) + 1);
const search = async () => {
setArchives(null);
const [archives, total] = await searchArchives(offset, limit, domain, searchStr);
setTotalPages(Math.floor(total / limit) + 1);
setArchives({archives, total});
setArchives(archives);
}
useEffect(() => {
search(searchStr);
search();
}, [offset, limit, domain, searchStr]);
const setPage = (i) => {
i = parseInt(i);
let l = parseInt(limit);
setOffset((l * i) - l);
setActivePage(i);
}
return {
archivesData,
archives,
totalPages,
setTotalPages,
offset,
@ -140,30 +130,22 @@ export const useVersion = () => {
return version;
}
const replaceFileDatetimes = (files) => {
for (let i = 0; i < files.length; i++) {
if (files[i]['modified']) {
files[i]['modified'] = secondsToDateTime(files[i]['modified']);
}
}
return files;
}
export const useSearchFiles = ({defaultLimit = 50}) => {
let {limit, setLimit, offset, setOffset, searchStr, setSearchStr, activePage, setPage} =
useSearchParams(defaultLimit);
let [limit, setLimit] = useSearchParam('l', defaultLimit);
let [offset, setOffset] = useSearchParam('o');
let [searchStr, setSearchStr] = useSearchParam('q');
const [searchFiles, setSearchFiles] = useState([]);
const [totalPages, setTotalPages] = useState(0);
const [activePage, setActivePage] = useState(1);
const localSearchFiles = async () => {
setSearchFiles([]);
setTotalPages(0);
if (searchStr) {
let {files, totals} = await filesSearch(offset, limit, searchStr);
files = replaceFileDatetimes(files);
let [files, total] = await filesSearch(offset, limit, searchStr);
setSearchFiles(files);
setTotalPages(Math.floor(totals['files'] / limit) + 1);
setTotalPages(Math.floor(total / limit) + 1);
}
}
@ -171,6 +153,13 @@ export const useSearchFiles = ({defaultLimit = 50}) => {
localSearchFiles();
}, [searchStr, limit, offset, activePage]);
const setPage = (i) => {
i = parseInt(i);
let l = parseInt(limit);
setOffset((l * i) - l);
setActivePage(i);
}
return {searchFiles, totalPages, limit, setLimit, setOffset, searchStr, setSearchStr, activePage, setPage};
}
@ -179,8 +168,7 @@ export const useBrowseFiles = () => {
const [openFolders, setOpenFolders] = useState([]);
const fetchFiles = async () => {
let {files} = await getFiles(openFolders);
files = replaceFileDatetimes(files);
const files = await getFiles(openFolders);
setBrowseFiles(files);
}