Skip to content

Commit 8f547a5

Browse files
ErwanDecosterErwanDecoster
committed
feat: add bulk deals instead of task table
1 parent 5e89810 commit 8f547a5

File tree

4 files changed

+131
-68
lines changed

4 files changed

+131
-68
lines changed

src/modules/datasets/dataset/DatasetTasksTable.tsx renamed to src/modules/datasets/dataset/DatasetBulkDealsTable.tsx

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import { DataTable } from '@/components/DataTable';
66
import { PaginatedNavigation } from '@/components/PaginatedNavigation';
77
import { usePageParam } from '@/hooks/usePageParam';
88
import { ErrorAlert } from '@/modules/ErrorAlert';
9-
import { columns } from '@/modules/tasks/tasksTable/columns';
9+
import { columns } from '@/modules/deals/dealsTable/columns';
1010
import useUserStore from '@/stores/useUser.store';
1111
import { createPlaceholderDataFnForQueryKey } from '@/utils/createPlaceholderDataFnForQueryKey';
1212
import { getAdditionalPages } from '@/utils/format';
13-
import { datasetTasksQuery } from './datasetTasksQuery';
13+
import { datasetBulkDealsQuery } from './datasetBulkDealsQuery';
1414

15-
function useDatasetTasksData({
15+
function useDatasetBulkDealsData({
1616
datasetId,
1717
currentPage,
1818
}: {
@@ -24,12 +24,12 @@ function useDatasetTasksData({
2424
const nextSkip = skip + DETAIL_TABLE_LENGTH;
2525
const nextNextSkip = skip + 2 * DETAIL_TABLE_LENGTH;
2626

27-
const queryKey = [chainId, 'dataset', 'tasks', datasetId, currentPage];
27+
const queryKey = [chainId, 'dataset', 'bulkDeals', datasetId, currentPage];
2828
const { data, isLoading, isRefetching, isError, errorUpdateCount } = useQuery(
2929
{
3030
queryKey,
3131
queryFn: () =>
32-
execute(datasetTasksQuery, chainId, {
32+
execute(datasetBulkDealsQuery, chainId, {
3333
length: DETAIL_TABLE_LENGTH,
3434
skip,
3535
nextSkip,
@@ -41,21 +41,23 @@ function useDatasetTasksData({
4141
}
4242
);
4343

44-
const tasks = data?.dataset?.bulkUsages.map((usage) => usage.task);
44+
const bulkDeals = data?.bulkSliceice?.map((slice) => slice.task?.deal) ?? [];
4545
// 0 = only current, 1 = next, 2 = next+1
4646
const additionalPages = getAdditionalPages(
47-
Boolean(data?.dataset?.bulkUsagesHasNext?.length),
48-
Boolean(data?.dataset?.bulkUsagesHasNextNext?.length)
47+
Boolean(data?.bulkSliceiceHasNext?.length),
48+
Boolean(data?.bulkSliceiceHasNextNext?.length)
4949
);
5050

51-
const formattedTask =
52-
tasks?.map((task) => ({
53-
...task,
54-
destination: `/task/${task.taskid}`,
55-
})) ?? [];
51+
const formattedBulkDeal =
52+
bulkDeals
53+
?.filter((bulkDeal) => bulkDeal !== undefined)
54+
.map((bulkDeal) => ({
55+
...bulkDeal,
56+
destination: `/bulkDeal/${bulkDeal!.dealid}`,
57+
})) ?? [];
5658

5759
return {
58-
data: formattedTask,
60+
data: formattedBulkDeal,
5961
isLoading,
6062
isRefetching,
6163
isError,
@@ -64,7 +66,7 @@ function useDatasetTasksData({
6466
};
6567
}
6668

67-
export function DatasetTasksTable({
69+
export function DatasetBulkDealsTable({
6870
datasetId,
6971
setLoading,
7072
setOutdated,
@@ -73,31 +75,31 @@ export function DatasetTasksTable({
7375
setLoading: (loading: boolean) => void;
7476
setOutdated: (outdated: boolean) => void;
7577
}) {
76-
const [currentPage, setCurrentPage] = usePageParam('datasetTasksPage');
78+
const [currentPage, setCurrentPage] = usePageParam('datasetBulkDealsPage');
7779
const {
78-
data: tasks,
80+
data: bulkDeals,
7981
isError,
8082
isLoading,
8183
isRefetching,
8284
additionalPages,
8385
hasPastError,
84-
} = useDatasetTasksData({ datasetId, currentPage: currentPage - 1 });
86+
} = useDatasetBulkDealsData({ datasetId, currentPage: currentPage - 1 });
8587

8688
useEffect(
8789
() => setLoading(isLoading || isRefetching),
8890
[isLoading, isRefetching, setLoading]
8991
);
9092
useEffect(
91-
() => setOutdated(tasks.length > 0 && isError),
92-
[tasks.length, isError, setOutdated]
93+
() => setOutdated(bulkDeals.length > 0 && isError),
94+
[bulkDeals.length, isError, setOutdated]
9395
);
9496

9597
return (
9698
<div className="space-y-6">
97-
{hasPastError && !tasks.length ? (
98-
<ErrorAlert message="An error occurred during dataset tasks loading." />
99+
{hasPastError && !bulkDeals.length ? (
100+
<ErrorAlert message="An error occurred during dataset bulkDeals loading." />
99101
) : (
100-
<DataTable columns={columns} data={tasks} />
102+
<DataTable columns={columns} data={bulkDeals} />
101103
)}
102104
<PaginatedNavigation
103105
currentPage={currentPage}

‎src/modules/datasets/dataset/datasetBulkDealsQuery.ts‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
import { graphql } from '@/graphql/poco/gql';
2+
3+
export const datasetBulkDealsQuery = graphql(`
4+
query DatasetBulkDeals(
5+
$datasetId: ID!
6+
$length: Int!
7+
$skip: Int!
8+
$nextSkip: Int!
9+
$nextNextSkip: Int!
10+
) {
11+
bulkSliceice(
12+
first: $length
13+
skip: $skip
14+
where: { datasets_: { id: $datasetId } }
15+
orderBy: task__timestamp
16+
orderDirection: desc
17+
) {
18+
task {
19+
deal {
20+
dealid: id
21+
timestamp
22+
requester {
23+
address: id
24+
}
25+
beneficiary {
26+
address: id
27+
}
28+
callback {
29+
address: id
30+
}
31+
app {
32+
address: id
33+
name
34+
}
35+
dataset {
36+
address: id
37+
name
38+
}
39+
workerpool {
40+
address: id
41+
description
42+
}
43+
category {
44+
catid: id
45+
workClockTimeRef
46+
}
47+
bulk {
48+
id
49+
}
50+
startTime
51+
appPrice
52+
datasetPrice
53+
workerpoolPrice
54+
botSize
55+
trust
56+
completedTasksCount
57+
claimedTasksCount
58+
}
59+
}
60+
}
61+
bulkSliceiceHasNext: bulkSliceice(
62+
first: 1
63+
skip: $nextSkip
64+
orderBy: task__timestamp
65+
orderDirection: desc
66+
) {
67+
task {
68+
deal {
69+
id
70+
}
71+
}
72+
}
73+
bulkSliceiceHasNextNext: bulkSliceice(
74+
first: 1
75+
skip: $nextNextSkip
76+
orderBy: task__timestamp
77+
orderDirection: desc
78+
) {
79+
task {
80+
deal {
81+
id
82+
}
83+
}
84+
}
85+
}
86+
`);

‎src/modules/datasets/dataset/datasetTasksQuery.ts‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/routes/$chainSlug/_layout/dataset/$datasetAddress.tsx‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import { ErrorAlert } from '@/modules/ErrorAlert';
1414
import { Tabs } from '@/modules/Tabs';
1515
import { DatasetAccessTable } from '@/modules/datasets/dataset/DatasetAccessTable';
1616
import { DatasetBreadcrumbs } from '@/modules/datasets/dataset/DatasetBreadcrumbs';
17+
import { DatasetBulkDealsTable } from '@/modules/datasets/dataset/DatasetBulkDealsTable';
1718
import { DatasetDealsTable } from '@/modules/datasets/dataset/DatasetDealsTable';
18-
import { DatasetTasksTable } from '@/modules/datasets/dataset/DatasetTasksTable';
1919
import { buildDatasetDetails } from '@/modules/datasets/dataset/buildDatasetDetails';
2020
import { datasetQuery } from '@/modules/datasets/dataset/datasetQuery';
2121
import { datasetSchemaQuery } from '@/modules/datasets/dataset/schema/datasetSchemaDpQuery';
@@ -91,7 +91,7 @@ function useDatasetData(datasetAddress: string, chainId: number) {
9191
}
9292

9393
function DatasetsRoute() {
94-
const tabLabels = ['DETAILS', 'DEALS', 'TASKS', 'ACCESS'];
94+
const tabLabels = ['DETAILS', 'DEALS', 'ACCESS'];
9595
const [currentTab, setCurrentTab] = useTabParam('datasetTab', tabLabels, 0);
9696
const { chainId } = useUserStore();
9797

@@ -161,20 +161,26 @@ function DatasetsRoute() {
161161
<DetailsTable details={datasetDetails || {}} zebra={false} />
162162
))}
163163
{currentTab === 1 && (
164-
<DatasetDealsTable
165-
datasetAddress={datasetAddress}
166-
setLoading={setIsLoadingChild}
167-
setOutdated={setIsOutdatedChild}
168-
/>
164+
<>
165+
<h2 className="flex items-center gap-2 font-extrabold">
166+
Latest deals
167+
</h2>
168+
<DatasetDealsTable
169+
datasetAddress={datasetAddress}
170+
setLoading={setIsLoadingChild}
171+
setOutdated={setIsOutdatedChild}
172+
/>
173+
<h2 className="flex items-center gap-2 font-extrabold">
174+
Latest bulk deals
175+
</h2>
176+
<DatasetBulkDealsTable
177+
datasetId={datasetAddress}
178+
setLoading={setIsLoadingChild}
179+
setOutdated={setIsOutdatedChild}
180+
/>
181+
</>
169182
)}
170183
{currentTab === 2 && (
171-
<DatasetTasksTable
172-
datasetId={datasetAddress}
173-
setLoading={setIsLoadingChild}
174-
setOutdated={setIsOutdatedChild}
175-
/>
176-
)}
177-
{currentTab === 3 && (
178184
<DatasetAccessTable
179185
datasetAddress={datasetAddress}
180186
setLoading={setIsLoadingChild}

0 commit comments

Comments
 (0)