the descriptions updated

2025-12-30 17:00:57 -06:00 · 2024-12-18 15:57:45 +01:00
parent 698b6755d1
commit 34f04e229d
4 changed files with 44 additions and 85 deletions
--- a/changelog/unreleased/enhancement-add-events-setting.md
+++ b/changelog/unreleased/enhancement-add-events-setting.md
@@ -1,6 +1,6 @@
-Enhancement: The user settings was extended by the notifications preferences
+Enhancement: Part I: The user settings are extended by notifications preferences

-The user settings was extended, that a user can store their notifications preferences
+Part I: Users can now store their notifications preferences in the user settings

-https://github.com/owncloud/ocis/pull/10706  
+https://github.com/owncloud/ocis/pull/10706
 https://github.com/owncloud/ocis/issues/10669
--- a/services/settings/pkg/service/v0/servicedecorator.go
+++ b/services/settings/pkg/service/v0/servicedecorator.go
@@ -113,31 +113,32 @@ func (s *defaultLanguageDecorator) withDefaultProfileValueList(ctx context.Conte
 	bundle := defaults.GenerateDefaultProfileBundle()

 	for _, setting := range bundle.GetSettings() {
-		if v, ok := requested[setting.GetId()]; ok && v == nil {
-			if setting.GetId() == defaults.SettingUUIDProfileLanguage {
-				requested[setting.GetId()] = s.withDefaultLanguageSetting(accountUUID)
-				continue
-			}
+		if v, ok := requested[setting.GetId()]; !ok || v != nil {
+			continue
+		}
+		if setting.GetId() == defaults.SettingUUIDProfileLanguage {
+			requested[setting.GetId()] = s.withDefaultLanguageSetting(accountUUID)
+			continue
+		}

-			newVal := &settingsmsg.ValueWithIdentifier{
-				Identifier: &settingsmsg.Identifier{
-					Extension: bundle.GetExtension(),
-					Bundle:    bundle.GetName(),
-					Setting:   setting.GetName(),
-				},
-				Value: &settingsmsg.Value{
-					BundleId:    bundle.GetId(),
-					SettingId:   setting.GetId(),
-					AccountUuid: accountUUID,
-					Resource:    setting.GetResource(),
-				},
-			}
+		newVal := &settingsmsg.ValueWithIdentifier{
+			Identifier: &settingsmsg.Identifier{
+				Extension: bundle.GetExtension(),
+				Bundle:    bundle.GetName(),
+				Setting:   setting.GetName(),
+			},
+			Value: &settingsmsg.Value{
+				BundleId:    bundle.GetId(),
+				SettingId:   setting.GetId(),
+				AccountUuid: accountUUID,
+				Resource:    setting.GetResource(),
+			},
+		}

-			switch val := setting.GetValue().(type) {
-			case *settingsmsg.Setting_MultiChoiceCollectionValue:
-				newVal.Value.Value = multiChoiceCollectionToValue(val.MultiChoiceCollectionValue)
-				requested[setting.GetId()] = newVal
-			}
+		switch val := setting.GetValue().(type) {
+		case *settingsmsg.Setting_MultiChoiceCollectionValue:
+			newVal.Value.Value = multiChoiceCollectionToValue(val.MultiChoiceCollectionValue)
+			requested[setting.GetId()] = newVal
 		}
 	}

@@ -172,15 +173,14 @@ func getDefaultValueList() map[string]*settingsmsg.ValueWithIdentifier {
 		// specific profile settings should be handled individually
 		defaults.SettingUUIDProfileLanguage: nil,
 		// all other profile settings that populated from the bundle based on type
-		defaults.SettingUUIDProfileEventShareCreated:                    nil,
-		defaults.SettingUUIDProfileEventShareRemoved:                    nil,
-		defaults.SettingUUIDProfileEventShareExpired:                    nil,
-		defaults.SettingUUIDProfileEventSpaceShared:                     nil,
-		defaults.SettingUUIDProfileEventSpaceUnshared:                   nil,
-		defaults.SettingUUIDProfileEventSpaceMembershipExpired:          nil,
-		defaults.SettingUUIDProfileEventSpaceDisabled:                   nil,
-		defaults.SettingUUIDProfileEventSpaceDeleted:                    nil,
-		defaults.SettingUUIDProfileEventPostprocessingStepFinished:      nil,
-		defaults.SettingUUIDProfileEventScienceMeshInviteTokenGenerated: nil,
+		defaults.SettingUUIDProfileEventShareCreated:               nil,
+		defaults.SettingUUIDProfileEventShareRemoved:               nil,
+		defaults.SettingUUIDProfileEventShareExpired:               nil,
+		defaults.SettingUUIDProfileEventSpaceShared:                nil,
+		defaults.SettingUUIDProfileEventSpaceUnshared:              nil,
+		defaults.SettingUUIDProfileEventSpaceMembershipExpired:     nil,
+		defaults.SettingUUIDProfileEventSpaceDisabled:              nil,
+		defaults.SettingUUIDProfileEventSpaceDeleted:               nil,
+		defaults.SettingUUIDProfileEventPostprocessingStepFinished: nil,
 	}
 }
--- a/services/settings/pkg/store/defaults/defaults.go
+++ b/services/settings/pkg/store/defaults/defaults.go
@@ -45,8 +45,6 @@ const (
 	SettingUUIDProfileEventSpaceDeleted = "094ceca9-5a00-40ba-bb1a-bbc7bccd39ee"
 	// SettingUUIDProfileEventPostprocessingStepFinished is the hardcoded setting UUID for the send in mail setting
 	SettingUUIDProfileEventPostprocessingStepFinished = "fe0a3011-d886-49c8-b797-33d02fa426ef"
-	// SettingUUIDProfileEventScienceMeshInviteTokenGenerated is the hardcoded setting UUID for the send in mail setting
-	SettingUUIDProfileEventScienceMeshInviteTokenGenerated = "b441ffb1-f5ee-4733-a08f-48d03f6e7f22"
 )

 // GenerateBundlesDefaultRoles bootstraps the default roles.
@@ -132,7 +130,6 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 			ProfileEventSpaceDisabledPermission(Own),
 			ProfileEventSpaceDeletedPermission(Own),
 			ProfileEventPostprocessingStepFinishedPermission(Own),
-			ProfileEventScienceMeshInviteTokenGeneratedPermission(Own),
 			GroupManagementPermission(All),
 			LanguageManagementPermission(All),
 			ListFavoritesPermission(Own),
@@ -176,7 +173,6 @@ func generateBundleSpaceAdminRole() *settingsmsg.Bundle {
 			ProfileEventSpaceDisabledPermission(Own),
 			ProfileEventSpaceDeletedPermission(Own),
 			ProfileEventPostprocessingStepFinishedPermission(Own),
-			ProfileEventScienceMeshInviteTokenGeneratedPermission(Own),
 			LanguageManagementPermission(Own),
 			ListFavoritesPermission(Own),
 			ListSpacesPermission(All),
@@ -215,7 +211,6 @@ func generateBundleUserRole() *settingsmsg.Bundle {
 			ProfileEventSpaceDisabledPermission(Own),
 			ProfileEventSpaceDeletedPermission(Own),
 			ProfileEventPostprocessingStepFinishedPermission(Own),
-			ProfileEventScienceMeshInviteTokenGeneratedPermission(Own),
 			LanguageManagementPermission(Own),
 			ListFavoritesPermission(Own),
 			SelfManagementPermission(Own),
@@ -298,7 +293,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventShareCreated,
 				Name:        "event-share-created-options",
 				DisplayName: "Share created",
-				Description: "Send In-App",
+				Description: "Share created",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -315,7 +310,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventShareRemoved,
 				Name:        "event-share-removed-options",
 				DisplayName: "Share removed",
-				Description: "Send In-App",
+				Description: "Share removed",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -332,7 +327,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventShareExpired,
 				Name:        "event-share-expired-options",
 				DisplayName: "Share expired",
-				Description: "Send In-App",
+				Description: "Share expired",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -349,7 +344,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventSpaceShared,
 				Name:        "event-space-shared-options",
 				DisplayName: "Space shared",
-				Description: "Send In-App",
+				Description: "Space shared",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -366,7 +361,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventSpaceUnshared,
 				Name:        "event-space-unshared-options",
 				DisplayName: "Space unshared",
-				Description: "Send In-App",
+				Description: "Space unshared",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -383,7 +378,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventSpaceMembershipExpired,
 				Name:        "event-space-membership-expired-options",
 				DisplayName: "Space membership expired",
-				Description: "Send In-App",
+				Description: "Space membership expired",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -400,7 +395,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventSpaceDisabled,
 				Name:        "event-space-disabled-options",
 				DisplayName: "Space disabled",
-				Description: "Send In-App",
+				Description: "Space disabled",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -417,7 +412,7 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 				Id:          SettingUUIDProfileEventSpaceDeleted,
 				Name:        "event-space-deleted-options",
 				DisplayName: "Space deleted",
-				Description: "Send In-App",
+				Description: "Space deleted",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_USER,
 				},
@@ -447,23 +442,6 @@ func generateBundleProfileRequest() *settingsmsg.Bundle {
 					},
 				},
 			},
-			{
-				Id:          SettingUUIDProfileEventScienceMeshInviteTokenGenerated,
-				Name:        "event-Science-mesh-invite-token-generated-options",
-				DisplayName: "Science Mesh Invite Token Generated",
-				Description: "Science Mesh Invite Token Generated",
-				Resource: &settingsmsg.Resource{
-					Type: settingsmsg.Resource_TYPE_USER,
-				},
-				Value: &settingsmsg.Setting_MultiChoiceCollectionValue{
-					MultiChoiceCollectionValue: &settingsmsg.MultiChoiceCollection{
-						Options: []*settingsmsg.MultiChoiceCollectionOption{
-							&optionInAppTrue,
-							&optionMailTrue,
-						},
-					},
-				},
-			},
 		},
 	}
 }
--- a/services/settings/pkg/store/defaults/permissions.go
+++ b/services/settings/pkg/store/defaults/permissions.go
@@ -390,25 +390,6 @@ func ProfileEventPostprocessingStepFinishedPermission(c settingsmsg.Permission_C
 	}
 }

-// ProfileEventScienceMeshInviteTokenGeneratedPermission is the permission to set the email sending interval
-func ProfileEventScienceMeshInviteTokenGeneratedPermission(c settingsmsg.Permission_Constraint) *settingsmsg.Setting {
-	return &settingsmsg.Setting{
-		Id:          "da3ff1c5-5bb4-4829-b9bd-a91542737151",
-		Name:        "Event.ScienceMeshInviteTokenGenerated.ReadWrite",
-		DisplayName: "Event Science Mesh Invite Token Generated",
-		Resource: &settingsmsg.Resource{
-			Type: settingsmsg.Resource_TYPE_SETTING,
-			Id:   SettingUUIDProfileEventScienceMeshInviteTokenGenerated,
-		},
-		Value: &settingsmsg.Setting_PermissionValue{
-			PermissionValue: &settingsmsg.Permission{
-				Operation:  settingsmsg.Permission_OPERATION_READWRITE,
-				Constraint: c,
-			},
-		},
-	}
-}
-
 // GroupManagementPermission is the permission to manage groups
 func GroupManagementPermission(c settingsmsg.Permission_Constraint) *settingsmsg.Setting {
 	return &settingsmsg.Setting{