This commit is contained in:
Dave Richer
2023-12-11 17:34:05 -05:00
parent 5c164f807d
commit ad79344709
87 changed files with 1100 additions and 1113 deletions

View File

@@ -3,7 +3,7 @@ import { Button, Card, Input, Space, Table, Typography } from "antd";
import queryString from "query-string";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link, useNavigate, useLocation } from "react-router-dom";
import { Link, useNavigate, useSearchParams } from "react-router-dom";
import { setModalContext } from "../../redux/modals/modals.actions";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
@@ -40,7 +40,7 @@ export function ContractsList({
filteredInfo: { text: "" },
});
const history = useNavigate();
const search = queryString.parse(useLocation().search);
const search = queryString.parse(useSearchParams().toString());
const { page } = search;
const { t } = useTranslation();
@@ -164,7 +164,7 @@ export function ContractsList({
search.page = pagination.current;
search.sortcolumn = sorter.columnKey;
search.sortorder = sorter.order;
history.push({ search: queryString.stringify(search) });
history({ search: queryString.stringify(search) });
};
return (
@@ -179,7 +179,7 @@ export function ContractsList({
<Button
onClick={() => {
delete search.search;
history.push({ search: queryString.stringify(search) });
history({ search: queryString.stringify(search) });
}}
>
{t("general.actions.clear")}
@@ -196,7 +196,7 @@ export function ContractsList({
placeholder={search.searh || t("general.labels.search")}
onSearch={(value) => {
search.search = value;
history.push({ search: queryString.stringify(search) });
history({ search: queryString.stringify(search) });
}}
/>
</Space>