refactor code

AbhineetJain · AbhineetJain · commit 4717f84ac802 · 2022-06-28T07:43:08.000Z
diff --git a/site/src/api/api.test.ts b/site/src/api/api.test.ts
@@ -114,18 +114,25 @@ describe("api.ts", () => {
     })
   })
 
-  describe("getURLWithSearchParams", () => {
-    it.each<[string, TypesGen.WorkspaceFilter | TypesGen.UsersRequest | undefined, string]>([
+  describe("getURLWithSearchParams - workspaces", () => {
+    it.each<[string, TypesGen.WorkspaceFilter | undefined, string]>([
       ["/api/v2/workspaces", undefined, "/api/v2/workspaces"],
 
       ["/api/v2/workspaces", { q: "" }, "/api/v2/workspaces"],
       ["/api/v2/workspaces", { q: "owner:1" }, "/api/v2/workspaces?q=owner%3A1"],
 
       ["/api/v2/workspaces", { q: "owner:me" }, "/api/v2/workspaces?q=owner%3Ame"],
+    ])(`Workspaces - getURLWithSearchParams(%p, %p) returns %p`, (basePath, filter, expected) => {
+      expect(getURLWithSearchParams(basePath, filter)).toBe(expected)
+    })
+  })
 
+  describe("getURLWithSearchParams - users", () => {
+    it.each<[string, TypesGen.UsersRequest | undefined, string]>([
+      ["/api/v2/users", undefined, "/api/v2/users"],
       ["/api/v2/users", { q: "status:active" }, "/api/v2/users?q=status%3Aactive"],
       ["/api/v2/users", { q: "" }, "/api/v2/users"],
-    ])(`getURLWithSearchParams(%p) returns %p`, (basePath, filter, expected) => {
+    ])(`Users - getURLWithSearchParams(%p, %p) returns %p`, (basePath, filter, expected) => {
       expect(getURLWithSearchParams(basePath, filter)).toBe(expected)
     })
   })
diff --git a/site/src/api/errors.ts b/site/src/api/errors.ts
@@ -72,6 +72,12 @@ export const getErrorMessage = (
     ? error.message
     : defaultMessage
 
+/**
+ *
+ * @param error
+ * @returns a combined validation error message if the error is an ApiError
+ * and contains validation messages for different form fields.
+ */
 export const getValidationErrorMessage = (error: Error | ApiError | unknown): string => {
   const validationErrors =
     isApiError(error) && error.response.data.validations ? error.response.data.validations : []
diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx
@@ -50,7 +50,7 @@ export const UsersPage: React.FC = () => {
   // Fetch users on component mount
   useEffect(() => {
     const filter = searchParams.get("filter")
-    const query = filter !== null ? filter : userFilterQuery.active
+    const query = filter ?? userFilterQuery.active
     usersSend({
       type: "GET_USERS",
       query,
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -14,7 +14,7 @@ const WorkspacesPage: FC = () => {
 
   useEffect(() => {
     const filter = searchParams.get("filter")
-    const query = filter !== null ? filter : workspaceFilterQuery.me
+    const query = filter ?? workspaceFilterQuery.me
 
     send({
       type: "GET_WORKSPACES",
