From cde98405fc5a1c1a4209cfa646fd486c8bc300dc Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Thu, 17 Oct 2024 13:20:18 +0900
Subject: [PATCH 1/6] fix(web): add some missing styling (#1257)

* asset table

* item information card

* field update modal title

* asset name

* show folder and file icon on asset tree
---
 web/src/components/atoms/Icon/icons.ts        |  2 +
 .../Asset/AssetBody/UnzipFileList/index.tsx   | 12 +++++-
 .../molecules/Asset/AssetListTable/index.tsx  |  7 +++-
 .../molecules/Common/Form/AssetItem/index.tsx | 39 ++++++++++---------
 .../molecules/Content/Form/SidebarWrapper.tsx |  8 ++--
 .../molecules/Schema/FieldModal/index.tsx     | 19 +++++----
 6 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/web/src/components/atoms/Icon/icons.ts b/web/src/components/atoms/Icon/icons.ts
index 2b118d8a60..ba1edb677e 100644
--- a/web/src/components/atoms/Icon/icons.ts
+++ b/web/src/components/atoms/Icon/icons.ts
@@ -33,6 +33,7 @@ import {
   MenuFoldOutlined,
   MenuUnfoldOutlined,
   FolderOutlined,
+  FolderOpenOutlined,
   LinkOutlined,
   UserAddOutlined,
   ClearOutlined,
@@ -137,6 +138,7 @@ export default {
   panelToggleLeft: MenuFoldOutlined,
   panelToggleRight: MenuUnfoldOutlined,
   folder: FolderOutlined,
+  folderOpen: FolderOpenOutlined,
   dot: Dot,
   userAdd: UserAddOutlined,
   clear: ClearOutlined,
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 6b21de1ba6..2673273199 100644
--- a/web/src/components/molecules/Asset/Asset/AssetBody/UnzipFileList/index.tsx
+++ b/web/src/components/molecules/Asset/Asset/AssetBody/UnzipFileList/index.tsx
@@ -74,13 +74,15 @@ const UnzipFileList: React.FC<Props> = ({
       ) : (
         treeData && (
           <Tree
-            switcherIcon={<Icon icon="caretDown" />}
+            switcherIcon={({ expanded }) => (
+              <SwitcherIcon icon={expanded ? "folderOpen" : "folder"} size={14} />
+            )}
             defaultExpandedKeys={["0-0"]}
             selectedKeys={selectedKeys}
             onSelect={handleSelect}
             treeData={treeData}
             multiple={false}
-            showLine
+            showLine={{ showLeafIcon: true }}
             titleRender={({ title, key, path }) => {
               return (
                 <>
@@ -144,4 +146,10 @@ const CopyIcon = styled(Icon)`
   }
 `;
 
+const SwitcherIcon = styled(Icon)`
+  svg {
+    transform: none !important;
+  }
+`;
+
 export default UnzipFileList;
diff --git a/web/src/components/molecules/Asset/AssetListTable/index.tsx b/web/src/components/molecules/Asset/AssetListTable/index.tsx
index 631f676069..61b4f1fd75 100644
--- a/web/src/components/molecules/Asset/AssetListTable/index.tsx
+++ b/web/src/components/molecules/Asset/AssetListTable/index.tsx
@@ -291,7 +291,12 @@ const AssetListTable: React.FC<Props> = ({
             onClick={props.onCleanSelected}>
             {t("Deselect")}
           </Button>
-          <DownloadButton displayDefaultIcon type="link" selected={props.selectedRows} />
+          <DownloadButton
+            displayDefaultIcon
+            size="small"
+            type="link"
+            selected={props.selectedRows}
+          />
           <Button
             type="link"
             size="small"
diff --git a/web/src/components/molecules/Common/Form/AssetItem/index.tsx b/web/src/components/molecules/Common/Form/AssetItem/index.tsx
index c16d160848..3e4fc8f7f8 100644
--- a/web/src/components/molecules/Common/Form/AssetItem/index.tsx
+++ b/web/src/components/molecules/Common/Form/AssetItem/index.tsx
@@ -148,19 +148,21 @@ const AssetItem: React.FC<Props> = ({
         <>
           <AssetDetailsWrapper>
             <AssetButton enabled={!!asset} disabled={disabled} onClick={handleClick}>
-              <div>
-                <Icon icon="folder" size={24} />
-                <AssetName>{asset?.fileName ?? value}</AssetName>
-              </div>
+              <Icon icon="folder" size={24} />
+              <AssetName>{asset?.fileName ?? value}</AssetName>
             </AssetButton>
             <Tooltip title={asset?.fileName}>
-              <Link
-                to={`/workspace/${workspaceId}/project/${projectId}/asset/${value}`}
-                target="_blank">
-                <AssetLinkedName enabled={!!asset} type="link">
-                  {asset?.fileName ?? value + " (removed)"}
+              {asset ? (
+                <Link
+                  to={`/workspace/${workspaceId}/project/${projectId}/asset/${value}`}
+                  target="_blank">
+                  <AssetLinkedName type="link">{asset.fileName}</AssetLinkedName>
+                </Link>
+              ) : (
+                <AssetLinkedName type="link" disabled>
+                  {`${value} (removed)`}
                 </AssetLinkedName>
-              </Link>
+              )}
             </Tooltip>
           </AssetDetailsWrapper>
           <Space />
@@ -181,10 +183,8 @@ const AssetItem: React.FC<Props> = ({
         </>
       ) : (
         <AssetButton disabled={disabled} onClick={handleClick}>
-          <div>
-            <Icon icon="linkSolid" size={14} />
-            <AssetButtonTitle>{t("Asset")}</AssetButtonTitle>
-          </div>
+          <Icon icon="linkSolid" size={14} />
+          <AssetButtonTitle>{t("Asset")}</AssetButtonTitle>
         </AssetButton>
       )}
       {uploadUrl && setUploadUrl && (
@@ -225,6 +225,8 @@ const AssetButton = styled(Button)<{ enabled?: boolean }>`
   border: 1px dashed;
   border-color: ${({ enabled }) => (enabled ? "#d9d9d9" : "#00000040")};
   color: ${({ enabled }) => (enabled ? "#000000D9" : "#00000040")};
+  padding: 0 5px;
+  flex-flow: column;
 `;
 
 const Space = styled.div`
@@ -247,9 +249,8 @@ const AssetLink = styled(Button)`
   }
 `;
 
-const AssetLinkedName = styled(Button)<{ enabled?: boolean }>`
-  color: #1890ff;
-  color: ${({ enabled }) => (enabled ? "#1890ff" : "#00000040")};
+const AssetLinkedName = styled(Button)<{ disabled?: boolean }>`
+  color: ${({ disabled }) => (disabled ? "#00000040" : "#1890ff")};
   margin-left: 12px;
   span {
     text-align: start;
@@ -268,8 +269,10 @@ const AssetDetailsWrapper = styled.div`
 `;
 
 const AssetName = styled.div`
-  margin-top: 8px;
+  width: 100%;
   overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 `;
 
 const AssetButtonTitle = styled.div`
diff --git a/web/src/components/molecules/Content/Form/SidebarWrapper.tsx b/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
index 734b5dcf2d..c059b52d7b 100644
--- a/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
+++ b/web/src/components/molecules/Content/Form/SidebarWrapper.tsx
@@ -94,22 +94,20 @@ const ContentSidebarWrapper: React.FC<Props> = ({ item, onNavigateToRequest }) =
 
 const DataRow = styled.div`
   display: flex;
-  margin: 0 -4px;
   align-items: center;
   justify-content: space-between;
+  gap: 8px;
+  padding: 4px 0;
+  line-height: 22px;
 `;
 
 const DataTitle = styled.div`
   font-size: 14px;
-  line-height: 22px;
-  padding: 4px;
 `;
 
 const DataText = styled.div`
   color: #00000073;
   font-size: 12px;
-  line-height: 22px;
-  padding: 4px;
 `;
 
 const StyledTag = styled(Tag)`
diff --git a/web/src/components/molecules/Schema/FieldModal/index.tsx b/web/src/components/molecules/Schema/FieldModal/index.tsx
index 3eafac4695..e3472415e0 100644
--- a/web/src/components/molecules/Schema/FieldModal/index.tsx
+++ b/web/src/components/molecules/Schema/FieldModal/index.tsx
@@ -153,11 +153,11 @@ const FieldModal: React.FC<Props> = ({
       title={
         <FieldThumbnail>
           <StyledIcon icon={fieldTypes[selectedType].icon} color={fieldTypes[selectedType].color} />
-          <h3>
+          <StyledTitle>
             {selectedField
               ? t("Update Field", { field: selectedField.title })
               : t("Create Field", { field: t(fieldTypes[selectedType].title) })}
-          </h3>
+          </StyledTitle>
         </FieldThumbnail>
       }
       width={572}
@@ -378,14 +378,6 @@ const OptionTitle = styled.p`
 const FieldThumbnail = styled.div`
   display: flex;
   align-items: center;
-  h3 {
-    margin: 0;
-    margin-left: 12px;
-    font-weight: 500;
-    font-size: 16px;
-    line-height: 24px;
-    color: #000000d9;
-  }
 `;
 
 const StyledIcon = styled(Icon)`
@@ -400,6 +392,13 @@ const StyledIcon = styled(Icon)`
   }
 `;
 
+const StyledTitle = styled.p`
+  color: #000000d9;
+  font-size: 16px;
+  margin: 0 20px 0 12px;
+  overflow: auto;
+`;
+
 const StyledGroupKey = styled.span`
   font-size: 12px;
   margin-left: 4px;

From bd13729eddb282bf277c573f956c59ee7025a562 Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:01:35 +0900
Subject: [PATCH 2/6] fix(web): toggle ok button on modal for updating field
 (#1252)

* toggle save button

* refactor and fix

* Update web/src/components/molecules/Schema/FieldModal/hooks.ts

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

---------

Co-authored-by: Nour Balaha <nourbalaha0@gmail.com>
---
 .../Common/Form/GeometryItem/index.tsx        |  6 +--
 .../MultiValueGeometry/index.tsx              |  3 +-
 .../molecules/Schema/FieldModal/hooks.ts      | 41 +++++++++++++++++--
 .../molecules/Schema/FieldModal/index.tsx     |  8 +++-
 web/src/components/molecules/Schema/types.ts  |  6 +--
 5 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/web/src/components/molecules/Common/Form/GeometryItem/index.tsx b/web/src/components/molecules/Common/Form/GeometryItem/index.tsx
index a256efa423..7d7c7edbee 100644
--- a/web/src/components/molecules/Common/Form/GeometryItem/index.tsx
+++ b/web/src/components/molecules/Common/Form/GeometryItem/index.tsx
@@ -225,12 +225,12 @@ const GeometryItem: React.FC<Props> = ({
                 : [GEO_TYPE_MAP[supportedTypes]];
             if (convertedTypes.includes(valueJson.type)) {
               handleErrorDelete();
-            } else {
-              handleErrorAdd();
+              return;
             }
           }
+          throw new Error();
         } catch (_) {
-          return;
+          handleErrorAdd();
         }
       } else {
         handleErrorDelete();
diff --git a/web/src/components/molecules/Common/MultiValueField/MultiValueGeometry/index.tsx b/web/src/components/molecules/Common/MultiValueField/MultiValueGeometry/index.tsx
index 6397c3968b..d62d1ae01b 100644
--- a/web/src/components/molecules/Common/MultiValueField/MultiValueGeometry/index.tsx
+++ b/web/src/components/molecules/Common/MultiValueField/MultiValueGeometry/index.tsx
@@ -50,8 +50,9 @@ const MultiValueGeometry: React.FC<Props> = ({
           return index !== key;
         }),
       );
+      errorDelete?.(key);
     },
-    [onChange, value],
+    [errorDelete, onChange, value],
   );
 
   return (
diff --git a/web/src/components/molecules/Schema/FieldModal/hooks.ts b/web/src/components/molecules/Schema/FieldModal/hooks.ts
index fc0b8aa5bd..b214c7402e 100644
--- a/web/src/components/molecules/Schema/FieldModal/hooks.ts
+++ b/web/src/components/molecules/Schema/FieldModal/hooks.ts
@@ -3,7 +3,11 @@ import dayjs from "dayjs";
 import { useCallback, useEffect, useMemo, useState, useRef } from "react";
 
 import Form from "@reearth-cms/components/atoms/Form";
-import { keyAutoFill, keyReplace } from "@reearth-cms/components/molecules/Common/Form/utils";
+import {
+  keyAutoFill,
+  keyReplace,
+  emptyConvert,
+} from "@reearth-cms/components/molecules/Common/Form/utils";
 import {
   Field,
   FieldModalTabs,
@@ -118,9 +122,12 @@ export default (
     }
   }, []);
 
+  const changedKeys = useRef(new Set<string>());
+  const defaultValueRef = useRef<Partial<FormTypes>>();
+
   useEffect(() => {
     setMultipleValue(!!selectedField?.multiple);
-    form.setFieldsValue({
+    const defaultValue = {
       fieldId: selectedField?.id,
       title: selectedField?.title,
       description: selectedField?.description,
@@ -139,7 +146,10 @@ export default (
       supportedTypes:
         selectedField?.typeProperty?.objectSupportedTypes ||
         selectedField?.typeProperty?.editorSupportedTypes?.[0],
-    });
+    };
+    form.setFieldsValue(defaultValue);
+    defaultValueRef.current = defaultValue;
+    changedKeys.current.clear();
   }, [defaultValueGet, form, selectedField]);
 
   const typePropertyGet = useCallback((values: FormTypes) => {
@@ -230,7 +240,7 @@ export default (
       } else {
         form
           .validateFields()
-          .then(() => setButtonDisabled(false))
+          .then(() => setButtonDisabled(changedKeys.current.size === 0))
           .catch(() => setButtonDisabled(true));
       }
     } else {
@@ -238,6 +248,28 @@ 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();
+      }
+
+      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>) => {
       if (selectedField) return;
@@ -357,6 +389,7 @@ export default (
     multipleValue,
     handleMultipleChange,
     handleTabChange,
+    handleValuesChange,
     handleNameChange,
     handleKeyChange,
     handleSubmit,
diff --git a/web/src/components/molecules/Schema/FieldModal/index.tsx b/web/src/components/molecules/Schema/FieldModal/index.tsx
index e3472415e0..4d08298eef 100644
--- a/web/src/components/molecules/Schema/FieldModal/index.tsx
+++ b/web/src/components/molecules/Schema/FieldModal/index.tsx
@@ -128,6 +128,7 @@ const FieldModal: React.FC<Props> = ({
     multipleValue,
     handleMultipleChange,
     handleTabChange,
+    handleValuesChange,
     handleNameChange,
     handleKeyChange,
     handleSubmit,
@@ -176,7 +177,12 @@ const FieldModal: React.FC<Props> = ({
           {t("OK")}
         </Button>,
       ]}>
-      <Form form={form} layout="vertical" initialValues={initialValues} requiredMark={requiredMark}>
+      <Form
+        form={form}
+        layout="vertical"
+        initialValues={initialValues}
+        requiredMark={requiredMark}
+        onValuesChange={handleValuesChange}>
         <Tabs activeKey={activeTab} onChange={handleTabChange}>
           <TabPane tab={t("Settings")} key="settings" forceRender>
             <Form.Item
diff --git a/web/src/components/molecules/Schema/types.ts b/web/src/components/molecules/Schema/types.ts
index 6e56d9093e..b2b5d9c4a0 100644
--- a/web/src/components/molecules/Schema/types.ts
+++ b/web/src/components/molecules/Schema/types.ts
@@ -100,7 +100,7 @@ export type FieldTypePropertyInput = {
   select?: { defaultValue: string; values: string[] };
   tag?: {
     defaultValue?: string;
-    tags: { color: string; id?: string; name: string }[];
+    tags: Tag[];
   };
   checkbox?: { defaultValue?: boolean };
   integer?: { defaultValue: number | ""; min: number | null; max: number | null };
@@ -162,9 +162,9 @@ export type FormTypes = FormValues & {
   values?: string[];
   min?: number;
   max?: number;
-  tags?: { color: string; id: string; name: string }[];
+  tags?: Tag[];
   group: string;
-  supportedTypes?: string[] | string;
+  supportedTypes?: ObjectSupportedType[] | EditorSupportedType;
 };
 
 export type Tab = "fields" | "meta-data";

From b247456f115947a0c2730421fe82cc27d2272ae5 Mon Sep 17 00:00:00 2001
From: caichi <54824604+caichi-t@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:39:39 +0900
Subject: [PATCH 3/6] fix(web): incorrect default value for filter (#1267)

* fix: nullable filter

* fix: default value bug

---------

Co-authored-by: Kazuma Tsuchiya <>
---
 .../Content/Table/DropdownRender/hooks.ts     | 71 ++++++++++++-------
 .../Content/Table/DropdownRender/index.tsx    | 14 +---
 .../Content/Table/filterDropdown.tsx          |  4 +-
 3 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/web/src/components/molecules/Content/Table/DropdownRender/hooks.ts b/web/src/components/molecules/Content/Table/DropdownRender/hooks.ts
index 6847a952e1..9ca30a16ae 100644
--- a/web/src/components/molecules/Content/Table/DropdownRender/hooks.ts
+++ b/web/src/components/molecules/Content/Table/DropdownRender/hooks.ts
@@ -1,4 +1,4 @@
-import { Dayjs } from "dayjs";
+import dayjs, { Dayjs } from "dayjs";
 import { useRef, useEffect, useCallback, useMemo, useState, Dispatch, SetStateAction } from "react";
 
 import { DatePickerProps } from "@reearth-cms/components/atoms/DatePicker";
@@ -38,15 +38,34 @@ export default (
   const t = useT();
   const [form] = Form.useForm();
 
+  const defaultValueGet = useCallback(() => {
+    switch (filter.type) {
+      case "Select":
+      case "Tag":
+      case "Person":
+      case "Bool":
+      case "Checkbox":
+        return defaultValue?.value?.toString();
+      case "Date":
+        return defaultValue && defaultValue.value !== "" ? dayjs(defaultValue.value) : undefined;
+      default:
+        return defaultValue?.value;
+    }
+  }, [defaultValue, filter.type]);
+
   useEffect(() => {
-    if (open && !defaultValue) {
-      form.resetFields();
-      setIsShowInputField(true);
-      if (!isFilter && filterOption.current) {
-        filterOption.current.value = "ASC";
+    if (open) {
+      if (defaultValue) {
+        form.setFieldsValue({ condition: defaultValue.operator, value: defaultValueGet() });
+      } else {
+        form.resetFields();
+        setIsShowInputField(true);
+        if (!isFilter && filterOption.current) {
+          filterOption.current.value = "ASC";
+        }
       }
     }
-  }, [open, form, defaultValue, isFilter]);
+  }, [open, form, defaultValue, isFilter, defaultValueGet]);
 
   const options = useMemo(() => {
     const result: {
@@ -236,31 +255,33 @@ export default (
   const filterValue = useRef<string>();
 
   useEffect(() => {
+    let isShow = true;
     if (defaultValue) {
+      const { operator, operatorType, value } = defaultValue;
       filterOption.current = {
-        value: defaultValue.operator,
-        operatorType: defaultValue.operatorType,
+        value: operator,
+        operatorType,
       };
-      filterValue.current = defaultValue.value;
+      filterValue.current = value;
+      if (
+        operatorType === "nullable" ||
+        operator === TimeOperator.OfThisWeek ||
+        operator === TimeOperator.OfThisMonth ||
+        operator === TimeOperator.OfThisYear
+      ) {
+        isShow = false;
+      }
     } else {
+      const { value, operatorType } = options[0];
       filterOption.current = {
-        value: options[0].value,
-        operatorType: options[0].operatorType,
+        value,
+        operatorType,
       };
+      if (operatorType === "nullable") {
+        isShow = false;
+      }
     }
-
-    if (defaultValue?.operatorType === "nullable") {
-      setIsShowInputField(false);
-    } else if (
-      defaultValue?.operator === TimeOperator.OfThisWeek ||
-      defaultValue?.operator === TimeOperator.OfThisMonth ||
-      defaultValue?.operator === TimeOperator.OfThisYear
-    ) {
-      setIsShowInputField(false);
-      defaultValue.value = "";
-    } else {
-      setIsShowInputField(true);
-    }
+    setIsShowInputField(isShow);
   }, [defaultValue, options]);
 
   const confirm = useCallback(() => {
diff --git a/web/src/components/molecules/Content/Table/DropdownRender/index.tsx b/web/src/components/molecules/Content/Table/DropdownRender/index.tsx
index b097161677..50f267e6cc 100644
--- a/web/src/components/molecules/Content/Table/DropdownRender/index.tsx
+++ b/web/src/components/molecules/Content/Table/DropdownRender/index.tsx
@@ -1,5 +1,4 @@
 import styled from "@emotion/styled";
-import dayjs from "dayjs";
 import { Dispatch, SetStateAction } from "react";
 
 import Button from "@reearth-cms/components/atoms/Button";
@@ -77,7 +76,7 @@ const DropdownRender: React.FC<Props> = ({
             style={{ width: 160 }}
             options={options}
             onSelect={onFilterSelect}
-            defaultValue={defaultValue?.operator ?? options[0].value}
+            defaultValue={options[0].value}
             getPopupContainer={trigger => trigger.parentNode}
           />
         </StyledFormItem>
@@ -91,7 +90,6 @@ const DropdownRender: React.FC<Props> = ({
               <Select
                 placeholder="Select the value"
                 onSelect={onValueSelect}
-                defaultValue={defaultValue?.value?.toString()}
                 getPopupContainer={trigger => trigger.parentNode}>
                 {valueOptions.map(option => (
                   <Option key={option.value} value={option.value} label={option.label}>
@@ -107,7 +105,6 @@ const DropdownRender: React.FC<Props> = ({
               <InputNumber
                 onChange={onNumberChange}
                 stringMode
-                defaultValue={defaultValue?.value}
                 style={{ width: "100%" }}
                 placeholder="Enter the value"
               />
@@ -117,16 +114,9 @@ const DropdownRender: React.FC<Props> = ({
                 style={{ width: "100%" }}
                 placeholder="Select the date"
                 showNow={false}
-                defaultValue={
-                  defaultValue && defaultValue.value !== "" ? dayjs(defaultValue.value) : undefined
-                }
               />
             ) : (
-              <Input
-                onChange={onInputChange}
-                defaultValue={defaultValue?.value}
-                placeholder="Enter the value"
-              />
+              <Input onChange={onInputChange} placeholder="Enter the value" />
             )}
           </StyledFormItem>
         )}
diff --git a/web/src/components/molecules/Content/Table/filterDropdown.tsx b/web/src/components/molecules/Content/Table/filterDropdown.tsx
index 20459aac30..9446bf7082 100644
--- a/web/src/components/molecules/Content/Table/filterDropdown.tsx
+++ b/web/src/components/molecules/Content/Table/filterDropdown.tsx
@@ -28,7 +28,7 @@ type Props = {
 const FilterDropdown: React.FC<Props> = ({
   filter,
   index,
-  defaultValue: value,
+  defaultValue,
   filterRemove,
   isFilterOpen,
   currentView,
@@ -61,7 +61,7 @@ const FilterDropdown: React.FC<Props> = ({
           filter={filter}
           index={index}
           close={close}
-          defaultValue={value}
+          defaultValue={defaultValue}
           open={open}
           isFilter={true}
           currentView={currentView}

From 6029152cbc6a2b392b8dfe12a6d078f2c55ed93b Mon Sep 17 00:00:00 2001
From: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>
Date: Thu, 17 Oct 2024 10:47:54 +0200
Subject: [PATCH 4/6] fix(server): all roles should be able to publish item by
 default (#1268)

imp
---
 server/internal/usecase/interactor/project.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/internal/usecase/interactor/project.go b/server/internal/usecase/interactor/project.go
index 82428de199..348da4902b 100644
--- a/server/internal/usecase/interactor/project.go
+++ b/server/internal/usecase/interactor/project.go
@@ -3,6 +3,7 @@ package interactor
 import (
 	"context"
 	"errors"
+
 	"github.com/reearth/reearth-cms/server/internal/usecase"
 	"github.com/reearth/reearth-cms/server/internal/usecase/gateway"
 	"github.com/reearth/reearth-cms/server/internal/usecase/interfaces"
@@ -62,7 +63,7 @@ func (i *Project) Create(ctx context.Context, p interfaces.CreateProjectParam, o
 			if len(p.RequestRoles) > 0 {
 				pb = pb.RequestRoles(p.RequestRoles)
 			} else {
-				pb = pb.RequestRoles([]workspace.Role{workspace.RoleOwner, workspace.RoleMaintainer, workspace.RoleWriter, workspace.RoleReader})
+				pb = pb.RequestRoles([]workspace.Role{})
 			}
 
 			proj, err := pb.Build()

From 970f63dd773a15c3c956f09766756245506f2430 Mon Sep 17 00:00:00 2001
From: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:45:20 +0200
Subject: [PATCH 5/6] ci: build workflow was not triggered (#1270)

imp
---
 .../{decompressor_build.yml => build_decompressor.yml}     | 0
 .github/workflows/build_server.yml                         | 5 ++---
 .github/workflows/{web_build.yml => build_web.yml}         | 7 +++----
 .github/workflows/build_worker.yml                         | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)
 rename .github/workflows/{decompressor_build.yml => build_decompressor.yml} (100%)
 rename .github/workflows/{web_build.yml => build_web.yml} (97%)

diff --git a/.github/workflows/decompressor_build.yml b/.github/workflows/build_decompressor.yml
similarity index 100%
rename from .github/workflows/decompressor_build.yml
rename to .github/workflows/build_decompressor.yml
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
index 954bab97e4..61baaeaadb 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -1,9 +1,8 @@
 name: server-build
 on:
-  workflow_run:
-    workflows: [ci-server]
-    types: [completed]
+  push:
     branches: [main, release]
+    paths: [server/**]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true
diff --git a/.github/workflows/web_build.yml b/.github/workflows/build_web.yml
similarity index 97%
rename from .github/workflows/web_build.yml
rename to .github/workflows/build_web.yml
index b35646a6f2..f445fbbaef 100644
--- a/.github/workflows/web_build.yml
+++ b/.github/workflows/build_web.yml
@@ -1,9 +1,8 @@
 name: web-build
 on:
-  workflow_run:
-    workflows: [ci-web]
-    types: [completed]
-    branches: [main, release]
+  push:
+    branches: [ main, release ]
+    paths: [ web/** ]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 9477556960..7a19a49a99 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -1,9 +1,8 @@
 name: worker-build
 on:
-  workflow_run:
-    workflows: [ci-worker]
-    types: [completed]
+  push:
     branches: [main, release]
+    paths: [worker/**]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true

From cf26d01d451e5d7c71d7ea7a32d19813a4e6f417 Mon Sep 17 00:00:00 2001
From: yk-eukarya <81808708+yk-eukarya@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:52:04 +0200
Subject: [PATCH 6/6] ci: build workflows was not triggered (#1271)

* imp

* imp
---
 .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 61baaeaadb..d9db9863d5 100644
--- a/.github/workflows/build_server.yml
+++ b/.github/workflows/build_server.yml
@@ -2,7 +2,7 @@ name: server-build
 on:
   push:
     branches: [main, release]
-    paths: [server/**]
+    paths: [server/**, .github/workflows/build_server.yml]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
index f445fbbaef..fead094495 100644
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@@ -2,7 +2,7 @@ name: web-build
 on:
   push:
     branches: [ main, release ]
-    paths: [ web/** ]
+    paths: [ web/**, .github/workflows/build_web.yml ]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true
diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
index 7a19a49a99..4f877a49a5 100644
--- a/.github/workflows/build_worker.yml
+++ b/.github/workflows/build_worker.yml
@@ -2,7 +2,7 @@ name: worker-build
 on:
   push:
     branches: [main, release]
-    paths: [worker/**]
+    paths: [worker/**, .github/workflows/build_worker.yml]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true