Format

presleyp · presleyp · commit 953428baa291 · 2022-10-27T17:11:51.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -270,7 +270,7 @@ interface SearchParamOptions extends TypesGen.Pagination {
 
 export const getURLWithSearchParams = (
   basePath: string,
-  options?: SearchParamOptions
+  options?: SearchParamOptions,
 ): string => {
   if (options) {
     const searchParams = new URLSearchParams()
diff --git a/site/src/components/PaginationWidget/PaginationWidget.tsx b/site/src/components/PaginationWidget/PaginationWidget.tsx
@@ -34,12 +34,14 @@ export const PaginationWidget = ({
   const currentPage = paginationState.context.page
   const numRecordsPerPage = paginationState.context.limit
 
-  const numPages = numRecords ? Math.ceil(numRecords / numRecordsPerPage) : undefined
+  const numPages = numRecords
+    ? Math.ceil(numRecords / numRecordsPerPage)
+    : undefined
   const firstPageActive = currentPage === 1 && numPages !== 0
   const lastPageActive = currentPage === numPages && numPages !== 0
 
   // No need to display any pagination if we know the number of pages is 1 or 0
-  if (numPages && numPages <= 1 || numRecords === 0) {
+  if ((numPages && numPages <= 1) || numRecords === 0) {
     return null
   }
 
@@ -64,24 +66,25 @@ export const PaginationWidget = ({
             />
           </Cond>
           <Cond>
-            {numPages && buildPagedList(numPages, currentPage).map((page) =>
-              typeof page !== "number" ? (
-                <PageButton
-                  key={`Page${page}`}
-                  activePage={currentPage}
-                  placeholder="..."
-                  disabled
-                />
-              ) : (
-                <PageButton
-                  key={`Page${page}`}
-                  activePage={currentPage}
-                  page={page}
-                  numPages={numPages}
-                  onPageClick={() => send({ type: "GO_TO_PAGE", page })}
-                />
-              ),
-            )}
+            {numPages &&
+              buildPagedList(numPages, currentPage).map((page) =>
+                typeof page !== "number" ? (
+                  <PageButton
+                    key={`Page${page}`}
+                    activePage={currentPage}
+                    placeholder="..."
+                    disabled
+                  />
+                ) : (
+                  <PageButton
+                    key={`Page${page}`}
+                    activePage={currentPage}
+                    page={page}
+                    numPages={numPages}
+                    onPageClick={() => send({ type: "GO_TO_PAGE", page })}
+                  />
+                ),
+              )}
           </Cond>
         </ChooseOne>
       </Maybe>
diff --git a/site/src/pages/UsersPage/UsersPage.test.tsx b/site/src/pages/UsersPage/UsersPage.test.tsx
@@ -197,8 +197,6 @@ describe("UsersPage", () => {
     expect(users.length).toEqual(3)
   })
 
-
-
   describe("suspend user", () => {
     describe("when it is success", () => {
       it("shows a success message and refresh the page", async () => {
@@ -252,13 +250,17 @@ describe("UsersPage", () => {
       const nextButton = await screen.findByLabelText("Next page")
       await user.click(nextButton)
 
-      await waitFor(() => expect(API.getUsers).toBeCalledWith({ offset: 25, limit: 25, q: "" }))
+      await waitFor(() =>
+        expect(API.getUsers).toBeCalledWith({ offset: 25, limit: 25, q: "" }),
+      )
 
       mock.mockClear()
       const previousButton = await screen.findByLabelText("Previous page")
       await user.click(previousButton)
 
-      await waitFor(() => expect(API.getUsers).toBeCalledWith({ offset: 0, limit: 25, q: "" }))
+      await waitFor(() =>
+        expect(API.getUsers).toBeCalledWith({ offset: 0, limit: 25, q: "" }),
+      )
     })
   })
 
diff --git a/site/src/pages/UsersPage/UsersPageView.stories.tsx b/site/src/pages/UsersPage/UsersPageView.stories.tsx
@@ -12,9 +12,9 @@ export default {
   component: UsersPageView,
   argTypes: {
     paginationRef: {
-      defaultValue: createPaginationRef({ page: 1, limit: 25 })
-    }
-  }
+      defaultValue: createPaginationRef({ page: 1, limit: 25 }),
+    },
+  },
 } as ComponentMeta<typeof UsersPageView>
 
 const Template: Story<UsersPageViewProps> = (args) => (
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -61,7 +61,10 @@ export function assignableRole(
 }
 
 export const MockSiteRoles = [MockUserAdminRole, MockAuditorRole]
-export const MockAssignableSiteRoles = [assignableRole(MockUserAdminRole, true), assignableRole(MockAuditorRole, true)]
+export const MockAssignableSiteRoles = [
+  assignableRole(MockUserAdminRole, true),
+  assignableRole(MockAuditorRole, true),
+]
 
 export const MockMemberPermissions = {
   viewAuditLog: false,
