Merge branch 'master' of github.com:dmm-com/airone into feature/frontend-core-module

Author: syucream

CHANGELOG.md

@@ -8,6 +8,14 @@
 
 ### Fixed
 
+## v3.109.0
+
+### Changed
+* Update duplicate entity name error handling.
+  Contributed by @tsunoda-takahiro
+* Update react-router from v5 to v6.
+  Contributed by @syucream
+
 ## v3.108.0
 
 ### Changed

entity/tests/test_view.py

@@ -1602,3 +1602,26 @@ def side_effect(handler_name, spec_name, entity):
 
         self.assertEqual(resp.status_code, 200)
         self.assertTrue(self._test_data["is_call_custom_called"])
+
+    @mock.patch("entity.tasks.create_entity.delay", mock.Mock(side_effect=tasks.create_entity))
+    def test_try_to_create_duplicate_name_of_entity(self):
+        user = self.admin_login()
+        Entity.objects.create(name="hoge", created_user=user)
+
+        # Set parameters with a duplicate entity name "hoge"
+        params = {
+            "name": "hoge",
+            "note": "",
+            "is_toplevel": False,
+            "attrs": [],
+        }
+
+        resp = self.client.post(
+            reverse("entity:do_create"),
+            json.dumps(params),
+            "application/json",
+        )
+
+        # Check the response is 400 and the content is "Duplicate name entity is existed"
+        self.assertEqual(resp.status_code, 400)
+        self.assertEqual(resp.content.decode("utf-8"), "Duplicate name entity is existed")

entity/views.py

@@ -215,9 +215,7 @@ def do_edit(request, entity_id, recv_data):
             "name": "name",
             "type": str,
             "checker": lambda x: (
-                x["name"]
-                and not Entity.objects.filter(name=x["name"]).exists()
-                and len(x["name"]) <= Entity._meta.get_field("name").max_length
+                x["name"] and len(x["name"]) <= Entity._meta.get_field("name").max_length
             ),
         },
         {"name": "note", "type": str},
@@ -277,6 +275,10 @@ def do_create(request, recv_data):
     if len([v for v, count in counter.items() if count > 1]):
         return HttpResponse("Duplicated attribute names are not allowed", status=400)
 
+    # checks that a same name entity corresponding to the entity is existed, or not.
+    if Entity.objects.filter(name=recv_data["name"], is_active=True).exists():
+        return HttpResponse("Duplicate name entity is existed", status=400)
+
     if custom_view.is_custom("create_entity"):
         resp = custom_view.call_custom("create_entity", None, recv_data["name"], recv_data["attrs"])
         if resp:

frontend/src/ErrorHandler.tsx

@@ -9,7 +9,7 @@ import {
 import { styled } from "@mui/material/styles";
 import React, { FC, useCallback, useEffect, useState } from "react";
 import { ErrorBoundary, FallbackProps } from "react-error-boundary";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { useError } from "react-use";
 
 import { ForbiddenErrorPage } from "./pages/ForbiddenErrorPage";
@@ -96,11 +96,15 @@ const GenericError: FC<GenericErrorProps> = ({ children }) => {
 };
 
 const ErrorFallback: FC<FallbackProps> = ({ error, resetErrorBoundary }) => {
-  const location = useLocation();
-
   useEffect(() => {
-    resetErrorBoundary();
-  }, [location, resetErrorBoundary]);
+    const handlePopState = () => {
+      resetErrorBoundary();
+    };
+    window.addEventListener("popstate", handlePopState);
+    return () => {
+      window.removeEventListener("popstate", handlePopState);
+    };
+  }, [resetErrorBoundary]);
 
   switch (error.name) {
     case ForbiddenError.errorName:

frontend/src/pages/EntityListPage.test.tsx

@@ -2,59 +2,61 @@
  * @jest-environment jsdom
  */
 
-import {
-  render,
-  waitForElementToBeRemoved,
-  screen,
-} from "@testing-library/react";
+import { render, screen, waitFor } from "@testing-library/react";
+import { http, HttpResponse } from "msw";
+import { setupServer } from "msw/node";
 import React from "react";
 
 import { TestWrapper } from "TestWrapper";
 import { EntityListPage } from "pages/EntityListPage";
 
-afterEach(() => {
-  jest.clearAllMocks();
-});
+const server = setupServer(
+  // getEntities
+  http.get("http://localhost/entity/api/v2/", () => {
+    return HttpResponse.json({
+      count: 3,
+      next: null,
+      previous: null,
+      results: [
+        {
+          id: 1,
+          name: "aaa",
+          note: "",
+          is_toplevel: false,
+          attrs: [],
+        },
+        {
+          id: 2,
+          name: "aaaaa",
+          note: "",
+          is_toplevel: false,
+          attrs: [],
+        },
+        {
+          id: 3,
+          name: "bbbbb",
+          note: "",
+          is_toplevel: false,
+          attrs: [],
+        },
+      ],
+    });
+  })
+);
 
-test("should match snapshot", async () => {
-  const entities = [
-    {
-      id: 1,
-      name: "aaa",
-      note: "",
-      isToplevel: false,
-      attrs: [],
-    },
-    {
-      id: 2,
-      name: "aaaaa",
-      note: "",
-      isToplevel: false,
-      attrs: [],
-    },
-    {
-      id: 3,
-      name: "bbbbb",
-      note: "",
-      isToplevel: false,
-      attrs: [],
-    },
-  ];
+beforeAll(() => server.listen());
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
 
-  /* eslint-disable */
-  jest
-    .spyOn(
-      require("../repository/AironeApiClient").aironeApiClient,
-      "getEntities"
-    )
-    .mockResolvedValue(Promise.resolve({ results: entities }));
-  /* eslint-enable */
+describe("EntityListPage", () => {
+  test("should match snapshot", async () => {
+    const result = render(<EntityListPage />, {
+      wrapper: TestWrapper,
+    });
+    await waitFor(() => {
+      expect(screen.queryByTestId("loading")).not.toBeInTheDocument();
+    });
 
-  // wait async calls and get rendered fragment
-  const result = render(<EntityListPage />, {
-    wrapper: TestWrapper,
+    expect(result).toMatchSnapshot();
   });
-  await waitForElementToBeRemoved(screen.getByTestId("loading"));
-
-  expect(result).toMatchSnapshot();
 });

frontend/src/pages/EntryListPage.test.tsx

@@ -2,70 +2,85 @@
  * @jest-environment jsdom
  */
 
-import {
-  render,
-  waitForElementToBeRemoved,
-  screen,
-} from "@testing-library/react";
+import { act, render, screen, waitFor } from "@testing-library/react";
+import { http, HttpResponse } from "msw";
+import { setupServer } from "msw/node";
 import React from "react";
+import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
 import { EntryListPage } from "./EntryListPage";
 
-import { TestWrapper } from "TestWrapper";
+import { entityEntriesPath } from "Routes";
+import { TestWrapperWithoutRoutes } from "TestWrapper";
 
-afterEach(() => {
-  jest.clearAllMocks();
-});
-
-test("should match snapshot", async () => {
-  const entity = {
-    id: 1,
-    name: "aaa",
-    note: "",
-    isToplevel: false,
-    attrs: [],
-  };
-  const entries = [
-    {
+const server = setupServer(
+  // getEntity
+  http.get("http://localhost/entity/api/v2/1", () => {
+    return HttpResponse.json({
       id: 1,
       name: "aaa",
-      schema: null,
-      isActive: true,
-    },
-    {
-      id: 2,
-      name: "aaaaa",
-      schema: null,
-      isActive: true,
-    },
-    {
-      id: 3,
-      name: "bbbbb",
-      schema: null,
-      isActive: true,
-    },
-  ];
+      note: "",
+      is_toplevel: false,
+      attrs: [],
+      webhooks: [],
+    });
+  }),
+  // getEntries
+  http.get("http://localhost/entity/api/v2/1/entries/", () => {
+    return HttpResponse.json({
+      count: 2,
+      next: null,
+      previous: null,
+      results: [
+        {
+          id: 1,
+          name: "aaa",
+          schema: null,
+          is_active: true,
+        },
+        {
+          id: 2,
+          name: "aaaaa",
+          schema: null,
+          is_active: true,
+        },
+        {
+          id: 3,
+          name: "bbbbb",
+          schema: null,
+          is_active: true,
+        },
+      ],
+    });
+  })
+);
 
-  /* eslint-disable */
-  jest
-    .spyOn(
-      require("../repository/AironeApiClient").aironeApiClient,
-      "getEntity"
-    )
-    .mockResolvedValue(Promise.resolve(entity));
-  jest
-    .spyOn(
-      require("../repository/AironeApiClient").aironeApiClient,
-      "getEntries"
-    )
-    .mockResolvedValue(Promise.resolve({ results: entries }));
-  /* eslint-enable */
+beforeAll(() => server.listen());
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
 
-  // wait async calls and get rendered fragment
-  const result = render(<EntryListPage />, {
-    wrapper: TestWrapper,
-  });
-  await waitForElementToBeRemoved(screen.getByTestId("loading"));
+describe("EntryListPage", () => {
+  test("should match snapshot", async () => {
+    const router = createMemoryRouter(
+      [
+        {
+          path: entityEntriesPath(":entityId"),
+          element: <EntryListPage />,
+        },
+      ],
+      {
+        initialEntries: ["/ui/entities/1/entries"],
+      }
+    );
+    const result = await act(async () => {
+      return render(<RouterProvider router={router} />, {
+        wrapper: TestWrapperWithoutRoutes,
+      });
+    });
+    await waitFor(() => {
+      expect(screen.queryByTestId("loading")).not.toBeInTheDocument();
+    });
 
-  expect(result).toMatchSnapshot();
+    expect(result).toMatchSnapshot();
+  });
 });