Skip to content

Commit 685ed1b

Browse files
authored
Merge pull request #1204 from topcoder-platform/pm-1614
fix(PM-1614): add white space below copilot request table
2 parents 750aafe + f1bcccd commit 685ed1b

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

src/apps/copilots/src/pages/copilot-requests/CopilotRequestsPage.module.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
@import '@libs/ui/styles/includes';
22

3+
.shortPage {
4+
margin-bottom: 250px;
5+
}
6+
7+
.tableWrapper {
8+
margin-bottom: 60px;
9+
}
10+
311
.actionButtons {
412
display: flex;
513
gap: $sp-1;

src/apps/copilots/src/pages/copilot-requests/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ const CopilotRequestsPage: FC = () => {
153153
isValidating: requestsLoading,
154154
hasMoreCopilotRequests,
155155
setSize,
156-
size }: CopilotRequestsResponse = useCopilotRequests(sort)
156+
size,
157+
page,
158+
}: CopilotRequestsResponse = useCopilotRequests(sort)
157159

158160
const viewRequestDetails = useMemo(() => (
159161
routeParams.requestId && find(requests, { id: +routeParams.requestId }) as CopilotRequest
@@ -265,6 +267,7 @@ const CopilotRequestsPage: FC = () => {
265267
>
266268
<PageTitle>Copilot Requests</PageTitle>
267269
<Table
270+
className={(page === 1 && tableData.length < 10) ? styles.shortPage : styles.tableWrapper}
268271
columns={tableColumns}
269272
data={tableData}
270273
moreToLoad={hasMoreCopilotRequests}

src/apps/copilots/src/services/copilot-requests.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export type CopilotRequestsResponse = {
3737
isValidating: boolean;
3838
size: number;
3939
setSize: (size: number) => void;
40+
page: number;
4041
}
4142

4243
/**
@@ -77,7 +78,14 @@ export const useCopilotRequests = (sort: Sort, projectId?: string): CopilotReque
7778
const copilotRequests = data.flatMap(page => page.data)
7879
const hasMoreCopilotRequests = latestPage.page + 1 < latestPage.totalPages
7980

80-
return { data: copilotRequests, hasMoreCopilotRequests, isValidating, setSize: (s: number) => { setSize(s) }, size }
81+
return {
82+
data: copilotRequests,
83+
hasMoreCopilotRequests,
84+
isValidating,
85+
page: latestPage.page,
86+
setSize: (s: number) => { setSize(s) },
87+
size,
88+
}
8189
}
8290

8391
export type CopilotRequestResponse = SWRResponse<CopilotRequest, CopilotRequest>

0 commit comments

Comments
 (0)