mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-12 22:39:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10072 from kobergj/FileUpdatedActivity

Browse Source 
Add FileUpdated Activity
This commit is contained in:
kobergj
2024-09-18 11:15:06 +02:00
committed by GitHub
parent 3355a74aaa e3d2f24fd8
commit 6fe9923b08
4 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/fileupdated-activity.md
+5
View File
@@ -0,0 +1,5 @@
Enhancement: Add an Activity for FileUpdated
Previously FileUpdated has also triggered a FileAdded Activity
https://github.com/owncloud/ocis/pull/10072
services/activitylog/pkg/service/http.go
+3
View File
@@ -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:
services/activitylog/pkg/service/response.go
+1
View File
@@ -21,6 +21,7 @@ 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}")
tests/acceptance/features/apiActivities/shareActivities.feature
+44 -3
View File
@@ -540,6 +540,47 @@ Feature: check share activity
"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"
}
}
}
}
}
}
}
@@ -598,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"
@@ -637,7 +678,7 @@ Feature: check share activity
"required": ["message","variables"],
"properties": {
"message": {
"const": "{user} added {resource} to {space}"
"const": "{user} updated {resource} in {folder}"
},
"variables": {
"type": "object",
@@ -658,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"