From a4f67a22a75c30d17bb224219ba013c90ac5d9d2 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Fri, 13 Sep 2024 12:12:14 +0200 Subject: [PATCH 01/12] split events Signed-off-by: Christian Richter # Conflicts: # services/activitylog/pkg/service/http.go # services/activitylog/pkg/service/response.go # Conflicts: # services/activitylog/pkg/service/response.go --- services/activitylog/pkg/service/http.go | 31 +++++++++++++++----- services/activitylog/pkg/service/response.go | 25 ++++++++-------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/services/activitylog/pkg/service/http.go b/services/activitylog/pkg/service/http.go index ea5ea41581..fd8579a2ec 100644 --- a/services/activitylog/pkg/service/http.go +++ b/services/activitylog/pkg/service/http.go @@ -120,22 +120,35 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h // error already logged in unwrapEvent continue case events.UploadReady: - message = MessageResourceCreated - if ev.IsVersion { - message = MessageResourceUpdated + if ev.FileRef.GetPath() == "/" { + message = MessageResourceInSpaceCreated + } else { + message = MessageResourceInFolderCreated } ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.FileRef, true), WithUser(ev.ExecutingUser.GetId(), ev.ExecutingUser.GetDisplayName()), WithSpace(toSpace(ev.FileRef))) case events.FileTouched: - message = MessageResourceCreated + if ev.Ref.GetPath() == "/" { + message = MessageResourceInSpaceCreated + } else { + message = MessageResourceInFolderCreated + } ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) case events.ContainerCreated: - message = MessageResourceCreated + if ev.Ref.GetPath() == "/" { + message = MessageResourceInSpaceCreated + } else { + message = MessageResourceInFolderCreated + } ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) case events.ItemTrashed: - message = MessageResourceTrashed + if ev.Ref.GetPath() == "/" { + message = MessageResourceInSpaceTrashed + } else { + message = MessageResourceInFolderTrashed + } ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithTrashedResource(ev.Ref, ev.ID), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) case events.ItemMoved: @@ -144,7 +157,11 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h message = MessageResourceRenamed vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithOldResource(ev.OldReference), WithUser(ev.Executant, "")) case false: - message = MessageResourceMoved + if ev.Ref.GetPath() == "/" { + message = MessageResourceInSpaceMoved + } else { + message = MessageResourceInFolderMoved + } vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) } ts = utils.TSToTime(ev.Timestamp) diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index 209d5f903f..f73e988742 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -11,7 +11,6 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" libregraph "github.com/owncloud/libre-graph-api-go" @@ -21,18 +20,20 @@ import ( // Translations var ( - MessageResourceCreated = l10n.Template("{user} added {resource} to {space}") - MessageResourceUpdated = l10n.Template("{user} updated {resource} in {folder}") - MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {space}") - MessageResourceMoved = l10n.Template("{user} moved {resource} to {space}") - MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") - MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}") - MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}") - MessageLinkCreated = l10n.Template("{user} shared {resource} via link") + MessageResourceInSpaceCreated = l10n.Template("{user} added {resource} to {space}") + MessageResourceInSpaceTrashed = l10n.Template("{user} deleted {resource} from {space}") + MessageResourceInSpaceMoved = l10n.Template("{user} moved {resource} to {space}") + MessageResourceInFolderCreated = l10n.Template("{user} added {resource} to {folder}") + MessageResourceInFolderTrashed = l10n.Template("{user} deleted {resource} from {folder}") + MessageResourceInFolderMoved = l10n.Template("{user} moved {resource} to {folder}") + MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") + MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}") + MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}") + MessageLinkCreated = l10n.Template("{user} shared {resource} via link") MessageLinkUpdated = l10n.Template("{user} updated {field} for a link {token} on {resource}") - MessageLinkDeleted = l10n.Template("{user} removed link to {resource}") - MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}") - MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}") + MessageLinkDeleted = l10n.Template("{user} removed link to {resource}") + MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}") + MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}") ) // GetActivitiesResponse is the response on GET activities requests From 505f76033984959398c23569d1b63dfd9cec7dfc Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 16 Sep 2024 17:15:03 +0200 Subject: [PATCH 02/12] reword and rollback Signed-off-by: Christian Richter --- services/activitylog/pkg/service/http.go | 30 ++++---------------- services/activitylog/pkg/service/response.go | 23 +++++++-------- 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/services/activitylog/pkg/service/http.go b/services/activitylog/pkg/service/http.go index fd8579a2ec..85d95ee421 100644 --- a/services/activitylog/pkg/service/http.go +++ b/services/activitylog/pkg/service/http.go @@ -120,35 +120,19 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h // error already logged in unwrapEvent continue case events.UploadReady: - if ev.FileRef.GetPath() == "/" { - message = MessageResourceInSpaceCreated - } else { - message = MessageResourceInFolderCreated - } + message = MessageResourceCreated ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.FileRef, true), WithUser(ev.ExecutingUser.GetId(), ev.ExecutingUser.GetDisplayName()), WithSpace(toSpace(ev.FileRef))) case events.FileTouched: - if ev.Ref.GetPath() == "/" { - message = MessageResourceInSpaceCreated - } else { - message = MessageResourceInFolderCreated - } + message = MessageResourceCreated ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) case events.ContainerCreated: - if ev.Ref.GetPath() == "/" { - message = MessageResourceInSpaceCreated - } else { - message = MessageResourceInFolderCreated - } + message = MessageResourceCreated ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) case events.ItemTrashed: - if ev.Ref.GetPath() == "/" { - message = MessageResourceInSpaceTrashed - } else { - message = MessageResourceInFolderTrashed - } + message = MessageResourceTrashed ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithTrashedResource(ev.Ref, ev.ID), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) case events.ItemMoved: @@ -157,11 +141,7 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h message = MessageResourceRenamed vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithOldResource(ev.OldReference), WithUser(ev.Executant, "")) case false: - if ev.Ref.GetPath() == "/" { - message = MessageResourceInSpaceMoved - } else { - message = MessageResourceInFolderMoved - } + message = MessageResourceMoved vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref))) } ts = utils.TSToTime(ev.Timestamp) diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index f73e988742..8714ff9f10 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -20,20 +20,17 @@ import ( // Translations var ( - MessageResourceInSpaceCreated = l10n.Template("{user} added {resource} to {space}") - MessageResourceInSpaceTrashed = l10n.Template("{user} deleted {resource} from {space}") - MessageResourceInSpaceMoved = l10n.Template("{user} moved {resource} to {space}") - MessageResourceInFolderCreated = l10n.Template("{user} added {resource} to {folder}") - MessageResourceInFolderTrashed = l10n.Template("{user} deleted {resource} from {folder}") - MessageResourceInFolderMoved = l10n.Template("{user} moved {resource} to {folder}") - MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") - MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}") - MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}") - MessageLinkCreated = l10n.Template("{user} shared {resource} via link") + MessageResourceCreated = l10n.Template("{user} added {resource} to {folder}") + MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {folder}") + MessageResourceMoved = l10n.Template("{user} moved {resource} to {folder}") + MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") + MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}") + MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}") + MessageLinkCreated = l10n.Template("{user} shared {resource} via link") MessageLinkUpdated = l10n.Template("{user} updated {field} for a link {token} on {resource}") - MessageLinkDeleted = l10n.Template("{user} removed link to {resource}") - MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}") - MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}") + MessageLinkDeleted = l10n.Template("{user} removed link to {resource}") + MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}") + MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}") ) // GetActivitiesResponse is the response on GET activities requests From 7c29d6a0c92a1d809e88b3583e531276ed1cc700 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 16 Sep 2024 17:40:31 +0200 Subject: [PATCH 03/12] fix gherkins Signed-off-by: Christian Richter --- .../features/apiActivities/activities.feature | 50 +++++++-------- .../apiActivities/shareActivities.feature | 61 +++---------------- 2 files changed, 35 insertions(+), 76 deletions(-) diff --git a/tests/acceptance/features/apiActivities/activities.feature b/tests/acceptance/features/apiActivities/activities.feature index dfe99ac7e1..9944535bdf 100644 --- a/tests/acceptance/features/apiActivities/activities.feature +++ b/tests/acceptance/features/apiActivities/activities.feature @@ -35,7 +35,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -125,7 +125,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -221,7 +221,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -251,7 +251,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -285,7 +285,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} deleted {resource} from {space}" + "const": "{user} deleted {resource} from {folder}" }, "variables": { "type": "object", @@ -359,7 +359,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} deleted {resource} from {space}" + "const": "{user} deleted {resource} from {folder}" }, "variables": { "type": "object", @@ -458,7 +458,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -477,7 +477,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} moved {resource} to {space}" + "const": "{user} moved {resource} to {folder}" }, "variables": { "type": "object", @@ -568,7 +568,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -587,7 +587,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} moved {resource} to {space}" + "const": "{user} moved {resource} to {folder}" }, "variables": { "type": "object", @@ -685,7 +685,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -794,7 +794,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -916,7 +916,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -946,7 +946,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -976,7 +976,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -1006,7 +1006,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -1036,7 +1036,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} moved {resource} to {space}" + "const": "{user} moved {resource} to {folder}" }, "variables": { "type": "object", @@ -1066,7 +1066,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} moved {resource} to {space}" + "const": "{user} moved {resource} to {folder}" }, "variables": { "type": "object", @@ -1174,7 +1174,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} deleted {resource} from {space}" + "const": "{user} deleted {resource} from {folder}" }, "variables": { "type": "object", @@ -1204,7 +1204,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} deleted {resource} from {space}" + "const": "{user} deleted {resource} from {folder}" }, "variables": { "type": "object", @@ -1261,7 +1261,7 @@ Feature: check activities "required": ["message","variables"], "properties": { "message": { - "const": "{user} hat {resource} zu {space} hinzugefügt" + "const": "{user} hat {resource} zu {folder} hinzugefügt" }, "variables": { "type": "object", @@ -1485,7 +1485,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -1519,7 +1519,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -1580,7 +1580,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -1614,7 +1614,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", diff --git a/tests/acceptance/features/apiActivities/shareActivities.feature b/tests/acceptance/features/apiActivities/shareActivities.feature index 7d039e5b32..6ba23e760c 100644 --- a/tests/acceptance/features/apiActivities/shareActivities.feature +++ b/tests/acceptance/features/apiActivities/shareActivities.feature @@ -42,7 +42,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -162,7 +162,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -299,7 +299,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -405,7 +405,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" } } } @@ -539,48 +539,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" - }, - "variables": { - "type": "object", - "required": ["resource","space","user"], - "properties": { - "resource": { - "type": "object", - "required": ["id","name"], - "properties": { - "name": { - "const": "FOLDER" - } - } - }, - "space": { - "type": "object", - "required": ["id","name"], - "properties": { - "id": { - "type": "string", - "pattern": "^%user_id_pattern%!%user_id_pattern%$" - }, - "name": { - "const": "Alice Hansen" - } - } - }, - "user": { - "type": "object", - "required": ["id","displayName"], - "properties": { - "id": { - "type": "string", - "pattern": "%user_id_pattern%" - }, - "displayName": { - "const": "Alice" - } - } - } - } + "const": "{user} added {resource} to {folder}" } } } @@ -618,7 +577,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -639,7 +598,7 @@ Feature: check share activity "properties": { "id": { "type": "string", - "pattern": "^%file_id_pattern%$" + "pattern": "^%user_id_pattern%!%user_id_pattern%$" }, "name": { "const": "Alice Hansen" @@ -678,7 +637,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} updated {resource} in {folder}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -699,7 +658,7 @@ Feature: check share activity "properties": { "id": { "type": "string", - "pattern": "^%file_id_pattern%$" + "pattern": "^%user_id_pattern%!%user_id_pattern%$" }, "name": { "const": "Alice Hansen" @@ -738,7 +697,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} deleted {resource} from {space}" + "const": "{user} deleted {resource} from {folder}" }, "variables": { "type": "object", From 3c8d85b05d1612542b4548de7f05e7844940be01 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 18 Sep 2024 09:59:10 +0200 Subject: [PATCH 04/12] Fix po files Signed-off-by: Christian Richter Co-authored-by: Martin Mattel Co-authored-by: Florian Schade Co-authored-by: Julian Koberg # Conflicts: # services/activitylog/pkg/service/l10n/locale/de/LC_MESSAGES/activitylog.po --- .../l10n/locale/de/LC_MESSAGES/activitylog.po | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/services/activitylog/pkg/service/l10n/locale/de/LC_MESSAGES/activitylog.po b/services/activitylog/pkg/service/l10n/locale/de/LC_MESSAGES/activitylog.po index ed503bfb48..cf2c87be88 100644 --- a/services/activitylog/pkg/service/l10n/locale/de/LC_MESSAGES/activitylog.po +++ b/services/activitylog/pkg/service/l10n/locale/de/LC_MESSAGES/activitylog.po @@ -2,16 +2,16 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Martin , 2024 -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL\n" -"POT-Creation-Date: 2024-09-19 15:03+0000\n" +"POT-Creation-Date: 2024-09-12 00:42+0000\n" "PO-Revision-Date: 2024-08-20 10:13+0000\n" "Last-Translator: Martin , 2024\n" "Language-Team: German (https://app.transifex.com/owncloud-org/teams/6149/de/)\n" @@ -21,43 +21,43 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: pkg/service/response.go:24 -msgid "{user} added {resource} to {space}" -msgstr "{user} hat {resource} zu {space} hinzugefügt" +#: pkg/service/response.go:23 +msgid "{user} added {resource} to {folder}" +msgstr "{user} hat {resource} zu {folder} hinzugefügt" -#: pkg/service/response.go:34 +#: pkg/service/response.go:31 msgid "{user} added {sharee} as member of {space}" -msgstr "{user} hat {sharee} als Mitglied zu {space} hinzugefügt" +msgstr "{user} hat {sharee} als Mitglied zu {folder} hinzugefügt" -#: pkg/service/response.go:26 +#: pkg/service/response.go:24 msgid "{user} deleted {resource} from {space}" msgstr "{user} hat {resource} in {space} gelöscht" -#: pkg/service/response.go:27 -msgid "{user} moved {resource} to {space}" +#: pkg/service/response.go:25 +msgid "{user} moved {resource} to {folder}" msgstr "{user} hat {resource} nach {space} verschoben" -#: pkg/service/response.go:33 +#: pkg/service/response.go:30 msgid "{user} removed link to {resource}" msgstr "{user} hat den Link zu {resource} entfernt" -#: pkg/service/response.go:30 +#: pkg/service/response.go:28 msgid "{user} removed {sharee} from {resource}" msgstr "{user} hat {sharee} von {resource} entfernt" -#: pkg/service/response.go:35 +#: pkg/service/response.go:32 msgid "{user} removed {sharee} from {space}" msgstr "{user} hat {sharee} von {space} entfernt" -#: pkg/service/response.go:28 +#: pkg/service/response.go:26 msgid "{user} renamed {oldResource} to {resource}" msgstr "{user} hat {oldResource} zu {resource} umbenannt" -#: pkg/service/response.go:31 +#: pkg/service/response.go:29 msgid "{user} shared {resource} via link" msgstr "{user} hat {resource} via Link geteilt" -#: pkg/service/response.go:29 +#: pkg/service/response.go:27 msgid "{user} shared {resource} with {sharee}" msgstr "{user} hat {resource} mit {sharee} geteilt" From b8523033539a683712fc1bb967b4a230202b531d Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 18 Sep 2024 10:07:58 +0200 Subject: [PATCH 05/12] Update tests after rebase Signed-off-by: Christian Richter --- tests/acceptance/features/apiActivities/activities.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/features/apiActivities/activities.feature b/tests/acceptance/features/apiActivities/activities.feature index 9944535bdf..26099a673d 100644 --- a/tests/acceptance/features/apiActivities/activities.feature +++ b/tests/acceptance/features/apiActivities/activities.feature @@ -1356,7 +1356,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -1390,7 +1390,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", @@ -1424,7 +1424,7 @@ Feature: check activities "required": ["message", "variables"], "properties": { "message": { - "const": "{user} added {resource} to {space}" + "const": "{user} added {resource} to {folder}" }, "variables": { "type": "object", From 1213a734cbe9ff41cc6380fef34030991229db64 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 18 Sep 2024 11:31:48 +0200 Subject: [PATCH 06/12] Add folder to WithResource function Signed-off-by: Christian Richter Co-authored-by: Julian Koberg Co-authored-by: Victor Scharf --- services/activitylog/pkg/service/response.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index 8714ff9f10..1e9acc05a0 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -69,6 +69,16 @@ func WithResource(ref *provider.Reference, addSpace bool) ActivityOption { Name: info.GetName(), } + parent, err := utils.GetResourceByID(ctx, info.GetParentId(), gwc) + if err != nil { + return err + } + + vars["folder"] = Resource{ + ID: info.GetParentId().GetOpaqueId(), + Name: parent.GetName(), + } + if addSpace { vars["space"] = Resource{ ID: info.GetSpace().GetId().GetOpaqueId(), From a6b97a3ee7afb5a7dd51841a61ba4c0284b9e5a7 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Thu, 19 Sep 2024 10:02:00 +0200 Subject: [PATCH 07/12] skip e2etests Signed-off-by: Christian Richter --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index e5c5df23ea..a71835ae72 100644 --- a/.drone.star +++ b/.drone.star @@ -191,7 +191,7 @@ config = { }, "e2eTests": { "part": { - "skip": False, + "skip": True, # TODO: reenable them as soon as the test is fixed in web "totalParts": 4, # divide and run all suites in parts (divide pipelines) "xsuites": ["search", "app-provider", "oidc"], # suites to skip }, From 220cde844099dcdb2491c1a3302a9c5a56852311 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Tue, 17 Sep 2024 10:07:37 +0200 Subject: [PATCH 08/12] feat(activitylog): Add FileUpdated Activity Signed-off-by: jkoberg --- services/activitylog/pkg/service/http.go | 3 +++ services/activitylog/pkg/service/response.go | 1 + .../acceptance/features/apiActivities/shareActivities.feature | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/services/activitylog/pkg/service/http.go b/services/activitylog/pkg/service/http.go index 85d95ee421..ea5ea41581 100644 --- a/services/activitylog/pkg/service/http.go +++ b/services/activitylog/pkg/service/http.go @@ -121,6 +121,9 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h continue case events.UploadReady: message = MessageResourceCreated + if ev.IsVersion { + message = MessageResourceUpdated + } ts = utils.TSToTime(ev.Timestamp) vars, err = s.GetVars(ctx, WithResource(ev.FileRef, true), WithUser(ev.ExecutingUser.GetId(), ev.ExecutingUser.GetDisplayName()), WithSpace(toSpace(ev.FileRef))) case events.FileTouched: diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index 1e9acc05a0..84f52eddcd 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -22,6 +22,7 @@ import ( var ( MessageResourceCreated = l10n.Template("{user} added {resource} to {folder}") MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {folder}") + MessageResourceUpdated = l10n.Template("{user} updated {resource} in {space}") MessageResourceMoved = l10n.Template("{user} moved {resource} to {folder}") MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}") diff --git a/tests/acceptance/features/apiActivities/shareActivities.feature b/tests/acceptance/features/apiActivities/shareActivities.feature index 6ba23e760c..96b81243c3 100644 --- a/tests/acceptance/features/apiActivities/shareActivities.feature +++ b/tests/acceptance/features/apiActivities/shareActivities.feature @@ -637,7 +637,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} added {resource} to {folder}" + "const": "{user} updated {resource} in {space}" }, "variables": { "type": "object", From 79c4ce3abf7090604df84bd8d99eb45a3d39caf1 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 18 Sep 2024 09:28:05 +0200 Subject: [PATCH 09/12] fix test --- services/activitylog/pkg/service/response.go | 1 + .../apiActivities/shareActivities.feature | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index 84f52eddcd..1c5294f9e2 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -3,6 +3,7 @@ package service import ( "context" "fmt" + "github.com/cs3org/reva/v2/pkg/events" "path/filepath" "time" diff --git a/tests/acceptance/features/apiActivities/shareActivities.feature b/tests/acceptance/features/apiActivities/shareActivities.feature index 96b81243c3..942b3647d2 100644 --- a/tests/acceptance/features/apiActivities/shareActivities.feature +++ b/tests/acceptance/features/apiActivities/shareActivities.feature @@ -540,6 +540,47 @@ Feature: check share activity "properties": { "message": { "const": "{user} added {resource} to {folder}" + }, + "variables": { + "type": "object", + "required": ["resource","space","user"], + "properties": { + "resource": { + "type": "object", + "required": ["id","name"], + "properties": { + "name": { + "const": "FOLDER" + } + } + }, + "space": { + "type": "object", + "required": ["id","name"], + "properties": { + "id": { + "type": "string", + "pattern": "^%user_id_pattern%!%user_id_pattern%$" + }, + "name": { + "const": "Alice Hansen" + } + } + }, + "user": { + "type": "object", + "required": ["id","displayName"], + "properties": { + "id": { + "type": "string", + "pattern": "%user_id_pattern%" + }, + "displayName": { + "const": "Alice" + } + } + } + } } } } From 7bafe7f66efabd1747193856922c36e2a5bdfc3f Mon Sep 17 00:00:00 2001 From: jkoberg Date: Wed, 18 Sep 2024 10:07:22 +0200 Subject: [PATCH 10/12] fix(activitylog): space -> folder Signed-off-by: jkoberg --- .drone.star | 2 +- services/activitylog/pkg/service/response.go | 13 ++----------- .../features/apiActivities/shareActivities.feature | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.drone.star b/.drone.star index a71835ae72..0b19779ffd 100644 --- a/.drone.star +++ b/.drone.star @@ -191,7 +191,7 @@ config = { }, "e2eTests": { "part": { - "skip": True, # TODO: reenable them as soon as the test is fixed in web + "skip": True, # TODO: reenable them as soon as the test is fixed in web "totalParts": 4, # divide and run all suites in parts (divide pipelines) "xsuites": ["search", "app-provider", "oidc"], # suites to skip }, diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index 1c5294f9e2..cd4f5bcb4e 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -22,8 +22,8 @@ import ( // Translations var ( MessageResourceCreated = l10n.Template("{user} added {resource} to {folder}") + MessageResourceUpdated = l10n.Template("{user} updated {resource} in {folder}") MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {folder}") - MessageResourceUpdated = l10n.Template("{user} updated {resource} in {space}") MessageResourceMoved = l10n.Template("{user} moved {resource} to {folder}") MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}") @@ -71,16 +71,6 @@ func WithResource(ref *provider.Reference, addSpace bool) ActivityOption { Name: info.GetName(), } - parent, err := utils.GetResourceByID(ctx, info.GetParentId(), gwc) - if err != nil { - return err - } - - vars["folder"] = Resource{ - ID: info.GetParentId().GetOpaqueId(), - Name: parent.GetName(), - } - if addSpace { vars["space"] = Resource{ ID: info.GetSpace().GetId().GetOpaqueId(), @@ -228,6 +218,7 @@ func WithSpace(spaceid *provider.StorageSpaceId) ActivityOption { } } +// WithLinkFieldUpdated sets the field and token variables for an activity func WithLinkFieldUpdated(e *events.LinkUpdated) ActivityOption { return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]interface{}) error { f := "some field" diff --git a/tests/acceptance/features/apiActivities/shareActivities.feature b/tests/acceptance/features/apiActivities/shareActivities.feature index 942b3647d2..0d96d860e6 100644 --- a/tests/acceptance/features/apiActivities/shareActivities.feature +++ b/tests/acceptance/features/apiActivities/shareActivities.feature @@ -678,7 +678,7 @@ Feature: check share activity "required": ["message","variables"], "properties": { "message": { - "const": "{user} updated {resource} in {space}" + "const": "{user} updated {resource} in {folder}" }, "variables": { "type": "object", From 74ce6b5a6b3bb26520715d607142dff22be6bf9c Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Thu, 19 Sep 2024 14:55:40 +0200 Subject: [PATCH 11/12] readd lost code for folder in resource Signed-off-by: Christian Richter --- services/activitylog/pkg/service/response.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index cd4f5bcb4e..cfd45768aa 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -71,6 +71,16 @@ func WithResource(ref *provider.Reference, addSpace bool) ActivityOption { Name: info.GetName(), } + parent, err := utils.GetResourceByID(ctx, info.GetParentId(), gwc) + if err != nil { + return err + } + + vars["folder"] = Resource{ + ID: info.GetParentId().GetOpaqueId(), + Name: parent.GetName(), + } + if addSpace { vars["space"] = Resource{ ID: info.GetSpace().GetId().GetOpaqueId(), From 2a54adfd635da444ca6ad974bc0ec8eee36db5e7 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 18 Sep 2024 09:28:05 +0200 Subject: [PATCH 12/12] fix test --- .../acceptance/features/apiActivities/shareActivities.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/features/apiActivities/shareActivities.feature b/tests/acceptance/features/apiActivities/shareActivities.feature index 0d96d860e6..9fc5c7ef54 100644 --- a/tests/acceptance/features/apiActivities/shareActivities.feature +++ b/tests/acceptance/features/apiActivities/shareActivities.feature @@ -639,7 +639,7 @@ Feature: check share activity "properties": { "id": { "type": "string", - "pattern": "^%user_id_pattern%!%user_id_pattern%$" + "pattern": "^%file_id_pattern%$" }, "name": { "const": "Alice Hansen" @@ -699,7 +699,7 @@ Feature: check share activity "properties": { "id": { "type": "string", - "pattern": "^%user_id_pattern%!%user_id_pattern%$" + "pattern": "^%file_id_pattern%$" }, "name": { "const": "Alice Hansen"