feat: Add roles EditorListGrantsWithVersions, FileEditorListGrantsWithVersions

Author: bastianbeier

changelog/unreleased/add-roles-with-versions.md

@@ -0,0 +1,6 @@
+Enhancement: Add roles
+
+Add EditorListGrantsWithVersions and FileEditorListGrantsWithVersions roles.
+
+TODO
+https://github.com/owncloud/ocis/issues/10747

services/graph/pkg/config/defaults/defaultconfig.go

@@ -20,7 +20,9 @@ var (
 		unifiedrole.UnifiedRoleSpaceEditorWithoutVersionsID,
 		unifiedrole.UnifiedRoleViewerListGrantsID,
 		unifiedrole.UnifiedRoleEditorListGrantsID,
+		unifiedrole.UnifiedRoleEditorListGrantsWithVersionsID,
 		unifiedrole.UnifiedRoleFileEditorListGrantsID,
+		unifiedrole.UnifiedRoleFileEditorListGrantsWithVersionsID,
 		unifiedrole.UnifiedRoleDeniedID,
 	}
 )

services/graph/pkg/unifiedrole/conversion.go

@@ -212,6 +212,8 @@ func cs3RoleToDisplayName(role *conversions.Role) string {
 		return _editorUnifiedRoleDisplayName
 	case conversions.RoleEditorListGrants:
 		return _editorListGrantsUnifiedRoleDisplayName
+	case conversions.RoleEditorListGrantsWithVersions:
+		return _editorListGrantsWithVersionsUnifiedRoleDisplayName
 	case conversions.RoleSpaceEditor:
 		return _spaceEditorUnifiedRoleDisplayName
 	case conversions.RoleSpaceEditorWithoutVersions:
@@ -220,6 +222,8 @@ func cs3RoleToDisplayName(role *conversions.Role) string {
 		return _fileEditorUnifiedRoleDisplayName
 	case conversions.RoleFileEditorListGrants:
 		return _fileEditorListGrantsUnifiedRoleDisplayName
+	case conversions.RoleFileEditorListGrantsWithVersions:
+		return _fileEditorListGrantsWithVersionsUnifiedRoleDisplayName
 	case conversions.RoleEditorLite:
 		return _editorLiteUnifiedRoleDisplayName
 	case conversions.RoleManager:

services/graph/pkg/unifiedrole/export_test.go

@@ -1,19 +1,21 @@
 package unifiedrole
 
 var (
-	RoleViewer                     = roleViewer
-	RoleViewerListGrants           = roleViewerListGrants
-	RoleSpaceViewer                = roleSpaceViewer
-	RoleEditor                     = roleEditor
-	RoleEditorListGrants           = roleEditorListGrants
-	RoleSpaceEditor                = roleSpaceEditor
-	RoleSpaceEditorWithoutVersions = roleSpaceEditorWithoutVersions
-	RoleFileEditor                 = roleFileEditor
-	RoleFileEditorListGrants       = roleFileEditorListGrants
-	RoleEditorLite                 = roleEditorLite
-	RoleManager                    = roleManager
-	RoleSecureViewer               = roleSecureViewer
-	RoleDenied                     = roleDenied
+	RoleViewer                           = roleViewer
+	RoleViewerListGrants                 = roleViewerListGrants
+	RoleSpaceViewer                      = roleSpaceViewer
+	RoleEditor                           = roleEditor
+	RoleEditorListGrants                 = roleEditorListGrants
+	RoleEditorListGrantsWithVersions     = roleEditorListGrantsWithVersions
+	RoleSpaceEditor                      = roleSpaceEditor
+	RoleSpaceEditorWithoutVersions       = roleSpaceEditorWithoutVersions
+	RoleFileEditor                       = roleFileEditor
+	RoleFileEditorListGrants             = roleFileEditorListGrants
+	RoleFileEditorListGrantsWithVersions = roleFileEditorListGrantsWithVersions
+	RoleEditorLite                       = roleEditorLite
+	RoleManager                          = roleManager
+	RoleSecureViewer                     = roleSecureViewer
+	RoleDenied                           = roleDenied
 
 	BuildInRoles = buildInRoles
 

services/graph/pkg/unifiedrole/roles.go

@@ -24,6 +24,8 @@ const (
 	UnifiedRoleEditorID = "fb6c3e19-e378-47e5-b277-9732f9de6e21"
 	// UnifiedRoleEditorListGrantsID Unified role editor id.
 	UnifiedRoleEditorListGrantsID = "e8ea8b21-abd4-45d2-b893-8d1546378e9e"
+	// UnifiedRoleEditorListGrantsWithVersionsID Unified role editor with versions id.
+	UnifiedRoleEditorListGrantsWithVersionsID = "0911d62b-1e3f-4778-8b1b-903b7e4e8476"
 	// UnifiedRoleSpaceEditorID Unified role space editor id.
 	UnifiedRoleSpaceEditorID = "58c63c02-1d89-4572-916a-870abc5a1b7d"
 	// UnifiedRoleSpaceEditorWithoutVersionsID Unified role space editor without list/restore versions id.
@@ -32,6 +34,8 @@ const (
 	UnifiedRoleFileEditorID = "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
 	// UnifiedRoleFileEditorListGrantsID Unified role file editor id.
 	UnifiedRoleFileEditorListGrantsID = "c1235aea-d106-42db-8458-7d5610fb0a67"
+	// UnifiedRoleFileEditorListGrantsWithVersionsID Unified role file editor id.
+	UnifiedRoleFileEditorListGrantsWithVersionsID = "b173329d-cf2e-42f0-a595-ee410645d840"
 	// UnifiedRoleEditorLiteID Unified role editor-lite id.
 	UnifiedRoleEditorLiteID = "1c996275-f1c9-4e71-abdf-a42f6495e960"
 	// UnifiedRoleManagerID Unified role manager id.
@@ -121,6 +125,12 @@ var (
 	// UnifiedRole EditorListGrants, Role DisplayName (resolves directly)
 	_editorListGrantsUnifiedRoleDisplayName = l10n.Template("Can edit")
 
+	// UnifiedRoleListGrants Editor, Role Description (resolves directly)
+	_editorListGrantsWithVersionsUnifiedRoleDescription = l10n.Template("View, download, upload, edit, delete and show all invited people, show all versions.")
+
+	// UnifiedRole EditorListGrants, Role DisplayName (resolves directly)
+	_editorListGrantsWithVersionsUnifiedRoleDisplayName = l10n.Template("Can edit")
+
 	// UnifiedRole SpaseEditor, Role Description (resolves directly)
 	_spaceEditorUnifiedRoleDescription = l10n.Template("View, download, upload, edit, add, delete including the history.")
 
@@ -145,6 +155,12 @@ var (
 	// UnifiedRole FileEditorListGrants, Role DisplayName (resolves directly)
 	_fileEditorListGrantsUnifiedRoleDisplayName = l10n.Template("Can edit")
 
+	// UnifiedRole FileEditorListGrants, Role Description (resolves directly)
+	_fileEditorListGrantsWithVersionsUnifiedRoleDescription = l10n.Template("View, download, edit and show all invited people, show all versions.")
+
+	// UnifiedRole FileEditorListGrants, Role DisplayName (resolves directly)
+	_fileEditorListGrantsWithVersionsUnifiedRoleDisplayName = l10n.Template("Can edit")
+
 	// UnifiedRole EditorLite, Role Description (resolves directly)
 	_editorLiteUnifiedRoleDescription = l10n.Template("View, download and upload.")
 
@@ -191,10 +207,12 @@ var (
 		roleSpaceViewer,
 		roleEditor,
 		roleEditorListGrants,
+		roleEditorListGrantsWithVersions,
 		roleSpaceEditor,
 		roleSpaceEditorWithoutVersions,
 		roleFileEditor,
 		roleFileEditorListGrants,
+		roleFileEditorListGrantsWithVersions,
 		roleEditorLite,
 		roleManager,
 		roleSecureViewer,
@@ -318,6 +336,27 @@ var (
 		}
 	}()
 
+	// roleEditorListGrantsWithVersions creates an editor role.
+	roleEditorListGrantsWithVersions = func() *libregraph.UnifiedRoleDefinition {
+		r := conversions.NewEditorListGrantsWithVersionsRole()
+		return &libregraph.UnifiedRoleDefinition{
+			Id:          proto.String(UnifiedRoleEditorListGrantsWithVersionsID),
+			Description: proto.String(_editorListGrantsWithVersionsUnifiedRoleDescription),
+			DisplayName: proto.String(cs3RoleToDisplayName(r)),
+			RolePermissions: []libregraph.UnifiedRolePermission{
+				{
+					AllowedResourceActions: CS3ResourcePermissionsToLibregraphActions(r.CS3ResourcePermissions()),
+					Condition:              proto.String(UnifiedRoleConditionFolder),
+				},
+				{
+					AllowedResourceActions: CS3ResourcePermissionsToLibregraphActions(r.CS3ResourcePermissions()),
+					Condition:              proto.String(UnifiedRoleConditionFolderFederatedUser),
+				},
+			},
+			LibreGraphWeight: proto.Int32(0),
+		}
+	}()
+
 	// roleSpaceEditor creates an editor role
 	roleSpaceEditor = func() *libregraph.UnifiedRoleDefinition {
 		r := conversions.NewSpaceEditorRole()
@@ -394,6 +433,27 @@ var (
 		}
 	}()
 
+	// roleFileEditorListGrantsWithVersions creates a file-editor role
+	roleFileEditorListGrantsWithVersions = func() *libregraph.UnifiedRoleDefinition {
+		r := conversions.NewFileEditorListGrantsWithVersionsRole()
+		return &libregraph.UnifiedRoleDefinition{
+			Id:          proto.String(UnifiedRoleFileEditorListGrantsWithVersionsID),
+			Description: proto.String(_fileEditorListGrantsWithVersionsUnifiedRoleDescription),
+			DisplayName: proto.String(cs3RoleToDisplayName(r)),
+			RolePermissions: []libregraph.UnifiedRolePermission{
+				{
+					AllowedResourceActions: CS3ResourcePermissionsToLibregraphActions(r.CS3ResourcePermissions()),
+					Condition:              proto.String(UnifiedRoleConditionFile),
+				},
+				{
+					AllowedResourceActions: CS3ResourcePermissionsToLibregraphActions(r.CS3ResourcePermissions()),
+					Condition:              proto.String(UnifiedRoleConditionFileFederatedUser),
+				},
+			},
+			LibreGraphWeight: proto.Int32(0),
+		}
+	}()
+
 	// roleEditorLite creates an editor-lite role
 	roleEditorLite = func() *libregraph.UnifiedRoleDefinition {
 		r := conversions.NewEditorLiteRole()

services/graph/pkg/unifiedrole/roles_test.go

@@ -166,6 +166,7 @@ func TestGetRolesByPermissions(t *testing.T) {
 				unifiedrole.RoleViewerListGrants,
 				unifiedrole.RoleFileEditor,
 				unifiedrole.RoleFileEditorListGrants,
+				unifiedrole.RoleFileEditorListGrantsWithVersions,
 			},
 		},
 		"BuildInRoles | folder": {
@@ -179,6 +180,7 @@ func TestGetRolesByPermissions(t *testing.T) {
 				unifiedrole.RoleEditorLite,
 				unifiedrole.RoleEditor,
 				unifiedrole.RoleEditorListGrants,
+				unifiedrole.RoleEditorListGrantsWithVersions,
 			},
 		},
 		"BuildInRoles | drive": {

services/web/pkg/theme/theme.go

@@ -37,6 +37,10 @@ var themeDefaults = KV{
 				"label":    "UnifiedRoleFileEditorListGrants",
 				"iconName": "pencil",
 			},
+			unifiedrole.UnifiedRoleFileEditorListGrantsWithVersionsID: KV{
+				"label":    "UnifiedRoleFileEditorListGrantsWithVersions",
+				"iconName": "pencil",
+			},
 			unifiedrole.UnifiedRoleEditorID: KV{
 				"label":    "UnifiedRoleEditor",
 				"iconName": "pencil",
@@ -45,6 +49,10 @@ var themeDefaults = KV{
 				"label":    "UnifiedRoleEditorListGrants",
 				"iconName": "pencil",
 			},
+			unifiedrole.UnifiedRoleEditorListGrantsWithVersionsID: KV{
+				"label":    "UnifiedRoleEditorListGrantsWithVersions",
+				"iconName": "pencil",
+			},
 			unifiedrole.UnifiedRoleSpaceEditorID: KV{
 				"label":    "UnifiedRoleSpaceEditor",
 				"iconName": "pencil",