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..d9db9863d5 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/**, .github/workflows/build_server.yml] 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..fead094495 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/**, .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 9477556960..4f877a49a5 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/**, .github/workflows/build_worker.yml] concurrency: group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }} cancel-in-progress: true 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() 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 = ({ ) : ( treeData && ( } + switcherIcon={({ expanded }) => ( + + )} 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 = ({ onClick={props.onCleanSelected}> {t("Deselect")} - + , ]}> -
+