Activity parent resource refs

[kulmann]

Describe the bug

For most file location related activity items I'd expect the target or parent folder to be referred to in the activity message. Instead, only the space itself is referenced.

Steps to reproduce

1. Create a Space Space
2. Create a folder folder
3. Create a subfolder folder/subfolder
4. Create a file test.md inside folder
5. Move test.md to folder/subfolder

Expected behavior

• Activity message for (3) is admin added subfolder to folder
• Activity message for (4) is admin added test.md to folder
• Activity message for (5) is admin moved test.md to subfolder

Actual behavior

Activity messages actually are:

• admin added subfolder to Space
• admin added test.md to Space
• admin moved test.md to Space

[kulmann]

I've lowered the priority to p3, we can work on this in the next sprint. No immediate fixing needed.

[dragonchaser]

As far as I can see it, this needs an additonal event to be thrown in that case. See

ocis/services/activitylog/pkg/service/http.go

Lines 106 to 160 in 1c4f53d

	switch ev := s.unwrapEvent(e).(type) {
	case nil:
	// error already logged in unwrapEvent
	continue
	case events.UploadReady:
	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:
	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:
	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:
	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:
	switch isRename(ev.OldReference, ev.Ref) {
	case true:
	message = MessageResourceRenamed
	vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithOldResource(ev.OldReference), WithUser(ev.Executant, ""))
	case false:
	message = MessageResourceMoved
	vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
	}
	ts = utils.TSToTime(ev.Timestamp)
	case events.ShareCreated:
	message = MessageShareCreated
	ts = utils.TSToTime(ev.CTime)
	vars, err = s.GetVars(ctx, WithResource(toRef(ev.ItemID), false), WithUser(ev.Executant, ""), WithSharee(ev.GranteeUserID, ev.GranteeGroupID))
	case events.ShareRemoved:
	message = MessageShareDeleted
	ts = ev.Timestamp
	vars, err = s.GetVars(ctx, WithResource(toRef(ev.ItemID), false), WithUser(ev.Executant, ""), WithSharee(ev.GranteeUserID, ev.GranteeGroupID))
	case events.LinkCreated:
	message = MessageLinkCreated
	ts = utils.TSToTime(ev.CTime)
	vars, err = s.GetVars(ctx, WithResource(toRef(ev.ItemID), false), WithUser(ev.Executant, ""))
	case events.LinkRemoved:
	message = MessageLinkDeleted
	ts = utils.TSToTime(ev.Timestamp)
	vars, err = s.GetVars(ctx, WithResource(toRef(ev.ItemID), false), WithUser(ev.Executant, ""))
	case events.SpaceShared:
	message = MessageSpaceShared
	ts = ev.Timestamp
	vars, err = s.GetVars(ctx, WithSpace(ev.ID), WithUser(ev.Executant, ""), WithSharee(ev.GranteeUserID, ev.GranteeGroupID))
	case events.SpaceUnshared:
	message = MessageSpaceUnshared
	ts = ev.Timestamp
	vars, err = s.GetVars(ctx, WithSpace(ev.ID), WithUser(ev.Executant, ""), WithSharee(ev.GranteeUserID, ev.GranteeGroupID))
	}

and

ocis/services/activitylog/pkg/service/response.go

Lines 22 to 32 in 1c4f53d

	var (
	MessageResourceCreated = l10n.Template("{user} added {resource} to {space}")
	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")
	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}")