diff --git a/.vscode/launch.json b/.vscode/launch.json index bad129046e..7103226f0f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -73,7 +73,8 @@ // service accounts "OC_SERVICE_ACCOUNT_ID": "service-account-id", - "OC_SERVICE_ACCOUNT_SECRET": "service-account-secret" + "OC_SERVICE_ACCOUNT_SECRET": "service-account-secret", + "FRONTEND_CONFIGURABLE_NOTIFICATIONS": "true" } }, { diff --git a/devtools/deployments/opencloud_full/opencloud.yml b/devtools/deployments/opencloud_full/opencloud.yml index 1c8790dcf2..d6dae17371 100644 --- a/devtools/deployments/opencloud_full/opencloud.yml +++ b/devtools/deployments/opencloud_full/opencloud.yml @@ -58,6 +58,7 @@ services: COMPANION_DOMAIN: ${COMPANION_DOMAIN:-companion.opencloud.test} # enable to allow using the banned passwords list OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: banned-password-list.txt + FRONTEND_CONFIGURABLE_NOTIFICATIONS: "true" volumes: - ./config/opencloud/app-registry.yaml:/etc/opencloud/app-registry.yaml - ./config/opencloud/csp.yaml:/etc/opencloud/csp.yaml diff --git a/services/userlog/pkg/service/filter.go b/services/userlog/pkg/service/filter.go index f45ed18a8d..6676c4f842 100644 --- a/services/userlog/pkg/service/filter.go +++ b/services/userlog/pkg/service/filter.go @@ -65,6 +65,8 @@ func (ulf userlogFilter) filterUsersBySettings(ctx context.Context, users []stri settingId = defaults.SettingUUIDProfileEventSpaceDeleted case ocEvents.ResourceMention: settingId = defaults.SettingUUIDProfileEventResourceMention + case events.PostprocessingStepFinished: + settingId = defaults.SettingUUIDProfileEventPostprocessingStepFinished default: // event that cannot be disabled return users diff --git a/services/userlog/pkg/service/filter_test.go b/services/userlog/pkg/service/filter_test.go index 1cfac22a9e..04c2f4ea5c 100644 --- a/services/userlog/pkg/service/filter_test.go +++ b/services/userlog/pkg/service/filter_test.go @@ -174,5 +174,11 @@ var _ = Describe("NotificationFilter", func() { Expect(ulf.execute(context.TODO(), events.Event{Event: events.SpaceDeleted{}}, nil, []string{"foo"})).To(BeEmpty()) }) + + It("handles PostprocessingStepFinished disabled", func() { + ulf.valueClient = setupMockValueService(false) + + Expect(ulf.execute(context.TODO(), events.Event{Event: events.PostprocessingStepFinished{}}, nil, []string{"foo"})).To(BeEmpty()) + }) }) })