From 2a49799063c5aee78ada932a99c0232c06381f4c Mon Sep 17 00:00:00 2001
From: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:42:43 +0100
Subject: [PATCH 01/28] fix(server): creating item with default group value
 fails (#1292)

* fix(server): creating item with default group value fails

* refactor
---
 server/internal/adapter/integration/convert.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/internal/adapter/integration/convert.go b/server/internal/adapter/integration/convert.go
index 3042944518..7ee7667eb7 100644
--- a/server/internal/adapter/integration/convert.go
+++ b/server/internal/adapter/integration/convert.go
@@ -113,10 +113,9 @@ func appendGroupFieldsDefaultValue(sp *schema.Package, res []interfaces.ItemFiel
 			continue
 		}
 		igID := id.NewItemGroupID()
-		var v any
-		v = []id.ItemGroupID{id.NewItemGroupID()}
-		if !gsf.Multiple() {
-			v = igID
+		var v any = igID
+		if gsf.Multiple() {
+			v = []any{igID}
 		}
 		res = append(res, interfaces.ItemFieldParam{
 			Field: gsf.ID().Ref(),

From 1db1bff61aef3ea5c156c3ada0d53ac8930e3028 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 13:34:02 +0900
Subject: [PATCH 02/28] chore(web): rewrite title and favicon in docker image

---
 web/docker/40-envsubst-on-reearth-config.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/web/docker/40-envsubst-on-reearth-config.sh b/web/docker/40-envsubst-on-reearth-config.sh
index 1b116b4164..ce1f9d6c64 100755
--- a/web/docker/40-envsubst-on-reearth-config.sh
+++ b/web/docker/40-envsubst-on-reearth-config.sh
@@ -15,3 +15,17 @@ wrap_reearth_cms_variables() {
 
 wrap_reearth_cms_variables $@
 envsubst < "$_REEARTH_CONFIG_TEMPLATE_FILE" > "$_REEARTH_CONFIG_OUTPUT_FILE"
+
+# rewrite index.html to change title and favicon
+_REEARTH_HTML_FILE="/usr/share/nginx/html/index.html"
+
+# Rewrite title tag in index.html only if REEARTH_CMS_TITLE is set
+if [ -n "$REEARTH_CMS_TITLE" ]; then
+  sed -i '' -e "s|<title>.*</title>|<title>${REEARTH_CMS_TITLE}</title>|g" "$_REEARTH_HTML_FILE"
+fi
+
+# Rewrite favicon in index.html only if REEARTH_CMS_FAVICON is set
+#
+if [ -n "$REEARTH_CMS_FAVICON" ]; then
+  sed -i '' -e "s|<link rel=\"icon\" href=\"[^\"]*\" type=\"image/x-icon\" />|<link rel=\"icon\" href=\"${REEARTH_CMS_FAVICON}\" type=\"image/x-icon\" />|g" "$_REEARTH_HTML_FILE"
+fi

From da553315d34a30124d4cbbe34553da28d3bba1c2 Mon Sep 17 00:00:00 2001
From: KeisukeYamashita <19yamashita15@gmail.com>
Date: Fri, 1 Nov 2024 06:05:10 +0100
Subject: [PATCH 03/28] ci: fix branch retrieval in build workflow for web and
 worker (#1294)

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>
---
 .github/workflows/build_web.yml    | 2 +-
 .github/workflows/build_worker.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index fead094495..237b3e4919 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -26,7 +26,7 @@ jobs:
         id: info
         # The tag name should be retrieved lazily, as tagging may be delayed.
         env:
-          BRANCH: ${{ github.event.workflow_run.head_branch }}
+          BRANCH: ${{ github.head_ref || github.ref_name }}
         run: |
           echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
           if [[ "$BRANCH" = "release" ]]; then
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 4f877a49a5..29e320f020 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -26,7 +26,7 @@ jobs:
         id: info
         # The tag name should be retrieved lazily, as tagging may be delayed.
         env:
-          BRANCH: ${{ github.event.workflow_run.head_branch }}
+          BRANCH: ${{ github.head_ref || github.ref_name }}
         run: |
           echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
           if [[ "$BRANCH" = "release" ]]; then

From cdc25a6a0f12d9b9109d33743ea738f76ba5be9c Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 16:49:35 +0900
Subject: [PATCH 04/28] fix(web): fix errors on Docker startup

---
 web/Dockerfile                              | 16 +++++----
 web/docker/40-envsubst-on-reearth-config.sh | 36 ++++++++++++---------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index 7dd957c3f5..5438007a1e 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -21,10 +21,10 @@ RUN --mount=type=bind,source=package.json,target=package.json \
     yarn build
 
 FROM nginx:1.27-alpine
-WORKDIR /app
+WORKDIR /usr/share/nginx/html
 
 # Quite the Nginx startup logs.
-ENV  NGINX_ENTRYPOINT_QUIET_LOGS=true
+ENV NGINX_ENTRYPOINT_QUIET_LOGS=true
 
 # Default to Cloud Run port.
 # Ref: https://cloud.google.com/run/docs/reference/container-contract#port
@@ -35,18 +35,20 @@ ENV PORT=8080
 ENV REAL_IP_HEADER=X-Forwarded-For
 
 # Default values.
-# Cesium Ion access token is not a secret.
-ENV REEARTH_CMS_CESIUM_ION_ACCESS_TOKEN=null
-
-# All values in reearth_config.json must have a default value.
+ENV REEARTH_CMS_TITLE=
+ENV REEARTH_CMS_FAVICON_URL=
 ENV REEARTH_CMS_API=null
+ENV REEARTH_CMS_AUTH0_AUDIENCE=
+ENV REEARTH_CMS_AUTH0_CLIENT_ID=
+ENV REEARTH_CMS_AUTH0_DOMAIN=
+ENV REEARTH_CMS_CESIUM_ION_ACCESS_TOKEN=null
 ENV REEARTH_CMS_COVER_IMAGE_URL=null
 ENV REEARTH_CMS_EDITOR_URL=null
 ENV REEARTH_CMS_LOGO_URL=null
 ENV REEARTH_CMS_MULTI_TENANT=null
 
 COPY --from=builder --chown=nginx:nginx /app/dist /usr/share/nginx/html
-COPY --chown=nginx:nginx docker/nginx.conf.template /etc/nginx/templates/nginx.conf.template 
+COPY --chown=nginx:nginx docker/nginx.conf.template /etc/nginx/templates/nginx.conf.template
 COPY --chown=nginx:nginx docker/40-envsubst-on-reearth-config.sh /docker-entrypoint.d
 COPY --chown=nginx:nginx docker/reearth_config.json.template /opt/reearth-cms/reearth_config.json.template
 
diff --git a/web/docker/40-envsubst-on-reearth-config.sh b/web/docker/40-envsubst-on-reearth-config.sh
index ce1f9d6c64..d60a911ac0 100755
--- a/web/docker/40-envsubst-on-reearth-config.sh
+++ b/web/docker/40-envsubst-on-reearth-config.sh
@@ -2,6 +2,20 @@
 
 set -e
 
+# rewrite index.html to change title and favicon
+_REEARTH_HTML_FILE="/usr/share/nginx/html/index.html"
+
+# Rewrite title tag in index.html only if REEARTH_CMS_TITLE is set
+if [ -n "$REEARTH_CMS_TITLE" ]; then
+  sed -i -e "s|<title>.*</title>|<title>${REEARTH_CMS_TITLE}</title>|g" "$_REEARTH_HTML_FILE"
+fi
+
+# Rewrite favicon in index.html only if REEARTH_CMS_FAVICON_URL is set
+if [ -n "$REEARTH_CMS_FAVICON_URL" ]; then
+  sed -i -e "s|<link rel=\"icon\" href=\"[^\"]*\" type=\"image/x-icon\" />|<link rel=\"icon\" href=\"${REEARTH_CMS_FAVICON_URL}\" type=\"image/x-icon\" />|g" "$_REEARTH_HTML_FILE"
+fi
+
+# generate reearth_config.json
 _REEARTH_CONFIG_TEMPLATE_FILE="/opt/reearth-cms/reearth_config.json.template"
 _REEARTH_CONFIG_OUTPUT_FILE="/usr/share/nginx/html/reearth_config.json"
 
@@ -9,23 +23,13 @@ _REEARTH_CONFIG_OUTPUT_FILE="/usr/share/nginx/html/reearth_config.json"
 wrap_reearth_cms_variables() {
     for var in $(env | grep '^REEARTH_CMS_' | cut -d= -f1); do
         value=$(printenv "$var")
-        [ "$value" != "null" ] && ! echo "$value" | grep -qE '^\{.*\}$' && export "$var=\"${value}\""
+        if [ -z "$value" ]; then
+            eval "export $var='\"\"'"
+        elif [ "$value" != "null" ] && ! echo "$value" | grep -qE '^\{.*\}$'; then
+            eval "export $var='${value}'"
+        fi
     done
 }
 
-wrap_reearth_cms_variables $@
+wrap_reearth_cms_variables "$@"
 envsubst < "$_REEARTH_CONFIG_TEMPLATE_FILE" > "$_REEARTH_CONFIG_OUTPUT_FILE"
-
-# rewrite index.html to change title and favicon
-_REEARTH_HTML_FILE="/usr/share/nginx/html/index.html"
-
-# Rewrite title tag in index.html only if REEARTH_CMS_TITLE is set
-if [ -n "$REEARTH_CMS_TITLE" ]; then
-  sed -i '' -e "s|<title>.*</title>|<title>${REEARTH_CMS_TITLE}</title>|g" "$_REEARTH_HTML_FILE"
-fi
-
-# Rewrite favicon in index.html only if REEARTH_CMS_FAVICON is set
-#
-if [ -n "$REEARTH_CMS_FAVICON" ]; then
-  sed -i '' -e "s|<link rel=\"icon\" href=\"[^\"]*\" type=\"image/x-icon\" />|<link rel=\"icon\" href=\"${REEARTH_CMS_FAVICON}\" type=\"image/x-icon\" />|g" "$_REEARTH_HTML_FILE"
-fi

From 7a13a608f6aee1ef1ad18504c5f6cb74e5a782c1 Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Fri, 1 Nov 2024 17:11:32 +0900
Subject: [PATCH 05/28] feat(web): publish multiple items (#1295)

* add: publish button

* remove deselect button
---
 .../molecules/Asset/AssetListTable/index.tsx  |  7 ---
 .../molecules/Content/List/index.tsx          |  6 +++
 .../molecules/Content/Table/index.tsx         | 49 ++++++++++++++++---
 .../Integration/IntegrationTable/index.tsx    |  7 ---
 .../molecules/Request/Table/index.tsx         |  7 ---
 .../Project/Content/ContentList/hooks.ts      |  4 ++
 .../Project/Content/ContentList/index.tsx     |  4 ++
 web/src/i18n/translations/en.yml              |  7 +--
 web/src/i18n/translations/ja.yml              |  7 +--
 9 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/web/src/components/molecules/Asset/AssetListTable/index.tsx b/web/src/components/molecules/Asset/AssetListTable/index.tsx
index 61b4f1fd75..1671d89815 100644
--- a/web/src/components/molecules/Asset/AssetListTable/index.tsx
+++ b/web/src/components/molecules/Asset/AssetListTable/index.tsx
@@ -284,13 +284,6 @@ const AssetListTable: React.FC<Props> = ({
     (props: any) => {
       return (
         <Space size={4}>
-          <Button
-            type="link"
-            size="small"
-            icon={<Icon icon="clear" />}
-            onClick={props.onCleanSelected}>
-            {t("Deselect")}
-          </Button>
           <DownloadButton
             displayDefaultIcon
             size="small"
diff --git a/web/src/components/molecules/Content/List/index.tsx b/web/src/components/molecules/Content/List/index.tsx
index e9037eef59..40376f487a 100644
--- a/web/src/components/molecules/Content/List/index.tsx
+++ b/web/src/components/molecules/Content/List/index.tsx
@@ -26,6 +26,7 @@ type Props = {
   contentTableFields?: ContentTableField[];
   loading: boolean;
   deleteLoading: boolean;
+  publishLoading: boolean;
   unpublishLoading: boolean;
   contentTableColumns?: ExtendedColumns[];
   modelsMenu: React.ReactNode;
@@ -45,6 +46,7 @@ type Props = {
   onSearchTerm: (term?: string) => void;
   onFilterChange: (filter?: ConditionInput[]) => void;
   onContentTableChange: (page: number, pageSize: number, sorter?: ItemSort) => void;
+  onPublish: (itemIds: string[]) => Promise<void>;
   onUnpublish: (itemIds: string[]) => Promise<void>;
   onItemSelect: (itemId: string) => void;
   setSelectedItems: (input: { selectedRows: { itemId: string; version?: string }[] }) => void;
@@ -72,6 +74,7 @@ const ContentListMolecule: React.FC<Props> = ({
   modelsMenu,
   loading,
   deleteLoading,
+  publishLoading,
   unpublishLoading,
   selectedItem,
   selectedItems,
@@ -88,6 +91,7 @@ const ContentListMolecule: React.FC<Props> = ({
   requestModalTotalCount,
   requestModalPage,
   requestModalPageSize,
+  onPublish,
   onUnpublish,
   onAddItemToRequest,
   onAddItemToRequestModalClose,
@@ -145,9 +149,11 @@ const ContentListMolecule: React.FC<Props> = ({
                 pageSize={pageSize}
                 loading={loading}
                 deleteLoading={deleteLoading}
+                publishLoading={publishLoading}
                 unpublishLoading={unpublishLoading}
                 selectedItem={selectedItem}
                 selectedItems={selectedItems}
+                onPublish={onPublish}
                 onUnpublish={onUnpublish}
                 onSearchTerm={onSearchTerm}
                 onFilterChange={onFilterChange}
diff --git a/web/src/components/molecules/Content/Table/index.tsx b/web/src/components/molecules/Content/Table/index.tsx
index 7be4e5e916..a278702724 100644
--- a/web/src/components/molecules/Content/Table/index.tsx
+++ b/web/src/components/molecules/Content/Table/index.tsx
@@ -16,6 +16,7 @@ import CustomTag from "@reearth-cms/components/atoms/CustomTag";
 import Dropdown, { MenuProps } from "@reearth-cms/components/atoms/Dropdown";
 import Icon from "@reearth-cms/components/atoms/Icon";
 import Input from "@reearth-cms/components/atoms/Input";
+import Modal from "@reearth-cms/components/atoms/Modal";
 import {
   TableRowSelection,
   ListToolBarProps,
@@ -56,6 +57,7 @@ type Props = {
   contentTableColumns?: ExtendedColumns[];
   loading: boolean;
   deleteLoading: boolean;
+  publishLoading: boolean;
   unpublishLoading: boolean;
   selectedItem?: Item;
   selectedItems: { selectedRows: { itemId: string; version?: string }[] };
@@ -77,6 +79,7 @@ type Props = {
   setSelectedItems: (input: { selectedRows: { itemId: string; version?: string }[] }) => void;
   onItemEdit: (itemId: string) => void;
   onItemDelete: (itemIds: string[]) => Promise<void>;
+  onPublish: (itemIds: string[]) => Promise<void>;
   onUnpublish: (itemIds: string[]) => Promise<void>;
   onItemsReload: () => void;
   requests: Request[];
@@ -94,6 +97,7 @@ const ContentTable: React.FC<Props> = ({
   contentTableColumns,
   loading,
   deleteLoading,
+  publishLoading,
   unpublishLoading,
   selectedItem,
   selectedItems,
@@ -113,6 +117,7 @@ const ContentTable: React.FC<Props> = ({
   onAddItemToRequest,
   onAddItemToRequestModalClose,
   onAddItemToRequestModalOpen,
+  onPublish,
   onUnpublish,
   onSearchTerm,
   onFilterChange,
@@ -289,11 +294,37 @@ const ContentTable: React.FC<Props> = ({
     [selectedItems, setSelectedItems],
   );
 
+  const publishConfirm = useCallback(
+    (itemIds: string[]) => {
+      Modal.confirm({
+        title: t("Publish items"),
+        content: t("All selected items will be published. You can unpublish them anytime."),
+        icon: <Icon icon="exclamationCircle" />,
+        cancelText: t("No"),
+        okText: t("Yes"),
+        async onOk() {
+          await onPublish(itemIds);
+        },
+      });
+    },
+    [onPublish, t],
+  );
+
   const alertOptions = useCallback(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (props: any) => {
       return (
         <Space size={4}>
+          <Button
+            type="link"
+            size="small"
+            icon={<Icon icon="upload" />}
+            onClick={() => {
+              publishConfirm(props.selectedRowKeys);
+            }}
+            loading={publishLoading}>
+            {t("Publish")}
+          </Button>
           <Button
             type="link"
             size="small"
@@ -309,13 +340,6 @@ const ContentTable: React.FC<Props> = ({
             loading={unpublishLoading}>
             {t("Unpublish")}
           </Button>
-          <Button
-            type="link"
-            size="small"
-            icon={<Icon icon="clear" />}
-            onClick={props.onCleanSelected}>
-            {t("Deselect")}
-          </Button>
           <Button
             type="link"
             size="small"
@@ -328,7 +352,16 @@ const ContentTable: React.FC<Props> = ({
         </Space>
       );
     },
-    [deleteLoading, onAddItemToRequestModalOpen, onItemDelete, onUnpublish, t, unpublishLoading],
+    [
+      deleteLoading,
+      onAddItemToRequestModalOpen,
+      onItemDelete,
+      onUnpublish,
+      publishConfirm,
+      publishLoading,
+      t,
+      unpublishLoading,
+    ],
   );
 
   const defaultFilterValues = useRef<DefaultFilterValueType[]>([]);
diff --git a/web/src/components/molecules/Integration/IntegrationTable/index.tsx b/web/src/components/molecules/Integration/IntegrationTable/index.tsx
index c312aa1334..a656aba5ee 100644
--- a/web/src/components/molecules/Integration/IntegrationTable/index.tsx
+++ b/web/src/components/molecules/Integration/IntegrationTable/index.tsx
@@ -132,13 +132,6 @@ const IntegrationTable: React.FC<Props> = ({
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (props: any) => (
       <Space size={4}>
-        <Button
-          type="link"
-          size="small"
-          icon={<Icon icon="clear" />}
-          onClick={props.onCleanSelected}>
-          {t("Deselect")}
-        </Button>
         <Button
           type="link"
           size="small"
diff --git a/web/src/components/molecules/Request/Table/index.tsx b/web/src/components/molecules/Request/Table/index.tsx
index 06f88089a2..cb2513c674 100644
--- a/web/src/components/molecules/Request/Table/index.tsx
+++ b/web/src/components/molecules/Request/Table/index.tsx
@@ -258,13 +258,6 @@ const RequestListTable: React.FC<Props> = ({
     (props: any) => {
       return (
         <Space size={4}>
-          <Button
-            type="link"
-            size="small"
-            icon={<Icon icon="clear" />}
-            onClick={props.onCleanSelected}>
-            {t("Deselect")}
-          </Button>
           <Button
             type="link"
             size="small"
diff --git a/web/src/components/organisms/Project/Content/ContentList/hooks.ts b/web/src/components/organisms/Project/Content/ContentList/hooks.ts
index 7ab705fbb5..4859896971 100644
--- a/web/src/components/organisms/Project/Content/ContentList/hooks.ts
+++ b/web/src/components/organisms/Project/Content/ContentList/hooks.ts
@@ -62,6 +62,7 @@ export default () => {
     currentProject,
     requests,
     addItemToRequestModalShown,
+    handlePublish,
     handleUnpublish,
     handleAddItemToRequest,
     handleAddItemToRequestModalClose,
@@ -70,6 +71,7 @@ export default () => {
     handleRequestSearchTerm,
     handleRequestTableReload,
     loading: requestModalLoading,
+    publishLoading,
     unpublishLoading,
     totalCount: requestModalTotalCount,
     page: requestModalPage,
@@ -527,6 +529,7 @@ export default () => {
     currentModel,
     loading,
     deleteLoading,
+    publishLoading,
     unpublishLoading,
     contentTableFields,
     contentTableColumns,
@@ -548,6 +551,7 @@ export default () => {
     requestModalTotalCount,
     requestModalPage,
     requestModalPageSize,
+    handlePublish,
     handleUnpublish,
     handleBulkAddItemToRequest,
     handleAddItemToRequestModalClose,
diff --git a/web/src/components/organisms/Project/Content/ContentList/index.tsx b/web/src/components/organisms/Project/Content/ContentList/index.tsx
index 4079b01e8e..2f9361eac2 100644
--- a/web/src/components/organisms/Project/Content/ContentList/index.tsx
+++ b/web/src/components/organisms/Project/Content/ContentList/index.tsx
@@ -19,6 +19,7 @@ const ContentList: React.FC = () => {
     selectedItems,
     loading,
     deleteLoading,
+    publishLoading,
     unpublishLoading,
     totalCount,
     views,
@@ -35,6 +36,7 @@ const ContentList: React.FC = () => {
     requestModalPage,
     requestModalPageSize,
     handleBulkAddItemToRequest: handleAddItemToRequest,
+    handlePublish,
     handleUnpublish,
     handleAddItemToRequestModalClose,
     handleAddItemToRequestModalOpen,
@@ -97,6 +99,7 @@ const ContentList: React.FC = () => {
       collapsed={collapsedModelMenu}
       loading={loading}
       deleteLoading={deleteLoading}
+      publishLoading={publishLoading}
       unpublishLoading={unpublishLoading}
       currentView={currentView}
       setCurrentView={setCurrentView}
@@ -118,6 +121,7 @@ const ContentList: React.FC = () => {
       onCollapse={collapseModelMenu}
       onItemsReload={handleItemsReload}
       onItemEdit={handleNavigateToItemEditForm}
+      onPublish={handlePublish}
       onUnpublish={handleUnpublish}
       onItemDelete={handleItemDelete}
       onItemAdd={handleNavigateToItemForm}
diff --git a/web/src/i18n/translations/en.yml b/web/src/i18n/translations/en.yml
index 9ba541a3be..b4ad00de96 100644
--- a/web/src/i18n/translations/en.yml
+++ b/web/src/i18n/translations/en.yml
@@ -67,7 +67,6 @@ Status: ''
 Created At: ''
 ID: ''
 input search text: ''
-Deselect: ''
 Delete: ''
 Upload Asset: ''
 Auto Unzip: ''
@@ -176,6 +175,10 @@ is not empty: ''
 Ascending: ''
 Descending: ''
 Confirm: ''
+Publish items: ''
+All selected items will be published. You can unpublish them anytime.: ''
+'No': ''
+'Yes': ''
 Filter: ''
 Add Filter: ''
 Add Sort: ''
@@ -210,8 +213,6 @@ Please input the appropriate role for this member!: ''
 Are you sure to remove these members?: ''
 Are you sure to remove this member?: ''
 Remove this member from workspace means this member will not view any content of this workspace.: ''
-'Yes': ''
-'No': ''
 Are you sure to leave this workspace?: ''
 Leave this workspace means you will not view any content of this workspace.: ''
 Thumbnail: ''
diff --git a/web/src/i18n/translations/ja.yml b/web/src/i18n/translations/ja.yml
index e607ec97f3..9b24d852d6 100644
--- a/web/src/i18n/translations/ja.yml
+++ b/web/src/i18n/translations/ja.yml
@@ -67,7 +67,6 @@ Status: ステータス
 Created At: 作成日時
 ID: ''
 input search text: 検索
-Deselect: 選択解除
 Delete: 削除
 Upload Asset: アセットをアップロード
 Auto Unzip: 自動解凍
@@ -176,6 +175,10 @@ is not empty: 空でない
 Ascending: 昇順
 Descending: 降順
 Confirm: 確認
+Publish items: アイテムを公開
+All selected items will be published. You can unpublish them anytime.: 選択したアイテムはすべて公開されます。アイテムはいつでも非公開にすることができます。
+'No': いいえ
+'Yes': はい
 Filter: フィルター
 Add Filter: 絞り込む
 Add Sort: 並び替える
@@ -210,8 +213,6 @@ Please input the appropriate role for this member!: このメンバーに付与
 Are you sure to remove these members?: 本当にこれらのメンバーをワークスペースから削除してもよろしいですか？
 Are you sure to remove this member?: 本当にこのメンバーをワークスペースから削除してもよろしいですか？
 Remove this member from workspace means this member will not view any content of this workspace.: メンバーをワークスペースから削除すると、そのメンバーはワークスペース内のいかなるコンテンツも閲覧することができなくなります。
-'Yes': はい
-'No': いいえ
 Are you sure to leave this workspace?: 本当にこのワークスペースを離れてもよろしいですか？
 Leave this workspace means you will not view any content of this workspace.: ワークスペースを離れると、ワークスペース内のいかなるコンテンツも閲覧することができなくなります。
 Thumbnail: サムネイル

From a680802af5447cd88afaaa245afebc90aa3ccb6e Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 17:18:00 +0900
Subject: [PATCH 06/28] fix(web): doublequotes are missing in reearth_config
 values

---
 web/docker/40-envsubst-on-reearth-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/docker/40-envsubst-on-reearth-config.sh b/web/docker/40-envsubst-on-reearth-config.sh
index d60a911ac0..e16fb7819c 100755
--- a/web/docker/40-envsubst-on-reearth-config.sh
+++ b/web/docker/40-envsubst-on-reearth-config.sh
@@ -26,7 +26,7 @@ wrap_reearth_cms_variables() {
         if [ -z "$value" ]; then
             eval "export $var='\"\"'"
         elif [ "$value" != "null" ] && ! echo "$value" | grep -qE '^\{.*\}$'; then
-            eval "export $var='${value}'"
+            eval "export $var='\"${value}\"'"
         fi
     done
 }

From 3466031987b7b41112cc27748f5afb6700f759f4 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 19:20:34 +0900
Subject: [PATCH 07/28] ci: fix wrong if, remove conrrency from build workflows

---
 .github/workflows/build_server.yml |  9 +++------
 .github/workflows/build_web.yml    | 17 +++++++----------
 .github/workflows/build_worker.yml |  9 +++------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index 7879995468..c2f8850816 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -1,17 +1,14 @@
-name: server-build
+name: build-server
 on:
   push:
     branches: [main, release]
     paths: [server/**, .github/workflows/build_server.yml]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: true
 
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'failure' && github.event.repository.full_name == 'reearth/reearth-cms' && (github.event.workflow_run.head_branch == 'release' || !startsWith(github.event.head_commit.message, 'v'))
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
@@ -71,7 +68,7 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
+          TAG: ${{ needs.info.outputs.new_tag_short }}
           NAME: ${{ needs.info.outputs.name }}
           SHA: ${{ needs.info.outputs.sha_short }}
         run: |
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index 237b3e4919..a073930895 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -1,17 +1,14 @@
-name: web-build
+name: build-web
 on:
   push:
     branches: [ main, release ]
     paths: [ web/**, .github/workflows/build_web.yml ]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: true
 
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'failure' && github.event.repository.full_name == 'reearth/reearth-cms' && (github.event.workflow_run.head_branch == 'release' || !startsWith(github.event.head_commit.message, 'v'))
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
@@ -32,13 +29,13 @@ jobs:
           if [[ "$BRANCH" = "release" ]]; then
             TAG=$(git tag --points-at HEAD)
             if [[ ! -z "$TAG" ]]; then
-              echo "::set-output name=new_tag::$TAG"
-              echo "::set-output name=new_tag_short::${TAG#v}"
+              echo "new_tag=$TAG" >> $GITHUB_ENV
+              echo "new_tag_short=${TAG#v}" >> $GITHUB_ENV
             else
-              echo "::set-output name=name::rc"
+              echo "name=rc" >> $GITHUB_ENV
             fi
           else
-            echo "::set-output name=name::nightly"
+            echo "name=nightly" >> $GITHUB_ENV
           fi
       - name: Show info
         env:
@@ -71,7 +68,7 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
+          TAG: ${{ needs.info.outputs.new_tag_short }}
           NAME: ${{ needs.info.outputs.name }}
           SHA: ${{ needs.info.outputs.sha_short }}
         run: |
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 29e320f020..0202794d47 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -1,17 +1,14 @@
-name: worker-build
+name: build-worker
 on:
   push:
     branches: [main, release]
     paths: [worker/**, .github/workflows/build_worker.yml]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: true
 
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'failure' && github.event.repository.full_name == 'reearth/reearth-cms' && (github.event.workflow_run.head_branch == 'release' || !startsWith(github.event.head_commit.message, 'v'))
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
@@ -71,7 +68,7 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
+          TAG: ${{ needs.info.outputs.new_tag_short }}
           NAME: ${{ needs.info.outputs.name }}
           SHA: ${{ needs.info.outputs.sha_short }}
         run: |

From 258dc3061881c4048adf836d9156cec27f16852e Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 19:34:12 +0900
Subject: [PATCH 08/28] ci: use GITHUB_OUTPUT

---
 .github/workflows/build_decompressor.yml | 16 ++++++++--------
 .github/workflows/build_server.yml       | 16 ++++++++--------
 .github/workflows/build_web.yml          | 16 ++++++++--------
 .github/workflows/build_worker.yml       | 16 ++++++++--------
 .github/workflows/deploy_aws.yml         |  2 +-
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build_decompressor.yml b/.github/workflows/build_decompressor.yml
index efd6188a29..9d2bbc857c 100644
--- a/.github/workflows/build_decompressor.yml
+++ b/.github/workflows/build_decompressor.yml
@@ -29,17 +29,17 @@ jobs:
         env:
           BRANCH: ${{ github.event.workflow_run.head_branch }}
         run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
           if [[ "$BRANCH" = "release" ]]; then
             TAG=$(git tag --points-at HEAD)
             if [[ ! -z "$TAG" ]]; then
-              echo "::set-output name=new_tag::$TAG"
-              echo "::set-output name=new_tag_short::${TAG#v}"
+              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
+              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
             else
-              echo "::set-output name=name::rc"
+              echo "name=rc" >> "$GITHUB_OUTPUT"
             fi
           else
-            echo "::set-output name=name::nightly"
+            echo "name=nightly" >> "$GITHUB_OUTPUT"
           fi
       - name: Show info
         env:
@@ -90,9 +90,9 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          echo "::set-output name=platforms::$PLATFORMS"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=tags::$TAGS"
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image
         uses: docker/build-push-action@v6
         with:
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index c2f8850816..11e68482eb 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -25,17 +25,17 @@ jobs:
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
         run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
           if [[ "$BRANCH" = "release" ]]; then
             TAG=$(git tag --points-at HEAD)
             if [[ ! -z "$TAG" ]]; then
-              echo "::set-output name=new_tag::$TAG"
-              echo "::set-output name=new_tag_short::${TAG#v}"
+              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
+              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
             else
-                echo "::set-output name=name::rc"
+              echo "name=rc" >> "$GITHUB_OUTPUT"
             fi
           else
-            echo "::set-output name=name::nightly"
+            echo "name=nightly" >> "$GITHUB_OUTPUT"
           fi
       - name: Show info
         env:
@@ -86,9 +86,9 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          echo "::set-output name=platforms::$PLATFORMS"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=tags::$TAGS"
+          ehoc "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Fetch reearth-cms-web
         uses: dawidd6/action-download-artifact@v6
         with:
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index a073930895..f213826101 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -25,17 +25,17 @@ jobs:
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
         run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
           if [[ "$BRANCH" = "release" ]]; then
             TAG=$(git tag --points-at HEAD)
             if [[ ! -z "$TAG" ]]; then
-              echo "new_tag=$TAG" >> $GITHUB_ENV
-              echo "new_tag_short=${TAG#v}" >> $GITHUB_ENV
+              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
+              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
             else
-              echo "name=rc" >> $GITHUB_ENV
+              echo "name=rc" >> "$GITHUB_OUTPUT"
             fi
           else
-            echo "name=nightly" >> $GITHUB_ENV
+            echo "name=nightly" >> "$GITHUB_OUTPUT"
           fi
       - name: Show info
         env:
@@ -86,9 +86,9 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          echo "::set-output name=platforms::$PLATFORMS"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=tags::$TAGS"
+          ehoc "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image
         uses: docker/build-push-action@v6
         with:
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 0202794d47..dea1273839 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -25,17 +25,17 @@ jobs:
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
         run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
           if [[ "$BRANCH" = "release" ]]; then
             TAG=$(git tag --points-at HEAD)
             if [[ ! -z "$TAG" ]]; then
-              echo "::set-output name=new_tag::$TAG"
-              echo "::set-output name=new_tag_short::${TAG#v}"
+              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
+              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
             else
-              echo "::set-output name=name::rc"
+              echo "name=rc" >> "$GITHUB_OUTPUT"
             fi
           else
-            echo "::set-output name=name::nightly"
+            echo "name=nightly" >> "$GITHUB_OUTPUT"
           fi
       - name: Show info
         env:
@@ -86,9 +86,9 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          echo "::set-output name=platforms::$PLATFORMS"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=tags::$TAGS"
+          ehoc "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image
         uses: docker/build-push-action@v6
         with:
diff --git a/.github/workflows/deploy_aws.yml b/.github/workflows/deploy_aws.yml
index 64c85826e9..ec7b5532eb 100644
--- a/.github/workflows/deploy_aws.yml
+++ b/.github/workflows/deploy_aws.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
       - uses: actions/cache@v4
         id: yarn-cache
         with:

From bb1876a0ad8f01b83b8869e6b588df6346d505a8 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 19:37:30 +0900
Subject: [PATCH 09/28] ci: fix typo

---
 .github/workflows/build_server.yml | 2 +-
 .github/workflows/build_web.yml    | 2 +-
 .github/workflows/build_worker.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index 11e68482eb..2b405ab45f 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -86,7 +86,7 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          ehoc "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Fetch reearth-cms-web
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index f213826101..5013e2220d 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -86,7 +86,7 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          ehoc "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          ehoo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index dea1273839..3beb14117a 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -86,7 +86,7 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          ehoc "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          ehoo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image

From a3f2668da1fef1d5122e2040d2c3989be1be0e65 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 19:39:54 +0900
Subject: [PATCH 10/28] ci: fix typo

---
 .github/workflows/build_web.yml    | 2 +-
 .github/workflows/build_worker.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index 5013e2220d..22ae5aa3e9 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -86,7 +86,7 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          ehoo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 3beb14117a..7d0a779b3a 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -86,7 +86,7 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          ehoo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image

From 3b3604d39100782bd4d56625e17ef19600631ad4 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 20:07:03 +0900
Subject: [PATCH 11/28] ci: refactor build workflows

---
 .github/workflows/build_server.yml |  6 +--
 .github/workflows/build_web.yml    |  6 +--
 .github/workflows/build_worker.yml |  5 +--
 .github/workflows/ci.yml           | 42 +++++++++++++++++--
 .github/workflows/deploy_test.yml  | 66 ++++++++----------------------
 5 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index 2b405ab45f..f6d9edfd93 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -1,14 +1,10 @@
 name: build-server
 on:
-  push:
-    branches: [main, release]
-    paths: [server/**, .github/workflows/build_server.yml]
-
+  workflow_call:
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index 22ae5aa3e9..2b9a7c35ba 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -1,14 +1,10 @@
 name: build-web
 on:
-  push:
-    branches: [ main, release ]
-    paths: [ web/**, .github/workflows/build_web.yml ]
-
+  workflow_call:
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 7d0a779b3a..384608c048 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -1,14 +1,11 @@
 name: build-worker
 on:
-  push:
-    branches: [main, release]
-    paths: [worker/**, .github/workflows/build_worker.yml]
+  workflow_call:
 
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70a1be0100..70f66b4640 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,7 @@ jobs:
       web: ${{ steps.web.outputs.any_modified }}
       server: ${{ steps.server.outputs.any_modified }}
       worker: ${{ steps.worker.outputs.any_modified }}
+      build: ${{ github.repository == 'reearth/reearth-cms' && github.event_name == 'push' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v')) }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -43,19 +44,16 @@ jobs:
             .github/workflows/build_worker.yml
 
   ci-web:
-    name: web
     needs: prepare
     if: needs.prepare.outputs.web == 'true'
     uses: ./.github/workflows/ci_web.yml
 
   ci-server:
-    name: server
     needs: prepare
     if: needs.prepare.outputs.server == 'true'
     uses: ./.github/workflows/ci_server.yml
 
   ci-worker:
-    name: worker
     needs: prepare
     if: needs.prepare.outputs.worker == 'true'
     uses: ./.github/workflows/ci_worker.yml
@@ -68,4 +66,40 @@ jobs:
       - ci-worker
     if: '!failure()'
     steps:
-      - run: echo OK
\ No newline at end of file
+      - run: echo OK
+
+  build-web:
+    needs: prepare
+    if: needs.prepare.outputs.web == 'true' && needs.prepare.outputs.build == 'true'
+    uses: ./.github/workflows/build_web.yml
+
+  build-server:
+    needs: prepare
+    if: needs.prepare.outputs.server == 'true' && needs.prepare.outputs.build == 'true'
+    uses: ./.github/workflows/build_server.yml
+
+  build-worker:
+    needs: prepare
+    if: needs.prepare.outputs.worker == 'true' && needs.prepare.outputs.build == 'true'
+    uses: ./.github/workflows/build_worker.yml
+
+  deploy-web:
+    needs: [build-web, ci-web]
+    if: needs.ci-web.result == 'success'
+    uses: ./.github/workflows/deploy_test.yml
+    with:
+      target: web
+
+  deploy-server:
+    needs: [build-server, ci-server]
+    if: needs.ci-server.result == 'success'
+    uses: ./.github/workflows/deploy_test.yml
+    with:
+      target: server
+
+  deploy-worker:
+    needs: [build-worker, ci-worker]
+    if: needs.ci-worker.result == 'success'
+    uses: ./.github/workflows/deploy_test.yml
+    with:
+      target: worker
diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
index d16b6db40f..a9474440c7 100644
--- a/.github/workflows/deploy_test.yml
+++ b/.github/workflows/deploy_test.yml
@@ -1,12 +1,19 @@
 name: deploy-test
 on:
-  workflow_run:
-    workflows: [server-build, ci-web, web-build, worker-build]
-    types: [completed]
-    branches: [main]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}-${{github.event.workflow_run.name}}
-  cancel-in-progress: true
+  workflow_dispatch:
+    inputs:
+      target:
+        description: 'Target to deploy'
+        type: choice
+        default: 'all'
+        options: ['all', 'server', 'web', 'worker']
+  workflow_call:
+    inputs:
+      target:
+        type: string
+        default: 'all'
+        description: 'Target to deploy'
+
 env:
   GCP_REGION: us-central1
 
@@ -29,52 +36,15 @@ env:
   WORKER_IMAGE_GCP: us-central1-docker.pkg.dev/reearth-oss/reearth/reearth-cms-worker:nightly
 
 jobs:
-  # TODO: Remove after dockerizing the web.
-  deploy_web_gcs:
-    name: Deploy web to test env
-    if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'ci-web' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read # To checkout
-      id-token: write # To authenticate with Google Cloud using OIDC
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ vars.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: get latest web artifact
-        uses: dawidd6/action-download-artifact@v3.1.4
-        with:
-          github_token: ${{ steps.app-token.outputs.token }}
-          workflow: ci_web.yml
-          workflow_conclusion: success
-          branch: main
-          name: reearth-cms-web
-          check_artifacts: true
-          search_artifacts: true
-      - name: Extract
-        run: tar -xvf reearth-cms-web.tar.gz
-      - uses: google-github-actions/auth@v2
-        with:
-          service_account: ${{ secrets.GCP_SA_EMAIL }}
-          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2
-      - name: Deploy
-        run: gsutil -m -h "Cache-Control:no-store" rsync -x "^reearth_config\\.json$" -dr reearth-cms-web/ $GCS_DEST
-
   deploy_server:
     name: Deploy server to test env
     runs-on: ubuntu-latest
-    if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'server-build' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && github.ref_name == 'main' && (inputs.target == 'all' || inputs.target == 'server')
     permissions:
       contents: read # To checkout
       id-token: write # To authenticate with Google Cloud using OIDC
     steps:
       - uses: actions/checkout@v4
-
       - uses: google-github-actions/auth@v2
         with:
           service_account: ${{ secrets.GCP_SA_EMAIL }}
@@ -99,13 +69,12 @@ jobs:
   deploy_web:
     name: Deploy web to test env
     runs-on: ubuntu-latest
-    if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'web-build' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && github.ref_name == 'main' && (inputs.target == 'all' || inputs.target == 'web')
     permissions:
       contents: read # To checkout
       id-token: write # To authenticate with Google Cloud using OIDC
     steps:
       - uses: actions/checkout@v4
-
       - uses: google-github-actions/auth@v2
         with:
           service_account: ${{ secrets.GCP_SA_EMAIL }}
@@ -130,13 +99,12 @@ jobs:
   deploy_worker:
     name: Deploy worker to test env
     runs-on: ubuntu-latest
-    if: github.event.repository.full_name == 'reearth/reearth-cms' && github.event.workflow_run.name == 'worker-build' && github.event.workflow_run.conclusion != 'failure' && github.event.workflow_run.head_branch == 'main'
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && github.ref_name == 'main' && (inputs.target == 'all' || inputs.target == 'worker')
     permissions:
       contents: read # To checkout
       id-token: write # To authenticate with Google Cloud using OIDC
     steps:
       - uses: actions/checkout@v4
-      
       - uses: google-github-actions/auth@v2
         with:
           service_account: ${{ secrets.GCP_SA_EMAIL }}

From f149e05c071414e1a168f4a57ff2ed06777a8a01 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 20:11:52 +0900
Subject: [PATCH 12/28] ci: fix secrets of build workflows

---
 .github/workflows/build_server.yml | 7 +++++++
 .github/workflows/build_web.yml    | 7 +++++++
 .github/workflows/build_worker.yml | 6 ++++++
 .github/workflows/ci.yml           | 9 +++++++++
 .github/workflows/ci_web.yml       | 8 ++------
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index f6d9edfd93..ed38bd26a2 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -1,6 +1,13 @@
 name: build-server
+
 on:
   workflow_call:
+    secrets:
+      DOCKERHUB_USERNAME:
+        required: true
+      DOCKERHUB_TOKEN:
+        required: true
+
 jobs:
   info:
     name: Collect information
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index 2b9a7c35ba..3d14feedc1 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -1,6 +1,13 @@
 name: build-web
+
 on:
   workflow_call:
+    secrets:
+      DOCKERHUB_USERNAME:
+        required: true
+      DOCKERHUB_TOKEN:
+        required: true
+
 jobs:
   info:
     name: Collect information
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 384608c048..1fbbcd1cfc 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -1,6 +1,12 @@
 name: build-worker
+
 on:
   workflow_call:
+    secrets:
+      DOCKERHUB_USERNAME:
+        required: true
+      DOCKERHUB_TOKEN:
+        required: true
 
 jobs:
   info:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70f66b4640..77dd49b3ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,16 +72,25 @@ jobs:
     needs: prepare
     if: needs.prepare.outputs.web == 'true' && needs.prepare.outputs.build == 'true'
     uses: ./.github/workflows/build_web.yml
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   build-server:
     needs: prepare
     if: needs.prepare.outputs.server == 'true' && needs.prepare.outputs.build == 'true'
     uses: ./.github/workflows/build_server.yml
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   build-worker:
     needs: prepare
     if: needs.prepare.outputs.worker == 'true' && needs.prepare.outputs.build == 'true'
     uses: ./.github/workflows/build_worker.yml
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   deploy-web:
     needs: [build-web, ci-web]
diff --git a/.github/workflows/ci_web.yml b/.github/workflows/ci_web.yml
index 7009e38770..c850f1262f 100644
--- a/.github/workflows/ci_web.yml
+++ b/.github/workflows/ci_web.yml
@@ -29,15 +29,11 @@ jobs:
         run: yarn i18n --fail-on-update
       - name: Build
         run: yarn build
-      
-      # TODO: Remove after dockerizing the web.
       - name: Pack
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release'
+        if: github.ref_name == 'main' || github.ref_name == 'release'
         run: mv dist reearth-cms-web && tar -zcvf reearth-cms-web.tar.gz reearth-cms-web
-
-      # TODO: Remove after dockerizing the web.
       - uses: actions/upload-artifact@v4
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release'
+        if: github.ref_name == 'main' || github.ref_name == 'release'
         with:
           name: reearth-cms-web
           path: web/reearth-cms-web.tar.gz

From 821f3b17204deece2d95fdaa5b41fbc3421ae84f Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 20:24:05 +0900
Subject: [PATCH 13/28] ci: refactor build workflows

---
 .github/workflows/build_prepare.yml | 51 ++++++++++++++++++++++++
 .github/workflows/build_server.yml  | 58 +++++++---------------------
 .github/workflows/build_web.yml     | 60 +++++++----------------------
 .github/workflows/build_worker.yml  | 58 +++++++---------------------
 .github/workflows/ci.yml            | 38 ++++++++++++++++--
 .github/workflows/deploy_test.yml   |  8 ++++
 server/Dockerfile                   |  1 -
 7 files changed, 134 insertions(+), 140 deletions(-)
 create mode 100644 .github/workflows/build_prepare.yml

diff --git a/.github/workflows/build_prepare.yml b/.github/workflows/build_prepare.yml
new file mode 100644
index 0000000000..ee7c8c98a2
--- /dev/null
+++ b/.github/workflows/build_prepare.yml
@@ -0,0 +1,51 @@
+on:
+  workflow_call:
+    outputs:
+      sha_short:
+        value: ${{ jobs.prepare.outputs.sha_short }}
+      new_tag:
+        value: ${{ jobs.prepare.outputs.new_tag }}
+      new_tag_short:
+        value: ${{ jobs.prepare.outputs.new_tag_short }}
+      name:
+        value: ${{ jobs.prepare.outputs.name }}
+
+jobs:
+  prepare:
+    name: Collect information
+    runs-on: ubuntu-latest
+    outputs:
+      sha_short: ${{ steps.info.outputs.sha_short }}
+      new_tag: ${{ steps.info.outputs.new_tag }}
+      new_tag_short: ${{ steps.info.outputs.new_tag_short }}
+      name: ${{ steps.info.outputs.name }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: Fetch tags
+        run: git fetch --prune --unshallow --tags
+      - name: Get info
+        id: info
+        # The tag name should be retrieved lazily, as tagging may be delayed.
+        env:
+          BRANCH: ${{ github.head_ref || github.ref_name }}
+        run: |
+          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
+          if [[ "$BRANCH" = "release" ]]; then
+            TAG=$(git tag --points-at HEAD)
+            if [[ ! -z "$TAG" ]]; then
+              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
+              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
+            else
+              echo "name=rc" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            echo "name=nightly" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Show info
+        env:
+          SHA_SHORT: ${{ steps.info.outputs.sha_short }}
+          NEW_TAG: ${{ steps.info.outputs.new_tag }}
+          NEW_TAG_SHORT: ${{ steps.info.outputs.new_tag_short }}
+          NAME: ${{ steps.info.outputs.name }}
+        run: echo "sha_short=$SHA_SHORT, new_tag=$NEW_TAG, new_tag_short=$NEW_TAG_SHORT, name=$NAME"
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index ed38bd26a2..c953781a2b 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -2,6 +2,15 @@ name: build-server
 
 on:
   workflow_call:
+    inputs:
+      sha_short:
+        type: string
+      new_tag:
+        type: string
+      new_tag_short:
+        type: string
+      name:
+        type: string
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -9,51 +18,10 @@ on:
         required: true
 
 jobs:
-  info:
-    name: Collect information
-    runs-on: ubuntu-latest
-    outputs:
-      sha_short: ${{ steps.info.outputs.sha_short }}
-      new_tag: ${{ steps.info.outputs.new_tag }}
-      new_tag_short: ${{ steps.info.outputs.new_tag_short }}
-      name: ${{ steps.info.outputs.name }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: Fetch tags
-        run: git fetch --prune --unshallow --tags
-      - name: Get info
-        id: info
-        # The tag name should be retrieved lazily, as tagging may be delayed.
-        env:
-          BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: |
-          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
-          if [[ "$BRANCH" = "release" ]]; then
-            TAG=$(git tag --points-at HEAD)
-            if [[ ! -z "$TAG" ]]; then
-              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
-              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
-            else
-              echo "name=rc" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            echo "name=nightly" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Show info
-        env:
-          SHA_SHORT: ${{ steps.info.outputs.sha_short }}
-          NEW_TAG: ${{ steps.info.outputs.new_tag }}
-          NEW_TAG_SHORT: ${{ steps.info.outputs.new_tag_short }}
-          NAME: ${{ steps.info.outputs.name }}
-        run: echo "sha_short=$SHA_SHORT, new_tag=$NEW_TAG, new_tag_short=$NEW_TAG_SHORT, name=$NAME"
-
   docker:
     name: Build and push Docker image
     runs-on: ubuntu-latest
-    needs:
-      - info
-    if: needs.info.outputs.name || needs.info.outputs.new_tag
+    if: inputs.name || inputs.new_tag
     env:
       IMAGE_NAME: reearth/reearth-cms
     steps:
@@ -71,9 +39,9 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.new_tag_short }}
-          NAME: ${{ needs.info.outputs.name }}
-          SHA: ${{ needs.info.outputs.sha_short }}
+          TAG: ${{ inputs.new_tag_short }}
+          NAME: ${{ inputs.name }}
+          SHA: ${{ inputs.sha_short }}
         run: |
           if [[ -n $TAG ]]; then
             PLATFORMS=linux/amd64,linux/arm64
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index 3d14feedc1..d97dcac90c 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -2,6 +2,15 @@ name: build-web
 
 on:
   workflow_call:
+    inputs:
+      sha_short:
+        type: string
+      new_tag:
+        type: string
+      new_tag_short:
+        type: string
+      name:
+        type: string
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -9,51 +18,10 @@ on:
         required: true
 
 jobs:
-  info:
-    name: Collect information
-    runs-on: ubuntu-latest
-    outputs:
-      sha_short: ${{ steps.info.outputs.sha_short }}
-      new_tag: ${{ steps.info.outputs.new_tag }}
-      new_tag_short: ${{ steps.info.outputs.new_tag_short }}
-      name: ${{ steps.info.outputs.name }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: Fetch tags
-        run: git fetch --prune --unshallow --tags
-      - name: Get info
-        id: info
-        # The tag name should be retrieved lazily, as tagging may be delayed.
-        env:
-          BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: |
-          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
-          if [[ "$BRANCH" = "release" ]]; then
-            TAG=$(git tag --points-at HEAD)
-            if [[ ! -z "$TAG" ]]; then
-              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
-              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
-            else
-              echo "name=rc" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            echo "name=nightly" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Show info
-        env:
-          SHA_SHORT: ${{ steps.info.outputs.sha_short }}
-          NEW_TAG: ${{ steps.info.outputs.new_tag }}
-          NEW_TAG_SHORT: ${{ steps.info.outputs.new_tag_short }}
-          NAME: ${{ steps.info.outputs.name }}
-        run: echo "sha_short=$SHA_SHORT, new_tag=$NEW_TAG, new_tag_short=$NEW_TAG_SHORT, name=$NAME"
-
   docker:
     name: Build and push Docker image
     runs-on: ubuntu-latest
-    needs:
-      - info
-    if: needs.info.outputs.name || needs.info.outputs.new_tag
+    if: inputs.name || inputs.new_tag
     env:
       IMAGE_NAME: reearth/reearth-cms-web
     steps:
@@ -71,9 +39,9 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.new_tag_short }}
-          NAME: ${{ needs.info.outputs.name }}
-          SHA: ${{ needs.info.outputs.sha_short }}
+          TAG: ${{ inputs.new_tag_short }}
+          NAME: ${{ inputs.name }}
+          SHA: ${{ inputs.sha_short }}
         run: |
           if [[ -n $TAG ]]; then
             PLATFORMS=linux/amd64,linux/arm64
@@ -99,7 +67,7 @@ jobs:
           platforms: ${{ steps.options.outputs.platforms }}
           push: true
           build-args: |
-            GITHUB_SHA=${{ needs.info.outputs.sha_short }}
+            GITHUB_SHA=${{ inputs.sha_short }}
             VERSION=${{ steps.options.outputs.version }}
           tags: ${{ steps.options.outputs.tags }}
           cache-from: type=gha
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 1fbbcd1cfc..c862f3a55b 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -2,6 +2,15 @@ name: build-worker
 
 on:
   workflow_call:
+    inputs:
+      sha_short:
+        type: string
+      new_tag:
+        type: string
+      new_tag_short:
+        type: string
+      name:
+        type: string
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -9,51 +18,10 @@ on:
         required: true
 
 jobs:
-  info:
-    name: Collect information
-    runs-on: ubuntu-latest
-    outputs:
-      sha_short: ${{ steps.info.outputs.sha_short }}
-      new_tag: ${{ steps.info.outputs.new_tag }}
-      new_tag_short: ${{ steps.info.outputs.new_tag_short }}
-      name: ${{ steps.info.outputs.name }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: Fetch tags
-        run: git fetch --prune --unshallow --tags
-      - name: Get info
-        id: info
-        # The tag name should be retrieved lazily, as tagging may be delayed.
-        env:
-          BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: |
-          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
-          if [[ "$BRANCH" = "release" ]]; then
-            TAG=$(git tag --points-at HEAD)
-            if [[ ! -z "$TAG" ]]; then
-              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
-              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
-            else
-              echo "name=rc" >> "$GITHUB_OUTPUT"
-            fi
-          else
-            echo "name=nightly" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Show info
-        env:
-          SHA_SHORT: ${{ steps.info.outputs.sha_short }}
-          NEW_TAG: ${{ steps.info.outputs.new_tag }}
-          NEW_TAG_SHORT: ${{ steps.info.outputs.new_tag_short }}
-          NAME: ${{ steps.info.outputs.name }}
-        run: echo "sha_short=$SHA_SHORT, new_tag=$NEW_TAG, new_tag_short=$NEW_TAG_SHORT, name=$NAME"
-
   docker:
     name: Build and push Docker image
     runs-on: ubuntu-latest
-    needs:
-      - info
-    if: needs.info.outputs.name || needs.info.outputs.new_tag
+    if: inputs.name || inputs.new_tag
     env:
       IMAGE_NAME: reearth/reearth-cms-worker
     steps:
@@ -71,9 +39,9 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.new_tag_short }}
-          NAME: ${{ needs.info.outputs.name }}
-          SHA: ${{ needs.info.outputs.sha_short }}
+          TAG: ${{ inputs.new_tag_short }}
+          NAME: ${{ inputs.name }}
+          SHA: ${{ inputs.sha_short }}
         run: |
           if [[ -n $TAG ]]; then
             PLATFORMS=linux/amd64,linux/arm64
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 77dd49b3ad..53b2749a1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,26 +68,46 @@ jobs:
     steps:
       - run: echo OK
 
-  build-web:
+  build-prepare:
     needs: prepare
+    if: needs.prepare.outputs.build == 'true'
+    uses: ./.github/workflows/build_prepare.yml
+
+  build-web:
+    needs: [prepare, build-prepare]
     if: needs.prepare.outputs.web == 'true' && needs.prepare.outputs.build == 'true'
     uses: ./.github/workflows/build_web.yml
+    with:
+      name: ${{ needs.build-prepare.outputs.name }}
+      new_tag: ${{ needs.build-prepare.outputs.new_tag }}
+      new_tag_short: ${{ needs.build-prepare.outputs.new_tag_short }}
+      sha_short: ${{ needs.build-prepare.outputs.sha_short }}
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   build-server:
-    needs: prepare
+    needs: [prepare, build-prepare]
     if: needs.prepare.outputs.server == 'true' && needs.prepare.outputs.build == 'true'
     uses: ./.github/workflows/build_server.yml
+    with:
+      name: ${{ needs.build-prepare.outputs.name }}
+      new_tag: ${{ needs.build-prepare.outputs.new_tag }}
+      new_tag_short: ${{ needs.build-prepare.outputs.new_tag_short }}
+      sha_short: ${{ needs.build-prepare.outputs.sha_short }}
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   build-worker:
-    needs: prepare
+    needs: [prepare, build-prepare]
     if: needs.prepare.outputs.worker == 'true' && needs.prepare.outputs.build == 'true'
     uses: ./.github/workflows/build_worker.yml
+    with:
+      name: ${{ needs.build-prepare.outputs.name }}
+      new_tag: ${{ needs.build-prepare.outputs.new_tag }}
+      new_tag_short: ${{ needs.build-prepare.outputs.new_tag_short }}
+      sha_short: ${{ needs.build-prepare.outputs.sha_short }}
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -98,6 +118,10 @@ jobs:
     uses: ./.github/workflows/deploy_test.yml
     with:
       target: web
+    secrets:
+      GCP_SA_EMAIL: ${{ secrets.GCP_SA_EMAIL }}
+      GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+      GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
 
   deploy-server:
     needs: [build-server, ci-server]
@@ -105,6 +129,10 @@ jobs:
     uses: ./.github/workflows/deploy_test.yml
     with:
       target: server
+    secrets:
+      GCP_SA_EMAIL: ${{ secrets.GCP_SA_EMAIL }}
+      GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+      GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
 
   deploy-worker:
     needs: [build-worker, ci-worker]
@@ -112,3 +140,7 @@ jobs:
     uses: ./.github/workflows/deploy_test.yml
     with:
       target: worker
+    secrets:
+      GCP_SA_EMAIL: ${{ secrets.GCP_SA_EMAIL }}
+      GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+      GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
index a9474440c7..e6d99a6c08 100644
--- a/.github/workflows/deploy_test.yml
+++ b/.github/workflows/deploy_test.yml
@@ -1,4 +1,5 @@
 name: deploy-test
+
 on:
   workflow_dispatch:
     inputs:
@@ -13,6 +14,13 @@ on:
         type: string
         default: 'all'
         description: 'Target to deploy'
+    secrets:
+      GCP_PROJECT_ID:
+        required: true
+      GCP_SA_EMAIL:
+        required: true
+      GCP_WORKLOAD_IDENTITY_PROVIDER:
+        required: true
 
 env:
   GCP_REGION: us-central1
diff --git a/server/Dockerfile b/server/Dockerfile
index 8d799a9449..777adfe083 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -21,7 +21,6 @@ FROM scratch
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=build /etc/mime.types /etc/mime.types
 COPY --from=build /app/reearth-cms /app/reearth-cms
-COPY web* /app/web/
 
 WORKDIR /app
 

From bf0ea63df7f0c51997ac6030de6ab3d658302055 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 20:39:44 +0900
Subject: [PATCH 14/28] ci: refactor workflows

---
 .github/workflows/build_prepare.yml | 1 -
 .github/workflows/build_server.yml  | 1 -
 .github/workflows/build_web.yml     | 1 -
 .github/workflows/build_worker.yml  | 1 -
 .github/workflows/ci.yml            | 9 ++++-----
 .github/workflows/deploy_test.yml   | 7 +------
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_prepare.yml b/.github/workflows/build_prepare.yml
index ee7c8c98a2..4cc76d33a4 100644
--- a/.github/workflows/build_prepare.yml
+++ b/.github/workflows/build_prepare.yml
@@ -12,7 +12,6 @@ on:
 
 jobs:
   prepare:
-    name: Collect information
     runs-on: ubuntu-latest
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index c953781a2b..1cc2169799 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -19,7 +19,6 @@ on:
 
 jobs:
   docker:
-    name: Build and push Docker image
     runs-on: ubuntu-latest
     if: inputs.name || inputs.new_tag
     env:
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index d97dcac90c..852cdbc880 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -19,7 +19,6 @@ on:
 
 jobs:
   docker:
-    name: Build and push Docker image
     runs-on: ubuntu-latest
     if: inputs.name || inputs.new_tag
     env:
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index c862f3a55b..46f6812ebc 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -19,7 +19,6 @@ on:
 
 jobs:
   docker:
-    name: Build and push Docker image
     runs-on: ubuntu-latest
     if: inputs.name || inputs.new_tag
     env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53b2749a1c..7681d7b98b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,6 @@ jobs:
       web: ${{ steps.web.outputs.any_modified }}
       server: ${{ steps.server.outputs.any_modified }}
       worker: ${{ steps.worker.outputs.any_modified }}
-      build: ${{ github.repository == 'reearth/reearth-cms' && github.event_name == 'push' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v')) }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -70,12 +69,12 @@ jobs:
 
   build-prepare:
     needs: prepare
-    if: needs.prepare.outputs.build == 'true'
+    if: ${{ github.repository == 'reearth/reearth-cms' && github.event_name == 'push' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v')) }}
     uses: ./.github/workflows/build_prepare.yml
 
   build-web:
     needs: [prepare, build-prepare]
-    if: needs.prepare.outputs.web == 'true' && needs.prepare.outputs.build == 'true'
+    if: needs.prepare.outputs.web == 'true'
     uses: ./.github/workflows/build_web.yml
     with:
       name: ${{ needs.build-prepare.outputs.name }}
@@ -88,7 +87,7 @@ jobs:
 
   build-server:
     needs: [prepare, build-prepare]
-    if: needs.prepare.outputs.server == 'true' && needs.prepare.outputs.build == 'true'
+    if: needs.prepare.outputs.server == 'true'
     uses: ./.github/workflows/build_server.yml
     with:
       name: ${{ needs.build-prepare.outputs.name }}
@@ -101,7 +100,7 @@ jobs:
 
   build-worker:
     needs: [prepare, build-prepare]
-    if: needs.prepare.outputs.worker == 'true' && needs.prepare.outputs.build == 'true'
+    if: needs.prepare.outputs.worker == 'true'
     uses: ./.github/workflows/build_worker.yml
     with:
       name: ${{ needs.build-prepare.outputs.name }}
diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
index e6d99a6c08..f6f264457a 100644
--- a/.github/workflows/deploy_test.yml
+++ b/.github/workflows/deploy_test.yml
@@ -23,11 +23,9 @@ on:
         required: true
 
 env:
+  # TODO: use environment variables
   GCP_REGION: us-central1
 
-  # TODO: Remove after dockerizing the web.
-  GCS_DEST: gs://cms.test.reearth.dev
-
   # server
   SERVER_IMAGE: reearth/reearth-cms:nightly
   SERVER_IMAGE_NAME: us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/reearth/reearth-cms:nightly
@@ -45,7 +43,6 @@ env:
 
 jobs:
   deploy_server:
-    name: Deploy server to test env
     runs-on: ubuntu-latest
     if: github.event.repository.full_name == 'reearth/reearth-cms' && github.ref_name == 'main' && (inputs.target == 'all' || inputs.target == 'server')
     permissions:
@@ -75,7 +72,6 @@ jobs:
             --quiet
 
   deploy_web:
-    name: Deploy web to test env
     runs-on: ubuntu-latest
     if: github.event.repository.full_name == 'reearth/reearth-cms' && github.ref_name == 'main' && (inputs.target == 'all' || inputs.target == 'web')
     permissions:
@@ -105,7 +101,6 @@ jobs:
             --quiet
 
   deploy_worker:
-    name: Deploy worker to test env
     runs-on: ubuntu-latest
     if: github.event.repository.full_name == 'reearth/reearth-cms' && github.ref_name == 'main' && (inputs.target == 'all' || inputs.target == 'worker')
     permissions:

From cb9a46138d9520511c34b81d8c4f34de010ccbbe Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 21:40:47 +0900
Subject: [PATCH 15/28] chore(server): update go.work.sum

---
 go.work.sum | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/go.work.sum b/go.work.sum
index 47b96469e9..4df069b56b 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -38,6 +38,7 @@ cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5x
 cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic=
 cloud.google.com/go v0.112.2/go.mod h1:iEqjp//KquGIJV/m+Pk3xecgKNhV+ry+vVTsy4TbDms=
 cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU=
+cloud.google.com/go v0.115.1/go.mod h1:DuujITeaufu3gL68/lOFIirVNJwQeyf5UXyi+Wbgknc=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accessapproval v1.6.0 h1:x0cEHro/JFPd7eS4BlEWNTMecIj2HdXjOVB5BtvwER0=
 cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
@@ -248,6 +249,7 @@ cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQS
 cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs=
 cloud.google.com/go/auth v0.8.0/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc=
 cloud.google.com/go/auth v0.9.0/go.mod h1:2HsApZBr9zGZhC9QAXsYVYaWk8kNUt37uny+XVKi7wM=
+cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk=
 cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q=
 cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I=
 cloud.google.com/go/automl v1.5.0 h1:Av8bE5rMQxUl4SVfYsEczEJf1ftIKQOUGGzpzEYwodY=
@@ -488,6 +490,7 @@ cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1h
 cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
+cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
 cloud.google.com/go/compute/metadata v0.5.1/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
 cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
 cloud.google.com/go/contactcenterinsights v1.6.0 h1:jXIpfcH/VYSE1SYcPzO0n1VVb+sAamiLOgCw45JbOQk=
@@ -1018,6 +1021,7 @@ cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5
 cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
 cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO1+zE=
 cloud.google.com/go/iam v1.1.12/go.mod h1:9LDX8J7dN5YRyzVHxwQzrQs9opFFqn0Mxs9nAeB+Hhg=
+cloud.google.com/go/iam v1.2.0/go.mod h1:zITGuWgsLZxd8OwAlX+eMFgZDXzBm7icj1PVTYG766Q=
 cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
 cloud.google.com/go/iap v1.7.1 h1:PxVHFuMxmSZyfntKXHXhd8bo82WJ+LcATenq7HLdVnU=
 cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74=
@@ -1118,6 +1122,7 @@ cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUz
 cloud.google.com/go/longrunning v0.5.6/go.mod h1:vUaDrWYOMKRuhiv6JBnn49YxCPz2Ayn9GqyjaBT8/mA=
 cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng=
 cloud.google.com/go/longrunning v0.5.12/go.mod h1:S5hMV8CDJ6r50t2ubVJSKQVv5u0rmik5//KgLO3k4lU=
+cloud.google.com/go/longrunning v0.6.0/go.mod h1:uHzSZqW89h7/pasCWNYdUpwGz3PcVWhrWupreVPYLts=
 cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
 cloud.google.com/go/managedidentities v1.5.0 h1:ZRQ4k21/jAhrHBVKl/AY7SjgzeJwG1iZa+mJ82P+VNg=
 cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
@@ -1741,6 +1746,7 @@ cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7Biccwk
 cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
 cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
 cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY=
+cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=
 cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
 cloud.google.com/go/storagetransfer v1.8.0 h1:5T+PM+3ECU3EY2y9Brv0Sf3oka8pKmsCfpQ07+91G9o=
 cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw=
@@ -2346,6 +2352,7 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5
 github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
 github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/enterprise-certificate-proxy v0.3.3/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
 github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -2840,6 +2847,7 @@ golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+
 golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2925,6 +2933,7 @@ golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
@@ -3035,6 +3044,7 @@ golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808 h1:+Kc94D8UVEVxJnLXp/+FMfqQARZtWHfVrcRtcG8aT3g=
 golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=
 golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk=
@@ -3073,6 +3083,7 @@ golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3080,6 +3091,7 @@ golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=
 golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -3205,6 +3217,7 @@ google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SB
 google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag=
 google.golang.org/api v0.191.0/go.mod h1:tD5dsFGxFza0hnQveGfVk9QQYKcfp+VzgRqyXFxE0+E=
 google.golang.org/api v0.193.0/go.mod h1:Po3YMV1XZx+mTku3cfJrlIYR03wiGrCOsdpC67hjZvw=
+google.golang.org/api v0.196.0/go.mod h1:g9IL21uGkYgvQ5BZg6BAtoGJQIm8r6EgaAbpNey5wBE=
 google.golang.org/api v0.197.0/go.mod h1:AuOuo20GoQ331nq7DquGHlU6d+2wN2fZ8O0ta60nRNw=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
@@ -3323,6 +3336,7 @@ google.golang.org/genproto v0.0.0-20240205150955-31a09d347014/go.mod h1:xEgQu1e4
 google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M=
 google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:mCr1K1c8kX+1iSBREvU3Juo11CB+QOEWxbRS01wWl5M=
 google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4=
+google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4=
 google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
 google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
 google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
@@ -3348,6 +3362,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f/go.
 google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
 google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo=
 google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo=
+google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20230629202037-9506855d4529 h1:3iZ0UBTVGPyczwi1ZR5vYcuAKxvqLY4kAAEeBJYzyvo=
 google.golang.org/genproto/googleapis/bytestream v0.0.0-20230629202037-9506855d4529/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
@@ -3395,6 +3410,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
@@ -3443,6 +3459,7 @@ google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDom
 google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
 google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
 google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
 google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
@@ -3458,6 +3475,7 @@ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=

From 19c3cba9b1536a86572dc3b7add301b5717ac987 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 21:42:17 +0900
Subject: [PATCH 16/28] ci: add docker_decompressor building

---
 .github/workflows/build_worker.yml | 53 ++++++++++++++++++++++++++++++
 .github/workflows/ci.yml           |  1 +
 2 files changed, 54 insertions(+)

diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 46f6812ebc..c5de8cd5d7 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -69,3 +69,56 @@ jobs:
           tags: ${{ steps.options.outputs.tags }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+  docker_decompressor:
+    runs-on: ubuntu-latest
+    if: inputs.name || inputs.new_tag
+    env:
+      IMAGE_NAME: reearth/reearth-cms-decompressor
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get options
+        id: options
+        env:
+          TAG: ${{ inputs.new_tag_short }}
+          NAME: ${{ inputs.name }}
+          SHA: ${{ inputs.sha_short }}
+        run: |
+          if [[ -n $TAG ]]; then
+            PLATFORMS=linux/amd64,linux/arm64
+            VERSION=$TAG
+            TAGS=$IMAGE_NAME:$TAG
+            if [[ ! $TAG =~ '-' ]]; then
+              TAGS+=,${IMAGE_NAME}:${TAG%.*}
+              TAGS+=,${IMAGE_NAME}:${TAG%%.*}
+              TAGS+=,${IMAGE_NAME}:latest
+            fi
+          else
+            PLATFORMS=linux/amd64
+            VERSION=$SHA
+            TAGS=$IMAGE_NAME:$NAME
+          fi
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
+      - name: Build and push docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./worker
+          file: ./worker/Dockerfile.decompressor
+          platforms: ${{ steps.options.outputs.platforms }}
+          push: true
+          build-args: VERSION=${{ steps.options.outputs.version }}
+          tags: ${{ steps.options.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7681d7b98b..d86a61b868 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,7 @@ jobs:
             web/**
             .github/workflows/ci.yml
             .github/workflows/ci_web.yml
+            .github/workflows/build_web.yml
 
       - name: changed files for server
         id: server

From 2cdcec593f51b2713302c77a22611ed2637f56a9 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 21:51:51 +0900
Subject: [PATCH 17/28] ci(worker): fix decompressor dockerfile path

---
 .github/workflows/build_worker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index c5de8cd5d7..7df9f039f0 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -115,7 +115,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./worker
-          file: ./worker/Dockerfile.decompressor
+          file: ./Dockerfile.decompressor
           platforms: ${{ steps.options.outputs.platforms }}
           push: true
           build-args: VERSION=${{ steps.options.outputs.version }}

From 9c637b286e55a9961c247737473a9ca7c65e3724 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 21:57:55 +0900
Subject: [PATCH 18/28] ci(worker): fix decompressor dockerfile path

---
 .github/workflows/build_worker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 7df9f039f0..0219c910eb 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -115,7 +115,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./worker
-          file: ./Dockerfile.decompressor
+          file: ./decompressor.Dockerfile
           platforms: ${{ steps.options.outputs.platforms }}
           push: true
           build-args: VERSION=${{ steps.options.outputs.version }}

From 94bea284810ee78d197dc32df42a318665aa239d Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Fri, 1 Nov 2024 22:04:19 +0900
Subject: [PATCH 19/28] ci(worker): fix decompressor dockerfile path

---
 .github/workflows/build_worker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 0219c910eb..306b32f13a 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -115,7 +115,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ./worker
-          file: ./decompressor.Dockerfile
+          file: ./worker/decompressor.Dockerfile
           platforms: ${{ steps.options.outputs.platforms }}
           push: true
           build-args: VERSION=${{ steps.options.outputs.version }}

From 3b42903e05421a1d8ebee71f802ff1cb5463f9e8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:58:10 +0100
Subject: [PATCH 20/28] chore: update go dependencies (#1296)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 server/go.mod | 44 ++++++++++++------------
 server/go.sum | 92 +++++++++++++++++++++++++--------------------------
 worker/go.mod | 38 ++++++++++-----------
 worker/go.sum | 76 +++++++++++++++++++++---------------------
 4 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/server/go.mod b/server/go.mod
index 49a64e9cb0..a7e2e34aa1 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -4,13 +4,13 @@ go 1.23.2
 
 require (
 	cloud.google.com/go/pubsub v1.45.1
-	cloud.google.com/go/storage v1.45.0
+	cloud.google.com/go/storage v1.46.0
 	github.com/99designs/gqlgen v0.17.55
 	github.com/avast/retry-go/v4 v4.6.0
-	github.com/aws/aws-sdk-go-v2 v1.32.2
-	github.com/aws/aws-sdk-go-v2/config v1.28.0
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.1
-	github.com/aws/aws-sdk-go-v2/service/sns v1.33.2
+	github.com/aws/aws-sdk-go-v2 v1.32.3
+	github.com/aws/aws-sdk-go-v2/config v1.28.1
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2
+	github.com/aws/aws-sdk-go-v2/service/sns v1.33.3
 	github.com/chrispappas/golang-generics-set v1.0.1
 	github.com/gavv/httpexpect/v2 v2.16.0
 	github.com/getkin/kin-openapi v0.128.0
@@ -43,14 +43,14 @@ require (
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
 	golang.org/x/net v0.30.0
 	golang.org/x/text v0.19.0
-	google.golang.org/api v0.203.0
+	google.golang.org/api v0.204.0
 )
 
 require (
 	cel.dev/expr v0.16.1 // indirect
 	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/auth v0.9.9 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
+	cloud.google.com/go/auth v0.10.0 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
 	cloud.google.com/go/compute/metadata v0.5.2 // indirect
 	cloud.google.com/go/iam v1.2.1 // indirect
 	cloud.google.com/go/monitoring v1.21.1 // indirect
@@ -66,20 +66,20 @@ require (
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/auth0/go-jwt-middleware/v2 v2.2.1 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.41 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.42 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ses v1.19.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
 	github.com/aws/smithy-go v1.22.0 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -177,9 +177,9 @@ require (
 	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
 	google.golang.org/grpc v1.67.1 // indirect
 	google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
 	google.golang.org/protobuf v1.35.1 // indirect
diff --git a/server/go.sum b/server/go.sum
index 128d805746..1c19f3f08f 100644
--- a/server/go.sum
+++ b/server/go.sum
@@ -3,26 +3,26 @@ cel.dev/expr v0.16.1/go.mod h1:AsGA5zb3WruAEQeQng1RZdGEXmBj0jvMWh6l5SnNuC8=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
 cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
-cloud.google.com/go/auth v0.9.9 h1:BmtbpNQozo8ZwW2t7QJjnrQtdganSdmqeIBxHxNkEZQ=
-cloud.google.com/go/auth v0.9.9/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
-cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
-cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc=
+cloud.google.com/go/auth v0.10.0 h1:tWlkvFAh+wwTOzXIjrwM64karR1iTBZ/GRr0S/DULYo=
+cloud.google.com/go/auth v0.10.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
+cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk=
+cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
 cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
 cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
 cloud.google.com/go/iam v1.2.1 h1:QFct02HRb7H12J/3utj0qf5tobFh9V4vR6h9eX5EBRU=
 cloud.google.com/go/iam v1.2.1/go.mod h1:3VUIJDPpwT6p/amXRC5GY8fCCh70lxPygguVtI0Z4/g=
 cloud.google.com/go/kms v1.20.0 h1:uKUvjGqbBlI96xGE669hcVnEMw1Px/Mvfa62dhM5UrY=
 cloud.google.com/go/kms v1.20.0/go.mod h1:/dMbFF1tLLFnQV44AoI2GlotbjowyUfgVwezxW291fM=
-cloud.google.com/go/logging v1.11.0 h1:v3ktVzXMV7CwHq1MBF65wcqLMA7i+z3YxbUsoK7mOKs=
-cloud.google.com/go/logging v1.11.0/go.mod h1:5LDiJC/RxTt+fHc1LAt20R9TKiUTReDg6RuuFOZ67+A=
+cloud.google.com/go/logging v1.12.0 h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk=
+cloud.google.com/go/logging v1.12.0/go.mod h1:wwYBt5HlYP1InnrtYI0wtwttpVU1rifnMT7RejksUAM=
 cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc=
 cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0=
 cloud.google.com/go/monitoring v1.21.1 h1:zWtbIoBMnU5LP9A/fz8LmWMGHpk4skdfeiaa66QdFGc=
 cloud.google.com/go/monitoring v1.21.1/go.mod h1:Rj++LKrlht9uBi8+Eb530dIrzG/cU/lB8mt+lbeFK1c=
 cloud.google.com/go/pubsub v1.45.1 h1:ZC/UzYcrmK12THWn1P72z+Pnp2vu/zCZRXyhAfP1hJY=
 cloud.google.com/go/pubsub v1.45.1/go.mod h1:3bn7fTmzZFwaUjllitv1WlsNMkqBgGUb3UdMhI54eCc=
-cloud.google.com/go/storage v1.45.0 h1:5av0QcIVj77t+44mV4gffFC/LscFRUhto6UBMB5SimM=
-cloud.google.com/go/storage v1.45.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE=
+cloud.google.com/go/storage v1.46.0 h1:OTXISBpFd8KaA2ClT3K3oRk8UGOcTHtrZ1bW88xKiic=
+cloud.google.com/go/storage v1.46.0/go.mod h1:lM+gMAW91EfXIeMTBmixRsKL/XCxysytoAgduVikjMk=
 cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew=
 cloud.google.com/go/trace v1.11.1/go.mod h1:IQKNQuBzH72EGaXEodKlNJrWykGZxet2zgjtS60OtjA=
 github.com/99designs/gqlgen v0.17.55 h1:3vzrNWYyzSZjGDFo68e5j9sSauLxfKvLp+6ioRokVtM=
@@ -67,44 +67,44 @@ github.com/auth0/go-jwt-middleware/v2 v2.2.1 h1:pqxEIwlCztD0T9ZygGfOrw4NK/F9iotn
 github.com/auth0/go-jwt-middleware/v2 v2.2.1/go.mod h1:CSi0tuu0QrALbWdiQZwqFL8SbBhj4e2MJzkvNfjY0Us=
 github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA=
 github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE=
-github.com/aws/aws-sdk-go-v2 v1.32.2 h1:AkNLZEyYMLnx/Q/mSKkcMqwNFXMAvFto9bNsHqcTduI=
-github.com/aws/aws-sdk-go-v2 v1.32.2/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
+github.com/aws/aws-sdk-go-v2 v1.32.3 h1:T0dRlFBKcdaUPGNtkBSwHZxrtis8CQU17UpNBZYd0wk=
+github.com/aws/aws-sdk-go-v2 v1.32.3/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 h1:pT3hpW0cOHRJx8Y0DfJUEQuqPild8jRGmSFmBgvydr0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6/go.mod h1:j/I2++U0xX+cr44QjHay4Cvxj6FUbnxrgmqN3H1jTZA=
-github.com/aws/aws-sdk-go-v2/config v1.28.0 h1:FosVYWcqEtWNxHn8gB/Vs6jOlNwSoyOCA/g/sxyySOQ=
-github.com/aws/aws-sdk-go-v2/config v1.28.0/go.mod h1:pYhbtvg1siOOg8h5an77rXle9tVG8T+BWLWAo7cOukc=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.41 h1:7gXo+Axmp+R4Z+AK8YFQO0ZV3L0gizGINCOWxSLY9W8=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.41/go.mod h1:u4Eb8d3394YLubphT4jLEwN1rLNq2wFOlT6OuxFwPzU=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 h1:TMH3f/SCAWdNtXXVPPu5D6wrr4G5hI1rAxbcocKfC7Q=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17/go.mod h1:1ZRXLdTpzdJb9fwTMXiLipENRxkGMTn1sfKexGllQCw=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 h1:UAsR3xA31QGf79WzpG/ixT9FZvQlh5HY1NRqSHBNOCk=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21/go.mod h1:JNr43NFf5L9YaG3eKTm7HQzls9J+A9YYcGI5Quh1r2Y=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 h1:6jZVETqmYCadGFvrYEQfC5fAQmlo80CeL5psbno6r0s=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21/go.mod h1:1SR0GbLlnN3QUmYaflZNiH1ql+1qrSiB2vwcJ+4UM60=
+github.com/aws/aws-sdk-go-v2/config v1.28.1 h1:oxIvOUXy8x0U3fR//0eq+RdCKimWI900+SV+10xsCBw=
+github.com/aws/aws-sdk-go-v2/config v1.28.1/go.mod h1:bRQcttQJiARbd5JZxw6wG0yIK3eLeSCPdg6uqmmlIiI=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.42 h1:sBP0RPjBU4neGpIYyx8mkU2QqLPl5u9cmdTWVzIpHkM=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.42/go.mod h1:FwZBfU530dJ26rv9saAbxa9Ej3eF/AK0OAY86k13n4M=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 h1:68jFVtt3NulEzojFesM/WVarlFpCaXLKaBxDpzkQ9OQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18/go.mod h1:Fjnn5jQVIo6VyedMc0/EhPpfNlPl7dHV916O6B+49aE=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 h1:Jw50LwEkVjuVzE1NzkhNKkBf9cRN7MtE1F/b2cOKTUM=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22/go.mod h1:Y/SmAyPcOTmpeVaWSzSKiILfXTVJwrGmYZhcRbhWuEY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 h1:981MHwBaRZM7+9QSR6XamDzF/o7ouUGxFzr+nVSIhrs=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22/go.mod h1:1RA1+aBEfn+CAB/Mh0MB6LsdCYCnjZm7tKXtnk499ZQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21 h1:7edmS3VOBDhK00b/MwGtGglCm7hhwNYnjJs/PgFdMQE=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21/go.mod h1:Q9o5h4HoIWG8XfzxqiuK/CGUbepCJ8uTlaE3bAbxytQ=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 h1:yV+hCAHZZYJQcwAaszoBNwLbPItHvApxT0kVIw6jRgs=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22/go.mod h1:kbR1TL8llqB1eGnVbybcA4/wgScxdylOdyAd51yxPdw=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2 h1:4FMHqLfk0efmTqhXVRL5xYRqlEBNBiRI7N6w4jsEdd4=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2/go.mod h1:LWoqeWlK9OZeJxsROW2RqrSPvQHKTpp69r/iDjwsSaw=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 h1:s7NA1SOw8q/5c0wr8477yOPp0z+uBaXBnLE0XYb0POA=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2/go.mod h1:fnjjWyAW/Pj5HYOxl9LJqWtEwS7W2qgcRLWP+uWbss0=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 h1:t7iUP9+4wdc5lt3E41huP+GvQZJD38WLsgVp4iOtAjg=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2/go.mod h1:/niFCtmuQNxqx9v8WAPq5qh7EH25U4BF6tjoyq9bObM=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.66.1 h1:MkQ4unegQEStiQYmfFj+Aq5uTp265ncSmm0XTQwDwi0=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.66.1/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 h1:kT6BcZsmMtNkP/iYMcRG+mIEA/IbeiUimXtGmqF39y0=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3/go.mod h1:Z8uGua2k4PPaGOYn66pK02rhMrot3Xk3tpBuUFPomZU=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 h1:qcxX0JYlgWH3hpPUnd6U0ikcl6LLA9sLkXE2w1fpMvY=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3/go.mod h1:cLSNEmI45soc+Ef8K/L+8sEA3A3pYFEYf5B5UI+6bH4=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 h1:ZC7Y/XgKUxwqcdhO5LE8P6oGP1eh6xlQReWNKfhvJno=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3/go.mod h1:WqfO7M9l9yUAw0HcHaikwRd/H6gzYdz7vjejCA5e2oY=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 h1:p9TNFL8bFUMd+38YIpTAXpoxyz0MxC7FlbFEH4P4E1U=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2/go.mod h1:fNjyo0Coen9QTwQLWeV6WO2Nytwiu+cCcWaTdKCAqqE=
 github.com/aws/aws-sdk-go-v2/service/ses v1.19.6 h1:2WWiQwUVU39kD8EGYw/sTGU+REd5Q+BFarTccU00Asc=
 github.com/aws/aws-sdk-go-v2/service/ses v1.19.6/go.mod h1:huHEdSNRqZOquzLTTjbBoEpoz7snBRwu2fe1dvvhZwE=
-github.com/aws/aws-sdk-go-v2/service/sns v1.33.2 h1:GeVRrB1aJsGdXxdPY6VOv0SWs+pfdeDlKgiBxi0+V6I=
-github.com/aws/aws-sdk-go-v2/service/sns v1.33.2/go.mod h1:c6Sj8zleZXYs4nyU3gpDKTzPWu7+t30YUXoLYRpbUvU=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 h1:bSYXVyUzoTHoKalBmwaZxs97HU9DWWI3ehHSAMa7xOk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.2/go.mod h1:skMqY7JElusiOUjMJMOv1jJsP7YUg7DrhgqZZWuzu1U=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 h1:AhmO1fHINP9vFYUE0LHzCWg/LfUWUF+zFPEcY9QXb7o=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2/go.mod h1:o8aQygT2+MVP0NaV6kbdE1YnnIM8RRVQzoeUH45GOdI=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 h1:CiS7i0+FUe+/YY1GvIBLLrR/XNGZ4CtM1Ll0XavNuVo=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.2/go.mod h1:HtaiBI8CjYoNVde8arShXb94UbQQi9L4EMr6D+xGBwo=
+github.com/aws/aws-sdk-go-v2/service/sns v1.33.3 h1:coZW/SqpINT0VWG8vRWWY9TWUof8TDdxublw2Xur0Zc=
+github.com/aws/aws-sdk-go-v2/service/sns v1.33.3/go.mod h1:J/G2xuhwNBlDvEi0WR/bnBbac4KSgpkERna/IXEF52w=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 h1:UTpsIf0loCIWEbrqdLb+0RxnTXfWh2vhw4nQmFi4nPc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.3/go.mod h1:FZ9j3PFHHAR+w0BSEjK955w5YD2UwB/l/H0yAK3MJvI=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 h1:2YCmIXv3tmiItw0LlYf6v7gEHebLY45kBEnPezbUKyU=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3/go.mod h1:u19stRyNPxGhj6dRm+Cdgu6N75qnbW7+QN0q0dsAk58=
+github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 h1:wVnQ6tigGsRqSWDEEyH6lSAJ9OyFUsSnbaUWChuSGzs=
+github.com/aws/aws-sdk-go-v2/service/sts v1.32.3/go.mod h1:VZa9yTFyj4o10YGsmDO4gbQJUvvhY72fhumT8W4LqsE=
 github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM=
 github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
@@ -618,19 +618,19 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
-google.golang.org/api v0.203.0 h1:SrEeuwU3S11Wlscsn+LA1kb/Y5xT8uggJSkIhD08NAU=
-google.golang.org/api v0.203.0/go.mod h1:BuOVyCSYEPwJb3npWvDnNmFI92f3GeRnHNkETneT3SI=
+google.golang.org/api v0.204.0 h1:3PjmQQEDkR/ENVZZwIYB4W/KzYtN8OrqnNcHWpeR8E4=
+google.golang.org/api v0.204.0/go.mod h1:69y8QSoKIbL9F94bWgWAq6wGqGwyjBgi2y8rAK8zLag=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 h1:Df6WuGvthPzc+JiQ/G+m+sNX24kc0aTBqoDN/0yyykE=
-google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53/go.mod h1:fheguH3Am2dGp1LfXkrvwqC/KlFq8F0nLq3LryOMrrE=
-google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 h1:T6rh4haD3GVYsgEfWExoCZA2o2FmbNyKpTuAxbEFPTg=
-google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:wp2WsuBYj6j8wUdo3ToZsdxxixbvQNAHqVJrTgi5E5M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38 h1:Q3nlH8iSQSRUwOskjbcSMcF2jiYMNiQYZ0c2KEJLKKU=
+google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38/go.mod h1:xBI+tzfqGGN2JBeSebfKXFSdBpWVQ7sLW40PTupVRm4=
+google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
+google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/worker/go.mod b/worker/go.mod
index b6186af5b6..301ef9cf9b 100644
--- a/worker/go.mod
+++ b/worker/go.mod
@@ -4,12 +4,12 @@ go 1.23.2
 
 require (
 	cloud.google.com/go/pubsub v1.45.1
-	cloud.google.com/go/storage v1.45.0
-	github.com/aws/aws-sdk-go-v2 v1.32.2
-	github.com/aws/aws-sdk-go-v2/config v1.28.0
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.34
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.1
-	github.com/aws/aws-sdk-go-v2/service/sns v1.33.2
+	cloud.google.com/go/storage v1.46.0
+	github.com/aws/aws-sdk-go-v2 v1.32.3
+	github.com/aws/aws-sdk-go-v2/config v1.28.1
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.35
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2
+	github.com/aws/aws-sdk-go-v2/service/sns v1.33.3
 	github.com/bodgit/sevenzip v1.5.2
 	github.com/jarcoal/httpmock v1.3.1
 	github.com/joho/godotenv v1.5.1
@@ -30,8 +30,8 @@ require (
 require (
 	cel.dev/expr v0.16.1 // indirect
 	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/auth v0.9.9 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
+	cloud.google.com/go/auth v0.10.0 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
 	cloud.google.com/go/compute/metadata v0.5.2 // indirect
 	cloud.google.com/go/iam v1.2.1 // indirect
 	cloud.google.com/go/monitoring v1.21.1 // indirect
@@ -40,19 +40,19 @@ require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
 	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.41 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.42 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
 	github.com/aws/smithy-go v1.22.0 // indirect
 	github.com/bodgit/plumbing v1.3.0 // indirect
 	github.com/bodgit/windows v1.0.1 // indirect
diff --git a/worker/go.sum b/worker/go.sum
index fbdbcf7e97..71adde9b58 100644
--- a/worker/go.sum
+++ b/worker/go.sum
@@ -11,10 +11,10 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
 cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
-cloud.google.com/go/auth v0.9.9 h1:BmtbpNQozo8ZwW2t7QJjnrQtdganSdmqeIBxHxNkEZQ=
-cloud.google.com/go/auth v0.9.9/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
-cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
-cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc=
+cloud.google.com/go/auth v0.10.0 h1:tWlkvFAh+wwTOzXIjrwM64karR1iTBZ/GRr0S/DULYo=
+cloud.google.com/go/auth v0.10.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
+cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk=
+cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
@@ -36,8 +36,8 @@ cloud.google.com/go/pubsub v1.45.1 h1:ZC/UzYcrmK12THWn1P72z+Pnp2vu/zCZRXyhAfP1hJ
 cloud.google.com/go/pubsub v1.45.1/go.mod h1:3bn7fTmzZFwaUjllitv1WlsNMkqBgGUb3UdMhI54eCc=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.45.0 h1:5av0QcIVj77t+44mV4gffFC/LscFRUhto6UBMB5SimM=
-cloud.google.com/go/storage v1.45.0/go.mod h1:wpPblkIuMP5jCB/E48Pz9zIo2S/zD8g+ITmxKkPCITE=
+cloud.google.com/go/storage v1.46.0 h1:OTXISBpFd8KaA2ClT3K3oRk8UGOcTHtrZ1bW88xKiic=
+cloud.google.com/go/storage v1.46.0/go.mod h1:lM+gMAW91EfXIeMTBmixRsKL/XCxysytoAgduVikjMk=
 cloud.google.com/go/trace v1.11.1 h1:UNqdP+HYYtnm6lb91aNA5JQ0X14GnxkABGlfz2PzPew=
 cloud.google.com/go/trace v1.11.1/go.mod h1:IQKNQuBzH72EGaXEodKlNJrWykGZxet2zgjtS60OtjA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -57,44 +57,44 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpH
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
-github.com/aws/aws-sdk-go-v2 v1.32.2 h1:AkNLZEyYMLnx/Q/mSKkcMqwNFXMAvFto9bNsHqcTduI=
-github.com/aws/aws-sdk-go-v2 v1.32.2/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
+github.com/aws/aws-sdk-go-v2 v1.32.3 h1:T0dRlFBKcdaUPGNtkBSwHZxrtis8CQU17UpNBZYd0wk=
+github.com/aws/aws-sdk-go-v2 v1.32.3/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 h1:pT3hpW0cOHRJx8Y0DfJUEQuqPild8jRGmSFmBgvydr0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6/go.mod h1:j/I2++U0xX+cr44QjHay4Cvxj6FUbnxrgmqN3H1jTZA=
-github.com/aws/aws-sdk-go-v2/config v1.28.0 h1:FosVYWcqEtWNxHn8gB/Vs6jOlNwSoyOCA/g/sxyySOQ=
-github.com/aws/aws-sdk-go-v2/config v1.28.0/go.mod h1:pYhbtvg1siOOg8h5an77rXle9tVG8T+BWLWAo7cOukc=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.41 h1:7gXo+Axmp+R4Z+AK8YFQO0ZV3L0gizGINCOWxSLY9W8=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.41/go.mod h1:u4Eb8d3394YLubphT4jLEwN1rLNq2wFOlT6OuxFwPzU=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 h1:TMH3f/SCAWdNtXXVPPu5D6wrr4G5hI1rAxbcocKfC7Q=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17/go.mod h1:1ZRXLdTpzdJb9fwTMXiLipENRxkGMTn1sfKexGllQCw=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.34 h1:os83HS/WfOwi1LsZWLCSHTyj+whvPGaxUsq/D1Ol2Q0=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.34/go.mod h1:tG0BaDCAweumHRsOHm72tuPgAfRLASQThgthWYeTyV8=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 h1:UAsR3xA31QGf79WzpG/ixT9FZvQlh5HY1NRqSHBNOCk=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21/go.mod h1:JNr43NFf5L9YaG3eKTm7HQzls9J+A9YYcGI5Quh1r2Y=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 h1:6jZVETqmYCadGFvrYEQfC5fAQmlo80CeL5psbno6r0s=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21/go.mod h1:1SR0GbLlnN3QUmYaflZNiH1ql+1qrSiB2vwcJ+4UM60=
+github.com/aws/aws-sdk-go-v2/config v1.28.1 h1:oxIvOUXy8x0U3fR//0eq+RdCKimWI900+SV+10xsCBw=
+github.com/aws/aws-sdk-go-v2/config v1.28.1/go.mod h1:bRQcttQJiARbd5JZxw6wG0yIK3eLeSCPdg6uqmmlIiI=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.42 h1:sBP0RPjBU4neGpIYyx8mkU2QqLPl5u9cmdTWVzIpHkM=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.42/go.mod h1:FwZBfU530dJ26rv9saAbxa9Ej3eF/AK0OAY86k13n4M=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 h1:68jFVtt3NulEzojFesM/WVarlFpCaXLKaBxDpzkQ9OQ=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18/go.mod h1:Fjnn5jQVIo6VyedMc0/EhPpfNlPl7dHV916O6B+49aE=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.35 h1:ihPPdcCVSN0IvBByXwqVp28/l4VosBZ6sDulcvU2J7w=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.35/go.mod h1:JkgEhs3SVF51Dj3m1Bj+yL8IznpxzkwlA3jLg3x7Kls=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 h1:Jw50LwEkVjuVzE1NzkhNKkBf9cRN7MtE1F/b2cOKTUM=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22/go.mod h1:Y/SmAyPcOTmpeVaWSzSKiILfXTVJwrGmYZhcRbhWuEY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 h1:981MHwBaRZM7+9QSR6XamDzF/o7ouUGxFzr+nVSIhrs=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22/go.mod h1:1RA1+aBEfn+CAB/Mh0MB6LsdCYCnjZm7tKXtnk499ZQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21 h1:7edmS3VOBDhK00b/MwGtGglCm7hhwNYnjJs/PgFdMQE=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21/go.mod h1:Q9o5h4HoIWG8XfzxqiuK/CGUbepCJ8uTlaE3bAbxytQ=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 h1:yV+hCAHZZYJQcwAaszoBNwLbPItHvApxT0kVIw6jRgs=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22/go.mod h1:kbR1TL8llqB1eGnVbybcA4/wgScxdylOdyAd51yxPdw=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2 h1:4FMHqLfk0efmTqhXVRL5xYRqlEBNBiRI7N6w4jsEdd4=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2/go.mod h1:LWoqeWlK9OZeJxsROW2RqrSPvQHKTpp69r/iDjwsSaw=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 h1:s7NA1SOw8q/5c0wr8477yOPp0z+uBaXBnLE0XYb0POA=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2/go.mod h1:fnjjWyAW/Pj5HYOxl9LJqWtEwS7W2qgcRLWP+uWbss0=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 h1:t7iUP9+4wdc5lt3E41huP+GvQZJD38WLsgVp4iOtAjg=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2/go.mod h1:/niFCtmuQNxqx9v8WAPq5qh7EH25U4BF6tjoyq9bObM=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.66.1 h1:MkQ4unegQEStiQYmfFj+Aq5uTp265ncSmm0XTQwDwi0=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.66.1/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8=
-github.com/aws/aws-sdk-go-v2/service/sns v1.33.2 h1:GeVRrB1aJsGdXxdPY6VOv0SWs+pfdeDlKgiBxi0+V6I=
-github.com/aws/aws-sdk-go-v2/service/sns v1.33.2/go.mod h1:c6Sj8zleZXYs4nyU3gpDKTzPWu7+t30YUXoLYRpbUvU=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 h1:bSYXVyUzoTHoKalBmwaZxs97HU9DWWI3ehHSAMa7xOk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.2/go.mod h1:skMqY7JElusiOUjMJMOv1jJsP7YUg7DrhgqZZWuzu1U=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 h1:AhmO1fHINP9vFYUE0LHzCWg/LfUWUF+zFPEcY9QXb7o=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2/go.mod h1:o8aQygT2+MVP0NaV6kbdE1YnnIM8RRVQzoeUH45GOdI=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 h1:CiS7i0+FUe+/YY1GvIBLLrR/XNGZ4CtM1Ll0XavNuVo=
-github.com/aws/aws-sdk-go-v2/service/sts v1.32.2/go.mod h1:HtaiBI8CjYoNVde8arShXb94UbQQi9L4EMr6D+xGBwo=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 h1:kT6BcZsmMtNkP/iYMcRG+mIEA/IbeiUimXtGmqF39y0=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3/go.mod h1:Z8uGua2k4PPaGOYn66pK02rhMrot3Xk3tpBuUFPomZU=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 h1:qcxX0JYlgWH3hpPUnd6U0ikcl6LLA9sLkXE2w1fpMvY=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3/go.mod h1:cLSNEmI45soc+Ef8K/L+8sEA3A3pYFEYf5B5UI+6bH4=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 h1:ZC7Y/XgKUxwqcdhO5LE8P6oGP1eh6xlQReWNKfhvJno=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3/go.mod h1:WqfO7M9l9yUAw0HcHaikwRd/H6gzYdz7vjejCA5e2oY=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 h1:p9TNFL8bFUMd+38YIpTAXpoxyz0MxC7FlbFEH4P4E1U=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2/go.mod h1:fNjyo0Coen9QTwQLWeV6WO2Nytwiu+cCcWaTdKCAqqE=
+github.com/aws/aws-sdk-go-v2/service/sns v1.33.3 h1:coZW/SqpINT0VWG8vRWWY9TWUof8TDdxublw2Xur0Zc=
+github.com/aws/aws-sdk-go-v2/service/sns v1.33.3/go.mod h1:J/G2xuhwNBlDvEi0WR/bnBbac4KSgpkERna/IXEF52w=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 h1:UTpsIf0loCIWEbrqdLb+0RxnTXfWh2vhw4nQmFi4nPc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.3/go.mod h1:FZ9j3PFHHAR+w0BSEjK955w5YD2UwB/l/H0yAK3MJvI=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 h1:2YCmIXv3tmiItw0LlYf6v7gEHebLY45kBEnPezbUKyU=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3/go.mod h1:u19stRyNPxGhj6dRm+Cdgu6N75qnbW7+QN0q0dsAk58=
+github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 h1:wVnQ6tigGsRqSWDEEyH6lSAJ9OyFUsSnbaUWChuSGzs=
+github.com/aws/aws-sdk-go-v2/service/sts v1.32.3/go.mod h1:VZa9yTFyj4o10YGsmDO4gbQJUvvhY72fhumT8W4LqsE=
 github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM=
 github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=

From 1ac9e8afdb9f9fc75da6f45517703300a66d0639 Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:56:21 +0900
Subject: [PATCH 21/28] fix(web): disable buttons based on user's role (#1251)

* impl userRole

* rename

* accesibility

* linked asset modal

* update rights

* settings

* member

* integrations

* workspace settings

* project setting

* schema

* request detail

* request table

* overview

* model list

* item edit

* view

* content list

* request query

* asset list

* asset

* comment

* gql

* item field

* i18n

* types

* fix

* merge

* fix

* fix: e2e test

* fix

* fix
---
 web/e2e/project/content/content.spec.ts       |   6 +-
 web/e2e/project/schema.spec.ts                |   2 +-
 .../molecules/Accessibility/index.tsx         |   8 +-
 .../molecules/Asset/Asset/AssetBody/Asset.tsx |  12 +-
 .../molecules/Asset/Asset/AssetBody/index.tsx |   3 +
 .../Asset/AssetBody/previewTypeSelect.tsx     |   5 +-
 .../molecules/Asset/AssetList/index.tsx       |  16 +-
 .../molecules/Asset/AssetListTable/index.tsx  |  24 +-
 .../molecules/Asset/UploadAsset/index.tsx     |  12 +-
 web/src/components/molecules/Asset/types.ts   |   2 +-
 .../Common/CommentsPanel/Comment.tsx          |  51 ++-
 .../Common/CommentsPanel/CommentList.tsx      |   8 +-
 .../molecules/Common/CommentsPanel/Thread.tsx |  13 +-
 .../molecules/Common/CommentsPanel/index.tsx  |  13 +-
 .../molecules/Common/Form/AssetItem/hooks.ts  |   8 +-
 .../molecules/Common/Form/AssetItem/index.tsx |   2 +
 .../molecules/Common/Form/GroupItem/index.tsx |   2 +-
 .../Common/LinkAssetModal/LinkAssetModal.tsx  |  13 +-
 .../MultiValueField/MultiValueGroup/index.tsx |   2 +-
 .../molecules/Content/Details/index.tsx       |  12 +
 .../molecules/Content/Form/SidebarWrapper.tsx |   4 +-
 .../ComplexFieldComponents/AssetField.tsx     |   2 +-
 .../ComplexFieldComponents/GroupField.tsx     |   2 +-
 .../ComplexFieldComponents/ReferenceField.tsx |   2 +-
 .../Form/fields/FieldComponents/BoolField.tsx |   2 +-
 .../fields/FieldComponents/CheckboxField.tsx  |   7 +-
 .../Form/fields/FieldComponents/DateField.tsx |   2 +-
 .../fields/FieldComponents/DefaultField.tsx   |   2 +-
 .../fields/FieldComponents/GeometryField.tsx  |   2 +-
 .../fields/FieldComponents/IntegerField.tsx   |   2 +-
 .../fields/FieldComponents/MarkdownField.tsx  |   2 +-
 .../fields/FieldComponents/SelectField.tsx    |   2 +-
 .../Form/fields/FieldComponents/TagField.tsx  |   8 +-
 .../fields/FieldComponents/TextareaField.tsx  |   2 +-
 .../Form/fields/FieldComponents/URLField.tsx  |   2 +-
 .../molecules/Content/Form/index.tsx          |  39 ++-
 .../molecules/Content/LinkItemModal/index.tsx |   8 +
 .../LinkItemRequestModal.tsx                  |  11 +-
 .../molecules/Content/List/index.tsx          |  24 +-
 .../molecules/Content/RenderField/index.tsx   |   3 +-
 .../molecules/Content/Table/index.tsx         |  41 ++-
 web/src/components/molecules/Content/types.ts |   7 +-
 .../Integration/IntegrationTable/index.tsx    |  47 ++-
 .../Member/MemberRoleModal/index.tsx          |   6 +-
 .../molecules/Member/MemberTable/index.tsx    |  40 ++-
 web/src/components/molecules/Member/types.ts  |  82 ++++-
 .../molecules/Model/ModelsList/Groups.tsx     |   6 +
 .../molecules/Model/ModelsList/GroupsList.tsx |  18 +-
 .../molecules/Model/ModelsList/Models.tsx     |   6 +
 .../molecules/Model/ModelsList/ModelsList.tsx |  18 +-
 .../molecules/ProjectList/ProjectList.tsx     |   8 +-
 .../molecules/ProjectOverview/ModelCard.tsx   |   8 +-
 .../molecules/ProjectOverview/index.tsx       |  14 +-
 .../molecules/ProjectSettings/DangerZone.tsx  |   9 +-
 .../molecules/ProjectSettings/GeneralForm.tsx |  14 +-
 .../ProjectSettings/RequestOptions.tsx        |  17 +-
 .../molecules/ProjectSettings/index.tsx       |  11 +-
 .../molecules/Request/Details/Comment.tsx     |  44 ++-
 .../molecules/Request/Details/CommentList.tsx |   8 +-
 .../molecules/Request/Details/Editor.tsx      |  10 +-
 .../molecules/Request/Details/Request.tsx     |  15 +
 .../Request/Details/SidebarWrapper.tsx        |   7 +-
 .../molecules/Request/Details/Thread.tsx      |  15 +-
 .../molecules/Request/Details/index.tsx       |  19 +-
 .../molecules/Request/List/index.tsx          |   9 +-
 .../molecules/Request/Table/index.tsx         |  20 +-
 .../components/molecules/Schema/FieldList.tsx |  15 +-
 .../molecules/Schema/ModelFieldList.tsx       |  53 +--
 web/src/components/molecules/Schema/index.tsx |  21 +-
 .../components/molecules/Settings/Cards.tsx   |  42 ++-
 .../components/molecules/Settings/index.tsx   |  20 +-
 .../molecules/View/viewMenuItem.tsx           |  14 +-
 .../components/molecules/View/viewsMenu.tsx   |  12 +-
 .../molecules/Workspace/WorkspaceHeader.tsx   |   8 +-
 .../components/molecules/Workspace/index.tsx  |   4 +
 .../components/molecules/Workspace/types.ts   |   8 +-
 .../WorkspaceSettings/DangerZone.tsx          |   9 +-
 .../WorkspaceSettings/GeneralForm.tsx         |   4 +-
 .../molecules/WorkspaceSettings/index.tsx     |   7 +-
 .../components/organisms/CMSWrapper/hooks.ts  |  37 ++-
 .../components/organisms/CMSWrapper/utils.ts  | 303 ++++++++++++++++++
 .../organisms/Common/CommentsPanel/hooks.ts   |  15 +
 .../organisms/Common/CommentsPanel/index.tsx  |  13 +-
 .../organisms/DataConverters/content.ts       |   6 +-
 .../organisms/Project/Accessibility/hooks.ts  |  10 +-
 .../organisms/Project/Accessibility/index.tsx |   2 +
 .../organisms/Project/Asset/Asset/hooks.ts    |  12 +
 .../organisms/Project/Asset/Asset/index.tsx   |   2 +
 .../Project/Asset/AssetList/hooks.ts          |  25 +-
 .../Project/Asset/AssetList/index.tsx         |   8 +-
 .../Project/Content/ContentDetails/hooks.ts   |  41 ++-
 .../Project/Content/ContentDetails/index.tsx  |   8 +
 .../Project/Content/ContentList/hooks.ts      |  65 +++-
 .../Project/Content/ContentList/index.tsx     |  14 +-
 .../Project/Content/ViewsMenu/hooks.ts        |  15 +-
 .../Project/Content/ViewsMenu/index.tsx       |  10 +-
 .../organisms/Project/Content/hooks.ts        |  12 +-
 .../organisms/Project/ModelsMenu/hooks.ts     |   8 +-
 .../organisms/Project/ModelsMenu/index.tsx    |  10 +-
 .../organisms/Project/Overview/hooks.ts       |  10 +-
 .../organisms/Project/Overview/index.tsx      |   6 +
 .../Project/Request/RequestDetails/hooks.ts   |  71 ++--
 .../Project/Request/RequestDetails/index.tsx  |  12 +-
 .../Project/Request/RequestList/hooks.ts      |  36 ++-
 .../Project/Request/RequestList/index.tsx     |   6 +-
 .../organisms/Project/Schema/hooks.ts         |   9 +-
 .../organisms/Project/Schema/index.tsx        |  10 +-
 .../organisms/Project/settings/hooks.ts       |  18 +-
 .../organisms/Project/settings/index.tsx      |   4 +
 .../organisms/Settings/General/hooks.ts       |  18 +-
 .../organisms/Settings/General/index.tsx      |   4 +-
 .../organisms/Settings/Integration/hooks.ts   |  17 +
 .../organisms/Settings/Integration/index.tsx  |   6 +
 .../organisms/Settings/Members/hooks.ts       |  42 ++-
 .../organisms/Settings/Members/index.tsx      |   8 +-
 .../organisms/Workspace/Settings/hooks.ts     |  17 +-
 .../organisms/Workspace/Settings/index.tsx    |  12 +-
 .../components/organisms/Workspace/hooks.ts   |   5 +-
 .../components/organisms/Workspace/index.tsx  |   2 +
 web/src/gql/graphql-client-api.tsx            |   8 +-
 web/src/gql/queries/item.ts                   |   4 +
 web/src/i18n/translations/en.yml              |  10 +-
 web/src/i18n/translations/ja.yml              |  12 +-
 web/src/state/index.ts                        |   4 +
 124 files changed, 1617 insertions(+), 408 deletions(-)
 create mode 100644 web/src/components/organisms/CMSWrapper/utils.ts

diff --git a/web/e2e/project/content/content.spec.ts b/web/e2e/project/content/content.spec.ts
index 57cb46426b..bd7c4ca5bd 100644
--- a/web/e2e/project/content/content.spec.ts
+++ b/web/e2e/project/content/content.spec.ts
@@ -51,7 +51,11 @@ test("Item CRUD and searching has succeeded", async ({ page }) => {
 test("Publishing and Unpublishing item has succeeded", async ({ page }) => {
   await page.locator("li").filter({ hasText: "Text" }).locator("div").first().click();
   await handleFieldForm(page, "text");
-  await page.getByText("Content").click();
+  await page.getByText("Settings").first().click();
+  await page.getByRole("row", { name: "Owner" }).getByRole("switch").click();
+  await page.getByRole("button", { name: "Save changes" }).last().click();
+  await closeNotification(page);
+  await page.getByText("Content").first().click();
   await page.getByRole("button", { name: "plus New Item" }).click();
   await page.getByLabel("text").click();
   await page.getByLabel("text").fill("text");
diff --git a/web/e2e/project/schema.spec.ts b/web/e2e/project/schema.spec.ts
index cc17a940b3..8f07702ab1 100644
--- a/web/e2e/project/schema.spec.ts
+++ b/web/e2e/project/schema.spec.ts
@@ -158,7 +158,7 @@ test("Schema reordering has succeeded", async ({ page }) => {
   );
   await page
     .getByLabel("Fields")
-    .locator(".draggable-item")
+    .locator(".grabbable")
     .nth(1)
     .dragTo(page.getByLabel("Fields").locator(".draggable-item").nth(0));
   await closeNotification(page);
diff --git a/web/src/components/molecules/Accessibility/index.tsx b/web/src/components/molecules/Accessibility/index.tsx
index 83765f16ec..5986f6828a 100644
--- a/web/src/components/molecules/Accessibility/index.tsx
+++ b/web/src/components/molecules/Accessibility/index.tsx
@@ -30,6 +30,7 @@ type Props = {
   aliasState?: string;
   assetState?: boolean;
   isSaveDisabled: boolean;
+  hasPublishRight: boolean;
   handlePublicUpdate: () => Promise<void>;
   handleUpdatedAssetState: (state: boolean) => void;
   handleUpdatedModels: (model: Model) => void;
@@ -43,6 +44,7 @@ const Accessibility: React.FC<Props> = ({
   aliasState,
   assetState,
   isSaveDisabled,
+  hasPublishRight,
   handlePublicUpdate,
   handleUpdatedAssetState,
   handleUpdatedModels,
@@ -95,6 +97,7 @@ const Accessibility: React.FC<Props> = ({
         public: (
           <Switch
             checked={assetState}
+            disabled={!hasPublishRight}
             onChange={(publicState: boolean) => handleUpdatedAssetState(publicState)}
           />
         ),
@@ -112,6 +115,7 @@ const Accessibility: React.FC<Props> = ({
             public: (
               <Switch
                 checked={m.public}
+                disabled={!hasPublishRight}
                 onChange={(publicState: boolean) =>
                   handleUpdatedModels({ ...m, public: publicState })
                 }
@@ -123,7 +127,7 @@ const Accessibility: React.FC<Props> = ({
       ];
     }
     return columns;
-  }, [models, assetState, handleUpdatedAssetState, handleUpdatedModels, t]);
+  }, [t, assetState, hasPublishRight, models, handleUpdatedAssetState, handleUpdatedModels]);
 
   const publicScopeList = [
     { id: 1, name: t("Private"), value: "private" },
@@ -144,7 +148,7 @@ const Accessibility: React.FC<Props> = ({
               extra={t(
                 "Choose the scope of your project. This affects all the models shown below that are switched on.",
               )}>
-              <Select value={scope} onChange={handleSetScope}>
+              <Select value={scope} onChange={handleSetScope} disabled={!hasPublishRight}>
                 {publicScopeList.map(type => (
                   <Select.Option key={type.id} value={type.value}>
                     {type.name}
diff --git a/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx b/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx
index ba11e35ff9..001853e977 100644
--- a/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx
+++ b/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx
@@ -42,6 +42,7 @@ type Props = {
   viewerType: ViewerType;
   displayUnzipFileList: boolean;
   decompressing: boolean;
+  hasUpdateRight: boolean;
   onAssetItemSelect: (item: AssetItem) => void;
   onAssetDecompress: (assetId: string) => void;
   onModalCancel: () => void;
@@ -60,6 +61,7 @@ const AssetMolecule: React.FC<Props> = ({
   viewerType,
   displayUnzipFileList,
   decompressing,
+  hasUpdateRight,
   onAssetItemSelect,
   onAssetDecompress,
   onTypeChange,
@@ -182,13 +184,17 @@ const AssetMolecule: React.FC<Props> = ({
       </BodyWrapper>
       <SideBarWrapper>
         <SideBarCard title={t("Asset Type")}>
-          <PreviewTypeSelect value={selectedPreviewType} onTypeChange={onTypeChange} />
+          <PreviewTypeSelect
+            value={selectedPreviewType}
+            onTypeChange={onTypeChange}
+            hasUpdateRight={hasUpdateRight}
+          />
         </SideBarCard>
         <SideBarCard title={t("Created Time")}>{formattedCreatedAt}</SideBarCard>
         <SideBarCard title={t("Created By")}>
           <Space>
-            <UserAvatar username={asset.createdBy} shadow />
-            {asset.createdBy}
+            <UserAvatar username={asset.createdBy.name} shadow />
+            {asset.createdBy.name}
           </Space>
         </SideBarCard>
         <SideBarCard title={t("Linked to")}>
diff --git a/web/src/components/molecules/Asset/Asset/AssetBody/index.tsx b/web/src/components/molecules/Asset/Asset/AssetBody/index.tsx
index a9c4b37d22..03ed32c844 100644
--- a/web/src/components/molecules/Asset/Asset/AssetBody/index.tsx
+++ b/web/src/components/molecules/Asset/Asset/AssetBody/index.tsx
@@ -21,6 +21,7 @@ type Props = {
   decompressing: boolean;
   isSaveDisabled: boolean;
   updateLoading: boolean;
+  hasUpdateRight: boolean;
   onAssetItemSelect: (item: AssetItem) => void;
   onAssetDecompress: (assetId: string) => void;
   onTypeChange: (value: PreviewType) => void;
@@ -42,6 +43,7 @@ const AssetWrapper: React.FC<Props> = ({
   commentsPanel,
   isSaveDisabled,
   updateLoading,
+  hasUpdateRight,
   onAssetItemSelect,
   onAssetDecompress,
   onTypeChange,
@@ -74,6 +76,7 @@ const AssetWrapper: React.FC<Props> = ({
             viewerType={viewerType}
             displayUnzipFileList={displayUnzipFileList}
             decompressing={decompressing}
+            hasUpdateRight={hasUpdateRight}
             onAssetDecompress={onAssetDecompress}
             onAssetItemSelect={onAssetItemSelect}
             onTypeChange={onTypeChange}
diff --git a/web/src/components/molecules/Asset/Asset/AssetBody/previewTypeSelect.tsx b/web/src/components/molecules/Asset/Asset/AssetBody/previewTypeSelect.tsx
index 89414bb1ed..2de162d679 100644
--- a/web/src/components/molecules/Asset/Asset/AssetBody/previewTypeSelect.tsx
+++ b/web/src/components/molecules/Asset/Asset/AssetBody/previewTypeSelect.tsx
@@ -16,6 +16,7 @@ export type PreviewType =
 type Props = {
   onTypeChange: (value: PreviewType) => void;
   value?: PreviewType;
+  hasUpdateRight: boolean;
 };
 
 type PreviewTypeListItem = {
@@ -23,7 +24,7 @@ type PreviewTypeListItem = {
   value: PreviewType;
 };
 
-export const PreviewTypeSelect: React.FC<Props> = ({ onTypeChange, value }) => {
+export const PreviewTypeSelect: React.FC<Props> = ({ onTypeChange, value, hasUpdateRight }) => {
   const t = useT();
   const previewTypeList: PreviewTypeListItem[] = [
     { name: t("PNG/JPEG/TIFF/GIF"), value: "IMAGE" },
@@ -39,7 +40,7 @@ export const PreviewTypeSelect: React.FC<Props> = ({ onTypeChange, value }) => {
     { name: t("Unknown Type"), value: "UNKNOWN" },
   ];
   return (
-    <StyledSelect value={value} onChange={onTypeChange}>
+    <StyledSelect value={value} onChange={onTypeChange} disabled={!hasUpdateRight}>
       {previewTypeList.map((type, index) => (
         <Select.Option key={index} value={type.value}>
           {type.name}
diff --git a/web/src/components/molecules/Asset/AssetList/index.tsx b/web/src/components/molecules/Asset/AssetList/index.tsx
index cdf466f1fc..939214da28 100644
--- a/web/src/components/molecules/Asset/AssetList/index.tsx
+++ b/web/src/components/molecules/Asset/AssetList/index.tsx
@@ -32,6 +32,8 @@ type Props = {
   sort?: SortType;
   searchTerm: string;
   columns: Record<string, ColumnsState>;
+  hasCreateRight: boolean;
+  hasDeleteRight: boolean;
   onColumnsChange: (cols: Record<string, ColumnsState>) => void;
   onAssetItemSelect: (item: AssetItem) => void;
   onAssetSelect: (assetId: string) => void;
@@ -43,7 +45,7 @@ type Props = {
   onAssetDelete: (assetIds: string[]) => Promise<void>;
   onSearchTerm: (term?: string) => void;
   onEdit: (assetId: string) => void;
-  setSelection: (input: { selectedRowKeys: Key[] }) => void;
+  onSelect: (selectedRowKeys: Key[], selectedRows: Asset[]) => void;
   setFileList: (fileList: UploadFile<File>[]) => void;
   setUploadModalVisibility: (visible: boolean) => void;
   onAssetsReload: () => void;
@@ -68,6 +70,8 @@ const AssetList: React.FC<Props> = ({
   sort,
   searchTerm,
   columns,
+  hasCreateRight,
+  hasDeleteRight,
   onColumnsChange,
   onAssetItemSelect,
   onAssetSelect,
@@ -79,7 +83,7 @@ const AssetList: React.FC<Props> = ({
   onAssetDelete,
   onSearchTerm,
   onEdit,
-  setSelection,
+  onSelect,
   setFileList,
   setUploadModalVisibility,
   onAssetsReload,
@@ -127,14 +131,15 @@ const AssetList: React.FC<Props> = ({
             title={t("Asset")}
             extra={
               <UploadAsset
+                uploadProps={uploadProps}
                 fileList={fileList}
                 uploading={uploading}
-                uploadProps={uploadProps}
+                uploadModalVisibility={uploadModalVisibility}
                 uploadUrl={uploadUrl}
                 uploadType={uploadType}
+                hasCreateRight={hasCreateRight}
                 setUploadUrl={setUploadUrl}
                 setUploadType={setUploadType}
-                uploadModalVisibility={uploadModalVisibility}
                 displayUploadModal={displayUploadModal}
                 onUploadModalCancel={onUploadModalCancel}
                 onUpload={handleUpload}
@@ -153,12 +158,13 @@ const AssetList: React.FC<Props> = ({
             sort={sort}
             searchTerm={searchTerm}
             columns={columns}
+            hasDeleteRight={hasDeleteRight}
             onColumnsChange={onColumnsChange}
             onAssetItemSelect={onAssetItemSelect}
             onAssetSelect={onAssetSelect}
             onEdit={onEdit}
             onSearchTerm={onSearchTerm}
-            setSelection={setSelection}
+            onSelect={onSelect}
             onAssetsReload={onAssetsReload}
             onAssetDelete={onAssetDelete}
             onAssetTableChange={onAssetTableChange}
diff --git a/web/src/components/molecules/Asset/AssetListTable/index.tsx b/web/src/components/molecules/Asset/AssetListTable/index.tsx
index 1671d89815..17f420fe0c 100644
--- a/web/src/components/molecules/Asset/AssetListTable/index.tsx
+++ b/web/src/components/molecules/Asset/AssetListTable/index.tsx
@@ -45,12 +45,13 @@ type Props = {
   sort?: SortType;
   searchTerm: string;
   columns: Record<string, ColumnsState>;
+  hasDeleteRight: boolean;
   onColumnsChange: (cols: Record<string, ColumnsState>) => void;
   onAssetItemSelect: (item: AssetItem) => void;
   onAssetSelect: (assetId: string) => void;
   onEdit: (assetId: string) => void;
   onSearchTerm: (term?: string) => void;
-  setSelection: (input: { selectedRowKeys: Key[] }) => void;
+  onSelect: (selectedRowKeys: Key[], selectedRows: Asset[]) => void;
   onAssetsReload: () => void;
   onAssetDelete: (assetIds: string[]) => Promise<void>;
   onAssetTableChange: (page: number, pageSize: number, sorter?: SortType) => void;
@@ -68,12 +69,13 @@ const AssetListTable: React.FC<Props> = ({
   sort,
   searchTerm,
   columns: columnsState,
+  hasDeleteRight,
   onColumnsChange,
   onAssetItemSelect,
   onAssetSelect,
   onEdit,
   onSearchTerm,
-  setSelection,
+  onSelect,
   onAssetsReload,
   onAssetDelete,
   onAssetTableChange,
@@ -176,8 +178,8 @@ const AssetListTable: React.FC<Props> = ({
         key: "createdBy",
         render: (_, item) => (
           <Space>
-            <UserAvatar username={item.createdBy} size={"small"} />
-            {item.createdBy}
+            <UserAvatar username={item.createdBy.name} size={"small"} />
+            {item.createdBy.name}
           </Space>
         ),
         width: 105,
@@ -253,14 +255,9 @@ const AssetListTable: React.FC<Props> = ({
   const rowSelection: TableRowSelection = useMemo(
     () => ({
       selectedRowKeys: selection.selectedRowKeys,
-      onChange: (selectedRowKeys: Key[]) => {
-        setSelection({
-          ...selection,
-          selectedRowKeys: selectedRowKeys,
-        });
-      },
+      onChange: onSelect,
     }),
-    [selection, setSelection],
+    [onSelect, selection.selectedRowKeys],
   );
 
   const toolbar: ListToolBarProps = useMemo(
@@ -296,13 +293,14 @@ const AssetListTable: React.FC<Props> = ({
             icon={<Icon icon="delete" />}
             onClick={() => onAssetDelete(props.selectedRowKeys)}
             danger
-            loading={deleteLoading}>
+            loading={deleteLoading}
+            disabled={!hasDeleteRight}>
             {t("Delete")}
           </Button>
         </Space>
       );
     },
-    [deleteLoading, onAssetDelete, t],
+    [deleteLoading, hasDeleteRight, onAssetDelete, t],
   );
 
   const handleChange = useCallback(
diff --git a/web/src/components/molecules/Asset/UploadAsset/index.tsx b/web/src/components/molecules/Asset/UploadAsset/index.tsx
index 917aa0811c..271bdc557d 100644
--- a/web/src/components/molecules/Asset/UploadAsset/index.tsx
+++ b/web/src/components/molecules/Asset/UploadAsset/index.tsx
@@ -14,6 +14,7 @@ type Props = {
   uploadModalVisibility?: boolean;
   uploadUrl: { url: string; autoUnzip: boolean };
   uploadType?: UploadType;
+  hasCreateRight: boolean;
   setUploadUrl: (uploadUrl: { url: string; autoUnzip: boolean }) => void;
   setUploadType?: (type: UploadType) => void;
   onUploadModalClose?: () => void;
@@ -28,11 +29,12 @@ const UploadAsset: React.FC<Props> = ({
   fileList,
   uploading,
   uploadModalVisibility,
+  uploadUrl,
+  uploadType,
+  hasCreateRight,
   onUploadModalClose,
   displayUploadModal,
   onUploadModalCancel,
-  uploadUrl,
-  uploadType,
   setUploadUrl,
   setUploadType,
   onUpload,
@@ -40,7 +42,11 @@ const UploadAsset: React.FC<Props> = ({
   const t = useT();
   return (
     <>
-      <Button type="primary" icon={<Icon icon="upload" />} onClick={displayUploadModal}>
+      <Button
+        type="primary"
+        icon={<Icon icon="upload" />}
+        onClick={displayUploadModal}
+        disabled={!hasCreateRight}>
         {t("Upload Asset")}
       </Button>
       <UploadModal
diff --git a/web/src/components/molecules/Asset/types.ts b/web/src/components/molecules/Asset/types.ts
index e36d96902f..e6b30d58d7 100644
--- a/web/src/components/molecules/Asset/types.ts
+++ b/web/src/components/molecules/Asset/types.ts
@@ -25,7 +25,7 @@ export type ViewerType =
 export type Asset = {
   id: string;
   createdAt: string;
-  createdBy: string;
+  createdBy: { id: string; name: string };
   createdByType: string;
   file?: AssetFile;
   fileName: string;
diff --git a/web/src/components/molecules/Common/CommentsPanel/Comment.tsx b/web/src/components/molecules/Common/CommentsPanel/Comment.tsx
index 6c82825c68..80455e11e9 100644
--- a/web/src/components/molecules/Common/CommentsPanel/Comment.tsx
+++ b/web/src/components/molecules/Common/CommentsPanel/Comment.tsx
@@ -17,12 +17,21 @@ import { dateTimeFormat } from "@reearth-cms/utils/format";
 
 type Props = {
   me?: User;
+  hasUpdateRight: boolean | null;
+  hasDeleteRight: boolean | null;
   comment: Comment;
   onCommentUpdate: (commentId: string, content: string) => Promise<void>;
   onCommentDelete: (commentId: string) => Promise<void>;
 };
 
-const CommentMolecule: React.FC<Props> = ({ me, comment, onCommentUpdate, onCommentDelete }) => {
+const CommentMolecule: React.FC<Props> = ({
+  me,
+  hasUpdateRight,
+  hasDeleteRight,
+  comment,
+  onCommentUpdate,
+  onCommentDelete,
+}) => {
   const [showEditor, setShowEditor] = useState(false);
   const [value, setValue] = useState(comment.content);
 
@@ -49,20 +58,36 @@ const CommentMolecule: React.FC<Props> = ({ me, comment, onCommentUpdate, onComm
     [comment.createdAt],
   );
 
+  const actions = useMemo(() => {
+    const result = [];
+    const isMine = me?.id === comment.author.id;
+    if (hasDeleteRight || (hasDeleteRight === null && isMine)) {
+      result.push(<Icon key="delete" icon="delete" onClick={() => onCommentDelete(comment.id)} />);
+    }
+    if (hasUpdateRight || (hasUpdateRight === null && isMine)) {
+      result.push(
+        <Icon
+          key="edit"
+          icon={showEditor ? "check" : "edit"}
+          onClick={showEditor ? handleSubmit : () => setShowEditor(true)}
+        />,
+      );
+    }
+    return result;
+  }, [
+    comment.author.id,
+    comment.id,
+    handleSubmit,
+    hasDeleteRight,
+    hasUpdateRight,
+    me?.id,
+    onCommentDelete,
+    showEditor,
+  ]);
+
   return (
     <StyledComment
-      actions={
-        me?.id === comment.author.id
-          ? [
-              <Icon key="delete" icon="delete" onClick={() => onCommentDelete(comment.id)} />,
-              showEditor ? (
-                <Icon key="edit" icon="check" onClick={handleSubmit} />
-              ) : (
-                <Icon key="edit" icon="edit" onClick={() => setShowEditor(true)} />
-              ),
-            ]
-          : []
-      }
+      actions={actions}
       author={comment.author.name}
       avatar={
         comment.author.type === "Integration" ? (
diff --git a/web/src/components/molecules/Common/CommentsPanel/CommentList.tsx b/web/src/components/molecules/Common/CommentsPanel/CommentList.tsx
index 8c8218e128..612281cc7c 100644
--- a/web/src/components/molecules/Common/CommentsPanel/CommentList.tsx
+++ b/web/src/components/molecules/Common/CommentsPanel/CommentList.tsx
@@ -6,6 +6,8 @@ import CommentMolecule from "./Comment";
 
 type Props = {
   me?: User;
+  hasUpdateRight: boolean | null;
+  hasDeleteRight: boolean | null;
   comments: Comment[];
   onCommentUpdate: (commentId: string, content: string) => Promise<void>;
   onCommentDelete: (commentId: string) => Promise<void>;
@@ -13,6 +15,8 @@ type Props = {
 
 export const CommentList: React.FC<Props> = ({
   me,
+  hasUpdateRight,
+  hasDeleteRight,
   comments,
   onCommentUpdate,
   onCommentDelete,
@@ -22,8 +26,10 @@ export const CommentList: React.FC<Props> = ({
     itemLayout="horizontal"
     renderItem={props => (
       <CommentMolecule
-        comment={props}
         me={me}
+        hasUpdateRight={hasUpdateRight}
+        hasDeleteRight={hasDeleteRight}
+        comment={props}
         onCommentUpdate={onCommentUpdate}
         onCommentDelete={onCommentDelete}
       />
diff --git a/web/src/components/molecules/Common/CommentsPanel/Thread.tsx b/web/src/components/molecules/Common/CommentsPanel/Thread.tsx
index 49cc7bfb0e..e584230d4e 100644
--- a/web/src/components/molecules/Common/CommentsPanel/Thread.tsx
+++ b/web/src/components/molecules/Common/CommentsPanel/Thread.tsx
@@ -5,17 +5,28 @@ import { CommentList } from "./CommentList";
 
 type Props = {
   me?: User;
+  hasUpdateRight: boolean | null;
+  hasDeleteRight: boolean | null;
   comments?: Comment[];
   onCommentUpdate: (commentId: string, content: string) => Promise<void>;
   onCommentDelete: (commentId: string) => Promise<void>;
 };
 
-export const Thread: React.FC<Props> = ({ me, comments, onCommentUpdate, onCommentDelete }) => {
+export const Thread: React.FC<Props> = ({
+  me,
+  hasUpdateRight,
+  hasDeleteRight,
+  comments,
+  onCommentUpdate,
+  onCommentDelete,
+}) => {
   return (
     <>
       {comments && comments?.length > 0 && (
         <CommentList
           me={me}
+          hasUpdateRight={hasUpdateRight}
+          hasDeleteRight={hasDeleteRight}
           comments={comments}
           onCommentUpdate={onCommentUpdate}
           onCommentDelete={onCommentDelete}
diff --git a/web/src/components/molecules/Common/CommentsPanel/index.tsx b/web/src/components/molecules/Common/CommentsPanel/index.tsx
index e78befcf26..0b32c557d4 100644
--- a/web/src/components/molecules/Common/CommentsPanel/index.tsx
+++ b/web/src/components/molecules/Common/CommentsPanel/index.tsx
@@ -11,6 +11,9 @@ import Thread from "./Thread";
 
 type Props = {
   me?: User;
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean | null;
+  hasDeleteRight: boolean | null;
   comments?: Comment[];
   emptyText?: string;
   collapsed: boolean;
@@ -22,6 +25,9 @@ type Props = {
 
 const CommentsPanel: React.FC<Props> = ({
   me,
+  hasCreateRight,
+  hasUpdateRight,
+  hasDeleteRight,
   comments,
   emptyText,
   collapsed,
@@ -50,6 +56,8 @@ const CommentsPanel: React.FC<Props> = ({
               <CommentsContainer>
                 <Thread
                   me={me}
+                  hasUpdateRight={hasUpdateRight}
+                  hasDeleteRight={hasDeleteRight}
                   comments={comments}
                   onCommentUpdate={onCommentUpdate}
                   onCommentDelete={onCommentDelete}
@@ -61,7 +69,10 @@ const CommentsPanel: React.FC<Props> = ({
               <EmptyTextWrapper>{emptyText}</EmptyTextWrapper>
             ) : null}
 
-            <Editor isInputDisabled={!comments} onCommentCreate={onCommentCreate} />
+            <Editor
+              isInputDisabled={!comments || !hasCreateRight}
+              onCommentCreate={onCommentCreate}
+            />
           </>
         )}
       </ContentWrapper>
diff --git a/web/src/components/molecules/Common/Form/AssetItem/hooks.ts b/web/src/components/molecules/Common/Form/AssetItem/hooks.ts
index 9777e8e720..b0e69ff096 100644
--- a/web/src/components/molecules/Common/Form/AssetItem/hooks.ts
+++ b/web/src/components/molecules/Common/Form/AssetItem/hooks.ts
@@ -1,9 +1,9 @@
-import { useState, useCallback } from "react";
+import { useState, useCallback, useMemo } from "react";
 
 import { UploadFile } from "@reearth-cms/components/atoms/Upload";
 import { UploadType } from "@reearth-cms/components/molecules/Asset/AssetList";
 import { Asset } from "@reearth-cms/components/molecules/Asset/types";
-import { useProject, useWorkspace } from "@reearth-cms/state";
+import { useProject, useWorkspace, useUserRights } from "@reearth-cms/state";
 
 export default (
   fileList?: UploadFile[],
@@ -17,6 +17,9 @@ export default (
 ) => {
   const [currentWorkspace] = useWorkspace();
   const [currentProject] = useProject();
+  const [userRights] = useUserRights();
+  const hasCreateRight = useMemo(() => !!userRights?.asset.create, [userRights?.asset.create]);
+
   const [visible, setVisible] = useState(false);
   const handleClick = useCallback(() => {
     setVisible(true);
@@ -49,6 +52,7 @@ export default (
     visible,
     workspaceId: currentWorkspace?.id,
     projectId: currentProject?.id,
+    hasCreateRight,
     handleClick,
     handleLinkAssetModalCancel,
     displayUploadModal,
diff --git a/web/src/components/molecules/Common/Form/AssetItem/index.tsx b/web/src/components/molecules/Common/Form/AssetItem/index.tsx
index 3e4fc8f7f8..c4ab09c5c0 100644
--- a/web/src/components/molecules/Common/Form/AssetItem/index.tsx
+++ b/web/src/components/molecules/Common/Form/AssetItem/index.tsx
@@ -76,6 +76,7 @@ const AssetItem: React.FC<Props> = ({
     visible,
     workspaceId,
     projectId,
+    hasCreateRight,
     handleClick,
     handleLinkAssetModalCancel,
     displayUploadModal,
@@ -203,6 +204,7 @@ const AssetItem: React.FC<Props> = ({
           totalCount={totalCount}
           page={page}
           pageSize={pageSize}
+          hasCreateRight={hasCreateRight}
           onAssetTableChange={onAssetTableChange}
           setUploadUrl={setUploadUrl}
           setUploadType={setUploadType}
diff --git a/web/src/components/molecules/Common/Form/GroupItem/index.tsx b/web/src/components/molecules/Common/Form/GroupItem/index.tsx
index 183ce8f8e0..eb4ddedc29 100644
--- a/web/src/components/molecules/Common/Form/GroupItem/index.tsx
+++ b/web/src/components/molecules/Common/Form/GroupItem/index.tsx
@@ -38,7 +38,7 @@ type Props = {
   linkItemModalTotalCount?: number;
   linkItemModalPage?: number;
   linkItemModalPageSize?: number;
-  disabled?: boolean;
+  disabled: boolean;
   onSearchTerm?: (term?: string) => void;
   onReferenceModelUpdate?: (modelId: string, referenceFieldId: string) => void;
   onLinkItemTableReload?: () => void;
diff --git a/web/src/components/molecules/Common/LinkAssetModal/LinkAssetModal.tsx b/web/src/components/molecules/Common/LinkAssetModal/LinkAssetModal.tsx
index 774111e9e4..b8c0091a95 100644
--- a/web/src/components/molecules/Common/LinkAssetModal/LinkAssetModal.tsx
+++ b/web/src/components/molecules/Common/LinkAssetModal/LinkAssetModal.tsx
@@ -10,8 +10,10 @@ import {
   OptionConfig,
 } from "@reearth-cms/components/atoms/ProTable";
 import Search from "@reearth-cms/components/atoms/Search";
+import Space from "@reearth-cms/components/atoms/Space";
 import { SorterResult, TablePaginationConfig } from "@reearth-cms/components/atoms/Table";
 import { UploadProps, UploadFile } from "@reearth-cms/components/atoms/Upload";
+import UserAvatar from "@reearth-cms/components/atoms/UserAvatar";
 import { UploadType } from "@reearth-cms/components/molecules/Asset/AssetList";
 import { Asset, SortType } from "@reearth-cms/components/molecules/Asset/types";
 import UploadAsset from "@reearth-cms/components/molecules/Asset/UploadAsset";
@@ -35,6 +37,7 @@ type Props = {
   totalCount?: number;
   page?: number;
   pageSize?: number;
+  hasCreateRight: boolean;
   onAssetTableChange?: (page: number, pageSize: number, sorter?: SortType) => void;
   setUploadUrl: (uploadUrl: { url: string; autoUnzip: boolean }) => void;
   setUploadType?: (type: UploadType) => void;
@@ -62,6 +65,7 @@ const LinkAssetModal: React.FC<Props> = ({
   totalCount,
   page,
   pageSize,
+  hasCreateRight,
   onAssetTableChange,
   setUploadUrl,
   setUploadType,
@@ -172,11 +176,17 @@ const LinkAssetModal: React.FC<Props> = ({
       },
       {
         title: t("Created By"),
-        dataIndex: "createdBy",
+        dataIndex: ["createdBy", "name"],
         key: "createdBy",
         ellipsis: true,
         width: 100,
         minWidth: 100,
+        render: (_, item) => (
+          <Space>
+            <UserAvatar username={item.createdBy.name} size="small" />
+            {item.createdBy.name}
+          </Space>
+        ),
       },
     ],
     [linkedAsset?.id, onLinkClick, t],
@@ -226,6 +236,7 @@ const LinkAssetModal: React.FC<Props> = ({
           uploadModalVisibility={uploadModalVisibility}
           uploadUrl={uploadUrl}
           uploadType={uploadType}
+          hasCreateRight={hasCreateRight}
           setUploadUrl={setUploadUrl}
           setUploadType={setUploadType}
           displayUploadModal={displayUploadModal}
diff --git a/web/src/components/molecules/Common/MultiValueField/MultiValueGroup/index.tsx b/web/src/components/molecules/Common/MultiValueField/MultiValueGroup/index.tsx
index 021a911249..fcddfbae13 100644
--- a/web/src/components/molecules/Common/MultiValueField/MultiValueGroup/index.tsx
+++ b/web/src/components/molecules/Common/MultiValueField/MultiValueGroup/index.tsx
@@ -41,7 +41,7 @@ type Props = {
   linkItemModalTotalCount?: number;
   linkItemModalPage?: number;
   linkItemModalPageSize?: number;
-  disabled?: boolean;
+  disabled: boolean;
   onSearchTerm?: (term?: string) => void;
   onReferenceModelUpdate?: (modelId: string, referenceFieldId: string) => void;
   onLinkItemTableReload?: () => void;
diff --git a/web/src/components/molecules/Content/Details/index.tsx b/web/src/components/molecules/Content/Details/index.tsx
index 8b5c2ca16e..2c47533977 100644
--- a/web/src/components/molecules/Content/Details/index.tsx
+++ b/web/src/components/molecules/Content/Details/index.tsx
@@ -17,6 +17,10 @@ import { Group } from "@reearth-cms/components/molecules/Schema/types";
 import { UserMember } from "@reearth-cms/components/molecules/Workspace/types";
 
 type Props = {
+  hasRequestCreateRight: boolean;
+  hasRequestUpdateRight: boolean;
+  hasPublishRight: boolean;
+  hasItemUpdateRight: boolean;
   loadingReference: boolean;
   linkedItemsModalList?: FormItem[];
   showPublishAction: boolean;
@@ -109,6 +113,10 @@ type Props = {
 };
 
 const ContentDetailsMolecule: React.FC<Props> = ({
+  hasRequestCreateRight,
+  hasRequestUpdateRight,
+  hasPublishRight,
+  hasItemUpdateRight,
   loadingReference,
   linkedItemsModalList,
   showPublishAction,
@@ -202,6 +210,10 @@ const ContentDetailsMolecule: React.FC<Props> = ({
           <ContentForm
             title={title}
             item={item}
+            hasRequestCreateRight={hasRequestCreateRight}
+            hasRequestUpdateRight={hasRequestUpdateRight}
+            hasPublishRight={hasPublishRight}
+            hasItemUpdateRight={hasItemUpdateRight}
             linkItemModalTitle={linkItemModalTitle}
             linkItemModalTotalCount={linkItemModalTotalCount}
             linkItemModalPage={linkItemModalPage}
diff --git a/web/src/components/molecules/Content/Form/SidebarWrapper.tsx b/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
index c059b52d7b..26b28ccd3f 100644
--- a/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
+++ b/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
@@ -49,7 +49,7 @@ const ContentSidebarWrapper: React.FC<Props> = ({ item, onNavigateToRequest }) =
             </DataRow>
             <DataRow>
               <DataTitle>{t("Created By")}</DataTitle>
-              <DataText>{item.createdBy}</DataText>
+              <DataText>{item.createdBy?.name}</DataText>
             </DataRow>
             <DataRow>
               <DataTitle>{t("Updated At")}</DataTitle>
@@ -57,7 +57,7 @@ const ContentSidebarWrapper: React.FC<Props> = ({ item, onNavigateToRequest }) =
             </DataRow>
             <DataRow>
               <DataTitle>{t("Updated By")}</DataTitle>
-              <DataText>{item.updatedBy}</DataText>
+              <DataText>{item.updatedBy?.name}</DataText>
             </DataRow>
           </SidebarCard>
           <SidebarCard title={t("Publish State")}>
diff --git a/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/AssetField.tsx b/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/AssetField.tsx
index 58242d01e1..4c7a66942b 100644
--- a/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/AssetField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/AssetField.tsx
@@ -23,7 +23,7 @@ type AssetFieldProps = {
   totalCount?: number;
   page?: number;
   pageSize?: number;
-  disabled?: boolean;
+  disabled: boolean;
   onAssetTableChange?: (page: number, pageSize: number, sorter?: SortType) => void;
   onUploadModalCancel?: () => void;
   setUploadUrl?: (uploadUrl: { url: string; autoUnzip: boolean }) => void;
diff --git a/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/GroupField.tsx b/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/GroupField.tsx
index 3084f64149..cf3b85ba56 100644
--- a/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/GroupField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/GroupField.tsx
@@ -30,7 +30,7 @@ type GroupFieldProps = {
   linkItemModalTotalCount?: number;
   linkItemModalPage?: number;
   linkItemModalPageSize?: number;
-  disabled?: boolean;
+  disabled: boolean;
   onSearchTerm?: (term?: string) => void;
   onReferenceModelUpdate?: (modelId: string, referenceFieldId: string) => void;
   onLinkItemTableReload?: () => void;
diff --git a/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/ReferenceField.tsx b/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/ReferenceField.tsx
index cf179e4e22..242aa67dea 100644
--- a/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/ReferenceField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/ComplexFieldComponents/ReferenceField.tsx
@@ -15,7 +15,7 @@ type ReferenceFieldProps = {
   linkItemModalTotalCount?: number;
   linkItemModalPage?: number;
   linkItemModalPageSize?: number;
-  disabled?: boolean;
+  disabled: boolean;
   onReferenceModelUpdate?: (modelId: string, referenceFieldId: string) => void;
   onSearchTerm?: (term?: string) => void;
   onLinkItemTableReload?: () => void;
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/BoolField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/BoolField.tsx
index b26e2efdb8..a83cd8935a 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/BoolField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/BoolField.tsx
@@ -9,7 +9,7 @@ type BoolFieldProps = {
   field: Field;
   itemGroupId?: string;
   onMetaUpdate?: () => void;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const BoolField: React.FC<BoolFieldProps> = ({ field, itemGroupId, onMetaUpdate, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/CheckboxField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/CheckboxField.tsx
index e9d8066e4e..d3f2bbf9d1 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/CheckboxField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/CheckboxField.tsx
@@ -8,9 +8,10 @@ import FieldTitle from "../../FieldTitle";
 type CheckboxFieldProps = {
   field: Field;
   onMetaUpdate?: () => void;
+  disabled: boolean;
 };
 
-const CheckboxField: React.FC<CheckboxFieldProps> = ({ field, onMetaUpdate }) => {
+const CheckboxField: React.FC<CheckboxFieldProps> = ({ field, onMetaUpdate, disabled }) => {
   return (
     <Form.Item
       extra={field.description}
@@ -18,9 +19,9 @@ const CheckboxField: React.FC<CheckboxFieldProps> = ({ field, onMetaUpdate }) =>
       valuePropName="checked"
       label={<FieldTitle title={field.title} isUnique={field.unique} isTitle={false} />}>
       {field.multiple ? (
-        <MultiValueBooleanField onChange={onMetaUpdate} FieldInput={Checkbox} />
+        <MultiValueBooleanField onChange={onMetaUpdate} FieldInput={Checkbox} disabled={disabled} />
       ) : (
-        <Checkbox onChange={onMetaUpdate} />
+        <Checkbox onChange={onMetaUpdate} disabled={disabled} />
       )}
     </Form.Item>
   );
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/DateField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/DateField.tsx
index 0fde138e30..b47282ef8f 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/DateField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/DateField.tsx
@@ -12,7 +12,7 @@ type DateFieldProps = {
   field: Field;
   itemGroupId?: string;
   onMetaUpdate?: () => void;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const DateField: React.FC<DateFieldProps> = ({ field, itemGroupId, onMetaUpdate, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/DefaultField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/DefaultField.tsx
index cdefaa8855..7399f13234 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/DefaultField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/DefaultField.tsx
@@ -13,7 +13,7 @@ type DefaultFieldProps = {
   field: Field;
   itemGroupId?: string;
   onMetaUpdate?: () => Promise<void>;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const DefaultField: React.FC<DefaultFieldProps> = ({
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/GeometryField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/GeometryField.tsx
index 136349c891..b4d2b86def 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/GeometryField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/GeometryField.tsx
@@ -11,7 +11,7 @@ import FieldTitle from "../../FieldTitle";
 type DefaultFieldProps = {
   field: Field;
   itemGroupId?: string;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const GeometryField: React.FC<DefaultFieldProps> = ({ field, itemGroupId, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/IntegerField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/IntegerField.tsx
index 94f44ff614..fedea84610 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/IntegerField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/IntegerField.tsx
@@ -11,7 +11,7 @@ import FieldTitle from "../../FieldTitle";
 type DefaultFieldProps = {
   field: Field;
   itemGroupId?: string;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const IntegerField: React.FC<DefaultFieldProps> = ({ field, itemGroupId, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/MarkdownField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/MarkdownField.tsx
index 883b7dcfdc..f29b4f4ef2 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/MarkdownField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/MarkdownField.tsx
@@ -12,7 +12,7 @@ import FieldTitle from "../../FieldTitle";
 type DefaultFieldProps = {
   field: Field;
   itemGroupId?: string;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const MarkdownField: React.FC<DefaultFieldProps> = ({ field, itemGroupId, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/SelectField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/SelectField.tsx
index 38ca5cc9b0..67e789f312 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/SelectField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/SelectField.tsx
@@ -9,7 +9,7 @@ import FieldTitle from "../../FieldTitle";
 type DefaultFieldProps = {
   field: Field;
   itemGroupId?: string;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const SelectField: React.FC<DefaultFieldProps> = ({ field, itemGroupId, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/TagField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/TagField.tsx
index 62d5d7c0c5..5be0d04bf8 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/TagField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/TagField.tsx
@@ -11,9 +11,10 @@ import FieldTitle from "../../FieldTitle";
 type TagFieldProps = {
   field: Field;
   onMetaUpdate?: () => void;
+  disabled: boolean;
 };
 
-const TagField: React.FC<TagFieldProps> = ({ field, onMetaUpdate }) => {
+const TagField: React.FC<TagFieldProps> = ({ field, onMetaUpdate, disabled }) => {
   const t = useT();
 
   return (
@@ -32,7 +33,8 @@ const TagField: React.FC<TagFieldProps> = ({ field, onMetaUpdate }) => {
           onChange={onMetaUpdate}
           mode="multiple"
           tagRender={props => <>{props.label}</>}
-          allowClear>
+          allowClear
+          disabled={disabled}>
           {field.typeProperty?.tags?.map((tag: { id: string; name: string; color: string }) => (
             <Select.Option key={tag.name} value={tag.id}>
               <Tag color={tag.color.toLowerCase()}>{tag.name}</Tag>
@@ -40,7 +42,7 @@ const TagField: React.FC<TagFieldProps> = ({ field, onMetaUpdate }) => {
           ))}
         </StyledMultipleSelect>
       ) : (
-        <Select onChange={onMetaUpdate} allowClear>
+        <Select onChange={onMetaUpdate} allowClear disabled={disabled}>
           {field.typeProperty?.tags?.map((tag: { id: string; name: string; color: string }) => (
             <Select.Option key={tag.name} value={tag.id}>
               <Tag color={tag.color.toLowerCase()}>{tag.name}</Tag>
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/TextareaField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/TextareaField.tsx
index ff92bde91f..03ee71eb31 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/TextareaField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/TextareaField.tsx
@@ -12,7 +12,7 @@ import FieldTitle from "../../FieldTitle";
 type DefaultFieldProps = {
   field: Field;
   itemGroupId?: string;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const TextareaField: React.FC<DefaultFieldProps> = ({ field, itemGroupId, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/fields/FieldComponents/URLField.tsx b/web/src/components/molecules/Content/Form/fields/FieldComponents/URLField.tsx
index 21fbf8408b..838871a0c5 100644
--- a/web/src/components/molecules/Content/Form/fields/FieldComponents/URLField.tsx
+++ b/web/src/components/molecules/Content/Form/fields/FieldComponents/URLField.tsx
@@ -11,7 +11,7 @@ type URLFieldProps = {
   field: Field;
   itemGroupId?: string;
   onMetaUpdate?: () => Promise<void>;
-  disabled?: boolean;
+  disabled: boolean;
 };
 
 const URLField: React.FC<URLFieldProps> = ({ field, itemGroupId, onMetaUpdate, disabled }) => {
diff --git a/web/src/components/molecules/Content/Form/index.tsx b/web/src/components/molecules/Content/Form/index.tsx
index 9254ebd009..5369aeee37 100644
--- a/web/src/components/molecules/Content/Form/index.tsx
+++ b/web/src/components/molecules/Content/Form/index.tsx
@@ -42,6 +42,10 @@ import { FIELD_TYPE_COMPONENT_MAP } from "./fields/FieldTypesMap";
 type Props = {
   title: string;
   item?: Item;
+  hasRequestCreateRight: boolean;
+  hasRequestUpdateRight: boolean;
+  hasPublishRight: boolean;
+  hasItemUpdateRight: boolean;
   loadingReference: boolean;
   linkedItemsModalList?: FormItem[];
   showPublishAction: boolean;
@@ -129,6 +133,10 @@ type Props = {
 const ContentForm: React.FC<Props> = ({
   title,
   item,
+  hasRequestCreateRight,
+  hasRequestUpdateRight,
+  hasPublishRight,
+  hasItemUpdateRight,
   loadingReference,
   linkedItemsModalList,
   showPublishAction,
@@ -439,7 +447,7 @@ const ContentForm: React.FC<Props> = ({
         key: "addToRequest",
         label: t("Add to Request"),
         onClick: onAddItemToRequestModalOpen,
-        disabled: item?.status === "PUBLIC",
+        disabled: item?.status === "PUBLIC" || !hasRequestUpdateRight,
       },
       {
         key: "unpublish",
@@ -447,7 +455,7 @@ const ContentForm: React.FC<Props> = ({
         onClick: () => {
           if (itemId) onUnpublish([itemId]);
         },
-        disabled: item?.status === "DRAFT" || item?.status === "REVIEW",
+        disabled: item?.status === "DRAFT" || item?.status === "REVIEW" || !hasPublishRight,
       },
     ];
     if (showPublishAction) {
@@ -455,7 +463,7 @@ const ContentForm: React.FC<Props> = ({
         key: "NewRequest",
         label: t("New Request"),
         onClick: onModalOpen,
-        disabled: item?.status === "PUBLIC",
+        disabled: item?.status === "PUBLIC" || !hasRequestCreateRight,
       });
     }
     return menuItems;
@@ -463,10 +471,13 @@ const ContentForm: React.FC<Props> = ({
     t,
     onAddItemToRequestModalOpen,
     item?.status,
+    hasRequestUpdateRight,
+    hasPublishRight,
     showPublishAction,
     itemId,
     onUnpublish,
     onModalOpen,
+    hasRequestCreateRight,
   ]);
 
   const handlePublishSubmit = useCallback(async () => {
@@ -482,6 +493,11 @@ const ContentForm: React.FC<Props> = ({
     setPublishModalOpen(false);
   }, [setPublishModalOpen]);
 
+  const fieldDisabled = useMemo(
+    () => !!itemId && !hasItemUpdateRight,
+    [hasItemUpdateRight, itemId],
+  );
+
   return (
     <>
       <StyledForm
@@ -504,7 +520,7 @@ const ContentForm: React.FC<Props> = ({
                       type="primary"
                       onClick={handlePublishSubmit}
                       loading={publishLoading}
-                      disabled={item?.status === "PUBLIC"}>
+                      disabled={item?.status === "PUBLIC" || !hasPublishRight}>
                       {t("Publish")}
                     </Button>
                   )}
@@ -512,7 +528,7 @@ const ContentForm: React.FC<Props> = ({
                     <Button
                       type="primary"
                       onClick={onModalOpen}
-                      disabled={item?.status === "PUBLIC"}>
+                      disabled={item?.status === "PUBLIC" || !hasRequestCreateRight}>
                       {t("New Request")}
                     </Button>
                   )}
@@ -544,6 +560,7 @@ const ContentForm: React.FC<Props> = ({
                     totalCount={totalCount}
                     page={page}
                     pageSize={pageSize}
+                    disabled={fieldDisabled}
                     onAssetTableChange={onAssetTableChange}
                     onUploadModalCancel={onUploadModalCancel}
                     setUploadUrl={setUploadUrl}
@@ -571,6 +588,7 @@ const ContentForm: React.FC<Props> = ({
                     linkItemModalTotalCount={linkItemModalTotalCount}
                     linkItemModalPage={linkItemModalPage}
                     linkItemModalPageSize={linkItemModalPageSize}
+                    disabled={fieldDisabled}
                     onReferenceModelUpdate={onReferenceModelUpdate}
                     onSearchTerm={onSearchTerm}
                     onLinkItemTableReload={onLinkItemTableReload}
@@ -603,6 +621,7 @@ const ContentForm: React.FC<Props> = ({
                     linkItemModalTotalCount={linkItemModalTotalCount}
                     linkItemModalPage={linkItemModalPage}
                     linkItemModalPageSize={linkItemModalPageSize}
+                    disabled={fieldDisabled}
                     onSearchTerm={onSearchTerm}
                     onReferenceModelUpdate={onReferenceModelUpdate}
                     onLinkItemTableReload={onLinkItemTableReload}
@@ -629,7 +648,7 @@ const ContentForm: React.FC<Props> = ({
 
               return (
                 <StyledFormItemWrapper key={field.id} isFullWidth>
-                  <FieldComponent field={field} />
+                  <FieldComponent field={field} disabled={fieldDisabled} />
                 </StyledFormItemWrapper>
               );
             } else {
@@ -649,7 +668,7 @@ const ContentForm: React.FC<Props> = ({
 
               return (
                 <StyledFormItemWrapper key={field.id}>
-                  <FieldComponent field={field} />
+                  <FieldComponent field={field} disabled={fieldDisabled} />
                 </StyledFormItemWrapper>
               );
             }
@@ -666,7 +685,11 @@ const ContentForm: React.FC<Props> = ({
               ] || DefaultField;
             return (
               <MetaFormItemWrapper key={field.id}>
-                <FieldComponent field={field} onMetaUpdate={handleMetaUpdate} />
+                <FieldComponent
+                  field={field}
+                  onMetaUpdate={handleMetaUpdate}
+                  disabled={fieldDisabled}
+                />
               </MetaFormItemWrapper>
             );
           })}
diff --git a/web/src/components/molecules/Content/LinkItemModal/index.tsx b/web/src/components/molecules/Content/LinkItemModal/index.tsx
index 76ee255a1f..fef9ec598e 100644
--- a/web/src/components/molecules/Content/LinkItemModal/index.tsx
+++ b/web/src/components/molecules/Content/LinkItemModal/index.tsx
@@ -10,6 +10,8 @@ import {
   OptionConfig,
 } from "@reearth-cms/components/atoms/ProTable";
 import Search from "@reearth-cms/components/atoms/Search";
+import Space from "@reearth-cms/components/atoms/Space";
+import UserAvatar from "@reearth-cms/components/atoms/UserAvatar";
 import ResizableProTable from "@reearth-cms/components/molecules/Common/ResizableProTable";
 import { CorrespondingField } from "@reearth-cms/components/molecules/Schema/types";
 import { useT } from "@reearth-cms/i18n";
@@ -160,6 +162,12 @@ const LinkItemModal: React.FC<Props> = ({
         ellipsis: true,
         width: 100,
         minWidth: 100,
+        render: (_, item) => (
+          <Space>
+            <UserAvatar username={item.createdBy} size="small" />
+            {item.createdBy}
+          </Space>
+        ),
       },
       {
         title: t("Created At"),
diff --git a/web/src/components/molecules/Content/LinkItemRequestModal/LinkItemRequestModal.tsx b/web/src/components/molecules/Content/LinkItemRequestModal/LinkItemRequestModal.tsx
index 5a870f38fc..0fa78c4b11 100644
--- a/web/src/components/molecules/Content/LinkItemRequestModal/LinkItemRequestModal.tsx
+++ b/web/src/components/molecules/Content/LinkItemRequestModal/LinkItemRequestModal.tsx
@@ -99,14 +99,17 @@ const LinkItemRequestModal: React.FC<Props> = ({
       },
       {
         title: t("Created By"),
-        dataIndex: "createdBy.name",
+        dataIndex: ["createdBy", "name"],
         key: "createdBy",
         ellipsis: true,
         width: 100,
         minWidth: 100,
-        render: (_, request) => {
-          return request.createdBy?.name;
-        },
+        render: (_, request) => (
+          <Space>
+            <UserAvatar username={request.createdBy?.name} size="small" />
+            {request.createdBy?.name}
+          </Space>
+        ),
       },
       {
         title: t("Reviewers"),
diff --git a/web/src/components/molecules/Content/List/index.tsx b/web/src/components/molecules/Content/List/index.tsx
index 40376f487a..f95bdee980 100644
--- a/web/src/components/molecules/Content/List/index.tsx
+++ b/web/src/components/molecules/Content/List/index.tsx
@@ -1,5 +1,5 @@
 import styled from "@emotion/styled";
-import { Dispatch, SetStateAction } from "react";
+import { Dispatch, SetStateAction, Key } from "react";
 
 import Button from "@reearth-cms/components/atoms/Button";
 import Icon from "@reearth-cms/components/atoms/Icon";
@@ -49,7 +49,7 @@ type Props = {
   onPublish: (itemIds: string[]) => Promise<void>;
   onUnpublish: (itemIds: string[]) => Promise<void>;
   onItemSelect: (itemId: string) => void;
-  setSelectedItems: (input: { selectedRows: { itemId: string; version?: string }[] }) => void;
+  onSelect: (selectedRowKeys: Key[], selectedRows: ContentTableField[]) => void;
   onCollapse?: (collapse: boolean) => void;
   onItemAdd: () => void;
   onItemsReload: () => void;
@@ -62,6 +62,11 @@ type Props = {
   onAddItemToRequestModalOpen: () => void;
   onRequestSearchTerm: (term: string) => void;
   onRequestTableReload: () => void;
+  hasCreateRight: boolean;
+  hasDeleteRight: boolean;
+  hasPublishRight: boolean;
+  hasRequestUpdateRight: boolean;
+  showPublishAction: boolean;
 };
 
 const ContentListMolecule: React.FC<Props> = ({
@@ -99,7 +104,7 @@ const ContentListMolecule: React.FC<Props> = ({
   onSearchTerm,
   onFilterChange,
   onContentTableChange,
-  setSelectedItems,
+  onSelect,
   onItemSelect,
   onCollapse,
   onItemAdd,
@@ -108,6 +113,11 @@ const ContentListMolecule: React.FC<Props> = ({
   onItemDelete,
   onRequestSearchTerm,
   onRequestTableReload,
+  hasCreateRight,
+  hasDeleteRight,
+  hasPublishRight,
+  hasRequestUpdateRight,
+  showPublishAction,
 }) => {
   const t = useT();
 
@@ -135,7 +145,7 @@ const ContentListMolecule: React.FC<Props> = ({
                     type="primary"
                     onClick={onItemAdd}
                     icon={<Icon icon="plus" />}
-                    disabled={!model}>
+                    disabled={!model || !hasCreateRight}>
                     {t("New Item")}
                   </Button>
                 }
@@ -158,7 +168,7 @@ const ContentListMolecule: React.FC<Props> = ({
                 onSearchTerm={onSearchTerm}
                 onFilterChange={onFilterChange}
                 onContentTableChange={onContentTableChange}
-                setSelectedItems={setSelectedItems}
+                onSelect={onSelect}
                 onItemSelect={onItemSelect}
                 onItemsReload={onItemsReload}
                 onItemEdit={onItemEdit}
@@ -179,6 +189,10 @@ const ContentListMolecule: React.FC<Props> = ({
                 modelKey={model?.key}
                 onRequestSearchTerm={onRequestSearchTerm}
                 onRequestTableReload={onRequestTableReload}
+                hasDeleteRight={hasDeleteRight}
+                hasPublishRight={hasPublishRight}
+                hasRequestUpdateRight={hasRequestUpdateRight}
+                showPublishAction={showPublishAction}
               />
             </>
           )}
diff --git a/web/src/components/molecules/Content/RenderField/index.tsx b/web/src/components/molecules/Content/RenderField/index.tsx
index 00218b58a9..e72d4f3ee8 100644
--- a/web/src/components/molecules/Content/RenderField/index.tsx
+++ b/web/src/components/molecules/Content/RenderField/index.tsx
@@ -36,7 +36,8 @@ export const renderField = (
             : option?.key;
           update?.(value);
         }}
-        placeholder="-">
+        placeholder="-"
+        disabled={!update}>
         {tags?.map(({ id, name, color }) => (
           <Select.Option key={id} value={name}>
             <Tag color={color.toLowerCase()}>{name}</Tag>
diff --git a/web/src/components/molecules/Content/Table/index.tsx b/web/src/components/molecules/Content/Table/index.tsx
index a278702724..17d0750fc9 100644
--- a/web/src/components/molecules/Content/Table/index.tsx
+++ b/web/src/components/molecules/Content/Table/index.tsx
@@ -76,7 +76,7 @@ type Props = {
   onFilterChange: (filter?: ConditionInput[]) => void;
   onContentTableChange: (page: number, pageSize: number, sorter?: ItemSort) => void;
   onItemSelect: (itemId: string) => void;
-  setSelectedItems: (input: { selectedRows: { itemId: string; version?: string }[] }) => void;
+  onSelect: (selectedRowKeys: Key[], selectedRows: ContentTableField[]) => void;
   onItemEdit: (itemId: string) => void;
   onItemDelete: (itemIds: string[]) => Promise<void>;
   onPublish: (itemIds: string[]) => Promise<void>;
@@ -90,6 +90,10 @@ type Props = {
   modelKey?: string;
   onRequestSearchTerm: (term: string) => void;
   onRequestTableReload: () => void;
+  hasDeleteRight: boolean;
+  hasPublishRight: boolean;
+  hasRequestUpdateRight: boolean;
+  showPublishAction: boolean;
 };
 
 const ContentTable: React.FC<Props> = ({
@@ -123,13 +127,17 @@ const ContentTable: React.FC<Props> = ({
   onFilterChange,
   onContentTableChange,
   onItemSelect,
-  setSelectedItems,
+  onSelect,
   onItemEdit,
   onItemDelete,
   onItemsReload,
   modelKey,
   onRequestSearchTerm,
   onRequestTableReload,
+  hasDeleteRight,
+  hasPublishRight,
+  hasRequestUpdateRight,
+  showPublishAction,
 }) => {
   const [currentWorkspace] = useWorkspace();
   const t = useT();
@@ -226,8 +234,8 @@ const ContentTable: React.FC<Props> = ({
         sortOrder: sortOrderGet("CREATION_USER"),
         render: (_, item) => (
           <Space>
-            <UserAvatar username={item.createdBy} size={"small"} />
-            {item.createdBy}
+            <UserAvatar username={item.createdBy.name} size={"small"} />
+            {item.createdBy.name}
           </Space>
         ),
         sorter: true,
@@ -284,14 +292,9 @@ const ContentTable: React.FC<Props> = ({
   const rowSelection: TableRowSelection = useMemo(
     () => ({
       selectedRowKeys: selectedItems.selectedRows.map(item => item.itemId),
-      onChange: (_selectedRowKeys: Key[], selectedRows: Item[]) => {
-        setSelectedItems({
-          ...selectedItems,
-          selectedRows: selectedRows.map(row => ({ itemId: row.id, version: row.version })),
-        });
-      },
+      onChange: onSelect,
     }),
-    [selectedItems, setSelectedItems],
+    [onSelect, selectedItems.selectedRows],
   );
 
   const publishConfirm = useCallback(
@@ -322,14 +325,16 @@ const ContentTable: React.FC<Props> = ({
             onClick={() => {
               publishConfirm(props.selectedRowKeys);
             }}
-            loading={publishLoading}>
+            loading={publishLoading}
+            disabled={!hasPublishRight || !showPublishAction}>
             {t("Publish")}
           </Button>
           <Button
             type="link"
             size="small"
             icon={<Icon icon="plus" />}
-            onClick={() => onAddItemToRequestModalOpen()}>
+            onClick={() => onAddItemToRequestModalOpen()}
+            disabled={!hasRequestUpdateRight}>
             {t("Add to Request")}
           </Button>
           <Button
@@ -337,7 +342,8 @@ const ContentTable: React.FC<Props> = ({
             size="small"
             icon={<Icon icon="eyeInvisible" />}
             onClick={() => onUnpublish(props.selectedRowKeys)}
-            loading={unpublishLoading}>
+            loading={unpublishLoading}
+            disabled={!hasPublishRight}>
             {t("Unpublish")}
           </Button>
           <Button
@@ -346,7 +352,8 @@ const ContentTable: React.FC<Props> = ({
             icon={<Icon icon="delete" />}
             onClick={() => onItemDelete(props.selectedRowKeys)}
             danger
-            loading={deleteLoading}>
+            loading={deleteLoading}
+            disabled={!hasDeleteRight}>
             {t("Delete")}
           </Button>
         </Space>
@@ -354,11 +361,15 @@ const ContentTable: React.FC<Props> = ({
     },
     [
       deleteLoading,
+      hasDeleteRight,
+      hasPublishRight,
+      hasRequestUpdateRight,
       onAddItemToRequestModalOpen,
       onItemDelete,
       onUnpublish,
       publishConfirm,
       publishLoading,
+      showPublishAction,
       t,
       unpublishLoading,
     ],
diff --git a/web/src/components/molecules/Content/types.ts b/web/src/components/molecules/Content/types.ts
index 392bfa8e86..d655e19de3 100644
--- a/web/src/components/molecules/Content/types.ts
+++ b/web/src/components/molecules/Content/types.ts
@@ -1,3 +1,4 @@
+import { User } from "@reearth-cms/components/molecules/AccountSettings/types";
 import { Request } from "@reearth-cms/components/molecules/Request/types";
 import { FieldType } from "@reearth-cms/components/molecules/Schema/types";
 
@@ -27,8 +28,8 @@ export type Item = {
   id: string;
   version: string;
   schemaId: string;
-  createdBy?: string;
-  updatedBy?: string;
+  createdBy?: Partial<User>;
+  updatedBy?: Partial<User>;
   createdAt: Date;
   updatedAt: Date;
   status: ItemStatus;
@@ -54,7 +55,7 @@ export type FormItem = {
 
 export type ContentTableField = {
   id: string;
-  createdBy: string;
+  createdBy: { id: string; name: string };
   updatedBy: string;
   schemaId: string;
   status: ItemStatus;
diff --git a/web/src/components/molecules/Integration/IntegrationTable/index.tsx b/web/src/components/molecules/Integration/IntegrationTable/index.tsx
index a656aba5ee..9aa800d505 100644
--- a/web/src/components/molecules/Integration/IntegrationTable/index.tsx
+++ b/web/src/components/molecules/Integration/IntegrationTable/index.tsx
@@ -12,6 +12,7 @@ import {
 } from "@reearth-cms/components/atoms/ProTable";
 import Search from "@reearth-cms/components/atoms/Search";
 import Space from "@reearth-cms/components/atoms/Space";
+import UserAvatar from "@reearth-cms/components/atoms/UserAvatar";
 import ResizableProTable from "@reearth-cms/components/molecules/Common/ResizableProTable";
 import { IntegrationMember } from "@reearth-cms/components/molecules/Integration/types";
 import { useT } from "@reearth-cms/i18n";
@@ -32,6 +33,9 @@ type Props = {
   onTableChange: (page: number, pageSize: number) => void;
   loading: boolean;
   onReload: () => void;
+  hasConnectRight: boolean;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
 };
 
 const IntegrationTable: React.FC<Props> = ({
@@ -48,6 +52,9 @@ const IntegrationTable: React.FC<Props> = ({
   onTableChange,
   loading,
   onReload,
+  hasConnectRight,
+  hasUpdateRight,
+  hasDeleteRight,
 }) => {
   const t = useT();
 
@@ -75,20 +82,33 @@ const IntegrationTable: React.FC<Props> = ({
         key: "creator",
         width: 250,
         minWidth: 100,
+        render: (_, item) => (
+          <Space>
+            <UserAvatar username={item.integration?.developer.name} size="small" />
+            {item.integration?.developer.name}
+          </Space>
+        ),
       },
       {
         key: "action",
         render: (_, integrationMember) => (
-          <StyledIcon
-            onClick={() => onIntegrationSettingsModalOpen(integrationMember)}
-            icon="settings"
+          <Button
+            type="link"
+            icon={
+              <Icon
+                size={18}
+                onClick={() => onIntegrationSettingsModalOpen(integrationMember)}
+                icon="settings"
+              />
+            }
+            disabled={!hasUpdateRight}
           />
         ),
         width: 48,
         minWidth: 48,
       },
     ],
-    [onIntegrationSettingsModalOpen, t],
+    [hasUpdateRight, onIntegrationSettingsModalOpen, t],
   );
 
   const toolbar: ListToolBarProps = useMemo(
@@ -138,12 +158,13 @@ const IntegrationTable: React.FC<Props> = ({
           icon={<Icon icon="delete" />}
           onClick={() => onIntegrationRemove(props.selectedRowKeys)}
           danger
-          loading={deleteLoading}>
+          loading={deleteLoading}
+          disabled={!hasDeleteRight}>
           {t("Remove")}
         </Button>
       </Space>
     ),
-    [deleteLoading, onIntegrationRemove, t],
+    [deleteLoading, hasDeleteRight, onIntegrationRemove, t],
   );
 
   const options = useMemo(
@@ -159,7 +180,11 @@ const IntegrationTable: React.FC<Props> = ({
       <PageHeader
         title={t("Integrations")}
         extra={
-          <Button type="primary" onClick={onIntegrationConnectModalOpen} icon={<Icon icon="api" />}>
+          <Button
+            type="primary"
+            onClick={onIntegrationConnectModalOpen}
+            icon={<Icon icon="api" />}
+            disabled={!hasConnectRight}>
             {t("Connect Integration")}
           </Button>
         }
@@ -173,7 +198,8 @@ const IntegrationTable: React.FC<Props> = ({
               <Button
                 onClick={onIntegrationConnectModalOpen}
                 type="primary"
-                icon={<Icon icon="api" />}>
+                icon={<Icon icon="api" />}
+                disabled={!hasConnectRight}>
                 {t("Connect Integration")}
               </Button>
             </Suggestion>
@@ -235,11 +261,6 @@ const Title = styled.h1`
   color: #000;
 `;
 
-const StyledIcon = styled(Icon)`
-  color: #1890ff;
-  font-size: 18px;
-`;
-
 const TableWrapper = styled.div`
   background-color: #fff;
   border-top: 1px solid #f0f0f0;
diff --git a/web/src/components/molecules/Member/MemberRoleModal/index.tsx b/web/src/components/molecules/Member/MemberRoleModal/index.tsx
index c7ed5f9705..8e0ff200a7 100644
--- a/web/src/components/molecules/Member/MemberRoleModal/index.tsx
+++ b/web/src/components/molecules/Member/MemberRoleModal/index.tsx
@@ -4,12 +4,12 @@ import Button from "@reearth-cms/components/atoms/Button";
 import Form from "@reearth-cms/components/atoms/Form";
 import Modal from "@reearth-cms/components/atoms/Modal";
 import Select from "@reearth-cms/components/atoms/Select";
-import { RoleUnion } from "@reearth-cms/components/molecules/Member/types";
+import { Role } from "@reearth-cms/components/molecules/Member/types";
 import { UserMember } from "@reearth-cms/components/molecules/Workspace/types";
 import { useT } from "@reearth-cms/i18n";
 
 type FormValues = {
-  role: RoleUnion;
+  role: Role;
 };
 
 type Props = {
@@ -17,7 +17,7 @@ type Props = {
   member: UserMember;
   loading: boolean;
   onClose: () => void;
-  onSubmit: (userId: string, role: RoleUnion) => Promise<void>;
+  onSubmit: (userId: string, role: Role) => Promise<void>;
 };
 
 const MemberRoleModal: React.FC<Props> = ({ open, member, loading, onClose, onSubmit }) => {
diff --git a/web/src/components/molecules/Member/MemberTable/index.tsx b/web/src/components/molecules/Member/MemberTable/index.tsx
index c6eca16a34..49d51abcf7 100644
--- a/web/src/components/molecules/Member/MemberTable/index.tsx
+++ b/web/src/components/molecules/Member/MemberTable/index.tsx
@@ -22,7 +22,6 @@ type Props = {
     id?: string;
     myWorkspace?: string;
   };
-  isOwner: boolean;
   isAbleToLeave: boolean;
   handleMemberRemoveFromWorkspace: (userIds: string[]) => Promise<void>;
   onLeave: (userId: string) => Promise<void>;
@@ -39,11 +38,13 @@ type Props = {
   onTableChange: (page: number, pageSize: number) => void;
   loading: boolean;
   onReload: () => void;
+  hasInviteRight: boolean;
+  hasRemoveRight: boolean;
+  hasChangeRoleRight: boolean;
 };
 
 const MemberTable: React.FC<Props> = ({
   me,
-  isOwner,
   isAbleToLeave,
   handleMemberRemoveFromWorkspace,
   onLeave,
@@ -58,6 +59,9 @@ const MemberTable: React.FC<Props> = ({
   onTableChange,
   loading,
   onReload,
+  hasInviteRight,
+  hasRemoveRight,
+  hasChangeRoleRight,
 }) => {
   const t = useT();
 
@@ -167,7 +171,7 @@ const MemberTable: React.FC<Props> = ({
             <ActionButton
               type="link"
               onClick={() => handleRoleModalOpen(member)}
-              disabled={!isOwner || member.userId === me.id}>
+              disabled={!hasChangeRoleRight || member.userId === me.id}>
               {t("Change Role?")}
             </ActionButton>
             <Divider type="vertical" />
@@ -185,7 +189,8 @@ const MemberTable: React.FC<Props> = ({
                 type="link"
                 onClick={() => {
                   handleMemberDelete([member.user]);
-                }}>
+                }}
+                disabled={!hasRemoveRight}>
                 {t("Remove")}
               </ActionButton>
             )}
@@ -195,9 +200,10 @@ const MemberTable: React.FC<Props> = ({
     [
       workspaceUserMembers,
       t,
-      isOwner,
+      hasChangeRoleRight,
       me.id,
       isAbleToLeave,
+      hasRemoveRight,
       handleRoleModalOpen,
       leaveConfirm,
       handleMemberDelete,
@@ -247,11 +253,17 @@ const MemberTable: React.FC<Props> = ({
   const alertOptions = useCallback(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (props: any) => (
-      <DeleteButton onClick={() => handleMemberDelete(props.selectedRows)}>
-        <Icon icon="userGroupDelete" /> {t("Remove")}
-      </DeleteButton>
+      <Button
+        type="link"
+        size="small"
+        icon={<Icon icon="userGroupDelete" />}
+        onClick={() => handleMemberDelete(props.selectedRows)}
+        danger
+        disabled={!hasRemoveRight}>
+        {t("Remove")}
+      </Button>
     ),
-    [handleMemberDelete, t],
+    [handleMemberDelete, t, hasRemoveRight],
   );
 
   const options = useMemo(
@@ -269,7 +281,8 @@ const MemberTable: React.FC<Props> = ({
           <Button
             type="primary"
             onClick={handleMemberAddModalOpen}
-            icon={<Icon icon="userGroupAdd" />}>
+            icon={<Icon icon="userGroupAdd" />}
+            disabled={!hasInviteRight}>
             {t("New Member")}
           </Button>
         }
@@ -340,11 +353,4 @@ const ActionButton = styled(Button)`
   padding-right: 0;
 `;
 
-const DeleteButton = styled.a`
-  color: #ff7875;
-  :hover {
-    color: #ff7875b3;
-  }
-`;
-
 export default MemberTable;
diff --git a/web/src/components/molecules/Member/types.ts b/web/src/components/molecules/Member/types.ts
index 7bd31d15dd..0d041305f9 100644
--- a/web/src/components/molecules/Member/types.ts
+++ b/web/src/components/molecules/Member/types.ts
@@ -1,7 +1,87 @@
+import { t } from "@reearth-cms/i18n";
+
 export type User = {
   id: string;
   name: string;
   email: string;
 };
 
-export type RoleUnion = "READER" | "WRITER" | "MAINTAINER" | "OWNER";
+export type Role = "READER" | "WRITER" | "MAINTAINER" | "OWNER";
+t("WRITER");
+t("READER");
+t("MAINTAINER");
+t("OWNER");
+
+export type UserRights = {
+  role: Role;
+  workspace: {
+    update: boolean;
+    delete: boolean;
+  };
+  workspaceSetting: {
+    update: boolean;
+  };
+  integrations: {
+    connect: boolean;
+    update: boolean;
+    delete: boolean;
+  };
+  members: {
+    invite: boolean;
+    remove: boolean;
+    changeRole: boolean;
+    leave: boolean;
+  };
+  project: {
+    create: boolean;
+    read: boolean;
+    update: boolean;
+    delete: boolean;
+    publish: boolean;
+  };
+  model: {
+    create: boolean;
+    read: boolean;
+    update: boolean;
+    delete: boolean;
+    publish: boolean;
+  };
+  schema: {
+    create: boolean;
+    read: boolean;
+    update: boolean;
+    delete: boolean;
+  };
+  view: {
+    create: boolean;
+    read: boolean;
+    update: boolean;
+    delete: boolean;
+  };
+  content: {
+    create: boolean;
+    read: boolean;
+    update: boolean | null;
+    delete: boolean | null;
+    publish: boolean;
+  };
+  asset: {
+    create: boolean;
+    read: boolean;
+    update: boolean | null;
+    delete: boolean | null;
+  };
+  request: {
+    create: boolean;
+    read: boolean;
+    update: boolean | null;
+    close: boolean | null;
+    approve: boolean;
+  };
+  comment: {
+    create: boolean;
+    read: boolean;
+    update: boolean | null;
+    delete: boolean | null;
+  };
+};
diff --git a/web/src/components/molecules/Model/ModelsList/Groups.tsx b/web/src/components/molecules/Model/ModelsList/Groups.tsx
index 7fa77e0d11..3fb0630b4c 100644
--- a/web/src/components/molecules/Model/ModelsList/Groups.tsx
+++ b/web/src/components/molecules/Model/ModelsList/Groups.tsx
@@ -8,6 +8,8 @@ type Props = {
   selectedKey?: string;
   groups?: Group[];
   open: boolean;
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean;
   onModalOpen: () => void;
   onGroupKeyCheck: (key: string, ignoredKey?: string) => Promise<boolean>;
   onClose: () => void;
@@ -21,6 +23,8 @@ const Groups: React.FC<Props> = ({
   selectedKey,
   groups,
   open,
+  hasCreateRight,
+  hasUpdateRight,
   onModalOpen,
   onGroupKeyCheck,
   onClose,
@@ -34,6 +38,8 @@ const Groups: React.FC<Props> = ({
         selectedKey={selectedKey}
         groups={groups}
         collapsed={collapsed}
+        hasCreateRight={hasCreateRight}
+        hasUpdateRight={hasUpdateRight}
         onGroupSelect={onGroupSelect}
         onModalOpen={onModalOpen}
         onUpdateGroupsOrder={onUpdateGroupsOrder}
diff --git a/web/src/components/molecules/Model/ModelsList/GroupsList.tsx b/web/src/components/molecules/Model/ModelsList/GroupsList.tsx
index eb96dd8897..c389963e6a 100644
--- a/web/src/components/molecules/Model/ModelsList/GroupsList.tsx
+++ b/web/src/components/molecules/Model/ModelsList/GroupsList.tsx
@@ -13,6 +13,8 @@ type Props = {
   selectedKey?: string;
   groups?: Group[];
   collapsed?: boolean;
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean;
   onModalOpen: () => void;
   onGroupSelect?: (groupId: string) => void;
   onUpdateGroupsOrder: (groupIds: string[]) => Promise<void>;
@@ -22,6 +24,8 @@ const GroupsList: React.FC<Props> = ({
   selectedKey,
   groups,
   collapsed,
+  hasCreateRight,
+  hasUpdateRight,
   onModalOpen,
   onGroupSelect,
   onUpdateGroupsOrder,
@@ -86,7 +90,11 @@ const GroupsList: React.FC<Props> = ({
         <Header>
           <SchemaAction>
             <SchemaStyledMenuTitle>{t("GROUPS")}</SchemaStyledMenuTitle>
-            <SchemaAddButton onClick={onModalOpen} icon={<Icon icon="plus" />} type="text">
+            <SchemaAddButton
+              onClick={onModalOpen}
+              icon={<Icon icon="plus" />}
+              type="link"
+              disabled={!hasCreateRight}>
               {!collapsed && t("Add")}
             </SchemaAddButton>
           </SchemaAction>
@@ -94,7 +102,7 @@ const GroupsList: React.FC<Props> = ({
       )}
       <MenuWrapper>
         <ReactDragListView
-          nodeSelector=".ant-menu-item"
+          nodeSelector={hasUpdateRight ? ".ant-menu-item" : undefined}
           lineClassName="dragLine"
           onDragEnd={(fromIndex, toIndex) => onDragEnd(fromIndex, toIndex)}>
           <StyledMenu
@@ -121,13 +129,7 @@ const SchemaAction = styled.div<{ collapsed?: boolean }>`
 `;
 
 const SchemaAddButton = styled(Button)`
-  color: #1890ff;
   padding: 4px;
-  &:hover,
-  &:active,
-  &:focus {
-    color: #1890ff;
-  }
 `;
 
 const SchemaStyledMenuTitle = styled.h1`
diff --git a/web/src/components/molecules/Model/ModelsList/Models.tsx b/web/src/components/molecules/Model/ModelsList/Models.tsx
index 9161a048d7..3814ae15a4 100644
--- a/web/src/components/molecules/Model/ModelsList/Models.tsx
+++ b/web/src/components/molecules/Model/ModelsList/Models.tsx
@@ -9,6 +9,8 @@ type Props = {
   selectedKey?: string;
   models?: Model[];
   open: boolean;
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean;
   onModalOpen: () => void;
   onModelKeyCheck: (key: string, ignoredKey?: string) => Promise<boolean>;
   onClose: () => void;
@@ -22,6 +24,8 @@ const Models: React.FC<Props> = ({
   selectedKey,
   models,
   open,
+  hasCreateRight,
+  hasUpdateRight,
   onModalOpen,
   onModelKeyCheck,
   onClose,
@@ -35,6 +39,8 @@ const Models: React.FC<Props> = ({
         selectedKey={selectedKey}
         models={models}
         collapsed={collapsed}
+        hasCreateRight={hasCreateRight}
+        hasUpdateRight={hasUpdateRight}
         onModelSelect={onModelSelect}
         onModalOpen={onModalOpen}
         onUpdateModelsOrder={onUpdateModelsOrder}
diff --git a/web/src/components/molecules/Model/ModelsList/ModelsList.tsx b/web/src/components/molecules/Model/ModelsList/ModelsList.tsx
index e39947fb20..12f770c6e8 100644
--- a/web/src/components/molecules/Model/ModelsList/ModelsList.tsx
+++ b/web/src/components/molecules/Model/ModelsList/ModelsList.tsx
@@ -13,6 +13,8 @@ type Props = {
   selectedKey?: string;
   models?: Model[];
   collapsed: boolean;
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean;
   onModalOpen: () => void;
   onModelSelect: (modelId: string) => void;
   onUpdateModelsOrder: (modelIds: string[]) => Promise<void>;
@@ -22,6 +24,8 @@ const ModelsList: React.FC<Props> = ({
   selectedKey,
   models,
   collapsed,
+  hasCreateRight,
+  hasUpdateRight,
   onModalOpen,
   onModelSelect,
   onUpdateModelsOrder,
@@ -91,7 +95,11 @@ const ModelsList: React.FC<Props> = ({
         <Header>
           <SchemaAction>
             <SchemaStyledMenuTitle>{t("MODELS")}</SchemaStyledMenuTitle>
-            <SchemaAddButton onClick={onModalOpen} icon={<Icon icon="plus" />} type="text">
+            <SchemaAddButton
+              onClick={onModalOpen}
+              icon={<Icon icon="plus" />}
+              type="link"
+              disabled={!hasCreateRight}>
               {!collapsed && t("Add")}
             </SchemaAddButton>
           </SchemaAction>
@@ -99,7 +107,7 @@ const ModelsList: React.FC<Props> = ({
       )}
       <MenuWrapper>
         <ReactDragListView
-          nodeSelector=".ant-menu-item"
+          nodeSelector={hasUpdateRight ? ".ant-menu-item" : undefined}
           lineClassName="dragLine"
           onDragEnd={(fromIndex, toIndex) => onDragEnd(fromIndex, toIndex)}>
           <StyledMenu
@@ -126,13 +134,7 @@ const SchemaAction = styled.div<{ collapsed?: boolean }>`
 `;
 
 const SchemaAddButton = styled(Button)`
-  color: #1890ff;
   padding: 4px;
-  &:hover,
-  &:active,
-  &:focus {
-    color: #1890ff;
-  }
 `;
 
 const SchemaStyledMenuTitle = styled.h1`
diff --git a/web/src/components/molecules/ProjectList/ProjectList.tsx b/web/src/components/molecules/ProjectList/ProjectList.tsx
index be051b7f1b..5637684c7d 100644
--- a/web/src/components/molecules/ProjectList/ProjectList.tsx
+++ b/web/src/components/molecules/ProjectList/ProjectList.tsx
@@ -8,6 +8,7 @@ import { Project } from "@reearth-cms/components/molecules/Workspace/types";
 import { useT } from "@reearth-cms/i18n";
 
 type Props = {
+  hasCreateRight: boolean;
   projects?: Project[];
   loading: boolean;
   onProjectModalOpen: () => void;
@@ -15,6 +16,7 @@ type Props = {
 };
 
 const ProjectList: React.FC<Props> = ({
+  hasCreateRight,
   projects,
   loading,
   onProjectModalOpen,
@@ -31,7 +33,11 @@ const ProjectList: React.FC<Props> = ({
           <Title>{t("No Projects Yet")}</Title>
           <Wrapper>
             <Suggestion>{t("Create a new project")}</Suggestion>
-            <Button onClick={onProjectModalOpen} type="primary" icon={<Icon icon="plus" />}>
+            <Button
+              onClick={onProjectModalOpen}
+              type="primary"
+              icon={<Icon icon="plus" />}
+              disabled={!hasCreateRight}>
               {t("New Project")}
             </Button>
           </Wrapper>
diff --git a/web/src/components/molecules/ProjectOverview/ModelCard.tsx b/web/src/components/molecules/ProjectOverview/ModelCard.tsx
index 462b55c845..d8c0a15782 100644
--- a/web/src/components/molecules/ProjectOverview/ModelCard.tsx
+++ b/web/src/components/molecules/ProjectOverview/ModelCard.tsx
@@ -9,6 +9,8 @@ import { useT } from "@reearth-cms/i18n";
 
 type Props = {
   model: Model;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
   onSchemaNavigate: (modelId: string) => void;
   onContentNavigate: (modelId: string) => void;
   onModelDeletionModalOpen: (model: Model) => Promise<void>;
@@ -17,6 +19,8 @@ type Props = {
 
 const ModelCard: React.FC<Props> = ({
   model,
+  hasUpdateRight,
+  hasDeleteRight,
   onSchemaNavigate,
   onContentNavigate,
   onModelDeletionModalOpen,
@@ -31,15 +35,17 @@ const ModelCard: React.FC<Props> = ({
         key: "edit",
         label: t("Edit"),
         onClick: () => onModelUpdateModalOpen(model),
+        disabled: !hasUpdateRight,
       },
       {
         key: "delete",
         label: t("Delete"),
         onClick: () => onModelDeletionModalOpen(model),
         danger: true,
+        disabled: !hasDeleteRight,
       },
     ],
-    [t, model, onModelUpdateModalOpen, onModelDeletionModalOpen],
+    [t, hasUpdateRight, hasDeleteRight, onModelUpdateModalOpen, model, onModelDeletionModalOpen],
   );
 
   return (
diff --git a/web/src/components/molecules/ProjectOverview/index.tsx b/web/src/components/molecules/ProjectOverview/index.tsx
index 56839d3ef8..a129b82f95 100644
--- a/web/src/components/molecules/ProjectOverview/index.tsx
+++ b/web/src/components/molecules/ProjectOverview/index.tsx
@@ -13,6 +13,9 @@ type Props = {
   projectName?: string;
   projectDescription?: string;
   models?: Model[];
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
   onModelModalOpen: () => void;
   onSchemaNavigate: (modelId: string) => void;
   onContentNavigate: (modelId: string) => void;
@@ -24,6 +27,9 @@ const ProjectOverview: React.FC<Props> = ({
   projectName,
   projectDescription,
   models,
+  hasCreateRight,
+  hasUpdateRight,
+  hasDeleteRight,
   onModelModalOpen,
   onSchemaNavigate,
   onContentNavigate,
@@ -37,7 +43,11 @@ const ProjectOverview: React.FC<Props> = ({
       <ContentSection
         title={t("Models")}
         headerActions={
-          <Button type="primary" icon={<Icon icon="plus" />} onClick={onModelModalOpen}>
+          <Button
+            type="primary"
+            icon={<Icon icon="plus" />}
+            onClick={onModelModalOpen}
+            disabled={!hasCreateRight}>
             {t("New Model")}
           </Button>
         }>
@@ -46,6 +56,8 @@ const ProjectOverview: React.FC<Props> = ({
             <ModelCard
               key={m.id}
               model={m}
+              hasUpdateRight={hasUpdateRight}
+              hasDeleteRight={hasDeleteRight}
               onSchemaNavigate={onSchemaNavigate}
               onContentNavigate={onContentNavigate}
               onModelDeletionModalOpen={onModelDeletionModalOpen}
diff --git a/web/src/components/molecules/ProjectSettings/DangerZone.tsx b/web/src/components/molecules/ProjectSettings/DangerZone.tsx
index d6bb335ad0..ca1c7ce459 100644
--- a/web/src/components/molecules/ProjectSettings/DangerZone.tsx
+++ b/web/src/components/molecules/ProjectSettings/DangerZone.tsx
@@ -8,10 +8,11 @@ import Modal from "@reearth-cms/components/atoms/Modal";
 import { useT } from "@reearth-cms/i18n";
 
 type Props = {
+  hasDeleteRight: boolean;
   onProjectDelete: () => Promise<void>;
 };
 
-const DangerZone: React.FC<Props> = ({ onProjectDelete }) => {
+const DangerZone: React.FC<Props> = ({ hasDeleteRight, onProjectDelete }) => {
   const t = useT();
   const { confirm } = Modal;
 
@@ -34,7 +35,11 @@ const DangerZone: React.FC<Props> = ({ onProjectDelete }) => {
           "Permanently removes your project and all of its contents from Re:Earth CMS. This action is not reversible, so please continue with caution.",
         )}
       </Text>
-      <Button onClick={handleProjectDeleteConfirmation} type="primary" danger>
+      <Button
+        onClick={handleProjectDeleteConfirmation}
+        type="primary"
+        danger
+        disabled={!hasDeleteRight}>
         {t("Delete Project")}
       </Button>
     </ContentSection>
diff --git a/web/src/components/molecules/ProjectSettings/GeneralForm.tsx b/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
index c37452a8b6..fab290f1c0 100644
--- a/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
+++ b/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
@@ -12,6 +12,7 @@ import { Project } from "../Workspace/types";
 
 type Props = {
   project: Project;
+  hasUpdateRight: boolean;
   onProjectUpdate: (name?: string, alias?: string, description?: string) => Promise<void>;
   onProjectAliasCheck: (alias: string) => Promise<boolean>;
 };
@@ -22,7 +23,12 @@ type FormType = {
   description: string;
 };
 
-const ProjectGeneralForm: React.FC<Props> = ({ project, onProjectUpdate, onProjectAliasCheck }) => {
+const ProjectGeneralForm: React.FC<Props> = ({
+  project,
+  hasUpdateRight,
+  onProjectUpdate,
+  onProjectAliasCheck,
+}) => {
   const [form] = Form.useForm<FormType>();
   const t = useT();
   const [isDisabled, setIsDisabled] = useState(true);
@@ -72,7 +78,7 @@ const ProjectGeneralForm: React.FC<Props> = ({ project, onProjectUpdate, onProje
         name="name"
         label={t("Name")}
         rules={[{ required: true, message: t("Please input the name of project!") }]}>
-        <Input />
+        <Input disabled={!hasUpdateRight} />
       </Form.Item>
       <Form.Item
         name="alias"
@@ -92,13 +98,13 @@ const ProjectGeneralForm: React.FC<Props> = ({ project, onProjectUpdate, onProje
             },
           },
         ]}>
-        <Input />
+        <Input disabled={!hasUpdateRight} />
       </Form.Item>
       <Form.Item
         name="description"
         label={t("Description")}
         extra={t("Write something here to describe this record.")}>
-        <TextArea rows={4} />
+        <TextArea rows={4} disabled={!hasUpdateRight} />
       </Form.Item>
       <Form.Item>
         <Button type="primary" htmlType="submit" disabled={isDisabled} loading={isLoading}>
diff --git a/web/src/components/molecules/ProjectSettings/RequestOptions.tsx b/web/src/components/molecules/ProjectSettings/RequestOptions.tsx
index fad4c414a9..8db3015204 100644
--- a/web/src/components/molecules/ProjectSettings/RequestOptions.tsx
+++ b/web/src/components/molecules/ProjectSettings/RequestOptions.tsx
@@ -4,9 +4,10 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import Button from "@reearth-cms/components/atoms/Button";
 import Switch from "@reearth-cms/components/atoms/Switch";
 import Table, { TableColumnsType } from "@reearth-cms/components/atoms/Table";
+import { Role } from "@reearth-cms/components/molecules/Member/types";
 import { useT } from "@reearth-cms/i18n";
 
-import { Project, Role } from "../Workspace/types";
+import { Project } from "../Workspace/types";
 
 type RequestOptionsData = {
   id: string;
@@ -16,10 +17,15 @@ type RequestOptionsData = {
 
 type Props = {
   project: Project;
+  hasUpdateRight: boolean;
   onProjectRequestRolesUpdate: (role?: Role[] | null) => Promise<void>;
 };
 
-const ProjectRequestOptions: React.FC<Props> = ({ project, onProjectRequestRolesUpdate }) => {
+const ProjectRequestOptions: React.FC<Props> = ({
+  project,
+  hasUpdateRight,
+  onProjectRequestRolesUpdate,
+}) => {
   const t = useT();
   const [requestRoles, setRequestRoles] = useState<Role[]>([]);
   const [isLoading, setIsLoading] = useState(false);
@@ -68,6 +74,7 @@ const ProjectRequestOptions: React.FC<Props> = ({ project, onProjectRequestRoles
                 setRequestRoles(requestRoles?.filter(role => role !== "OWNER"));
               }
             }}
+            disabled={!hasUpdateRight}
           />
         ),
       },
@@ -88,6 +95,7 @@ const ProjectRequestOptions: React.FC<Props> = ({ project, onProjectRequestRoles
                 setRequestRoles(requestRoles?.filter(role => role !== "MAINTAINER"));
               }
             }}
+            disabled={!hasUpdateRight}
           />
         ),
       },
@@ -108,6 +116,7 @@ const ProjectRequestOptions: React.FC<Props> = ({ project, onProjectRequestRoles
                 setRequestRoles(requestRoles?.filter(role => role !== "WRITER"));
               }
             }}
+            disabled={!hasUpdateRight}
           />
         ),
       },
@@ -135,7 +144,7 @@ const ProjectRequestOptions: React.FC<Props> = ({ project, onProjectRequestRoles
     ];
 
     return columns;
-  }, [requestRoles]);
+  }, [hasUpdateRight, requestRoles]);
 
   const handleSave = useCallback(async () => {
     setIsLoading(true);
@@ -149,7 +158,7 @@ const ProjectRequestOptions: React.FC<Props> = ({ project, onProjectRequestRoles
   return (
     <>
       <SeondaryText>
-        {t("If this option is chosen, all new model within the project will default follow it")}
+        {t("If this option is chosen, all new model within the project will default follow it.")}
       </SeondaryText>
       <TableWrapper>
         <Table dataSource={dataSource} columns={columns} pagination={false} />
diff --git a/web/src/components/molecules/ProjectSettings/index.tsx b/web/src/components/molecules/ProjectSettings/index.tsx
index 0cef8af6dc..ba0360e889 100644
--- a/web/src/components/molecules/ProjectSettings/index.tsx
+++ b/web/src/components/molecules/ProjectSettings/index.tsx
@@ -1,14 +1,17 @@
 import InnerContent from "@reearth-cms/components/atoms/InnerContents/basic";
 import ContentSection from "@reearth-cms/components/atoms/InnerContents/ContentSection";
+import { Role } from "@reearth-cms/components/molecules/Member/types";
 import DangerZone from "@reearth-cms/components/molecules/ProjectSettings/DangerZone";
 import ProjectGeneralForm from "@reearth-cms/components/molecules/ProjectSettings/GeneralForm";
 import ProjectRequestOptions from "@reearth-cms/components/molecules/ProjectSettings/RequestOptions";
 import { useT } from "@reearth-cms/i18n";
 
-import { Project, Role } from "../Workspace/types";
+import { Project } from "../Workspace/types";
 
 type Props = {
   project: Project;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
   onProjectUpdate: (name?: string, alias?: string, description?: string) => Promise<void>;
   onProjectRequestRolesUpdate: (role?: Role[] | null) => Promise<void>;
   onProjectDelete: () => Promise<void>;
@@ -17,6 +20,8 @@ type Props = {
 
 const ProjectSettings: React.FC<Props> = ({
   project,
+  hasUpdateRight,
+  hasDeleteRight,
   onProjectDelete,
   onProjectUpdate,
   onProjectRequestRolesUpdate,
@@ -29,6 +34,7 @@ const ProjectSettings: React.FC<Props> = ({
       <ContentSection title={t("General")}>
         <ProjectGeneralForm
           project={project}
+          hasUpdateRight={hasUpdateRight}
           onProjectUpdate={onProjectUpdate}
           onProjectAliasCheck={onProjectAliasCheck}
         />
@@ -36,10 +42,11 @@ const ProjectSettings: React.FC<Props> = ({
       <ContentSection title={t("Request")}>
         <ProjectRequestOptions
           project={project}
+          hasUpdateRight={hasUpdateRight}
           onProjectRequestRolesUpdate={onProjectRequestRolesUpdate}
         />
       </ContentSection>
-      <DangerZone onProjectDelete={onProjectDelete} />
+      <DangerZone hasDeleteRight={hasDeleteRight} onProjectDelete={onProjectDelete} />
     </InnerContent>
   );
 };
diff --git a/web/src/components/molecules/Request/Details/Comment.tsx b/web/src/components/molecules/Request/Details/Comment.tsx
index 4020740a59..2f6d8d4b1b 100644
--- a/web/src/components/molecules/Request/Details/Comment.tsx
+++ b/web/src/components/molecules/Request/Details/Comment.tsx
@@ -15,6 +15,8 @@ import { dateTimeFormat } from "@reearth-cms/utils/format";
 
 type Props = {
   me?: User;
+  hasCommentUpdateRight: boolean | null;
+  hasCommentDeleteRight: boolean | null;
   comment: Comment;
   onCommentUpdate: (commentId: string, content: string) => Promise<void>;
   onCommentDelete: (commentId: string) => Promise<void>;
@@ -22,6 +24,8 @@ type Props = {
 
 const ThreadCommentMolecule: React.FC<Props> = ({
   me,
+  hasCommentUpdateRight,
+  hasCommentDeleteRight,
   comment,
   onCommentUpdate,
   onCommentDelete,
@@ -52,21 +56,37 @@ const ThreadCommentMolecule: React.FC<Props> = ({
     [comment.createdAt],
   );
 
+  const actions = useMemo(() => {
+    const result = [];
+    const isMine = me?.id === comment.author.id;
+    if (hasCommentDeleteRight || (hasCommentDeleteRight === null && isMine)) {
+      result.push(<Icon key="delete" icon="delete" onClick={() => onCommentDelete(comment.id)} />);
+    }
+    if (hasCommentUpdateRight || (hasCommentUpdateRight === null && isMine)) {
+      result.push(
+        <Icon
+          key="edit"
+          icon={showEditor ? "check" : "edit"}
+          onClick={showEditor ? handleSubmit : () => setShowEditor(true)}
+        />,
+      );
+    }
+    return result;
+  }, [
+    comment.author.id,
+    comment.id,
+    handleSubmit,
+    hasCommentDeleteRight,
+    hasCommentUpdateRight,
+    me?.id,
+    onCommentDelete,
+    showEditor,
+  ]);
+
   return (
     <StyledAntDComment
       author={comment.author.name}
-      actions={
-        me?.id === comment.author.id
-          ? [
-              <Icon key="delete" icon="delete" onClick={() => onCommentDelete(comment.id)} />,
-              showEditor ? (
-                <Icon key="edit" icon="check" onClick={handleSubmit} />
-              ) : (
-                <Icon key="edit" icon="edit" onClick={() => setShowEditor(true)} />
-              ),
-            ]
-          : []
-      }
+      actions={actions}
       avatar={
         comment.author.type === "Integration" ? (
           <Badge count={<StyledIcon icon="api" size={8} color="#BFBFBF" />} offset={[0, 24]}>
diff --git a/web/src/components/molecules/Request/Details/CommentList.tsx b/web/src/components/molecules/Request/Details/CommentList.tsx
index a2338abd0b..28086af855 100644
--- a/web/src/components/molecules/Request/Details/CommentList.tsx
+++ b/web/src/components/molecules/Request/Details/CommentList.tsx
@@ -7,6 +7,8 @@ import ThreadCommentMolecule from "@reearth-cms/components/molecules/Request/Det
 
 type Props = {
   me?: User;
+  hasCommentUpdateRight: boolean | null;
+  hasCommentDeleteRight: boolean | null;
   comments: Comment[];
   onCommentUpdate: (commentId: string, content: string) => Promise<void>;
   onCommentDelete: (commentId: string) => Promise<void>;
@@ -14,6 +16,8 @@ type Props = {
 
 export const RequestCommentList: React.FC<Props> = ({
   me,
+  hasCommentUpdateRight,
+  hasCommentDeleteRight,
   comments,
   onCommentUpdate,
   onCommentDelete,
@@ -24,8 +28,10 @@ export const RequestCommentList: React.FC<Props> = ({
       itemLayout="horizontal"
       renderItem={props => (
         <ThreadCommentMolecule
-          comment={props}
           me={me}
+          hasCommentUpdateRight={hasCommentUpdateRight}
+          hasCommentDeleteRight={hasCommentDeleteRight}
+          comment={props}
           onCommentUpdate={onCommentUpdate}
           onCommentDelete={onCommentDelete}
         />
diff --git a/web/src/components/molecules/Request/Details/Editor.tsx b/web/src/components/molecules/Request/Details/Editor.tsx
index efad247569..6280ada6df 100644
--- a/web/src/components/molecules/Request/Details/Editor.tsx
+++ b/web/src/components/molecules/Request/Details/Editor.tsx
@@ -7,10 +7,11 @@ import TextArea from "@reearth-cms/components/atoms/TextArea";
 import { useT } from "@reearth-cms/i18n";
 
 type Props = {
+  hasCommentCreateRight: boolean;
   onCommentCreate: (content: string) => Promise<void>;
 };
 
-const RequestEditor: React.FC<Props> = ({ onCommentCreate }) => {
+const RequestEditor: React.FC<Props> = ({ hasCommentCreateRight, onCommentCreate }) => {
   const [submitting, setSubmitting] = useState(false);
   const [isDisabled, setIsDisabled] = useState(true);
   const [form] = Form.useForm();
@@ -37,7 +38,12 @@ const RequestEditor: React.FC<Props> = ({ onCommentCreate }) => {
   return (
     <Form form={form} layout="vertical">
       <TextAreaItem name="content">
-        <TextArea rows={4} placeholder={t("Leave your comment...")} onChange={handleChange} />
+        <TextArea
+          rows={4}
+          placeholder={t("Leave your comment...")}
+          onChange={handleChange}
+          disabled={!hasCommentCreateRight}
+        />
       </TextAreaItem>
       <ButtonItem>
         <Button disabled={isDisabled} loading={submitting} onClick={handleSubmit} type="primary">
diff --git a/web/src/components/molecules/Request/Details/Request.tsx b/web/src/components/molecules/Request/Details/Request.tsx
index b64fc6cfa5..97780cc8b6 100644
--- a/web/src/components/molecules/Request/Details/Request.tsx
+++ b/web/src/components/molecules/Request/Details/Request.tsx
@@ -13,8 +13,13 @@ import RequestSidebarWrapper from "./SidebarWrapper";
 
 type Props = {
   me?: User;
+  hasCommentCreateRight: boolean;
+  hasCommentUpdateRight: boolean | null;
+  hasCommentDeleteRight: boolean | null;
   isCloseActionEnabled: boolean;
+  isReopenActionEnabled: boolean;
   isApproveActionEnabled: boolean;
+  isAssignActionEnabled: boolean;
   currentRequest: Request;
   workspaceUserMembers: UserMember[];
   deleteLoading: boolean;
@@ -34,8 +39,13 @@ type Props = {
 
 const RequestMolecule: React.FC<Props> = ({
   me,
+  hasCommentCreateRight,
+  hasCommentUpdateRight,
+  hasCommentDeleteRight,
   isCloseActionEnabled,
+  isReopenActionEnabled,
   isApproveActionEnabled,
+  isAssignActionEnabled,
   currentRequest,
   workspaceUserMembers,
   deleteLoading,
@@ -69,6 +79,7 @@ const RequestMolecule: React.FC<Props> = ({
             </Button>
             <Button
               hidden={currentRequest.state !== "CLOSED"}
+              disabled={!isReopenActionEnabled}
               loading={updateLoading}
               onClick={() =>
                 onRequestUpdate({
@@ -95,6 +106,9 @@ const RequestMolecule: React.FC<Props> = ({
         <ThreadWrapper>
           <RequestThread
             me={me}
+            hasCommentCreateRight={hasCommentCreateRight}
+            hasCommentUpdateRight={hasCommentUpdateRight}
+            hasCommentDeleteRight={hasCommentDeleteRight}
             currentRequest={currentRequest}
             onCommentCreate={onCommentCreate}
             onCommentUpdate={onCommentUpdate}
@@ -107,6 +121,7 @@ const RequestMolecule: React.FC<Props> = ({
         <RequestSidebarWrapper
           currentRequest={currentRequest}
           workspaceUserMembers={workspaceUserMembers}
+          isAssignActionEnabled={isAssignActionEnabled}
           onRequestUpdate={onRequestUpdate}
         />
       </BodyWrapper>
diff --git a/web/src/components/molecules/Request/Details/SidebarWrapper.tsx b/web/src/components/molecules/Request/Details/SidebarWrapper.tsx
index 56a35a5440..114b9cc974 100644
--- a/web/src/components/molecules/Request/Details/SidebarWrapper.tsx
+++ b/web/src/components/molecules/Request/Details/SidebarWrapper.tsx
@@ -18,12 +18,14 @@ const { Option } = Select;
 type Props = {
   currentRequest: Request;
   workspaceUserMembers: UserMember[];
+  isAssignActionEnabled: boolean;
   onRequestUpdate: (data: RequestUpdatePayload) => Promise<void>;
 };
 
 const RequestSidebarWrapper: React.FC<Props> = ({
   currentRequest,
   workspaceUserMembers,
+  isAssignActionEnabled,
   onRequestUpdate,
 }) => {
   const t = useT();
@@ -120,7 +122,10 @@ const RequestSidebarWrapper: React.FC<Props> = ({
           </StyledSelect>
         ) : (
           <ViewReviewers>
-            <StyledButton type="link" onClick={displayViewReviewers}>
+            <StyledButton
+              type="link"
+              onClick={displayViewReviewers}
+              disabled={!isAssignActionEnabled}>
               {t("Assign to")}
             </StyledButton>
           </ViewReviewers>
diff --git a/web/src/components/molecules/Request/Details/Thread.tsx b/web/src/components/molecules/Request/Details/Thread.tsx
index 3c44ecfb39..c85531e106 100644
--- a/web/src/components/molecules/Request/Details/Thread.tsx
+++ b/web/src/components/molecules/Request/Details/Thread.tsx
@@ -13,6 +13,9 @@ import RequestStatus from "./RequestStatus";
 
 type Props = {
   me?: User;
+  hasCommentCreateRight: boolean;
+  hasCommentUpdateRight: boolean | null;
+  hasCommentDeleteRight: boolean | null;
   currentRequest: Request;
   onCommentCreate: (content: string) => Promise<void>;
   onCommentUpdate: (commentId: string, content: string) => Promise<void>;
@@ -24,6 +27,9 @@ type Props = {
 
 const RequestThread: React.FC<Props> = ({
   me,
+  hasCommentCreateRight,
+  hasCommentUpdateRight,
+  hasCommentDeleteRight,
   currentRequest,
   onCommentCreate,
   onCommentUpdate,
@@ -45,6 +51,8 @@ const RequestThread: React.FC<Props> = ({
           {currentRequest.comments && currentRequest.comments?.length > 0 && (
             <RequestCommentList
               me={me}
+              hasCommentUpdateRight={hasCommentUpdateRight}
+              hasCommentDeleteRight={hasCommentDeleteRight}
               comments={currentRequest.comments}
               onCommentUpdate={onCommentUpdate}
               onCommentDelete={onCommentDelete}
@@ -56,7 +64,12 @@ const RequestThread: React.FC<Props> = ({
       <ThreadDivider />
       <StyledAntDComment
         avatar={<UserAvatar username={me?.name} />}
-        content={<RequestEditor onCommentCreate={onCommentCreate} />}
+        content={
+          <RequestEditor
+            hasCommentCreateRight={hasCommentCreateRight}
+            onCommentCreate={onCommentCreate}
+          />
+        }
       />
     </ContentWrapper>
   );
diff --git a/web/src/components/molecules/Request/Details/index.tsx b/web/src/components/molecules/Request/Details/index.tsx
index 2c2eb5bd00..e3408e6cc5 100644
--- a/web/src/components/molecules/Request/Details/index.tsx
+++ b/web/src/components/molecules/Request/Details/index.tsx
@@ -8,10 +8,16 @@ import { UserMember } from "@reearth-cms/components/molecules/Workspace/types";
 
 type Props = {
   me?: User;
+  hasCommentCreateRight: boolean;
+  hasCommentUpdateRight: boolean | null;
+  hasCommentDeleteRight: boolean | null;
   isCloseActionEnabled: boolean;
+  isReopenActionEnabled: boolean;
   isApproveActionEnabled: boolean;
+  isAssignActionEnabled: boolean;
   currentRequest?: Request;
   workspaceUserMembers: UserMember[];
+  loading: boolean;
   deleteLoading: boolean;
   approveLoading: boolean;
   updateLoading: boolean;
@@ -23,17 +29,22 @@ type Props = {
   onCommentDelete: (commentId: string) => Promise<void>;
   onBack: () => void;
   onNavigateToItemEdit: (modelId: string, itemId: string) => void;
-  loading: boolean;
   onGetAsset: (assetId: string) => Promise<string | undefined>;
   onGroupGet: (id: string) => Promise<Group | undefined>;
 };
 
 const RequestDetailsMolecule: React.FC<Props> = ({
   me,
+  hasCommentCreateRight,
+  hasCommentUpdateRight,
+  hasCommentDeleteRight,
   isCloseActionEnabled,
+  isReopenActionEnabled,
   isApproveActionEnabled,
+  isAssignActionEnabled,
   currentRequest,
   workspaceUserMembers,
+  loading,
   deleteLoading,
   approveLoading,
   updateLoading,
@@ -45,7 +56,6 @@ const RequestDetailsMolecule: React.FC<Props> = ({
   onCommentDelete,
   onBack,
   onNavigateToItemEdit,
-  loading,
   onGetAsset,
   onGroupGet,
 }) => {
@@ -54,8 +64,13 @@ const RequestDetailsMolecule: React.FC<Props> = ({
   ) : currentRequest ? (
     <RequestMolecule
       me={me}
+      hasCommentCreateRight={hasCommentCreateRight}
+      hasCommentUpdateRight={hasCommentUpdateRight}
+      hasCommentDeleteRight={hasCommentDeleteRight}
       isCloseActionEnabled={isCloseActionEnabled}
+      isReopenActionEnabled={isReopenActionEnabled}
       isApproveActionEnabled={isApproveActionEnabled}
+      isAssignActionEnabled={isAssignActionEnabled}
       currentRequest={currentRequest}
       workspaceUserMembers={workspaceUserMembers}
       deleteLoading={deleteLoading}
diff --git a/web/src/components/molecules/Request/List/index.tsx b/web/src/components/molecules/Request/List/index.tsx
index c0bbdcd35f..52571d51e9 100644
--- a/web/src/components/molecules/Request/List/index.tsx
+++ b/web/src/components/molecules/Request/List/index.tsx
@@ -20,7 +20,7 @@ type Props = {
   selection: {
     selectedRowKeys: Key[];
   };
-  setSelection: (input: { selectedRowKeys: Key[] }) => void;
+  onSelect: (selectedRowKeys: Key[], selectedRows: Request[]) => void;
   onRequestsReload: () => void;
   deleteLoading: boolean;
   onRequestDelete: (requestIds: string[]) => void;
@@ -39,6 +39,7 @@ type Props = {
   pageSize: number;
   columns: Record<string, ColumnsState>;
   onColumnsChange: (cols: Record<string, ColumnsState>) => void;
+  hasCloseRight: boolean;
 };
 
 const RequestListMolecule: React.FC<Props> = ({
@@ -51,7 +52,7 @@ const RequestListMolecule: React.FC<Props> = ({
   searchTerm,
   onSearchTerm,
   selection,
-  setSelection,
+  onSelect,
   onRequestsReload,
   deleteLoading,
   onRequestDelete,
@@ -64,6 +65,7 @@ const RequestListMolecule: React.FC<Props> = ({
   pageSize,
   columns,
   onColumnsChange,
+  hasCloseRight,
 }) => {
   const t = useT();
 
@@ -82,7 +84,7 @@ const RequestListMolecule: React.FC<Props> = ({
             deleteLoading={deleteLoading}
             onRequestDelete={onRequestDelete}
             onRequestsReload={onRequestsReload}
-            setSelection={setSelection}
+            onSelect={onSelect}
             onRequestSelect={onRequestSelect}
             selectedRequest={selectedRequest}
             onRequestTableChange={onRequestTableChange}
@@ -94,6 +96,7 @@ const RequestListMolecule: React.FC<Props> = ({
             pageSize={pageSize}
             columns={columns}
             onColumnsChange={onColumnsChange}
+            hasCloseRight={hasCloseRight}
           />
         </Content>
       }
diff --git a/web/src/components/molecules/Request/Table/index.tsx b/web/src/components/molecules/Request/Table/index.tsx
index cb2513c674..39bbee6794 100644
--- a/web/src/components/molecules/Request/Table/index.tsx
+++ b/web/src/components/molecules/Request/Table/index.tsx
@@ -32,7 +32,7 @@ type Props = {
   selection: {
     selectedRowKeys: Key[];
   };
-  setSelection: (input: { selectedRowKeys: Key[] }) => void;
+  onSelect: (selectedRowKeys: Key[], selectedRows: Request[]) => void;
   onRequestsReload: () => void;
   deleteLoading: boolean;
   onRequestDelete: (requestIds: string[]) => void;
@@ -51,6 +51,7 @@ type Props = {
   pageSize: number;
   columns: Record<string, ColumnsState>;
   onColumnsChange: (cols: Record<string, ColumnsState>) => void;
+  hasCloseRight: boolean;
 };
 
 const RequestListTable: React.FC<Props> = ({
@@ -62,7 +63,7 @@ const RequestListTable: React.FC<Props> = ({
   searchTerm,
   onSearchTerm,
   selection,
-  setSelection,
+  onSelect,
   onRequestsReload,
   deleteLoading,
   onRequestDelete,
@@ -75,6 +76,7 @@ const RequestListTable: React.FC<Props> = ({
   pageSize,
   columns: columnsState,
   onColumnsChange,
+  hasCloseRight,
 }) => {
   const t = useT();
 
@@ -227,14 +229,9 @@ const RequestListTable: React.FC<Props> = ({
   const rowSelection: TableRowSelection = useMemo(
     () => ({
       selectedRowKeys: selection.selectedRowKeys,
-      onChange: (selectedRowKeys: Key[]) => {
-        setSelection({
-          ...selection,
-          selectedRowKeys: selectedRowKeys,
-        });
-      },
+      onChange: onSelect,
     }),
-    [selection, setSelection],
+    [onSelect, selection.selectedRowKeys],
   );
 
   const handleToolbarEvents: ListToolBarProps = useMemo(
@@ -264,13 +261,14 @@ const RequestListTable: React.FC<Props> = ({
             icon={<Icon icon="delete" />}
             onClick={() => onRequestDelete(props.selectedRowKeys)}
             danger
-            loading={deleteLoading}>
+            loading={deleteLoading}
+            disabled={!hasCloseRight}>
             {t("Close")}
           </Button>
         </Space>
       );
     },
-    [deleteLoading, onRequestDelete, t],
+    [deleteLoading, onRequestDelete, t, hasCloseRight],
   );
 
   return (
diff --git a/web/src/components/molecules/Schema/FieldList.tsx b/web/src/components/molecules/Schema/FieldList.tsx
index 552e615c5b..e49aa6880f 100644
--- a/web/src/components/molecules/Schema/FieldList.tsx
+++ b/web/src/components/molecules/Schema/FieldList.tsx
@@ -11,6 +11,7 @@ import { FieldType, Tab, SelectedSchemaType } from "./types";
 type Props = {
   currentTab: Tab;
   selectedSchemaType: SelectedSchemaType;
+  hasCreateRight: boolean;
   addField: (fieldType: FieldType) => void;
 };
 
@@ -19,7 +20,12 @@ type FieldListItem = {
   fields: FieldType[];
 };
 
-const FieldList: React.FC<Props> = ({ currentTab, selectedSchemaType, addField }) => {
+const FieldList: React.FC<Props> = ({
+  currentTab,
+  selectedSchemaType,
+  hasCreateRight,
+  addField,
+}) => {
   const t = useT();
 
   const common: FieldListItem[] = useMemo(
@@ -103,11 +109,12 @@ const FieldList: React.FC<Props> = ({ currentTab, selectedSchemaType, addField }
       <FieldStyledList
         itemLayout="horizontal"
         dataSource={dataSource}
+        hasCreateRight={hasCreateRight}
         renderItem={item => (
           <>
             <FieldCategoryTitle>{item.title}</FieldCategoryTitle>
             {item.fields.map(field => (
-              <List.Item key={field} onClick={() => addField(field)}>
+              <List.Item key={field} onClick={hasCreateRight ? () => addField(field) : undefined}>
                 <Meta
                   avatar={<Icon icon={fieldTypes[field].icon} color={fieldTypes[field].color} />}
                   title={t(fieldTypes[field].title)}
@@ -135,13 +142,13 @@ const FieldCategoryTitle = styled.h2`
   color: rgba(0, 0, 0, 0.45);
 `;
 
-const FieldStyledList = styled(List<FieldListItem>)`
+const FieldStyledList = styled(List<FieldListItem>)<{ hasCreateRight: boolean }>`
   max-height: calc(100% - 34px);
   overflow-y: auto;
   padding-bottom: 24px;
   .ant-list-item {
     background-color: #fff;
-    cursor: pointer;
+    cursor: ${({ hasCreateRight }) => (hasCreateRight ? "pointer" : "not-allowed")};
     + .ant-list-item {
       margin-top: 12px;
     }
diff --git a/web/src/components/molecules/Schema/ModelFieldList.tsx b/web/src/components/molecules/Schema/ModelFieldList.tsx
index 43fff84e1f..ec66ed39dd 100644
--- a/web/src/components/molecules/Schema/ModelFieldList.tsx
+++ b/web/src/components/molecules/Schema/ModelFieldList.tsx
@@ -15,6 +15,8 @@ import { Field } from "./types";
 type Props = {
   isMeta?: boolean;
   fields?: Field[];
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
   onFieldReorder: (data: Field[]) => Promise<void>;
   onFieldDelete: (fieldId: string) => Promise<void>;
   handleFieldUpdateModalOpen: (field: Field) => void;
@@ -24,6 +26,8 @@ const { confirm } = Modal;
 const ModelFieldList: React.FC<Props> = ({
   fields,
   isMeta,
+  hasUpdateRight,
+  hasDeleteRight,
   onFieldReorder,
   onFieldDelete,
   handleFieldUpdateModalOpen,
@@ -51,23 +55,29 @@ const ModelFieldList: React.FC<Props> = ({
     setData(fields);
   }, [fields]);
 
-  const reorder = (list: Field[] | undefined, startIndex: number, endIndex: number) => {
-    if (!list) return;
-    let result = Array.from(list);
-    if (isMeta) {
-      result = result.map(field => ({ ...field, metadata: true }));
-    }
+  const reorder = useCallback(
+    (list: Field[] | undefined, startIndex: number, endIndex: number) => {
+      if (!list) return;
+      let result = Array.from(list);
+      if (isMeta) {
+        result = result.map(field => ({ ...field, metadata: true }));
+      }
 
-    const [removed] = result.splice(startIndex, 1);
-    result.splice(endIndex, 0, removed);
-    onFieldReorder(result);
-    return result;
-  };
+      const [removed] = result.splice(startIndex, 1);
+      result.splice(endIndex, 0, removed);
+      onFieldReorder(result);
+      return result;
+    },
+    [isMeta, onFieldReorder],
+  );
 
-  const onDragEnd = (fromIndex: number, toIndex: number) => {
-    if (toIndex < 0) return;
-    return setData(reorder(data, fromIndex, toIndex));
-  };
+  const onDragEnd = useCallback(
+    (fromIndex: number, toIndex: number) => {
+      if (toIndex < 0) return;
+      return setData(reorder(data, fromIndex, toIndex));
+    },
+    [data, reorder],
+  );
 
   return (
     <>
@@ -104,6 +114,7 @@ const ModelFieldList: React.FC<Props> = ({
       ) : (
         <ReactDragListView
           nodeSelector=".ant-list-item"
+          handleSelector=".grabbable"
           lineClassName="dragLine"
           onDragEnd={onDragEnd}>
           <FieldStyledList itemLayout="horizontal">
@@ -118,6 +129,7 @@ const ModelFieldList: React.FC<Props> = ({
                     size="small"
                     onClick={() => handleFieldDeleteConfirmation(item.id, item.title)}
                     icon={<Icon icon="delete" color="#8c8c8c" />}
+                    disabled={!hasDeleteRight}
                   />,
                   <Button
                     type="text"
@@ -125,12 +137,13 @@ const ModelFieldList: React.FC<Props> = ({
                     size="small"
                     onClick={() => handleFieldUpdateModalOpen(item)}
                     icon={<Icon icon="ellipsis" color="#8c8c8c" />}
+                    disabled={!hasUpdateRight}
                   />,
                 ]}>
                 <List.Item.Meta
                   avatar={
                     <FieldThumbnail>
-                      <DragIcon icon="menu" className="grabbable" />
+                      {hasUpdateRight && <DragIcon icon="menu" className="grabbable" />}
                       <StyledIcon
                         icon={fieldTypes[item.type].icon}
                         color={fieldTypes[item.type].color}
@@ -159,6 +172,9 @@ const ModelFieldList: React.FC<Props> = ({
 const DragIcon = styled(Icon)`
   margin-right: 16px;
   cursor: grab;
+  :active {
+    cursor: grabbing;
+  }
 `;
 
 const StyledIcon = styled(Icon)`
@@ -190,7 +206,6 @@ const FieldStyledList = styled(List)`
   }
   .ant-list-item {
     background-color: #fff;
-    cursor: pointer;
     + .ant-list-item {
       margin-top: 12px;
     }
@@ -210,10 +225,6 @@ const FieldStyledList = styled(List)`
       padding: 0 3px;
     }
   }
-
-  .grabbable {
-    cursor: grab;
-  }
 `;
 
 const ItemTitle = styled.p`
diff --git a/web/src/components/molecules/Schema/index.tsx b/web/src/components/molecules/Schema/index.tsx
index 2186c5cc6e..e097824ada 100644
--- a/web/src/components/molecules/Schema/index.tsx
+++ b/web/src/components/molecules/Schema/index.tsx
@@ -23,10 +23,13 @@ import { useT } from "@reearth-cms/i18n";
 type Props = {
   data?: Model | Group;
   collapsed: boolean;
+  selectedSchemaType: SelectedSchemaType;
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
   onModalOpen: () => void;
   onDeletionModalOpen: () => void;
   modelsMenu: JSX.Element;
-  selectedSchemaType: SelectedSchemaType;
   setIsMeta: (isMeta: boolean) => void;
   onCollapse: (collapse: boolean) => void;
   onFieldReorder: (data: Field[]) => Promise<void>;
@@ -38,10 +41,13 @@ type Props = {
 const Schema: React.FC<Props> = ({
   data,
   collapsed,
+  selectedSchemaType,
+  hasCreateRight,
+  hasUpdateRight,
+  hasDeleteRight,
   onModalOpen,
   onDeletionModalOpen,
   modelsMenu,
-  selectedSchemaType,
   setIsMeta,
   onCollapse,
   onFieldReorder,
@@ -59,6 +65,7 @@ const Schema: React.FC<Props> = ({
         label: t("Edit"),
         icon: <StyledIcon icon="edit" />,
         onClick: onModalOpen,
+        disabled: !hasUpdateRight,
       },
       {
         key: "delete",
@@ -66,9 +73,10 @@ const Schema: React.FC<Props> = ({
         icon: <StyledIcon icon="delete" />,
         onClick: onDeletionModalOpen,
         danger: true,
+        disabled: !hasDeleteRight,
       },
     ],
-    [onDeletionModalOpen, onModalOpen, t],
+    [hasDeleteRight, hasUpdateRight, onDeletionModalOpen, onModalOpen, t],
   );
 
   const DropdownMenu = useCallback(
@@ -88,6 +96,8 @@ const Schema: React.FC<Props> = ({
         <div>
           <ModelFieldList
             fields={data?.schema.fields}
+            hasUpdateRight={hasUpdateRight}
+            hasDeleteRight={hasDeleteRight}
             handleFieldUpdateModalOpen={onFieldUpdateModalOpen}
             onFieldReorder={onFieldReorder}
             onFieldDelete={onFieldDelete}
@@ -103,6 +113,8 @@ const Schema: React.FC<Props> = ({
           <ModelFieldList
             isMeta={true}
             fields={data && "metadataSchema" in data ? data?.metadataSchema?.fields : undefined}
+            hasUpdateRight={hasUpdateRight}
+            hasDeleteRight={hasDeleteRight}
             handleFieldUpdateModalOpen={onFieldUpdateModalOpen}
             onFieldReorder={onFieldReorder}
             onFieldDelete={onFieldDelete}
@@ -148,6 +160,8 @@ const Schema: React.FC<Props> = ({
                 <GroupFieldsWrapper>
                   <ModelFieldList
                     fields={data?.schema?.fields}
+                    hasUpdateRight={hasUpdateRight}
+                    hasDeleteRight={hasDeleteRight}
                     handleFieldUpdateModalOpen={onFieldUpdateModalOpen}
                     onFieldReorder={onFieldReorder}
                     onFieldDelete={onFieldDelete}
@@ -163,6 +177,7 @@ const Schema: React.FC<Props> = ({
           <FieldList
             currentTab={tab}
             selectedSchemaType={selectedSchemaType}
+            hasCreateRight={hasCreateRight}
             addField={onFieldCreationModalOpen}
           />
         </FieldListWrapper>
diff --git a/web/src/components/molecules/Settings/Cards.tsx b/web/src/components/molecules/Settings/Cards.tsx
index 2b9c5585db..aa0497b1ea 100644
--- a/web/src/components/molecules/Settings/Cards.tsx
+++ b/web/src/components/molecules/Settings/Cards.tsx
@@ -11,12 +11,20 @@ export type Props = {
   isTile: boolean;
   onDelete: (isTile: boolean, index: number) => void;
   onDragEnd: (fromIndex: number, toIndex: number, isTile: boolean) => void;
+  hasUpdateRight: boolean;
 };
 
 const { DragColumn } = ReactDragListView;
 const { Meta } = Card;
 
-const Cards: React.FC<Props> = ({ resources, onModalOpen, isTile, onDelete, onDragEnd }) => {
+const Cards: React.FC<Props> = ({
+  resources,
+  onModalOpen,
+  isTile,
+  onDelete,
+  onDragEnd,
+  hasUpdateRight,
+}) => {
   return (
     <DragColumn
       nodeSelector=".ant-card"
@@ -28,16 +36,25 @@ const Cards: React.FC<Props> = ({ resources, onModalOpen, isTile, onDelete, onDr
           return (
             <StyledCard
               actions={[
-                <Icon icon="delete" key="delete" onClick={() => onDelete(isTile, index)} />,
-                <Icon icon="edit" key="edit" onClick={() => onModalOpen(index)} />,
+                <Icon
+                  icon="delete"
+                  key="delete"
+                  onClick={hasUpdateRight ? () => onDelete(isTile, index) : undefined}
+                />,
+                <Icon
+                  icon="edit"
+                  key="edit"
+                  onClick={hasUpdateRight ? () => onModalOpen(index) : undefined}
+                />,
               ]}
-              key={resource.id}>
+              key={resource.id}
+              hasUpdateRight={hasUpdateRight}>
               <TitleWrapper>
                 <StyledMeta
                   avatar={resource.props?.image ? <img src={resource.props?.image} /> : null}
                   title={resource.props?.name ? resource.props.name : resource.type}
                 />
-                <DragIcon icon="menu" className="grabbable" />
+                {hasUpdateRight && <DragIcon icon="menu" className="grabbable" />}
               </TitleWrapper>
             </StyledCard>
           );
@@ -56,7 +73,17 @@ const GridArea = styled.div`
   padding-bottom: 12px;
 `;
 
-const StyledCard = styled(Card)`
+const StyledCard = styled(Card)<{ hasUpdateRight: boolean }>`
+  .ant-card-actions > li > span {
+    ${({ hasUpdateRight }) => !hasUpdateRight && "cursor: not-allowed;"}
+    > .anticon {
+      ${({ hasUpdateRight }) =>
+        !hasUpdateRight && "cursor: not-allowed; color: rgba(0, 0, 0, 0.25);"}
+      :hover {
+        ${({ hasUpdateRight }) => !hasUpdateRight && "color: rgba(0, 0, 0, 0.25);"}
+      }
+    }
+  }
   .ant-card-body {
     padding: 16px;
   }
@@ -82,4 +109,7 @@ const StyledMeta = styled(Meta)`
 
 const DragIcon = styled(Icon)`
   cursor: grab;
+  :active {
+    cursor: grabbing;
+  }
 `;
diff --git a/web/src/components/molecules/Settings/index.tsx b/web/src/components/molecules/Settings/index.tsx
index 32032c57bc..b982500d5e 100644
--- a/web/src/components/molecules/Settings/index.tsx
+++ b/web/src/components/molecules/Settings/index.tsx
@@ -18,7 +18,7 @@ import { useT } from "@reearth-cms/i18n";
 
 type Props = {
   workspaceSettings: WorkspaceSettings;
-  hasPrivilege: boolean;
+  hasUpdateRight: boolean;
   loading: boolean;
   onWorkspaceSettingsUpdate: (
     tiles: TileInput[],
@@ -29,7 +29,7 @@ type Props = {
 
 const Settings: React.FC<Props> = ({
   workspaceSettings,
-  hasPrivilege,
+  hasUpdateRight,
   loading,
   onWorkspaceSettingsUpdate,
 }) => {
@@ -136,9 +136,14 @@ const Settings: React.FC<Props> = ({
             isTile={true}
             onDelete={handleDelete}
             onDragEnd={handleDragEnd}
+            hasUpdateRight={hasUpdateRight}
           />
         ) : null}
-        <Button type="link" onClick={() => onTileModalOpen()} icon={<Icon icon="plus" />}>
+        <Button
+          type="link"
+          onClick={() => onTileModalOpen()}
+          icon={<Icon icon="plus" />}
+          disabled={!hasUpdateRight}>
           {t("Add new Tiles option")}
         </Button>
         <Divider />
@@ -148,7 +153,7 @@ const Settings: React.FC<Props> = ({
           <Switch
             checked={settings?.terrains?.enabled}
             onChange={onChange}
-            disabled={!hasPrivilege}
+            disabled={!hasUpdateRight}
           />
           <Text>{t("Enable")}</Text>
         </SwitchWrapper>
@@ -161,9 +166,14 @@ const Settings: React.FC<Props> = ({
                 isTile={false}
                 onDelete={handleDelete}
                 onDragEnd={handleDragEnd}
+                hasUpdateRight={hasUpdateRight}
               />
             ) : null}
-            <Button type="link" onClick={() => onTerrainModalOpen()} icon={<Icon icon="plus" />}>
+            <Button
+              type="link"
+              onClick={() => onTerrainModalOpen()}
+              icon={<Icon icon="plus" />}
+              disabled={!hasUpdateRight}>
               {t("Add new Terrain option")}
             </Button>
           </>
diff --git a/web/src/components/molecules/View/viewMenuItem.tsx b/web/src/components/molecules/View/viewMenuItem.tsx
index 3c109ea576..395b9754c2 100644
--- a/web/src/components/molecules/View/viewMenuItem.tsx
+++ b/web/src/components/molecules/View/viewMenuItem.tsx
@@ -8,12 +8,21 @@ import { useT } from "@reearth-cms/i18n";
 
 type Props = {
   view: View;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
   onViewRenameModalOpen: (view: View) => void;
   onUpdate: (viewId: string, name: string) => Promise<void>;
   onDelete: (viewId: string) => Promise<void>;
 };
 
-const ViewsMenuItem: React.FC<Props> = ({ view, onViewRenameModalOpen, onUpdate, onDelete }) => {
+const ViewsMenuItem: React.FC<Props> = ({
+  view,
+  hasUpdateRight,
+  hasDeleteRight,
+  onViewRenameModalOpen,
+  onUpdate,
+  onDelete,
+}) => {
   const t = useT();
 
   const children = [
@@ -22,12 +31,14 @@ const ViewsMenuItem: React.FC<Props> = ({ view, onViewRenameModalOpen, onUpdate,
       key: "update",
       icon: <Icon icon="reload" />,
       onClick: () => onUpdate(view.id, view.name),
+      disabled: !hasDeleteRight,
     },
     {
       label: t("Rename"),
       key: "rename",
       icon: <Icon icon="edit" />,
       onClick: () => onViewRenameModalOpen(view),
+      disabled: !hasUpdateRight,
     },
     {
       label: t("Remove View"),
@@ -58,6 +69,7 @@ const ViewsMenuItem: React.FC<Props> = ({ view, onViewRenameModalOpen, onUpdate,
           },
         });
       },
+      disabled: !hasUpdateRight,
     },
   ];
 
diff --git a/web/src/components/molecules/View/viewsMenu.tsx b/web/src/components/molecules/View/viewsMenu.tsx
index db91a92ac3..6d2ffdedcd 100644
--- a/web/src/components/molecules/View/viewsMenu.tsx
+++ b/web/src/components/molecules/View/viewsMenu.tsx
@@ -19,6 +19,9 @@ type Props = {
   onViewCreateModalOpen: () => void;
   onViewSelect: (key: string) => void;
   onUpdateViewsOrder: (viewIds: string[]) => Promise<void>;
+  hasCreateRight: boolean;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
 };
 
 const ViewsMenuMolecule: React.FC<Props> = ({
@@ -30,6 +33,9 @@ const ViewsMenuMolecule: React.FC<Props> = ({
   currentView,
   onViewSelect,
   onUpdateViewsOrder,
+  hasCreateRight,
+  hasUpdateRight,
+  hasDeleteRight,
 }) => {
   const t = useT();
 
@@ -51,6 +57,8 @@ const ViewsMenuMolecule: React.FC<Props> = ({
         label: (
           <ViewsMenuItem
             view={view}
+            hasUpdateRight={hasUpdateRight}
+            hasDeleteRight={hasDeleteRight}
             onViewRenameModalOpen={onViewRenameModalOpen}
             onDelete={onDelete}
             onUpdate={onUpdate}
@@ -64,12 +72,12 @@ const ViewsMenuMolecule: React.FC<Props> = ({
   return (
     <Wrapper>
       <DragColumn
-        nodeSelector=".ant-tabs-tab"
+        nodeSelector={hasUpdateRight ? ".ant-tabs-tab" : undefined}
         lineClassName="dragLineColumn"
         onDragEnd={(fromIndex, toIndex) => onDragEnd(fromIndex, toIndex)}>
         <StyledTabs
           tabBarExtraContent={
-            <NewViewButton type="text" onClick={onViewCreateModalOpen}>
+            <NewViewButton type="text" onClick={onViewCreateModalOpen} disabled={!hasCreateRight}>
               {t("Save as new view")}
             </NewViewButton>
           }
diff --git a/web/src/components/molecules/Workspace/WorkspaceHeader.tsx b/web/src/components/molecules/Workspace/WorkspaceHeader.tsx
index bdd25d8b62..7e996edfa2 100644
--- a/web/src/components/molecules/Workspace/WorkspaceHeader.tsx
+++ b/web/src/components/molecules/Workspace/WorkspaceHeader.tsx
@@ -7,12 +7,14 @@ import Search from "@reearth-cms/components/atoms/Search";
 import { useT } from "@reearth-cms/i18n";
 
 type Props = {
+  hasCreateRight: boolean;
   onProjectSearch: (value: string) => void;
   onProjectModalOpen: () => void;
   onWorkspaceModalOpen: () => void;
 };
 
 const WorkspaceHeader: React.FC<Props> = ({
+  hasCreateRight,
   onProjectSearch,
   onProjectModalOpen,
   onWorkspaceModalOpen,
@@ -29,7 +31,11 @@ const WorkspaceHeader: React.FC<Props> = ({
       />
       <ButtonWrapper>
         <Button onClick={onWorkspaceModalOpen}>{t("Create a Workspace")}</Button>
-        <Button onClick={onProjectModalOpen} type="primary" icon={<Icon icon="plus" />}>
+        <Button
+          onClick={onProjectModalOpen}
+          type="primary"
+          icon={<Icon icon="plus" />}
+          disabled={!hasCreateRight}>
           {t("New Project")}
         </Button>
       </ButtonWrapper>
diff --git a/web/src/components/molecules/Workspace/index.tsx b/web/src/components/molecules/Workspace/index.tsx
index 0da26be372..242c773f15 100644
--- a/web/src/components/molecules/Workspace/index.tsx
+++ b/web/src/components/molecules/Workspace/index.tsx
@@ -17,6 +17,7 @@ type Props = {
   projectModal: boolean;
   workspaceModal: boolean;
   loadingProjects: boolean;
+  hasCreateRight: boolean;
   onProjectSearch: (value: string) => void;
   onProjectModalOpen: () => void;
   onProjectNavigation: (project: Project) => void;
@@ -34,6 +35,7 @@ const WorkspaceWrapper: React.FC<Props> = ({
   projectModal,
   workspaceModal,
   loadingProjects,
+  hasCreateRight,
   onProjectSearch,
   onProjectModalOpen,
   onProjectNavigation,
@@ -49,11 +51,13 @@ const WorkspaceWrapper: React.FC<Props> = ({
       <Greeting coverImageUrl={coverImageUrl} />
       <Content>
         <WorkspaceHeader
+          hasCreateRight={hasCreateRight}
           onProjectSearch={onProjectSearch}
           onProjectModalOpen={onProjectModalOpen}
           onWorkspaceModalOpen={onWorkspaceModalOpen}
         />
         <ProjectList
+          hasCreateRight={hasCreateRight}
           projects={projects}
           loading={loadingProjects}
           onProjectModalOpen={onProjectModalOpen}
diff --git a/web/src/components/molecules/Workspace/types.ts b/web/src/components/molecules/Workspace/types.ts
index 184c816f45..7f5fc3ca4e 100644
--- a/web/src/components/molecules/Workspace/types.ts
+++ b/web/src/components/molecules/Workspace/types.ts
@@ -1,7 +1,7 @@
 import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
 import { IntegrationMember } from "@reearth-cms/components/molecules/Integration/types";
 import { User } from "@reearth-cms/components/molecules/Member/types";
-import { t } from "@reearth-cms/i18n";
+import { Role } from "@reearth-cms/components/molecules/Member/types";
 
 export type Project = {
   id: string;
@@ -26,12 +26,6 @@ export type MemberInput = {
   role: Role;
 };
 
-export type Role = "WRITER" | "READER" | "MAINTAINER" | "OWNER";
-t("WRITER");
-t("READER");
-t("MAINTAINER");
-t("OWNER");
-
 export type Workspace = {
   id: string;
   name: string;
diff --git a/web/src/components/molecules/WorkspaceSettings/DangerZone.tsx b/web/src/components/molecules/WorkspaceSettings/DangerZone.tsx
index 791b210a7e..f4f85e81e6 100644
--- a/web/src/components/molecules/WorkspaceSettings/DangerZone.tsx
+++ b/web/src/components/molecules/WorkspaceSettings/DangerZone.tsx
@@ -8,10 +8,11 @@ import Modal from "@reearth-cms/components/atoms/Modal";
 import { useT } from "@reearth-cms/i18n";
 
 type Props = {
+  hasDeleteRight: boolean;
   onWorkspaceDelete: () => Promise<void>;
 };
 
-const DangerZone: React.FC<Props> = ({ onWorkspaceDelete }) => {
+const DangerZone: React.FC<Props> = ({ hasDeleteRight, onWorkspaceDelete }) => {
   const t = useT();
   const { confirm } = Modal;
 
@@ -34,7 +35,11 @@ const DangerZone: React.FC<Props> = ({ onWorkspaceDelete }) => {
           "Permanently removes the current workspace and all of its contents from Re:Earth CMS. This action is not reversible, so please continue with caution.",
         )}
       </Text>
-      <Button onClick={handleWorkspaceDeleteConfirmation} type="primary" danger>
+      <Button
+        onClick={handleWorkspaceDeleteConfirmation}
+        type="primary"
+        danger
+        disabled={!hasDeleteRight}>
         {t("Remove Workspace")}
       </Button>
     </ContentSection>
diff --git a/web/src/components/molecules/WorkspaceSettings/GeneralForm.tsx b/web/src/components/molecules/WorkspaceSettings/GeneralForm.tsx
index 1aa6eaf44c..32070a6fc4 100644
--- a/web/src/components/molecules/WorkspaceSettings/GeneralForm.tsx
+++ b/web/src/components/molecules/WorkspaceSettings/GeneralForm.tsx
@@ -9,6 +9,7 @@ import { useT } from "@reearth-cms/i18n";
 type Props = {
   workspaceName?: string;
   updateWorkspaceLoading: boolean;
+  hasUpdateRight: boolean;
   onWorkspaceUpdate: (name: string) => Promise<void>;
 };
 
@@ -19,6 +20,7 @@ type FormType = {
 const WorkspaceGeneralForm: React.FC<Props> = ({
   workspaceName,
   updateWorkspaceLoading,
+  hasUpdateRight,
   onWorkspaceUpdate,
 }) => {
   const t = useT();
@@ -73,7 +75,7 @@ const WorkspaceGeneralForm: React.FC<Props> = ({
             message: t("Please input a new workspace name!"),
           },
         ]}>
-        <Input />
+        <Input disabled={!hasUpdateRight} />
       </Form.Item>
       <Button
         onClick={handleSubmit}
diff --git a/web/src/components/molecules/WorkspaceSettings/index.tsx b/web/src/components/molecules/WorkspaceSettings/index.tsx
index 9411683f1f..30bd211499 100644
--- a/web/src/components/molecules/WorkspaceSettings/index.tsx
+++ b/web/src/components/molecules/WorkspaceSettings/index.tsx
@@ -7,6 +7,8 @@ import { useT } from "@reearth-cms/i18n";
 type Props = {
   workspaceName?: string;
   updateWorkspaceLoading: boolean;
+  hasUpdateRight: boolean;
+  hasDeleteRight: boolean;
   onWorkspaceUpdate: (name: string) => Promise<void>;
   onWorkspaceDelete: () => Promise<void>;
 };
@@ -14,6 +16,8 @@ type Props = {
 const WorkspaceSettings: React.FC<Props> = ({
   workspaceName,
   updateWorkspaceLoading,
+  hasUpdateRight,
+  hasDeleteRight,
   onWorkspaceUpdate,
   onWorkspaceDelete,
 }) => {
@@ -25,10 +29,11 @@ const WorkspaceSettings: React.FC<Props> = ({
         <WorkspaceGeneralForm
           workspaceName={workspaceName}
           updateWorkspaceLoading={updateWorkspaceLoading}
+          hasUpdateRight={hasUpdateRight}
           onWorkspaceUpdate={onWorkspaceUpdate}
         />
       </ContentSection>
-      <DangerZone onWorkspaceDelete={onWorkspaceDelete} />
+      <DangerZone hasDeleteRight={hasDeleteRight} onWorkspaceDelete={onWorkspaceDelete} />
     </InnerContent>
   );
 };
diff --git a/web/src/components/organisms/CMSWrapper/hooks.ts b/web/src/components/organisms/CMSWrapper/hooks.ts
index 90bb6523b7..d31ec7b4df 100644
--- a/web/src/components/organisms/CMSWrapper/hooks.ts
+++ b/web/src/components/organisms/CMSWrapper/hooks.ts
@@ -4,6 +4,7 @@ import { useParams, useLocation, useNavigate } from "react-router-dom";
 import { MenuInfo } from "@reearth-cms/components/atoms/Menu";
 import Notification from "@reearth-cms/components/atoms/Notification";
 import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
+import { UserMember } from "@reearth-cms/components/molecules/Workspace/types";
 import {
   fromGraphQLMember,
   fromGraphQLWorkspace,
@@ -17,9 +18,17 @@ import {
   Workspace as GQLWorkspace,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useWorkspace, useProject, useUserId, useWorkspaceId } from "@reearth-cms/state";
+import {
+  useWorkspace,
+  useProject,
+  useUserId,
+  useWorkspaceId,
+  useUserRights,
+} from "@reearth-cms/state";
 import { splitPathname } from "@reearth-cms/utils/path";
 
+import { userRightsGet } from "./utils";
+
 export default () => {
   const t = useT();
   const { projectId, workspaceId } = useParams();
@@ -27,10 +36,11 @@ export default () => {
   const navigate = useNavigate();
   const logoUrl = window.REEARTH_CONFIG?.logoUrl;
 
-  const [, setCurrentUserId] = useUserId();
+  const [currentUserId, setCurrentUserId] = useUserId();
   const [currentWorkspace, setCurrentWorkspace] = useWorkspace();
   const [, setCurrentWorkspaceId] = useWorkspaceId();
   const [currentProject, setCurrentProject] = useProject();
+  const [, setUserRights] = useUserRights();
   const [workspaceModalShown, setWorkspaceModalShown] = useState(false);
   const [collapsed, setCollapsed] = useState(false);
 
@@ -68,10 +78,18 @@ export default () => {
 
   useEffect(() => {
     if (currentWorkspace || workspaceId || !data) return;
-    setCurrentWorkspace(data.me?.myWorkspace ?? undefined);
-    setCurrentWorkspaceId(data.me?.myWorkspace?.id);
+    setCurrentWorkspace(personalWorkspace ?? undefined);
+    setCurrentWorkspaceId(personalWorkspace?.id);
     navigate(`/workspace/${data.me?.myWorkspace?.id}`);
-  }, [data, navigate, setCurrentWorkspace, setCurrentWorkspaceId, currentWorkspace, workspaceId]);
+  }, [
+    data,
+    navigate,
+    setCurrentWorkspace,
+    setCurrentWorkspaceId,
+    currentWorkspace,
+    workspaceId,
+    personalWorkspace,
+  ]);
 
   useEffect(() => {
     if (workspace?.id && workspace.id !== currentWorkspace?.id) {
@@ -83,6 +101,15 @@ export default () => {
     }
   }, [currentWorkspace, workspace, personal, setCurrentWorkspace, setCurrentWorkspaceId]);
 
+  useEffect(() => {
+    const userInfo = currentWorkspace?.members?.find(
+      member => "userId" in member && member.userId === data?.me?.id,
+    );
+    if (userInfo) {
+      setUserRights(userRightsGet((userInfo as UserMember).role));
+    }
+  }, [currentUserId, currentWorkspace, data?.me?.id, setUserRights]);
+
   const [createWorkspaceMutation] = useCreateWorkspaceMutation();
   const handleWorkspaceCreate = useCallback(
     async (data: { name: string }) => {
diff --git a/web/src/components/organisms/CMSWrapper/utils.ts b/web/src/components/organisms/CMSWrapper/utils.ts
new file mode 100644
index 0000000000..c7e1f5a3ee
--- /dev/null
+++ b/web/src/components/organisms/CMSWrapper/utils.ts
@@ -0,0 +1,303 @@
+import { Role, UserRights } from "@reearth-cms/components/molecules/Member/types";
+
+export const userRightsGet = (role: Role): UserRights => {
+  switch (role) {
+    case "OWNER":
+      return {
+        role,
+        workspace: {
+          update: true,
+          delete: true,
+        },
+        workspaceSetting: {
+          update: true,
+        },
+        integrations: {
+          connect: true,
+          update: true,
+          delete: true,
+        },
+        members: {
+          invite: true,
+          remove: true,
+          changeRole: true,
+          leave: true,
+        },
+        project: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+          publish: true,
+        },
+        model: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+          publish: true,
+        },
+        schema: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+        view: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+        content: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+          publish: true,
+        },
+        asset: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+        request: {
+          create: true,
+          read: true,
+          update: true,
+          close: true,
+          approve: true,
+        },
+        comment: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+      };
+    case "MAINTAINER":
+      return {
+        role,
+        workspace: {
+          update: false,
+          delete: false,
+        },
+        workspaceSetting: {
+          update: true,
+        },
+        integrations: {
+          connect: false,
+          update: false,
+          delete: false,
+        },
+        members: {
+          invite: false,
+          remove: false,
+          changeRole: false,
+          leave: true,
+        },
+        project: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+          publish: true,
+        },
+        model: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+          publish: true,
+        },
+        schema: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+        view: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+        content: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+          publish: true,
+        },
+        asset: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+        request: {
+          create: true,
+          read: true,
+          update: true,
+          close: true,
+          approve: true,
+        },
+        comment: {
+          create: true,
+          read: true,
+          update: true,
+          delete: true,
+        },
+      };
+    case "WRITER":
+      return {
+        role,
+        workspace: {
+          update: false,
+          delete: false,
+        },
+        workspaceSetting: {
+          update: false,
+        },
+        integrations: {
+          connect: false,
+          update: false,
+          delete: false,
+        },
+        members: {
+          invite: false,
+          remove: false,
+          changeRole: false,
+          leave: true,
+        },
+        project: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+          publish: false,
+        },
+        model: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+          publish: false,
+        },
+        schema: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+        },
+        view: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+        },
+        content: {
+          create: true,
+          read: true,
+          update: null,
+          delete: null,
+          publish: false,
+        },
+        asset: {
+          create: true,
+          read: true,
+          update: null,
+          delete: null,
+        },
+        request: {
+          create: true,
+          read: true,
+          update: null,
+          close: null,
+          approve: false,
+        },
+        comment: {
+          create: true,
+          read: true,
+          update: null,
+          delete: null,
+        },
+      };
+    case "READER":
+    default:
+      return {
+        role,
+        workspace: {
+          update: false,
+          delete: false,
+        },
+        workspaceSetting: {
+          update: false,
+        },
+        integrations: {
+          connect: false,
+          update: false,
+          delete: false,
+        },
+        members: {
+          invite: false,
+          remove: false,
+          changeRole: false,
+          leave: true,
+        },
+        project: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+          publish: false,
+        },
+        model: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+          publish: false,
+        },
+        schema: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+        },
+        view: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+        },
+        content: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+          publish: false,
+        },
+        asset: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+        },
+        request: {
+          create: false,
+          read: true,
+          update: false,
+          close: false,
+          approve: false,
+        },
+        comment: {
+          create: false,
+          read: true,
+          update: false,
+          delete: false,
+        },
+      };
+  }
+};
diff --git a/web/src/components/organisms/Common/CommentsPanel/hooks.ts b/web/src/components/organisms/Common/CommentsPanel/hooks.ts
index c75d419e9e..06c6872bd8 100644
--- a/web/src/components/organisms/Common/CommentsPanel/hooks.ts
+++ b/web/src/components/organisms/Common/CommentsPanel/hooks.ts
@@ -10,6 +10,7 @@ import {
   useUpdateCommentMutation,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
+import { useUserRights } from "@reearth-cms/state";
 
 type Params = {
   threadId?: string;
@@ -19,6 +20,17 @@ type Params = {
 export default ({ threadId, refetchQueries }: Params) => {
   const t = useT();
 
+  const [userRights] = useUserRights();
+  const hasCreateRight = useMemo(() => !!userRights?.comment.create, [userRights?.comment.create]);
+  const hasUpdateRight = useMemo(
+    () => userRights?.comment.update !== undefined && userRights.comment.update,
+    [userRights?.comment.update],
+  );
+  const hasDeleteRight = useMemo(
+    () => userRights?.comment.delete !== undefined && userRights.comment.delete,
+    [userRights?.comment.delete],
+  );
+
   const { data: userData } = useGetMeQuery();
 
   const me: User | undefined = useMemo(() => {
@@ -101,6 +113,9 @@ export default ({ threadId, refetchQueries }: Params) => {
 
   return {
     me,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
     handleCommentCreate,
     handleCommentUpdate,
     handleCommentDelete,
diff --git a/web/src/components/organisms/Common/CommentsPanel/index.tsx b/web/src/components/organisms/Common/CommentsPanel/index.tsx
index 42f4ed1d90..b71273df3d 100644
--- a/web/src/components/organisms/Common/CommentsPanel/index.tsx
+++ b/web/src/components/organisms/Common/CommentsPanel/index.tsx
@@ -23,7 +23,15 @@ const CommentsPanel: React.FC<Props> = ({
   onCollapse,
   refetchQueries,
 }) => {
-  const { me, handleCommentCreate, handleCommentUpdate, handleCommentDelete } = useHooks({
+  const {
+    me,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
+    handleCommentCreate,
+    handleCommentUpdate,
+    handleCommentDelete,
+  } = useHooks({
     threadId,
     refetchQueries,
   });
@@ -31,6 +39,9 @@ const CommentsPanel: React.FC<Props> = ({
   return (
     <CommentsPanelMolecule
       me={me}
+      hasCreateRight={hasCreateRight}
+      hasUpdateRight={hasUpdateRight}
+      hasDeleteRight={hasDeleteRight}
       emptyText={emptyText}
       comments={comments}
       collapsed={collapsed}
diff --git a/web/src/components/organisms/DataConverters/content.ts b/web/src/components/organisms/DataConverters/content.ts
index ad5545c205..09a0c356dd 100644
--- a/web/src/components/organisms/DataConverters/content.ts
+++ b/web/src/components/organisms/DataConverters/content.ts
@@ -41,8 +41,8 @@ export const fromGraphQLItem = (GQLItem: GQLItem | undefined): Item | undefined
         createdAt: item.createdAt,
         updatedAt: item.updatedAt,
       })) ?? [],
-    createdBy: GQLItem.createdBy?.name,
-    updatedBy: GQLItem.updatedBy?.name,
+    createdBy: { id: GQLItem.createdBy?.id, name: GQLItem.createdBy?.name },
+    updatedBy: { id: GQLItem.updatedBy?.id, name: GQLItem.updatedBy?.name },
     createdAt: GQLItem.createdAt,
     updatedAt: GQLItem.updatedAt,
     schemaId: GQLItem.schemaId,
@@ -73,7 +73,7 @@ export const fromGraphQLAsset = (asset: GQLAsset | undefined): Asset | undefined
     id: asset.id,
     fileName: asset.fileName,
     createdAt: asset.createdAt.toString(),
-    createdBy: asset.createdBy?.name ?? "",
+    createdBy: { id: asset.createdBy.id, name: asset.createdBy.name },
     createdByType: asset.createdByType,
     previewType: asset.previewType || "UNKNOWN",
     projectId: asset.projectId,
diff --git a/web/src/components/organisms/Project/Accessibility/hooks.ts b/web/src/components/organisms/Project/Accessibility/hooks.ts
index 997ed82145..8406c3b7cc 100644
--- a/web/src/components/organisms/Project/Accessibility/hooks.ts
+++ b/web/src/components/organisms/Project/Accessibility/hooks.ts
@@ -1,4 +1,4 @@
-import { useCallback, useState, useEffect } from "react";
+import { useCallback, useState, useEffect, useMemo } from "react";
 
 import Notification from "@reearth-cms/components/atoms/Notification";
 import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
@@ -12,11 +12,16 @@ import {
   useUpdateProjectMutation,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useProject } from "@reearth-cms/state";
+import { useProject, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const t = useT();
   const [currentProject] = useProject();
+  const [userRights] = useUserRights();
+  const hasPublishRight = useMemo(
+    () => !!userRights?.project.publish,
+    [userRights?.project.publish],
+  );
 
   const [models, setModels] = useState<Model[]>();
   const [scope, setScope] = useState(currentProject?.scope);
@@ -150,6 +155,7 @@ export default () => {
     aliasState,
     assetState,
     isSaveDisabled,
+    hasPublishRight,
     handlePublicUpdate,
     handleUpdatedAssetState,
     handleUpdatedModels,
diff --git a/web/src/components/organisms/Project/Accessibility/index.tsx b/web/src/components/organisms/Project/Accessibility/index.tsx
index 88e31e71d0..fa00b23a25 100644
--- a/web/src/components/organisms/Project/Accessibility/index.tsx
+++ b/web/src/components/organisms/Project/Accessibility/index.tsx
@@ -10,6 +10,7 @@ const Accessibility: React.FC = () => {
     aliasState,
     assetState,
     isSaveDisabled,
+    hasPublishRight,
     handlePublicUpdate,
     handleUpdatedAssetState,
     handleUpdatedModels,
@@ -24,6 +25,7 @@ const Accessibility: React.FC = () => {
       aliasState={aliasState}
       assetState={assetState}
       isSaveDisabled={isSaveDisabled}
+      hasPublishRight={hasPublishRight}
       handlePublicUpdate={handlePublicUpdate}
       handleUpdatedAssetState={handleUpdatedAssetState}
       handleUpdatedModels={handleUpdatedModels}
diff --git a/web/src/components/organisms/Project/Asset/Asset/hooks.ts b/web/src/components/organisms/Project/Asset/Asset/hooks.ts
index 1bd89f737a..1cbb36bfec 100644
--- a/web/src/components/organisms/Project/Asset/Asset/hooks.ts
+++ b/web/src/components/organisms/Project/Asset/Asset/hooks.ts
@@ -32,10 +32,13 @@ import {
   useUpdateAssetMutation,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
+import { useUserId, useUserRights } from "@reearth-cms/state";
 import { getExtension } from "@reearth-cms/utils/file";
 
 export default (assetId?: string) => {
   const t = useT();
+  const [userId] = useUserId();
+  const [userRights] = useUserRights();
   const navigate = useNavigate();
   const { workspaceId, projectId } = useParams();
   const location = useLocation();
@@ -78,6 +81,14 @@ export default (assetId?: string) => {
       : undefined;
   }, [convertedAsset, rawFile?.assetFile]);
 
+  const hasUpdateRight = useMemo(
+    () =>
+      userRights?.asset.update === null
+        ? asset?.createdBy.id === userId
+        : !!userRights?.asset.update,
+    [asset?.createdBy.id, userId, userRights?.asset.update],
+  );
+
   const [updateAssetMutation, { loading: updateLoading }] = useUpdateAssetMutation();
   const handleAssetUpdate = useCallback(
     async (assetId: string, previewType?: PreviewType) => {
@@ -236,6 +247,7 @@ export default (assetId?: string) => {
     decompressing,
     isSaveDisabled,
     updateLoading,
+    hasUpdateRight,
     handleAssetItemSelect,
     handleAssetDecompress,
     handleToggleCommentMenu,
diff --git a/web/src/components/organisms/Project/Asset/Asset/index.tsx b/web/src/components/organisms/Project/Asset/Asset/index.tsx
index dd0ce8c806..d23c4618f1 100644
--- a/web/src/components/organisms/Project/Asset/Asset/index.tsx
+++ b/web/src/components/organisms/Project/Asset/Asset/index.tsx
@@ -21,6 +21,7 @@ const Asset: React.FC = () => {
     decompressing,
     isSaveDisabled,
     updateLoading,
+    hasUpdateRight,
     handleAssetDecompress,
     handleAssetItemSelect,
     handleToggleCommentMenu,
@@ -55,6 +56,7 @@ const Asset: React.FC = () => {
       decompressing={decompressing}
       isSaveDisabled={isSaveDisabled}
       updateLoading={updateLoading}
+      hasUpdateRight={hasUpdateRight}
       onAssetItemSelect={handleAssetItemSelect}
       onAssetDecompress={handleAssetDecompress}
       onTypeChange={handleTypeChange}
diff --git a/web/src/components/organisms/Project/Asset/AssetList/hooks.ts b/web/src/components/organisms/Project/Asset/AssetList/hooks.ts
index 1e7397205a..3f72edfcd4 100644
--- a/web/src/components/organisms/Project/Asset/AssetList/hooks.ts
+++ b/web/src/components/organisms/Project/Asset/AssetList/hooks.ts
@@ -18,12 +18,16 @@ import {
   useGetAssetLazyQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
+import { useUserId, useUserRights } from "@reearth-cms/state";
 
 type UploadType = "local" | "url";
 
 export default (isItemsRequired: boolean) => {
   const t = useT();
-
+  const [userRights] = useUserRights();
+  const [userId] = useUserId();
+  const hasCreateRight = useMemo(() => !!userRights?.asset.create, [userRights?.asset.create]);
+  const [hasDeleteRight, setHasDeleteRight] = useState(false);
   const [uploadModalVisibility, setUploadModalVisibility] = useState(false);
 
   const { workspaceId, projectId } = useParams();
@@ -60,6 +64,21 @@ export default (isItemsRequired: boolean) => {
   const [createAssetMutation] = useCreateAssetMutation();
   const [createAssetUploadMutation] = useCreateAssetUploadMutation();
 
+  const handleSelect = useCallback(
+    (selectedRowKeys: Key[], selectedRows: Asset[]) => {
+      setSelection({
+        ...selection,
+        selectedRowKeys,
+      });
+      if (userRights?.asset.delete === null) {
+        setHasDeleteRight(selectedRows.every(row => row.createdBy.id === userId));
+      } else {
+        setHasDeleteRight(!!userRights?.asset.delete);
+      }
+    },
+    [selection, userId, userRights?.asset.delete],
+  );
+
   const [getAsset] = useGetAssetLazyQuery();
 
   const handleGetAsset = useCallback(
@@ -338,6 +357,8 @@ export default (isItemsRequired: boolean) => {
     sort,
     searchTerm,
     columns,
+    hasCreateRight,
+    hasDeleteRight,
     handleColumnsChange,
     handleToggleCommentMenu,
     handleAssetItemSelect,
@@ -345,7 +366,7 @@ export default (isItemsRequired: boolean) => {
     handleUploadModalCancel,
     setUploadUrl,
     setUploadType,
-    setSelection,
+    handleSelect,
     setFileList,
     setUploadModalVisibility,
     handleAssetsCreate,
diff --git a/web/src/components/organisms/Project/Asset/AssetList/index.tsx b/web/src/components/organisms/Project/Asset/AssetList/index.tsx
index 1fe0f8f1c1..b8264cc6c9 100644
--- a/web/src/components/organisms/Project/Asset/AssetList/index.tsx
+++ b/web/src/components/organisms/Project/Asset/AssetList/index.tsx
@@ -24,6 +24,8 @@ const AssetList: React.FC = () => {
     sort,
     searchTerm,
     columns,
+    hasCreateRight,
+    hasDeleteRight,
     handleColumnsChange,
     handleToggleCommentMenu,
     handleAssetItemSelect,
@@ -31,7 +33,7 @@ const AssetList: React.FC = () => {
     handleUploadModalCancel,
     setUploadUrl,
     setUploadType,
-    setSelection,
+    handleSelect,
     setFileList,
     setUploadModalVisibility,
     handleAssetsCreate,
@@ -76,6 +78,8 @@ const AssetList: React.FC = () => {
       deleteLoading={deleteLoading}
       uploadUrl={uploadUrl}
       uploadType={uploadType}
+      hasCreateRight={hasCreateRight}
+      hasDeleteRight={hasDeleteRight}
       onAssetItemSelect={handleAssetItemSelect}
       onAssetSelect={handleAssetSelect}
       onUploadModalCancel={handleUploadModalCancel}
@@ -88,7 +92,7 @@ const AssetList: React.FC = () => {
       onAssetsReload={handleAssetsReload}
       onSearchTerm={handleSearchTerm}
       onEdit={handleNavigateToAsset}
-      setSelection={setSelection}
+      onSelect={handleSelect}
       setFileList={setFileList}
       setUploadModalVisibility={setUploadModalVisibility}
     />
diff --git a/web/src/components/organisms/Project/Content/ContentDetails/hooks.ts b/web/src/components/organisms/Project/Content/ContentDetails/hooks.ts
index 47206d84b9..194c3d1a1d 100644
--- a/web/src/components/organisms/Project/Content/ContentDetails/hooks.ts
+++ b/web/src/components/organisms/Project/Content/ContentDetails/hooks.ts
@@ -41,7 +41,7 @@ import {
   useIsItemReferencedLazyQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useCollapsedModelMenu } from "@reearth-cms/state";
+import { useCollapsedModelMenu, useUserRights } from "@reearth-cms/state";
 import { newID } from "@reearth-cms/utils/id";
 
 import { dateConvert } from "./utils";
@@ -66,6 +66,7 @@ export default () => {
     totalCount,
     page,
     pageSize,
+    showPublishAction,
   } = useContentHooks();
   const navigate = useNavigate();
   const location = useLocation();
@@ -73,6 +74,20 @@ export default () => {
 
   const { itemId } = useParams();
   const [collapsedModelMenu, collapseModelMenu] = useCollapsedModelMenu();
+  const [userRights] = useUserRights();
+  const hasRequestCreateRight = useMemo(
+    () => !!userRights?.request.create,
+    [userRights?.request.create],
+  );
+  const hasRequestUpdateRight = useMemo(
+    () => userRights?.request.update === null || !!userRights?.request.update,
+    [userRights?.request.update],
+  );
+  const hasPublishRight = useMemo(
+    () => !!userRights?.content.publish,
+    [userRights?.content.publish],
+  );
+
   const [collapsedCommentsPanel, collapseCommentsPanel] = useState(true);
   const [requestModalShown, setRequestModalShown] = useState(false);
   const [searchTerm, setSearchTerm] = useState("");
@@ -174,23 +189,19 @@ export default () => {
       : undefined;
   }, [userData]);
 
-  const myRole = useMemo(
-    () =>
-      currentWorkspace?.members?.find((m): m is UserMember => "userId" in m && m.userId === me?.id)
-        ?.role,
-    [currentWorkspace?.members, me?.id],
-  );
-
-  const showPublishAction = useMemo(
-    () => (myRole ? !currentProject?.requestRoles?.includes(myRole) : true),
-    [currentProject?.requestRoles, myRole],
-  );
-
   const currentItem: Item | undefined = useMemo(
     () => fromGraphQLItem(data?.node as GQLItem),
     [data?.node],
   );
 
+  const hasItemUpdateRight = useMemo(
+    () =>
+      userRights?.content.update === null
+        ? currentItem?.createdBy?.id === me?.id
+        : !!userRights?.content.update,
+    [currentItem?.createdBy?.id, me?.id, userRights?.content.update],
+  );
+
   const [getGroup] = useGetGroupLazyQuery({
     fetchPolicy: "cache-and-network",
   });
@@ -648,5 +659,9 @@ export default () => {
     handleAddItemToRequestModalOpen,
     handleGroupGet,
     handleCheckItemReference,
+    hasRequestCreateRight,
+    hasRequestUpdateRight,
+    hasPublishRight,
+    hasItemUpdateRight,
   };
 };
diff --git a/web/src/components/organisms/Project/Content/ContentDetails/index.tsx b/web/src/components/organisms/Project/Content/ContentDetails/index.tsx
index 00fffe5363..85cda781fe 100644
--- a/web/src/components/organisms/Project/Content/ContentDetails/index.tsx
+++ b/web/src/components/organisms/Project/Content/ContentDetails/index.tsx
@@ -63,6 +63,10 @@ const ContentDetails: React.FC = () => {
     handleAddItemToRequestModalOpen,
     handleGroupGet,
     handleCheckItemReference,
+    hasRequestCreateRight,
+    hasRequestUpdateRight,
+    hasPublishRight,
+    hasItemUpdateRight,
   } = useHooks();
 
   const {
@@ -92,6 +96,10 @@ const ContentDetails: React.FC = () => {
 
   return (
     <ContentDetailsMolecule
+      hasRequestCreateRight={hasRequestCreateRight}
+      hasRequestUpdateRight={hasRequestUpdateRight}
+      hasPublishRight={hasPublishRight}
+      hasItemUpdateRight={hasItemUpdateRight}
       linkItemModalTitle={linkItemModalTitle}
       linkItemModalTotalCount={linkItemModalTotalCount}
       linkItemModalPage={linkItemModalPage}
diff --git a/web/src/components/organisms/Project/Content/ContentList/hooks.ts b/web/src/components/organisms/Project/Content/ContentList/hooks.ts
index 4859896971..e7639355ec 100644
--- a/web/src/components/organisms/Project/Content/ContentList/hooks.ts
+++ b/web/src/components/organisms/Project/Content/ContentList/hooks.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState, useRef } from "react";
+import { useCallback, useEffect, useMemo, useState, useRef, Key } from "react";
 import { useNavigate, useParams, useLocation } from "react-router-dom";
 
 import Notification from "@reearth-cms/components/atoms/Notification";
@@ -44,7 +44,7 @@ import {
   ItemFieldInput,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useCollapsedModelMenu } from "@reearth-cms/state";
+import { useUserId, useCollapsedModelMenu, useUserRights } from "@reearth-cms/state";
 
 import { fileName } from "./utils";
 
@@ -76,6 +76,7 @@ export default () => {
     totalCount: requestModalTotalCount,
     page: requestModalPage,
     pageSize: requestModalPageSize,
+    showPublishAction,
   } = useContentHooks();
   const t = useT();
 
@@ -89,6 +90,18 @@ export default () => {
       pageSize: number;
     } | null;
   } = useLocation();
+
+  const [userId] = useUserId();
+  const [userRights] = useUserRights();
+
+  const hasCreateRight = useMemo(() => !!userRights?.content.create, [userRights?.content.create]);
+  const [hasDeleteRight, setHasDeleteRight] = useState(false);
+  const hasPublishRight = useMemo(
+    () => !!userRights?.content.publish,
+    [userRights?.content.publish],
+  );
+  const [hasRequestUpdateRight, setHasRequestUpdateRight] = useState(false);
+
   const [searchTerm, setSearchTerm] = useState<string>(location.state?.searchTerm ?? "");
   const [page, setPage] = useState<number>(location.state?.page ?? 1);
   const [pageSize, setPageSize] = useState<number>(location.state?.pageSize ?? 20);
@@ -152,6 +165,26 @@ export default () => {
     selectedRows: { itemId: string; version?: string }[];
   }>({ selectedRows: [] });
 
+  const handleSelect = useCallback(
+    (_selectedRowKeys: Key[], selectedRows: ContentTableField[]) => {
+      setSelectedItems({
+        ...selectedItems,
+        selectedRows: selectedRows.map(row => ({ itemId: row.id, version: row.version })),
+      });
+
+      const newRight =
+        userRights?.content.delete === null
+          ? selectedRows.every(row => row.createdBy.id === userId)
+          : !!userRights?.content.delete;
+      setHasDeleteRight(newRight);
+
+      if (userRights?.request.update || userRights?.request.update === null) {
+        setHasRequestUpdateRight(selectedRows.every(row => row.status !== "PUBLIC"));
+      }
+    },
+    [selectedItems, userId, userRights?.content.delete, userRights?.request.update],
+  );
+
   const [updateItemMutation] = useUpdateItemMutation();
   const [getItem] = useGetItemLazyQuery({ fetchPolicy: "no-cache" });
   const [createNewItem] = useCreateItemMutation();
@@ -315,8 +348,8 @@ export default () => {
               id: item.id,
               schemaId: item.schemaId,
               status: item.status as ItemStatus,
-              createdBy: item.createdBy?.name,
-              updatedBy: item.updatedBy?.name || "",
+              createdBy: { id: item.createdBy?.id ?? "", name: item.createdBy?.name ?? "" },
+              updatedBy: item.updatedBy?.name ?? "",
               fields: fieldsGet(item as unknown as Item),
               comments: item.thread.comments.map(comment =>
                 fromGraphQLComment(comment as GQLComment),
@@ -347,6 +380,12 @@ export default () => {
     [currentView.sort?.direction, currentView.sort?.field.id],
   );
 
+  const hasRightGet = useCallback(
+    (id: string) =>
+      userRights?.content.update === null ? id === userId : !!userRights?.content.update,
+    [userId, userRights?.content.update],
+  );
+
   const contentTableColumns: ExtendedColumns[] | undefined = useMemo(() => {
     if (!currentModel) return;
     const fieldsColumns = currentModel?.schema?.fields?.map(field => ({
@@ -384,14 +423,17 @@ export default () => {
         sortOrder: sortOrderGet(field.id),
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         render: (el: any, record: ContentTableField) => {
-          return renderField(el, field, (value?: string | string[] | boolean, index?: number) => {
-            handleMetaItemUpdate(record.id, field.id, value, index);
-          });
+          const update = hasRightGet(record.createdBy.id)
+            ? (value?: string | string[] | boolean, index?: number) => {
+                handleMetaItemUpdate(record.id, field.id, value, index);
+              }
+            : undefined;
+          return renderField(el, field, update);
         },
       })) || [];
 
     return [...fieldsColumns, ...metadataColumns];
-  }, [currentModel, handleMetaItemUpdate, sortOrderGet]);
+  }, [currentModel, handleMetaItemUpdate, hasRightGet, sortOrderGet]);
 
   useEffect(() => {
     if (!modelId && currentModel?.id) {
@@ -545,6 +587,11 @@ export default () => {
     pageSize,
     requests,
     addItemToRequestModalShown,
+    hasCreateRight,
+    hasDeleteRight,
+    hasPublishRight,
+    hasRequestUpdateRight,
+    showPublishAction,
     setCurrentView,
     handleRequestTableChange,
     requestModalLoading,
@@ -558,7 +605,7 @@ export default () => {
     handleAddItemToRequestModalOpen,
     handleSearchTerm,
     handleFilterChange,
-    setSelectedItems,
+    handleSelect,
     handleItemSelect,
     collapseCommentsPanel,
     collapseModelMenu,
diff --git a/web/src/components/organisms/Project/Content/ContentList/index.tsx b/web/src/components/organisms/Project/Content/ContentList/index.tsx
index 2f9361eac2..5242b8f538 100644
--- a/web/src/components/organisms/Project/Content/ContentList/index.tsx
+++ b/web/src/components/organisms/Project/Content/ContentList/index.tsx
@@ -29,6 +29,11 @@ const ContentList: React.FC = () => {
     pageSize,
     requests,
     addItemToRequestModalShown,
+    hasCreateRight,
+    hasDeleteRight,
+    hasPublishRight,
+    hasRequestUpdateRight,
+    showPublishAction,
     setCurrentView,
     handleRequestTableChange,
     requestModalLoading,
@@ -42,7 +47,7 @@ const ContentList: React.FC = () => {
     handleAddItemToRequestModalOpen,
     handleSearchTerm,
     handleFilterChange,
-    setSelectedItems,
+    handleSelect,
     handleItemSelect,
     collapseCommentsPanel,
     collapseModelMenu,
@@ -117,7 +122,7 @@ const ContentList: React.FC = () => {
       requestModalTotalCount={requestModalTotalCount}
       requestModalPage={requestModalPage}
       requestModalPageSize={requestModalPageSize}
-      setSelectedItems={setSelectedItems}
+      onSelect={handleSelect}
       onCollapse={collapseModelMenu}
       onItemsReload={handleItemsReload}
       onItemEdit={handleNavigateToItemEditForm}
@@ -131,6 +136,11 @@ const ContentList: React.FC = () => {
       addItemToRequestModalShown={addItemToRequestModalShown}
       onRequestSearchTerm={handleRequestSearchTerm}
       onRequestTableReload={handleRequestTableReload}
+      hasCreateRight={hasCreateRight}
+      hasDeleteRight={hasDeleteRight}
+      hasPublishRight={hasPublishRight}
+      hasRequestUpdateRight={hasRequestUpdateRight}
+      showPublishAction={showPublishAction}
     />
   );
 };
diff --git a/web/src/components/organisms/Project/Content/ViewsMenu/hooks.ts b/web/src/components/organisms/Project/Content/ViewsMenu/hooks.ts
index e375bf4c92..e706608973 100644
--- a/web/src/components/organisms/Project/Content/ViewsMenu/hooks.ts
+++ b/web/src/components/organisms/Project/Content/ViewsMenu/hooks.ts
@@ -1,4 +1,4 @@
-import { useCallback, useState } from "react";
+import { useCallback, useState, useMemo } from "react";
 
 import Notification from "@reearth-cms/components/atoms/Notification";
 import { CurrentView } from "@reearth-cms/components/molecules/View/types";
@@ -14,7 +14,7 @@ import {
   useUpdateViewsOrderMutation,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useProject, useModel } from "@reearth-cms/state";
+import { useProject, useModel, useUserRights } from "@reearth-cms/state";
 
 type Params = {
   currentView: CurrentView;
@@ -29,6 +29,10 @@ export default ({ currentView, onViewChange }: Params) => {
   const [modalState, setModalState] = useState<modalStateType>("create");
   const [currentProject] = useProject();
   const [currentModel] = useModel();
+  const [userRights] = useUserRights();
+  const hasCreateRight = useMemo(() => !!userRights?.view.create, [userRights?.view.create]);
+  const hasUpdateRight = useMemo(() => !!userRights?.view.update, [userRights?.view.update]);
+  const hasDeleteRight = useMemo(() => !!userRights?.view.delete, [userRights?.view.delete]);
 
   const handleViewRenameModalOpen = useCallback(() => {
     setModalState("rename");
@@ -165,10 +169,13 @@ export default ({ currentView, onViewChange }: Params) => {
 
   return {
     modalState,
-    handleViewRenameModalOpen,
-    handleViewCreateModalOpen,
     viewModalShown,
     submitting: createLoading || updateLoading,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
+    handleViewRenameModalOpen,
+    handleViewCreateModalOpen,
     handleViewModalReset,
     handleViewCreate,
     handleViewUpdate,
diff --git a/web/src/components/organisms/Project/Content/ViewsMenu/index.tsx b/web/src/components/organisms/Project/Content/ViewsMenu/index.tsx
index 1664013b20..9436eced66 100644
--- a/web/src/components/organisms/Project/Content/ViewsMenu/index.tsx
+++ b/web/src/components/organisms/Project/Content/ViewsMenu/index.tsx
@@ -16,10 +16,13 @@ type Props = {
 const ViewsMenu: React.FC<Props> = ({ views, currentView, onViewSelect, onViewChange }) => {
   const {
     modalState,
-    handleViewRenameModalOpen,
-    handleViewCreateModalOpen,
     viewModalShown,
     submitting,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
+    handleViewRenameModalOpen,
+    handleViewCreateModalOpen,
     handleViewModalReset,
     handleViewCreate,
     handleViewUpdate,
@@ -39,6 +42,9 @@ const ViewsMenu: React.FC<Props> = ({ views, currentView, onViewSelect, onViewCh
         onUpdate={handleViewUpdate}
         onViewSelect={onViewSelect}
         onUpdateViewsOrder={handleUpdateViewsOrder}
+        hasCreateRight={hasCreateRight}
+        hasUpdateRight={hasUpdateRight}
+        hasDeleteRight={hasDeleteRight}
       />
       <ViewFormModal
         modalState={modalState}
diff --git a/web/src/components/organisms/Project/Content/hooks.ts b/web/src/components/organisms/Project/Content/hooks.ts
index 69dfdd8cf8..9a253ff276 100644
--- a/web/src/components/organisms/Project/Content/hooks.ts
+++ b/web/src/components/organisms/Project/Content/hooks.ts
@@ -12,12 +12,20 @@ import {
   usePublishItemMutation,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useModel, useProject, useWorkspace } from "@reearth-cms/state";
+import { useModel, useProject, useWorkspace, useUserId, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const [currentModel] = useModel();
   const [currentWorkspace] = useWorkspace();
   const [currentProject] = useProject();
+  const [userId] = useUserId();
+  const [userRights] = useUserRights();
+  const myRole = useMemo(() => userRights?.role, [userRights?.role]);
+  const showPublishAction = useMemo(
+    () => (myRole ? !currentProject?.requestRoles?.includes(myRole) : true),
+    [currentProject?.requestRoles, myRole],
+  );
+
   const [addItemToRequestModalShown, setAddItemToRequestModalShown] = useState(false);
   const t = useT();
 
@@ -38,6 +46,7 @@ export default () => {
       sort: { key: "createdAt", reverted: true },
       state: ["WAITING"] as GQLRequestState[],
       key: searchTerm,
+      createdBy: userRights?.request.update === null ? userId : undefined,
     },
   });
 
@@ -170,5 +179,6 @@ export default () => {
     totalCount: data?.requests.totalCount ?? 0,
     page,
     pageSize,
+    showPublishAction,
   };
 };
diff --git a/web/src/components/organisms/Project/ModelsMenu/hooks.ts b/web/src/components/organisms/Project/ModelsMenu/hooks.ts
index 094acc5538..28c4b69792 100644
--- a/web/src/components/organisms/Project/ModelsMenu/hooks.ts
+++ b/web/src/components/organisms/Project/ModelsMenu/hooks.ts
@@ -20,7 +20,7 @@ import {
   Group as GQLGroup,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useModel, useWorkspace, useProject } from "@reearth-cms/state";
+import { useModel, useWorkspace, useProject, useUserRights } from "@reearth-cms/state";
 
 type Params = {
   modelId?: string;
@@ -31,6 +31,10 @@ export default ({ modelId }: Params) => {
   const [, setCurrentModel] = useModel();
   const [currentWorkspace] = useWorkspace();
   const [currentProject] = useProject();
+  const [userRights] = useUserRights();
+  const hasCreateRight = useMemo(() => !!userRights?.model.create, [userRights?.model.create]);
+  const hasUpdateRight = useMemo(() => !!userRights?.model.update, [userRights?.model.update]);
+
   const navigate = useNavigate();
 
   const projectId = useMemo(() => currentProject?.id, [currentProject]);
@@ -212,6 +216,8 @@ export default ({ modelId }: Params) => {
     groups,
     modelModalShown,
     groupModalShown,
+    hasCreateRight,
+    hasUpdateRight,
     handleModelModalOpen,
     handleModelModalClose,
     handleModelCreate,
diff --git a/web/src/components/organisms/Project/ModelsMenu/index.tsx b/web/src/components/organisms/Project/ModelsMenu/index.tsx
index 56bae2f1c5..76d1acc253 100644
--- a/web/src/components/organisms/Project/ModelsMenu/index.tsx
+++ b/web/src/components/organisms/Project/ModelsMenu/index.tsx
@@ -34,6 +34,8 @@ const ModelsMenu: React.FC<Props> = ({
     groups,
     modelModalShown,
     groupModalShown,
+    hasCreateRight,
+    hasUpdateRight,
     handleModelModalOpen,
     handleModelModalClose,
     handleGroupModalOpen,
@@ -58,6 +60,8 @@ const ModelsMenu: React.FC<Props> = ({
           selectedKey={schemaId}
           models={models}
           open={modelModalShown}
+          hasCreateRight={hasCreateRight}
+          hasUpdateRight={hasUpdateRight}
           onModalOpen={handleModelModalOpen}
           onModelSelect={onModelSelect}
           onModelKeyCheck={handleModelKeyCheck}
@@ -71,12 +75,14 @@ const ModelsMenu: React.FC<Props> = ({
             collapsed={collapsed}
             selectedKey={schemaId}
             groups={groups}
-            onGroupSelect={onGroupSelect}
-            onModalOpen={handleGroupModalOpen}
             open={groupModalShown}
+            hasCreateRight={hasCreateRight}
+            hasUpdateRight={hasUpdateRight}
+            onModalOpen={handleGroupModalOpen}
             onGroupKeyCheck={handleGroupKeyCheck}
             onClose={handleGroupModalClose}
             onCreate={handleGroupCreate}
+            onGroupSelect={onGroupSelect}
             onUpdateGroupsOrder={handleUpdateGroupsOrder}
           />
         )}
diff --git a/web/src/components/organisms/Project/Overview/hooks.ts b/web/src/components/organisms/Project/Overview/hooks.ts
index 0ae7b6ea14..d91df1c89b 100644
--- a/web/src/components/organisms/Project/Overview/hooks.ts
+++ b/web/src/components/organisms/Project/Overview/hooks.ts
@@ -13,11 +13,16 @@ import {
   Model as GQLModel,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useProject, useWorkspace } from "@reearth-cms/state";
+import { useProject, useWorkspace, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const [currentProject] = useProject();
   const [currentWorkspace] = useWorkspace();
+  const [userRights] = useUserRights();
+  const hasCreateRight = useMemo(() => !!userRights?.model.create, [userRights?.model.create]);
+  const hasUpdateRight = useMemo(() => !!userRights?.model.update, [userRights?.model.update]);
+  const hasDeleteRight = useMemo(() => !!userRights?.model.delete, [userRights?.model.delete]);
+
   const [selectedModel, setSelectedModel] = useState<Model | undefined>();
   const [modelDeletionModalShown, setModelDeletionModalShown] = useState(false);
   const t = useT();
@@ -137,6 +142,9 @@ export default () => {
     selectedModel,
     modelDeletionModalShown,
     deleteLoading,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
     handleSchemaNavigation,
     handleContentNavigation,
     handleModelKeyCheck,
diff --git a/web/src/components/organisms/Project/Overview/index.tsx b/web/src/components/organisms/Project/Overview/index.tsx
index d24b770af5..5eb26bd441 100644
--- a/web/src/components/organisms/Project/Overview/index.tsx
+++ b/web/src/components/organisms/Project/Overview/index.tsx
@@ -12,6 +12,9 @@ const ProjectOverview: React.FC = () => {
     selectedModel,
     modelDeletionModalShown,
     deleteLoading,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
     handleSchemaNavigation,
     handleContentNavigation,
     handleModelKeyCheck,
@@ -31,6 +34,9 @@ const ProjectOverview: React.FC = () => {
         projectName={currentProject?.name}
         projectDescription={currentProject?.description}
         models={models}
+        hasCreateRight={hasCreateRight}
+        hasUpdateRight={hasUpdateRight}
+        hasDeleteRight={hasDeleteRight}
         onSchemaNavigate={handleSchemaNavigation}
         onContentNavigate={handleContentNavigation}
         onModelModalOpen={handleModelModalOpen}
diff --git a/web/src/components/organisms/Project/Request/RequestDetails/hooks.ts b/web/src/components/organisms/Project/Request/RequestDetails/hooks.ts
index 60407eb332..69616bcc41 100644
--- a/web/src/components/organisms/Project/Request/RequestDetails/hooks.ts
+++ b/web/src/components/organisms/Project/Request/RequestDetails/hooks.ts
@@ -4,7 +4,6 @@ import { useNavigate, useParams, useLocation } from "react-router-dom";
 import Notification from "@reearth-cms/components/atoms/Notification";
 import { User } from "@reearth-cms/components/molecules/AccountSettings/types";
 import { Request } from "@reearth-cms/components/molecules/Request/types";
-import { UserMember } from "@reearth-cms/components/molecules/Workspace/types";
 import { fromGraphQLRequest } from "@reearth-cms/components/organisms/DataConverters/content";
 import {
   useDeleteRequestMutation,
@@ -17,16 +16,30 @@ import {
   Request as GQLRequest,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useProject, useWorkspace } from "@reearth-cms/state";
+import { useProject, useWorkspace, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const t = useT();
   const navigate = useNavigate();
-  const [currentProject] = useProject();
-  const [currentWorkspace] = useWorkspace();
   const { requestId } = useParams();
   const location = useLocation();
 
+  const [currentProject] = useProject();
+  const [currentWorkspace] = useWorkspace();
+  const [userRights] = useUserRights();
+  const hasCommentCreateRight = useMemo(
+    () => !!userRights?.comment.create,
+    [userRights?.comment.create],
+  );
+  const hasCommentUpdateRight = useMemo(
+    () => userRights?.comment.update !== undefined && userRights.comment.update,
+    [userRights?.comment.update],
+  );
+  const hasCommentDeleteRight = useMemo(
+    () => userRights?.comment.delete !== undefined && userRights.comment.delete,
+    [userRights?.comment.delete],
+  );
+
   const { data: userData } = useGetMeQuery();
   const { data: rawRequest, loading } = useGetRequestQuery({
     variables: { requestId: requestId ?? "" },
@@ -45,13 +58,6 @@ export default () => {
       : undefined;
   }, [userData]);
 
-  const myRole = useMemo(
-    () =>
-      currentWorkspace?.members?.find((m): m is UserMember => "userId" in m && m.userId === me?.id)
-        ?.role,
-    [currentWorkspace?.members, me?.id],
-  );
-
   const projectId = useMemo(() => currentProject?.id, [currentProject]);
 
   const currentRequest: Request | undefined = useMemo(() => {
@@ -59,23 +65,35 @@ export default () => {
     return fromGraphQLRequest(rawRequest.node as GQLRequest);
   }, [rawRequest]);
 
-  const isCloseActionEnabled: boolean = useMemo(
+  const isCloseActionEnabled = useMemo(
     () =>
-      currentRequest?.state !== "CLOSED" &&
-      currentRequest?.state !== "APPROVED" &&
-      !!currentRequest?.reviewers.find(reviewer => reviewer.id === me?.id) &&
-      myRole !== "READER" &&
-      myRole !== "WRITER",
-    [currentRequest?.reviewers, currentRequest?.state, me?.id, myRole],
+      (currentRequest?.state === "WAITING" || currentRequest?.state === "DRAFT") &&
+      (userRights?.request.close === null
+        ? currentRequest.createdBy?.id === me?.id
+        : !!userRights?.request.close),
+    [currentRequest?.createdBy?.id, currentRequest?.state, me?.id, userRights?.request.close],
   );
 
-  const isApproveActionEnabled: boolean = useMemo(
+  const isReopenActionEnabled = useMemo(
+    () => currentRequest?.state === "CLOSED" && !!userRights?.request.close,
+    [currentRequest?.state, userRights?.request.close],
+  );
+
+  const isApproveActionEnabled = useMemo(
     () =>
       currentRequest?.state === "WAITING" &&
-      !!currentRequest?.reviewers.find(reviewer => reviewer.id === me?.id) &&
-      myRole !== "READER" &&
-      myRole !== "WRITER",
-    [currentRequest?.reviewers, currentRequest?.state, me?.id, myRole],
+      !!userRights?.request.approve &&
+      currentRequest?.reviewers.some(reviewer => reviewer.id === me?.id),
+    [currentRequest?.reviewers, currentRequest?.state, me?.id, userRights?.request.approve],
+  );
+
+  const isAssignActionEnabled = useMemo(
+    () =>
+      (currentRequest?.state === "WAITING" || currentRequest?.state === "DRAFT") &&
+      (userRights?.request.update === null
+        ? currentRequest.createdBy?.id === me?.id
+        : !!userRights?.request.update),
+    [currentRequest?.createdBy?.id, currentRequest?.state, me?.id, userRights?.request.update],
   );
 
   const [deleteRequestMutation, { loading: deleteLoading }] = useDeleteRequestMutation();
@@ -201,11 +219,16 @@ export default () => {
 
   return {
     me,
+    hasCommentCreateRight,
+    hasCommentUpdateRight,
+    hasCommentDeleteRight,
     isCloseActionEnabled,
+    isReopenActionEnabled,
+    isApproveActionEnabled,
+    isAssignActionEnabled,
     loading,
     deleteLoading,
     approveLoading,
-    isApproveActionEnabled,
     currentRequest,
     handleRequestDelete,
     handleRequestApprove,
diff --git a/web/src/components/organisms/Project/Request/RequestDetails/index.tsx b/web/src/components/organisms/Project/Request/RequestDetails/index.tsx
index 9f5774f25f..7547392fb1 100644
--- a/web/src/components/organisms/Project/Request/RequestDetails/index.tsx
+++ b/web/src/components/organisms/Project/Request/RequestDetails/index.tsx
@@ -7,8 +7,13 @@ import useHooks from "./hooks";
 const RequestDetails: React.FC = () => {
   const {
     me,
+    hasCommentCreateRight,
+    hasCommentUpdateRight,
+    hasCommentDeleteRight,
     isCloseActionEnabled,
+    isReopenActionEnabled,
     isApproveActionEnabled,
+    isAssignActionEnabled,
     currentRequest,
     loading,
     deleteLoading,
@@ -30,10 +35,16 @@ const RequestDetails: React.FC = () => {
   return (
     <RequestDetailsMolecule
       me={me}
+      hasCommentCreateRight={hasCommentCreateRight}
+      hasCommentUpdateRight={hasCommentUpdateRight}
+      hasCommentDeleteRight={hasCommentDeleteRight}
       isCloseActionEnabled={isCloseActionEnabled}
+      isReopenActionEnabled={isReopenActionEnabled}
       isApproveActionEnabled={isApproveActionEnabled}
+      isAssignActionEnabled={isAssignActionEnabled}
       currentRequest={currentRequest}
       workspaceUserMembers={workspaceUserMembers}
+      loading={loading}
       deleteLoading={deleteLoading}
       approveLoading={approveLoading}
       updateLoading={updateRequestLoading}
@@ -45,7 +56,6 @@ const RequestDetails: React.FC = () => {
       onCommentDelete={handleCommentDelete}
       onBack={handleNavigateToRequestsList}
       onNavigateToItemEdit={handleNavigateToItemEdit}
-      loading={loading}
       onGetAsset={handleGetAsset}
       onGroupGet={handleGroupGet}
     />
diff --git a/web/src/components/organisms/Project/Request/RequestList/hooks.ts b/web/src/components/organisms/Project/Request/RequestList/hooks.ts
index 5e0c2febf4..fa191e764b 100644
--- a/web/src/components/organisms/Project/Request/RequestList/hooks.ts
+++ b/web/src/components/organisms/Project/Request/RequestList/hooks.ts
@@ -10,10 +10,9 @@ import {
   useDeleteRequestMutation,
   Comment as GQLComment,
   RequestState as GQLRequestState,
-  useGetMeQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useProject, useWorkspace } from "@reearth-cms/state";
+import { useProject, useWorkspace, useUserId, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const t = useT();
@@ -30,12 +29,34 @@ export default () => {
       pageSize: number;
     } | null;
   } = useLocation();
+
   const [currentProject] = useProject();
+  const projectId = useMemo(() => currentProject?.id, [currentProject]);
   const [currentWorkspace] = useWorkspace();
+  const [userId] = useUserId();
+  const [userRights] = useUserRights();
+  const [hasCloseRight, setHasCloseRight] = useState(false);
+
   const [collapsedCommentsPanel, collapseCommentsPanel] = useState(true);
   const [selection, setSelection] = useState<{ selectedRowKeys: Key[] }>({
     selectedRowKeys: [],
   });
+
+  const handleSelect = useCallback(
+    (selectedRowKeys: Key[], selectedRows: Request[]) => {
+      setSelection({
+        ...selection,
+        selectedRowKeys,
+      });
+      const newCloseRight =
+        userRights?.request.close === null
+          ? selectedRows.every(row => row.createdBy?.id === userId)
+          : !!userRights?.request.close;
+      setHasCloseRight(newCloseRight);
+    },
+    [selection, userId, userRights?.request.close],
+  );
+
   const [selectedRequestId, setselectedRequestId] = useState<string>();
   const [page, setPage] = useState(location.state?.page ?? 1);
   const [pageSize, setPageSize] = useState(location.state?.pageSize ?? 10);
@@ -51,10 +72,6 @@ export default () => {
     location.state?.columns ?? {},
   );
 
-  const projectId = useMemo(() => currentProject?.id, [currentProject]);
-
-  const { data: userData } = useGetMeQuery();
-
   const {
     data: rawRequests,
     refetch,
@@ -67,8 +84,8 @@ export default () => {
       sort: { key: "createdAt", reverted: true },
       key: searchTerm,
       state: requestState.length === 0 ? undefined : (requestState as GQLRequestState[]),
-      reviewer: reviewedByMe && userData?.me?.id ? userData?.me?.id : undefined,
-      createdBy: createdByMe && userData?.me?.id ? userData?.me?.id : undefined,
+      reviewer: reviewedByMe && userId ? userId : undefined,
+      createdBy: createdByMe && userId ? userId : undefined,
     },
     notifyOnNetworkStatusChange: true,
     skip: !projectId,
@@ -193,7 +210,7 @@ export default () => {
     selectedRequest,
     selection,
     handleNavigateToRequest,
-    setSelection,
+    handleSelect,
     handleRequestSelect,
     handleRequestsReload,
     deleteLoading,
@@ -209,5 +226,6 @@ export default () => {
     handleRequestTableChange,
     columns,
     handleColumnsChange,
+    hasCloseRight,
   };
 };
diff --git a/web/src/components/organisms/Project/Request/RequestList/index.tsx b/web/src/components/organisms/Project/Request/RequestList/index.tsx
index 087471c5af..3b1ae59e0a 100644
--- a/web/src/components/organisms/Project/Request/RequestList/index.tsx
+++ b/web/src/components/organisms/Project/Request/RequestList/index.tsx
@@ -13,7 +13,7 @@ const RequestList: React.FC = () => {
     collapsedCommentsPanel,
     selectedRequest,
     selection,
-    setSelection,
+    handleSelect,
     collapseCommentsPanel,
     handleRequestSelect,
     handleRequestsReload,
@@ -31,6 +31,7 @@ const RequestList: React.FC = () => {
     handleRequestTableChange,
     columns,
     handleColumnsChange,
+    hasCloseRight,
   } = useHooks();
 
   return (
@@ -59,7 +60,7 @@ const RequestList: React.FC = () => {
       searchTerm={searchTerm}
       onSearchTerm={handleSearchTerm}
       selection={selection}
-      setSelection={setSelection}
+      onSelect={handleSelect}
       onEdit={handleNavigateToRequest}
       totalCount={totalCount}
       reviewedByMe={reviewedByMe}
@@ -70,6 +71,7 @@ const RequestList: React.FC = () => {
       pageSize={pageSize}
       columns={columns}
       onColumnsChange={handleColumnsChange}
+      hasCloseRight={hasCloseRight}
     />
   );
 };
diff --git a/web/src/components/organisms/Project/Schema/hooks.ts b/web/src/components/organisms/Project/Schema/hooks.ts
index 47ae9dfd14..52c1fc7f02 100644
--- a/web/src/components/organisms/Project/Schema/hooks.ts
+++ b/web/src/components/organisms/Project/Schema/hooks.ts
@@ -36,7 +36,7 @@ import {
   useModelsByGroupQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useModel, useCollapsedModelMenu } from "@reearth-cms/state";
+import { useModel, useCollapsedModelMenu, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const t = useT();
@@ -44,6 +44,10 @@ export default () => {
   const navigate = useNavigate();
   const { projectId, workspaceId, modelId: schemaId } = useParams();
   const [currentModel, setCurrentModel] = useModel();
+  const [userRights] = useUserRights();
+  const hasCreateRight = useMemo(() => !!userRights?.schema.create, [userRights?.schema.create]);
+  const hasUpdateRight = useMemo(() => !!userRights?.schema.update, [userRights?.schema.update]);
+  const hasDeleteRight = useMemo(() => !!userRights?.schema.delete, [userRights?.schema.delete]);
 
   const [fieldModalShown, setFieldModalShown] = useState(false);
   const [isMeta, setIsMeta] = useState(false);
@@ -600,5 +604,8 @@ export default () => {
     groupDeletionModalShown,
     modelModalShown,
     modelDeletionModalShown,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
   };
 };
diff --git a/web/src/components/organisms/Project/Schema/index.tsx b/web/src/components/organisms/Project/Schema/index.tsx
index 0efeca7be6..5ee370d96b 100644
--- a/web/src/components/organisms/Project/Schema/index.tsx
+++ b/web/src/components/organisms/Project/Schema/index.tsx
@@ -77,6 +77,9 @@ const ProjectSchema: React.FC = () => {
     groupDeletionModalShown,
     modelModalShown,
     modelDeletionModalShown,
+    hasCreateRight,
+    hasUpdateRight,
+    hasDeleteRight,
   } = useHooks();
 
   return (
@@ -85,6 +88,9 @@ const ProjectSchema: React.FC = () => {
         data={data}
         collapsed={collapsed}
         selectedSchemaType={selectedSchemaType}
+        hasCreateRight={hasCreateRight}
+        hasUpdateRight={hasUpdateRight}
+        hasDeleteRight={hasDeleteRight}
         onModalOpen={handleModalOpen}
         onDeletionModalOpen={handleDeletionModalOpen}
         modelsMenu={
@@ -92,10 +98,10 @@ const ProjectSchema: React.FC = () => {
             title={t("Schema")}
             collapsed={collapsed}
             selectedSchemaType={selectedSchemaType}
-            onModelSelect={handleModelSelect}
-            onGroupSelect={handleGroupSelect}
             displayGroups
             titleIcon={"unorderedList"}
+            onModelSelect={handleModelSelect}
+            onGroupSelect={handleGroupSelect}
           />
         }
         setIsMeta={setIsMeta}
diff --git a/web/src/components/organisms/Project/settings/hooks.ts b/web/src/components/organisms/Project/settings/hooks.ts
index 87f939d22e..49e55393c2 100644
--- a/web/src/components/organisms/Project/settings/hooks.ts
+++ b/web/src/components/organisms/Project/settings/hooks.ts
@@ -2,7 +2,7 @@ import { useCallback, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import Notification from "@reearth-cms/components/atoms/Notification";
-import { Role } from "@reearth-cms/components/molecules/Workspace/types";
+import { Role } from "@reearth-cms/components/molecules/Member/types";
 import {
   useGetProjectsQuery,
   useUpdateProjectMutation,
@@ -11,18 +11,21 @@ import {
   useCheckProjectAliasLazyQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useWorkspace } from "@reearth-cms/state";
+import { useWorkspace, useUserRights } from "@reearth-cms/state";
 
 type Params = {
   projectId?: string;
 };
 
 export default ({ projectId }: Params) => {
-  const navigate = useNavigate();
-  const [currentWorkspace] = useWorkspace();
   const t = useT();
+  const navigate = useNavigate();
 
-  const workspaceId = currentWorkspace?.id;
+  const [currentWorkspace] = useWorkspace();
+  const workspaceId = useMemo(() => currentWorkspace?.id, [currentWorkspace?.id]);
+  const [userRights] = useUserRights();
+  const hasUpdateRight = useMemo(() => !!userRights?.project.update, [userRights?.project.update]);
+  const hasDeleteRight = useMemo(() => !!userRights?.project.delete, [userRights?.project.delete]);
 
   const { data, loading } = useGetProjectsQuery({
     variables: { workspaceId: workspaceId ?? "", pagination: { first: 100 } },
@@ -134,13 +137,12 @@ export default ({ projectId }: Params) => {
   return {
     project,
     loading,
-    projectId,
-    currentWorkspace,
+    hasUpdateRight,
+    hasDeleteRight,
     handleProjectUpdate,
     handleProjectRequestRolesUpdate,
     handleProjectDelete,
     handleProjectAliasCheck,
-    assetModalOpened,
     toggleAssetModal,
   };
 };
diff --git a/web/src/components/organisms/Project/settings/index.tsx b/web/src/components/organisms/Project/settings/index.tsx
index 148cd58f89..7c616f2076 100644
--- a/web/src/components/organisms/Project/settings/index.tsx
+++ b/web/src/components/organisms/Project/settings/index.tsx
@@ -11,6 +11,8 @@ const ProjectSettings: React.FC = () => {
   const {
     project,
     loading,
+    hasUpdateRight,
+    hasDeleteRight,
     handleProjectDelete,
     handleProjectUpdate,
     handleProjectRequestRolesUpdate,
@@ -24,6 +26,8 @@ const ProjectSettings: React.FC = () => {
   ) : (
     <ProjectSettingsMolecule
       project={project}
+      hasUpdateRight={hasUpdateRight}
+      hasDeleteRight={hasDeleteRight}
       onProjectDelete={handleProjectDelete}
       onProjectUpdate={handleProjectUpdate}
       onProjectRequestRolesUpdate={handleProjectRequestRolesUpdate}
diff --git a/web/src/components/organisms/Settings/General/hooks.ts b/web/src/components/organisms/Settings/General/hooks.ts
index 0ca1d8f831..76bd7dcb7b 100644
--- a/web/src/components/organisms/Settings/General/hooks.ts
+++ b/web/src/components/organisms/Settings/General/hooks.ts
@@ -5,7 +5,6 @@ import {
   WorkspaceSettings,
   TileInput,
   TerrainInput,
-  UserMember,
 } from "@reearth-cms/components/molecules/Workspace/types";
 import { fromGraphQLWorkspaceSettings } from "@reearth-cms/components/organisms/DataConverters/setting";
 import {
@@ -13,15 +12,15 @@ import {
   useUpdateWorkspaceSettingsMutation,
   ResourceInput,
   WorkspaceSettings as GQLWorkspaceSettings,
-  useGetMeQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useWorkspace } from "@reearth-cms/state";
+import { useWorkspace, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const t = useT();
 
   const [currentWorkspace] = useWorkspace();
+  const [userRights] = useUserRights();
   const workspaceId = currentWorkspace?.id;
   const { data, refetch, loading } = useGetWorkspaceSettingsQuery({
     variables: { workspaceId: workspaceId ?? "" },
@@ -78,18 +77,15 @@ export default () => {
     [refetch, t, updateWorkspaceMutation, workspaceId, workspaceSettings?.terrains?.enabled],
   );
 
-  const { data: userData } = useGetMeQuery();
-  const hasPrivilege: boolean = useMemo(() => {
-    const myRole = currentWorkspace?.members?.find(
-      (m): m is UserMember => "userId" in m && m.userId === userData?.me?.id,
-    )?.role;
-    return myRole === "OWNER" || myRole === "MAINTAINER";
-  }, [currentWorkspace?.members, userData?.me?.id]);
+  const hasUpdateRight = useMemo(
+    () => !!userRights?.workspaceSetting.update,
+    [userRights?.workspaceSetting.update],
+  );
 
   return {
     workspaceSettings,
     loading,
-    hasPrivilege,
+    hasUpdateRight,
     updateLoading,
     handleWorkspaceSettingsUpdate,
   };
diff --git a/web/src/components/organisms/Settings/General/index.tsx b/web/src/components/organisms/Settings/General/index.tsx
index 0f3c9fb40e..b06849764e 100644
--- a/web/src/components/organisms/Settings/General/index.tsx
+++ b/web/src/components/organisms/Settings/General/index.tsx
@@ -3,13 +3,13 @@ import SettingsMolecule from "@reearth-cms/components/molecules/Settings";
 import useHooks from "./hooks";
 
 const WorkspaceSettings: React.FC = () => {
-  const { workspaceSettings, hasPrivilege, updateLoading, handleWorkspaceSettingsUpdate } =
+  const { workspaceSettings, hasUpdateRight, updateLoading, handleWorkspaceSettingsUpdate } =
     useHooks();
 
   return (
     <SettingsMolecule
       workspaceSettings={workspaceSettings}
-      hasPrivilege={hasPrivilege}
+      hasUpdateRight={hasUpdateRight}
       loading={updateLoading}
       onWorkspaceSettingsUpdate={handleWorkspaceSettingsUpdate}
     />
diff --git a/web/src/components/organisms/Settings/Integration/hooks.ts b/web/src/components/organisms/Settings/Integration/hooks.ts
index 053562a4ff..3b2aeb3546 100644
--- a/web/src/components/organisms/Settings/Integration/hooks.ts
+++ b/web/src/components/organisms/Settings/Integration/hooks.ts
@@ -16,6 +16,7 @@ import {
   Workspace as GQLWorkspace,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
+import { useUserRights } from "@reearth-cms/state";
 
 export default (workspaceId?: string) => {
   const [selectedIntegrationMember, SetSelectedIntegrationMember] = useState<IntegrationMember>();
@@ -32,6 +33,19 @@ export default (workspaceId?: string) => {
     notifyOnNetworkStatusChange: true,
   });
   const t = useT();
+  const [userRights] = useUserRights();
+  const hasConnectRight = useMemo(
+    () => !!userRights?.integrations.connect,
+    [userRights?.integrations.connect],
+  );
+  const hasUpdateRight = useMemo(
+    () => !!userRights?.integrations.update,
+    [userRights?.integrations.update],
+  );
+  const hasDeleteRight = useMemo(
+    () => !!userRights?.integrations.delete,
+    [userRights?.integrations.delete],
+  );
 
   const workspace = useMemo(() => {
     const foundWorkspace = data?.me?.workspaces?.find(workspace => workspace.id === workspaceId);
@@ -192,5 +206,8 @@ export default (workspaceId?: string) => {
     handleTableChange,
     loading,
     handleReload,
+    hasConnectRight,
+    hasUpdateRight,
+    hasDeleteRight,
   };
 };
diff --git a/web/src/components/organisms/Settings/Integration/index.tsx b/web/src/components/organisms/Settings/Integration/index.tsx
index 9839788f2f..0f5447fc98 100644
--- a/web/src/components/organisms/Settings/Integration/index.tsx
+++ b/web/src/components/organisms/Settings/Integration/index.tsx
@@ -33,6 +33,9 @@ const Integration: React.FC = () => {
     handleTableChange,
     loading,
     handleReload,
+    hasConnectRight,
+    hasUpdateRight,
+    hasDeleteRight,
   } = useHooks(workspaceId);
 
   return (
@@ -51,6 +54,9 @@ const Integration: React.FC = () => {
         onTableChange={handleTableChange}
         loading={loading}
         onReload={handleReload}
+        hasConnectRight={hasConnectRight}
+        hasUpdateRight={hasUpdateRight}
+        hasDeleteRight={hasDeleteRight}
       />
       <IntegrationConnectModal
         integrations={integrations}
diff --git a/web/src/components/organisms/Settings/Members/hooks.ts b/web/src/components/organisms/Settings/Members/hooks.ts
index 13ecff3be8..123d290213 100644
--- a/web/src/components/organisms/Settings/Members/hooks.ts
+++ b/web/src/components/organisms/Settings/Members/hooks.ts
@@ -2,7 +2,7 @@ import { Key, useCallback, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import Notification from "@reearth-cms/components/atoms/Notification";
-import { User, RoleUnion } from "@reearth-cms/components/molecules/Member/types";
+import { User, Role } from "@reearth-cms/components/molecules/Member/types";
 import { UserMember, MemberInput } from "@reearth-cms/components/molecules/Workspace/types";
 import { fromGraphQLWorkspace } from "@reearth-cms/components/organisms/DataConverters/setting";
 import {
@@ -10,20 +10,30 @@ import {
   useGetMeQuery,
   useAddUsersToWorkspaceMutation,
   useUpdateMemberOfWorkspaceMutation,
-  Role,
+  Role as GQLRole,
   useRemoveMultipleMembersFromWorkspaceMutation,
   Workspace as GQLWorkspace,
   useGetUserBySearchLazyQuery,
   MemberInput as GQLMemberInput,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useWorkspace } from "@reearth-cms/state";
+import { useWorkspace, useUserRights } from "@reearth-cms/state";
 import { stringSortCallback } from "@reearth-cms/utils/sort";
 
 export default () => {
+  const t = useT();
   const navigate = useNavigate();
+
   const [currentWorkspace, setWorkspace] = useWorkspace();
   const workspaceId = useMemo(() => currentWorkspace?.id, [currentWorkspace?.id]);
+  const [userRights] = useUserRights();
+  const hasInviteRight = useMemo(() => !!userRights?.members.invite, [userRights?.members.invite]);
+  const hasRemoveRight = useMemo(() => !!userRights?.members.remove, [userRights?.members.remove]);
+  const hasChangeRoleRight = useMemo(
+    () => !!userRights?.members.changeRole,
+    [userRights?.members.changeRole],
+  );
+
   const [roleModalShown, setRoleModalShown] = useState(false);
   const [MemberAddModalShown, setMemberAddModalShown] = useState(false);
   const [selectedMember, setSelectedMember] = useState<UserMember>();
@@ -33,7 +43,6 @@ export default () => {
   });
   const [page, setPage] = useState(1);
   const [pageSize, setPageSize] = useState(10);
-  const t = useT();
 
   const handleSearchTerm = useCallback((term?: string) => {
     setSearchTerm(term);
@@ -82,14 +91,11 @@ export default () => {
       .sort((user1, user2) => stringSortCallback(user1.userId, user2.userId));
   }, [searchTerm, workspaceData?.node]);
 
-  const isOwner = useMemo(
-    () => !!workspaceUserMembers?.some(m => m.role === "OWNER" && m.userId === me.id),
-    [me.id, workspaceUserMembers],
-  );
-
   const isAbleToLeave = useMemo(
-    () => !isOwner || !!workspaceUserMembers?.some(m => m.role === "OWNER" && m.userId !== me.id),
-    [isOwner, me.id, workspaceUserMembers],
+    () =>
+      userRights?.role !== "OWNER" ||
+      !!workspaceUserMembers?.some(m => m.role === "OWNER" && m.userId !== me.id),
+    [me.id, userRights?.role, workspaceUserMembers],
   );
 
   const [searchUserQuery] = useGetUserBySearchLazyQuery({
@@ -146,17 +152,17 @@ export default () => {
     useUpdateMemberOfWorkspaceMutation();
 
   const handleMemberOfWorkspaceUpdate = useCallback(
-    async (userId: string, role: RoleUnion) => {
+    async (userId: string, role: Role) => {
       if (!workspaceId) return;
       const result = await updateMemberOfWorkspaceMutation({
         variables: {
           workspaceId,
           userId,
           role: {
-            READER: Role.Reader,
-            WRITER: Role.Writer,
-            MAINTAINER: Role.Maintainer,
-            OWNER: Role.Owner,
+            READER: GQLRole.Reader,
+            WRITER: GQLRole.Writer,
+            MAINTAINER: GQLRole.Maintainer,
+            OWNER: GQLRole.Owner,
           }[role],
         },
       });
@@ -253,7 +259,6 @@ export default () => {
 
   return {
     me,
-    isOwner,
     isAbleToLeave,
     searchedUser,
     handleSearchTerm,
@@ -283,5 +288,8 @@ export default () => {
     handleTableChange,
     loading,
     handleReload,
+    hasInviteRight,
+    hasRemoveRight,
+    hasChangeRoleRight,
   };
 };
diff --git a/web/src/components/organisms/Settings/Members/index.tsx b/web/src/components/organisms/Settings/Members/index.tsx
index 93ad85977e..0dd004f344 100644
--- a/web/src/components/organisms/Settings/Members/index.tsx
+++ b/web/src/components/organisms/Settings/Members/index.tsx
@@ -7,7 +7,6 @@ import useHooks from "./hooks";
 const Members: React.FC = () => {
   const {
     me,
-    isOwner,
     isAbleToLeave,
     searchedUser,
     handleSearchTerm,
@@ -37,13 +36,15 @@ const Members: React.FC = () => {
     handleTableChange,
     loading,
     handleReload,
+    hasInviteRight,
+    hasRemoveRight,
+    hasChangeRoleRight,
   } = useHooks();
 
   return (
     <>
       <MemberTable
         me={me}
-        isOwner={isOwner}
         isAbleToLeave={isAbleToLeave}
         handleMemberRemoveFromWorkspace={handleMemberRemoveFromWorkspace}
         onLeave={handleLeave}
@@ -58,6 +59,9 @@ const Members: React.FC = () => {
         onTableChange={handleTableChange}
         loading={loading}
         onReload={handleReload}
+        hasInviteRight={hasInviteRight}
+        hasRemoveRight={hasRemoveRight}
+        hasChangeRoleRight={hasChangeRoleRight}
       />
       {selectedMember && (
         <MemberRoleModal
diff --git a/web/src/components/organisms/Workspace/Settings/hooks.ts b/web/src/components/organisms/Workspace/Settings/hooks.ts
index 264036d0de..5588f3bd69 100644
--- a/web/src/components/organisms/Workspace/Settings/hooks.ts
+++ b/web/src/components/organisms/Workspace/Settings/hooks.ts
@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { useCallback, useMemo } from "react";
 import { useNavigate } from "react-router-dom";
 
 import Notification from "@reearth-cms/components/atoms/Notification";
@@ -9,12 +9,21 @@ import {
   Workspace as GQLWorkspace,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useWorkspace } from "@reearth-cms/state";
+import { useWorkspace, useUserRights } from "@reearth-cms/state";
 
 export default () => {
+  const t = useT();
   const navigate = useNavigate();
   const [currentWorkspace, setCurrentWorkspace] = useWorkspace();
-  const t = useT();
+  const [userRights] = useUserRights();
+  const hasUpdateRight = useMemo(
+    () => !!userRights?.workspace.update,
+    [userRights?.workspace.update],
+  );
+  const hasDeleteRight = useMemo(
+    () => !!userRights?.workspace.delete,
+    [userRights?.workspace.delete],
+  );
 
   const workspaceId = currentWorkspace?.id;
   const workspaceName = currentWorkspace?.name;
@@ -61,6 +70,8 @@ export default () => {
   return {
     workspaceName,
     updateWorkspaceLoading,
+    hasUpdateRight,
+    hasDeleteRight,
     handleWorkspaceUpdate,
     handleWorkspaceDelete,
   };
diff --git a/web/src/components/organisms/Workspace/Settings/index.tsx b/web/src/components/organisms/Workspace/Settings/index.tsx
index e1c448aa69..8447c2bbf9 100644
--- a/web/src/components/organisms/Workspace/Settings/index.tsx
+++ b/web/src/components/organisms/Workspace/Settings/index.tsx
@@ -3,13 +3,21 @@ import WorkspaceSettingsMolecule from "@reearth-cms/components/molecules/Workspa
 import useHooks from "./hooks";
 
 const WorkspaceSettings: React.FC = () => {
-  const { workspaceName, updateWorkspaceLoading, handleWorkspaceUpdate, handleWorkspaceDelete } =
-    useHooks();
+  const {
+    workspaceName,
+    updateWorkspaceLoading,
+    hasUpdateRight,
+    hasDeleteRight,
+    handleWorkspaceUpdate,
+    handleWorkspaceDelete,
+  } = useHooks();
 
   return (
     <WorkspaceSettingsMolecule
       workspaceName={workspaceName}
       updateWorkspaceLoading={updateWorkspaceLoading}
+      hasUpdateRight={hasUpdateRight}
+      hasDeleteRight={hasDeleteRight}
       onWorkspaceUpdate={handleWorkspaceUpdate}
       onWorkspaceDelete={handleWorkspaceDelete}
     />
diff --git a/web/src/components/organisms/Workspace/hooks.ts b/web/src/components/organisms/Workspace/hooks.ts
index 5e80a77bef..f27243733b 100644
--- a/web/src/components/organisms/Workspace/hooks.ts
+++ b/web/src/components/organisms/Workspace/hooks.ts
@@ -14,7 +14,7 @@ import {
   useCheckProjectAliasLazyQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useWorkspace } from "@reearth-cms/state";
+import { useWorkspace, useUserRights } from "@reearth-cms/state";
 
 export default () => {
   const t = useT();
@@ -24,6 +24,8 @@ export default () => {
   const [currentWorkspace, setCurrentWorkspace] = useWorkspace();
 
   const [searchedProjectName, setSearchedProjectName] = useState<string>("");
+  const [userRights] = useUserRights();
+  const hasCreateRight = useMemo(() => !!userRights?.project.create, [userRights?.project.create]);
 
   const [workspaceModalShown, setWorkspaceModalShown] = useState(false);
   const [projectModalShown, setProjectModalShown] = useState(false);
@@ -151,6 +153,7 @@ export default () => {
     projectModalShown,
     loadingProjects,
     workspaceModalShown,
+    hasCreateRight,
     handleProjectSearch,
     handleProjectCreate,
     handleProjectModalOpen,
diff --git a/web/src/components/organisms/Workspace/index.tsx b/web/src/components/organisms/Workspace/index.tsx
index 7f0a9731f5..e0aaa15fa8 100644
--- a/web/src/components/organisms/Workspace/index.tsx
+++ b/web/src/components/organisms/Workspace/index.tsx
@@ -9,6 +9,7 @@ const Workspace: React.FC = () => {
     projectModalShown,
     loadingProjects,
     workspaceModalShown,
+    hasCreateRight,
     handleProjectSearch,
     handleProjectCreate,
     handleProjectModalOpen,
@@ -27,6 +28,7 @@ const Workspace: React.FC = () => {
       projectModal={projectModalShown}
       workspaceModal={workspaceModalShown}
       loadingProjects={loadingProjects}
+      hasCreateRight={hasCreateRight}
       onProjectSearch={handleProjectSearch}
       onProjectModalOpen={handleProjectModalOpen}
       onProjectNavigation={handleProjectNavigation}
diff --git a/web/src/gql/graphql-client-api.tsx b/web/src/gql/graphql-client-api.tsx
index 5a5c93aaf5..27b9a7a18e 100644
--- a/web/src/gql/graphql-client-api.tsx
+++ b/web/src/gql/graphql-client-api.tsx
@@ -2537,7 +2537,7 @@ export type GetItemQueryVariables = Exact<{
 }>;
 
 
-export type GetItemQuery = { __typename?: 'Query', node?: { __typename?: 'Asset' } | { __typename?: 'Group' } | { __typename?: 'Integration' } | { __typename?: 'Item', id: string, title?: string | null, schemaId: string, createdAt: Date, updatedAt: Date, status: ItemStatus, version: string, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, assets: Array<{ __typename?: 'Asset', id: string, url: string, fileName: string } | null>, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null, updatedBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, itemGroupId?: string | null, type: SchemaFieldType, value?: any | null }>, metadata?: { __typename?: 'Item', id: string, version: string, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null }> } | null, thread: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> }, requests?: Array<{ __typename?: 'Request', id: string, state: RequestState }> | null } | { __typename?: 'Model' } | { __typename?: 'Project' } | { __typename?: 'Request' } | { __typename?: 'Schema' } | { __typename?: 'User' } | { __typename?: 'View' } | { __typename?: 'Workspace' } | { __typename?: 'WorkspaceSettings' } | null };
+export type GetItemQuery = { __typename?: 'Query', node?: { __typename?: 'Asset' } | { __typename?: 'Group' } | { __typename?: 'Integration' } | { __typename?: 'Item', id: string, title?: string | null, schemaId: string, createdAt: Date, updatedAt: Date, status: ItemStatus, version: string, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, assets: Array<{ __typename?: 'Asset', id: string, url: string, fileName: string } | null>, createdBy?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string } | null, updatedBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, itemGroupId?: string | null, type: SchemaFieldType, value?: any | null }>, metadata?: { __typename?: 'Item', id: string, version: string, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null }> } | null, thread: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> }, requests?: Array<{ __typename?: 'Request', id: string, state: RequestState }> | null } | { __typename?: 'Model' } | { __typename?: 'Project' } | { __typename?: 'Request' } | { __typename?: 'Schema' } | { __typename?: 'User' } | { __typename?: 'View' } | { __typename?: 'Workspace' } | { __typename?: 'WorkspaceSettings' } | null };
 
 export type IsItemReferencedQueryVariables = Exact<{
   itemId: Scalars['ID']['input'];
@@ -2552,7 +2552,7 @@ export type SearchItemQueryVariables = Exact<{
 }>;
 
 
-export type SearchItemQuery = { __typename?: 'Query', searchItem: { __typename?: 'ItemConnection', totalCount: number, nodes: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, createdAt: Date, updatedAt: Date, status: ItemStatus, version: string, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, assets: Array<{ __typename?: 'Asset', id: string, url: string } | null>, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, itemGroupId?: string | null, type: SchemaFieldType, value?: any | null }>, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null, updatedBy?: { __typename: 'Integration', name: string } | { __typename: 'User', name: string } | null, metadata?: { __typename?: 'Item', id: string, version: string, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null }> } | null, thread: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } } | null>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null, endCursor?: string | null } } };
+export type SearchItemQuery = { __typename?: 'Query', searchItem: { __typename?: 'ItemConnection', totalCount: number, nodes: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, createdAt: Date, updatedAt: Date, status: ItemStatus, version: string, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, assets: Array<{ __typename?: 'Asset', id: string, url: string } | null>, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, itemGroupId?: string | null, type: SchemaFieldType, value?: any | null }>, createdBy?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string } | null, updatedBy?: { __typename: 'Integration', name: string } | { __typename: 'User', name: string } | null, metadata?: { __typename?: 'Item', id: string, version: string, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null }> } | null, thread: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } } | null>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null, endCursor?: string | null } } };
 
 export type CreateItemMutationVariables = Exact<{
   modelId: Scalars['ID']['input'];
@@ -4662,9 +4662,11 @@ export const GetItemDocument = gql`
       }
       createdBy {
         ... on Integration {
+          id
           name
         }
         ... on User {
+          id
           name
         }
       }
@@ -4814,9 +4816,11 @@ export const SearchItemDocument = gql`
       }
       createdBy {
         ... on Integration {
+          id
           name
         }
         ... on User {
+          id
           name
         }
       }
diff --git a/web/src/gql/queries/item.ts b/web/src/gql/queries/item.ts
index 4e59cc9731..11ff984efd 100644
--- a/web/src/gql/queries/item.ts
+++ b/web/src/gql/queries/item.ts
@@ -100,9 +100,11 @@ export const GET_ITEM_NODE = gql`
         }
         createdBy {
           ... on Integration {
+            id
             name
           }
           ... on User {
+            id
             name
           }
         }
@@ -187,9 +189,11 @@ export const SEARCH_ITEM = gql`
         }
         createdBy {
           ... on Integration {
+            id
             name
           }
           ... on User {
+            id
             name
           }
         }
diff --git a/web/src/i18n/translations/en.yml b/web/src/i18n/translations/en.yml
index b4ad00de96..c7dcb4d9c7 100644
--- a/web/src/i18n/translations/en.yml
+++ b/web/src/i18n/translations/en.yml
@@ -221,6 +221,10 @@ Action: ''
 Change Role?: ''
 Members: ''
 New Member: ''
+WRITER: ''
+READER: ''
+MAINTAINER: ''
+OWNER: ''
 GROUPS: ''
 Add: ''
 MODELS: ''
@@ -271,7 +275,7 @@ Alias: ''
 Write something here to describe this record.: ''
 Project Settings: ''
 Need request: ''
-If this option is chosen, all new model within the project will default follow it: ''
+If this option is chosen, all new model within the project will default follow it.: ''
 Leave your comment...: ''
 Add Comment: ''
 Close: ''
@@ -421,10 +425,6 @@ Deleting the view is a permanent action. However, the contents will remain unaff
 Please proceed with caution as this action cannot be undone.: ''
 Save as new view: ''
 Welcome to Re:Earth CMS !: ''
-WRITER: ''
-READER: ''
-MAINTAINER: ''
-OWNER: ''
 search projects: ''
 Create a Workspace: ''
 Are you sure you want to delete this workspace?: ''
diff --git a/web/src/i18n/translations/ja.yml b/web/src/i18n/translations/ja.yml
index 9b24d852d6..a0b775d911 100644
--- a/web/src/i18n/translations/ja.yml
+++ b/web/src/i18n/translations/ja.yml
@@ -211,7 +211,7 @@ Selected Members: 選択中のメンバー
 Role Settings: ロール設定
 Please input the appropriate role for this member!: このメンバーに付与するロールを入力してください
 Are you sure to remove these members?: 本当にこれらのメンバーをワークスペースから削除してもよろしいですか？
-Are you sure to remove this member?: 本当にこのメンバーをワークスペースから削除してもよろしいですか？
+Are you sure to remove this member?: 本当にメンバーをこのワークスペースから削除してもよろしいですか？
 Remove this member from workspace means this member will not view any content of this workspace.: メンバーをワークスペースから削除すると、そのメンバーはワークスペース内のいかなるコンテンツも閲覧することができなくなります。
 Are you sure to leave this workspace?: 本当にこのワークスペースを離れてもよろしいですか？
 Leave this workspace means you will not view any content of this workspace.: ワークスペースを離れると、ワークスペース内のいかなるコンテンツも閲覧することができなくなります。
@@ -221,6 +221,10 @@ Action: 操作
 Change Role?: ロールを変更
 Members: メンバー
 New Member: メンバーを追加
+WRITER: 編集者
+READER: 閲覧者
+MAINTAINER: メンテナー
+OWNER: オーナー
 GROUPS: グループ
 Add: 追加
 MODELS: モデル
@@ -271,7 +275,7 @@ Alias: エイリアス
 Write something here to describe this record.: このレコードの説明を入力してください。
 Project Settings: プロジェクト設定
 Need request: リクエストの要否
-If this option is chosen, all new model within the project will default follow it: このオプションが選択された場合、プロジェクト内のすべての新しいモデルはデフォルトでそれに従います。
+If this option is chosen, all new model within the project will default follow it.: このオプションが選択された場合、プロジェクト内のすべての新しいモデルはデフォルトでそれに従います。
 Leave your comment...: コメントを入力してください。
 Add Comment: コメントを追加
 Close: クローズ
@@ -421,10 +425,6 @@ Deleting the view is a permanent action. However, the contents will remain unaff
 Please proceed with caution as this action cannot be undone.: この操作は元に戻せませんので、注意して行ってください。
 Save as new view: 新しいビューとして保存します
 Welcome to Re:Earth CMS !: ようこそ！Re:Earth CMSへ
-WRITER: 編集者
-READER: 閲覧者
-MAINTAINER: メンテナー
-OWNER: オーナー
 search projects: 検索
 Create a Workspace: 新規ワークスペース
 Are you sure you want to delete this workspace?: このワークスペースを削除します。よろしいですか？
diff --git a/web/src/state/index.ts b/web/src/state/index.ts
index 8a9d8fe71a..0064df2869 100644
--- a/web/src/state/index.ts
+++ b/web/src/state/index.ts
@@ -1,6 +1,7 @@
 import { atom, useAtom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 
+import { UserRights } from "@reearth-cms/components/molecules/Member/types";
 import { Model } from "@reearth-cms/components/molecules/Model/types";
 import { Workspace, Project } from "@reearth-cms/components/molecules/Workspace/types";
 
@@ -21,3 +22,6 @@ export const useModel = () => useAtom(model);
 
 const collapsedModelMenu = atomWithStorage<boolean>("collapsedModelMenu", false);
 export const useCollapsedModelMenu = () => useAtom(collapsedModelMenu);
+
+const userRights = atom<UserRights | undefined>(undefined);
+export const useUserRights = () => useAtom(userRights);

From d72963d5eb76b6512516c36baa77949e1055600c Mon Sep 17 00:00:00 2001
From: mimoham24 <69579255+mimoham24@users.noreply.github.com>
Date: Wed, 6 Nov 2024 20:11:09 +0900
Subject: [PATCH 22/28] feat(server): implement limited scope and token
 management for public API (#655)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(web): unify settings (#1029)

* rename save to save changes

* wip: save settings when clicking on save button

* rename save changes button

* fix(server): integration api is not retrieving metdata item fields when metadata item id is passed (#1030)

fix integration api get item bug

* fix(web): metadata default value and item creating and updating (#1027)

* fix: metadata default value

* add: bool conversion

* refactor: create and update

* fix: the bug that prevented adding meta text and url

* Apply suggestions from code review

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* fix: dateConvert

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* fix(web): workspace settings in old workspaces (#1031)

fix: workspace settings in old workspaces

* fix(web): add missing translation (#1032)

fix: add missing translation

* chore(server): add trace to item (#1034)

* add trace to item

* fix lint

* feat(web): make it possible to change tiles and terrain on the asset preview (#1033)

* add: custom dropdown

* add: default terrain

* add: reflect settings

* fix: dropdown styling

* fix: missing type

* add: no image

* fix: mistype

* fix(server): check group schema field before handling inner group fields (#1036)

* check group schema field before handling inner group fields

* fix operator

* fix(web): update the item with a new group field (#1037)

* fix: id bug

* fix: styled warning

* fix: check if value changed

* fix: adding new group field

* fix handling multiple value and refactor

* add: useCallback

* undo: styled-component warning

* fix(web): enable to preview gltf/glb file (#1038)

fix: gltf

* fix(web): minor bugs in appearance, etc. (#1039)

* fix: group icon color

* fix: asset table column styling

* fix: clickable range on group tab header

* fix: leaving alert with single-option and multi-asset in group

* fix: default terrain

* fix: move the onClick functions

---------

Co-authored-by: nourbalaha <nourbalaha0@gmail.com>

* perf(server): optimize mongo indices

* chore(server): update reearthx package (#1042)

update reearthx package

* chore(server): fix go mod (#1043)

fix

* fix(web): not showing empty info box (#1041)

* remove: unnecessary assertion

* fix: not showing infoBox when selecting layer

* refactor and fix

* fix: showing mvt file info

* wrap with useCallback

* fix(web): the length of the view title's underline (#1045)

fix: underline length

* fix(worker,server): update decompressor (#1049)

* chore(server): update go dependencies (#1047)

* chore(server): update go dependencies

* update reearthx

* fix(web): the size of the point in mvt (#1053)

* update cesium-mvt-imagery-provider

* expand the size of the point

* fix(web): mvt maximum zoom level (#1054)

* add maximum zoom level

* fix(web): change the default number of items (#1060)

change the default number of items

* chore(server): referenced items resolver (#1058)

* ref items resolver

* resolve notes
revert worker sum changes

* feat(web): implement referenced items resolver (#1059)

* feat: implement referenced items resolver

* feat(web): add e2e testing (#1040)

* install playwright

* wip: e2e config

* add playwright to .git ignore

* update vite.config

* update gitignore files

* add workspaceId

* wip: e2e config

* fix e2e action env

* fix: removed unused env vars

* fix: @playwright/test version

* add gql to Reearth type

* test(web): add unit tests for utils functions (#1065)

add unit tests for utils folder

* chore(server): go mod tidy

* ci: fix decompressor deployment

* fix(web): use assets data that is the result of the getItemQuery (#1066)

* fix: use assets data of getItem's query

* apply suggestions

* refactor(web): comprehensive refactor (#1067)

* Refactor Item page components

* Refactor Asset page components

* Refactor Schema page components

* Refactor Integration page components

* Refactor Request page components

* Refactor Settings page components

* Refactor Accessibility page components

* Add unit tests

* Remove inline styles

* Use react hooks in the places that they should be used

* Do the todo comments

* Remove unnecessary comments

* Remove unused queries

* Add performance improvements

---------

Co-authored-by: caichi <54824604+caichi-t@users.noreply.github.com>
Co-authored-by: Kazuma Tsuchiya <caichi0424@gmail.com>

* fix(web): some quick fixing and improvements (#1071)

* add: asset creator's name

* fix: request creator name and reviewer's icon

* add: setting icons to request modal

* fix: multi reviewers style

* fix: updating reviewers

* fix: hiding three-dots icon

* showing the notification when updating my integration

* fix: swicth column width on Accessibility page

* fix: project role setting

* add: go back home button

* apply suggestions

* fix(web): asset value bugs (#1070)

* fix: showing bug of asset default value

* fix: asset name bug

* fix: enable to select the same asset once unlinking

* apply a suggestion

* fix: getAsset logic

* fix(web): reduce the queries to get assets (#1072)

* unify GetAssets and GetAssetsItems

* remove joinning asset's names

* remove redundant codes

* refactor: item fields

* refactor: item metadata

* Apply suggestions from code review

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* feat(web): implement resizable columns on Asset and Request pages (#1074)

make the columns stretchable on Asset and Request page

* refactor(web): organize type definitions and data converters (#1075)

* move model type

* unify dataConverters

* fix conflict

* rename asset.type.ts to types.ts

* delete thread.types.ts

* refactor: move comment type

* fix(web): include home tab in sidebar on project page (#1076)

* revert: go back home button

* add: home tab on project page

* fix(web): reference field bugs (#1079)

* fix: disable model change on update reference field

* fix: disable unique validation in two-way reference fields

* fix(server): cannot unset a schema field's title (#1073)

* fix title unsetting bug

* Update server/pkg/schema/schema.go

Co-authored-by: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>

---------

Co-authored-by: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>

* fix(web): resolve issues with home tab and asset page comments (#1080)

* fix: refetchQueries on comment panel

* fix: when switching workspace, the home tab should always be selected

* fix: synchronize account name with personal workspace name when updating account name

* fix: the lang of the notification when updating language setting

* add: required mark on webhook url

* test(web): add simple, comprehensive, and minimum e2e tests (#1081)

* add account and myIntegrations tests

* add: logout test

* add: integrations test

* small fix

* add: terrain test

* add: member test

* add: workspace test

* add: project test

* fix: terrain swtich test

* add: overview test

* add: accesibility test

* add: asset test

* add: request test

* fix: comment on Asset test

* add: schema test

* move utils for workspace

* move utils for project

* move utils for model

* move utils for group

* move utils for comment

* fix: missing import

* move handleFieldForm

* move createRequest func

* add: content test

* fix some codes

* Revert "fix: synchronize account name with personal workspace name when updating account name"

This reverts commit 388e67b5135da458c4bcc2ba20b12f56c551dc5c.

* fix: request state

* add: notification closing

* fix: exclude path in vite.config

* fix: integrations test

* Apply suggestions from code review

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* fix(web): request page bugs (#1082)

* fix: reviewer selecting

* add: reloading function of request modal

* fix: reviewers column styling

* fix: refetchQueries of createRequestMutation

* feat(server): integration API to create asset upload (#1084)

feat(server): add a new integration api to create asset upload

* fix(server): integration API asset create cannot create an asset with token

* fix(web): correct rendering of boolean field in content table (#1083)

fix: boolean field render in content table

* feat(web): increase asset file fragment depth (#1086)

feat: increase asset file fragment depth

* refactor: reference schema field (#1077)

* ref field migration

* fix lint

* add missing translations

* add some comments

* add new error

* fix migration

* fix(server): ja translations (#1078)

* fix ja translations

* fix ja translation

* migration test

* fix: graphql

* fix gql resolver

* fix: reference item searching

* fix migration

---------

Co-authored-by: caichi <54824604+caichi-t@users.noreply.github.com>
Co-authored-by: Kazuma Tsuchiya <caichi0424@gmail.com>

* chore(server): fix go mod (#1087)

* fix go mod

* fix go mod

* ci: upgrade to golang 1.22.1 (#1088)

* upgrade to golang 1.22.1

* fix

* chore(worker): update golang dependencies (#1089)

update

* ci(web): add an action to update ion token (#1021)

* ci: add an action to update ion token

* update the Get Cesium Ion token run command

* feat(server): support multiple tenants (#1068)

* feat(server): support multiple tenants

* test(server): fix broken tests

* chore: update dependencies

---------

Co-authored-by: rot1024 <aayhrot@gmail.com>

* feat(server): add WEB_CONFIG to config

* feat(server): item search by referenced item title (#1090)

* imp

* fix dependency issue

* ci: update github actions dependencies (#1052)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: update go dependencies (#926)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(server): multi tennant was not working

* chore(web): my workspace is optional

* feat(server,web): support s3 multipart upload (#1091)

* feat(server,web): support s3 multipart upload

* update integration api

* fix frontend

* fix ci

* fix ci

* fix

* fix ci

* fix

* fix

* fix

* add etag

* Revert "add etag"

This reverts commit a2f9738e58a2873b9c471c6f78106414a9600926.

* fix

---------

Co-authored-by: rot1024 <aayhrot@gmail.com>

* fix(server): workspace cloud not be created

* fix(server): Fixed to use parameter uuid instead of generated uuid (#1093)

* fix(web): add an editable icon on a metadata column header (#1092)

* add: renderTitle

* enable url metadata to edit from table

* rename itemFormat.tsx to ItemFormat.tsx

* fix(server): item search mongo pipeline (#1097)

imp

* feat(server,worker): add authentication for AWS SNS subscriptions (#1094)

* feat(server,worker): add aws sns subcription

* feat(server): change the authentication method of notify handler in the case of aws

* fix(server,worker): error message

* refactor

---------

Co-authored-by: rot1024 <aayhrot@gmail.com>

* fix(web): adding e2e tests for items and optimizing queries (#1096)

* fix: content test

* add: text field test

* add: asset test

* add: date test

* add: boolean test

* add: option test

* add: int test

* fix: int test

* add: url test

* add; group test

* add reference
test and fix reference modal behavior

* move files

* add: text matadata test

* small fix

* add: tag test

* add: boolean metadata test

* add: checkbox test

* add: date metadata test

* add: url metadata test

* fix: reduce api when updating item

* fix: throw searchItem when opening the reference modal

* fix: throw GetAssets when selecting asset field

* fix: throw GetModalRequests when opening the add to Request modal

* fix: unify GetAsset and GetAssetItem

* fix: GetModels and GetModel

* fix: tests

* fix: refetchQueries name

* fix: behavior after deleting model

* fix: account settting test

* fix group test

* add: retries property to playwright.config

* fix: randomizing project alias

* add: beforeEach and afterEach

* remove metadata tests

* add: reverting back to the original username and email

* fix: account name and email bug

* chore(server): asset uc UpdateFiles should print more logs

* fix(server): fix tests, return err from notify handler

* fix(server): send event after saving an asset in asset creation

* fix(server): fix warning

* chore(server): update go.mod

* feat(web,server): support multi-tenant login (#1102)

* feat(web): support multi-tenant login

* memoize

* refactor type

* fix cognito

* fix bugs

* pretty print config, mask db url

* fix

* fix(web): improve the performance related to the group (#1104)

* remove redundant code

* fix:  jumping to ia new model when creating it

* fix: unify model and group

* remove redundant code

* fix: getGroups and getGroup

* add test for creating group

* fix: createGroup test behavior

* fix: default value bug

* fix: remove graphql api from GroupItem

* fix(web): table-related and small bugs (#1103)

* fix:  disable upload button when selecting nothing

* add: clear btn on search input field on all tables

* fix: the behavior of updating tag from the edit page

* hide first column from table setting of table on modal

* fix: make the columns resizable on modal table

* fix: placeholder in test

* refactor(web): model, project, and workspace types (#1105)

* refactor: model type

* refactor: workspace type

* refactor: project type

* fix: showPublishAction

* fix(web): after deleting the first view, the current view is not changed (#1106)

* move file

* add: view test

* fix: the behavior when removing first view

* add: filter saving

* add: saving column setting

* add: test.setTimeout

* fix: change test.timeout() to test.slow()

* test(web): add the tests to reorder schema, model, tiles, and terrain by drag and drop (#1107)

* add: schema reordering test

* fix: where handleFieldForm is used

* add: model reordering test

* add: tiles and terrain reordring test

* fix(web): improve the performance of updating metadata from the table (#1109)

* remove searchItems query from refetchQueries

* Revert "remove metadata tests"

This reverts commit 055abc22553585cd7a32799d9654db42218e6392.

* fix: tag test

* fix: url updating feature

* fix: url metadata test

* fix(web): reference items bug (#1110)

* fix: adding schema variable

* add loading to reference modal table

* refactor(web): move isItemReferenced query to organisms level (#1108)

* refactor: move graphql to organisms level

* fix: conflict

* feat(server): asset file paths (#1099)

* wip: adding file paths

* wip: asset file paths

* fix: filepaths

* revert new file code

* wip: move to adapter level

* wip: getting asset files from adapter level

* fix: memory

* fix: test cases

* fix: find file by id

* fix: paths in repo layer

* refactor: rename variables

* revert repo and interactor changes

* rename variables

* fix: remove children from adapter

* fix: convert asset unit test

* refactor and comment unused code

* fix: FindByID unit test

* feat(web): asset file paths (#1100)

* add file paths to gql

* wip: unzip file list

* remove children from asset file

* fix: change constructFileTree's  parameter name

* fix path and remove unused props

* refactor: get tree data

* refactor

* refactor 2

* refactor(web): e2e tests (#1111)

* fix: closeNotification

* add: locale setting

* add: fullyParallel to config

* remove: unnnecessary assertion

* perf(web): asset file list (#1112)

* perf: asset file list

* fix asset file types

* refactor

* feat(web): migrate to antd v5 (#1113)

* wip: migrate to antd 5

* wip: migrating to antd v5

* upgrade other antd deps

* fix: console errors

* remove deprecated method showArrow

* wip: upgrading antd

* fix: change moment to dayjs

* fix: styling

* update antd and @ant-design/pro-table

* wip: fix stying

* fix: table column

* fix: control dropdown

* fix: comment styling

* fix: revert primary color change

* fix: SearchItemQuery skip variable

* update: ant-design libs

* fix: multiple tag render

* fix: e2e tests

* revert: a tag styling

* delete: any assertion

* fix: ci error

* yarn format

---------

Co-authored-by: nourbalaha <nourbalaha0@gmail.com>

* fix(web): styling issues after updating antd and from long Input (#1117)

* add: scroll-bar

* fix: schema heading

* fix: integration card title

* fix: schema display

* fix: reference modal

* fix: request page

* fix: field title

* fix: test

* Update web/src/components/molecules/Content/Form/FieldTitle.tsx

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* add: test.slow() to asset field test

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* perf(web): optimize list items performance by minimizing query calls (#1119)

* fix: move useGetViewsQuery to contentList hooks

* add: default sort

* fix: filter area styling

* fix: the behavior when updating view's name

* fix(web): styling of the close button on modal (#1120)

fix: modal close btn

* feat(web): implement resizable columns on Integration table (#1121)

fix: table styling

* chore(web): add a missing translation (#1123)

chore: add missing translation

* feat(web): add a sipnner to content and request pages (#1122)

* add a spinner to content and request pages

* remove unused code

* feat(web): add a spinner when creating a new workspace (#1124)

* feat: add a spinner to new workspace button

* rename isLoading to setLoading

* fix(server): item metadata resolver returns jumbled items (#1118)

fix

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* fix(server): filter out the deleted referenced items (#1116)

filter out the nil items

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* feat(web): implement workspace owners' ability to remove other owners (#1127)

feat: workspace owners' ability to remove other owners

* fix(web): updating metadata added later from edit page (#1125)

* fix: updating metadata from detail

* add: e2e test

* chore(server): add environment example (#1101)

* chore(server): log mongo query in dev env (#1098)

imp

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* feat(web): reduce the notificatoin duration (#1131)

set the notification timeout to 2 seconds

* feat(web): show notification when updating member’s role (#1129)

* add: notification

* fix: logic and typo

* chore(web): update npm dependencies and configuration (#1126)

* update minor versions

* update patch versions

* update major versions

* update netlify deploy-preview version

* make node 18 the minimum version to run cms

* update @graphql-codegen

* update @testing-library

* upgrade apollo-upload-client

---------

Co-authored-by: Kazuma Tsuchiya <caichi0424@gmail.com>

* chore(web): update auth0 version (#1132)

* chore: upgrade auth0 to v2

* fix(server): remove the root file from asset files  (#1134)

* fix: filter the root file when finding file by id

* fix: error checking if statement

* fix: error checking in aws file

* fix: update the commented code

* move the filter logic to pkg and add a test

* chore(web): add environment example (#1135)

add: .env.example

* chore(web): decrease the default items per page to 20 (#1136)

fix: default pageSize

* refactor(web): asset file tree and add unit tests (#1133)

* refactor: move unzip file list to a folder

* test: add unit tests

* fix(server): deleting and updating item fails when it has a deleted reference  (#1137)

* fix

* fix

* refactor(server): data loaders generic implementation (#1130)

* fix

* imp

---------

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* feat(web): check project alias availability (#1141)

feat: check project alias availability

* fix(server): increase disk size of cloud build

* fix(web): clear fields on close in create project modal (#1143)

fix: reset fields when closing create project modal

* fix(web): populate create project form with initial values (#1144)

fix: add initial values to create project form

* feat(web): scrolling to selected model or group on Schema or Content page (#1139)

feat: scroll to selected model or group

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* feat(web): implement project alias update in settings page (#1145)

* make project alias readonly in accessability page and add copy icon

* wip: add project alias to update project form

* add onProjectAliasCheck

* refactor

* feat(web): fill key or alias by name automatically (#1140)

* feat: project alias

* model key

* model key

* reference field

* unify

* fix: tests and validater setting

* fix: e2e tests

* fix(web): keep search word and selected view after going back to table from edit (#1138)

* fix: keep searchTerm & currentView

* fix: e2e tests

* fix(web): format of standard date field (#1148)

fix: format of date field

* fix(web): fill key or alias automatically by lowercase (#1147)

fix: auto filling by lowercase

* fix(web): display all data on Request detail (#1146)

* refactor values except for group

* refactor Asset component & add reference title

* fix: multiple boolean

* fix: markdown styling

* add: group field

* fix: e2e tests

* fix(web): filter drop-down closes by itself when the condition is selectable (#1149)

fix: filter closing bug

* fix(web): keep page number and page size when returning to table from detail (#1150)

* fix: keep page and pageSize on Content

* fix: asset page

* fix: request

* fix(web): view svg source code (#1151)

fix: remove the cors header

* chore(server): update content type handling for uploaded SVG images via URL (#1152)

fix: content type

* feat(server): implement ordering for multiple groups (#1153)

* feat: support group ordering

* add unit tests

* add e2e test

* feat(server): implement ordering for multiple views (#1154)

* feat: add order to views

* make order required

* add unit tests

* handle order in create and updateOrder functions

* add e2e test

* add more suitable error messages

* make i18n

* feat(web): make the project alias readonly instead of disabled (#1159)

feat: make the project alias readonly instead of disabled

* feat(web): add support for multi-group ordering (#1158)

* feat: ordering

* add e2e tests

* yarn i18n

* fix: remove on Group from gql query

* chore(server): add missing translations (#1161)

add missing translations

* fix(server): add order to view document (#1162)

* fix: add order to infrastructure layer

* add unit test

* feat(server): implement regenerate integration token functionality (#1156)

* feat: implement regererate integration token

* add unit test

* add e2e test

* feat(web): implement regenerate integration token functionality (#1157)

* add regenerate token mutation to gql

* implement regenerate token

* add japanese translations

* fix: translation

---------

Co-authored-by: Kazuma Tsuchiya <caichi0424@gmail.com>

* feat(web): add support for multi-view ordering (#1163)

* feat: ordering views

* add e2e tests

* fix: test name

* fix: using Promise<void>

* feat(web): add the button to copy the value of Integration Token (#1164)

feat: copying integration token

* refactor(server): item reference (#1155)

imp

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* fix(server): webhook should not be triggered on meta data item creation (#1160)

fix

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* feat(server): add csv to preview type (#1165)

feat: add csv to preview type

* ci: migrate to GitHub Apps from PAT (#1167)

feat: migrate to github apps

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

* fix(server): sort models, groups and views by order (#1166)

* fix: sort models, groups and views by order

* remove unnecessary code

* add unit tests

* handle errors

* refactor

* chore(web): upgrade cesium and resium versions (#1000)

* upgrade resium to version 1.17.4

* upgrade cesium to version 1.117.0

* upgrade cesium-mvt-imagery-provider to version 1.4.1

---------

Co-authored-by: keiya01 <keiya.s.0210@gmail.com>

* chore(web): update vite and fix vite.config (#1170)

update vite + config

* chore(web): migrate eslint to v9 (#1168)

* migrate eslint to v9

* add config for playwright

* add story book to eslint.config

* add type: module to package.json

* add prettier config and update to v 3.3.0

* feat(web): add csv preview support on asset page (#1169)

* wip: add csv viewer

* feat: showing point

* yarn gql

* rename

* add: properties

* yarn i18n

* add: zoomTo entities

* add: disableDepthTestDistance

* apply suggestion

* chore(web): update prettier config (#1171)

* update prettier config

* format files

* refactor(web): resolve eslint update warnings (#1172)

* wip: fix wrong type specification

* fix: MyIntegrationDetails

* fix: MyIntegrations

* fix: Accessibility

* fix: Settings

* fix: AssetList

* fix: asset

* fix: modelsMenu

* fix: overview

* fix: Schema

* fix: Request Details

* fix: RequestList

* fix: ContentList

* fix: ViewsMenu

* fix: contentDetail

* fix: className

* fix: fromGraphQLRequest

* fix conflicts

* yarn lint & fix manually

* fix: e2e test

* yarn fix

* fix any

* yarn format

* yarn fix

* add .prettierignore

* fix: any assertion warnings

* revert amplify changes

* some fixes

* add amplify to eslint ignores

---------

Co-authored-by: nourbalaha <nourbalaha0@gmail.com>

* feat(server): enhance preview type detection for more file types (#1174)

* feat: enhance preview type detection for more file types

* add unit-test

* fix(web): styling of request detail page (#1175)

* fix: header dropdown

* fix: styling

* fix: accordion styling

* yarn i18n

* fix: hover color of remove button

* feat(server): implement geo field's position (#1176)

* wip: position value

* refactor to value

* refactor 2

* wip: unit tests

* fix: mapToFloat64

* add Test_propertyPosition_ToValue

* add propertyPosition to registry

* add more unit tests

* fix: float32 to float64 conversion

* add decimal numbers to unit tests

* fix: bad import in list_test

* feat(server): implement geo-field's point (#1177)

* add point field to the field schema

* add point to convert schema

* add field point to schema domain models

* add unit tests

* fix(web): disable all setting save buttons when nothing is changed (#1178)

* fix: disable button

* yarn fix

* fix: test

* fix

* fix(web): styling of integration, myIntegration, and member page (#1180)

* fix: MyIntegraiong, integration, delete

* fix: member, integration page

* add: minWidth

* quick fix

* feat(server): support field management in integration api (#1181)

imp

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* fix(web): disable members and integrations already added (#1182)

* add flag to check if the user is member

* remove already connected integration

* refactor workspaceIntegrationMembers

* fix: e2e test

* fix: useCallback dependency

* rename

* refactor

* fix(web): styling and translation issues (#1184)

* fix traslations

* apply suggestions

* feat(server): support fetch projects in integration api (#1185)

* imp

* fix lint issue

* feat(server): support search by Ids in item filter (#1183)

imp

* feat(server): add geometry field support (#1179)

* wip: geometry field

* test: fix the test cases

* add ToGeometrySupportedType

* wip: add validation to geo field

* fix: TestFieldGeometry_Validate

* fix: TestTypeProperty_Validate

* fix: TestValue_Match

* add FromGeometrySupportedType

* fix(web): show loading for various actions (#1186)

* wip

* add: publish loading

* fix: e2e tests

* fix: uncomment t

* remove as Field

* apply suggestions

* fix(web): ignore invalid characters when auto-filling the key and alias (#1187)

* fix: ignore invalid characters

* fix: use try-catch

* ci: migrate GCR to GAR (#1190)

* feat: migrate to github apps

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

* ci: migrate gcr to gar

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

---------

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

* feat(server): support item search in integration api (#1192)

* imp

* add test cases

* fix(web): remove useless key validating when updating some value other than key (#1191)

* fix: project, model, and schema

* fix: reference field validate

* fix: model, project

* fix: CorrespondingFieldKeyUnique

* feat(server): implement geometry object and geometry editor fields (#1189)

* add geometry to value

* add geometry to mongodoc

* wip: add geometry to integration api

* wip: e2e

* wip: e2e tests

* fix: supported types

* fix TestClearItemValues

* make supported types uniq

* add any supported type

* add integration e2e tests

* fix: TestIntegrationModelFilterAPI

* format integration item test

* add geometry editor type

* remove unwanted code

* rename the field geometry to geometry object

* fix: test cases

* remove any type from geometry object

* rename test files

* fix(server): geo field missing validations (#1188)

* add validation
supported type validation
remove GeoJSON feature decoding

* remove fmt

* i18n gen

* i18n gen

* refactor rfc validation logic
add geo collection support

* add missing returns

* position validation

* is valid

* support any

* feat(web): preserve table conditions on asset and request page (#1193)

* fix: preserve sort on asset

* refactor

* fix: preserve sort of request and columns

* fix: type definition

* fix: add missing repository URL argument for `configure-docker` command (#1195)

* fix: add missing argument for `configure-docker` command

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

* fix: add missing `actions/checkout` before google cloud auth

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

---------

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

* ci: add missing checkout before deploy server workflow (#1196)

fix: add missing checkout before deploy server workflow

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>

* fix(web): changes are not detected for some group fields (#1199)

fix: the logic of detect changes in group field

* feat(server): schemata in integration api (#1200)

imp

* fix(web): group field values sometimes disapper after refreshing page (#1202)

fix

* feat(server): export items as geojson and csv via integration api (#1194)

* wip: items with project as geojson and csv

* update the csv format and description in the integration schema

* fix: csv and geojson bugs

* add unit tests for group

* update geojson content type

* update Japanese translations

* remove group and reference fields from export

* add check if result is empty

* feat(server): export items as geojson and csv via public api (#1198)

* add geojson types to public api

* support multiple values in csv

* support multiple geo fields in geojson

* add e2e test

* improve error handling

* make the files downloadable

* feat(web): support geometry object and geometry editor fields (#1197)

* wip: add point, polyline, polygon on cesium

* add: geometry fields

* fix: geometry field modal

* wip: add zoom feature

* change pin icons

* feat: edit pin pos & fullscreen

* feat: deleting points

* wip

* install monaco-editor

* add icons

* yarn gql

* fix type definition

* wip: imp UI

* fix schema

* fix icon

* wip: move geometry field component

* add: table render

* impl field

* add: default value

* add: request

* fix schema modal & add disable flag

* feat: show input value on map

* wip: fix validation

* wip: integrate @reearth/core

* render value on map

* refactor

* add: warning

* add: search location

* add: terrain setting

* add: support group

* i18n

* fix: validate

* add: e2e test

* refactor

* upgrage @reearth/core to render GeometryCollection

* refactor

* support tile setting

* feat(web): add version suffix to cesiumBaseUrl (#1203)

feat: add version suffix to cesiumBaseUrl

* fix(web): cesium base url version (#1204)

fix: cesium base url

* feat(server): implement asset search in integrarion api (#1208)

* add keyword param to integration schema

* rename q to keyword

* rename q to keyword in memory

* fix test cases

* add e2e

* refactor

* feat(server): firebase authentication (#1206)

* add firebase to config

* feat(web): firebase authentication (#1207)

* add firebase auth

* refactor

* refactor 2

* update .env.example

* rename firebase provider component

* fix(web): improve geometry field (#1205)

* make field resizable

* fix: sketch color

* fix: error showing

* fix: search bar color bug

* fix: delete button on editor

* fix: validating

* fix: camera pos when updating editor

* fix: test

* set --max_old_space_size

* increase space size

* support terrain setting

* fix: group width

* fix: placeholder position

* fix: allocated memory

* fix(web): upgrade @reearth/core (#1210)

* upgrade core

* fix: ci error

* apply request

* remove string-width

* Revert "remove string-width"

This reverts commit 2a30aa1a0511632b69b12d5ef818d1b7fb5c9563.

* feat(server): add workspace id to project in integration api (#1209)

imp

* feat(server): schemata filter in integration api (#1212)

imp

* fix(server): internal error when the project has an active webhook (#1213)

imp

* fix(web): styling of model menu (#1211)

* fix: title icon

* fix: collapsed styling

* feat: show tooltip

* fix: keep collapsed

* chore(web): upgrade eslint and eslint-config-reearth (#1215)

* feat: upgrade eslint and reearth-eslint-config

* fix: eslint error

* add project name

* fix(web): asset upload button is activated before all uploading process is completed (#1217)

fix: asset uploading bug

* chore(web): upgrade yarn dependencies (#1216)

* upgrade patch versions

* upgrade minor versions

* upgrade major versions

* generate gql and i18n

* fix(web): publish status is not updated when creating a new request (#1221)

fix: adding GetItem to refetchQueries

* fix(web): disable closing modal when uploading asset (#1222)

fix: disable closing when uploading

* fix(web): using OpenLayers for geometry field (#1220)

* update: using OpenLayers

* fix: remove unnecessary props

* remove @reearth/core

* set max_old_space_size

* increase max_old_space_siz

* remove wrong line breaks

* fix: map initilizing bug

* Update web/src/components/molecules/Common/Form/GeometryItem/index.tsx

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

* chore(web): optimize vite config

* fix(server): asset children are not returned in integration api (#1226)

* fix

* fix

---------

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* fix(web): camera and validation message on geometry field (#1227)

* fix: set default value on geometry editor

* fix: zoom after searching

* fix: error message on geometry object

* fix(server): geojson validation bug (#1228)

fix: multiple geo bug

* fix(server): multiple default value bug (#1229)

* fix: multiple default value bug

* doc: fix api doc (#1232)

fix api doc

* feat(web): add item link to the request (#1230)

* add: item link on request

* add e2e test

* feat(server): geoJson/json import via integration api (#1231)

* imp

* imp

* wip: add e2e tests to geojson import

* refactor e2e

* fix geoJson handling

* fix

* fix lint

* add i18n

---------

Co-authored-by: nourbalaha <nourbalaha0@gmail.com>
Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* fix(web): title of my integration and request page (#1234)

* fix: background color

* fix: page title

* fix(server): set file size for zip asset's children files (#1237)

fix

* chore(web): show tooltip when pressing copy button (#1233)

chore: show tooltip when pressing copy button

* fix(web): screen flickers on member page (#1239)

fix: screen flickers

* fix(web): disable the buttons to change the state of an item based on the item's status (#1240)

fix: disable publish buttons

* fix(server): multiple bugs while importing json/geoJson (#1241)

fix

Co-authored-by: mimoham24 <69579255+mimoham24@users.noreply.github.com>

* feat(server): enhance request filter to search by id (#1243)

imp

* feat(server): add requests resolver in item query (#1235)

imp

* feat(server): search request by item id (#1246)

fix

* feat(web): leave workspace (#1244)

* impl

* add modal to confirm leaving

* fix(web): reference field updating bug (#1236)

* fix: ref field bug

* feat: toggle confirm button

* improve test

* chore: update go dependencies (#1142)

* chore: update go dependencies

* update go.work

* fix

* fix

* fix

* fix

* ignore linter

* ignore linter

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>

* fix(server): accept all geo types when creating geometryObject field from integration api by default (#1247)

fix

* ci: update github actions dependencies (#1115)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>

* feat(server): find by assets memory infrastructure (#649)

* find by assets memory implementation and test case

* fix

---------

Co-authored-by: rot1024 <aayhrot@gmail.com>
Co-authored-by: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>

* add api key

* fix

* fix

* fix

* fix

* fix

* implement token as standalone pkg

* apply code suggestion

* fix NewPublication

* update TestToken_Value

* add error handling to generate

* remove token pkg and use lo.RandomString instead

* fix ci

* wip: e2e tests

* lint + review changes

* e2e

* lint

* gql project test

* e2e

* fix: auth client

* e2e tests

* e2e

* refactor auth client

* requested changes 1

* e2e

* refactor

* requested changes 2

* fix

* fix

* fix: possible nil check

* add a comment

* revert

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>
Co-authored-by: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>
Co-authored-by: rot1024 <aayhrot@gmail.com>
Co-authored-by: Nao Yonashiro <owan.orisano@gmail.com>
Co-authored-by: Kazuma Tsuchiya <caichi0424@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Katsuya Miyachi <kattu0426@gmail.com>
Co-authored-by: KeisukeYamashita <19yamashita15@gmail.com>
Co-authored-by: keiya01 <keiya.s.0210@gmail.com>
---
 server/e2e/gql_porject_test.go                |  64 ++++-
 server/e2e/integration_test.go                |   8 +-
 server/e2e/publicapi_test.go                  | 149 +++++++++--
 server/internal/adapter/gql/generated.go      | 252 ++++++++++++++++--
 .../adapter/gql/gqlmodel/convert_project.go   |   6 +
 .../adapter/gql/gqlmodel/models_gen.go        |   7 +-
 .../adapter/gql/resolver_integration.go       |   4 +-
 .../internal/adapter/gql/resolver_project.go  |  15 ++
 .../internal/adapter/publicapi/controller.go  |  15 +-
 server/internal/app/app.go                    |   2 +-
 server/internal/app/auth_client.go            |  70 +++--
 .../internal/infrastructure/memory/project.go |  16 ++
 .../infrastructure/memory/project_test.go     |  79 ++++++
 .../infrastructure/mongo/mongodoc/project.go  |   4 +-
 .../internal/infrastructure/mongo/project.go  |  12 +-
 .../infrastructure/mongo/project_test.go      |  75 ++++++
 server/internal/usecase/interactor/project.go |  31 +++
 server/internal/usecase/interfaces/project.go |   2 +
 server/internal/usecase/repo/project.go       |   1 +
 server/pkg/integration/integration.go         |  24 +-
 server/pkg/project/publication.go             |  28 ++
 server/pkg/project/publication_test.go        |  33 ++-
 server/schemas/integration.graphql            |   4 +-
 server/schemas/project.graphql                |   6 +
 24 files changed, 782 insertions(+), 125 deletions(-)

diff --git a/server/e2e/gql_porject_test.go b/server/e2e/gql_porject_test.go
index bbf7a63ddb..a5a508301b 100644
--- a/server/e2e/gql_porject_test.go
+++ b/server/e2e/gql_porject_test.go
@@ -88,14 +88,66 @@ func updateProject(e *httpexpect.Expect, pID, name, desc, alias, publicationScop
 	return res.Path("$.data.updateProject.project.id").Raw().(string), res
 }
 
-func TestCreateProject(t *testing.T) {
-	e := StartServer(t, &app.Config{}, true, baseSeederUser)
+func regeneratePublicApiToken(e *httpexpect.Expect, pId string) *httpexpect.Value {
+	requestBody := GraphQLRequest{
+		Query: `mutation RegeneratePublicApiToken($projectId: ID!) {
+							regeneratePublicApiToken(input: { projectId: $projectId }) {
+								project {
+									id
+									publication {
+										scope
+										assetPublic
+										token
+									}
+								}
+							}
+						}`,
+		Variables: map[string]any{
+			"projectId": pId,
+		},
+	}
+
+	res := e.POST("/api/graphql").
+		WithHeader("Origin", "https://example.com").
+		WithHeader("X-Reearth-Debug-User", uId1.String()).
+		WithHeader("Content-Type", "application/json").
+		WithJSON(requestBody).
+		Expect().
+		Status(http.StatusOK).
+		JSON()
+
+	return res
+}
 
-	_, res := createProject(e, wId.String(), "test", "test", "test-1")
+func TestProject(t *testing.T) {
+	e := StartServer(t, &app.Config{}, true, baseSeederUser)
 
-	res.Object().
+	// create project
+	pId, p := createProject(e, wId.String(), "test1", "test1", "test1")
+	pp := p.Object().
 		Value("data").Object().
 		Value("createProject").Object().
-		Value("project").Object().
-		HasValue("name", "test")
+		Value("project").Object()
+	pp.HasValue("name", "test1")
+	pp.HasValue("description", "test1")
+	pp.HasValue("alias", "test1")
+
+	// update project
+	_, res := updateProject(e, pId, "test2", "test2", "test2", "LIMITED", true)
+	pp = res.Object().
+		Value("data").Object().
+		Value("updateProject").Object().
+		Value("project").Object()
+	pp.HasValue("name", "test2")
+	pp.HasValue("description", "test2")
+	pp.HasValue("alias", "test2")
+	pp.Value("publication").Object().HasValue("scope", "LIMITED")
+	pp.Value("publication").Object().HasValue("assetPublic", true)
+
+	// regenerate public api token
+	res1 := regeneratePublicApiToken(e, pId)
+	token := res1.Path("$.data.regeneratePublicApiToken.project.publication.token")
+	res2 := regeneratePublicApiToken(e, pId)
+	newToken := res2.Path("$.data.regeneratePublicApiToken.project.publication.token")
+	token.NotEqual(newToken)
 }
diff --git a/server/e2e/integration_test.go b/server/e2e/integration_test.go
index f19d429fad..9e0658ecb8 100644
--- a/server/e2e/integration_test.go
+++ b/server/e2e/integration_test.go
@@ -56,8 +56,8 @@ func createIntegration(e *httpexpect.Expect, name, desc, logoUrl, iType string)
 func regenerateToken(e *httpexpect.Expect, iId string) (string, *httpexpect.Value) {
 	requestBody := GraphQLRequest{
 		Query: `
-		mutation regenerateToken($integrationId: ID!) {
-			regenerateToken(input: { integrationId: $integrationId }) {
+		mutation regenerateIntegrationToken($integrationId: ID!) {
+			regenerateIntegrationToken(input: { integrationId: $integrationId }) {
 			  integration {
 				id
 				name
@@ -85,7 +85,7 @@ func regenerateToken(e *httpexpect.Expect, iId string) (string, *httpexpect.Valu
 		Status(http.StatusOK).
 		JSON()
 
-	return res.Path("$.data.regenerateToken.integration.config.token").Raw().(string), res
+	return res.Path("$.data.regenerateIntegrationToken.integration.config.token").Raw().(string), res
 }
 
 func TestRegenerateToken(t *testing.T) {
@@ -102,7 +102,7 @@ func TestRegenerateToken(t *testing.T) {
 	_, updatedIntegration := regenerateToken(e, iId)
 	newToken := updatedIntegration.Object().
 		Value("data").Object().
-		Value("regenerateToken").Object().
+		Value("regenerateIntegrationToken").Object().
 		Value("integration").Object().
 		Value("config").Object().
 		Value("token")
diff --git a/server/e2e/publicapi_test.go b/server/e2e/publicapi_test.go
index 6506b1da19..bca973a4a6 100644
--- a/server/e2e/publicapi_test.go
+++ b/server/e2e/publicapi_test.go
@@ -22,27 +22,31 @@ import (
 )
 
 var (
-	publicAPIProjectID    = id.NewProjectID()
-	publicAPIModelID      = id.NewModelID()
-	publicAPIItem1ID      = id.NewItemID()
-	publicAPIItem2ID      = id.NewItemID()
-	publicAPIItem3ID      = id.NewItemID()
-	publicAPIItem4ID      = id.NewItemID()
-	publicAPIItem6ID      = id.NewItemID()
-	publicAPIItem7ID      = id.NewItemID()
-	publicAPIAsset1ID     = id.NewAssetID()
-	publicAPIAsset2ID     = id.NewAssetID()
-	publicAPIAssetUUID    = uuid.NewString()
-	publicAPIProjectAlias = "test-project"
-	publicAPIModelKey     = "test-model"
-	publicAPIModelKey2    = "test-model-2"
-	publicAPIModelKey3    = "test-model-3"
-	publicAPIField1Key    = "test-field-1"
-	publicAPIField2Key    = "asset"
-	publicAPIField3Key    = "test-field-2"
-	publicAPIField4Key    = "asset2"
-	publicAPIField5Key    = "geometry-object"
-	publicAPIField6Key    = "geometry-editor"
+	publicAPIProjectID     = id.NewProjectID()
+	publicAPIProjectID2    = id.NewProjectID()
+	publicAPIModelID       = id.NewModelID()
+	publicAPIModelID2      = id.NewModelID()
+	publicAPIItem1ID       = id.NewItemID()
+	publicAPIItem2ID       = id.NewItemID()
+	publicAPIItem3ID       = id.NewItemID()
+	publicAPIItem4ID       = id.NewItemID()
+	publicAPIItem6ID       = id.NewItemID()
+	publicAPIItem7ID       = id.NewItemID()
+	publicAPIAsset1ID      = id.NewAssetID()
+	publicAPIAsset2ID      = id.NewAssetID()
+	publicAPIAssetUUID     = uuid.NewString()
+	publicAPIProjectAlias  = "test-project"
+	publicAPIProjectAlias2 = "test-project-2"
+	publicAPIModelKey      = "test-model"
+	publicAPIModelKey2     = "test-model-2"
+	publicAPIModelKey3     = "test-model-3"
+	publicAPIModelKey4     = "test-model-4"
+	publicAPIField1Key     = "test-field-1"
+	publicAPIField2Key     = "asset"
+	publicAPIField3Key     = "test-field-2"
+	publicAPIField4Key     = "asset2"
+	publicAPIField5Key     = "geometry-object"
+	publicAPIField6Key     = "geometry-editor"
 )
 
 func TestPublicAPI(t *testing.T) {
@@ -213,7 +217,7 @@ func TestPublicAPI(t *testing.T) {
 			"offset":  0,
 			"page":    1,
 			"results": []map[string]any{
-				map[string]any{
+				{
 					"id":          publicAPIAsset1ID.String(),
 					"type":        "asset",
 					"url":         fmt.Sprintf("https://example.com/assets/%s/%s/aaa.zip", publicAPIAssetUUID[:2], publicAPIAssetUUID[2:]),
@@ -370,13 +374,109 @@ func TestPublicAPI(t *testing.T) {
 		IsEqual(map[string]any{
 			"error": "not found",
 		})
+
+	// make the project limited
+	prj.Publication().SetScope(project.PublicationScopeLimited)
+	prj.Publication().SetAssetPublic(true)
+	prj.Publication().GenerateToken()
+	token := prj.Publication().Token()
+	lo.Must0(repos.Project.Save(ctx, prj))
+
+	// invalid token
+	e.GET("/api/p/{project}/{model}", publicAPIProjectAlias, publicAPIModelKey).
+		WithHeader("Origin", "https://example.com").
+		WithHeader("Authorization", "secret_abc").
+		WithHeader("Content-Type", "application/json").
+		Expect().
+		Status(http.StatusUnauthorized).
+		JSON().
+		IsEqual(map[string]interface{}{
+			"error": "invalid token",
+		})
+
+	// valid token
+	e.GET("/api/p/{project}/{model}", publicAPIProjectAlias, publicAPIModelKey).
+		WithHeader("Origin", "https://example.com").
+		WithHeader("Authorization", token).
+		WithHeader("Content-Type", "application/json").
+		Expect().
+		Status(http.StatusOK).
+		JSON().
+		IsEqual(map[string]any{
+			"results": []map[string]any{
+				{
+					"id":               publicAPIItem1ID.String(),
+					publicAPIField1Key: "aaa",
+					publicAPIField2Key: map[string]any{
+						"type": "asset",
+						"id":   publicAPIAsset1ID.String(),
+						"url":  fmt.Sprintf("https://example.com/assets/%s/%s/aaa.zip", publicAPIAssetUUID[:2], publicAPIAssetUUID[2:]),
+					},
+				},
+				{
+					"id":               publicAPIItem2ID.String(),
+					publicAPIField1Key: "bbb",
+				},
+				{
+					"id":               publicAPIItem3ID.String(),
+					publicAPIField1Key: "ccc",
+					publicAPIField3Key: []string{"aaa", "bbb", "ccc"},
+					publicAPIField4Key: []any{
+						map[string]any{
+							"type": "asset",
+							"id":   publicAPIAsset1ID.String(),
+							"url":  fmt.Sprintf("https://example.com/assets/%s/%s/aaa.zip", publicAPIAssetUUID[:2], publicAPIAssetUUID[2:]),
+						},
+					},
+				},
+				{
+					"id":               publicAPIItem6ID.String(),
+					publicAPIField1Key: "ccc",
+					publicAPIField3Key: []string{"aaa", "bbb", "ccc"},
+					publicAPIField4Key: []any{
+						map[string]any{
+							"type": "asset",
+							"id":   publicAPIAsset1ID.String(),
+							"url":  fmt.Sprintf("https://example.com/assets/%s/%s/aaa.zip", publicAPIAssetUUID[:2], publicAPIAssetUUID[2:]),
+						},
+					},
+					publicAPIField5Key: "{\n\"type\": \"Point\",\n\t\"coordinates\": [102.0, 0.5]\n}",
+					publicAPIField6Key: "{\"coordinates\":[[139.65439725962517,36.34793305387103],[139.61688622815393,35.910803456352724]],\"type\":\"LineString\"}",
+				},
+				{
+					"id":               publicAPIItem7ID.String(),
+					publicAPIField1Key: "ccc",
+				},
+			},
+			"totalCount": 5,
+			"hasMore":    false,
+			"limit":      50,
+			"offset":     0,
+			"page":       1,
+		})
+
+	// different project in the same workspace with the same token
+	e.GET("/api/p/{project}/{model}", publicAPIProjectAlias2, publicAPIModelKey2).
+		WithHeader("Origin", "https://example.com").
+		WithHeader("Authorization", token).
+		WithHeader("Content-Type", "application/json").
+		Expect().
+		Status(http.StatusBadRequest).
+		JSON().
+		IsEqual(map[string]any{
+			"error": "invalid project",
+		})
 }
 
 func publicAPISeeder(ctx context.Context, r *repo.Container) error {
 	uid := accountdomain.NewUserID()
-	p1 := project.New().ID(publicAPIProjectID).Workspace(accountdomain.NewWorkspaceID()).Alias(publicAPIProjectAlias).Publication(
+	wid := accountdomain.NewWorkspaceID()
+	p1 := project.New().ID(publicAPIProjectID).Workspace(wid).Alias(publicAPIProjectAlias).Publication(
 		project.NewPublication(project.PublicationScopePublic, true),
 	).MustBuild()
+	p2 := project.New().ID(publicAPIProjectID2).Workspace(wid).Alias(publicAPIProjectAlias2).Publication(
+		project.NewPublicationWithToken(project.PublicationScopeLimited, true, "secret_abcdefghijklmnopqrstuvwxyz"),
+	).MustBuild()
 
 	a := asset.New().ID(publicAPIAsset1ID).Project(p1.ID()).CreatedByUser(uid).Size(1).Thread(id.NewThreadID()).
 		FileName("aaa.zip").UUID(publicAPIAssetUUID).MustBuild()
@@ -403,6 +503,7 @@ func publicAPISeeder(ctx context.Context, r *repo.Container) error {
 	// m2 is not a public model
 	m2 := model.New().ID(publicAPIModelID).Project(p1.ID()).Schema(s.ID()).Name(publicAPIModelKey2).Key(id.NewKey(publicAPIModelKey2)).Public(false).MustBuild()
 	m3 := model.New().ID(publicAPIModelID).Project(p1.ID()).Schema(s2.ID()).Name(publicAPIModelKey3).Key(id.NewKey(publicAPIModelKey3)).Public(true).MustBuild()
+	m4 := model.New().ID(publicAPIModelID2).Project(p2.ID()).Schema(id.NewSchemaID()).Key(id.NewKey(publicAPIModelKey4)).Public(true).MustBuild()
 
 	i1 := item.New().ID(publicAPIItem1ID).Model(m.ID()).Schema(s.ID()).Project(p1.ID()).Thread(id.NewThreadID()).User(uid).Fields([]*item.Field{
 		item.NewField(s.Fields()[0].ID(), value.TypeText.Value("aaa").AsMultiple(), nil),
@@ -444,10 +545,12 @@ func publicAPISeeder(ctx context.Context, r *repo.Container) error {
 	}).MustBuild()
 
 	lo.Must0(r.Project.Save(ctx, p1))
+	lo.Must0(r.Project.Save(ctx, p2))
 	lo.Must0(r.Asset.Save(ctx, a))
 	lo.Must0(r.AssetFile.Save(ctx, a.ID(), af))
 	lo.Must0(r.Schema.Save(ctx, s))
 	lo.Must0(r.Model.Save(ctx, m))
+	lo.Must0(r.Model.Save(ctx, m4))
 	lo.Must0(r.Item.Save(ctx, i1))
 	lo.Must0(r.Item.Save(ctx, i2))
 	lo.Must0(r.Item.Save(ctx, i3))
diff --git a/server/internal/adapter/gql/generated.go b/server/internal/adapter/gql/generated.go
index 3bb07ad41f..6284f6f87d 100644
--- a/server/internal/adapter/gql/generated.go
+++ b/server/internal/adapter/gql/generated.go
@@ -445,7 +445,8 @@ type ComplexityRoot struct {
 		DeleteWorkspace                    func(childComplexity int, input gqlmodel.DeleteWorkspaceInput) int
 		PublishItem                        func(childComplexity int, input gqlmodel.PublishItemInput) int
 		PublishModel                       func(childComplexity int, input gqlmodel.PublishModelInput) int
-		RegenerateToken                    func(childComplexity int, input gqlmodel.RegenerateTokenInput) int
+		RegenerateIntegrationToken         func(childComplexity int, input gqlmodel.RegenerateIntegrationTokenInput) int
+		RegeneratePublicAPIToken           func(childComplexity int, input gqlmodel.RegeneratePublicAPITokenInput) int
 		RemoveIntegrationFromWorkspace     func(childComplexity int, input gqlmodel.RemoveIntegrationFromWorkspaceInput) int
 		RemoveMultipleMembersFromWorkspace func(childComplexity int, input gqlmodel.RemoveMultipleMembersFromWorkspaceInput) int
 		RemoveMyAuth                       func(childComplexity int, input gqlmodel.RemoveMyAuthInput) int
@@ -531,6 +532,7 @@ type ComplexityRoot struct {
 	ProjectPublication struct {
 		AssetPublic func(childComplexity int) int
 		Scope       func(childComplexity int) int
+		Token       func(childComplexity int) int
 	}
 
 	PublishItemPayload struct {
@@ -958,7 +960,7 @@ type MutationResolver interface {
 	CreateIntegration(ctx context.Context, input gqlmodel.CreateIntegrationInput) (*gqlmodel.IntegrationPayload, error)
 	UpdateIntegration(ctx context.Context, input gqlmodel.UpdateIntegrationInput) (*gqlmodel.IntegrationPayload, error)
 	DeleteIntegration(ctx context.Context, input gqlmodel.DeleteIntegrationInput) (*gqlmodel.DeleteIntegrationPayload, error)
-	RegenerateToken(ctx context.Context, input gqlmodel.RegenerateTokenInput) (*gqlmodel.IntegrationPayload, error)
+	RegenerateIntegrationToken(ctx context.Context, input gqlmodel.RegenerateIntegrationTokenInput) (*gqlmodel.IntegrationPayload, error)
 	CreateWebhook(ctx context.Context, input gqlmodel.CreateWebhookInput) (*gqlmodel.WebhookPayload, error)
 	UpdateWebhook(ctx context.Context, input gqlmodel.UpdateWebhookInput) (*gqlmodel.WebhookPayload, error)
 	DeleteWebhook(ctx context.Context, input gqlmodel.DeleteWebhookInput) (*gqlmodel.DeleteWebhookPayload, error)
@@ -979,6 +981,7 @@ type MutationResolver interface {
 	CreateProject(ctx context.Context, input gqlmodel.CreateProjectInput) (*gqlmodel.ProjectPayload, error)
 	UpdateProject(ctx context.Context, input gqlmodel.UpdateProjectInput) (*gqlmodel.ProjectPayload, error)
 	DeleteProject(ctx context.Context, input gqlmodel.DeleteProjectInput) (*gqlmodel.DeleteProjectPayload, error)
+	RegeneratePublicAPIToken(ctx context.Context, input gqlmodel.RegeneratePublicAPITokenInput) (*gqlmodel.ProjectPayload, error)
 	CreateRequest(ctx context.Context, input gqlmodel.CreateRequestInput) (*gqlmodel.RequestPayload, error)
 	UpdateRequest(ctx context.Context, input gqlmodel.UpdateRequestInput) (*gqlmodel.RequestPayload, error)
 	ApproveRequest(ctx context.Context, input gqlmodel.ApproveRequestInput) (*gqlmodel.RequestPayload, error)
@@ -2767,17 +2770,29 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Mutation.PublishModel(childComplexity, args["input"].(gqlmodel.PublishModelInput)), true
 
-	case "Mutation.regenerateToken":
-		if e.complexity.Mutation.RegenerateToken == nil {
+	case "Mutation.regenerateIntegrationToken":
+		if e.complexity.Mutation.RegenerateIntegrationToken == nil {
 			break
 		}
 
-		args, err := ec.field_Mutation_regenerateToken_args(context.TODO(), rawArgs)
+		args, err := ec.field_Mutation_regenerateIntegrationToken_args(context.TODO(), rawArgs)
 		if err != nil {
 			return 0, false
 		}
 
-		return e.complexity.Mutation.RegenerateToken(childComplexity, args["input"].(gqlmodel.RegenerateTokenInput)), true
+		return e.complexity.Mutation.RegenerateIntegrationToken(childComplexity, args["input"].(gqlmodel.RegenerateIntegrationTokenInput)), true
+
+	case "Mutation.regeneratePublicApiToken":
+		if e.complexity.Mutation.RegeneratePublicAPIToken == nil {
+			break
+		}
+
+		args, err := ec.field_Mutation_regeneratePublicApiToken_args(context.TODO(), rawArgs)
+		if err != nil {
+			return 0, false
+		}
+
+		return e.complexity.Mutation.RegeneratePublicAPIToken(childComplexity, args["input"].(gqlmodel.RegeneratePublicAPITokenInput)), true
 
 	case "Mutation.removeIntegrationFromWorkspace":
 		if e.complexity.Mutation.RemoveIntegrationFromWorkspace == nil {
@@ -3284,6 +3299,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.ProjectPublication.Scope(childComplexity), true
 
+	case "ProjectPublication.token":
+		if e.complexity.ProjectPublication.Token == nil {
+			break
+		}
+
+		return e.complexity.ProjectPublication.Token(childComplexity), true
+
 	case "PublishItemPayload.items":
 		if e.complexity.PublishItemPayload.Items == nil {
 			break
@@ -4780,7 +4802,8 @@ func (e *executableSchema) Exec(ctx context.Context) graphql.ResponseHandler {
 		ec.unmarshalInputPagination,
 		ec.unmarshalInputPublishItemInput,
 		ec.unmarshalInputPublishModelInput,
-		ec.unmarshalInputRegenerateTokenInput,
+		ec.unmarshalInputRegenerateIntegrationTokenInput,
+		ec.unmarshalInputRegeneratePublicApiTokenInput,
 		ec.unmarshalInputRemoveIntegrationFromWorkspaceInput,
 		ec.unmarshalInputRemoveMultipleMembersFromWorkspaceInput,
 		ec.unmarshalInputRemoveMyAuthInput,
@@ -5655,7 +5678,7 @@ input DeleteIntegrationInput {
   integrationId: ID!
 }
 
-input RegenerateTokenInput {
+input RegenerateIntegrationTokenInput {
   integrationId: ID!
 }
 
@@ -5674,7 +5697,7 @@ extend type Mutation {
   createIntegration(input: CreateIntegrationInput!): IntegrationPayload
   updateIntegration(input: UpdateIntegrationInput!): IntegrationPayload
   deleteIntegration(input: DeleteIntegrationInput!): DeleteIntegrationPayload
-  regenerateToken(input: RegenerateTokenInput!): IntegrationPayload
+  regenerateIntegrationToken(input: RegenerateIntegrationTokenInput!): IntegrationPayload
 }
 `, BuiltIn: false},
 	{Name: "../../../schemas/integration_webhook.graphql", Input: `type WebhookTrigger {
@@ -6318,6 +6341,7 @@ enum ProjectPublicationScope {
 type ProjectPublication {
   scope: ProjectPublicationScope!
   assetPublic: Boolean!
+  token: String
 }
 
 type Project implements Node {
@@ -6360,6 +6384,10 @@ input DeleteProjectInput {
   projectId: ID!
 }
 
+input RegeneratePublicApiTokenInput {
+  projectId: ID!
+}
+
 # Payload
 type ProjectPayload {
   project: Project!
@@ -6390,6 +6418,7 @@ extend type Mutation {
   createProject(input: CreateProjectInput!): ProjectPayload
   updateProject(input: UpdateProjectInput!): ProjectPayload
   deleteProject(input: DeleteProjectInput!): DeleteProjectPayload
+  regeneratePublicApiToken(input: RegeneratePublicApiTokenInput!): ProjectPayload
 }
 `, BuiltIn: false},
 	{Name: "../../../schemas/request.graphql", Input: `type Request implements Node {
@@ -7931,35 +7960,67 @@ func (ec *executionContext) field_Mutation_publishModel_argsInput(
 	return zeroVal, nil
 }
 
-func (ec *executionContext) field_Mutation_regenerateToken_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
+func (ec *executionContext) field_Mutation_regenerateIntegrationToken_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
+	var err error
+	args := map[string]interface{}{}
+	arg0, err := ec.field_Mutation_regenerateIntegrationToken_argsInput(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["input"] = arg0
+	return args, nil
+}
+func (ec *executionContext) field_Mutation_regenerateIntegrationToken_argsInput(
+	ctx context.Context,
+	rawArgs map[string]interface{},
+) (gqlmodel.RegenerateIntegrationTokenInput, error) {
+	// We won't call the directive if the argument is null.
+	// Set call_argument_directives_with_null to true to call directives
+	// even if the argument is null.
+	_, ok := rawArgs["input"]
+	if !ok {
+		var zeroVal gqlmodel.RegenerateIntegrationTokenInput
+		return zeroVal, nil
+	}
+
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("input"))
+	if tmp, ok := rawArgs["input"]; ok {
+		return ec.unmarshalNRegenerateIntegrationTokenInput2githubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐRegenerateIntegrationTokenInput(ctx, tmp)
+	}
+
+	var zeroVal gqlmodel.RegenerateIntegrationTokenInput
+	return zeroVal, nil
+}
+
+func (ec *executionContext) field_Mutation_regeneratePublicApiToken_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) {
 	var err error
 	args := map[string]interface{}{}
-	arg0, err := ec.field_Mutation_regenerateToken_argsInput(ctx, rawArgs)
+	arg0, err := ec.field_Mutation_regeneratePublicApiToken_argsInput(ctx, rawArgs)
 	if err != nil {
 		return nil, err
 	}
 	args["input"] = arg0
 	return args, nil
 }
-func (ec *executionContext) field_Mutation_regenerateToken_argsInput(
+func (ec *executionContext) field_Mutation_regeneratePublicApiToken_argsInput(
 	ctx context.Context,
 	rawArgs map[string]interface{},
-) (gqlmodel.RegenerateTokenInput, error) {
+) (gqlmodel.RegeneratePublicAPITokenInput, error) {
 	// We won't call the directive if the argument is null.
 	// Set call_argument_directives_with_null to true to call directives
 	// even if the argument is null.
 	_, ok := rawArgs["input"]
 	if !ok {
-		var zeroVal gqlmodel.RegenerateTokenInput
+		var zeroVal gqlmodel.RegeneratePublicAPITokenInput
 		return zeroVal, nil
 	}
 
 	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("input"))
 	if tmp, ok := rawArgs["input"]; ok {
-		return ec.unmarshalNRegenerateTokenInput2githubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐRegenerateTokenInput(ctx, tmp)
+		return ec.unmarshalNRegeneratePublicApiTokenInput2githubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐRegeneratePublicAPITokenInput(ctx, tmp)
 	}
 
-	var zeroVal gqlmodel.RegenerateTokenInput
+	var zeroVal gqlmodel.RegeneratePublicAPITokenInput
 	return zeroVal, nil
 }
 
@@ -20060,8 +20121,8 @@ func (ec *executionContext) fieldContext_Mutation_deleteIntegration(ctx context.
 	return fc, nil
 }
 
-func (ec *executionContext) _Mutation_regenerateToken(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Mutation_regenerateToken(ctx, field)
+func (ec *executionContext) _Mutation_regenerateIntegrationToken(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_Mutation_regenerateIntegrationToken(ctx, field)
 	if err != nil {
 		return graphql.Null
 	}
@@ -20074,7 +20135,7 @@ func (ec *executionContext) _Mutation_regenerateToken(ctx context.Context, field
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Mutation().RegenerateToken(rctx, fc.Args["input"].(gqlmodel.RegenerateTokenInput))
+		return ec.resolvers.Mutation().RegenerateIntegrationToken(rctx, fc.Args["input"].(gqlmodel.RegenerateIntegrationTokenInput))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -20088,7 +20149,7 @@ func (ec *executionContext) _Mutation_regenerateToken(ctx context.Context, field
 	return ec.marshalOIntegrationPayload2ᚖgithubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐIntegrationPayload(ctx, field.Selections, res)
 }
 
-func (ec *executionContext) fieldContext_Mutation_regenerateToken(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+func (ec *executionContext) fieldContext_Mutation_regenerateIntegrationToken(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
 	fc = &graphql.FieldContext{
 		Object:     "Mutation",
 		Field:      field,
@@ -20109,7 +20170,7 @@ func (ec *executionContext) fieldContext_Mutation_regenerateToken(ctx context.Co
 		}
 	}()
 	ctx = graphql.WithFieldContext(ctx, fc)
-	if fc.Args, err = ec.field_Mutation_regenerateToken_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
+	if fc.Args, err = ec.field_Mutation_regenerateIntegrationToken_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
 		ec.Error(ctx, err)
 		return fc, err
 	}
@@ -21238,6 +21299,62 @@ func (ec *executionContext) fieldContext_Mutation_deleteProject(ctx context.Cont
 	return fc, nil
 }
 
+func (ec *executionContext) _Mutation_regeneratePublicApiToken(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_Mutation_regeneratePublicApiToken(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
+		ctx = rctx // use context from middleware stack in children
+		return ec.resolvers.Mutation().RegeneratePublicAPIToken(rctx, fc.Args["input"].(gqlmodel.RegeneratePublicAPITokenInput))
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		return graphql.Null
+	}
+	res := resTmp.(*gqlmodel.ProjectPayload)
+	fc.Result = res
+	return ec.marshalOProjectPayload2ᚖgithubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐProjectPayload(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_Mutation_regeneratePublicApiToken(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "Mutation",
+		Field:      field,
+		IsMethod:   true,
+		IsResolver: true,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			switch field.Name {
+			case "project":
+				return ec.fieldContext_ProjectPayload_project(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type ProjectPayload", field.Name)
+		},
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = ec.Recover(ctx, r)
+			ec.Error(ctx, err)
+		}
+	}()
+	ctx = graphql.WithFieldContext(ctx, fc)
+	if fc.Args, err = ec.field_Mutation_regeneratePublicApiToken_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
+		ec.Error(ctx, err)
+		return fc, err
+	}
+	return fc, nil
+}
+
 func (ec *executionContext) _Mutation_createRequest(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_Mutation_createRequest(ctx, field)
 	if err != nil {
@@ -23265,6 +23382,8 @@ func (ec *executionContext) fieldContext_Project_publication(_ context.Context,
 				return ec.fieldContext_ProjectPublication_scope(ctx, field)
 			case "assetPublic":
 				return ec.fieldContext_ProjectPublication_assetPublic(ctx, field)
+			case "token":
+				return ec.fieldContext_ProjectPublication_token(ctx, field)
 			}
 			return nil, fmt.Errorf("no field named %q was found under type ProjectPublication", field.Name)
 		},
@@ -23876,6 +23995,47 @@ func (ec *executionContext) fieldContext_ProjectPublication_assetPublic(_ contex
 	return fc, nil
 }
 
+func (ec *executionContext) _ProjectPublication_token(ctx context.Context, field graphql.CollectedField, obj *gqlmodel.ProjectPublication) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_ProjectPublication_token(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
+		ctx = rctx // use context from middleware stack in children
+		return obj.Token, nil
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		return graphql.Null
+	}
+	res := resTmp.(*string)
+	fc.Result = res
+	return ec.marshalOString2ᚖstring(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_ProjectPublication_token(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "ProjectPublication",
+		Field:      field,
+		IsMethod:   false,
+		IsResolver: false,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			return nil, errors.New("field of type String does not have child fields")
+		},
+	}
+	return fc, nil
+}
+
 func (ec *executionContext) _PublishItemPayload_items(ctx context.Context, field graphql.CollectedField, obj *gqlmodel.PublishItemPayload) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_PublishItemPayload_items(ctx, field)
 	if err != nil {
@@ -37862,8 +38022,8 @@ func (ec *executionContext) unmarshalInputPublishModelInput(ctx context.Context,
 	return it, nil
 }
 
-func (ec *executionContext) unmarshalInputRegenerateTokenInput(ctx context.Context, obj interface{}) (gqlmodel.RegenerateTokenInput, error) {
-	var it gqlmodel.RegenerateTokenInput
+func (ec *executionContext) unmarshalInputRegenerateIntegrationTokenInput(ctx context.Context, obj interface{}) (gqlmodel.RegenerateIntegrationTokenInput, error) {
+	var it gqlmodel.RegenerateIntegrationTokenInput
 	asMap := map[string]interface{}{}
 	for k, v := range obj.(map[string]interface{}) {
 		asMap[k] = v
@@ -37889,6 +38049,33 @@ func (ec *executionContext) unmarshalInputRegenerateTokenInput(ctx context.Conte
 	return it, nil
 }
 
+func (ec *executionContext) unmarshalInputRegeneratePublicApiTokenInput(ctx context.Context, obj interface{}) (gqlmodel.RegeneratePublicAPITokenInput, error) {
+	var it gqlmodel.RegeneratePublicAPITokenInput
+	asMap := map[string]interface{}{}
+	for k, v := range obj.(map[string]interface{}) {
+		asMap[k] = v
+	}
+
+	fieldsInOrder := [...]string{"projectId"}
+	for _, k := range fieldsInOrder {
+		v, ok := asMap[k]
+		if !ok {
+			continue
+		}
+		switch k {
+		case "projectId":
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("projectId"))
+			data, err := ec.unmarshalNID2githubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐID(ctx, v)
+			if err != nil {
+				return it, err
+			}
+			it.ProjectID = data
+		}
+	}
+
+	return it, nil
+}
+
 func (ec *executionContext) unmarshalInputRemoveIntegrationFromWorkspaceInput(ctx context.Context, obj interface{}) (gqlmodel.RemoveIntegrationFromWorkspaceInput, error) {
 	var it gqlmodel.RemoveIntegrationFromWorkspaceInput
 	asMap := map[string]interface{}{}
@@ -44536,9 +44723,9 @@ func (ec *executionContext) _Mutation(ctx context.Context, sel ast.SelectionSet)
 			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
 				return ec._Mutation_deleteIntegration(ctx, field)
 			})
-		case "regenerateToken":
+		case "regenerateIntegrationToken":
 			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
-				return ec._Mutation_regenerateToken(ctx, field)
+				return ec._Mutation_regenerateIntegrationToken(ctx, field)
 			})
 		case "createWebhook":
 			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
@@ -44620,6 +44807,10 @@ func (ec *executionContext) _Mutation(ctx context.Context, sel ast.SelectionSet)
 			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
 				return ec._Mutation_deleteProject(ctx, field)
 			})
+		case "regeneratePublicApiToken":
+			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
+				return ec._Mutation_regeneratePublicApiToken(ctx, field)
+			})
 		case "createRequest":
 			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
 				return ec._Mutation_createRequest(ctx, field)
@@ -45212,6 +45403,8 @@ func (ec *executionContext) _ProjectPublication(ctx context.Context, sel ast.Sel
 			if out.Values[i] == graphql.Null {
 				out.Invalids++
 			}
+		case "token":
+			out.Values[i] = ec._ProjectPublication_token(ctx, field, obj)
 		default:
 			panic("unknown field " + strconv.Quote(field.Name))
 		}
@@ -50724,8 +50917,13 @@ func (ec *executionContext) unmarshalNPublishModelInput2githubᚗcomᚋreearth
 	return res, graphql.ErrorOnPath(ctx, err)
 }
 
-func (ec *executionContext) unmarshalNRegenerateTokenInput2githubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐRegenerateTokenInput(ctx context.Context, v interface{}) (gqlmodel.RegenerateTokenInput, error) {
-	res, err := ec.unmarshalInputRegenerateTokenInput(ctx, v)
+func (ec *executionContext) unmarshalNRegenerateIntegrationTokenInput2githubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐRegenerateIntegrationTokenInput(ctx context.Context, v interface{}) (gqlmodel.RegenerateIntegrationTokenInput, error) {
+	res, err := ec.unmarshalInputRegenerateIntegrationTokenInput(ctx, v)
+	return res, graphql.ErrorOnPath(ctx, err)
+}
+
+func (ec *executionContext) unmarshalNRegeneratePublicApiTokenInput2githubᚗcomᚋreearthᚋreearthᚑcmsᚋserverᚋinternalᚋadapterᚋgqlᚋgqlmodelᚐRegeneratePublicAPITokenInput(ctx context.Context, v interface{}) (gqlmodel.RegeneratePublicAPITokenInput, error) {
+	res, err := ec.unmarshalInputRegeneratePublicApiTokenInput(ctx, v)
 	return res, graphql.ErrorOnPath(ctx, err)
 }
 
diff --git a/server/internal/adapter/gql/gqlmodel/convert_project.go b/server/internal/adapter/gql/gqlmodel/convert_project.go
index 7145ad31be..066fd436ca 100644
--- a/server/internal/adapter/gql/gqlmodel/convert_project.go
+++ b/server/internal/adapter/gql/gqlmodel/convert_project.go
@@ -29,9 +29,15 @@ func ToProjectPublication(p *project.Publication) *ProjectPublication {
 		return nil
 	}
 
+	token := lo.ToPtr(p.Token())
+	if p.Scope() != project.PublicationScopeLimited {
+		token = nil
+	}
+
 	return &ProjectPublication{
 		Scope:       ToProjectPublicationScope(p.Scope()),
 		AssetPublic: p.AssetPublic(),
+		Token:       token,
 	}
 }
 
diff --git a/server/internal/adapter/gql/gqlmodel/models_gen.go b/server/internal/adapter/gql/gqlmodel/models_gen.go
index dae2e37e5f..cebafb0a12 100644
--- a/server/internal/adapter/gql/gqlmodel/models_gen.go
+++ b/server/internal/adapter/gql/gqlmodel/models_gen.go
@@ -784,6 +784,7 @@ type ProjectPayload struct {
 type ProjectPublication struct {
 	Scope       ProjectPublicationScope `json:"scope"`
 	AssetPublic bool                    `json:"assetPublic"`
+	Token       *string                 `json:"token,omitempty"`
 }
 
 type PublishItemInput struct {
@@ -807,10 +808,14 @@ type PublishModelPayload struct {
 type Query struct {
 }
 
-type RegenerateTokenInput struct {
+type RegenerateIntegrationTokenInput struct {
 	IntegrationID ID `json:"integrationId"`
 }
 
+type RegeneratePublicAPITokenInput struct {
+	ProjectID ID `json:"projectId"`
+}
+
 type RemoveIntegrationFromWorkspaceInput struct {
 	WorkspaceID   ID `json:"workspaceId"`
 	IntegrationID ID `json:"integrationId"`
diff --git a/server/internal/adapter/gql/resolver_integration.go b/server/internal/adapter/gql/resolver_integration.go
index 850c079b3a..1ff561d754 100644
--- a/server/internal/adapter/gql/resolver_integration.go
+++ b/server/internal/adapter/gql/resolver_integration.go
@@ -85,8 +85,8 @@ func (r *mutationResolver) DeleteIntegration(ctx context.Context, input gqlmodel
 	}, nil
 }
 
-// RegenerateToken is the resolver for the regenerateToken field.
-func (r *mutationResolver) RegenerateToken(ctx context.Context, input gqlmodel.RegenerateTokenInput) (*gqlmodel.IntegrationPayload, error) {
+// RegenerateIntegrationToken is the resolver for the regenerateToken field.
+func (r *mutationResolver) RegenerateIntegrationToken(ctx context.Context, input gqlmodel.RegenerateIntegrationTokenInput) (*gqlmodel.IntegrationPayload, error) {
 	iId, err := gqlmodel.ToID[id.Integration](input.IntegrationID)
 	if err != nil {
 		return nil, err
diff --git a/server/internal/adapter/gql/resolver_project.go b/server/internal/adapter/gql/resolver_project.go
index 3cb3fa9c1a..a0f8562c61 100644
--- a/server/internal/adapter/gql/resolver_project.go
+++ b/server/internal/adapter/gql/resolver_project.go
@@ -85,6 +85,21 @@ func (r *mutationResolver) DeleteProject(ctx context.Context, input gqlmodel.Del
 	return &gqlmodel.DeleteProjectPayload{ProjectID: input.ProjectID}, nil
 }
 
+// RegeneratePublicAPIToken is the resolver for the regeneratePublicApiToken field.
+func (r *mutationResolver) RegeneratePublicAPIToken(ctx context.Context, input gqlmodel.RegeneratePublicAPITokenInput) (*gqlmodel.ProjectPayload, error) {
+	pid, err := gqlmodel.ToID[id.Project](input.ProjectID)
+	if err != nil {
+		return nil, err
+	}
+
+	p, err := usecases(ctx).Project.RegenerateToken(ctx, pid, getOperator(ctx))
+	if err != nil {
+		return nil, err
+	}
+
+	return &gqlmodel.ProjectPayload{Project: gqlmodel.ToProject(p)}, nil
+}
+
 // Workspace is the resolver for the workspace field.
 func (r *projectResolver) Workspace(ctx context.Context, obj *gqlmodel.Project) (*gqlmodel.Workspace, error) {
 	return dataloaders(ctx).Workspace.Load(obj.WorkspaceID)
diff --git a/server/internal/adapter/publicapi/controller.go b/server/internal/adapter/publicapi/controller.go
index 0bb8d432f7..c64e133b53 100644
--- a/server/internal/adapter/publicapi/controller.go
+++ b/server/internal/adapter/publicapi/controller.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"github.com/reearth/reearth-cms/server/internal/adapter"
 	"github.com/reearth/reearth-cms/server/internal/usecase/interfaces"
 	"github.com/reearth/reearth-cms/server/internal/usecase/repo"
 	"github.com/reearth/reearth-cms/server/pkg/asset"
@@ -37,17 +38,15 @@ func (c *Controller) checkProject(ctx context.Context, prj string) (*project.Pro
 		return nil, ErrInvalidProject
 	}
 
-	if p := pr.Publication(); p == nil || p.Scope() != project.PublicationScopePublic {
+	if p := pr.Publication(); p == nil || p.Scope() == project.PublicationScopePrivate {
 		return nil, rerror.ErrNotFound
 	}
 
-	// TODO: check token if the scope is limited
-	// if pr.Publication().Scope() == project.PublicationScopeLimited {
-	// 	t := pr.Publication().Token()
-	// 	if op := adapter.Operator(ctx); op == nil || t == "" || op.PublicAPIToken != t {
-	// 		return nil, ErrInvalidProject
-	// 	}
-	// }
+	if pr.Publication().Scope() == project.PublicationScopeLimited {
+		if op := adapter.Operator(ctx); op == nil || !op.IsReadableProject(pr.ID()) {
+			return nil, ErrInvalidProject
+		}
+	}
 
 	return pr, nil
 }
diff --git a/server/internal/app/app.go b/server/internal/app/app.go
index 040daae81e..87f33b9e87 100644
--- a/server/internal/app/app.go
+++ b/server/internal/app/app.go
@@ -80,7 +80,7 @@ func initEcho(cfg *ServerConfig) *echo.Echo {
 	)
 	api.POST("/signup", Signup(), usecaseMiddleware)
 
-	publicapi.Echo(api.Group("/p", PublicAPIAuthMiddleware(cfg), usecaseMiddleware))
+	publicapi.Echo(api.Group("/p", publicAPIAuthMiddleware(cfg), usecaseMiddleware))
 	integration.RegisterHandlers(api.Group(
 		"",
 		authMiddleware(cfg),
diff --git a/server/internal/app/auth_client.go b/server/internal/app/auth_client.go
index 1e30c75e7c..53d99675c7 100644
--- a/server/internal/app/auth_client.go
+++ b/server/internal/app/auth_client.go
@@ -11,6 +11,7 @@ import (
 	"github.com/reearth/reearth-cms/server/internal/usecase"
 	"github.com/reearth/reearth-cms/server/pkg/id"
 	"github.com/reearth/reearth-cms/server/pkg/integration"
+	"github.com/reearth/reearth-cms/server/pkg/project"
 	"github.com/reearth/reearthx/account/accountdomain"
 	"github.com/reearth/reearthx/account/accountdomain/user"
 	"github.com/reearth/reearthx/account/accountdomain/workspace"
@@ -89,7 +90,7 @@ func attachUserOperator(ctx context.Context, req *http.Request, cfg *ServerConfi
 
 func attachIntegrationOperator(ctx context.Context, req *http.Request, cfg *ServerConfig) (context.Context, error) {
 	var i *integration.Integration
-	if token := getIntegrationToken(req); token != "" {
+	if token := getToken(req); token != "" {
 		var err error
 		i, err = cfg.Repos.Integration.FindByToken(ctx, token)
 		if err != nil {
@@ -126,37 +127,36 @@ func attachIntegrationOperator(ctx context.Context, req *http.Request, cfg *Serv
 	return ctx, nil
 }
 
-func PublicAPIAuthMiddleware(cfg *ServerConfig) echo.MiddlewareFunc {
+func publicAPIAuthMiddleware(cfg *ServerConfig) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
-			// TODO: support limit publication scope
-
-			// req := c.Request()
-			// ctx := req.Context()
-			// if token := req.Header.Get("Reearth-Token"); token != "" {
-			// 	ws, err := cfg.Repos.Project.FindByPublicAPIToken(ctx, token)
-			// 	if err != nil {
-			// 		if errors.Is(err, rerror.ErrNotFound) {
-			// 			return c.JSON(http.StatusUnauthorized, map[string]string{"error": "invalid token"})
-			// 		}
-			// 		return err
-			// 	}
-
-			// 	if !ws.IsPublic() {
-			// 		return c.JSON(http.StatusUnauthorized, map[string]string{"error": "invalid token"})
-			// 	}
-
-			// 	c.SetRequest(req.WithContext(adapter.AttachOperator(ctx, &usecase.Operator{
-			// 		PublicAPIProject: ws.ID(),
-			// 	})))
-			// }
+			req := c.Request()
+			ctx := req.Context()
+			if token := getToken(req); token != "" {
+				p, err := cfg.Repos.Project.FindByPublicAPIToken(ctx, token)
+				if err != nil {
+					if errors.Is(err, rerror.ErrNotFound) {
+						return c.JSON(http.StatusUnauthorized, map[string]string{"error": "invalid token"})
+					}
+					return err
+				}
+
+				if p.Publication() == nil || p.Publication().Scope() == project.PublicationScopePrivate {
+					return c.JSON(http.StatusUnauthorized, map[string]string{"error": "invalid project"})
+				}
+
+				defaultLang := req.Header.Get("Accept-Language")
+				op := generatePublicApiOperator(p, defaultLang)
+				ctx = adapter.AttachOperator(ctx, op)
+				c.SetRequest(req.WithContext(ctx))
+			}
 
 			return next(c)
 		}
 	}
 }
 
-func getIntegrationToken(req *http.Request) string {
+func getToken(req *http.Request) string {
 	token := strings.TrimPrefix(req.Header.Get("authorization"), "Bearer ")
 	if strings.HasPrefix(token, "secret_") {
 		return token
@@ -293,6 +293,28 @@ func generateIntegrationOperator(ctx context.Context, cfg *ServerConfig, i *inte
 	}, nil
 }
 
+func generatePublicApiOperator(p *project.Project, lang string) *usecase.Operator {
+	if p == nil {
+		return nil
+	}
+
+	return &usecase.Operator{
+		AcOperator: &accountusecase.Operator{
+			User:                   nil,
+			ReadableWorkspaces:     id.WorkspaceIDList{p.Workspace()},
+			WritableWorkspaces:     nil,
+			MaintainableWorkspaces: nil,
+			OwningWorkspaces:       nil,
+		},
+		Integration:          nil,
+		Lang:                 lang,
+		ReadableProjects:     id.ProjectIDList{p.ID()},
+		WritableProjects:     nil,
+		MaintainableProjects: nil,
+		OwningProjects:       nil,
+	}
+}
+
 func AuthRequiredMiddleware() echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
diff --git a/server/internal/infrastructure/memory/project.go b/server/internal/infrastructure/memory/project.go
index bb4f699133..4d92522c40 100644
--- a/server/internal/infrastructure/memory/project.go
+++ b/server/internal/infrastructure/memory/project.go
@@ -129,6 +129,22 @@ func (r *Project) FindByPublicName(_ context.Context, name string) (*project.Pro
 	return nil, rerror.ErrNotFound
 }
 
+
+func (r *Project) FindByPublicAPIToken(ctx context.Context, token string) (*project.Project, error) {
+	if r.err != nil {
+		return nil, r.err
+	}
+
+	p := r.data.Find(func(_ id.ProjectID, v *project.Project) bool {
+		return v.Publication().Token() == token && r.f.CanRead(v.Workspace())
+	})
+
+	if p != nil {
+		return p, nil
+	}
+	return nil, rerror.ErrNotFound
+}
+
 func (r *Project) CountByWorkspace(_ context.Context, workspace accountdomain.WorkspaceID) (c int, err error) {
 	if r.err != nil {
 		return 0, r.err
diff --git a/server/internal/infrastructure/memory/project_test.go b/server/internal/infrastructure/memory/project_test.go
index 448d131035..c99b948a75 100644
--- a/server/internal/infrastructure/memory/project_test.go
+++ b/server/internal/infrastructure/memory/project_test.go
@@ -939,3 +939,82 @@ func TestProjectRepo_Save(t *testing.T) {
 		})
 	}
 }
+
+func TestProject_FindByPublicAPIToken(t *testing.T) {
+	mocknow := time.Now().Truncate(time.Millisecond).UTC()
+	tid1 := accountdomain.NewWorkspaceID()
+	id1 := id.NewProjectID()
+	pub := project.NewPublication(project.PublicationScopeLimited, false)
+	p1 := project.New().
+		ID(id1).
+		Workspace(tid1).
+		UpdatedAt(mocknow).
+		Publication(pub).
+		MustBuild()
+
+	tests := []struct {
+		name    string
+		seeds   project.List
+		arg     string
+		want    *project.Project
+		wantErr error
+		mockErr bool
+	}{
+		{
+			name:    "Not found in empty db",
+			seeds:   project.List{},
+			arg:     "xyz123",
+			want:    nil,
+			wantErr: rerror.ErrNotFound,
+		},
+		{
+			name: "Not found",
+			seeds: project.List{
+				p1,
+			},
+			arg:     "",
+			want:    nil,
+			wantErr: rerror.ErrNotFound,
+		},
+		{
+			name: "Found 1",
+			seeds: project.List{
+				p1,
+			},
+			arg:     pub.Token(),
+			want:    p1,
+			wantErr: nil,
+		},
+		{
+			name:    "must mock error",
+			wantErr: errors.New("test"),
+			mockErr: true,
+		},
+	}
+
+	for _, tc := range tests {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			r := NewProject()
+			if tc.mockErr {
+				SetProjectError(r, tc.wantErr)
+			}
+			defer MockProjectNow(r, mocknow)()
+			ctx := context.Background()
+			for _, p := range tc.seeds {
+				err := r.Save(ctx, p.Clone())
+				assert.NoError(t, err)
+			}
+
+			got, err := r.FindByPublicAPIToken(ctx, tc.arg)
+			if tc.wantErr != nil {
+				assert.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			assert.NoError(t, err)
+			assert.Equal(t, tc.want, got)
+		})
+	}
+}
diff --git a/server/internal/infrastructure/mongo/mongodoc/project.go b/server/internal/infrastructure/mongo/mongodoc/project.go
index 904cb3a270..47d26ac471 100644
--- a/server/internal/infrastructure/mongo/mongodoc/project.go
+++ b/server/internal/infrastructure/mongo/mongodoc/project.go
@@ -26,6 +26,7 @@ type ProjectDocument struct {
 type ProjectPublicationDocument struct {
 	AssetPublic bool
 	Scope       string
+	Token       string
 }
 
 func NewProject(project *project.Project) (*ProjectDocument, string) {
@@ -57,6 +58,7 @@ func NewProjectPublication(p *project.Publication) *ProjectPublicationDocument {
 	return &ProjectPublicationDocument{
 		AssetPublic: p.AssetPublic(),
 		Scope:       string(p.Scope()),
+		Token:       p.Token(),
 	}
 }
 
@@ -94,7 +96,7 @@ func (d *ProjectPublicationDocument) Model() *project.Publication {
 	if d == nil {
 		return nil
 	}
-	return project.NewPublication(project.PublicationScope(d.Scope), d.AssetPublic)
+	return project.NewPublicationWithToken(project.PublicationScope(d.Scope), d.AssetPublic, d.Token)
 }
 
 type ProjectConsumer = mongox.SliceFuncConsumer[*ProjectDocument, *project.Project]
diff --git a/server/internal/infrastructure/mongo/project.go b/server/internal/infrastructure/mongo/project.go
index 54731afbcd..97b8962377 100644
--- a/server/internal/infrastructure/mongo/project.go
+++ b/server/internal/infrastructure/mongo/project.go
@@ -16,7 +16,8 @@ import (
 )
 
 var (
-	projectIndexes       = []string{"workspace"}
+	// TODO: the `publication.token` should be unique, this should be fixed in the future
+	projectIndexes       = []string{"workspace", "publication.token"}
 	projectUniqueIndexes = []string{"id"}
 )
 
@@ -98,6 +99,15 @@ func (r *ProjectRepo) FindByPublicName(ctx context.Context, name string) (*proje
 	})
 }
 
+func (r *ProjectRepo) FindByPublicAPIToken(ctx context.Context, token string) (*project.Project, error) {
+	if token == "" {
+		return nil, rerror.ErrNotFound
+	}
+	return r.findOne(ctx, bson.M{
+		"publication.token": token,
+	})
+}
+
 func (r *ProjectRepo) CountByWorkspace(ctx context.Context, workspace accountdomain.WorkspaceID) (int, error) {
 	count, err := r.client.Count(ctx, bson.M{
 		"workspace": workspace.String(),
diff --git a/server/internal/infrastructure/mongo/project_test.go b/server/internal/infrastructure/mongo/project_test.go
index 1c3dd0914c..71c978b16c 100644
--- a/server/internal/infrastructure/mongo/project_test.go
+++ b/server/internal/infrastructure/mongo/project_test.go
@@ -892,3 +892,78 @@ func Test_projectRepo_Save(t *testing.T) {
 		})
 	}
 }
+
+func TestProjectRepo_FindByPublicAPIToken(t *testing.T) {
+	tid1 := accountdomain.NewWorkspaceID()
+	id1 := id.NewProjectID()
+	now := time.Now().Truncate(time.Millisecond).UTC()
+	pub := project.NewPublication(project.PublicationScopeLimited, false)
+	p1 := project.New().ID(id1).Workspace(tid1).Publication(pub).UpdatedAt(now).MustBuild()
+	tests := []struct {
+		name    string
+		seeds   project.List
+		arg     string
+		want    *project.Project
+		wantErr error
+	}{
+		{
+			name:    "Not found in empty db",
+			seeds:   project.List{},
+			arg:     pub.Token(),
+			want:    nil,
+			wantErr: rerror.ErrNotFound,
+		},
+		{
+			name: "Not found",
+			seeds: project.List{
+				p1,
+			},
+			arg:     "xxx",
+			want:    nil,
+			wantErr: rerror.ErrNotFound,
+		},
+		{
+			name: "Found 1",
+			seeds: project.List{
+				p1,
+			},
+			arg:     pub.Token(),
+			want:    p1,
+			wantErr: nil,
+		},
+		{
+			name: "Project exists but not public",
+			seeds: project.List{
+				project.New().ID(id.NewProjectID()).Workspace(tid1).UpdatedAt(now).MustBuild(),
+			},
+			arg:     "some_token",
+			want:    nil,
+			wantErr: rerror.ErrNotFound,
+		},
+	}
+
+	initDB := mongotest.Connect(t)
+
+	for _, tc := range tests {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			client := mongox.NewClientWithDatabase(initDB(t))
+
+			r := NewProject(client)
+			ctx := context.Background()
+			for _, p := range tc.seeds {
+				err := r.Save(ctx, p)
+				assert.NoError(t, err)
+			}
+
+			got, err := r.FindByPublicAPIToken(ctx, tc.arg)
+			if tc.wantErr != nil {
+				assert.ErrorIs(t, err, tc.wantErr)
+				return
+			}
+			assert.Equal(t, tc.want, got)
+		})
+	}
+}
diff --git a/server/internal/usecase/interactor/project.go b/server/internal/usecase/interactor/project.go
index 348da4902b..8b7fa633f6 100644
--- a/server/internal/usecase/interactor/project.go
+++ b/server/internal/usecase/interactor/project.go
@@ -3,6 +3,7 @@ package interactor
 import (
 	"context"
 	"errors"
+	"time"
 
 	"github.com/reearth/reearth-cms/server/internal/usecase"
 	"github.com/reearth/reearth-cms/server/internal/usecase/gateway"
@@ -164,3 +165,33 @@ func (i *Project) Delete(ctx context.Context, projectID id.ProjectID, operator *
 			return nil
 		})
 }
+
+func (i *Project) RegenerateToken(ctx context.Context, pId id.ProjectID, operator *usecase.Operator) (*project.Project, error) {
+	if operator.AcOperator.User == nil {
+		return nil, interfaces.ErrInvalidOperator
+	}
+	return Run1(ctx, operator, i.repos, Usecase().Transaction(),
+		func(ctx context.Context) (*project.Project, error) {
+			p, err := i.repos.Project.FindByID(ctx, pId)
+			if err != nil {
+				return nil, err
+			}
+
+			// check if the user is the owner of the project
+			if !operator.IsOwningProject(p.ID()) {
+				return nil, interfaces.ErrOperationDenied
+			}
+
+			if p.Publication() == nil || p.Publication().Scope() != project.PublicationScopeLimited  {
+				return nil, interfaces.ErrInvalidProject
+			}
+
+			p.Publication().GenerateToken()
+			p.SetUpdatedAt(time.Now())
+			if err := i.repos.Project.Save(ctx, p); err != nil {
+				return nil, err
+			}
+
+			return p, nil
+		})
+}
diff --git a/server/internal/usecase/interfaces/project.go b/server/internal/usecase/interfaces/project.go
index e992af32ae..b521615e5c 100644
--- a/server/internal/usecase/interfaces/project.go
+++ b/server/internal/usecase/interfaces/project.go
@@ -38,6 +38,7 @@ type UpdateProjectPublicationParam struct {
 var (
 	ErrProjectAliasIsNotSet    error = rerror.NewE(i18n.T("project alias is not set"))
 	ErrProjectAliasAlreadyUsed error = rerror.NewE(i18n.T("project alias is already used by another project"))
+	ErrInvalidProject                = rerror.NewE(i18n.T("invalid project"))
 )
 
 type Project interface {
@@ -48,4 +49,5 @@ type Project interface {
 	Update(context.Context, UpdateProjectParam, *usecase.Operator) (*project.Project, error)
 	CheckAlias(context.Context, string) (bool, error)
 	Delete(context.Context, id.ProjectID, *usecase.Operator) error
+	RegenerateToken(context.Context, id.ProjectID, *usecase.Operator) (*project.Project, error)
 }
diff --git a/server/internal/usecase/repo/project.go b/server/internal/usecase/repo/project.go
index 3cb0133f11..46b4025aec 100644
--- a/server/internal/usecase/repo/project.go
+++ b/server/internal/usecase/repo/project.go
@@ -17,6 +17,7 @@ type Project interface {
 	FindByWorkspaces(context.Context, accountdomain.WorkspaceIDList, *usecasex.Pagination) (project.List, *usecasex.PageInfo, error)
 	FindByPublicName(context.Context, string) (*project.Project, error)
 	CountByWorkspace(context.Context, accountdomain.WorkspaceID) (int, error)
+	FindByPublicAPIToken(context.Context, string) (*project.Project, error)
 	Save(context.Context, *project.Project) error
 	Remove(context.Context, id.ProjectID) error
 }
diff --git a/server/pkg/integration/integration.go b/server/pkg/integration/integration.go
index 5265f67ec1..8c35bc3610 100644
--- a/server/pkg/integration/integration.go
+++ b/server/pkg/integration/integration.go
@@ -1,8 +1,6 @@
 package integration
 
 import (
-	"crypto/rand"
-	"math/big"
 	"net/url"
 	"time"
 
@@ -11,6 +9,8 @@ import (
 	"golang.org/x/exp/slices"
 )
 
+const charSet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
 type Integration struct {
 	id          ID
 	name        string
@@ -68,11 +68,7 @@ func (i *Integration) SetToken(token string) {
 }
 
 func (i *Integration) RandomToken() {
-	t, err := randomString(43)
-	if err != nil {
-		return
-	}
-	i.token = "secret_" + t
+	i.token = "secret_" + lo.RandomString(43, []rune(charSet))
 }
 
 func (i *Integration) Developer() UserID {
@@ -159,17 +155,3 @@ func (i *Integration) Clone() *Integration {
 		updatedAt:   i.updatedAt,
 	}
 }
-
-func randomString(n int) (string, error) {
-	const letters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-	result := make([]byte, n)
-	for i := 0; i < n; i++ {
-		randIndex, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))
-		if err != nil {
-			return "", err
-		}
-		result[i] = letters[randIndex.Int64()]
-	}
-
-	return string(result), nil
-}
diff --git a/server/pkg/project/publication.go b/server/pkg/project/publication.go
index 3ef30a6136..3d5a3e6890 100644
--- a/server/pkg/project/publication.go
+++ b/server/pkg/project/publication.go
@@ -1,16 +1,23 @@
 package project
 
+import (
+	"github.com/samber/lo"
+)
+
 const (
 	PublicationScopePrivate PublicationScope = "private"
 	PublicationScopeLimited PublicationScope = "limited"
 	PublicationScopePublic  PublicationScope = "public"
 )
 
+const charSet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
 type PublicationScope string
 
 type Publication struct {
 	scope       PublicationScope
 	assetPublic bool
+	token       string
 }
 
 func NewPublication(scope PublicationScope, assetPublic bool) *Publication {
@@ -20,6 +27,15 @@ func NewPublication(scope PublicationScope, assetPublic bool) *Publication {
 	return p
 }
 
+func NewPublicationWithToken(scope PublicationScope, assetPublic bool, token string) *Publication {
+	p := &Publication{
+		token: token,
+	}
+	p.SetScope(scope)
+	p.SetAssetPublic(assetPublic)
+	return p
+}
+
 func (p *Publication) Scope() PublicationScope {
 	if p.scope == "" {
 		return PublicationScopePrivate
@@ -31,10 +47,21 @@ func (p *Publication) AssetPublic() bool {
 	return p.assetPublic
 }
 
+func (p *Publication) Token() string {
+	return p.token
+}
+
+func (p *Publication) GenerateToken() {
+	p.token = "secret_" + lo.RandomString(43, []rune(charSet))
+}
+
 func (p *Publication) SetScope(scope PublicationScope) {
 	if scope != PublicationScopePrivate && scope != PublicationScopeLimited && scope != PublicationScopePublic {
 		scope = PublicationScopePrivate
 	}
+	if scope == PublicationScopeLimited && p.token == "" {
+		p.GenerateToken()
+	}
 
 	p.scope = scope
 }
@@ -51,5 +78,6 @@ func (p *Publication) Clone() *Publication {
 	return &Publication{
 		scope:       p.scope,
 		assetPublic: p.assetPublic,
+		token:       p.token,
 	}
 }
diff --git a/server/pkg/project/publication_test.go b/server/pkg/project/publication_test.go
index b09a1fd996..86869436a4 100644
--- a/server/pkg/project/publication_test.go
+++ b/server/pkg/project/publication_test.go
@@ -11,10 +11,12 @@ func TestNewPublication(t *testing.T) {
 		scope:       PublicationScopePrivate,
 		assetPublic: false,
 	}, NewPublication(PublicationScopePrivate, false))
-	assert.Equal(t, &Publication{
-		scope:       PublicationScopeLimited,
-		assetPublic: true,
-	}, NewPublication(PublicationScopeLimited, true))
+
+	got := NewPublication(PublicationScopeLimited, true)
+	assert.Equal(t, PublicationScopeLimited, got.Scope())
+	assert.Equal(t, true, got.AssetPublic())
+	assert.NotEmpty(t, got.Token())
+
 	assert.Equal(t, &Publication{
 		scope:       PublicationScopePublic,
 		assetPublic: false,
@@ -47,6 +49,7 @@ func TestPublication_SetScope(t *testing.T) {
 	p.SetScope(PublicationScopeLimited)
 	assert.Equal(t, &Publication{
 		scope: PublicationScopeLimited,
+		token: p.Token(),
 	}, p)
 
 	p = &Publication{}
@@ -92,3 +95,25 @@ func TestPublication_Clone(t *testing.T) {
 	assert.NotSame(t, p, p2)
 	assert.Nil(t, (*Publication)(nil).Clone())
 }
+
+func TestNewPublicationWithToken(t *testing.T) {
+	assert.Equal(t, &Publication{
+		scope:       PublicationScopePrivate,
+		assetPublic: false,
+		token:       "xxx",
+	}, NewPublicationWithToken(PublicationScopePrivate, false, "xxx"))
+	assert.Equal(t, &Publication{
+		scope:       PublicationScopeLimited,
+		assetPublic: true,
+		token:       "xxx",
+	}, NewPublicationWithToken(PublicationScopeLimited, true, "xxx"))
+	assert.Equal(t, &Publication{
+		scope:       PublicationScopePublic,
+		assetPublic: false,
+		token:       "xxx",
+	}, NewPublicationWithToken(PublicationScopePublic, false, "xxx"))
+	assert.Equal(t, &Publication{
+		scope:       PublicationScopePrivate,
+		assetPublic: true,
+	}, NewPublicationWithToken("", true, ""))
+}
diff --git a/server/schemas/integration.graphql b/server/schemas/integration.graphql
index 27f1e1440f..0c61d731f1 100644
--- a/server/schemas/integration.graphql
+++ b/server/schemas/integration.graphql
@@ -41,7 +41,7 @@ input DeleteIntegrationInput {
   integrationId: ID!
 }
 
-input RegenerateTokenInput {
+input RegenerateIntegrationTokenInput {
   integrationId: ID!
 }
 
@@ -60,5 +60,5 @@ extend type Mutation {
   createIntegration(input: CreateIntegrationInput!): IntegrationPayload
   updateIntegration(input: UpdateIntegrationInput!): IntegrationPayload
   deleteIntegration(input: DeleteIntegrationInput!): DeleteIntegrationPayload
-  regenerateToken(input: RegenerateTokenInput!): IntegrationPayload
+  regenerateIntegrationToken(input: RegenerateIntegrationTokenInput!): IntegrationPayload
 }
diff --git a/server/schemas/project.graphql b/server/schemas/project.graphql
index f0a31b95e5..e3a4d98c96 100644
--- a/server/schemas/project.graphql
+++ b/server/schemas/project.graphql
@@ -12,6 +12,7 @@ enum ProjectPublicationScope {
 type ProjectPublication {
   scope: ProjectPublicationScope!
   assetPublic: Boolean!
+  token: String
 }
 
 type Project implements Node {
@@ -54,6 +55,10 @@ input DeleteProjectInput {
   projectId: ID!
 }
 
+input RegeneratePublicApiTokenInput {
+  projectId: ID!
+}
+
 # Payload
 type ProjectPayload {
   project: Project!
@@ -84,4 +89,5 @@ extend type Mutation {
   createProject(input: CreateProjectInput!): ProjectPayload
   updateProject(input: UpdateProjectInput!): ProjectPayload
   deleteProject(input: DeleteProjectInput!): DeleteProjectPayload
+  regeneratePublicApiToken(input: RegeneratePublicApiTokenInput!): ProjectPayload
 }

From 4c24a9c47a15c4aa768b7e500155c89075abbb0f Mon Sep 17 00:00:00 2001
From: KeisukeYamashita <19yamashita15@gmail.com>
Date: Fri, 8 Nov 2024 02:45:32 +0100
Subject: [PATCH 23/28] ci(web): update cesium ion token via secret manager
 (#1301)

---
 .github/workflows/cron_ion_token_test.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cron_ion_token_test.yml b/.github/workflows/cron_ion_token_test.yml
index 4504d60ec7..53d9a124bd 100644
--- a/.github/workflows/cron_ion_token_test.yml
+++ b/.github/workflows/cron_ion_token_test.yml
@@ -36,9 +36,17 @@ jobs:
           " \
           )
           echo "token=${ION_TOKEN}" >> $GITHUB_OUTPUT
+      - name: Update Secret Manager secret
+        run: |
+          echo -n "${{ steps.ion_token.outputs.token }}" | gcloud secrets versions add ${{ secrets.CESIUM_ION_TOKEN_SECRET_NAME }} \
+            --data-file=-
       - name: Update Cloud Run
         run: |
           gcloud run services update $CMS_WEB \
-            --update-env-vars REEARTH_CMS_CESIUM_ION_ACCESS_TOKEN=${{ steps.ion_token.outputs.token }} \
-            --region $REGION \
-            --platform managed
+            --update-secrets REEARTH_CMS_CESIUM_ION_ACCESS_TOKEN=${{ secrets.CESIUM_ION_TOKEN_SECRET_NAME }}:latest \
+            --region $REGION
+      - name: Update Cloud Run traffic
+        run: |
+          gcloud run services update-traffic $CMS_WEB \
+            --to-latest \
+            --region $REGION

From 10044d3dea380fcbf902b27fbc7db6553f73cd6f Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Wed, 13 Nov 2024 13:26:32 +0900
Subject: [PATCH 24/28] feat(web): add limited to public scope (#1304)

* refactoring

* impl

* use copyButton for unzipFileList

* add: fromGraphQLProject

* fix: i18n

* add: e2e test

* fix: refetch when deleting project

* remove "example"

* fix: e2e tests

* fix: copy tooltip text
---
 web/e2e/general/project.spec.ts               |   2 +-
 web/e2e/project/accessibility.spec.ts         |  21 ++
 web/e2e/project/asset.spec.ts                 |   2 +-
 web/e2e/project/content/content.spec.ts       |   2 +-
 web/e2e/project/item/fields/reference.spec.ts |   2 +-
 web/e2e/project/schema.spec.ts                |   2 +-
 web/src/components/atoms/CopyButton/index.tsx |  36 ++
 web/src/components/atoms/Icon/icons.ts        |   2 +
 .../components/atoms/InnerContents/basic.tsx  |   9 +-
 .../molecules/Accessibility/index.tsx         | 309 ++++++++++--------
 .../molecules/Accessibility/types.ts          |   8 +-
 .../molecules/Asset/Asset/AssetBody/Asset.tsx |  24 +-
 .../Asset/AssetBody/UnzipFileList/index.tsx   |  56 ++--
 .../molecules/Asset/Asset/AssetBody/card.tsx  |   3 +
 .../molecules/Common/Form/GroupItem/index.tsx |   3 +-
 .../molecules/Common/Header/index.tsx         |  24 +-
 .../molecules/Content/Form/index.tsx          |   7 +-
 .../molecules/MyIntegrations/List/index.tsx   |   5 +-
 .../MyIntegrations/Settings/Form.tsx          |  51 +--
 .../molecules/ProjectSettings/GeneralForm.tsx |   1 +
 .../molecules/Settings/FormModal.tsx          |  16 +-
 .../components/molecules/Workspace/types.ts   |  14 +-
 .../components/organisms/CMSWrapper/hooks.ts  |  24 +-
 .../organisms/DataConverters/project.ts       |  13 +
 .../organisms/Project/Accessibility/hooks.ts  | 242 ++++++++------
 .../organisms/Project/Accessibility/index.tsx |  32 +-
 .../organisms/Project/Schema/hooks.ts         |   2 +-
 .../organisms/Project/settings/hooks.ts       |  39 +--
 .../organisms/Project/settings/index.tsx      |   3 +-
 .../organisms/Settings/Integration/hooks.ts   |   2 +-
 .../Settings/MyIntegrationDetails/hooks.ts    |  13 +-
 .../components/organisms/Workspace/hooks.ts   |  51 +--
 web/src/gql/graphql-client-api.tsx            |  94 ++++--
 web/src/gql/graphql.schema.json               |  75 ++++-
 web/src/gql/queries/integration.ts            |   6 +-
 web/src/gql/queries/project.ts                |  11 +
 web/src/i18n/translations/en.yml              |  33 +-
 web/src/i18n/translations/ja.yml              |  35 +-
 38 files changed, 784 insertions(+), 490 deletions(-)
 create mode 100644 web/src/components/atoms/CopyButton/index.tsx
 create mode 100644 web/src/components/organisms/DataConverters/project.ts

diff --git a/web/e2e/general/project.spec.ts b/web/e2e/general/project.spec.ts
index f06c0155cb..4867c0d1b8 100644
--- a/web/e2e/general/project.spec.ts
+++ b/web/e2e/general/project.spec.ts
@@ -47,7 +47,7 @@ test("Project CRUD and searching has succeeded", async ({ reearth, page }) => {
   await page.getByRole("button", { name: "Save changes" }).nth(1).click();
   await expect(page.getByRole("row", { name: "Owner" }).getByRole("switch")).toHaveAttribute(
     "aria-checked",
-    "false",
+    "true",
   );
   await closeNotification(page);
 
diff --git a/web/e2e/project/accessibility.spec.ts b/web/e2e/project/accessibility.spec.ts
index ab9d7bf67d..a3f911c0fd 100644
--- a/web/e2e/project/accessibility.spec.ts
+++ b/web/e2e/project/accessibility.spec.ts
@@ -27,3 +27,24 @@ test("Update settings on Accesibility page has succeeded", async ({ page }) => {
   await expect(page.locator("tbody")).toContainText(`http://localhost:8080/api/p/${alias}/assets`);
   await expect(page.getByRole("button", { name: "Save changes" })).toBeDisabled();
 });
+
+test("Setting public scope to Limited has succeeded", async ({ page }) => {
+  await page.getByText("Accessibility").click();
+  await page.getByText("Private").click();
+  await page.getByText("Limited", { exact: true }).click();
+  await expect(page.locator('input[type="password"]')).toBeHidden();
+  await page.getByRole("button", { name: "Save changes" }).click();
+  await closeNotification(page);
+  await expect(page.locator("form")).toContainText("Limited");
+  await expect(page.locator('input[type="password"]')).toHaveValue(/^secret_/);
+  const token = await page.locator('input[type="password"]').inputValue();
+  await page.getByRole("button", { name: "Re-generate" }).click();
+  await closeNotification(page);
+  await expect(page.locator('input[type="password"]')).toHaveValue(/^secret_/);
+  await expect(page.locator('input[type="password"]')).not.toHaveValue(token);
+  await page.getByText("Limited").first().click();
+  await page.getByText("Private", { exact: true }).click();
+  await page.getByRole("button", { name: "Save changes" }).click();
+  await closeNotification(page);
+  await expect(page.locator('input[type="password"]')).toBeHidden();
+});
diff --git a/web/e2e/project/asset.spec.ts b/web/e2e/project/asset.spec.ts
index e0d8667bbb..a5b9357510 100644
--- a/web/e2e/project/asset.spec.ts
+++ b/web/e2e/project/asset.spec.ts
@@ -72,7 +72,7 @@ test("Donwloading asset has succeeded", async ({ page }) => {
 
 test("Comment CRUD on edit page has succeeded", async ({ page }) => {
   await page.getByRole("cell", { name: "edit" }).locator("svg").click();
-  await page.getByLabel("message").click();
+  await page.getByLabel("comment").click();
   await expect(page.getByText("Comments0 / 1000Comment")).toBeVisible();
   await crudComment(page);
 });
diff --git a/web/e2e/project/content/content.spec.ts b/web/e2e/project/content/content.spec.ts
index bd7c4ca5bd..b8425eb53f 100644
--- a/web/e2e/project/content/content.spec.ts
+++ b/web/e2e/project/content/content.spec.ts
@@ -148,7 +148,7 @@ test("Comment CRUD on edit page has succeeded", async ({ page }) => {
   await page.getByLabel("text").fill("text");
   await page.getByRole("button", { name: "Save" }).click();
   await closeNotification(page);
-  await page.getByLabel("message").click();
+  await page.getByLabel("comment").click();
   await expect(page.getByText("Comments0 / 1000Comment")).toBeVisible();
   await crudComment(page);
 });
diff --git a/web/e2e/project/item/fields/reference.spec.ts b/web/e2e/project/item/fields/reference.spec.ts
index ab38bc2229..3328e67c5e 100644
--- a/web/e2e/project/item/fields/reference.spec.ts
+++ b/web/e2e/project/item/fields/reference.spec.ts
@@ -127,7 +127,7 @@ test("One-way reference field creating and updating has succeeded", async ({ pag
   await expect(page.getByRole("cell", { name: "text1" }).locator("span").first()).toBeVisible();
   await page.getByRole("cell").getByLabel("edit").locator("svg").click();
   await expect(page.locator("#root").getByText("text1")).toBeVisible();
-  await page.getByRole("button", { name: "Refer to item" }).click();
+  await page.getByRole("button", { name: "Replace item" }).click();
   await page.getByRole("row").getByRole("button").nth(1).hover();
   await page.getByRole("row").getByRole("button").nth(1).click();
   await expect(page.locator("#root").getByText("text2")).toBeVisible();
diff --git a/web/e2e/project/schema.spec.ts b/web/e2e/project/schema.spec.ts
index 8f07702ab1..2dc269094b 100644
--- a/web/e2e/project/schema.spec.ts
+++ b/web/e2e/project/schema.spec.ts
@@ -93,7 +93,7 @@ test("Group creating from adding field has succeeded", async ({ page }) => {
   await handleFieldForm(page, "text");
   await page.getByText("e2e model name").click();
   await page.locator("li").getByText("Group", { exact: true }).click();
-  await expect(page.getByRole("heading", { name: "Create Group" })).toBeVisible();
+  await expect(page.getByText("Create Group Field")).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();
diff --git a/web/src/components/atoms/CopyButton/index.tsx b/web/src/components/atoms/CopyButton/index.tsx
new file mode 100644
index 0000000000..db6ade4b77
--- /dev/null
+++ b/web/src/components/atoms/CopyButton/index.tsx
@@ -0,0 +1,36 @@
+import styled from "@emotion/styled";
+import { Typography } from "antd";
+import type { CopyConfig } from "antd/lib/typography/Base";
+import { RefAttributes } from "react";
+
+import { useT } from "@reearth-cms/i18n";
+
+const { Text } = Typography;
+
+type Props = {
+  copyable: CopyConfig;
+} & RefAttributes<HTMLSpanElement>;
+
+const CopyButton: React.FC<Props> = ({ copyable, ...props }) => {
+  const t = useT();
+  return <Text copyable={{ tooltips: [t("Copy"), t("Copied")], ...copyable }} {...props} />;
+};
+
+const StyledCopyButton = styled(CopyButton)<{ color?: string; hoverColor?: string }>`
+  display: inline-flex;
+  .ant-typography-copy {
+    transition: all 0.3s;
+    color: ${({ color }) => color || "#00000073"};
+    :focus {
+      color: ${({ color }) => color || "#00000073"};
+    }
+    :active {
+      color: ${({ hoverColor }) => hoverColor || "#000000e0"};
+    }
+    :hover {
+      color: ${({ hoverColor }) => hoverColor || "#000000e0"};
+    }
+  }
+`;
+
+export default StyledCopyButton;
diff --git a/web/src/components/atoms/Icon/icons.ts b/web/src/components/atoms/Icon/icons.ts
index 065fe50fa6..b2f07b6178 100644
--- a/web/src/components/atoms/Icon/icons.ts
+++ b/web/src/components/atoms/Icon/icons.ts
@@ -47,6 +47,7 @@ import {
   FileTwoTone,
   PictureTwoTone,
   LoadingOutlined,
+  EyeOutlined,
   EyeInvisibleOutlined,
   CopyOutlined,
   ReloadOutlined,
@@ -159,6 +160,7 @@ export default {
   loading: LoadingOutlined,
   linked: Linked,
   unzip: Unzip,
+  eye: EyeOutlined,
   eyeInvisible: EyeInvisibleOutlined,
   copy: CopyOutlined,
   terminalWindow: TerminalWindow,
diff --git a/web/src/components/atoms/InnerContents/basic.tsx b/web/src/components/atoms/InnerContents/basic.tsx
index 430c664844..5f8eee5053 100644
--- a/web/src/components/atoms/InnerContents/basic.tsx
+++ b/web/src/components/atoms/InnerContents/basic.tsx
@@ -20,7 +20,6 @@ const BasicInnerContents: React.FC<Props> = ({ title, subtitle, flexChildren, ch
           {subtitle && <Subtitle>{subtitle}</Subtitle>}
         </Header>
       )}
-
       {childrenArray.map((child, idx) => (
         <Section key={idx} flex={flexChildren} lastChild={childrenArray.length - 1 === idx}>
           {child}
@@ -42,16 +41,22 @@ const Header = styled.div`
   margin-bottom: 16px;
 `;
 
-const Title = styled.p`
+const Title = styled.h2`
   font-weight: 500;
   font-size: 20px;
   line-height: 28px;
   margin: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 `;
 
 const Subtitle = styled.p`
   margin: 16px 0 0 0;
   color: rgba(0, 0, 0, 0.45);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 `;
 
 const Section = styled.div<{ flex?: boolean; lastChild?: boolean }>`
diff --git a/web/src/components/molecules/Accessibility/index.tsx b/web/src/components/molecules/Accessibility/index.tsx
index 5986f6828a..c5347853f0 100644
--- a/web/src/components/molecules/Accessibility/index.tsx
+++ b/web/src/components/molecules/Accessibility/index.tsx
@@ -1,17 +1,18 @@
 import styled from "@emotion/styled";
-import React, { useCallback, useMemo } from "react";
+import { useMemo, useState } from "react";
 
 import Button from "@reearth-cms/components/atoms/Button";
-import Form from "@reearth-cms/components/atoms/Form";
+import CopyButton from "@reearth-cms/components/atoms/CopyButton";
+import Form, { FormInstance } from "@reearth-cms/components/atoms/Form";
 import Icon from "@reearth-cms/components/atoms/Icon";
 import InnerContent from "@reearth-cms/components/atoms/InnerContents/basic";
 import ContentSection from "@reearth-cms/components/atoms/InnerContents/ContentSection";
 import Input from "@reearth-cms/components/atoms/Input";
+import Password from "@reearth-cms/components/atoms/Password";
 import Select from "@reearth-cms/components/atoms/Select";
 import Switch from "@reearth-cms/components/atoms/Switch";
 import Table, { TableColumnsType } from "@reearth-cms/components/atoms/Table";
-import Tooltip from "@reearth-cms/components/atoms/Tooltip";
-import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
+import { FormType } from "@reearth-cms/components/molecules/Accessibility/types";
 import { Model } from "@reearth-cms/components/molecules/Model/types";
 import { useT } from "@reearth-cms/i18n";
 
@@ -20,158 +21,171 @@ type ModelDataType = {
   name: string;
   public: JSX.Element;
   publicState: boolean;
-  key?: string;
+  key: string;
 };
 
 type Props = {
-  models?: Model[];
-  scope?: PublicScope;
-  alias?: string;
-  aliasState?: string;
-  assetState?: boolean;
+  form: FormInstance<FormType>;
+  models: Model[];
+  modelsState: Record<string, boolean>;
+  assetState: boolean;
   isSaveDisabled: boolean;
   hasPublishRight: boolean;
-  handlePublicUpdate: () => Promise<void>;
-  handleUpdatedAssetState: (state: boolean) => void;
-  handleUpdatedModels: (model: Model) => void;
-  handleSetScope: (projectScope: PublicScope) => void;
+  updateLoading: boolean;
+  regenerateLoading: boolean;
+  apiUrl: string;
+  alias: string;
+  token: string;
+  onValuesChange: (changedValues: Partial<FormType>, values: FormType) => void;
+  onPublicUpdate: () => Promise<void>;
+  onRegenerateToken: () => Promise<void>;
 };
 
 const Accessibility: React.FC<Props> = ({
+  form,
   models,
-  scope,
-  alias,
-  aliasState,
+  modelsState,
   assetState,
   isSaveDisabled,
   hasPublishRight,
-  handlePublicUpdate,
-  handleUpdatedAssetState,
-  handleUpdatedModels,
-  handleSetScope,
+  updateLoading,
+  regenerateLoading,
+  apiUrl,
+  alias,
+  token,
+  onValuesChange,
+  onPublicUpdate,
+  onRegenerateToken,
 }) => {
   const t = useT();
-  const [form] = Form.useForm();
-
-  const columns: TableColumnsType<ModelDataType> = [
-    {
-      title: t("Model"),
-      dataIndex: "name",
-      key: "name",
-      width: 220,
-    },
-    {
-      title: t("Switch"),
-      dataIndex: "public",
-      key: "public",
-      align: "center",
-      width: 90,
-    },
-    {
-      title: t("End point"),
-      dataIndex: "endpoint",
-      key: "endpoint",
-      render: (_, modelData: ModelDataType) => {
-        return (
-          modelData.publicState &&
-          modelData.key && (
-            <StyledAnchor
-              target="_blank"
-              href={window.REEARTH_CONFIG?.api + "/p/" + alias + "/" + modelData.key}
-              rel="noreferrer">
-              {window.REEARTH_CONFIG?.api}/p/{alias}/{modelData.key}
+  const [visible, setVisible] = useState(false);
+
+  const columns: TableColumnsType<ModelDataType> = useMemo(
+    () => [
+      {
+        title: t("Model"),
+        dataIndex: "name",
+        key: "name",
+        width: 220,
+      },
+      {
+        title: t("Switch"),
+        dataIndex: "public",
+        key: "public",
+        align: "center",
+        width: 90,
+      },
+      {
+        title: t("End point"),
+        dataIndex: "endpoint",
+        key: "endpoint",
+        render: (_, modelData) => {
+          const url = apiUrl + modelData.key;
+          return (
+            <StyledAnchor target="_blank" href={url} rel="noreferrer">
+              {url}
             </StyledAnchor>
-          )
-        );
+          );
+        },
       },
-    },
-  ];
+    ],
+    [apiUrl, t],
+  );
 
-  const dataSource: ModelDataType[] = useMemo(() => {
-    let columns: ModelDataType[] = [
-      {
-        id: "assets",
-        name: t("Assets"),
-        key: "assets",
-        publicState: assetState ?? false,
+  const dataSource = useMemo(() => {
+    const columns: ModelDataType[] = [];
+    models.forEach(m => {
+      columns.push({
+        id: m.id,
+        name: m.name,
+        key: m.key,
+        publicState: modelsState[m.id],
         public: (
-          <Switch
-            checked={assetState}
-            disabled={!hasPublishRight}
-            onChange={(publicState: boolean) => handleUpdatedAssetState(publicState)}
-          />
+          <StyledFormItem name={["models", m.id]}>
+            <Switch disabled={!hasPublishRight} />
+          </StyledFormItem>
         ),
-      },
-    ];
-
-    if (models) {
-      columns = [
-        ...models.map(m => {
-          return {
-            id: m.id,
-            name: m.name ?? "",
-            key: m.key,
-            publicState: m.public,
-            public: (
-              <Switch
-                checked={m.public}
-                disabled={!hasPublishRight}
-                onChange={(publicState: boolean) =>
-                  handleUpdatedModels({ ...m, public: publicState })
-                }
-              />
-            ),
-          };
-        }),
-        ...columns,
-      ];
-    }
+      });
+    });
+    columns.push({
+      id: "assets",
+      name: t("Assets"),
+      key: "assets",
+      publicState: assetState,
+      public: (
+        <StyledFormItem name="assetPublic">
+          <Switch disabled={!hasPublishRight} />
+        </StyledFormItem>
+      ),
+    });
     return columns;
-  }, [t, assetState, hasPublishRight, models, handleUpdatedAssetState, handleUpdatedModels]);
+  }, [assetState, models, modelsState, t, hasPublishRight]);
 
-  const publicScopeList = [
-    { id: 1, name: t("Private"), value: "private" },
-    { id: 2, name: t("Public"), value: "public" },
-  ];
-
-  const handleCopy = useCallback(() => {
-    if (aliasState) navigator.clipboard.writeText(aliasState);
-  }, [aliasState]);
+  const publicScopeList = useMemo(
+    () => [
+      { name: t("Private"), value: "PRIVATE" },
+      { name: t("Limited"), value: "LIMITED" },
+      { name: t("Public"), value: "PUBLIC" },
+    ],
+    [t],
+  );
 
   return (
-    <InnerContent title={t("Accessibility")} flexChildren>
+    <InnerContent
+      title={t("Accessibility")}
+      flexChildren
+      subtitle={t("Control the visibility scope of the Content API")}>
       <ContentSection title="">
-        <Form form={form} layout="vertical" autoComplete="off">
-          <ItemsWrapper>
-            <Form.Item
-              label={t("Public Scope")}
-              extra={t(
-                "Choose the scope of your project. This affects all the models shown below that are switched on.",
-              )}>
-              <Select value={scope} onChange={handleSetScope} disabled={!hasPublishRight}>
-                {publicScopeList.map(type => (
-                  <Select.Option key={type.id} value={type.value}>
-                    {type.name}
-                  </Select.Option>
-                ))}
-              </Select>
-            </Form.Item>
-            <Form.Item label={t("Project Alias")}>
-              <Input
-                value={aliasState}
-                suffix={
-                  <Tooltip title={t("Alias copied!!")} trigger={"click"}>
-                    <StyledIcon icon="copy" onClick={handleCopy} />
-                  </Tooltip>
+        <Form form={form} layout="vertical" onValuesChange={onValuesChange}>
+          <Form.Item
+            name="scope"
+            label={t("Public Scope")}
+            extra={t("Choose your project public method.")}>
+            <StyledSelect disabled={!hasPublishRight}>
+              {publicScopeList.map(({ value, name }) => (
+                <Select.Option key={value} value={value}>
+                  {name}
+                </Select.Option>
+              ))}
+            </StyledSelect>
+          </Form.Item>
+          <Form.Item
+            name="alias"
+            label={t("Project Alias")}
+            extra={t("Edit Project Alias in Project Setting.")}>
+            <StyledInput suffix={<CopyButton copyable={{ text: alias }} />} disabled />
+          </Form.Item>
+          {token && (
+            <TokenFormItem
+              label={t("Token")}
+              extra={t("This is your secret token, please use as your env value.")}>
+              <StyledTokenInput
+                value={token}
+                disabled
+                visibilityToggle={{ visible }}
+                iconRender={() => <CopyButton copyable={{ text: token }} />}
+                prefix={
+                  <Icon
+                    icon={visible ? "eye" : "eyeInvisible"}
+                    onClick={() => {
+                      setVisible(prev => !prev);
+                    }}
+                  />
                 }
-                contentEditable={false}
               />
-            </Form.Item>
-          </ItemsWrapper>
+              <Button onClick={onRegenerateToken} loading={regenerateLoading}>
+                {t("Re-generate")}
+              </Button>
+            </TokenFormItem>
+          )}
           <TableWrapper>
             <Table dataSource={dataSource} columns={columns} pagination={false} />
           </TableWrapper>
-          <Button type="primary" disabled={isSaveDisabled} onClick={handlePublicUpdate}>
+          <Button
+            type="primary"
+            disabled={isSaveDisabled}
+            onClick={onPublicUpdate}
+            loading={updateLoading}>
             {t("Save changes")}
           </Button>
         </Form>
@@ -182,8 +196,37 @@ const Accessibility: React.FC<Props> = ({
 
 export default Accessibility;
 
-const ItemsWrapper = styled.div`
-  max-width: 304px;
+const maxWidth = "316px";
+
+const StyledSelect = styled(Select)`
+  max-width: ${maxWidth};
+`;
+
+const StyledInput = styled(Input)`
+  max-width: ${maxWidth};
+`;
+
+const TokenFormItem = styled(Form.Item)`
+  .ant-form-item-control-input-content {
+    display: flex;
+    gap: 4px;
+  }
+`;
+
+const StyledTokenInput = styled(Password)`
+  max-width: ${maxWidth};
+  .ant-input-prefix {
+    order: 1;
+    margin-left: 4px;
+    color: rgb(0, 0, 0, 0.45);
+    transition: all 0.3s;
+    :hover {
+      color: rgba(0, 0, 0, 0.88);
+    }
+  }
+  .ant-input-suffix {
+    order: 2;
+  }
 `;
 
 const TableWrapper = styled.div`
@@ -195,10 +238,6 @@ const StyledAnchor = styled.a`
   color: #000000d9;
 `;
 
-const StyledIcon = styled(Icon)`
-  transition: all 0.3s;
-  color: rgb(0, 0, 0, 0.45);
-  :hover {
-    color: rgba(0, 0, 0, 0.88);
-  }
+const StyledFormItem = styled(Form.Item)`
+  margin: 0;
 `;
diff --git a/web/src/components/molecules/Accessibility/types.ts b/web/src/components/molecules/Accessibility/types.ts
index edb9cbc2e7..690deeba4e 100644
--- a/web/src/components/molecules/Accessibility/types.ts
+++ b/web/src/components/molecules/Accessibility/types.ts
@@ -1 +1,7 @@
-export type PublicScope = "private" | "public"; // Add "limited" when functionality becomes available
+export type PublicScope = "PRIVATE" | "LIMITED" | "PUBLIC";
+export type FormType = {
+  scope: PublicScope;
+  alias: string;
+  assetPublic: boolean;
+  models: Record<string, boolean>;
+};
diff --git a/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx b/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx
index 001853e977..d7f405d858 100644
--- a/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx
+++ b/web/src/components/molecules/Asset/Asset/AssetBody/Asset.tsx
@@ -3,10 +3,10 @@ import { Viewer as CesiumViewer } from "cesium";
 import { useCallback, useState } from "react";
 
 import Button from "@reearth-cms/components/atoms/Button";
+import CopyButton from "@reearth-cms/components/atoms/CopyButton";
 import DownloadButton from "@reearth-cms/components/atoms/DownloadButton";
 import Icon from "@reearth-cms/components/atoms/Icon";
 import Space from "@reearth-cms/components/atoms/Space";
-import Tooltip from "@reearth-cms/components/atoms/Tooltip";
 import UserAvatar from "@reearth-cms/components/atoms/UserAvatar";
 import Card from "@reearth-cms/components/molecules/Asset/Asset/AssetBody/card";
 import PreviewToolbar from "@reearth-cms/components/molecules/Asset/Asset/AssetBody/previewToolbar";
@@ -125,20 +125,16 @@ const AssetMolecule: React.FC<Props> = ({
     }
   }, [assetFileExt, assetUrl, svgRender, viewerType, workspaceSettings]);
 
-  const handleCopy = useCallback(() => {
-    navigator.clipboard.writeText(asset.url);
-  }, [asset.url]);
-
   return (
     <BodyContainer>
       <BodyWrapper>
         <Card
           title={
             <>
-              {asset.fileName}
-              <Tooltip title={t("URL copied!!")} trigger={"click"}>
-                <CopyIcon icon="copy" onClick={handleCopy} />
-              </Tooltip>
+              <AssetName>{asset.fileName}</AssetName>
+              <CopyButton
+                copyable={{ text: asset.url, tooltips: [t("Copy URL"), t("URL copied!!")] }}
+              />
             </>
           }
           toolbar={
@@ -211,13 +207,9 @@ const AssetMolecule: React.FC<Props> = ({
   );
 };
 
-const CopyIcon = styled(Icon)`
-  margin-left: 10px;
-  transition: all 0.3s;
-  color: rgb(0, 0, 0, 0.45);
-  :hover {
-    color: rgba(0, 0, 0, 0.88);
-  }
+const AssetName = styled.span`
+  min-width: 0;
+  word-wrap: break-word;
 `;
 
 const UnzipButton = styled(Button)`
diff --git a/web/src/components/molecules/Asset/Asset/AssetBody/UnzipFileList/index.tsx b/web/src/components/molecules/Asset/Asset/AssetBody/UnzipFileList/index.tsx
index 2673273199..24aa32da28 100644
--- a/web/src/components/molecules/Asset/Asset/AssetBody/UnzipFileList/index.tsx
+++ b/web/src/components/molecules/Asset/Asset/AssetBody/UnzipFileList/index.tsx
@@ -2,9 +2,9 @@ import styled from "@emotion/styled";
 import { Key } from "rc-table/lib/interface";
 import { useCallback, useEffect, useState } from "react";
 
+import CopyButton from "@reearth-cms/components/atoms/CopyButton";
 import Icon from "@reearth-cms/components/atoms/Icon";
 import Spin from "@reearth-cms/components/atoms/Spin";
-import Tooltip from "@reearth-cms/components/atoms/Tooltip";
 import Tree, { TreeProps } from "@reearth-cms/components/atoms/Tree";
 import { ArchiveExtractionStatus, AssetFile } from "@reearth-cms/components/molecules/Asset/types";
 import { useT } from "@reearth-cms/i18n";
@@ -51,13 +51,6 @@ const UnzipFileList: React.FC<Props> = ({
     [previewFile, selectedKeys],
   );
 
-  const handleCopy = useCallback(
-    (path: string) => {
-      navigator.clipboard.writeText(assetBaseUrl + path);
-    },
-    [assetBaseUrl],
-  );
-
   return (
     <UnzipFileListWrapper>
       {archiveExtractionStatus === "IN_PROGRESS" || archiveExtractionStatus === "PENDING" ? (
@@ -84,16 +77,21 @@ const UnzipFileList: React.FC<Props> = ({
             multiple={false}
             showLine={{ showLeafIcon: true }}
             titleRender={({ title, key, path }) => {
-              return (
-                <>
-                  {title}
-                  {selectedKeys[0] === key && (
-                    <Tooltip title={t("URL copied!!")} trigger={"click"}>
-                      <CopyIcon icon="copy" onClick={() => handleCopy(path)} />
-                    </Tooltip>
-                  )}
-                </>
-              );
+              if (typeof title !== "function") {
+                return (
+                  <TitleWrapper>
+                    <Title>{title}</Title>
+                    {selectedKeys[0] === key && (
+                      <CopyButton
+                        copyable={{
+                          text: assetBaseUrl + path,
+                          tooltips: [t("Copy URL"), t("URL copied!!")],
+                        }}
+                      />
+                    )}
+                  </TitleWrapper>
+                );
+              }
             }}
           />
         )
@@ -106,6 +104,12 @@ const UnzipFileListWrapper = styled.div`
   height: 250px;
   overflow-y: scroll;
   background-color: #f5f5f5;
+  .ant-tree-treenode {
+    max-width: 100%;
+  }
+  .ant-tree-node-content-wrapper {
+    min-width: 0;
+  }
 `;
 
 const ExtractionInProgressWrapper = styled.div`
@@ -137,13 +141,15 @@ const ExtractionFailedText = styled.p`
   color: rgba(0, 0, 0, 0.85);
 `;
 
-const CopyIcon = styled(Icon)`
-  margin-left: 6px;
-  transition: all 0.3s;
-  color: rgb(0, 0, 0, 0.45);
-  :hover {
-    color: rgba(0, 0, 0, 0.88);
-  }
+const TitleWrapper = styled.span`
+  display: flex;
+  gap: 6px;
+`;
+
+const Title = styled.span`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 `;
 
 const SwitcherIcon = styled(Icon)`
diff --git a/web/src/components/molecules/Asset/Asset/AssetBody/card.tsx b/web/src/components/molecules/Asset/Asset/AssetBody/card.tsx
index 7df70a6308..9b9f1e9206 100644
--- a/web/src/components/molecules/Asset/Asset/AssetBody/card.tsx
+++ b/web/src/components/molecules/Asset/Asset/AssetBody/card.tsx
@@ -39,6 +39,9 @@ const Title = styled.p`
   margin: 0;
   font-size: 14px;
   font-weight: 500;
+  display: flex;
+  gap: 10px;
+  overflow: hidden;
 `;
 
 const Toolbar = styled.div`
diff --git a/web/src/components/molecules/Common/Form/GroupItem/index.tsx b/web/src/components/molecules/Common/Form/GroupItem/index.tsx
index eb4ddedc29..4a43f72a68 100644
--- a/web/src/components/molecules/Common/Form/GroupItem/index.tsx
+++ b/web/src/components/molecules/Common/Form/GroupItem/index.tsx
@@ -278,8 +278,7 @@ const IconWrapper = styled.span<{ disabled?: boolean }>`
 `;
 
 const StyledFormItemWrapper = styled.div<{ isFullWidth?: boolean }>`
-  width: ${({ isFullWidth }) => (isFullWidth ? undefined : "468px")};
-  max-width: 100%;
+  max-width: ${({ isFullWidth }) => (isFullWidth ? undefined : "468px")};
   word-wrap: break-word;
 `;
 
diff --git a/web/src/components/molecules/Common/Header/index.tsx b/web/src/components/molecules/Common/Header/index.tsx
index 3870592e87..98f7e4963f 100644
--- a/web/src/components/molecules/Common/Header/index.tsx
+++ b/web/src/components/molecules/Common/Header/index.tsx
@@ -133,13 +133,14 @@ const HeaderMolecule: React.FC<Props> = ({
         items={WorkspacesItems}
         personal={currentIsPersonal}
       />
-      {currentProject?.name && (
-        <CurrentProject>
-          <Break>/</Break>
-          <ProjectText>{currentProject.name}</ProjectText>
-        </CurrentProject>
-      )}
-      <Spacer />
+      <CurrentProject>
+        {currentProject?.name && (
+          <>
+            <Break>/</Break>
+            <ProjectText>{currentProject.name}</ProjectText>
+          </>
+        )}
+      </CurrentProject>
       <AccountDropdown name={username} items={AccountItems} personal={true} />
       {url && (
         <LinkWrapper>
@@ -181,10 +182,6 @@ const LogoIcon = styled.img`
   cursor: pointer;
 `;
 
-const Spacer = styled.div`
-  flex: 1;
-`;
-
 const VerticalDivider = styled.div`
   display: inline-block;
   height: 32px;
@@ -206,6 +203,9 @@ const AccountDropdown = styled(HeaderDropdown)`
 
 const ProjectText = styled.p`
   margin: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 `;
 
 const Break = styled.p`
@@ -218,6 +218,8 @@ const CurrentProject = styled.div`
   display: flex;
   align-items: center;
   color: #dbdbdb;
+  flex: 1;
+  min-width: 0;
 `;
 
 const MenuText = styled.p`
diff --git a/web/src/components/molecules/Content/Form/index.tsx b/web/src/components/molecules/Content/Form/index.tsx
index 5369aeee37..5ac72ef8c3 100644
--- a/web/src/components/molecules/Content/Form/index.tsx
+++ b/web/src/components/molecules/Content/Form/index.tsx
@@ -735,12 +735,13 @@ const ContentForm: React.FC<Props> = ({
 };
 
 const StyledFormItemWrapper = styled.div<{ isFullWidth?: boolean }>`
-  width: ${({ isFullWidth }) => (isFullWidth ? undefined : "500px")};
+  max-width: ${({ isFullWidth }) => (isFullWidth ? undefined : "500px")};
   word-wrap: break-word;
 `;
 
 const StyledForm = styled(Form)`
-  width: 100%;
+  flex: 1;
+  min-width: 0;
   height: 100%;
   background: #fff;
   label {
@@ -759,7 +760,7 @@ const FormItemsWrapper = styled.div`
 const SideBarWrapper = styled.div`
   background-color: #fafafa;
   padding: 8px;
-  width: 400px;
+  min-width: 272px;
   max-height: 100%;
   overflow-y: auto;
 `;
diff --git a/web/src/components/molecules/MyIntegrations/List/index.tsx b/web/src/components/molecules/MyIntegrations/List/index.tsx
index 1185b9997d..81fc0e7045 100644
--- a/web/src/components/molecules/MyIntegrations/List/index.tsx
+++ b/web/src/components/molecules/MyIntegrations/List/index.tsx
@@ -21,7 +21,10 @@ const MyIntegrationList: React.FC<Props> = ({
 
   return (
     <Wrapper>
-      <PageHeader title={t("My Integrations")} />
+      <PageHeader
+        title={t("My Integrations")}
+        subTitle={t("Create and test your own integration.")}
+      />
       <ListWrapper>
         {integrations?.map((integration: Integration) => (
           <MyIntegrationCard
diff --git a/web/src/components/molecules/MyIntegrations/Settings/Form.tsx b/web/src/components/molecules/MyIntegrations/Settings/Form.tsx
index 8174cc4b44..6c2b21ea3e 100644
--- a/web/src/components/molecules/MyIntegrations/Settings/Form.tsx
+++ b/web/src/components/molecules/MyIntegrations/Settings/Form.tsx
@@ -3,6 +3,7 @@ import { useCallback, useState } from "react";
 
 import Button from "@reearth-cms/components/atoms/Button";
 import Col from "@reearth-cms/components/atoms/Col";
+import CopyButton from "@reearth-cms/components/atoms/CopyButton";
 import Divider from "@reearth-cms/components/atoms/Divider";
 import Form, { ValidateErrorEntity } from "@reearth-cms/components/atoms/Form";
 import Icon from "@reearth-cms/components/atoms/Icon";
@@ -11,7 +12,6 @@ import Modal from "@reearth-cms/components/atoms/Modal";
 import Password from "@reearth-cms/components/atoms/Password";
 import Row from "@reearth-cms/components/atoms/Row";
 import TextArea from "@reearth-cms/components/atoms/TextArea";
-import Tooltip from "@reearth-cms/components/atoms/Tooltip";
 import { Integration } from "@reearth-cms/components/molecules/MyIntegrations/types";
 import { useT } from "@reearth-cms/i18n";
 
@@ -43,6 +43,7 @@ const MyIntegrationForm: React.FC<Props> = ({
   const t = useT();
   const [form] = Form.useForm<FormType>();
   const [isDisabled, setIsDisabled] = useState(true);
+  const [visible, setVisible] = useState(false);
 
   const handleValuesChange = useCallback(
     async (_: unknown, values: FormType) => {
@@ -74,9 +75,9 @@ const MyIntegrationForm: React.FC<Props> = ({
 
   const handleRegenerateToken = useCallback(() => {
     Modal.confirm({
-      title: t("Regenerate The Integration Token?"),
+      title: t("Re-generate The Integration Token?"),
       content: t(
-        "If you regenerate the integration token, the previous token will become invalid, and this action cannot be undone. Are you sure you want to proceed?",
+        "If you re-generate the integration token, the previous token will become invalid, and this action cannot be undone. Are you sure you want to proceed?",
       ),
       cancelText: t("Cancel"),
       okText: t("Reset"),
@@ -86,10 +87,6 @@ const MyIntegrationForm: React.FC<Props> = ({
     });
   }, [t, onRegenerateToken]);
 
-  const handleCopy = useCallback(() => {
-    if (integration.config.token) navigator.clipboard.writeText(integration.config.token);
-  }, [integration.config.token]);
-
   return (
     <Form
       form={form}
@@ -112,23 +109,27 @@ const MyIntegrationForm: React.FC<Props> = ({
           <Form.Item name="description" label={t("Description")}>
             <TextArea rows={3} showCount maxLength={100} />
           </Form.Item>
-          <Form.Item label={t("Integration Token")}>
+          <StyledFormItem
+            label={t("Integration Token")}
+            extra={t("This is your secret token, please use as your env value.")}>
             <StyledTokenInput
               value={integration.config.token}
               contentEditable={false}
+              visibilityToggle={{ visible }}
+              iconRender={() => <CopyButton copyable={{ text: integration.config.token }} />}
               prefix={
-                <Tooltip title={t("Token copied!!")} trigger={"click"}>
-                  <Icon icon="copy" onClick={handleCopy} />
-                </Tooltip>
+                <Icon
+                  icon={visible ? "eye" : "eyeInvisible"}
+                  onClick={() => {
+                    setVisible(prev => !prev);
+                  }}
+                />
               }
             />
-            <StyledRegenerateTokenButton
-              type="primary"
-              onClick={handleRegenerateToken}
-              loading={regenerateLoading}>
-              {t("Regenerate")}
-            </StyledRegenerateTokenButton>
-          </Form.Item>
+            <Button onClick={handleRegenerateToken} loading={regenerateLoading}>
+              {t("Re-generate")}
+            </Button>
+          </StyledFormItem>
           <Form.Item>
             <Button
               type="primary"
@@ -182,8 +183,15 @@ const StyledDivider = styled(Divider)`
   height: 100%;
 `;
 
+const StyledFormItem = styled(Form.Item)`
+  .ant-form-item-control-input-content {
+    display: flex;
+    gap: 4px;
+  }
+`;
+
 const StyledTokenInput = styled(Password)`
-  width: calc(100% - 120px);
+  flex: 1;
   .ant-input-prefix {
     order: 1;
     margin-left: 4px;
@@ -198,9 +206,4 @@ const StyledTokenInput = styled(Password)`
   }
 `;
 
-const StyledRegenerateTokenButton = styled(Button)`
-  width: 115px;
-  margin-left: 5px;
-`;
-
 export default MyIntegrationForm;
diff --git a/web/src/components/molecules/ProjectSettings/GeneralForm.tsx b/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
index fab290f1c0..04ebeb9c4c 100644
--- a/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
+++ b/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
@@ -83,6 +83,7 @@ const ProjectGeneralForm: React.FC<Props> = ({
       <Form.Item
         name="alias"
         label={t("Alias")}
+        extra={t("A simpler way to access to the project.")}
         rules={[
           {
             required: true,
diff --git a/web/src/components/molecules/Settings/FormModal.tsx b/web/src/components/molecules/Settings/FormModal.tsx
index 6ebcde038a..2cde61210c 100644
--- a/web/src/components/molecules/Settings/FormModal.tsx
+++ b/web/src/components/molecules/Settings/FormModal.tsx
@@ -198,31 +198,31 @@ const FormModal: React.FC<Props> = ({
           isTile ? (
             <>
               <Form.Item name="name" label={t("Name")} extra={t("Name of tiles")}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
               <Form.Item name="url" label={t("URL")} rules={urlRules}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
               <Form.Item name="image" label={t("Image URL")} rules={urlRules}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
             </>
           ) : (
             <>
               <Form.Item name="name" label={t("Name")} extra={t("Name of terrain")}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
               <Form.Item name="cesiumIonAssetId" label={t("Terrain Cesium Ion asset ID")}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
               <Form.Item name="cesiumIonAccessToken" label={t("Terrain Cesium Ion access token")}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
               <Form.Item name="url" label={t("Terrain URL")} rules={urlRules}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
               <Form.Item name="image" label={t("Image URL")} rules={urlRules}>
-                <Input placeholder={t("example")} />
+                <Input />
               </Form.Item>
             </>
           )
diff --git a/web/src/components/molecules/Workspace/types.ts b/web/src/components/molecules/Workspace/types.ts
index 7f5fc3ca4e..710204c30d 100644
--- a/web/src/components/molecules/Workspace/types.ts
+++ b/web/src/components/molecules/Workspace/types.ts
@@ -1,16 +1,16 @@
 import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
 import { IntegrationMember } from "@reearth-cms/components/molecules/Integration/types";
-import { User } from "@reearth-cms/components/molecules/Member/types";
-import { Role } from "@reearth-cms/components/molecules/Member/types";
+import { User, Role } from "@reearth-cms/components/molecules/Member/types";
 
 export type Project = {
   id: string;
   name: string;
-  description?: string;
-  alias?: string;
-  scope?: PublicScope;
-  assetPublic?: boolean;
-  requestRoles?: Role[];
+  description: string;
+  alias: string;
+  scope: PublicScope;
+  assetPublic: boolean;
+  requestRoles: Role[];
+  token: string;
 };
 
 export type UserMember = {
diff --git a/web/src/components/organisms/CMSWrapper/hooks.ts b/web/src/components/organisms/CMSWrapper/hooks.ts
index d31ec7b4df..a95152d081 100644
--- a/web/src/components/organisms/CMSWrapper/hooks.ts
+++ b/web/src/components/organisms/CMSWrapper/hooks.ts
@@ -3,8 +3,8 @@ import { useParams, useLocation, useNavigate } from "react-router-dom";
 
 import { MenuInfo } from "@reearth-cms/components/atoms/Menu";
 import Notification from "@reearth-cms/components/atoms/Notification";
-import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
 import { UserMember } from "@reearth-cms/components/molecules/Workspace/types";
+import { fromGraphQLProject } from "@reearth-cms/components/organisms/DataConverters/project";
 import {
   fromGraphQLMember,
   fromGraphQLWorkspace,
@@ -13,9 +13,9 @@ import {
   useCreateWorkspaceMutation,
   useGetMeQuery,
   useGetProjectQuery,
-  ProjectPublicationScope,
   WorkspaceMember,
   Workspace as GQLWorkspace,
+  Project as GQLProject,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
 import {
@@ -147,15 +147,7 @@ export default () => {
     if (projectId) {
       const project = projectData?.node?.__typename === "Project" ? projectData.node : undefined;
       if (project) {
-        setCurrentProject({
-          id: project.id,
-          name: project.name,
-          description: project.description,
-          scope: convertScope(project.publication?.scope),
-          alias: project.alias,
-          assetPublic: project.publication?.assetPublic,
-          requestRoles: project.requestRoles ?? undefined,
-        });
+        setCurrentProject(fromGraphQLProject(project as GQLProject));
       }
     } else {
       setCurrentProject(undefined);
@@ -219,13 +211,3 @@ export default () => {
     logoUrl,
   };
 };
-
-const convertScope = (scope?: ProjectPublicationScope): PublicScope | undefined => {
-  switch (scope) {
-    case "PUBLIC":
-      return "public";
-    case "PRIVATE":
-      return "private";
-  }
-  return "private";
-};
diff --git a/web/src/components/organisms/DataConverters/project.ts b/web/src/components/organisms/DataConverters/project.ts
new file mode 100644
index 0000000000..8a5f7f0077
--- /dev/null
+++ b/web/src/components/organisms/DataConverters/project.ts
@@ -0,0 +1,13 @@
+import { Project } from "@reearth-cms/components/molecules/Workspace/types";
+import { Project as GQLProject } from "@reearth-cms/gql/graphql-client-api";
+
+export const fromGraphQLProject = (project: GQLProject): Project => ({
+  id: project.id,
+  name: project.name,
+  description: project.description,
+  scope: project.publication?.scope ?? "PRIVATE",
+  alias: project.alias,
+  assetPublic: project.publication?.assetPublic ?? false,
+  requestRoles: project.requestRoles ?? [],
+  token: project.publication?.token ?? "",
+});
diff --git a/web/src/components/organisms/Project/Accessibility/hooks.ts b/web/src/components/organisms/Project/Accessibility/hooks.ts
index 8406c3b7cc..8721721680 100644
--- a/web/src/components/organisms/Project/Accessibility/hooks.ts
+++ b/web/src/components/organisms/Project/Accessibility/hooks.ts
@@ -1,7 +1,8 @@
-import { useCallback, useState, useEffect, useMemo } from "react";
+import { useCallback, useState, useEffect, useMemo, useRef } from "react";
 
+import Form from "@reearth-cms/components/atoms/Form";
 import Notification from "@reearth-cms/components/atoms/Notification";
-import { PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
+import { FormType, PublicScope } from "@reearth-cms/components/molecules/Accessibility/types";
 import { Model } from "@reearth-cms/components/molecules/Model/types";
 import { fromGraphQLModel } from "@reearth-cms/components/organisms/DataConverters/model";
 import {
@@ -10,6 +11,7 @@ import {
   Model as GQLModel,
   ProjectPublicationScope,
   useUpdateProjectMutation,
+  useRegeneratePublicApiTokenMutation,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
 import { useProject, useUserRights } from "@reearth-cms/state";
@@ -22,13 +24,11 @@ export default () => {
     () => !!userRights?.project.publish,
     [userRights?.project.publish],
   );
-
-  const [models, setModels] = useState<Model[]>();
-  const [scope, setScope] = useState(currentProject?.scope);
-  const [aliasState, setAlias] = useState(currentProject?.alias);
-  const [updatedModels, setUpdatedModels] = useState<Model[]>([]);
-  const [assetState, setAssetState] = useState<boolean | undefined>(currentProject?.assetPublic);
-  const [isSaveDisabled, setIsSaveDisabled] = useState(false);
+  const [form] = Form.useForm<FormType>();
+  const modelsState = Form.useWatch("models", form) ?? {};
+  const assetState = !!Form.useWatch("assetPublic", form);
+  const [isSaveDisabled, setIsSaveDisabled] = useState(true);
+  const [updateLoading, setUpdateLoading] = useState(false);
 
   const { data: modelsData } = useGetModelsQuery({
     variables: {
@@ -38,41 +38,69 @@ export default () => {
     skip: !currentProject?.id,
   });
 
-  useEffect(() => {
-    const filteredModel = modelsData?.models.nodes
-      ?.map<Model | undefined>(model => fromGraphQLModel(model as GQLModel))
-      .filter((model): model is Model => !!model);
-    setModels(filteredModel);
-  }, [modelsData]);
-
-  useEffect(() => {
-    setScope(currentProject?.scope);
-  }, [currentProject?.scope]);
+  const models = useMemo(
+    () =>
+      modelsData?.models.nodes
+        ?.map<Model | undefined>(model => fromGraphQLModel(model as GQLModel))
+        .filter((model): model is Model => !!model) ?? [],
+    [modelsData?.models.nodes],
+  );
 
-  useEffect(() => {
-    setAlias(currentProject?.alias);
-  }, [currentProject?.alias]);
+  const alias = useMemo(() => currentProject?.alias ?? "", [currentProject?.alias]);
+  const token = useMemo(() => currentProject?.token ?? "", [currentProject?.token]);
+
+  const initialValues = useMemo(() => {
+    const modelsObj: Record<string, boolean> = {};
+    models?.forEach(model => {
+      modelsObj[model.id] = !!model.public;
+    });
+    return {
+      scope: currentProject?.scope,
+      alias,
+      token,
+      assetPublic: !!currentProject?.assetPublic,
+      models: modelsObj,
+    };
+  }, [alias, currentProject?.assetPublic, currentProject?.scope, models, token]);
 
   useEffect(() => {
-    setAssetState(currentProject?.assetPublic);
-  }, [currentProject?.assetPublic]);
+    form.setFieldsValue(initialValues);
+  }, [form, initialValues]);
+
+  const changedModels = useRef(new Map<string, boolean>());
+
+  const handleValuesChange = useCallback(
+    (changedValues: Partial<FormType>, values: FormType) => {
+      if (changedValues?.models) {
+        const modelId = Object.keys(changedValues.models)[0];
+        if (changedModels.current.has(modelId)) {
+          changedModels.current.delete(modelId);
+        } else {
+          changedModels.current.set(modelId, changedValues.models[modelId]);
+        }
+      }
+      if (
+        initialValues.scope === values.scope &&
+        initialValues.assetPublic === values.assetPublic &&
+        changedModels.current.size === 0
+      ) {
+        setIsSaveDisabled(true);
+      } else {
+        setIsSaveDisabled(false);
+      }
+    },
+    [initialValues],
+  );
 
-  useEffect(() => {
-    setIsSaveDisabled(
-      updatedModels.length === 0 &&
-        currentProject?.scope === scope &&
-        currentProject?.alias === aliasState &&
-        currentProject?.assetPublic === assetState,
-    );
-  }, [
-    aliasState,
-    assetState,
-    currentProject?.alias,
-    currentProject?.assetPublic,
-    currentProject?.scope,
-    scope,
-    updatedModels.length,
-  ]);
+  const scopeConvert = useCallback((scope?: PublicScope) => {
+    if (scope === "PUBLIC") {
+      return ProjectPublicationScope.Public;
+    } else if (scope === "LIMITED") {
+      return ProjectPublicationScope.Limited;
+    } else {
+      return ProjectPublicationScope.Private;
+    }
+  }, []);
 
   const [updateProjectMutation] = useUpdateProjectMutation();
   const [updateModelMutation] = useUpdateModelMutation({
@@ -80,85 +108,99 @@ export default () => {
   });
 
   const handlePublicUpdate = useCallback(async () => {
-    if (!currentProject?.id || (!scope && updatedModels.length === 0)) return;
-    let errors = false;
-
-    if ((scope && scope !== currentProject.scope) || aliasState) {
-      const gqlScope =
-        scope === "public" ? ProjectPublicationScope.Public : ProjectPublicationScope.Private;
-      const projRes = await updateProjectMutation({
-        variables: {
-          alias: aliasState,
-          projectId: currentProject.id,
-          publication: { scope: gqlScope, assetPublic: assetState },
-        },
-      });
-      if (projRes.errors) {
-        errors = true;
-      }
-    }
-
-    if (updatedModels) {
-      updatedModels.forEach(async model => {
-        const modelRes = await updateModelMutation({
-          variables: { modelId: model.id, public: model.public },
+    if (!currentProject?.id) return;
+    setUpdateLoading(true);
+    try {
+      const { alias, scope, assetPublic } = form.getFieldsValue();
+      if (initialValues.scope !== scope || initialValues.assetPublic !== assetPublic) {
+        const projRes = await updateProjectMutation({
+          variables: {
+            alias,
+            projectId: currentProject.id,
+            publication: {
+              scope: scopeConvert(scope),
+              assetPublic,
+            },
+          },
         });
-        if (modelRes.errors) {
-          errors = true;
+        if (projRes.errors) {
+          throw new Error();
         }
-      });
-    }
-    if (errors) {
-      Notification.error({ message: t("Failed to update publication settings.") });
-    } else {
+      }
+      if (changedModels.current.size) {
+        changedModels.current.forEach(async (value, modelId) => {
+          const modelRes = await updateModelMutation({
+            variables: { modelId, public: value },
+          });
+          if (modelRes.errors) {
+            throw new Error();
+          }
+        });
+      }
       Notification.success({
         message: t("Successfully updated publication settings!"),
       });
+      changedModels.current.clear();
+      setIsSaveDisabled(true);
+    } catch (_) {
+      Notification.error({ message: t("Failed to update publication settings.") });
+      setIsSaveDisabled(false);
+    } finally {
+      setUpdateLoading(false);
     }
-    setUpdatedModels([]);
   }, [
     currentProject?.id,
-    currentProject?.scope,
-    scope,
-    updatedModels,
-    aliasState,
-    updateProjectMutation,
-    assetState,
-    updateModelMutation,
+    form,
+    initialValues.assetPublic,
+    initialValues.scope,
+    scopeConvert,
     t,
+    updateModelMutation,
+    updateProjectMutation,
   ]);
 
-  const handleUpdatedAssetState = useCallback((state: boolean) => {
-    setAssetState(state);
-  }, []);
+  const [regeneratePublicApiToken, { loading: regenerateLoading }] =
+    useRegeneratePublicApiTokenMutation({
+      refetchQueries: ["GetProject"],
+    });
+
+  const handleRegenerateToken = useCallback(async () => {
+    if (!currentProject?.id) return;
+    const result = await regeneratePublicApiToken({
+      variables: {
+        projectId: currentProject.id,
+      },
+    });
+    if (result.errors) {
+      Notification.error({
+        message: t("The attempt to re-generate the Public API Token has failed."),
+      });
+    } else {
+      Notification.success({
+        message: t("Public API Token has been re-generated!"),
+      });
+    }
+  }, [currentProject?.id, regeneratePublicApiToken, t]);
 
-  const handleUpdatedModels = useCallback(
-    (model: Model) => {
-      if (updatedModels.find(um => um.id === model.id)) {
-        setUpdatedModels(ums => ums.filter(um => um.id !== model.id));
-      } else {
-        setUpdatedModels(ums => [...ums, model]);
-      }
-      setModels(ms => ms?.map(m => (m.id === model.id ? { ...m, public: model.public } : m)));
-    },
-    [updatedModels],
+  const apiUrl = useMemo(
+    () => `${window.REEARTH_CONFIG?.api}/p/${currentProject?.alias}/`,
+    [currentProject?.alias],
   );
 
-  const handleSetScope = (projectScope: PublicScope) => {
-    setScope(projectScope);
-  };
-
   return {
+    form,
     models,
-    scope,
-    alias: currentProject?.alias,
-    aliasState,
+    modelsState,
     assetState,
     isSaveDisabled,
     hasPublishRight,
+    updateLoading,
+    regenerateLoading,
+    apiUrl,
+    alias,
+    token,
+    handleValuesChange,
     handlePublicUpdate,
-    handleUpdatedAssetState,
-    handleUpdatedModels,
-    handleSetScope,
+    handleRegenerateToken,
   };
 };
diff --git a/web/src/components/organisms/Project/Accessibility/index.tsx b/web/src/components/organisms/Project/Accessibility/index.tsx
index fa00b23a25..901dac764a 100644
--- a/web/src/components/organisms/Project/Accessibility/index.tsx
+++ b/web/src/components/organisms/Project/Accessibility/index.tsx
@@ -4,32 +4,38 @@ import useHooks from "./hooks";
 
 const Accessibility: React.FC = () => {
   const {
+    form,
     models,
-    scope,
-    alias,
-    aliasState,
+    modelsState,
     assetState,
     isSaveDisabled,
     hasPublishRight,
+    updateLoading,
+    regenerateLoading,
+    apiUrl,
+    alias,
+    token,
+    handleValuesChange,
     handlePublicUpdate,
-    handleUpdatedAssetState,
-    handleUpdatedModels,
-    handleSetScope,
+    handleRegenerateToken,
   } = useHooks();
 
   return (
     <AccessibilityMolecule
+      form={form}
       models={models}
-      scope={scope}
-      alias={alias}
-      aliasState={aliasState}
+      modelsState={modelsState}
       assetState={assetState}
       isSaveDisabled={isSaveDisabled}
       hasPublishRight={hasPublishRight}
-      handlePublicUpdate={handlePublicUpdate}
-      handleUpdatedAssetState={handleUpdatedAssetState}
-      handleUpdatedModels={handleUpdatedModels}
-      handleSetScope={handleSetScope}
+      updateLoading={updateLoading}
+      regenerateLoading={regenerateLoading}
+      apiUrl={apiUrl}
+      alias={alias}
+      token={token}
+      onValuesChange={handleValuesChange}
+      onPublicUpdate={handlePublicUpdate}
+      onRegenerateToken={handleRegenerateToken}
     />
   );
 };
diff --git a/web/src/components/organisms/Project/Schema/hooks.ts b/web/src/components/organisms/Project/Schema/hooks.ts
index 52c1fc7f02..75afe4657a 100644
--- a/web/src/components/organisms/Project/Schema/hooks.ts
+++ b/web/src/components/organisms/Project/Schema/hooks.ts
@@ -328,7 +328,7 @@ export default () => {
         Modal.error({
           title: t("Group cannot be deleted"),
           content: `
-          ${group?.name} ${t("is used in")} ${modelNames}. 
+          ${group?.name}${t("is used in", { modelNames })}  
           ${t("If you want to delete it, please delete the field that uses it first.")}`,
         });
         return;
diff --git a/web/src/components/organisms/Project/settings/hooks.ts b/web/src/components/organisms/Project/settings/hooks.ts
index 49e55393c2..381f49e942 100644
--- a/web/src/components/organisms/Project/settings/hooks.ts
+++ b/web/src/components/organisms/Project/settings/hooks.ts
@@ -3,53 +3,32 @@ import { useNavigate } from "react-router-dom";
 
 import Notification from "@reearth-cms/components/atoms/Notification";
 import { Role } from "@reearth-cms/components/molecules/Member/types";
+import useHooks from "@reearth-cms/components/organisms/Workspace/hooks";
 import {
-  useGetProjectsQuery,
   useUpdateProjectMutation,
   useDeleteProjectMutation,
   Role as GQLRole,
   useCheckProjectAliasLazyQuery,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
-import { useWorkspace, useUserRights } from "@reearth-cms/state";
+import { useWorkspace, useUserRights, useProject } from "@reearth-cms/state";
 
 type Params = {
   projectId?: string;
 };
 
 export default ({ projectId }: Params) => {
+  const { projectsRefetch } = useHooks();
   const t = useT();
   const navigate = useNavigate();
 
   const [currentWorkspace] = useWorkspace();
   const workspaceId = useMemo(() => currentWorkspace?.id, [currentWorkspace?.id]);
+  const [currentProject] = useProject();
   const [userRights] = useUserRights();
   const hasUpdateRight = useMemo(() => !!userRights?.project.update, [userRights?.project.update]);
   const hasDeleteRight = useMemo(() => !!userRights?.project.delete, [userRights?.project.delete]);
 
-  const { data, loading } = useGetProjectsQuery({
-    variables: { workspaceId: workspaceId ?? "", pagination: { first: 100 } },
-    skip: !workspaceId,
-  });
-
-  const rawProject = useMemo(
-    () => data?.projects.nodes.find(p => p?.id === projectId),
-    [data, projectId],
-  );
-  const project = useMemo(
-    () =>
-      rawProject?.id
-        ? {
-            id: rawProject.id,
-            name: rawProject.name,
-            description: rawProject.description,
-            alias: rawProject.alias,
-            requestRoles: rawProject.requestRoles as Role[],
-          }
-        : undefined,
-    [rawProject],
-  );
-
   const [updateProjectMutation] = useUpdateProjectMutation({
     refetchQueries: ["GetProject"],
   });
@@ -66,7 +45,7 @@ export default ({ projectId }: Params) => {
           name,
           alias,
           description,
-          requestRoles: project?.requestRoles as GQLRole[],
+          requestRoles: currentProject?.requestRoles as GQLRole[],
         },
       });
       if (result.errors || !result.data?.updateProject) {
@@ -75,7 +54,7 @@ export default ({ projectId }: Params) => {
       }
       Notification.success({ message: t("Successfully updated project!") });
     },
-    [projectId, updateProjectMutation, project?.requestRoles, t],
+    [projectId, updateProjectMutation, currentProject?.requestRoles, t],
   );
 
   const handleProjectRequestRolesUpdate = useCallback(
@@ -103,9 +82,10 @@ export default ({ projectId }: Params) => {
       Notification.error({ message: t("Failed to delete project.") });
     } else {
       Notification.success({ message: t("Successfully deleted project!") });
+      projectsRefetch();
       navigate(`/workspace/${workspaceId}`);
     }
-  }, [projectId, deleteProjectMutation, navigate, workspaceId, t]);
+  }, [projectId, deleteProjectMutation, t, projectsRefetch, navigate, workspaceId]);
 
   const [assetModalOpened, setOpenAssets] = useState(false);
 
@@ -135,8 +115,7 @@ export default ({ projectId }: Params) => {
   );
 
   return {
-    project,
-    loading,
+    project: currentProject,
     hasUpdateRight,
     hasDeleteRight,
     handleProjectUpdate,
diff --git a/web/src/components/organisms/Project/settings/index.tsx b/web/src/components/organisms/Project/settings/index.tsx
index 7c616f2076..07e698f9e7 100644
--- a/web/src/components/organisms/Project/settings/index.tsx
+++ b/web/src/components/organisms/Project/settings/index.tsx
@@ -10,7 +10,6 @@ const ProjectSettings: React.FC = () => {
 
   const {
     project,
-    loading,
     hasUpdateRight,
     hasDeleteRight,
     handleProjectDelete,
@@ -21,7 +20,7 @@ const ProjectSettings: React.FC = () => {
     projectId,
   });
 
-  return !project || loading ? (
+  return !project ? (
     <Loading minHeight="400px" />
   ) : (
     <ProjectSettingsMolecule
diff --git a/web/src/components/organisms/Settings/Integration/hooks.ts b/web/src/components/organisms/Settings/Integration/hooks.ts
index 3b2aeb3546..26762d18db 100644
--- a/web/src/components/organisms/Settings/Integration/hooks.ts
+++ b/web/src/components/organisms/Settings/Integration/hooks.ts
@@ -154,7 +154,7 @@ export default (workspaceId?: string) => {
             refetchQueries: ["GetMe"],
           });
           if (result.errors) {
-            Notification.error({ message: t("Failed to delete one or more intagrations.") });
+            Notification.error({ message: t("Failed to delete one or more integrations.") });
           }
         }),
       );
diff --git a/web/src/components/organisms/Settings/MyIntegrationDetails/hooks.ts b/web/src/components/organisms/Settings/MyIntegrationDetails/hooks.ts
index d20aa84d6d..e44b67c055 100644
--- a/web/src/components/organisms/Settings/MyIntegrationDetails/hooks.ts
+++ b/web/src/components/organisms/Settings/MyIntegrationDetails/hooks.ts
@@ -10,7 +10,7 @@ import {
   useUpdateWebhookMutation,
   useDeleteWebhookMutation,
   useDeleteIntegrationMutation,
-  useRegenerateTokenMutation,
+  useRegenerateIntegrationTokenMutation,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
 import { useWorkspace } from "@reearth-cms/state";
@@ -77,9 +77,10 @@ export default () => {
     }
   }, [currentWorkspace, integrationId, deleteIntegrationMutation, navigate, t]);
 
-  const [regenerateTokenMutation, { loading: regenerateLoading }] = useRegenerateTokenMutation({
-    refetchQueries: ["GetMe"],
-  });
+  const [regenerateTokenMutation, { loading: regenerateLoading }] =
+    useRegenerateIntegrationTokenMutation({
+      refetchQueries: ["GetMe"],
+    });
 
   const handleRegenerateToken = useCallback(async () => {
     if (!integrationId) return;
@@ -90,11 +91,11 @@ export default () => {
     });
     if (result.errors) {
       Notification.error({
-        message: t("The attempt to regenerate the integration token has failed."),
+        message: t("The attempt to re-generate the integration token has failed."),
       });
     } else {
       Notification.success({
-        message: t("The integration token has been successfully regenerated!"),
+        message: t("Integration Token has been re-generated!"),
       });
     }
   }, [integrationId, regenerateTokenMutation, t]);
diff --git a/web/src/components/organisms/Workspace/hooks.ts b/web/src/components/organisms/Workspace/hooks.ts
index f27243733b..a112aad41b 100644
--- a/web/src/components/organisms/Workspace/hooks.ts
+++ b/web/src/components/organisms/Workspace/hooks.ts
@@ -5,6 +5,7 @@ import Notification from "@reearth-cms/components/atoms/Notification";
 import { FormValues as ProjectFormValues } from "@reearth-cms/components/molecules/Common/ProjectCreationModal";
 import { FormValues as WorkspaceFormValues } from "@reearth-cms/components/molecules/Common/WorkspaceCreationModal";
 import { Project } from "@reearth-cms/components/molecules/Workspace/types";
+import { fromGraphQLProject } from "@reearth-cms/components/organisms/DataConverters/project";
 import { fromGraphQLWorkspace } from "@reearth-cms/components/organisms/DataConverters/setting";
 import {
   useGetProjectsQuery,
@@ -12,6 +13,7 @@ import {
   useCreateWorkspaceMutation,
   Workspace as GQLWorkspace,
   useCheckProjectAliasLazyQuery,
+  Project as GQLProject,
 } from "@reearth-cms/gql/graphql-client-api";
 import { useT } from "@reearth-cms/i18n";
 import { useWorkspace, useUserRights } from "@reearth-cms/state";
@@ -35,31 +37,29 @@ export default () => {
   const {
     data,
     loading: loadingProjects,
-    refetch,
+    refetch: projectsRefetch,
   } = useGetProjectsQuery({
     variables: { workspaceId: workspaceId ?? "", pagination: { first: 100 } },
     skip: !workspaceId,
   });
 
-  const projects = useMemo(() => {
-    return data?.projects.nodes
-      .map<Project | undefined>(project =>
-        project
-          ? {
-              id: project.id,
-              description: project.description,
-              name: project.name,
-            }
-          : undefined,
-      )
-      .filter(
-        (project): project is Project =>
-          !!project &&
-          (!searchedProjectName ||
-            (!!searchedProjectName &&
-              project.name.toLocaleLowerCase().includes(searchedProjectName.toLocaleLowerCase()))),
-      );
-  }, [data?.projects.nodes, searchedProjectName]);
+  const allProjects = useMemo(
+    () =>
+      data?.projects.nodes
+        .map(project => (project ? fromGraphQLProject(project as GQLProject) : undefined))
+        .filter(project => !!project),
+    [data?.projects.nodes],
+  );
+
+  const projects = useMemo(
+    () =>
+      searchedProjectName
+        ? allProjects?.filter(project =>
+            project.name.toLocaleLowerCase().includes(searchedProjectName.toLocaleLowerCase()),
+          )
+        : allProjects,
+    [allProjects, searchedProjectName],
+  );
 
   const [createNewProject] = useCreateProjectMutation({
     refetchQueries: ["GetProjects"],
@@ -67,7 +67,7 @@ export default () => {
 
   const handleProjectSearch = useCallback(
     (value: string) => {
-      setSearchedProjectName?.(value);
+      setSearchedProjectName(value);
     },
     [setSearchedProjectName],
   );
@@ -89,9 +89,9 @@ export default () => {
       }
       Notification.success({ message: t("Successfully created project!") });
       setProjectModalShown(false);
-      refetch();
+      projectsRefetch();
     },
-    [createNewProject, workspaceId, refetch, t],
+    [createNewProject, workspaceId, projectsRefetch, t],
   );
 
   const handleProjectModalClose = useCallback(() => {
@@ -122,9 +122,9 @@ export default () => {
         );
         navigate(`/workspace/${results.data.createWorkspace.workspace.id}`);
       }
-      refetch();
+      projectsRefetch();
     },
-    [createWorkspaceMutation, setCurrentWorkspace, refetch, navigate, t],
+    [createWorkspaceMutation, setCurrentWorkspace, projectsRefetch, navigate, t],
   );
 
   const handleWorkspaceModalClose = useCallback(() => {
@@ -163,5 +163,6 @@ export default () => {
     handleWorkspaceModalOpen,
     handleWorkspaceCreate,
     handleProjectAliasCheck,
+    projectsRefetch,
   };
 };
diff --git a/web/src/gql/graphql-client-api.tsx b/web/src/gql/graphql-client-api.tsx
index 27b9a7a18e..318c77939f 100644
--- a/web/src/gql/graphql-client-api.tsx
+++ b/web/src/gql/graphql-client-api.tsx
@@ -803,7 +803,8 @@ export type Mutation = {
   deleteWorkspace?: Maybe<DeleteWorkspacePayload>;
   publishItem?: Maybe<PublishItemPayload>;
   publishModel?: Maybe<PublishModelPayload>;
-  regenerateToken?: Maybe<IntegrationPayload>;
+  regenerateIntegrationToken?: Maybe<IntegrationPayload>;
+  regeneratePublicApiToken?: Maybe<ProjectPayload>;
   removeIntegrationFromWorkspace?: Maybe<RemoveIntegrationFromWorkspacePayload>;
   removeMultipleMembersFromWorkspace?: Maybe<RemoveMultipleMembersFromWorkspacePayload>;
   removeMyAuth?: Maybe<UpdateMePayload>;
@@ -996,8 +997,13 @@ export type MutationPublishModelArgs = {
 };
 
 
-export type MutationRegenerateTokenArgs = {
-  input: RegenerateTokenInput;
+export type MutationRegenerateIntegrationTokenArgs = {
+  input: RegenerateIntegrationTokenInput;
+};
+
+
+export type MutationRegeneratePublicApiTokenArgs = {
+  input: RegeneratePublicApiTokenInput;
 };
 
 
@@ -1270,6 +1276,7 @@ export type ProjectPublication = {
   __typename?: 'ProjectPublication';
   assetPublic: Scalars['Boolean']['output'];
   scope: ProjectPublicationScope;
+  token?: Maybe<Scalars['String']['output']>;
 };
 
 export enum ProjectPublicationScope {
@@ -1422,10 +1429,14 @@ export type QueryViewArgs = {
   modelId: Scalars['ID']['input'];
 };
 
-export type RegenerateTokenInput = {
+export type RegenerateIntegrationTokenInput = {
   integrationId: Scalars['ID']['input'];
 };
 
+export type RegeneratePublicApiTokenInput = {
+  projectId: Scalars['ID']['input'];
+};
+
 export type RemoveIntegrationFromWorkspaceInput = {
   integrationId: Scalars['ID']['input'];
   workspaceId: Scalars['ID']['input'];
@@ -2517,12 +2528,12 @@ export type DeleteIntegrationMutationVariables = Exact<{
 
 export type DeleteIntegrationMutation = { __typename?: 'Mutation', deleteIntegration?: { __typename?: 'DeleteIntegrationPayload', integrationId: string } | null };
 
-export type RegenerateTokenMutationVariables = Exact<{
+export type RegenerateIntegrationTokenMutationVariables = Exact<{
   integrationId: Scalars['ID']['input'];
 }>;
 
 
-export type RegenerateTokenMutation = { __typename?: 'Mutation', regenerateToken?: { __typename?: 'IntegrationPayload', integration: { __typename?: 'Integration', id: string, name: string, description?: string | null, logoUrl: string, iType: IntegrationType } } | null };
+export type RegenerateIntegrationTokenMutation = { __typename?: 'Mutation', regenerateIntegrationToken?: { __typename?: 'IntegrationPayload', integration: { __typename?: 'Integration', id: string, name: string, description?: string | null, logoUrl: string, iType: IntegrationType } } | null };
 
 export type GetItemsQueryVariables = Exact<{
   query: ItemQueryInput;
@@ -2658,7 +2669,7 @@ export type GetProjectQueryVariables = Exact<{
 }>;
 
 
-export type GetProjectQuery = { __typename?: 'Query', node?: { __typename?: 'Asset', id: string } | { __typename?: 'Group', id: string } | { __typename?: 'Integration', id: string } | { __typename?: 'Item', id: string } | { __typename?: 'Model', id: string } | { __typename?: 'Project', name: string, description: string, alias: string, requestRoles?: Array<Role> | null, id: string, publication?: { __typename?: 'ProjectPublication', scope: ProjectPublicationScope, assetPublic: boolean } | null } | { __typename?: 'Request', id: string } | { __typename?: 'Schema', id: string } | { __typename?: 'User', id: string } | { __typename?: 'View', id: string } | { __typename?: 'Workspace', id: string } | { __typename?: 'WorkspaceSettings', id: string } | null };
+export type GetProjectQuery = { __typename?: 'Query', node?: { __typename?: 'Asset', id: string } | { __typename?: 'Group', id: string } | { __typename?: 'Integration', id: string } | { __typename?: 'Item', id: string } | { __typename?: 'Model', id: string } | { __typename?: 'Project', name: string, description: string, alias: string, requestRoles?: Array<Role> | null, id: string, publication?: { __typename?: 'ProjectPublication', scope: ProjectPublicationScope, assetPublic: boolean, token?: string | null } | null } | { __typename?: 'Request', id: string } | { __typename?: 'Schema', id: string } | { __typename?: 'User', id: string } | { __typename?: 'View', id: string } | { __typename?: 'Workspace', id: string } | { __typename?: 'WorkspaceSettings', id: string } | null };
 
 export type GetProjectsQueryVariables = Exact<{
   workspaceId: Scalars['ID']['input'];
@@ -2704,6 +2715,13 @@ export type UpdateProjectMutationVariables = Exact<{
 
 export type UpdateProjectMutation = { __typename?: 'Mutation', updateProject?: { __typename?: 'ProjectPayload', project: { __typename?: 'Project', id: string, name: string, description: string, alias: string, requestRoles?: Array<Role> | null, publication?: { __typename?: 'ProjectPublication', scope: ProjectPublicationScope, assetPublic: boolean } | null } } | null };
 
+export type RegeneratePublicApiTokenMutationVariables = Exact<{
+  projectId: Scalars['ID']['input'];
+}>;
+
+
+export type RegeneratePublicApiTokenMutation = { __typename?: 'Mutation', regeneratePublicApiToken?: { __typename?: 'ProjectPayload', project: { __typename?: 'Project', id: string } } | null };
+
 export type GetRequestsQueryVariables = Exact<{
   projectId: Scalars['ID']['input'];
   key?: InputMaybe<Scalars['String']['input']>;
@@ -4494,9 +4512,9 @@ export function useDeleteIntegrationMutation(baseOptions?: Apollo.MutationHookOp
 export type DeleteIntegrationMutationHookResult = ReturnType<typeof useDeleteIntegrationMutation>;
 export type DeleteIntegrationMutationResult = Apollo.MutationResult<DeleteIntegrationMutation>;
 export type DeleteIntegrationMutationOptions = Apollo.BaseMutationOptions<DeleteIntegrationMutation, DeleteIntegrationMutationVariables>;
-export const RegenerateTokenDocument = gql`
-    mutation regenerateToken($integrationId: ID!) {
-  regenerateToken(input: {integrationId: $integrationId}) {
+export const RegenerateIntegrationTokenDocument = gql`
+    mutation regenerateIntegrationToken($integrationId: ID!) {
+  regenerateIntegrationToken(input: {integrationId: $integrationId}) {
     integration {
       id
       name
@@ -4507,32 +4525,32 @@ export const RegenerateTokenDocument = gql`
   }
 }
     `;
-export type RegenerateTokenMutationFn = Apollo.MutationFunction<RegenerateTokenMutation, RegenerateTokenMutationVariables>;
+export type RegenerateIntegrationTokenMutationFn = Apollo.MutationFunction<RegenerateIntegrationTokenMutation, RegenerateIntegrationTokenMutationVariables>;
 
 /**
- * __useRegenerateTokenMutation__
+ * __useRegenerateIntegrationTokenMutation__
  *
- * To run a mutation, you first call `useRegenerateTokenMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useRegenerateTokenMutation` returns a tuple that includes:
+ * To run a mutation, you first call `useRegenerateIntegrationTokenMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useRegenerateIntegrationTokenMutation` returns a tuple that includes:
  * - A mutate function that you can call at any time to execute the mutation
  * - An object with fields that represent the current status of the mutation's execution
  *
  * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
  *
  * @example
- * const [regenerateTokenMutation, { data, loading, error }] = useRegenerateTokenMutation({
+ * const [regenerateIntegrationTokenMutation, { data, loading, error }] = useRegenerateIntegrationTokenMutation({
  *   variables: {
  *      integrationId: // value for 'integrationId'
  *   },
  * });
  */
-export function useRegenerateTokenMutation(baseOptions?: Apollo.MutationHookOptions<RegenerateTokenMutation, RegenerateTokenMutationVariables>) {
+export function useRegenerateIntegrationTokenMutation(baseOptions?: Apollo.MutationHookOptions<RegenerateIntegrationTokenMutation, RegenerateIntegrationTokenMutationVariables>) {
         const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useMutation<RegenerateTokenMutation, RegenerateTokenMutationVariables>(RegenerateTokenDocument, options);
+        return Apollo.useMutation<RegenerateIntegrationTokenMutation, RegenerateIntegrationTokenMutationVariables>(RegenerateIntegrationTokenDocument, options);
       }
-export type RegenerateTokenMutationHookResult = ReturnType<typeof useRegenerateTokenMutation>;
-export type RegenerateTokenMutationResult = Apollo.MutationResult<RegenerateTokenMutation>;
-export type RegenerateTokenMutationOptions = Apollo.BaseMutationOptions<RegenerateTokenMutation, RegenerateTokenMutationVariables>;
+export type RegenerateIntegrationTokenMutationHookResult = ReturnType<typeof useRegenerateIntegrationTokenMutation>;
+export type RegenerateIntegrationTokenMutationResult = Apollo.MutationResult<RegenerateIntegrationTokenMutation>;
+export type RegenerateIntegrationTokenMutationOptions = Apollo.BaseMutationOptions<RegenerateIntegrationTokenMutation, RegenerateIntegrationTokenMutationVariables>;
 export const GetItemsDocument = gql`
     query GetItems($query: ItemQueryInput!, $pagination: Pagination) {
   searchItem(input: {query: $query, pagination: $pagination}) {
@@ -5583,6 +5601,7 @@ export const GetProjectDocument = gql`
       publication {
         scope
         assetPublic
+        token
       }
       requestRoles
     }
@@ -5844,6 +5863,41 @@ export function useUpdateProjectMutation(baseOptions?: Apollo.MutationHookOption
 export type UpdateProjectMutationHookResult = ReturnType<typeof useUpdateProjectMutation>;
 export type UpdateProjectMutationResult = Apollo.MutationResult<UpdateProjectMutation>;
 export type UpdateProjectMutationOptions = Apollo.BaseMutationOptions<UpdateProjectMutation, UpdateProjectMutationVariables>;
+export const RegeneratePublicApiTokenDocument = gql`
+    mutation RegeneratePublicApiToken($projectId: ID!) {
+  regeneratePublicApiToken(input: {projectId: $projectId}) {
+    project {
+      id
+    }
+  }
+}
+    `;
+export type RegeneratePublicApiTokenMutationFn = Apollo.MutationFunction<RegeneratePublicApiTokenMutation, RegeneratePublicApiTokenMutationVariables>;
+
+/**
+ * __useRegeneratePublicApiTokenMutation__
+ *
+ * To run a mutation, you first call `useRegeneratePublicApiTokenMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useRegeneratePublicApiTokenMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [regeneratePublicApiTokenMutation, { data, loading, error }] = useRegeneratePublicApiTokenMutation({
+ *   variables: {
+ *      projectId: // value for 'projectId'
+ *   },
+ * });
+ */
+export function useRegeneratePublicApiTokenMutation(baseOptions?: Apollo.MutationHookOptions<RegeneratePublicApiTokenMutation, RegeneratePublicApiTokenMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<RegeneratePublicApiTokenMutation, RegeneratePublicApiTokenMutationVariables>(RegeneratePublicApiTokenDocument, options);
+      }
+export type RegeneratePublicApiTokenMutationHookResult = ReturnType<typeof useRegeneratePublicApiTokenMutation>;
+export type RegeneratePublicApiTokenMutationResult = Apollo.MutationResult<RegeneratePublicApiTokenMutation>;
+export type RegeneratePublicApiTokenMutationOptions = Apollo.BaseMutationOptions<RegeneratePublicApiTokenMutation, RegeneratePublicApiTokenMutationVariables>;
 export const GetRequestsDocument = gql`
     query GetRequests($projectId: ID!, $key: String, $state: [RequestState!], $pagination: Pagination, $createdBy: ID, $reviewer: ID, $sort: Sort) {
   requests(
diff --git a/web/src/gql/graphql.schema.json b/web/src/gql/graphql.schema.json
index 4adf4987b2..f2d3dba388 100644
--- a/web/src/gql/graphql.schema.json
+++ b/web/src/gql/graphql.schema.json
@@ -7782,7 +7782,7 @@
             "deprecationReason": null
           },
           {
-            "name": "regenerateToken",
+            "name": "regenerateIntegrationToken",
             "description": null,
             "args": [
               {
@@ -7793,7 +7793,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
-                    "name": "RegenerateTokenInput",
+                    "name": "RegenerateIntegrationTokenInput",
                     "ofType": null
                   }
                 },
@@ -7810,6 +7810,35 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "regeneratePublicApiToken",
+            "description": null,
+            "args": [
+              {
+                "name": "input",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "RegeneratePublicApiTokenInput",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "OBJECT",
+              "name": "ProjectPayload",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "removeIntegrationFromWorkspace",
             "description": null,
@@ -9774,6 +9803,18 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "token",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -10814,7 +10855,7 @@
       },
       {
         "kind": "INPUT_OBJECT",
-        "name": "RegenerateTokenInput",
+        "name": "RegenerateIntegrationTokenInput",
         "description": null,
         "isOneOf": false,
         "fields": null,
@@ -10840,6 +10881,34 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "RegeneratePublicApiTokenInput",
+        "description": null,
+        "isOneOf": false,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "projectId",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "RemoveIntegrationFromWorkspaceInput",
diff --git a/web/src/gql/queries/integration.ts b/web/src/gql/queries/integration.ts
index ec6f9d11d8..c6a5f8e697 100644
--- a/web/src/gql/queries/integration.ts
+++ b/web/src/gql/queries/integration.ts
@@ -55,9 +55,9 @@ export const DELETE_INTEGRATION = gql`
   }
 `;
 
-export const REGENERATE_TOKEN = gql`
-  mutation regenerateToken($integrationId: ID!) {
-    regenerateToken(input: { integrationId: $integrationId }) {
+export const REGENERATE_INTEGRATION_TOKEN = gql`
+  mutation regenerateIntegrationToken($integrationId: ID!) {
+    regenerateIntegrationToken(input: { integrationId: $integrationId }) {
       integration {
         id
         name
diff --git a/web/src/gql/queries/project.ts b/web/src/gql/queries/project.ts
index 8fadab747f..742a3731eb 100644
--- a/web/src/gql/queries/project.ts
+++ b/web/src/gql/queries/project.ts
@@ -11,6 +11,7 @@ export const GET_PROJECT = gql`
         publication {
           scope
           assetPublic
+          token
         }
         requestRoles
       }
@@ -110,3 +111,13 @@ export const UPDATE_PROJECT = gql`
     }
   }
 `;
+
+export const REGENERATE_PUBLIC_API_TOKEN = gql`
+  mutation RegeneratePublicApiToken($projectId: ID!) {
+    regeneratePublicApiToken(input: { projectId: $projectId }) {
+      project {
+        id
+      }
+    }
+  }
+`;
diff --git a/web/src/i18n/translations/en.yml b/web/src/i18n/translations/en.yml
index c7dcb4d9c7..e80094a13e 100644
--- a/web/src/i18n/translations/en.yml
+++ b/web/src/i18n/translations/en.yml
@@ -1,3 +1,5 @@
+Copy: ''
+Copied: ''
 Download: ''
 Loading: ''
 Oops!: ''
@@ -9,12 +11,17 @@ Switch: ''
 End point: ''
 Assets: ''
 Private: ''
+Limited: ''
 Public: ''
 Accessibility: ''
+Control the visibility scope of the Content API: ''
 Public Scope: ''
-Choose the scope of your project. This affects all the models shown below that are switched on.: ''
+Choose your project public method.: ''
 Project Alias: ''
-Alias copied!!: ''
+Edit Project Alias in Project Setting.: ''
+Token: ''
+This is your secret token, please use as your env value.: ''
+Re-generate: ''
 Save changes: ''
 Are you sure you want to delete your account?: ''
 Cancel: ''
@@ -35,6 +42,7 @@ Auto: ''
 Service Language: ''
 This will change the UI language: ''
 Language: ''
+Copy URL: ''
 URL copied!!: ''
 Unzip: ''
 Asset Type: ''
@@ -235,17 +243,16 @@ Create: ''
 Integration Name: ''
 Please input the title of the integration!: ''
 Create new integration: ''
+Create and test your own integration.: ''
 Are you sure to remove this integration?: ''
 Permanently remove your Integration and all of its contents from the Re:Earth CMS.: ''
 Once the integration is removed, it will disappear from all workspaces.: ''
 Remove Integration: ''
 Permanently remove your Integration and all of its contents from the Re:Earth CMS. This action is not reversible – please continue with caution.: ''
-Regenerate The Integration Token?: ''
-If you regenerate the integration token, the previous token will become invalid, and this action cannot be undone. Are you sure you want to proceed?: ''
+Re-generate The Integration Token?: ''
+If you re-generate the integration token, the previous token will become invalid, and this action cannot be undone. Are you sure you want to proceed?: ''
 Reset: ''
 Integration Token: ''
-Token copied!!: ''
-Regenerate: ''
 Code Example: ''
 your model id here: ''
 your Integration Token here: ''
@@ -272,6 +279,7 @@ Are you sure you want to delete this project?: ''
 Delete Project: ''
 Permanently removes your project and all of its contents from Re:Earth CMS. This action is not reversible, so please continue with caution.: ''
 Alias: ''
+A simpler way to access to the project.: ''
 Write something here to describe this record.: ''
 Project Settings: ''
 Need request: ''
@@ -398,7 +406,6 @@ Update Terrain: ''
 Tiles type: ''
 Terrain type: ''
 Name of tiles: ''
-example: ''
 Image URL: ''
 Name of terrain: ''
 Terrain Cesium Ion asset ID: ''
@@ -447,8 +454,10 @@ Failed to update comment.: ''
 Successfully updated comment!: ''
 Failed to delete comment.: ''
 Successfully deleted comment!: ''
-Failed to update publication settings.: ''
 Successfully updated publication settings!: ''
+Failed to update publication settings.: ''
+The attempt to re-generate the Public API Token has failed.: ''
+Public API Token has been re-generated!: ''
 Failed to update asset.: ''
 Asset was successfully updated!: ''
 Failed to decompress asset.: ''
@@ -510,7 +519,7 @@ Successfully updated field!: ''
 Failed to create field.: ''
 Successfully created field!: ''
 Group cannot be deleted: ''
-is used in: ''
+is used in: ' is used in {{modelNames}}.'
 If you want to delete it, please delete the field that uses it first.: ''
 Failed to delete group.: ''
 Successfully deleted group!: ''
@@ -531,7 +540,7 @@ Failed to connect integration.: ''
 Successfully connected integration to the workspace!: ''
 Failed to update workspace integration.: ''
 Successfully updated workspace integration!: ''
-Failed to delete one or more intagrations.: ''
+Failed to delete one or more integrations.: ''
 One or more integrations were successfully deleted!: ''
 Failed to add one or more members.: ''
 Successfully added member(s) to the workspace!: ''
@@ -545,8 +554,8 @@ Failed to update integration.: ''
 Successfully updated integration!: ''
 Failed to delete integration.: ''
 Successfully deleted integration!: ''
-The attempt to regenerate the integration token has failed.: ''
-The integration token has been successfully regenerated!: ''
+The attempt to re-generate the integration token has failed.: ''
+Integration Token has been re-generated!: ''
 Failed to create webhook.: ''
 Successfully created webhook!: ''
 Failed to delete webhook.: ''
diff --git a/web/src/i18n/translations/ja.yml b/web/src/i18n/translations/ja.yml
index a0b775d911..6e73d7a918 100644
--- a/web/src/i18n/translations/ja.yml
+++ b/web/src/i18n/translations/ja.yml
@@ -1,3 +1,5 @@
+Copy: コピー
+Copied: コピーしました
 Download: ダウンロード
 Loading: ローディング中
 Oops!: ''
@@ -9,12 +11,17 @@ Switch: 切り替え
 End point: エンドポイント
 Assets: アセット
 Private: 非公開
+Limited: 限定公開
 Public: 公開
 Accessibility: 公開設定
+Control the visibility scope of the Content API: コンテンツAPIの公開範囲を制御
 Public Scope: 公開範囲
-Choose the scope of your project. This affects all the models shown below that are switched on.: プロジェクトの公開範囲を選択してください。この操作は以下のすべてのモデルに影響します。
+Choose your project public method.: プロジェクトの公開範囲を選択してください。
 Project Alias: プロジェクトエイリアス
-Alias copied!!: エイリアスをコピーしました！
+Edit Project Alias in Project Setting.: プロジェクト設定にてプロジェクトエイリアスを編集することができます。
+Token: トークン
+This is your secret token, please use as your env value.: これは秘密のトークンです。環境変数の値として使用してください。
+Re-generate: 再生成
 Save changes: 変更を保存
 Are you sure you want to delete your account?: 本当にアカウントを削除してよろしいですか？
 Cancel: キャンセル
@@ -35,6 +42,7 @@ Auto: 自動
 Service Language: 利用言語
 This will change the UI language: UIの言語設定を変更します。
 Language: 言語
+Copy URL: URLをコピー
 URL copied!!: URLをコピーしました！
 Unzip: ''
 Asset Type: アセットの種類
@@ -235,17 +243,16 @@ Create: 作成
 Integration Name: インテグレーション名
 Please input the title of the integration!: インテグレーションの名前を入力してください
 Create new integration: 新規インテグレーション作成
+Create and test your own integration.: 独自のインテグレーションの作成とテストをすることができます。
 Are you sure to remove this integration?: 本当にこのインテグレーションを削除してよろしいですか？
 Permanently remove your Integration and all of its contents from the Re:Earth CMS.: インテグレーションを削除します。
 Once the integration is removed, it will disappear from all workspaces.: インテグレーション削除すると、このインテグレーションを利用しているすべてのワークスペースから取り除かれます。
 Remove Integration: インテグレーションを削除
 Permanently remove your Integration and all of its contents from the Re:Earth CMS. This action is not reversible – please continue with caution.: インテグレーションを削除します。この操作は取り消すことができません。
-Regenerate The Integration Token?: インテグレーショントークンを再生成しますか？
-If you regenerate the integration token, the previous token will become invalid, and this action cannot be undone. Are you sure you want to proceed?: インテグレーショントークンを再生成すると、以前のトークンは無効になり、この操作は元に戻せません。本当に続行しますか？
+Re-generate The Integration Token?: インテグレーショントークンを再生成しますか？
+If you re-generate the integration token, the previous token will become invalid, and this action cannot be undone. Are you sure you want to proceed?: インテグレーショントークンを再生成すると、以前のトークンは無効になり、この操作は元に戻せません。本当に続行しますか？
 Reset: リセット
 Integration Token: インテグレーショントークン
-Token copied!!: トークンをコピーしました！
-Regenerate: 再生成
 Code Example: コード例
 your model id here: モデルIDをここに入力してください
 your Integration Token here: インテグレーショントークンをここに入力してください
@@ -272,6 +279,7 @@ Are you sure you want to delete this project?: 本当にプロジェクトを削
 Delete Project: プロジェクトを削除
 Permanently removes your project and all of its contents from Re:Earth CMS. This action is not reversible, so please continue with caution.: プロジェクトとその内容をRe:Earth CMSから完全に削除します。このアクションは元に戻せません。
 Alias: エイリアス
+A simpler way to access to the project.: プロジェクトにアクセスするためのシンプルな方法です。
 Write something here to describe this record.: このレコードの説明を入力してください。
 Project Settings: プロジェクト設定
 Need request: リクエストの要否
@@ -398,7 +406,6 @@ Update Terrain: 地形を更新
 Tiles type: タイルの種類
 Terrain type: 地形の種類
 Name of tiles: タイルの名前
-example: ''
 Image URL: イメージURL
 Name of terrain: 地形の名前
 Terrain Cesium Ion asset ID: Terrain Cesium Ion アセットID
@@ -447,8 +454,10 @@ Failed to update comment.: コメントの更新に失敗しました。
 Successfully updated comment!: コメントの更新に成功しました。
 Failed to delete comment.: コメントの削除に失敗しました。
 Successfully deleted comment!: コメントの削除に成功しました。
+Successfully updated publication settings!: 公開設定の更新に成功しました。
 Failed to update publication settings.: 公開設定の更新に失敗しました。
-Successfully updated publication settings!: 公開設定の更新に更新に成功しました。
+The attempt to re-generate the Public API Token has failed.: 公開APIトークンの再生成に失敗しました。
+Public API Token has been re-generated!: 公開APIトークンの再生成に成功しました！
 Failed to update asset.: アセットの更新に失敗しました。
 Asset was successfully updated!: アセットの更新に成功しました。
 Failed to decompress asset.: アセットの解凍に失敗しました。
@@ -510,8 +519,8 @@ Successfully updated field!: フィールドの更新に成功しました。
 Failed to create field.: フィールドの作成に失敗しました。
 Successfully created field!: フィールドの作成に成功しました。
 Group cannot be deleted: グループを削除できません。
-is used in: ''
-If you want to delete it, please delete the field that uses it first.: 削除したい場合は、まずそれを使っているフィールドを削除してください。
+is used in: は {{modelNames}} にて使用されています。
+If you want to delete it, please delete the field that uses it first.: 削除したい場合は、このグループを使用しているフィールドを先に削除してください。
 Failed to delete group.: グループの削除に失敗しました
 Successfully deleted group!: グループの削除に成功しました！
 Failed to update group.: グループの更新に失敗しました。
@@ -531,7 +540,7 @@ Failed to connect integration.: インテグレーションの接続に失敗し
 Successfully connected integration to the workspace!: インテグレーションの接続に成功しました。
 Failed to update workspace integration.: ワークスペースのインテグレーションの更新に失敗しました。
 Successfully updated workspace integration!: ワークスペースのインテグレーションの更新に成功しました。
-Failed to delete one or more intagrations.: インテグレーションの削除に失敗しました。
+Failed to delete one or more integrations.: インテグレーションの削除に失敗しました。
 One or more integrations were successfully deleted!: インテグレーションの削除に成功しました。
 Failed to add one or more members.: メンバーの追加に失敗しました。
 Successfully added member(s) to the workspace!: メンバーの追加に成功しました。
@@ -545,8 +554,8 @@ Failed to update integration.: インテグレーションの更新に失敗し
 Successfully updated integration!: インテグレーションの更新に成功しました。
 Failed to delete integration.: インテグレーションの削除に失敗しました。
 Successfully deleted integration!: インテグレーションの削除に成功しました。
-The attempt to regenerate the integration token has failed.: インテグレーショントークンの再生成に失敗しました。
-The integration token has been successfully regenerated!: インテグレーショントークンの再生成に成功しました！
+The attempt to re-generate the integration token has failed.: インテグレーショントークンの再生成に失敗しました。
+Integration Token has been re-generated!: インテグレーショントークンの再生成に成功しました！
 Failed to create webhook.: Webhookの作成に失敗しました。
 Successfully created webhook!: Webhookの作成に成功しました。
 Failed to delete webhook.: Webhookの削除に失敗しました。

From 6a889ca8e1366f16c3d2fbff8d2903ae50d5a2fc Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Wed, 13 Nov 2024 13:30:52 +0900
Subject: [PATCH 25/28] fix(web): show request title on linked request and item
 title on request content (#1300)

* show request title on linked request

* show item title on request detail

* fix: e2e test

* fix: use item id for key
---
 web/e2e/project/request.spec.ts               | 52 ++++++++++++-------
 web/e2e/project/utils/field.ts                | 15 ++++++
 web/e2e/project/utils/item.ts                 | 22 ++++++--
 web/e2e/project/utils/model.ts                |  4 +-
 .../molecules/Content/Form/SidebarWrapper.tsx |  2 +-
 web/src/components/molecules/Content/types.ts |  2 +-
 .../Request/Details/RequestDescription.tsx    | 15 +++---
 web/src/components/molecules/Request/types.ts | 21 ++++----
 .../organisms/DataConverters/content.ts       |  8 ++-
 .../organisms/Project/Content/hooks.ts        |  3 +-
 web/src/gql/fragments/request.ts              |  1 +
 web/src/gql/graphql-client-api.tsx            | 14 ++---
 web/src/gql/queries/item.ts                   |  1 +
 13 files changed, 108 insertions(+), 52 deletions(-)

diff --git a/web/e2e/project/request.spec.ts b/web/e2e/project/request.spec.ts
index d19c84bd69..b077df4dbc 100644
--- a/web/e2e/project/request.spec.ts
+++ b/web/e2e/project/request.spec.ts
@@ -2,21 +2,20 @@ import { closeNotification } from "@reearth-cms/e2e/common/notification";
 import { expect, test } from "@reearth-cms/e2e/utils";
 
 import { crudComment } from "./utils/comment";
-import { createRequest } from "./utils/item";
-import { createModel } from "./utils/model";
+import { createTitleField, itemTitle, titleFieldName } from "./utils/field";
+import { createItem, createRequest, requestTitle } from "./utils/item";
+import { createModel, modelName } from "./utils/model";
 import { createProject, deleteProject } from "./utils/project";
 import { createWorkspace, deleteWorkspace } from "./utils/workspace";
 
-const requestTitle = "title";
-
 test.beforeEach(async ({ reearth, page }) => {
   await reearth.goto("/", { waitUntil: "domcontentloaded" });
-  const username = await page.locator("a").nth(1).locator("div").nth(2).locator("p").innerText();
-
   await createWorkspace(page);
   await createProject(page);
   await createModel(page);
-  await createRequest(page, username, requestTitle);
+  await createTitleField(page);
+  await createItem(page);
+  await createRequest(page);
 });
 
 test.afterEach(async ({ page }) => {
@@ -78,7 +77,7 @@ test("Request closing and reopening has succeeded", async ({ page }) => {
   await page.getByRole("button", { name: "Reopen" }).click();
   await closeNotification(page);
   await page.getByLabel("Back").click();
-  await expect(page.locator("tbody").getByText("title", { exact: true })).toBeVisible();
+  await expect(page.locator("tbody").getByText(requestTitle, { exact: true })).toBeVisible();
   await expect(page.locator("tbody").getByText("WAITING")).toBeVisible();
   await page.getByLabel("", { exact: true }).check();
   await page.getByText("Close").click();
@@ -137,15 +136,30 @@ test("Creating a new request and adding to request has succeeded", async ({ page
   await expect(page.getByRole("button", { name: "collapsed e2e model name" }).nth(1)).toBeVisible();
 });
 
-test("Navigating from request to item has succeeded", async ({ page }) => {
-  await page.getByText("Request", { exact: true }).click();
-  await page.getByLabel("edit").locator("svg").click();
-  const itemLink = page
-    .getByRole("button", { name: "collapsed e2e model name /" })
-    .getByRole("button");
-  const itemId = await itemLink.innerText();
-  await itemLink.click();
-  await expect(page.getByRole("main")).toContainText("Content");
-  await expect(page.getByRole("main")).toContainText("e2e model name");
-  await expect(page.getByRole("main")).toContainText(itemId);
+test("Navigating between item and request has succeeded", async ({ page }) => {
+  await page.getByRole("button", { name: requestTitle }).first().click();
+  await expect(page.getByText(`Request / ${requestTitle}`)).toBeVisible();
+  await expect(page.getByRole("heading", { name: requestTitle })).toBeVisible();
+  await page.getByRole("button", { name: itemTitle }).last().click();
+  await page.getByLabel(`${titleFieldName}Title`).click();
+  await page.getByLabel(`${titleFieldName}Title`).fill("");
+  await page.getByRole("button", { name: "Save" }).click();
+  await closeNotification(page);
+  const itemId = await page
+    .getByRole("main")
+    .locator("p")
+    .filter({ hasText: "ID" })
+    .locator("div > span")
+    .innerText();
+  await expect(page.getByText(`${modelName} / ${itemId}`)).toBeVisible();
+  const newRequestTitle = "newRequestTitle";
+  await createRequest(page, newRequestTitle);
+  await page.getByLabel(`${titleFieldName}Title`).click();
+  await page.getByLabel(`${titleFieldName}Title`).fill("newItemTitle");
+  await page.getByRole("button", { name: "Save" }).click();
+  await closeNotification(page);
+  await page.getByRole("button", { name: newRequestTitle }).first().click();
+  await expect(
+    page.getByRole("button", { name: `collapsed ${modelName} / ${itemId}` }),
+  ).toBeVisible();
 });
diff --git a/web/e2e/project/utils/field.ts b/web/e2e/project/utils/field.ts
index 317b61ab0b..22b7fe7d5f 100644
--- a/web/e2e/project/utils/field.ts
+++ b/web/e2e/project/utils/field.ts
@@ -12,3 +12,18 @@ export async function handleFieldForm(page: Page, name: string, key = name) {
   await expect(page.getByText(`${name}#${key}`)).toBeVisible();
   await closeNotification(page);
 }
+
+export const titleFieldName = "titleFieldName";
+export const itemTitle = "itemTitle";
+
+export async function createTitleField(page: Page) {
+  await page.locator("li").filter({ hasText: "Text" }).locator("div").first().click();
+  await page.getByLabel("Display name").click();
+  await page.getByLabel("Display name").fill(titleFieldName);
+  await page.getByLabel("Use as title").check();
+  await page.getByRole("tab", { name: "Default value" }).click();
+  await page.getByLabel("Set default value").click();
+  await page.getByLabel("Set default value").fill(itemTitle);
+  await page.getByRole("button", { name: "OK" }).click();
+  await closeNotification(page);
+}
diff --git a/web/e2e/project/utils/item.ts b/web/e2e/project/utils/item.ts
index fe07b3fa4b..2ababb5e08 100644
--- a/web/e2e/project/utils/item.ts
+++ b/web/e2e/project/utils/item.ts
@@ -2,16 +2,28 @@ import { Page } from "@playwright/test";
 
 import { closeNotification } from "@reearth-cms/e2e/common/notification";
 
-export async function createRequest(page: Page, reviewerName: string, title: string) {
+export const requestTitle = "requestTitle";
+
+export async function createItem(page: Page) {
   await page.getByText("Content").click();
   await page.getByRole("button", { name: "plus New Item" }).click();
   await page.getByRole("button", { name: "Save" }).click();
   await closeNotification(page);
-  await page.getByRole("button", { name: "New Request" }).click();
-  await page.getByLabel("Title").click();
-  await page.getByLabel("Title").fill(title);
-  await page.locator(".ant-select-selection-overflow").click();
+}
 
+export async function createRequest(page: Page, title = requestTitle) {
+  await page.getByRole("button", { name: "ellipsis" }).click();
+  await page.getByRole("menuitem", { name: "New Request" }).click();
+  await page.getByLabel("Title").last().click();
+  await page.getByLabel("Title").last().fill(title);
+  await page.locator(".ant-select-selection-overflow").click();
+  const reviewerName = await page
+    .locator("a")
+    .nth(1)
+    .locator("div")
+    .nth(2)
+    .locator("p")
+    .innerText();
   await page.getByTitle(reviewerName).locator("div").click();
   await page.locator(".ant-select-selection-overflow").click();
   await page.getByRole("button", { name: "OK" }).click();
diff --git a/web/e2e/project/utils/model.ts b/web/e2e/project/utils/model.ts
index 4740e0a1f2..4927cf7916 100644
--- a/web/e2e/project/utils/model.ts
+++ b/web/e2e/project/utils/model.ts
@@ -3,7 +3,9 @@ import { Page } from "@playwright/test";
 import { closeNotification } from "@reearth-cms/e2e/common/notification";
 import { expect } from "@reearth-cms/e2e/utils";
 
-export async function createModel(page: Page, name = "e2e model name", key = "e2e-model-key") {
+export const modelName = "e2e model name";
+
+export async function createModel(page: Page, name = modelName, key = "e2e-model-key") {
   await page.getByText("Schema").first().click();
   await page.getByRole("button", { name: "plus Add" }).first().click();
   await page.getByLabel("Model name").click();
diff --git a/web/src/components/molecules/Content/Form/SidebarWrapper.tsx b/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
index 26b28ccd3f..3d7528912f 100644
--- a/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
+++ b/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
@@ -78,7 +78,7 @@ const ContentSidebarWrapper: React.FC<Props> = ({ item, onNavigateToRequest }) =
                         onClick={() => {
                           onNavigateToRequest(request.id);
                         }}>
-                        {request.id}
+                        {request.title}
                       </StyledButton>
                     }
                   />
diff --git a/web/src/components/molecules/Content/types.ts b/web/src/components/molecules/Content/types.ts
index d655e19de3..731af413ff 100644
--- a/web/src/components/molecules/Content/types.ts
+++ b/web/src/components/molecules/Content/types.ts
@@ -39,7 +39,7 @@ export type Item = {
   threadId: string;
   comments: Comment[];
   assets: ItemAsset[];
-  requests: Pick<Request, "id" | "state">[];
+  requests: Pick<Request, "id" | "state" | "title">[];
 };
 
 export type FormItem = {
diff --git a/web/src/components/molecules/Request/Details/RequestDescription.tsx b/web/src/components/molecules/Request/Details/RequestDescription.tsx
index 50d01d5240..f0f76aa0a7 100644
--- a/web/src/components/molecules/Request/Details/RequestDescription.tsx
+++ b/web/src/components/molecules/Request/Details/RequestDescription.tsx
@@ -7,7 +7,7 @@ import Collapse from "@reearth-cms/components/atoms/Collapse";
 import AntDComment from "@reearth-cms/components/atoms/Comment";
 import Tooltip from "@reearth-cms/components/atoms/Tooltip";
 import UserAvatar from "@reearth-cms/components/atoms/UserAvatar";
-import { Request } from "@reearth-cms/components/molecules/Request/types";
+import { Request, ItemInRequest } from "@reearth-cms/components/molecules/Request/types";
 import { Group } from "@reearth-cms/components/molecules/Schema/types";
 import { dateTimeFormat } from "@reearth-cms/utils/format";
 
@@ -34,8 +34,8 @@ export const RequestDescription: React.FC<Props> = ({
   );
 
   const headerGet = useCallback(
-    (modelName?: string, modelId?: string, itemId?: string) => {
-      if (modelName && modelId && itemId) {
+    ({ modelName, modelId, id: itemId, title }: ItemInRequest) => {
+      if (modelName && modelId) {
         return (
           <>
             {`${modelName} / `}
@@ -44,7 +44,7 @@ export const RequestDescription: React.FC<Props> = ({
               onClick={() => {
                 onNavigateToItemEdit(modelId, itemId);
               }}>
-              {itemId}
+              {title || itemId}
             </StyledButton>
           </>
         );
@@ -66,11 +66,10 @@ export const RequestDescription: React.FC<Props> = ({
           <RequestItemsWrapper>
             {currentRequest.items
               .filter(item => item.schema)
-              .map((item, index) => (
-                <Collapse key={index}>
-                  <StyledPanel header={headerGet(item.modelName, item.modelId, item.id)} key={1}>
+              .map(item => (
+                <Collapse key={item.id}>
+                  <StyledPanel header={headerGet(item)} key={1}>
                     <RequestItemForm
-                      key={index}
                       schema={item.schema}
                       initialFormValues={item.initialValues}
                       referencedItems={item.referencedItems}
diff --git a/web/src/components/molecules/Request/types.ts b/web/src/components/molecules/Request/types.ts
index a375fa79d3..46987fce5a 100644
--- a/web/src/components/molecules/Request/types.ts
+++ b/web/src/components/molecules/Request/types.ts
@@ -17,15 +17,18 @@ export type Request = {
   updatedAt: Date;
   approvedAt?: Date;
   closedAt?: Date;
-  items: {
-    id: string;
-    modelId?: string;
-    modelName?: string;
-    version?: string;
-    schema?: Schema;
-    initialValues: Record<string, unknown>;
-    referencedItems: FormItem[];
-  }[];
+  items: ItemInRequest[];
+};
+
+export type ItemInRequest = {
+  id: string;
+  title: string;
+  modelId?: string;
+  modelName?: string;
+  version?: string;
+  schema?: Schema;
+  initialValues: Record<string, unknown>;
+  referencedItems: FormItem[];
 };
 
 export type RequestItem = {
diff --git a/web/src/components/organisms/DataConverters/content.ts b/web/src/components/organisms/DataConverters/content.ts
index 09a0c356dd..9a57deb87c 100644
--- a/web/src/components/organisms/DataConverters/content.ts
+++ b/web/src/components/organisms/DataConverters/content.ts
@@ -63,7 +63,12 @@ export const fromGraphQLItem = (GQLItem: GQLItem | undefined): Item | undefined
     assets: GQLItem.assets
       ?.map(asset => asset && { id: asset.id, fileName: asset.fileName })
       .filter((asset): asset is ItemAsset => asset !== null),
-    requests: GQLItem.requests?.map(request => ({ id: request.id, state: request.state })) ?? [],
+    requests:
+      GQLItem.requests?.map(request => ({
+        id: request.id,
+        state: request.state,
+        title: request.title,
+      })) ?? [],
   };
 };
 
@@ -101,6 +106,7 @@ export const fromGraphQLRequest = (request: GQLRequest): Request => ({
   closedAt: request.closedAt ?? undefined,
   items: request.items?.map(item => ({
     id: item.itemId,
+    title: item.item?.value.title ?? "",
     modelId: item?.item?.value.modelId,
     modelName: item?.item?.value.model.name,
     version: item?.version ?? "",
diff --git a/web/src/components/organisms/Project/Content/hooks.ts b/web/src/components/organisms/Project/Content/hooks.ts
index 9a253ff276..223d88f483 100644
--- a/web/src/components/organisms/Project/Content/hooks.ts
+++ b/web/src/components/organisms/Project/Content/hooks.ts
@@ -81,6 +81,7 @@ export default () => {
           title: request.title,
           state: request.state as GQLRequestState,
         },
+        refetchQueries: ["GetItem"],
       });
       if (item.errors || !item.data?.updateRequest) {
         Notification.error({ message: t("Failed to update request.") });
@@ -100,7 +101,7 @@ export default () => {
         variables: {
           itemIds: itemIds,
         },
-        refetchQueries: ["SearchItem", "GetItem", "GetItemsByIds"],
+        refetchQueries: ["SearchItem", "GetItem"],
       });
       if (item.errors || !item.data?.publishItem) {
         Notification.error({ message: t("Failed to publish items.") });
diff --git a/web/src/gql/fragments/request.ts b/web/src/gql/fragments/request.ts
index bd85c9c664..7ae7637b8c 100644
--- a/web/src/gql/fragments/request.ts
+++ b/web/src/gql/fragments/request.ts
@@ -15,6 +15,7 @@ export const requestFragment = gql`
         refs
         value {
           id
+          title
           schemaId
           modelId
           model {
diff --git a/web/src/gql/graphql-client-api.tsx b/web/src/gql/graphql-client-api.tsx
index 318c77939f..40d237200a 100644
--- a/web/src/gql/graphql-client-api.tsx
+++ b/web/src/gql/graphql-client-api.tsx
@@ -2269,7 +2269,7 @@ export type AssetFileFragmentFragment = { __typename?: 'AssetFile', name: string
 
 export type IntegrationFragmentFragment = { __typename?: 'Integration', id: string, name: string, description?: string | null, logoUrl: string, iType: IntegrationType, developerId: string, createdAt: Date, updatedAt: Date, developer: { __typename?: 'User', id: string, name: string, email: string }, config?: { __typename?: 'IntegrationConfig', token: string, webhooks: Array<{ __typename?: 'Webhook', id: string, name: string, url: string, active: boolean, secret: string, createdAt: Date, updatedAt: Date, trigger: { __typename?: 'WebhookTrigger', onItemCreate?: boolean | null, onItemUpdate?: boolean | null, onItemDelete?: boolean | null, onItemPublish?: boolean | null, onItemUnPublish?: boolean | null, onAssetUpload?: boolean | null, onAssetDecompress?: boolean | null, onAssetDelete?: boolean | null } }> } | null };
 
-export type RequestFragmentFragment = { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> };
+export type RequestFragmentFragment = { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, title?: string | null, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> };
 
 export type ThreadFragmentFragment = { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> };
 
@@ -2548,7 +2548,7 @@ export type GetItemQueryVariables = Exact<{
 }>;
 
 
-export type GetItemQuery = { __typename?: 'Query', node?: { __typename?: 'Asset' } | { __typename?: 'Group' } | { __typename?: 'Integration' } | { __typename?: 'Item', id: string, title?: string | null, schemaId: string, createdAt: Date, updatedAt: Date, status: ItemStatus, version: string, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, assets: Array<{ __typename?: 'Asset', id: string, url: string, fileName: string } | null>, createdBy?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string } | null, updatedBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, itemGroupId?: string | null, type: SchemaFieldType, value?: any | null }>, metadata?: { __typename?: 'Item', id: string, version: string, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null }> } | null, thread: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> }, requests?: Array<{ __typename?: 'Request', id: string, state: RequestState }> | null } | { __typename?: 'Model' } | { __typename?: 'Project' } | { __typename?: 'Request' } | { __typename?: 'Schema' } | { __typename?: 'User' } | { __typename?: 'View' } | { __typename?: 'Workspace' } | { __typename?: 'WorkspaceSettings' } | null };
+export type GetItemQuery = { __typename?: 'Query', node?: { __typename?: 'Asset' } | { __typename?: 'Group' } | { __typename?: 'Integration' } | { __typename?: 'Item', id: string, title?: string | null, schemaId: string, createdAt: Date, updatedAt: Date, status: ItemStatus, version: string, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, assets: Array<{ __typename?: 'Asset', id: string, url: string, fileName: string } | null>, createdBy?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string } | null, updatedBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, itemGroupId?: string | null, type: SchemaFieldType, value?: any | null }>, metadata?: { __typename?: 'Item', id: string, version: string, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null }> } | null, thread: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> }, requests?: Array<{ __typename?: 'Request', id: string, state: RequestState, title: string }> | null } | { __typename?: 'Model' } | { __typename?: 'Project' } | { __typename?: 'Request' } | { __typename?: 'Schema' } | { __typename?: 'User' } | { __typename?: 'View' } | { __typename?: 'Workspace' } | { __typename?: 'WorkspaceSettings' } | null };
 
 export type IsItemReferencedQueryVariables = Exact<{
   itemId: Scalars['ID']['input'];
@@ -2753,7 +2753,7 @@ export type GetRequestQueryVariables = Exact<{
 }>;
 
 
-export type GetRequestQuery = { __typename?: 'Query', node?: { __typename?: 'Asset', id: string } | { __typename?: 'Group', id: string } | { __typename?: 'Integration', id: string } | { __typename?: 'Item', id: string } | { __typename?: 'Model', id: string } | { __typename?: 'Project', id: string } | { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } | { __typename?: 'Schema', id: string } | { __typename?: 'User', id: string } | { __typename?: 'View', id: string } | { __typename?: 'Workspace', id: string } | { __typename?: 'WorkspaceSettings', id: string } | null };
+export type GetRequestQuery = { __typename?: 'Query', node?: { __typename?: 'Asset', id: string } | { __typename?: 'Group', id: string } | { __typename?: 'Integration', id: string } | { __typename?: 'Item', id: string } | { __typename?: 'Model', id: string } | { __typename?: 'Project', id: string } | { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, title?: string | null, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } | { __typename?: 'Schema', id: string } | { __typename?: 'User', id: string } | { __typename?: 'View', id: string } | { __typename?: 'Workspace', id: string } | { __typename?: 'WorkspaceSettings', id: string } | null };
 
 export type CreateRequestMutationVariables = Exact<{
   projectId: Scalars['ID']['input'];
@@ -2765,7 +2765,7 @@ export type CreateRequestMutationVariables = Exact<{
 }>;
 
 
-export type CreateRequestMutation = { __typename?: 'Mutation', createRequest?: { __typename?: 'RequestPayload', request: { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } } | null };
+export type CreateRequestMutation = { __typename?: 'Mutation', createRequest?: { __typename?: 'RequestPayload', request: { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, title?: string | null, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } } | null };
 
 export type UpdateRequestMutationVariables = Exact<{
   requestId: Scalars['ID']['input'];
@@ -2777,14 +2777,14 @@ export type UpdateRequestMutationVariables = Exact<{
 }>;
 
 
-export type UpdateRequestMutation = { __typename?: 'Mutation', updateRequest?: { __typename?: 'RequestPayload', request: { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } } | null };
+export type UpdateRequestMutation = { __typename?: 'Mutation', updateRequest?: { __typename?: 'RequestPayload', request: { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, title?: string | null, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } } | null };
 
 export type ApproveRequestMutationVariables = Exact<{
   requestId: Scalars['ID']['input'];
 }>;
 
 
-export type ApproveRequestMutation = { __typename?: 'Mutation', approveRequest?: { __typename?: 'RequestPayload', request: { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } } | null };
+export type ApproveRequestMutation = { __typename?: 'Mutation', approveRequest?: { __typename?: 'RequestPayload', request: { __typename?: 'Request', id: string, title: string, description?: string | null, workspaceId: string, projectId: string, threadId: string, reviewersId: Array<string>, state: RequestState, createdAt: Date, updatedAt: Date, approvedAt?: Date | null, closedAt?: Date | null, items: Array<{ __typename?: 'RequestItem', itemId: string, version?: string | null, ref?: string | null, item?: { __typename?: 'VersionedItem', version: string, parents?: Array<string> | null, refs: Array<string>, value: { __typename?: 'Item', id: string, title?: string | null, schemaId: string, modelId: string, model: { __typename?: 'Model', name: string }, fields: Array<{ __typename?: 'ItemField', schemaFieldId: string, type: SchemaFieldType, value?: any | null, itemGroupId?: string | null }>, referencedItems?: Array<{ __typename?: 'Item', id: string, title?: string | null, schemaId: string, status: ItemStatus, version: string, createdAt: Date, updatedAt: Date, createdBy?: { __typename?: 'Integration', name: string } | { __typename?: 'User', name: string } | null }> | null, schema: { __typename?: 'Schema', id: string, fields: Array<{ __typename?: 'SchemaField', id: string, type: SchemaFieldType, title: string, key: string, description?: string | null, required: boolean, unique: boolean, isTitle: boolean, multiple: boolean, typeProperty?: { __typename?: 'SchemaFieldAsset', assetDefaultValue?: any | null } | { __typename?: 'SchemaFieldBool', defaultValue?: any | null } | { __typename?: 'SchemaFieldCheckbox' } | { __typename?: 'SchemaFieldDate' } | { __typename?: 'SchemaFieldGeometryEditor' } | { __typename?: 'SchemaFieldGeometryObject' } | { __typename?: 'SchemaFieldGroup', groupId: string } | { __typename?: 'SchemaFieldInteger', min?: number | null, max?: number | null, integerDefaultValue?: any | null } | { __typename?: 'SchemaFieldMarkdown', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldNumber' } | { __typename?: 'SchemaFieldReference', modelId: string } | { __typename?: 'SchemaFieldRichText' } | { __typename?: 'SchemaFieldSelect', values: Array<string>, selectDefaultValue?: any | null } | { __typename?: 'SchemaFieldTag' } | { __typename?: 'SchemaFieldText', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldTextArea', defaultValue?: any | null, maxLength?: number | null } | { __typename?: 'SchemaFieldURL', defaultValue?: any | null } | null }> } } } | null }>, createdBy?: { __typename?: 'User', id: string, name: string, email: string } | null, thread?: { __typename?: 'Thread', id: string, workspaceId: string, comments: Array<{ __typename?: 'Comment', id: string, authorId: string, content: string, createdAt: Date, author?: { __typename?: 'Integration', id: string, name: string } | { __typename?: 'User', id: string, name: string, email: string } | null }> } | null, project?: { __typename?: 'Project', id: string, name: string, createdAt: Date, updatedAt: Date } | null, reviewers: Array<{ __typename?: 'User', id: string, name: string, email: string }> } } | null };
 
 export type DeleteRequestMutationVariables = Exact<{
   projectId: Scalars['ID']['input'];
@@ -3127,6 +3127,7 @@ export const RequestFragmentFragmentDoc = gql`
       refs
       value {
         id
+        title
         schemaId
         modelId
         model {
@@ -4717,6 +4718,7 @@ export const GetItemDocument = gql`
       requests {
         id
         state
+        title
       }
     }
   }
diff --git a/web/src/gql/queries/item.ts b/web/src/gql/queries/item.ts
index 11ff984efd..4a9487bb57 100644
--- a/web/src/gql/queries/item.ts
+++ b/web/src/gql/queries/item.ts
@@ -137,6 +137,7 @@ export const GET_ITEM_NODE = gql`
         requests {
           id
           state
+          title
         }
       }
     }

From f7f15b644509388fbec01a570dadb4e5c7f423f7 Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Wed, 13 Nov 2024 14:46:54 +0900
Subject: [PATCH 26/28] fix(web): option and tag field validation enhancement
 (#1306)

* improve validation of option and tag

* fix: input status

* fix: wrap t

* fix: input status

* small fixes
---
 web/e2e/project/item/fields/option.spec.ts    |  5 ++
 web/e2e/project/item/metadata/tag.spec.ts     |  6 ++
 web/src/components/atoms/Input/index.tsx      |  7 +-
 .../MultValueColoredTag/index.tsx             | 16 +++-
 .../Common/MultiValueField/index.tsx          |  3 +
 .../FieldCreationModalWithSteps/index.tsx     | 53 ++---------
 .../FieldDefaultInputs/URLField/index.tsx     |  2 +-
 .../molecules/Schema/FieldModal/hooks.ts      | 90 ++++++++++++++-----
 .../molecules/Schema/FieldModal/index.tsx     | 57 +++++++-----
 web/src/components/molecules/Schema/types.ts  |  2 +-
 .../organisms/Project/Schema/hooks.ts         | 12 ++-
 web/src/i18n/translations/en.yml              |  7 +-
 web/src/i18n/translations/ja.yml              |  7 +-
 13 files changed, 158 insertions(+), 109 deletions(-)

diff --git a/web/e2e/project/item/fields/option.spec.ts b/web/e2e/project/item/fields/option.spec.ts
index 604fa019fd..4d81e98566 100644
--- a/web/e2e/project/item/fields/option.spec.ts
+++ b/web/e2e/project/item/fields/option.spec.ts
@@ -25,7 +25,12 @@ test("Option field creating and updating has succeeded", async ({ page }) => {
   await page.locator("#values").nth(0).click();
   await page.locator("#values").nth(0).fill("first");
   await page.getByRole("button", { name: "plus New" }).click();
+  await expect(page.getByText("Empty values are not allowed")).toBeVisible();
+  await expect(page.getByRole("button", { name: "OK" })).toBeDisabled();
   await page.locator("#values").nth(1).click();
+  await page.locator("#values").nth(1).fill("first");
+  await expect(page.getByText("Option must be unique")).toBeVisible();
+  await expect(page.getByRole("button", { name: "OK" })).toBeDisabled();
   await page.locator("#values").nth(1).fill("second");
   await page.getByRole("button", { name: "OK" }).click();
   await closeNotification(page);
diff --git a/web/e2e/project/item/metadata/tag.spec.ts b/web/e2e/project/item/metadata/tag.spec.ts
index 0c5194dfd6..009b3d5b12 100644
--- a/web/e2e/project/item/metadata/tag.spec.ts
+++ b/web/e2e/project/item/metadata/tag.spec.ts
@@ -27,6 +27,12 @@ test("Tag metadata creating and updating has succeeded", async ({ page }) => {
   await page.getByLabel("Set Tags").fill("Tag1");
   await page.getByRole("button", { name: "plus New" }).click();
   await page.locator("div").filter({ hasText: /^Tag$/ }).click();
+  await page.locator("#tags").nth(1).fill("");
+  await expect(page.getByText("Empty values are not allowed")).toBeVisible();
+  await expect(page.getByRole("button", { name: "OK" })).toBeDisabled();
+  await page.locator("#tags").nth(1).fill("Tag1");
+  await expect(page.getByText("Labels must be unique")).toBeVisible();
+  await expect(page.getByRole("button", { name: "OK" })).toBeDisabled();
   await page.locator("#tags").nth(1).fill("Tag2");
   await page.getByRole("button", { name: "OK" }).click();
   await closeNotification(page);
diff --git a/web/src/components/atoms/Input/index.tsx b/web/src/components/atoms/Input/index.tsx
index e86df62641..0e2f5da9ad 100644
--- a/web/src/components/atoms/Input/index.tsx
+++ b/web/src/components/atoms/Input/index.tsx
@@ -6,14 +6,15 @@ export type { SearchProps } from "antd/lib/input";
 
 type Props = {
   value?: string;
+  isError?: boolean;
 } & InputProps;
 
-const Input = forwardRef<InputRef, Props>(({ value, maxLength, ...props }, ref) => {
+const Input = forwardRef<InputRef, Props>(({ value, isError, maxLength, ...props }, ref) => {
   const status = useMemo(() => {
-    if (maxLength && value && runes(value).length > maxLength) {
+    if (isError || (maxLength && value && runes(value).length > maxLength)) {
       return "error";
     }
-  }, [maxLength, value]);
+  }, [isError, maxLength, value]);
 
   return (
     <AntDInput
diff --git a/web/src/components/molecules/Common/MultiValueField/MultValueColoredTag/index.tsx b/web/src/components/molecules/Common/MultiValueField/MultValueColoredTag/index.tsx
index 3f3f619e0e..887d10e309 100644
--- a/web/src/components/molecules/Common/MultiValueField/MultValueColoredTag/index.tsx
+++ b/web/src/components/molecules/Common/MultiValueField/MultValueColoredTag/index.tsx
@@ -30,10 +30,16 @@ type TagColor = (typeof colors)[number];
 type Props = {
   value?: { id?: string; name: string; color: TagColor }[];
   onChange?: (value: { id?: string; name: string; color: TagColor }[]) => void;
+  errorIndexes: Set<number>;
 } & TextAreaProps &
   InputProps;
 
-const MultiValueColoredTag: React.FC<Props> = ({ value = [], onChange, ...props }) => {
+const MultiValueColoredTag: React.FC<Props> = ({
+  value = [],
+  onChange,
+  errorIndexes,
+  ...props
+}) => {
   const t = useT();
   const [lastColorIndex, setLastColorIndex] = useState(0);
   const [focusedTagIndex, setFocusedTagIndex] = useState<number | null>(null); // New State to hold the focused tag index
@@ -140,11 +146,13 @@ const MultiValueColoredTag: React.FC<Props> = ({ value = [], onChange, ...props
                 onChange={(e: ChangeEvent<HTMLInputElement>) => handleInput(e, key)}
                 value={valueItem.name}
                 onBlur={() => handleInputBlur()}
+                isError={errorIndexes?.has(key)}
               />
             </StyledDiv>
             <StyledTagContainer
               hidden={focusedTagIndex === key} // Hide tag when it is focused
-              onClick={() => handleTagClick(key)}>
+              onClick={() => handleTagClick(key)}
+              isError={errorIndexes?.has(key)}>
               <StyledTag color={valueItem.color.toLowerCase()}>{valueItem.name}</StyledTag>
             </StyledTagContainer>
             <Dropdown menu={{ items: generateMenuItems(key) }} trigger={["click"]}>
@@ -188,9 +196,9 @@ const StyledInput = styled(Input)`
   flex: 1;
 `;
 
-const StyledTagContainer = styled.div`
+const StyledTagContainer = styled.div<{ isError?: boolean }>`
   cursor: pointer;
-  border: 1px solid #d9d9d9;
+  border: 1px solid ${({ isError }) => (isError ? "#ff4d4f" : "#d9d9d9")};
   padding: 4px 11px;
   overflow: auto;
   height: 100%;
diff --git a/web/src/components/molecules/Common/MultiValueField/index.tsx b/web/src/components/molecules/Common/MultiValueField/index.tsx
index 4eeaccf5ed..11488b0d66 100644
--- a/web/src/components/molecules/Common/MultiValueField/index.tsx
+++ b/web/src/components/molecules/Common/MultiValueField/index.tsx
@@ -16,6 +16,7 @@ type Props = {
   onBlur?: () => Promise<void>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   FieldInput: React.FunctionComponent<any>;
+  errorIndexes?: Set<number>;
 } & TextAreaProps &
   InputProps;
 
@@ -24,6 +25,7 @@ const MultiValueField: React.FC<Props> = ({
   onChange,
   onBlur,
   FieldInput,
+  errorIndexes,
   ...props
 }) => {
   const t = useT();
@@ -91,6 +93,7 @@ const MultiValueField: React.FC<Props> = ({
               onChange={(e: ChangeEvent<HTMLInputElement>) => handleInput(e, key)}
               onBlur={() => onBlur?.()}
               value={valueItem}
+              isError={errorIndexes?.has(key)}
             />
             {!props.disabled && (
               <FieldButton
diff --git a/web/src/components/molecules/Schema/FieldModal/FieldCreationModalWithSteps/index.tsx b/web/src/components/molecules/Schema/FieldModal/FieldCreationModalWithSteps/index.tsx
index 1c117fa9b7..e33bc1cc46 100644
--- a/web/src/components/molecules/Schema/FieldModal/FieldCreationModalWithSteps/index.tsx
+++ b/web/src/components/molecules/Schema/FieldModal/FieldCreationModalWithSteps/index.tsx
@@ -14,13 +14,11 @@ import Steps from "@reearth-cms/components/atoms/Step";
 import Tabs from "@reearth-cms/components/atoms/Tabs";
 import TextArea from "@reearth-cms/components/atoms/TextArea";
 import { keyAutoFill, keyReplace } from "@reearth-cms/components/molecules/Common/Form/utils";
-import MultiValueField from "@reearth-cms/components/molecules/Common/MultiValueField";
 import { Model } from "@reearth-cms/components/molecules/Model/types";
 import { fieldTypes } from "@reearth-cms/components/molecules/Schema/fieldTypes";
 import {
   Field,
   FieldModalTabs,
-  FieldType,
   FormValues,
   CorrespondingField,
 } from "@reearth-cms/components/molecules/Schema/types";
@@ -32,7 +30,7 @@ const { TabPane } = Tabs;
 
 type Props = {
   models?: Model[];
-  selectedType: FieldType;
+  selectedType: "Reference";
   selectedField: Field | null;
   open: boolean;
   isLoading: boolean;
@@ -208,11 +206,10 @@ const FieldCreationModalWithSteps: React.FC<Props> = ({
     setField1FormValues(initialValues);
   }, [initialValues, setCurrentStep]);
 
-  const handleCancel = useCallback(() => {
-    onClose();
+  const handleAfterClose = useCallback(() => {
     formReset();
     modalReset();
-  }, [formReset, modalReset, onClose]);
+  }, [formReset, modalReset]);
 
   const prevStep = useCallback(() => {
     if (currentStep > 0) setCurrentStep(currentStep - 1);
@@ -342,8 +339,8 @@ const FieldCreationModalWithSteps: React.FC<Props> = ({
           </FieldThumbnail>
         ) : null
       }
-      onCancel={handleCancel}
-      afterClose={modalReset}
+      onCancel={onClose}
+      afterClose={handleAfterClose}
       width={572}
       open={open}
       footer={
@@ -475,25 +472,6 @@ const FieldCreationModalWithSteps: React.FC<Props> = ({
               <Form.Item name="description" label={t("Description")}>
                 <TextArea rows={3} showCount maxLength={1000} />
               </Form.Item>
-              {selectedType === "Select" && (
-                <Form.Item
-                  name="values"
-                  label={t("Set Options")}
-                  rules={[
-                    {
-                      validator: async (_, values) => {
-                        if (!values || values.length < 1) {
-                          return Promise.reject(new Error("At least 1 option"));
-                        }
-                        if (values.some((value: string) => value.length === 0)) {
-                          return Promise.reject(new Error("Empty values are not allowed"));
-                        }
-                      },
-                    },
-                  ]}>
-                  <MultiValueField FieldInput={Input} />
-                </Form.Item>
-              )}
               <Form.Item
                 name="multiple"
                 valuePropName="checked"
@@ -550,7 +528,7 @@ const FieldCreationModalWithSteps: React.FC<Props> = ({
               </Form.Item>
               <Form.Item
                 name="key"
-                label="Field Key"
+                label={t("Field Key")}
                 extra={t(
                   "Field key must be unique and at least 1 character long. It can only contain letters, numbers, underscores and dashes.",
                 )}
@@ -578,25 +556,6 @@ const FieldCreationModalWithSteps: React.FC<Props> = ({
               <Form.Item name="description" label={t("Description")}>
                 <TextArea rows={3} showCount maxLength={1000} />
               </Form.Item>
-              {selectedType === "Select" && (
-                <Form.Item
-                  name="values"
-                  label={t("Set Options")}
-                  rules={[
-                    {
-                      validator: async (_, values) => {
-                        if (!values || values.length < 1) {
-                          return Promise.reject(new Error("At least 1 option"));
-                        }
-                        if (values.some((value: string) => value.length === 0)) {
-                          return Promise.reject(new Error("Empty values are not allowed"));
-                        }
-                      },
-                    },
-                  ]}>
-                  <MultiValueField FieldInput={Input} />
-                </Form.Item>
-              )}
             </TabPane>
             <TabPane tab={t("Validation")} key="validation" forceRender>
               <Form.Item
diff --git a/web/src/components/molecules/Schema/FieldModal/FieldDefaultInputs/URLField/index.tsx b/web/src/components/molecules/Schema/FieldModal/FieldDefaultInputs/URLField/index.tsx
index 8fde2abd81..c418de3449 100644
--- a/web/src/components/molecules/Schema/FieldModal/FieldDefaultInputs/URLField/index.tsx
+++ b/web/src/components/molecules/Schema/FieldModal/FieldDefaultInputs/URLField/index.tsx
@@ -15,7 +15,7 @@ const URLField: React.FC<Props> = ({ multiple }) => {
   return (
     <Form.Item
       name="defaultValue"
-      label="Set default value"
+      label={t("Set default value")}
       extra={t("Default value must be a valid URL and start with 'http://' or 'https://'.")}
       rules={[
         {
diff --git a/web/src/components/molecules/Schema/FieldModal/hooks.ts b/web/src/components/molecules/Schema/FieldModal/hooks.ts
index b214c7402e..81479ce042 100644
--- a/web/src/components/molecules/Schema/FieldModal/hooks.ts
+++ b/web/src/components/molecules/Schema/FieldModal/hooks.ts
@@ -27,7 +27,7 @@ export default (
   open: boolean,
   onClose: () => void,
   onSubmit: (values: FormValues) => Promise<void>,
-  handleFieldKeyUnique: (key: string, fieldId?: string) => boolean,
+  handleFieldKeyUnique: (key: string) => boolean,
 ) => {
   const [form] = Form.useForm<FormTypes>();
   const [buttonDisabled, setButtonDisabled] = useState(true);
@@ -235,7 +235,11 @@ export default (
   const values = Form.useWatch([], form);
   useEffect(() => {
     if (form.getFieldValue("title") && form.getFieldValue("key")) {
-      if (form.getFieldValue("supportedTypes")?.length === 0) {
+      if (
+        form.getFieldValue("values")?.length === 0 ||
+        form.getFieldValue("supportedTypes")?.length === 0 ||
+        form.getFieldValue("tags")?.length === 0
+      ) {
         setButtonDisabled(true);
       } else {
         form
@@ -249,26 +253,22 @@ export default (
   }, [form, values]);
 
   const handleValuesChange = useCallback(async (changedValues: Record<string, unknown>) => {
-      const [key, value] = Object.entries(changedValues)[0];
-      let changedValue = value;
-      let defaultValue = defaultValueRef.current?.[key as keyof FormTypes];
-      if (Array.isArray(value)) {
-        changedValue = [...value].sort();
-      }
-      if (Array.isArray(defaultValue)) {
-        defaultValue = [...defaultValue].sort();
-      }
+    const [key, value] = Object.entries(changedValues)[0];
+    let changedValue = value;
+    let defaultValue = defaultValueRef.current?.[key as keyof FormTypes];
+    if (Array.isArray(value)) {
+      changedValue = [...value].sort();
+    }
+    if (Array.isArray(defaultValue)) {
+      defaultValue = [...defaultValue].sort();
+    }
 
-      if (
-        JSON.stringify(emptyConvert(changedValue)) === JSON.stringify(emptyConvert(defaultValue))
-      ) {
-        changedKeys.current.delete(key);
-      } else {
-        changedKeys.current.add(key);
-      }
-    },
-    [],
-  );
+    if (JSON.stringify(emptyConvert(changedValue)) === JSON.stringify(emptyConvert(defaultValue))) {
+      changedKeys.current.delete(key);
+    } else {
+      changedKeys.current.add(key);
+    }
+  }, []);
 
   const handleNameChange = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -323,7 +323,7 @@ export default (
     (value: string) => {
       if (prevKey.current?.key === value) {
         return prevKey.current?.isSuccess ? Promise.resolve() : Promise.reject();
-      } else if (validateKey(value) && handleFieldKeyUnique(value, selectedField?.id)) {
+      } else if (validateKey(value) && handleFieldKeyUnique(value)) {
         prevKey.current = { key: value, isSuccess: true };
         return Promise.resolve();
       } else {
@@ -331,7 +331,7 @@ export default (
         return Promise.reject();
       }
     },
-    [handleFieldKeyUnique, selectedField?.id],
+    [handleFieldKeyUnique],
   );
 
   const isTitleDisabled = useMemo(
@@ -368,14 +368,53 @@ export default (
 
   useEffect(() => {
     if (open && !selectedField) {
-      if (selectedType === "GeometryObject") {
+      if (selectedType === "Select") {
+        form.setFieldValue("values", []);
+      } else if (selectedType === "GeometryObject") {
         form.setFieldValue("supportedTypes", []);
       } else if (selectedType === "GeometryEditor") {
         form.setFieldValue("supportedTypes", EditorSupportType[0].value);
+      } else if (selectedType === "Tag") {
+        form.setFieldValue("tags", []);
       }
     }
   }, [EditorSupportType, form, open, selectedField, selectedType]);
 
+  const [emptyIndexes, setEmptyIndexes] = useState<number[]>([]);
+  const emptyValidator = useCallback(async (values?: string[]) => {
+    if (values) {
+      const indexes = values
+        .map((value: string, index: number) => value.length === 0 && index)
+        .filter(value => typeof value === "number");
+      setEmptyIndexes(indexes);
+      if (indexes.length) {
+        return Promise.reject();
+      }
+    }
+  }, []);
+
+  const [duplicatedIndexes, setDuplicatedIndexes] = useState<number[]>([]);
+  const duplicatedValidator = useCallback(async (values?: string[]) => {
+    if (values) {
+      const indexes = values
+        .map((value: string, selfIndex: number) => {
+          if (!value) return;
+          const index = values.findIndex(v => v === value);
+          return index < selfIndex && selfIndex;
+        })
+        .filter(value => typeof value === "number");
+      setDuplicatedIndexes(indexes);
+      if (indexes.length) {
+        return Promise.reject();
+      }
+    }
+  }, []);
+
+  const errorIndexes = useMemo(
+    () => new Set([...emptyIndexes, ...duplicatedIndexes]),
+    [duplicatedIndexes, emptyIndexes],
+  );
+
   return {
     form,
     buttonDisabled,
@@ -400,5 +439,8 @@ export default (
     isTitleDisabled,
     ObjectSupportType,
     EditorSupportType,
+    emptyValidator,
+    duplicatedValidator,
+    errorIndexes,
   };
 };
diff --git a/web/src/components/molecules/Schema/FieldModal/index.tsx b/web/src/components/molecules/Schema/FieldModal/index.tsx
index 4d08298eef..417868ad4b 100644
--- a/web/src/components/molecules/Schema/FieldModal/index.tsx
+++ b/web/src/components/molecules/Schema/FieldModal/index.tsx
@@ -24,6 +24,7 @@ import {
   FieldType,
   Group,
   FormValues,
+  Tag,
 } from "@reearth-cms/components/molecules/Schema/types";
 import { useT } from "@reearth-cms/i18n";
 import { MAX_KEY_LENGTH } from "@reearth-cms/utils/regex";
@@ -37,7 +38,7 @@ type Props = {
   open: boolean;
   fieldLoading: boolean;
   selectedField: Field | null;
-  handleFieldKeyUnique: (key: string, fieldId?: string) => boolean;
+  handleFieldKeyUnique: (key: string) => boolean;
   onClose: () => void;
   onSubmit: (values: FormValues) => Promise<void>;
   assetList: Asset[];
@@ -139,6 +140,9 @@ const FieldModal: React.FC<Props> = ({
     isTitleDisabled,
     ObjectSupportType,
     EditorSupportType,
+    emptyValidator,
+    duplicatedValidator,
+    errorIndexes,
   } = useHooks(selectedType, isMeta, selectedField, open, onClose, onSubmit, handleFieldKeyUnique);
 
   const requiredMark = (label: React.ReactNode, { required }: { required: boolean }) => (
@@ -215,43 +219,50 @@ const FieldModal: React.FC<Props> = ({
               <Form.Item
                 name="values"
                 label={t("Set Options")}
+                validateStatus={"success"}
                 rules={[
                   {
-                    validator: async (_, values) => {
-                      if (!values || values.length < 1) {
-                        return Promise.reject(new Error("At least 1 option"));
-                      }
-                      if (values.some((value: string) => value.length === 0)) {
-                        return Promise.reject(new Error("Empty values are not allowed"));
-                      }
-                    },
+                    required: true,
+                    message: t("At least 1 option"),
+                  },
+                  {
+                    validator: async (_, values?: string[]) => emptyValidator(values),
+                    message: t("Empty values are not allowed"),
+                  },
+                  {
+                    validator: async (_, values?: string[]) => duplicatedValidator(values),
+                    message: t("Option must be unique"),
                   },
                 ]}>
-                <MultiValueField FieldInput={Input} />
+                <MultiValueField FieldInput={Input} errorIndexes={errorIndexes} />
               </Form.Item>
             )}
             {selectedType === "Tag" && (
               <Form.Item
                 name="tags"
                 label={t("Set Tags")}
+                validateStatus={"success"}
                 rules={[
                   {
-                    validator: async (_, values) => {
-                      if (!values || values.length < 1) {
-                        return Promise.reject(new Error("At least 1 option"));
-                      }
-                      if (values.some((value: string) => value.length === 0)) {
-                        return Promise.reject(new Error("Empty values are not allowed"));
-                      }
-                      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                      const uniqueNames = new Set(values.map((valueObj: any) => valueObj.name));
-                      if (uniqueNames.size !== values.length) {
-                        return Promise.reject(new Error("Labels must be unique"));
-                      }
+                    required: true,
+                    message: t("At least 1 tag"),
+                  },
+                  {
+                    validator: async (_, values?: Tag[]) => {
+                      const names = values?.map(value => value.name);
+                      return emptyValidator(names);
+                    },
+                    message: t("Empty values are not allowed"),
+                  },
+                  {
+                    validator: async (_, values?: Tag[]) => {
+                      const names = values?.map(value => value.name);
+                      return duplicatedValidator(names);
                     },
+                    message: t("Labels must be unique"),
                   },
                 ]}>
-                <MultiValueColoredTag />
+                <MultiValueColoredTag errorIndexes={errorIndexes} />
               </Form.Item>
             )}
             {selectedType === "Group" && (
diff --git a/web/src/components/molecules/Schema/types.ts b/web/src/components/molecules/Schema/types.ts
index b2b5d9c4a0..fca4a01253 100644
--- a/web/src/components/molecules/Schema/types.ts
+++ b/web/src/components/molecules/Schema/types.ts
@@ -43,7 +43,7 @@ export type FieldType =
   | "GeometryObject"
   | "GeometryEditor";
 
-type Tag = {
+export type Tag = {
   id: string;
   name: string;
   color: string;
diff --git a/web/src/components/organisms/Project/Schema/hooks.ts b/web/src/components/organisms/Project/Schema/hooks.ts
index 75afe4657a..baabe1c23f 100644
--- a/web/src/components/organisms/Project/Schema/hooks.ts
+++ b/web/src/components/organisms/Project/Schema/hooks.ts
@@ -134,10 +134,14 @@ export default () => {
     [navigate, projectId, workspaceId],
   );
 
-  const keyUniqueCheck = useCallback((key: string, fieldId?: string, model?: Model) => {
-    const sameKeyField = model?.schema.fields.find(field => field.key === key);
-    return !sameKeyField || sameKeyField.id === fieldId;
-  }, []);
+  const keyUniqueCheck = useCallback(
+    (key: string, fieldId?: string, model?: Model) => {
+      const schema = isMeta ? model?.metadataSchema : model?.schema;
+      const sameKeyField = schema?.fields?.find(field => field.key === key);
+      return !sameKeyField || sameKeyField.id === fieldId;
+    },
+    [isMeta],
+  );
 
   const handleFieldKeyUnique = useCallback(
     (key: string) => keyUniqueCheck(key, selectedField?.id, currentModel),
diff --git a/web/src/i18n/translations/en.yml b/web/src/i18n/translations/en.yml
index e80094a13e..79832bb025 100644
--- a/web/src/i18n/translations/en.yml
+++ b/web/src/i18n/translations/en.yml
@@ -333,7 +333,6 @@ Please input the display name of field!: ''
 Field Key: ''
 Field key must be unique and at least 1 character long. It can only contain letters, numbers, underscores and dashes.: ''
 Key is not valid: ''
-Set Options: ''
 Stores a list of values instead of a single value: ''
 Support multiple values: ''
 Only one field can be used as the title: ''
@@ -348,7 +347,13 @@ Default value must be a valid URL and start with 'http://' or 'https://'.: ''
 Set maximum length: ''
 Set minimum value: ''
 Set maximum value: ''
+Set Options: ''
+At least 1 option: ''
+Empty values are not allowed: ''
+Option must be unique: ''
 Set Tags: ''
+At least 1 tag: ''
+Labels must be unique: ''
 Select Group: ''
 Please select the group!: ''
 Support Type: ''
diff --git a/web/src/i18n/translations/ja.yml b/web/src/i18n/translations/ja.yml
index 6e73d7a918..8e19528a62 100644
--- a/web/src/i18n/translations/ja.yml
+++ b/web/src/i18n/translations/ja.yml
@@ -333,7 +333,6 @@ Please input the display name of field!: このフィールドの表示名を入
 Field Key: フィールドキー
 Field key must be unique and at least 1 character long. It can only contain letters, numbers, underscores and dashes.: フィールドキーは1文字以上かつ一意である必要があります。半角英数字、アンダースコア、ダッシュのみを含むことができます。
 Key is not valid: 無効なキーです
-Set Options: オプションを設定
 Stores a list of values instead of a single value: このフィールドに複数の値をリスト形式で設定します
 Support multiple values: 複数値の設定を許可
 Only one field can be used as the title: タイトルとして使用できるフィールドは1つだけです。
@@ -348,7 +347,13 @@ Default value must be a valid URL and start with 'http://' or 'https://'.: デ
 Set maximum length: 最大長
 Set minimum value: 最小値
 Set maximum value: 最大値
+Set Options: オプションを設定
+At least 1 option: 最低一つのオプションが必要です
+Empty values are not allowed: 空の値は使用できません
+Option must be unique: オプションは一意である必要があります
 Set Tags: タグを設定する
+At least 1 tag: 最低一つのタグが必要です
+Labels must be unique: ラベルは一意である必要があります
 Select Group: グループを選択
 Please select the group!: グループを選択してください！
 Support Type: サポートタイプ

From d7003e386ee3600a624e742124ae361acc3250cf Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Wed, 13 Nov 2024 15:40:51 +0900
Subject: [PATCH 27/28] fix(web): reduce waste of queries to check key and
 alias (#1298)

* fix: key and alias validation

* Apply suggestions from code review

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>
---
 .../Common/ProjectCreationModal/index.tsx     | 25 +++++--
 .../molecules/ProjectSettings/GeneralForm.tsx | 66 ++++++++++++++-----
 .../components/molecules/Schema/FormModal.tsx | 44 ++++++++-----
 3 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/web/src/components/molecules/Common/ProjectCreationModal/index.tsx b/web/src/components/molecules/Common/ProjectCreationModal/index.tsx
index 04134bc516..9ce5bdf6fd 100644
--- a/web/src/components/molecules/Common/ProjectCreationModal/index.tsx
+++ b/web/src/components/molecules/Common/ProjectCreationModal/index.tsx
@@ -40,16 +40,29 @@ const ProjectCreationModal: React.FC<Props> = ({
   const [isDisabled, setIsDisabled] = useState(true);
   const prevAlias = useRef<{ alias: string; isSuccess: boolean }>();
 
-  const values = Form.useWatch([], form);
+  const timeout = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const values = Form.useWatch<FormValues | undefined>([], form);
   useEffect(() => {
-    if (form.getFieldValue("name") && form.getFieldValue("alias")) {
+    if (timeout.current) {
+      clearTimeout(timeout.current);
+      timeout.current = null;
+    }
+    if (!values?.name && !values?.alias) {
+      setIsDisabled(true);
+      return;
+    }
+    const validate = () => {
       form
         .validateFields()
         .then(() => setIsDisabled(false))
         .catch(() => setIsDisabled(true));
-    } else {
-      setIsDisabled(true);
-    }
+    };
+    timeout.current = setTimeout(validate, 300);
+    return () => {
+      if (timeout.current) {
+        clearTimeout(timeout.current);
+      }
+    };
   }, [form, values]);
 
   const handleNameChange = useCallback(
@@ -119,7 +132,7 @@ const ProjectCreationModal: React.FC<Props> = ({
           {t("OK")}
         </Button>,
       ]}>
-      <Form form={form} layout="vertical" initialValues={initialValues}>
+      <Form form={form} layout="vertical" initialValues={initialValues} validateTrigger="">
         <Form.Item
           name="name"
           label={t("Project name")}
diff --git a/web/src/components/molecules/ProjectSettings/GeneralForm.tsx b/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
index 04ebeb9c4c..89a3569650 100644
--- a/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
+++ b/web/src/components/molecules/ProjectSettings/GeneralForm.tsx
@@ -1,12 +1,13 @@
 import styled from "@emotion/styled";
-import { useCallback, useState } from "react";
+import { useCallback, useState, useRef } from "react";
 
 import Button from "@reearth-cms/components/atoms/Button";
 import Form, { ValidateErrorEntity } from "@reearth-cms/components/atoms/Form";
 import Input from "@reearth-cms/components/atoms/Input";
 import TextArea from "@reearth-cms/components/atoms/TextArea";
+import { keyReplace } from "@reearth-cms/components/molecules/Common/Form/utils";
 import { useT } from "@reearth-cms/i18n";
-import { validateKey } from "@reearth-cms/utils/regex";
+import { validateKey, MAX_KEY_LENGTH } from "@reearth-cms/utils/regex";
 
 import { Project } from "../Workspace/types";
 
@@ -47,8 +48,13 @@ const ProjectGeneralForm: React.FC<Props> = ({
     }
   }, [form, onProjectUpdate]);
 
+  const timeout = useRef<ReturnType<typeof setTimeout> | null>(null);
   const handleValuesChange = useCallback(
     async (_: unknown, values: FormType) => {
+      if (timeout.current) {
+        clearTimeout(timeout.current);
+        timeout.current = null;
+      }
       if (
         project.name === values.name &&
         project.alias === values.alias &&
@@ -57,15 +63,43 @@ const ProjectGeneralForm: React.FC<Props> = ({
         setIsDisabled(true);
         return;
       }
-      const hasError = await form
-        .validateFields()
-        .then(() => false)
-        .catch((errorInfo: ValidateErrorEntity) => errorInfo.errorFields.length > 0);
-      setIsDisabled(hasError);
+      const validate = async () => {
+        const hasError = await form
+          .validateFields()
+          .then(() => false)
+          .catch((errorInfo: ValidateErrorEntity) => errorInfo.errorFields.length > 0);
+        setIsDisabled(hasError);
+      };
+      timeout.current = setTimeout(validate, 300);
     },
     [form, project.alias, project.description, project.name],
   );
 
+  const prevAlias = useRef<{ alias: string; isSuccess: boolean }>();
+  const aliasValidate = useCallback(
+    async (value: string) => {
+      if (project.alias === value) {
+        return Promise.resolve();
+      } else if (prevAlias.current?.alias === value) {
+        return prevAlias.current?.isSuccess ? Promise.resolve() : Promise.reject();
+      } else if (value.length >= 5 && validateKey(value) && (await onProjectAliasCheck(value))) {
+        prevAlias.current = { alias: value, isSuccess: true };
+        return Promise.resolve();
+      } else {
+        prevAlias.current = { alias: value, isSuccess: false };
+        return Promise.reject();
+      }
+    },
+    [onProjectAliasCheck, project.alias],
+  );
+
+  const handleAliasChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      keyReplace(e, { form, key: "alias" });
+    },
+    [form],
+  );
+
   return (
     <StyledForm
       form={form}
@@ -73,7 +107,8 @@ const ProjectGeneralForm: React.FC<Props> = ({
       autoComplete="off"
       initialValues={project}
       onFinish={handleSubmit}
-      onValuesChange={handleValuesChange}>
+      onValuesChange={handleValuesChange}
+      validateTrigger="">
       <Form.Item
         name="name"
         label={t("Name")}
@@ -89,17 +124,16 @@ const ProjectGeneralForm: React.FC<Props> = ({
             required: true,
             message: t("Project alias is not valid"),
             validator: async (_, value) => {
-              if (!validateKey(value) || value.length <= 4) {
-                return Promise.reject();
-              }
-              const isProjectAliasAvailable = await onProjectAliasCheck(value);
-              return isProjectAliasAvailable || project?.alias === value
-                ? Promise.resolve()
-                : Promise.reject();
+              await aliasValidate(value);
             },
           },
         ]}>
-        <Input disabled={!hasUpdateRight} />
+        <Input
+          disabled={!hasUpdateRight}
+          onChange={handleAliasChange}
+          showCount
+          maxLength={MAX_KEY_LENGTH}
+        />
       </Form.Item>
       <Form.Item
         name="description"
diff --git a/web/src/components/molecules/Schema/FormModal.tsx b/web/src/components/molecules/Schema/FormModal.tsx
index d4c2c0c41b..c4a31b91a1 100644
--- a/web/src/components/molecules/Schema/FormModal.tsx
+++ b/web/src/components/molecules/Schema/FormModal.tsx
@@ -42,28 +42,38 @@ const FormModal: React.FC<Props> = ({
   const [isDisabled, setIsDisabled] = useState(true);
   const prevKey = useRef<{ key: string; isSuccess: boolean }>();
 
-  const values = Form.useWatch([], form);
+  const timeout = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const values = Form.useWatch<FormType | undefined>([], form);
   useEffect(() => {
-    if (form.getFieldValue("name") && form.getFieldValue("key")) {
-      if (
-        data?.name === values.name &&
-        data.description === values.description &&
-        data.key === values.key
-      ) {
-        setIsDisabled(true);
-      } else {
-        form
-          .validateFields()
-          .then(() => setIsDisabled(false))
-          .catch(() => setIsDisabled(true));
-      }
-    } else {
+    if (timeout.current) {
+      clearTimeout(timeout.current);
+      timeout.current = null;
+    }
+    if (
+      data?.name === values?.name &&
+      data?.description === values?.description &&
+      data?.key === values?.key
+    ) {
       setIsDisabled(true);
+      return;
     }
-  }, [data?.description, data?.key, data?.name, form, values]);
+    const validate = () => {
+      form
+        .validateFields()
+        .then(() => setIsDisabled(false))
+        .catch(() => setIsDisabled(true));
+    };
+    timeout.current = setTimeout(validate, 300);
+    return () => {
+      if (timeout.current) {
+        clearTimeout(timeout.current);
+      }
+    };
+  }, [data, form, values]);
 
   useEffect(() => {
     if (open) {
+      setIsDisabled(true);
       if (data) {
         form.setFieldsValue(data);
       } else {
@@ -183,7 +193,7 @@ const FormModal: React.FC<Props> = ({
           {t("OK")}
         </Button>,
       ]}>
-      <Form form={form} layout="vertical">
+      <Form form={form} layout="vertical" validateTrigger="">
         <Form.Item
           name="name"
           label={nameLabel}

From c5802622b50f360f45a271f61dfc62d403918d73 Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:28:18 +0900
Subject: [PATCH 28/28] fix(web): field key unique check for fields in group
 (#1308)

* fix: group key check

* fix: e2e tests
---
 web/e2e/project/item/fields/group.spec.ts     |  4 +-
 web/e2e/project/schema.spec.ts                |  2 +-
 .../molecules/Schema/FieldModal/hooks.ts      |  3 ++
 .../organisms/Project/Schema/hooks.ts         | 44 ++++++++++---------
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/web/e2e/project/item/fields/group.spec.ts b/web/e2e/project/item/fields/group.spec.ts
index db71283ff0..5c8af97d05 100644
--- a/web/e2e/project/item/fields/group.spec.ts
+++ b/web/e2e/project/item/fields/group.spec.ts
@@ -41,7 +41,7 @@ test("Group field creating and updating has succeeded", async ({ page }) => {
   await page.getByLabel("Settings").locator("#key").fill("group1");
   await page.getByLabel("Settings").locator("#description").click();
   await page.getByLabel("Settings").locator("#description").fill("group1 description");
-  await page.getByLabel("Select Group").click();
+  await page.locator(".ant-select-selector").click();
   await page.getByText("e2e group name #e2e-group-key").click();
   await expect(page.getByLabel("Settings")).toContainText("e2e group name #e2e-group-key");
   await page.getByRole("tab", { name: "Validation" }).click();
@@ -171,7 +171,7 @@ test("Group field editing has succeeded", async ({ page }) => {
   await page.getByLabel("Settings").locator("#key").fill("group1");
   await page.getByLabel("Settings").locator("#description").click();
   await page.getByLabel("Settings").locator("#description").fill("group1 description");
-  await page.getByLabel("Select Group").click();
+  await page.locator(".ant-select-selector").click();
   await page.getByText("e2e group name #e2e-group-key").click();
   await expect(page.getByLabel("Settings")).toContainText("e2e group name #e2e-group-key");
   await page.getByRole("tab", { name: "Validation" }).click();
diff --git a/web/e2e/project/schema.spec.ts b/web/e2e/project/schema.spec.ts
index 2dc269094b..dd1abfde27 100644
--- a/web/e2e/project/schema.spec.ts
+++ b/web/e2e/project/schema.spec.ts
@@ -94,7 +94,7 @@ test("Group creating from adding field has succeeded", async ({ page }) => {
   await page.getByText("e2e model name").click();
   await page.locator("li").getByText("Group", { exact: true }).click();
   await expect(page.getByText("Create Group Field")).toBeVisible();
-  await page.getByLabel("Select Group").click();
+  await page.locator(".ant-select-selector").click();
   await expect(page.getByText("e2e group name #e2e-group-key")).toBeVisible();
   await page.getByRole("button", { name: "Cancel" }).click();
 });
diff --git a/web/src/components/molecules/Schema/FieldModal/hooks.ts b/web/src/components/molecules/Schema/FieldModal/hooks.ts
index 81479ce042..58dc832ee4 100644
--- a/web/src/components/molecules/Schema/FieldModal/hooks.ts
+++ b/web/src/components/molecules/Schema/FieldModal/hooks.ts
@@ -237,6 +237,7 @@ export default (
     if (form.getFieldValue("title") && form.getFieldValue("key")) {
       if (
         form.getFieldValue("values")?.length === 0 ||
+        form.getFieldValue("group")?.length === 0 ||
         form.getFieldValue("supportedTypes")?.length === 0 ||
         form.getFieldValue("tags")?.length === 0
       ) {
@@ -370,6 +371,8 @@ export default (
     if (open && !selectedField) {
       if (selectedType === "Select") {
         form.setFieldValue("values", []);
+      } else if (selectedType === "Group") {
+        form.setFieldValue("group", "");
       } else if (selectedType === "GeometryObject") {
         form.setFieldValue("supportedTypes", []);
       } else if (selectedType === "GeometryEditor") {
diff --git a/web/src/components/organisms/Project/Schema/hooks.ts b/web/src/components/organisms/Project/Schema/hooks.ts
index baabe1c23f..5e50dc0d00 100644
--- a/web/src/components/organisms/Project/Schema/hooks.ts
+++ b/web/src/components/organisms/Project/Schema/hooks.ts
@@ -9,6 +9,8 @@ import {
   FieldType,
   Group,
   SelectedSchemaType,
+  Schema,
+  MetaDataSchema,
 } from "@reearth-cms/components/molecules/Schema/types";
 import type { FormValues, ModelFormValues } from "@reearth-cms/components/molecules/Schema/types";
 import { fromGraphQLModel } from "@reearth-cms/components/organisms/DataConverters/model";
@@ -49,6 +51,10 @@ export default () => {
   const hasUpdateRight = useMemo(() => !!userRights?.schema.update, [userRights?.schema.update]);
   const hasDeleteRight = useMemo(() => !!userRights?.schema.delete, [userRights?.schema.delete]);
 
+  const [modelModalShown, setModelModalShown] = useState(false);
+  const [modelDeletionModalShown, setModelDeletionModalShown] = useState(false);
+  const [groupModalShown, setGroupModalShown] = useState(false);
+  const [groupDeletionModalShown, setGroupDeletionModalShown] = useState(false);
   const [fieldModalShown, setFieldModalShown] = useState(false);
   const [isMeta, setIsMeta] = useState(false);
   const [selectedField, setSelectedField] = useState<Field | null>(null);
@@ -114,6 +120,13 @@ export default () => {
     [group],
   );
 
+  const isGroup = useMemo(
+    () => groupModalShown || selectedSchemaType === "group",
+    [groupModalShown, selectedSchemaType],
+  );
+
+  const data = useMemo(() => (isGroup ? group : currentModel), [currentModel, group, isGroup]);
+
   useEffect(() => {
     if (!schemaId && currentModel) {
       navigate(`/workspace/${workspaceId}/project/${projectId}/schema/${currentModel.id}`);
@@ -135,23 +148,27 @@ export default () => {
   );
 
   const keyUniqueCheck = useCallback(
-    (key: string, fieldId?: string, model?: Model) => {
-      const schema = isMeta ? model?.metadataSchema : model?.schema;
+    (key: string, fieldId?: string, schema?: Schema | MetaDataSchema) => {
       const sameKeyField = schema?.fields?.find(field => field.key === key);
       return !sameKeyField || sameKeyField.id === fieldId;
     },
-    [isMeta],
+    [],
   );
 
   const handleFieldKeyUnique = useCallback(
-    (key: string) => keyUniqueCheck(key, selectedField?.id, currentModel),
-    [keyUniqueCheck, selectedField?.id, currentModel],
+    (key: string) =>
+      keyUniqueCheck(key, selectedField?.id, isMeta ? currentModel?.metadataSchema : data?.schema),
+    [keyUniqueCheck, selectedField?.id, isMeta, currentModel?.metadataSchema, data?.schema],
   );
 
   const handleCorrespondingFieldKeyUnique = useCallback(
     (key: string) =>
-      keyUniqueCheck(key, selectedField?.typeProperty?.correspondingField?.id, referencedModel),
-    [keyUniqueCheck, selectedField?.typeProperty?.correspondingField?.id, referencedModel],
+      keyUniqueCheck(
+        key,
+        selectedField?.typeProperty?.correspondingField?.id,
+        referencedModel?.schema,
+      ),
+    [keyUniqueCheck, referencedModel?.schema, selectedField?.typeProperty?.correspondingField?.id],
   );
 
   const [createNewField, { loading: fieldCreationLoading }] = useCreateFieldMutation({
@@ -291,9 +308,6 @@ export default () => {
   );
 
   // group hooks
-  const [groupModalShown, setGroupModalShown] = useState(false);
-  const [groupDeletionModalShown, setGroupDeletionModalShown] = useState(false);
-
   const handleGroupModalOpen = useCallback(() => setGroupModalShown(true), []);
   const handleGroupModalClose = useCallback(() => setGroupModalShown(false), []);
   const handleGroupDeletionModalOpen = useCallback(
@@ -436,9 +450,6 @@ export default () => {
   );
 
   // model hooks
-  const [modelModalShown, setModelModalShown] = useState(false);
-  const [modelDeletionModalShown, setModelDeletionModalShown] = useState(false);
-
   const [CheckModelKeyAvailability] = useCheckModelKeyAvailabilityLazyQuery({
     fetchPolicy: "no-cache",
   });
@@ -510,13 +521,6 @@ export default () => {
     [updateNewModel, handleModelModalClose, t],
   );
 
-  const isGroup = useMemo(
-    () => groupModalShown || selectedSchemaType === "group",
-    [groupModalShown, selectedSchemaType],
-  );
-
-  const data = useMemo(() => (isGroup ? group : currentModel), [currentModel, group, isGroup]);
-
   const handleKeyCheck = useCallback(
     async (key: string, ignoredKey?: string) => {
       if (!projectId || !key) return false;