Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OPIK-1034] [FR]: Fix the link in the project list pagination #1302

Merged
merged 1 commit into from
Feb 17, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import React, { useCallback, useMemo, useRef, useState } from "react";
import { keepPreviousData } from "@tanstack/react-query";
import {
JsonParam,
NumberParam,
StringParam,
useQueryParam,
} from "use-query-params";
import isNumber from "lodash/isNumber";
import get from "lodash/get";

import { formatNumericData } from "@/lib/utils";
import DataTable from "@/components/shared/DataTable/DataTable";
Expand Down Expand Up @@ -30,18 +37,13 @@ import {
} from "@/types/shared";
import { convertColumnDataToColumn, mapColumnDataFields } from "@/lib/table";
import useLocalStorageState from "use-local-storage-state";
import {
ColumnPinningState,
ColumnSort,
RowSelectionState,
} from "@tanstack/react-table";
import { ColumnPinningState, ColumnSort } from "@tanstack/react-table";
import {
generateActionsColumDef,
generateSelectColumDef,
} from "@/components/shared/DataTable/utils";
import { RESOURCE_TYPE } from "@/components/shared/ResourceLink/ResourceLink";
import FeedbackScoreListCell from "@/components/shared/DataTableCells/FeedbackScoreListCell";
import { get } from "lodash";

export const getRowId = (p: ProjectWithStatistic) => p.id;

Expand Down Expand Up @@ -175,12 +177,22 @@ const ProjectsPage: React.FunctionComponent = () => {

const resetDialogKeyRef = useRef(0);
const [openDialog, setOpenDialog] = useState<boolean>(false);

const [search, setSearch] = useState("");
const [page, setPage] = useState(1);
const [size, setSize] = useState(10);

const [rowSelection, setRowSelection] = useState<RowSelectionState>({});
const [search = "", setSearch] = useQueryParam("search", StringParam, {
updateType: "replaceIn",
});
const [page = 1, setPage] = useQueryParam("page", NumberParam, {
updateType: "replaceIn",
});
const [size = 10, setSize] = useQueryParam("size", NumberParam, {
updateType: "replaceIn",
});
const [rowSelection = {}, setRowSelection] = useQueryParam(
"selection",
JsonParam,
{
updateType: "replaceIn",
},
);

const [sortedColumns, setSortedColumns] = useLocalStorageState<ColumnSort[]>(
COLUMNS_SORT_KEY,
Expand All @@ -192,7 +204,7 @@ const ProjectsPage: React.FunctionComponent = () => {
const { data, isPending } = useProjectWithStatisticsList(
{
workspaceName,
search,
search: search!,
sorting: sortedColumns.map((column) => {
if (column.id === "last_updated_at") {
return {
Expand All @@ -202,8 +214,8 @@ const ProjectsPage: React.FunctionComponent = () => {
}
return column;
}),
page,
size,
page: page!,
size: size!,
},
{
placeholderData: keepPreviousData,
Expand Down Expand Up @@ -292,7 +304,7 @@ const ProjectsPage: React.FunctionComponent = () => {
</div>
<div className="mb-4 flex items-center justify-between gap-8">
<SearchInput
searchText={search}
searchText={search!}
setSearchText={setSearch}
placeholder="Search by name"
className="w-[320px]"
Expand Down Expand Up @@ -339,9 +351,9 @@ const ProjectsPage: React.FunctionComponent = () => {
/>
<div className="py-4">
<DataTablePagination
page={page}
page={page!}
pageChange={setPage}
size={size}
size={size!}
sizeChange={setSize}
total={total}
></DataTablePagination>
Expand Down