Skip to content

Commit d99f149

Browse files
presleyppresleyp
committed
Format
1 parent 36ba04d commit d99f149

File tree

6 files changed

+178
-172
lines changed

6 files changed

+178
-172
lines changed

‎site/src/components/PaginationWidget/PaginationWidget.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import { CSSProperties } from "react"
1010
import { useSearchParams } from "react-router-dom"
1111
import { PaginationMachineRef } from "xServices/pagination/paginationXService"
1212
import { PageButton } from "./PageButton"
13-
import {
14-
buildPagedList,
15-
getInitialPage,
16-
} from "./utils"
13+
import { buildPagedList, getInitialPage } from "./utils"
1714

1815
export type PaginationWidgetProps = {
1916
prevLabel?: string
@@ -24,8 +21,8 @@ export type PaginationWidgetProps = {
2421
}
2522

2623
export const PaginationWidget = ({
27-
prevLabel="",
28-
nextLabel="",
24+
prevLabel = "",
25+
nextLabel = "",
2926
numRecords,
3027
containerStyle,
3128
paginationRef,

‎site/src/components/PaginationWidget/utils.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { PaginationContext, PaginationMachineRef } from "xServices/pagination/paginationXService"
1+
import {
2+
PaginationContext,
3+
PaginationMachineRef,
4+
} from "xServices/pagination/paginationXService"
25

36
/**
47
* Generates a ranged array with an option to step over values.
@@ -82,8 +85,12 @@ export const getPaginationData = (
8285
}
8386
}
8487

85-
export const getPaginationContext = (searchParams: URLSearchParams, setSearchParams: ({ page }: { page: string }) => void, limit=DEFAULT_RECORDS_PER_PAGE): PaginationContext => ({
88+
export const getPaginationContext = (
89+
searchParams: URLSearchParams,
90+
setSearchParams: ({ page }: { page: string }) => void,
91+
limit = DEFAULT_RECORDS_PER_PAGE,
92+
): PaginationContext => ({
8693
page: getInitialPage(searchParams.get("page")),
8794
limit,
88-
updateURL: (page) => setSearchParams({ page: page.toString() })
95+
updateURL: (page) => setSearchParams({ page: page.toString() }),
8996
})

‎site/src/pages/WorkspacesPage/WorkspacesPage.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import { useSearchParams } from "react-router-dom"
66
import { workspaceFilterQuery } from "util/filters"
77
import { pageTitle } from "util/page"
88
import { PaginationMachineRef } from "xServices/pagination/paginationXService"
9-
import {
10-
workspacesMachine,
11-
} from "xServices/workspaces/workspacesXService"
9+
import { workspacesMachine } from "xServices/workspaces/workspacesXService"
1210
import { WorkspacesPageView } from "./WorkspacesPageView"
1311

1412
const WorkspacesPage: FC = () => {
@@ -17,13 +15,14 @@ const WorkspacesPage: FC = () => {
1715
const [workspacesState, send] = useMachine(workspacesMachine, {
1816
context: {
1917
filter,
20-
paginationContext: getPaginationContext(searchParams, setSearchParams)
18+
paginationContext: getPaginationContext(searchParams, setSearchParams),
2119
},
2220
})
2321

2422
const { workspaceRefs, count, getWorkspacesError, getCountError } =
2523
workspacesState.context
26-
const paginationRef = workspacesState.context.paginationRef as PaginationMachineRef
24+
const paginationRef = workspacesState.context
25+
.paginationRef as PaginationMachineRef
2726

2827
return (
2928
<>

‎site/src/pages/WorkspacesPage/WorkspacesPageView.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,7 @@ export const WorkspacesPageView: FC<
107107
filter={filter}
108108
/>
109109

110-
<PaginationWidget
111-
numRecords={count}
112-
paginationRef={paginationRef}
113-
/>
110+
<PaginationWidget numRecords={count} paginationRef={paginationRef} />
114111
</Margins>
115112
)
116113
}

‎site/src/xServices/pagination/paginationXService.ts

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,53 @@ export type PaginationEvent =
1515
export type PaginationMachineRef = ActorRefFrom<typeof paginationMachine>
1616

1717
export const paginationMachine =
18-
/** @xstate-layout N4IgpgJg5mDOIC5QAcCGUCWA7VAXDA9lgLKoDGAFtmAMQByAogBoAqA+gAoCCA4gwNoAGALqIUBWBnxExIAB6IATADZBAOgAcGgCwBWDYMEHBAdm2KANCACeiEwEZ7axboCcbkw8-3XGgL5+VmiYONIk5FRYtBwASgwAagCSAPIAqgDKnLwCIrLIElKEWLIKCAC09hrKarq6AMwarsraGormuiYaVrYIDk4u7q7e3r4BQejYeEWklNQ0PMlsLIvcfEKiSCD5kmElduq69vrKyiaCjqfu3YgauupatYp1eia+o4FbE6HTEXNx6Qx2KschtxDsintyvZqlVzmdGs0tIpbtcENplIoanV7M8jrpFCZntoAh8sAQIHA8l8pkQZpEwGoAE5gVAQHpgwoyTalZSuNTuV6CFzabSCFqdVFmdTPMU+dHnZrKMafEI08KzKJ5Aq7blKJwC1xC3QisUaCU2RDKQ5qGXaOWqaHokl+IA */
19-
createMachine(
20-
{
21-
tsTypes: {} as import("./paginationXService.typegen").Typegen0,
22-
schema: { context: {} as PaginationContext, events: {} as PaginationEvent },
23-
predictableActionArguments: true,
24-
id: "paginationMachine",
25-
initial: "ready",
26-
on: {
27-
NEXT_PAGE: {
28-
actions: ["assignNextPage", "updateURL", "sendRefreshData"],
29-
},
30-
PREVIOUS_PAGE: {
31-
actions: ["assignPreviousPage", "updateURL", "sendRefreshData"],
32-
},
33-
GO_TO_PAGE: {
34-
actions: ["assignPage", "updateURL", "sendRefreshData"],
35-
},
36-
RESET_PAGE: {
37-
actions: ["logReset", "resetPage", "updateURL", "sendRefreshData"],
18+
/** @xstate-layout N4IgpgJg5mDOIC5QAcCGUCWA7VAXDA9lgLKoDGAFtmAMQByAogBoAqA+gAoCCA4gwNoAGALqIUBWBnxExIAB6IATADZBAOgAcGgCwBWDYMEHBAdm2KANCACeiEwEZ7axboCcbkw8-3XGgL5+VmiYONIk5FRYtBwASgwAagCSAPIAqgDKnLwCIrLIElKEWLIKCAC09hrKarq6AMwarsraGormuiYaVrYIDk4u7q7e3r4BQejYeEWklNQ0PMlsLIvcfEKiSCD5kmElduq69vrKyiaCjqfu3YgauupatYp1eia+o4FbE6HTEXNx6Qx2KschtxDsintyvZqlVzmdGs0tIpbtcENplIoanV7M8jrpFCZntoAh8sAQIHA8l8pkQZpEwGoAE5gVAQHpgwoyTalZSuNTuV6CFzabSCFqdVFmdTPMU+dHnZrKMafEI08KzKJ5Aq7blKJwC1xC3QisUaCU2RDKQ5qGXaOWqaHokl+IA */
19+
createMachine(
20+
{
21+
tsTypes: {} as import("./paginationXService.typegen").Typegen0,
22+
schema: {
23+
context: {} as PaginationContext,
24+
events: {} as PaginationEvent,
25+
},
26+
predictableActionArguments: true,
27+
id: "paginationMachine",
28+
initial: "ready",
29+
on: {
30+
NEXT_PAGE: {
31+
actions: ["assignNextPage", "updateURL", "sendRefreshData"],
32+
},
33+
PREVIOUS_PAGE: {
34+
actions: ["assignPreviousPage", "updateURL", "sendRefreshData"],
35+
},
36+
GO_TO_PAGE: {
37+
actions: ["assignPage", "updateURL", "sendRefreshData"],
38+
},
39+
RESET_PAGE: {
40+
actions: ["logReset", "resetPage", "updateURL", "sendRefreshData"],
41+
},
42+
},
43+
states: {
44+
ready: {},
45+
},
3846
},
39-
},
40-
states: {
41-
ready: {},
42-
},
43-
},
44-
{
45-
actions: {
46-
sendRefreshData: (_) => sendParent("REFRESH_DATA"),
47-
assignNextPage: assign({
48-
page: (context) => context.page + 1,
49-
}),
50-
assignPreviousPage: assign({
51-
page: (context) => context.page - 1,
52-
}),
53-
assignPage: assign({
54-
page: (_, event) => event.page,
55-
}),
56-
resetPage: assign({
57-
page: (_) => 1,
58-
}),
59-
updateURL: (context) => {
60-
context.updateURL(context.page)
47+
{
48+
actions: {
49+
sendRefreshData: (_) => sendParent("REFRESH_DATA"),
50+
assignNextPage: assign({
51+
page: (context) => context.page + 1,
52+
}),
53+
assignPreviousPage: assign({
54+
page: (context) => context.page - 1,
55+
}),
56+
assignPage: assign({
57+
page: (_, event) => event.page,
58+
}),
59+
resetPage: assign({
60+
page: (_) => 1,
61+
}),
62+
updateURL: (context) => {
63+
context.updateURL(context.page)
64+
},
6165
},
6266
},
63-
},
64-
)
67+
)

0 commit comments

Comments
 (0)