feat(web,server): support maintainer role (#749)

reearth · Oct 25, 2023 · 20b086c · 20b086c
1 parent a8fb535
commit 20b086c
Show file tree

Hide file tree

Showing 21 changed files with 10,145 additions and 5,261 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,7 +2,7 @@
   "go.testEnvFile": "${workspaceRoot}/.env",
   "go.lintTool": "golangci-lint",
   "editor.formatOnSave": true,
-  "yaml.format.enable": true,
+  "yaml.format.enable": false,
   "yaml.completion": true,
   "yaml.validate": true,
   "yaml.hover": true,
@@ -28,5 +28,8 @@
       ],
       "url": "./server/schemas/plugin_manifest_translation.json"
     }
-  ]
+  ],
+  "[yaml]": {
+    "editor.formatOnSave": false
+  }
 }
diff --git a/server/gql/team.graphql → server/gql/workspace.graphql b/server/gql/team.graphql → server/gql/workspace.graphql
@@ -32,6 +32,8 @@ enum Role {
   READER
   # a role who can read and write project
   WRITER
+  # a role who can maintain a project
+  MAINTAINER
   # a eole who can have full controll of project
   OWNER
 }
@@ -103,4 +105,4 @@ extend type Mutation {
   addMemberToTeam(input: AddMemberToTeamInput!): AddMemberToTeamPayload
   removeMemberFromTeam(input: RemoveMemberFromTeamInput!): RemoveMemberFromTeamPayload
   updateMemberOfTeam(input: UpdateMemberOfTeamInput!): UpdateMemberOfTeamPayload
-}
+}
diff --git a/server/internal/adapter/gql/generated.go b/server/internal/adapter/gql/generated.go
diff --git a/...nternal/adapter/gql/gqlmodel/workspace.go → ...adapter/gql/gqlmodel/convert_workspace.go b/...nternal/adapter/gql/gqlmodel/workspace.go → ...adapter/gql/gqlmodel/convert_workspace.go
@@ -34,6 +34,8 @@ func ToRole(r workspace.Role) Role {
 		return RoleReader
 	case workspace.RoleWriter:
 		return RoleWriter
+	case workspace.RoleMaintainer:
+		return RoleMaintainer
 	case workspace.RoleOwner:
 		return RoleOwner
 	}

diff --git a/...al/adapter/gql/gqlmodel/workspace_test.go → ...er/gql/gqlmodel/convert_workspace_test.go b/...al/adapter/gql/gqlmodel/workspace_test.go → ...er/gql/gqlmodel/convert_workspace_test.go
diff --git a/server/internal/adapter/gql/gqlmodel/models_gen.go b/server/internal/adapter/gql/gqlmodel/models_gen.go
diff --git a/server/internal/app/auth_client.go b/server/internal/app/auth_client.go
@@ -115,21 +115,24 @@ func generateOperator(ctx context.Context, cfg *ServerConfig, u *user.User) (*us
 
 	readableWorkspaces := workspaces.FilterByUserRole(uid, workspace.RoleReader).IDs()
 	writableWorkspaces := workspaces.FilterByUserRole(uid, workspace.RoleWriter).IDs()
+	maintainingWorkspaces := workspaces.FilterByUserRole(uid, workspace.RoleMaintainer).IDs()
 	owningWorkspaces := workspaces.FilterByUserRole(uid, workspace.RoleOwner).IDs()
 	defaultPolicy := util.CloneRef(cfg.Config.Policy.Default)
 
 	return &usecase.Operator{
 		AcOperator: &accountusecase.Operator{
-			User:               &uid,
-			ReadableWorkspaces: readableWorkspaces,
-			WritableWorkspaces: writableWorkspaces,
-			OwningWorkspaces:   owningWorkspaces,
-			DefaultPolicy:      defaultPolicy,
+			User:                   &uid,
+			ReadableWorkspaces:     readableWorkspaces,
+			WritableWorkspaces:     writableWorkspaces,
+			MaintainableWorkspaces: maintainingWorkspaces,
+			OwningWorkspaces:       owningWorkspaces,
+			DefaultPolicy:          defaultPolicy,
 		},
-		ReadableScenes: scenes.FilterByWorkspace(readableWorkspaces...).IDs(),
-		WritableScenes: scenes.FilterByWorkspace(writableWorkspaces...).IDs(),
-		OwningScenes:   scenes.FilterByWorkspace(owningWorkspaces...).IDs(),
-		DefaultPolicy:  defaultPolicy,
+		ReadableScenes:    scenes.FilterByWorkspace(readableWorkspaces...).IDs(),
+		WritableScenes:    scenes.FilterByWorkspace(writableWorkspaces...).IDs(),
+		MaintainingScenes: scenes.FilterByWorkspace(maintainingWorkspaces...).IDs(),
+		OwningScenes:      scenes.FilterByWorkspace(owningWorkspaces...).IDs(),
+		DefaultPolicy:     defaultPolicy,
 	}, nil
 }
 

diff --git a/server/internal/usecase/operator.go b/server/internal/usecase/operator.go
@@ -12,11 +12,12 @@ import (
 )
 
 type Operator struct {
-	AcOperator     *accountusecase.Operator
-	ReadableScenes scene.IDList
-	WritableScenes scene.IDList
-	OwningScenes   scene.IDList
-	DefaultPolicy  *policy.ID
+	AcOperator        *accountusecase.Operator
+	ReadableScenes    scene.IDList
+	WritableScenes    scene.IDList
+	MaintainingScenes scene.IDList
+	OwningScenes      scene.IDList
+	DefaultPolicy     *policy.ID
 }
 
 func (o *Operator) Workspaces(r workspace.Role) accountdomain.WorkspaceIDList {
@@ -29,42 +30,57 @@ func (o *Operator) Workspaces(r workspace.Role) accountdomain.WorkspaceIDList {
 	if r == workspace.RoleWriter {
 		return o.AcOperator.WritableWorkspaces
 	}
+	if r == workspace.RoleMaintainer {
+		return o.AcOperator.MaintainableWorkspaces
+	}
 	if r == workspace.RoleOwner {
 		return o.AcOperator.OwningWorkspaces
 	}
 	return nil
 }
 
 func (o *Operator) AllReadableWorkspaces() user.WorkspaceIDList {
-	return append(o.AcOperator.ReadableWorkspaces, o.AllWritableWorkspaces()...)
+	return o.AcOperator.AllReadableWorkspaces()
 }
 
 func (o *Operator) AllWritableWorkspaces() user.WorkspaceIDList {
-	return append(o.AcOperator.WritableWorkspaces, o.AllOwningWorkspaces()...)
+	return o.AcOperator.AllWritableWorkspaces()
+}
+
+func (o *Operator) AllMaintainingWorkspace() user.WorkspaceIDList {
+	return o.AcOperator.AllMaintainingWorkspaces()
 }
 
 func (o *Operator) AllOwningWorkspaces() user.WorkspaceIDList {
-	return o.AcOperator.OwningWorkspaces
+	return o.AcOperator.AllOwningWorkspaces()
 }
 
 func (o *Operator) IsReadableWorkspace(ws ...accountdomain.WorkspaceID) bool {
-	return o.AllReadableWorkspaces().Intersect(ws).Len() > 0
+	return o.AcOperator.IsReadableWorkspace(ws...)
 }
 
 func (o *Operator) IsWritableWorkspace(ws ...accountdomain.WorkspaceID) bool {
-	return o.AllWritableWorkspaces().Intersect(ws).Len() > 0
+	return o.AcOperator.IsWritableWorkspace(ws...)
+}
+
+func (o *Operator) IsMaintainingWorkspace(ws ...accountdomain.WorkspaceID) bool {
+	return o.AcOperator.IsMaintainingWorkspace(ws...)
 }
 
 func (o *Operator) IsOwningWorkspace(ws ...accountdomain.WorkspaceID) bool {
-	return o.AllOwningWorkspaces().Intersect(ws).Len() > 0
+	return o.AcOperator.IsOwningWorkspace(ws...)
 }
 
 func (o *Operator) AllReadableScenes() scene.IDList {
 	return append(o.ReadableScenes, o.AllWritableScenes()...)
 }
 
 func (o *Operator) AllWritableScenes() scene.IDList {
-	return append(o.WritableScenes, o.AllOwningScenes()...)
+	return append(o.WritableScenes, o.AllMaintainingScenes()...)
+}
+
+func (o *Operator) AllMaintainingScenes() scene.IDList {
+	return append(o.MaintainingScenes, o.AllOwningScenes()...)
 }
 
 func (o *Operator) AllOwningScenes() scene.IDList {
@@ -79,6 +95,10 @@ func (o *Operator) IsWritableScene(scene ...id.SceneID) bool {
 	return o.AllWritableScenes().Has(scene...)
 }
 
+func (o *Operator) IsMaintainingScene(scene ...id.SceneID) bool {
+	return o.AllMaintainingScenes().Has(scene...)
+}
+
 func (o *Operator) IsOwningScene(scene ...id.SceneID) bool {
 	return o.AllOwningScenes().Has(scene...)
 }

diff --git a/web/codegen-classic.ts b/web/codegen-classic.ts
@@ -0,0 +1,38 @@
+// CLASSIC CONFIG
+
+import { CodegenConfig } from "@graphql-codegen/cli";
+
+const config: CodegenConfig = {
+  overwrite: true,
+  schema: "../server/gql/*.graphql",
+  documents: [
+    "src/classic/gql/fragments/*.ts",
+    "src/classic/gql/queries/*.ts",
+    "src/classic/**/*.graphql",
+  ],
+  generates: {
+    "./src/classic/gql/graphql-client-api.tsx": {
+      plugins: ["typescript", "typescript-operations", "typescript-react-apollo"],
+      config: {
+        useTypeImports: true,
+        scalars: {
+          DateTime: "Date",
+          FileSize: "number",
+          ID: "string",
+          Cursor: "string",
+          URL: "string",
+          Lang: "string",
+          TranslatedString: "{ [lang in string]?: string } | null",
+        },
+      },
+    },
+    "./src/classic/gql/graphql.schema.json": {
+      plugins: ["introspection"],
+    },
+    "./src/classic/gql/fragmentMatcher.json": {
+      plugins: ["fragment-matcher"],
+    },
+  },
+};
+
+export default config;
diff --git a/web/codegen.ts b/web/codegen.ts
@@ -37,44 +37,3 @@ const config: CodegenConfig = {
 };
 
 export default config;
-
-// CLASSIC CONFIG
-
-// import { CodegenConfig } from "@graphql-codegen/cli";
-
-// const config: CodegenConfig = {
-//   overwrite: true,
-//   schema: "../server/gql/*.graphql",
-//   documents: [
-//     "src/classic/gql/fragments/*.ts",
-//     "src/classic/gql/queries/*.ts",
-//     "src/classic/**/*.graphql",
-//   ],
-//   generates: {
-//     "./src/classic/gql/graphql-client-api.tsx": {
-//       plugins: ["typescript", "typescript-operations", "typescript-react-apollo"],
-//       config: {
-//         useTypeImports: true,
-//         scalars: {
-//           DateTime: "Date",
-//           FileSize: "number",
-//           ID: "string",
-//           Cursor: "string",
-//           URL: "string",
-//           Lang: "string",
-//           TranslatedString: "{ [lang in string]?: string } | null",
-//         },
-//       },
-//     },
-//     "./src/classic/gql/graphql.schema.json": {
-//       plugins: ["introspection"],
-//     },
-//     "./src/classic/gql/fragmentMatcher.json": {
-//       plugins: ["fragment-matcher"],
-//     },
-//   },
-// };
-
-// export default config;
-
-// CLASSIC CONFIG
diff --git a/web/package.json b/web/package.json
@@ -20,7 +20,9 @@
         "format": "eslint --fix .",
         "storybook": "storybook dev -p 9001",
         "storybook:build": "storybook build --quiet -o dist/storybook",
-        "gql": "graphql-codegen",
+        "gql": "run-s gql:beta gql:classic",
+        "gql:beta": "graphql-codegen",
+        "gql:classic": "graphql-codegen -c codegen-classic.ts",
         "i18n": "i18next",
         "gen:doc:plugin": "ts-node -O '{\"module\":\"CommonJS\"}' ./bin/pluginDoc"
     },

diff --git a/web/src/classic/components/molecules/Settings/Workspace/MemberListItem/index.tsx b/web/src/classic/components/molecules/Settings/Workspace/MemberListItem/index.tsx
@@ -39,6 +39,7 @@ const MemberListItem: React.FC<Props> = ({ user, role, owner, onChangeRole, onRe
   const roles = [
     { key: "READER", label: t("Reader") },
     { key: "WRITER", label: t("Writer") },
+    { key: "MAINTAINER", label: t("Maintainer") },
     { key: "OWNER", label: t("Owner") },
   ];
 

diff --git a/web/src/classic/components/organisms/EarthEditor/CanvasArea/convert.ts b/web/src/classic/components/organisms/EarthEditor/CanvasArea/convert.ts
@@ -29,20 +29,17 @@ import {
   EarthLayerCommonFragment,
   EarthLayerItemFragment,
   PropertySchemaGroupFragmentFragment,
-  PropertyGroupFragmentFragment,
-  PropertySchemaFieldFragmentFragment,
-  PropertyFieldFragmentFragment,
 } from "@reearth/classic/gql";
 import { valueFromGQL } from "@reearth/classic/util/value";
 
-export type { Layer } from "@reearth/classic/components/molecules/Visualizer";
+type PropertyGroupFragmentFragment = Extract<
+  PropertyItemFragmentFragment,
+  { __typename?: "PropertyGroup" }
+>;
+type PropertySchemaFieldFragmentFragment = PropertySchemaGroupFragmentFragment["fields"][number];
+type PropertyFieldFragmentFragment = PropertyGroupFragmentFragment["fields"][number];
 
-// export type RawLayer =
-//   | (EarthLayerItemFragment & EarthLayerCommonFragment)
-//   | ({
-//     __typename: "LayerGroup";
-//     layers?: RawLayer[] | null | undefined;
-//   } & EarthLayerCommonFragment);
+export type { Layer } from "@reearth/classic/components/molecules/Visualizer";
 
 export type RawLayer = EarthLayerCommonFragment &
   (

diff --git a/web/src/classic/components/organisms/Settings/Workspace/hooks.ts b/web/src/classic/components/organisms/Settings/Workspace/hooks.ts
@@ -183,6 +183,7 @@ export default (params: Params) => {
             role: {
               READER: Role.Reader,
               WRITER: Role.Writer,
+              MAINTAINER: Role.Maintainer,
               OWNER: Role.Owner,
             }[role],
           },

diff --git a/web/src/classic/gql/fragmentMatcher.json b/web/src/classic/gql/fragmentMatcher.json
@@ -8,6 +8,10 @@
       "LayerTagGroup",
       "LayerTagItem"
     ],
+    "NLSLayer": [
+      "NLSLayerGroup",
+      "NLSLayerSimple"
+    ],
     "Node": [
       "Asset",
       "Dataset",
@@ -16,6 +20,9 @@
       "Project",
       "Property",
       "Scene",
+      "Story",
+      "StoryBlock",
+      "StoryPage",
       "Team",
       "User"
     ],