Merge pull request #9881 from 2403905/issue-9699

Added a new role space editor without versions

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

@@ -15,7 +15,7 @@ import (
 var (
 	// _disabledByDefaultUnifiedRoleRoleIDs contains all roles that are not enabled by default,
 	// but can be enabled by the user.
-	_disabledByDefaultUnifiedRoleRoleIDs = []string{unifiedrole.UnifiedRoleSecureViewerID}
+	_disabledByDefaultUnifiedRoleRoleIDs = []string{unifiedrole.UnifiedRoleSecureViewerID, unifiedrole.UnifiedRoleSpaceEditorWithoutVersionsID}
 )
 
 // FullDefaultConfig returns a fully initialized default configuration

services/graph/pkg/unifiedrole/conversion.go

@@ -210,6 +210,8 @@ func cs3RoleToDisplayName(role *conversions.Role) string {
 		return _editorUnifiedRoleDisplayName
 	case conversions.RoleSpaceEditor:
 		return _spaceEditorUnifiedRoleDisplayName
+	case conversions.RoleSpaceEditorWithoutVersions:
+		return _spaceEditorWithoutVersionsUnifiedRoleDisplayName
 	case conversions.RoleFileEditor:
 		return _fileEditorUnifiedRoleDisplayName
 	case conversions.RoleEditorLite:

services/graph/pkg/unifiedrole/export_test.go

@@ -1,14 +1,15 @@
 package unifiedrole
 
 var (
-	RoleViewer       = roleViewer
-	RoleSpaceViewer  = roleSpaceViewer
-	RoleEditor       = roleEditor
-	RoleSpaceEditor  = roleSpaceEditor
-	RoleFileEditor   = roleFileEditor
-	RoleEditorLite   = roleEditorLite
-	RoleManager      = roleManager
-	RoleSecureViewer = roleSecureViewer
+	RoleViewer                     = roleViewer
+	RoleSpaceViewer                = roleSpaceViewer
+	RoleEditor                     = roleEditor
+	RoleSpaceEditor                = roleSpaceEditor
+	RoleSpaceEditorWithoutVersions = roleSpaceEditorWithoutVersions
+	RoleFileEditor                 = roleFileEditor
+	RoleEditorLite                 = roleEditorLite
+	RoleManager                    = roleManager
+	RoleSecureViewer               = roleSecureViewer
 
 	BuildInRoles = buildInRoles
 

services/graph/pkg/unifiedrole/roles.go

@@ -22,6 +22,8 @@ const (
 	UnifiedRoleEditorID = "fb6c3e19-e378-47e5-b277-9732f9de6e21"
 	// UnifiedRoleSpaceEditorID Unified role space editor id.
 	UnifiedRoleSpaceEditorID = "58c63c02-1d89-4572-916a-870abc5a1b7d"
+	// UnifiedRoleSpaceEditorWithoutVersionsID Unified role space editor without list/restore versions id.
+	UnifiedRoleSpaceEditorWithoutVersionsID = "3284f2d5-0070-4ad8-ac40-c247f7c1fb27"
 	// UnifiedRoleFileEditorID Unified role file editor id.
 	UnifiedRoleFileEditorID = "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
 	// UnifiedRoleEditorLiteID Unified role editor-lite id.
@@ -109,6 +111,12 @@ var (
 	// UnifiedRole SpaseEditor, Role DisplayName (resolves directly)
 	_spaceEditorUnifiedRoleDisplayName = l10n.Template("Can edit")
 
+	// UnifiedRole SpaseEditorWithoutVersions, Role Description (resolves directly)
+	_spaceEditorWithoutVersionsUnifiedRoleDescription = l10n.Template("View, download, upload, edit, add and delete.")
+
+	// UnifiedRole SpaseEditorWithoutVersions, Role DisplayName (resolves directly)
+	_spaceEditorWithoutVersionsUnifiedRoleDisplayName = l10n.Template("Can edit without versions")
+
 	// UnifiedRole FileEditor, Role Description (resolves directly)
 	_fileEditorUnifiedRoleDescription = l10n.Template("View, download and edit.")
 
@@ -138,13 +146,14 @@ var (
 		UnifiedRoleViewerID: conversions.RoleViewer,
 		// one V1 api the "spaceviewer" role was call "viewer" and the "spaceeditor" was "editor",
 		// we need to stay compatible with that
-		UnifiedRoleSpaceViewerID:  "viewer",
-		UnifiedRoleSpaceEditorID:  "editor",
-		UnifiedRoleEditorID:       conversions.RoleEditor,
-		UnifiedRoleFileEditorID:   conversions.RoleFileEditor,
-		UnifiedRoleEditorLiteID:   conversions.RoleEditorLite,
-		UnifiedRoleManagerID:      conversions.RoleManager,
-		UnifiedRoleSecureViewerID: conversions.RoleSecureViewer,
+		UnifiedRoleSpaceViewerID:                "viewer",
+		UnifiedRoleSpaceEditorID:                "editor",
+		UnifiedRoleSpaceEditorWithoutVersionsID: conversions.RoleSpaceEditorWithoutVersions,
+		UnifiedRoleEditorID:                     conversions.RoleEditor,
+		UnifiedRoleFileEditorID:                 conversions.RoleFileEditor,
+		UnifiedRoleEditorLiteID:                 conversions.RoleEditorLite,
+		UnifiedRoleManagerID:                    conversions.RoleManager,
+		UnifiedRoleSecureViewerID:               conversions.RoleSecureViewer,
 	}
 
 	// buildInRoles contains the built-in roles.
@@ -153,6 +162,7 @@ var (
 		roleSpaceViewer,
 		roleEditor,
 		roleSpaceEditor,
+		roleSpaceEditorWithoutVersions,
 		roleFileEditor,
 		roleEditorLite,
 		roleManager,
@@ -243,6 +253,23 @@ var (
 		}
 	}()
 
+	// roleSpaceEditorWithoutVersions creates an editor without versions role
+	roleSpaceEditorWithoutVersions = func() *libregraph.UnifiedRoleDefinition {
+		r := conversions.NewSpaceEditorWithoutVersionsRole()
+		return &libregraph.UnifiedRoleDefinition{
+			Id:          proto.String(UnifiedRoleSpaceEditorWithoutVersionsID),
+			Description: proto.String(_spaceEditorWithoutVersionsUnifiedRoleDescription),
+			DisplayName: proto.String(cs3RoleToDisplayName(r)),
+			RolePermissions: []libregraph.UnifiedRolePermission{
+				{
+					AllowedResourceActions: CS3ResourcePermissionsToLibregraphActions(r.CS3ResourcePermissions()),
+					Condition:              proto.String(UnifiedRoleConditionDrive),
+				},
+			},
+			LibreGraphWeight: proto.Int32(0),
+		}
+	}()
+
 	// roleFileEditor creates a file-editor role
 	roleFileEditor = func() *libregraph.UnifiedRoleDefinition {
 		r := conversions.NewFileEditorRole()

services/graph/pkg/unifiedrole/roles_test.go

@@ -181,6 +181,7 @@ func TestGetRolesByPermissions(t *testing.T) {
 			constraints:  unifiedrole.UnifiedRoleConditionDrive,
 			unifiedRoleDefinition: []*libregraph.UnifiedRoleDefinition{
 				unifiedrole.RoleSpaceViewer,
+				unifiedrole.RoleSpaceEditorWithoutVersions,
 				unifiedrole.RoleSpaceEditor,
 				unifiedrole.RoleManager,
 			},

services/web/pkg/theme/theme.go

@@ -37,6 +37,10 @@ var themeDefaults = KV{
 				"label":    "UnifiedRoleSpaceEditor",
 				"iconName": "pencil",
 			},
+			unifiedrole.UnifiedRoleSpaceEditorWithoutVersionsID: KV{
+				"label":    "UnifiedRoleSpaceEditorWithoutVersions",
+				"iconName": "pencil",
+			},
 			unifiedrole.UnifiedRoleManagerID: KV{
 				"label":    "UnifiedRoleManager",
 				"iconName": "user-star",