Merge branch 'main' of https://github.com/reearth/reearth-cms into re…

…factor-web/types
reearth · Mar 19, 2024 · 6079647 · 6079647
2 parents 0d12d5f + 9679911
commit 6079647
Show file tree

Hide file tree

Showing 45 changed files with 1,202 additions and 1,189 deletions.
diff --git a/web/e2e/project/asset.spec.ts b/web/e2e/project/asset.spec.ts
@@ -27,12 +27,12 @@ test("Asset CRUD and Searching has succeeded", async ({ page }) => {
   await expect(page.getByRole("alert").last()).toContainText("Successfully added asset!");
   await closeNotification(page);
   await expect(page.getByText(uploadFileName)).toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("no asset");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("no asset");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.getByText(uploadFileName)).not.toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.getByText(uploadFileName)).toBeVisible();
   await page.getByLabel("edit").locator("svg").click();

diff --git a/web/e2e/project/content.spec.ts b/web/e2e/project/content.spec.ts
@@ -17,12 +17,7 @@ test.afterEach(async ({ page }) => {
 });
 
 test("Item CRUD and searching has succeeded", async ({ page }) => {
-  await page
-    .locator("li")
-    .filter({ hasText: "TextHeading and titles, one-" })
-    .locator("div")
-    .first()
-    .click();
+  await page.locator("li").filter({ hasText: "Text" }).locator("div").first().click();
   await handleFieldForm(page, "text");
   await closeNotification(page);
   await page.getByText("Content").click();
@@ -34,11 +29,11 @@ test("Item CRUD and searching has succeeded", async ({ page }) => {
   await closeNotification(page);
   await page.getByLabel("Back").click();
   await expect(page.getByRole("cell", { name: "text", exact: true })).toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("no field");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("no field");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.getByRole("cell", { name: "text", exact: true })).not.toBeVisible();
-  await page.getByPlaceholder("Please enter").fill("");
+  await page.getByPlaceholder("input search text").fill("");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.getByRole("cell", { name: "text", exact: true })).toBeVisible();
   await page.getByRole("link", { name: "edit", exact: true }).click();

diff --git a/web/e2e/project/item/fields/asset.spec.ts b/web/e2e/project/item/fields/asset.spec.ts
@@ -96,12 +96,12 @@ test("Asset field editing has succeeded", async ({ page }) => {
   await expect(page.getByRole("button", { name: uploadFileName_1, exact: true })).toBeVisible();
   await page.getByLabel("Default value").getByRole("button").nth(3).click();
   await page.getByRole("button", { name: "Asset" }).click();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("no asset");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("no asset");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.locator(".ant-table-row").first()).not.toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("");
   await page.getByRole("button", { name: "search" }).click();
   await page.locator(".ant-table-row > td").first().getByRole("button").hover();
   await page.locator(".ant-table-row > td").first().getByRole("button").click();

diff --git a/web/e2e/project/item/fields/group.spec.ts b/web/e2e/project/item/fields/group.spec.ts
@@ -116,6 +116,7 @@ test("Group field creating and updating has succeeded", async ({ page }) => {
   await expect(page.getByRole("alert").last()).toContainText("Successfully updated field!");
   await closeNotification(page);
   await page.getByText("Content").click();
+  await page.getByText("e2e model name").click();
   await page.getByRole("link", { name: "edit", exact: true }).click();
   await expect(page.getByRole("main")).toContainText("new text1(unique)");
   await expect(page.getByRole("main")).toContainText("new text1 description");
@@ -304,6 +305,7 @@ test("Group field editing has succeeded", async ({ page }) => {
   await closeNotification(page);
 
   await page.getByText("Content").click();
+  await page.getByText("e2e model name").click();
   await page.getByRole("button", { name: "plus New Item" }).click();
   await page.getByRole("button", { name: "plus New" }).click();
   await expect(page.getByRole("textbox").nth(0)).toHaveValue("text1");

diff --git a/web/e2e/project/request.spec.ts b/web/e2e/project/request.spec.ts
@@ -30,12 +30,12 @@ test("Request creating, searching, updating reviewer, and approving has succeede
   await page.getByText("Request", { exact: true }).click();
   await expect(page.getByText(requestTitle, { exact: true })).toBeVisible();
   await expect(page.getByText("WAITING")).toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("no request");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("no request");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.getByText(requestTitle, { exact: true })).not.toBeVisible();
   await expect(page.getByText("WAITING")).not.toBeVisible();
-  await page.getByPlaceholder("Please enter").fill("");
+  await page.getByPlaceholder("input search text").fill("");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.getByText(requestTitle, { exact: true })).toBeVisible();
   await expect(page.getByText("WAITING")).toBeVisible();

diff --git a/web/e2e/project/schema.spec.ts b/web/e2e/project/schema.spec.ts
@@ -33,14 +33,46 @@ test("Group CRUD has succeeded", async ({ page }) => {
   await crudGroup(page);
 });
 
+test("Group creating from adding field has succeeded", async ({ page }) => {
+  await createModel(page);
+  await page.locator("li").filter({ hasText: "Group" }).locator("div").first().click();
+  await page.getByRole("button", { name: "Create Group" }).click();
+  await expect(page.getByLabel("New Group")).toContainText("New Group");
+  await expect(page.getByRole("button", { name: "OK" })).toBeDisabled();
+
+  await page.getByLabel("New Group").locator("#name").click();
+  await page.getByLabel("New Group").locator("#name").fill("e2e group name");
+  await page.getByLabel("New Group").locator("#key").click();
+  await page.getByLabel("New Group").locator("#key").fill("e2e-group-key");
+  await page.getByRole("button", { name: "OK" }).click();
+  await expect(page.getByRole("alert").last()).toContainText("Successfully created group!");
+  await closeNotification(page);
+  await expect(
+    page.getByRole("menuitem", { name: "e2e group name" }).locator("span"),
+  ).toBeVisible();
+  await expect(page.getByText("e2e group name#e2e-group-key")).toBeVisible();
+  await expect(page.getByText("FieldsMeta Data")).not.toBeVisible();
+  await expect(
+    page.locator("li").filter({ hasText: "Reference" }).locator("div").first(),
+  ).not.toBeVisible();
+  await expect(
+    page.locator("li").filter({ hasText: "Group" }).locator("div").first(),
+  ).not.toBeVisible();
+  await page.locator("li").filter({ hasText: "Text" }).locator("div").first().click();
+  await handleFieldForm(page, "text");
+  await expect(page.getByRole("alert").last()).toContainText("Successfully created field!");
+  await closeNotification(page);
+  await page.getByText("e2e model name").click();
+  await page.locator("li").filter({ hasText: "Group" }).locator("div").first().click();
+  await expect(page.getByRole("heading", { name: "Create Group" })).toBeVisible();
+  await page.getByLabel("Select Group").click();
+  await expect(page.getByText("e2e group name #e2e-group-key")).toBeVisible();
+  await page.getByRole("button", { name: "Cancel" }).click();
+});
+
 test("Text field CRUD has succeeded", async ({ page }) => {
   await createModel(page);
-  await page
-    .locator("li")
-    .filter({ hasText: "TextHeading and titles, one-" })
-    .locator("div")
-    .first()
-    .click();
+  await page.locator("li").filter({ hasText: "Text" }).locator("div").first().click();
   await handleFieldForm(page, "text");
   await expect(page.getByRole("alert").last()).toContainText("Successfully created field!");
   await closeNotification(page);

diff --git a/web/e2e/project/utils/group.ts b/web/e2e/project/utils/group.ts
@@ -13,7 +13,6 @@ export async function createGroup(page: Page) {
   await page.getByRole("button", { name: "OK" }).click();
   await expect(page.getByRole("alert").last()).toContainText("Successfully created group!");
   await closeNotification(page);
-  await page.getByText("e2e group name").click();
   await expect(page.getByTitle("e2e group name")).toBeVisible();
   await expect(page.getByText("#e2e-group-key")).toBeVisible();
 }

diff --git a/web/e2e/settings/integrations.spec.ts b/web/e2e/settings/integrations.spec.ts
@@ -32,8 +32,8 @@ test("Integration CRUD and searching has succeeded", async ({ reearth, page }) =
   );
   await closeNotification(page);
   await expect(page.getByRole("cell", { name: "e2e integration name", exact: true })).toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("e2e integration name");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("e2e integration name");
   await page.getByRole("button", { name: "search" }).click();
   await page.getByRole("cell", { name: "setting" }).locator("svg").click();
   await page
@@ -48,14 +48,14 @@ test("Integration CRUD and searching has succeeded", async ({ reearth, page }) =
   );
   await closeNotification(page);
   await expect(page.getByRole("cell", { name: "WRITER" })).toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("no integration");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("no integration");
   await page.getByRole("button", { name: "search" }).click();
   await expect(
     page.getByRole("cell", { name: "e2e integration name", exact: true }),
   ).not.toBeVisible();
-  await page.getByPlaceholder("Please enter").click();
-  await page.getByPlaceholder("Please enter").fill("e2e integration name");
+  await page.getByPlaceholder("input search text").click();
+  await page.getByPlaceholder("input search text").fill("e2e integration name");
   await page.getByRole("button", { name: "search" }).click();
   await expect(page.getByRole("cell", { name: "e2e integration name", exact: true })).toBeVisible();
   await page.getByLabel("", { exact: true }).check();

diff --git a/web/src/components/molecules/Asset/AssetList/index.tsx b/web/src/components/molecules/Asset/AssetList/index.tsx
@@ -31,7 +31,6 @@ type Props = {
   totalCount: number;
   page: number;
   pageSize: number;
-  searchTerm: string;
   onAssetItemSelect: (item: AssetItem) => void;
   onAssetSelect: (assetId: string) => void;
   onUploadModalCancel: () => void;
@@ -65,7 +64,6 @@ const AssetList: React.FC<Props> = ({
   uploadType,
   selectedAsset,
   totalCount,
-  searchTerm,
   page,
   pageSize,
   onAssetItemSelect,
@@ -146,7 +144,6 @@ const AssetList: React.FC<Props> = ({
             loading={loading}
             selectedAsset={selectedAsset}
             totalCount={totalCount}
-            searchTerm={searchTerm}
             page={page}
             pageSize={pageSize}
             onAssetItemSelect={onAssetItemSelect}