✨ feat(deepsource): fix async issues

dashpresshq · Nov 30, 2024 · ec8e8de · ec8e8de
1 parent 14f6cb6
commit ec8e8de
Show file tree

Hide file tree

Showing 15 changed files with 174 additions and 25 deletions.
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -4,7 +4,7 @@ module.exports = {
   // stories: ['../**/*.stories.@(ts|tsx|js|jsx)'],
   addons: ["@storybook/addon-links", "@storybook/addon-essentials"],
   // https://storybook.js.org/docs/react/configure/typescript#mainjs-configuration,
-  webpackFinal: async (config, { configType }) => {
+  webpackFinal: async (config) => {
     const assetRule = config.module.rules.find(({ test }) => test.test(".svg"));
     // exclude svg from the default storybook file-loader
     assetRule.exclude = /\.svg$/;

diff --git a/scripts/ci/check-file-segments.js b/scripts/ci/check-file-segments.js
@@ -38,9 +38,7 @@ for (const fileName of files) {
 }
 
 if (errors.length > 0) {
-  console.error(`${errors.length} files not placed in the correct folders`);
-
   console.error(errors.join(","));
 
-  process.exit(1);
+  throw new Error(`${errors.length} files not placed in the correct folders`);
 }
diff --git a/src/__tests__/_/api/setups/_all.ts b/src/__tests__/_/api/setups/_all.ts
@@ -35,7 +35,7 @@ export const setupAllTestData = async (domains: DomainTypes[]) => {
     ...portalTestData,
   ];
 
-  createCacheService().purge();
+  await createCacheService().purge();
 
   await Promise.all(
     allTestData

diff --git a/src/__tests__/account/password.spec.tsx b/src/__tests__/account/password.spec.tsx
@@ -69,6 +69,8 @@ describe("pages/account/password", () => {
       "New Password"
     );
 
+    await closeAllToasts();
+
     await userEvent.click(
       screen.getByRole("button", { name: "Update Password" })
     );

diff --git a/src/__tests__/admin/settings/data.spec.tsx b/src/__tests__/admin/settings/data.spec.tsx
@@ -46,11 +46,9 @@ describe("pages/admin/settings/data", () => {
       expect(await getToastMessage()).toBe(
         "Metadata Columns Saved Successfully"
       );
-
-      await closeAllToasts();
     });
 
-    it("should display updated date values", async () => {
+    it("should display updated metatacolumns values", async () => {
       render(
         <TestProviders>
           <GeneralDataSettings />
@@ -86,6 +84,8 @@ describe("pages/admin/settings/data", () => {
         </TestProviders>
       );
 
+      await closeAllToasts();
+
       await userEvent.clear(screen.getByLabelText("Format"));
 
       await userEvent.type(screen.getByLabelText("Format"), "yyyy MMM do");
@@ -127,6 +127,8 @@ describe("pages/admin/settings/data", () => {
         expect(await getToastMessage()).toBe(
           `Invalid Date FormatPlease go to https://date-fns.org/docs/format to see valid formats`
         );
+
+        await closeAllToasts();
       });
 
       it("should show date format", async () => {

diff --git a/src/__tests__/api/integrations/storage/active.spec.ts b/src/__tests__/api/integrations/storage/active.spec.ts
@@ -8,7 +8,7 @@ describe("/api/integrations/actions/[key]/index", () => {
     const currentStorageKeyValueStoreApiService =
       createKeyValueDomainPersistenceService<string>("current-storage");
 
-    currentStorageKeyValueStoreApiService.clearItem();
+    await currentStorageKeyValueStoreApiService.clearItem();
 
     await setupAllTestData(["users", "credentials"]);
   });

diff --git a/src/__tests__/api/integrations/storage/credentials.spec.ts b/src/__tests__/api/integrations/storage/credentials.spec.ts
@@ -11,7 +11,7 @@ describe("/api/integrations/storage/[key]/credentials", () => {
     const currentStorageKeyValueStoreApiService =
       createKeyValueDomainPersistenceService<string>("current-storage");
 
-    currentStorageKeyValueStoreApiService.persistItem("s3");
+    await currentStorageKeyValueStoreApiService.persistItem("s3");
 
     await setupAllTestData(["users"]);
     await setupCredentialsTestData({

diff --git a/src/__tests__/api/integrations/storage/list.spec.ts b/src/__tests__/api/integrations/storage/list.spec.ts
@@ -53,6 +53,60 @@ describe("/api/integrations/storage/list", () => {
           "key": "s3",
           "title": "AWS S3",
         },
+        {
+          "configurationSchema": {
+            "accessKey": {
+              "label": {
+                "id": "5k6ZTK",
+                "message": "Access Key",
+              },
+              "type": "text",
+              "validations": [
+                {
+                  "validationType": "required",
+                },
+              ],
+            },
+            "endpoint": {
+              "label": {
+                "id": "FCKppt",
+                "message": "Endpoint",
+              },
+              "type": "text",
+              "validations": [
+                {
+                  "validationType": "required",
+                },
+              ],
+            },
+            "port": {
+              "label": {
+                "id": "hZ6znB",
+                "message": "Port",
+              },
+              "type": "text",
+              "validations": [
+                {
+                  "validationType": "required",
+                },
+              ],
+            },
+            "secretKey": {
+              "label": {
+                "id": "E7bgrN",
+                "message": "Secret Key",
+              },
+              "type": "text",
+              "validations": [
+                {
+                  "validationType": "required",
+                },
+              ],
+            },
+          },
+          "key": "minio",
+          "title": "Minio",
+        },
         {
           "configurationSchema": {
             "apiKey": {

diff --git a/src/__tests__/integrations/variables__credentials.spec.tsx b/src/__tests__/integrations/variables__credentials.spec.tsx
@@ -1,7 +1,9 @@
 /* eslint-disable prettier/prettier */
 
 import { render, screen, waitFor, within } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
+import userEvent, {
+  PointerEventsCheckLevel,
+} from "@testing-library/user-event";
 
 import { AuthActions } from "@/frontend/hooks/auth/auth.actions";
 import ManageVariables from "@/pages/admin/settings/variables";
@@ -301,18 +303,32 @@ describe("pages/integrations/variables => credentials", () => {
         )
       );
 
-      const dialog = await screen.findByRole("dialog");
+      const dialog = await screen.findByRole(
+        "dialog",
+        {},
+        {
+          timeout: 10000,
+        }
+      );
 
       expect(within(dialog).getByText("Create Secret")).toBeInTheDocument();
 
-      await userEvent.type(within(dialog).getByLabelText("Key"), "NEW_SECRET");
+      await userEvent.type(within(dialog).getByLabelText("Key"), "NEW_SECRET", {
+        pointerEventsCheck: PointerEventsCheckLevel.Never,
+      });
       await userEvent.type(
         within(dialog).getByLabelText("Value"),
-        "new secret"
+        "new secret",
+        {
+          pointerEventsCheck: PointerEventsCheckLevel.Never,
+        }
       );
 
       await userEvent.click(
-        within(dialog).getByRole("button", { name: "Create Secret" })
+        within(dialog).getByRole("button", { name: "Create Secret" }),
+        {
+          pointerEventsCheck: PointerEventsCheckLevel.Never,
+        }
       );
 
       expect(await getToastMessage()).toBe("Secret Saved Successfully");
@@ -376,10 +392,17 @@ describe("pages/integrations/variables => credentials", () => {
 
       expect(within(dialog).getByLabelText("Key")).toBeDisabled();
 
-      await userEvent.type(within(dialog).getByLabelText("Value"), "__updated");
+      await userEvent.type(
+        within(dialog).getByLabelText("Value"),
+        "__updated",
+        {
+          pointerEventsCheck: PointerEventsCheckLevel.Never,
+        }
+      );
 
       await userEvent.click(
-        within(dialog).getByRole("button", { name: "Update Secret" })
+        within(dialog).getByRole("button", { name: "Update Secret" }),
+        { pointerEventsCheck: PointerEventsCheckLevel.Never }
       );
 
       expect(await getToastMessage()).toBe("Secret Saved Successfully");

diff --git a/src/backend/lib/request/validations/implementations/__tests__/authenticated-user.spec.ts b/src/backend/lib/request/validations/implementations/__tests__/authenticated-user.spec.ts
@@ -10,8 +10,8 @@ const handler = requestHandler({
 });
 
 describe("Request Validations => authenticatedUserValidationImpl", () => {
-  beforeAll(() => {
-    setupAllTestData(["users"]);
+  beforeAll(async () => {
+    await setupAllTestData(["users"]);
   });
 
   it("should return authenticated user", async () => {

diff --git a/src/backend/lib/temp-storage/index.ts b/src/backend/lib/temp-storage/index.ts
@@ -30,7 +30,7 @@ export class TempStorageApiService {
       return null;
     }
     if (isBefore(new Date(data.expiryDate), new Date())) {
-      this.clearItem(key);
+      await this.clearItem(key);
       return null;
     }
     return JSON.parse(data.data) as T;

diff --git a/src/frontend/components/app/table/filters/__tests__/index.spec.tsx b/src/frontend/components/app/table/filters/__tests__/index.spec.tsx
@@ -90,7 +90,9 @@ describe("Table Filters", () => {
         });
       });
 
-      await user.selectOptions(screen.getByRole("combobox"), "Equal");
+      await user.click(screen.getByRole("combobox"));
+
+      await user.click(screen.getByRole("option", { name: "Equal" }));
 
       await waitFor(() => {
         expect(setFilterValueJestFn).toHaveBeenLastCalledWith({
@@ -254,6 +256,8 @@ describe("Table Filters", () => {
         screen.getByRole("button", { name: "Filter Test Column By Id" })
       );
 
+      await user.click(screen.getByRole("combobox"));
+
       expect(
         screen
           .getAllByRole("option", { hidden: true })
@@ -272,7 +276,13 @@ describe("Table Filters", () => {
         screen.getByRole("button", { name: "Filter Test Column By Id" })
       );
 
-      await userEvent.type(screen.getByPlaceholderText("Enter value"), "12345");
+      await userEvent.type(
+        screen.getByPlaceholderText("Enter value"),
+        "12345",
+        {
+          pointerEventsCheck: PointerEventsCheckLevel.Never,
+        }
+      );
 
       await waitFor(() => {
         expect(setFilterValueJestFn).toHaveBeenLastCalledWith({
@@ -305,7 +315,9 @@ describe("Table Filters", () => {
 
       expect(screen.getByPlaceholderText("Enter value")).toHaveValue("789");
 
-      await userEvent.type(screen.getByPlaceholderText("Enter value"), "0");
+      await userEvent.type(screen.getByPlaceholderText("Enter value"), "0", {
+        pointerEventsCheck: PointerEventsCheckLevel.Never,
+      });
 
       await waitFor(() => {
         expect(setFilterValueJestFn).toHaveBeenLastCalledWith({
@@ -338,6 +350,8 @@ describe("Table Filters", () => {
         screen.getByRole("button", { name: "Filter Test Column By Boolean" })
       );
 
+      await user.click(screen.getByRole("combobox"));
+
       expect(screen.getAllByRole("option").map((option) => option.textContent))
         .toMatchInlineSnapshot(`
         [
@@ -456,6 +470,8 @@ describe("Table Filters", () => {
         screen.getByRole("button", { name: "Filter Test Column By Status" })
       );
 
+      await user.click(screen.getAllByRole("combobox")[0]);
+
       expect(screen.getAllByRole("option").map((option) => option.textContent))
         .toMatchInlineSnapshot(`
         [

diff --git a/src/frontend/lib/data/useMutate/types.ts → src/frontend/lib/data/useMutate/types.d.ts b/src/frontend/lib/data/useMutate/types.ts → src/frontend/lib/data/useMutate/types.d.ts
diff --git a/src/frontend/views/errors/index.spec.tsx b/src/frontend/views/errors/index.spec.tsx
@@ -0,0 +1,54 @@
+import { render, screen } from "@testing-library/react";
+
+import { USE_ROUTER_PARAMS } from "@/tests/constants";
+import { TestProviders } from "@/tests/Provider";
+
+import { NotFound } from "./NotFound";
+import { ServerError } from "./ServerError";
+import { UnAuthorized } from "./UnAuthorized";
+
+describe("Error pages", () => {
+  beforeAll(() => {
+    const useRouter = jest.spyOn(require("next/router"), "useRouter");
+    useRouter.mockImplementation(USE_ROUTER_PARAMS({}));
+  });
+
+  it("renders the 500 error page", () => {
+    render(
+      <TestProviders>
+        <ServerError />
+      </TestProviders>
+    );
+
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("500");
+    expect(screen.getByRole("heading", { level: 3 })).toHaveTextContent(
+      "Internal Server Error"
+    );
+  });
+
+  it("renders the 403 error page", () => {
+    render(
+      <TestProviders>
+        <UnAuthorized />
+      </TestProviders>
+    );
+
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("403");
+    expect(screen.getByRole("heading", { level: 3 })).toHaveTextContent(
+      "Unauthorized"
+    );
+  });
+
+  it("renders the 404 error page", () => {
+    render(
+      <TestProviders>
+        <NotFound />
+      </TestProviders>
+    );
+
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("404");
+    expect(screen.getByRole("heading", { level: 3 })).toHaveTextContent(
+      "Page Not Found"
+    );
+  });
+});
diff --git a/src/frontend/views/settings/Entities/Selection.tsx b/src/frontend/views/settings/Entities/Selection.tsx
@@ -58,8 +58,8 @@ export function EntitiesSelection({
           ? {
               orderList: sort.order,
               key: "name",
-              on: (newOrder) => {
-                sort.save(newOrder);
+              on: async (newOrder) => {
+                await sort.save(newOrder);
               },
             }
           : undefined