From 704fbab6889ebe84c22d9c0ec0ed4d10e4d9d37f Mon Sep 17 00:00:00 2001 From: Stefan Lender Date: Mon, 12 Oct 2026 09:29:33 +0200 Subject: [PATCH 1/2] feat(teams): add activity and resource integration Co-authored-by: Copilot GPT-5.6 Terra Signed-off-by: Stefan Lender --- lib/Activity/Provider.php | 1 + lib/Activity/ProviderParser.php | 10 + lib/Activity/ProviderSubjectCircle.php | 41 + lib/Db/CircleRequest.php | 9 + lib/FederatedItems/CircleEdit.php | 1 + lib/Service/ActivityService.php | 58 +- lib/Service/EventService.php | 7 + src/teams/api.spec.ts | 41 +- src/teams/api.ts | 48 +- src/teams/components/TeamNavigation.vue | 24 +- src/teams/router.ts | 7 + src/teams/types.ts | 40 + src/teams/views/TeamActivityView.spec.ts | 185 +++++ src/teams/views/TeamActivityView.vue | 752 ++++++++++++++++++ .../lib/FederatedItems/MemberLevelTest.php | 49 ++ .../unit/lib/Service/ActivityServiceTest.php | 186 +++++ tests/unit/lib/Service/EventServiceTest.php | 36 + 17 files changed, 1481 insertions(+), 14 deletions(-) create mode 100644 src/teams/views/TeamActivityView.spec.ts create mode 100644 src/teams/views/TeamActivityView.vue create mode 100644 tests/unit/lib/FederatedItems/MemberLevelTest.php create mode 100644 tests/unit/lib/Service/ActivityServiceTest.php create mode 100644 tests/unit/lib/Service/EventServiceTest.php diff --git a/lib/Activity/Provider.php b/lib/Activity/Provider.php index 1a796846c..0535e9724 100644 --- a/lib/Activity/Provider.php +++ b/lib/Activity/Provider.php @@ -112,6 +112,7 @@ private function parseAsMember( $this->parserCircle->parseSubjectCircleCreate($event, $params); $this->parserCircle->parseSubjectCircleDelete($event, $params); + $this->parserCircle->parseSubjectCircleEdit($event, $params); $this->parseMemberAsMember($event, $params); $this->parseCircleMemberAsMember($event, $params); } diff --git a/lib/Activity/ProviderParser.php b/lib/Activity/ProviderParser.php index 1e60ae41a..404881a4f 100644 --- a/lib/Activity/ProviderParser.php +++ b/lib/Activity/ProviderParser.php @@ -265,4 +265,14 @@ protected function generateGroupParameter(array $group): array { '_parsed' => $group['userId'] ]; } + + /** @return array */ + protected function generateHighlightParameter(string $value): array { + return [ + 'type' => 'highlight', + 'id' => $value, + 'name' => $value, + '_parsed' => $value, + ]; + } } diff --git a/lib/Activity/ProviderSubjectCircle.php b/lib/Activity/ProviderSubjectCircle.php index f591929cd..719872a25 100644 --- a/lib/Activity/ProviderSubjectCircle.php +++ b/lib/Activity/ProviderSubjectCircle.php @@ -46,4 +46,45 @@ public function parseSubjectCircleDelete(IEvent $event, array $params): void { throw new FakeException(); } + + public function parseSubjectCircleEdit(IEvent $event, array $params): void { + if ($event->getSubject() !== 'circle_edit') { + return; + } + + $change = (string)($params['change'] ?? 'details'); + if ($change === 'name' || $change === 'displayName') { + $data = [ + 'author' => $this->generateUserParameter($params['initiator'] ?? []), + 'title' => $this->generateHighlightParameter((string)($params['title'] ?? '')), + ]; + if ($this->isViewerTheAuthor($params['initiator'] ?? [], $this->activityManager->getCurrentUserId())) { + $this->setSubject($event, $this->l10n->t('You changed the team title to {title}'), $data); + } else { + $this->setSubject($event, $this->l10n->t('{author} changed the team title to {title}'), $data); + } + + throw new FakeException(); + } + + if ($change === 'description') { + $this->parseCircleEvent( + $event, + $params, + $this->l10n->t('You changed the description of {circle}'), + $this->l10n->t('{author} changed the description of {circle}'), + ); + + throw new FakeException(); + } + + $this->parseCircleEvent( + $event, $params, + $this->l10n->t('You edited the team {circle}'), + $this->l10n->t('{author} edited the team {circle}') + ); + + throw new FakeException(); + } + } diff --git a/lib/Db/CircleRequest.php b/lib/Db/CircleRequest.php index 93ff586c2..0589b0519 100644 --- a/lib/Db/CircleRequest.php +++ b/lib/Db/CircleRequest.php @@ -40,6 +40,15 @@ public function __construct( parent::__construct($timezoneService, $configService); } + public function getActivityObjectId(string $singleId): int { + $qb = $this->getQueryBuilder(); + $qb->select('id') + ->from(self::TABLE_CIRCLE) + ->where($qb->expr()->eq('unique_id', $qb->createNamedParameter($singleId))); + + return (int)$qb->executeQuery()->fetchOne(); + } + /** * @param Circle $circle * diff --git a/lib/FederatedItems/CircleEdit.php b/lib/FederatedItems/CircleEdit.php index d6c43e143..85b5537ae 100644 --- a/lib/FederatedItems/CircleEdit.php +++ b/lib/FederatedItems/CircleEdit.php @@ -112,6 +112,7 @@ public function manage(FederatedEvent $event): void { } $this->circleRequest->edit($circle); + $event->setCircle($circle); $this->memberRequest->updateDisplayName($circle->getSingleId(), $circle->getDisplayName()); $this->eventService->circleEditing($event); } diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php index f1bcf2364..d41a663af 100644 --- a/lib/Service/ActivityService.php +++ b/lib/Service/ActivityService.php @@ -10,6 +10,7 @@ namespace OCA\Circles\Service; use OCA\Circles\AppInfo\Application; +use OCA\Circles\Db\CircleRequest; use OCA\Circles\Db\MemberRequest; use OCA\Circles\Events\CircleGenericEvent; use OCA\Circles\IFederatedUser; @@ -27,6 +28,7 @@ public function __construct( private readonly IActivityManager $activityManager, private readonly IUserManager $userManager, private readonly MemberRequest $memberRequest, + private readonly CircleRequest $circleRequest, private readonly ConfigService $configService, ) { } @@ -40,7 +42,7 @@ public function onCircleCreation(Circle $circle): void { return; } - $event = $this->generateEvent('circles_as_non_member'); + $event = $this->generateEvent('circles_as_non_member', $circle); $event->setSubject( 'circle_create', [ @@ -66,7 +68,7 @@ public function onCircleDestruction(Circle $circle): void { return; } - $event = $this->generateEvent('circles_as_member'); + $event = $this->generateEvent('circles_as_member', $circle); $event->setSubject( 'circle_delete', [ @@ -81,6 +83,33 @@ public function onCircleDestruction(Circle $circle): void { ); } + public function onCircleEdited(Circle $circle, string $change): void { + if ($circle->isConfig(Circle::CFG_PERSONAL)) { + return; + } + + $event = $this->generateEvent('circles_as_member', $circle); + $event->setSubject( + 'circle_edit', + [ + 'ver' => 2, + 'circle' => $this->shortenCircleData($circle), + 'initiator' => ($circle->hasInitiator() ? $this->shortenMemberData($circle->getInitiator()) : null), + 'change' => $change, + 'title' => match ($change) { + 'name' => $circle->getName(), + 'displayName' => $circle->getDisplayName(), + default => null, + }, + ] + ); + + $this->publishEvent( + $event, + $this->memberRequest->getInheritedMembers($circle->getSingleId(), false, Member::LEVEL_MEMBER) + ); + } + /** * @param Circle $circle * @param Member $member @@ -127,7 +156,7 @@ private function onMemberNewAccount( Member $member, int $eventType, ): void { - $event = $this->generateEvent('circles_as_member'); + $event = $this->generateEvent('circles_as_member', $circle); try { $event->setSubject( @@ -168,7 +197,7 @@ private function onMemberNewCircle( Member $member, int $eventType = CircleGenericEvent::JOINED, ): void { - $event = $this->generateEvent('circles_as_member'); + $event = $this->generateEvent('circles_as_member', $circle); try { $event->setSubject( @@ -209,7 +238,7 @@ private function onMemberAlmost( return; // only if almost-member is a local account } - $event = $this->generateEvent('circles_as_moderator'); + $event = $this->generateEvent('circles_as_moderator', $circle); try { $event->setSubject( @@ -269,7 +298,7 @@ private function onMemberRemoveAccount( Member $member, int $eventType, ): void { - $event = $this->generateEvent('circles_as_member'); + $event = $this->generateEvent('circles_as_member', $circle); try { $event->setSubject( @@ -305,7 +334,7 @@ private function onMemberRemoveCircle( Member $member, int $eventType = CircleGenericEvent::JOINED, ): void { - $event = $this->generateEvent('circles_as_member'); + $event = $this->generateEvent('circles_as_member', $circle); try { $event->setSubject( @@ -342,13 +371,13 @@ public function onMemberLevel( Member $member, int $level, ): void { - if ($member->getLevel() === Member::LEVEL_OWNER) { + if ($level === Member::LEVEL_OWNER) { $this->onMemberOwner($circle, $member); return; } - $event = $this->generateEvent('circles_as_moderator'); + $event = $this->generateEvent('circles_as_moderator', $circle); $event->setSubject( 'member_level', [ @@ -373,7 +402,7 @@ public function onMemberLevel( * @param Member $member */ public function onMemberOwner(Circle $circle, Member $member): void { - $event = $this->generateEvent('circles_as_moderator'); + $event = $this->generateEvent('circles_as_moderator', $circle); $event->setSubject( 'member_owner', [ @@ -398,13 +427,20 @@ public function onShareNew(Circle $getCircle, FederatedEvent $federatedEvent): v * Create an Activity Event with the basic settings for the app. * * @param string $type + * @param Circle|null $circle * * @return IEvent */ - private function generateEvent(string $type): IEvent { + private function generateEvent(string $type, ?Circle $circle = null): IEvent { $event = $this->activityManager->generateEvent(); $event->setApp(Application::APP_ID) ->setType($type); + if ($circle !== null) { + $event->setObject(Application::APP_ID, $this->circleRequest->getActivityObjectId($circle->getSingleId()), $circle->getName()); + if ($circle->hasInitiator() && $circle->getInitiator()->getUserType() === Member::TYPE_USER) { + $event->setAuthor($circle->getInitiator()->getUserId()); + } + } return $event; } diff --git a/lib/Service/EventService.php b/lib/Service/EventService.php index b2b806743..f8858e9a7 100644 --- a/lib/Service/EventService.php +++ b/lib/Service/EventService.php @@ -68,6 +68,13 @@ public function circleCreated(FederatedEvent $federatedEvent, array $results): v public function circleEditing(FederatedEvent $federatedEvent): void { $event = new EditingCircleEvent($federatedEvent); $this->eventDispatcher->dispatchTyped($event); + $change = match (true) { + $federatedEvent->getData()->hasKey('name') => 'name', + $federatedEvent->getData()->hasKey('displayName') => 'displayName', + $federatedEvent->getData()->hasKey('description') => 'description', + default => 'details', + }; + $this->activityService->onCircleEdited($event->getCircle(), $change); } /** diff --git a/src/teams/api.spec.ts b/src/teams/api.spec.ts index e85ec1408..ed5880441 100644 --- a/src/teams/api.spec.ts +++ b/src/teams/api.spec.ts @@ -32,7 +32,7 @@ vi.mock('./team-page/services/collaborationAutocompletion.js', () => ({ getSuggestions: vi.fn(), })) -const { createTeam, fetchTeams, setTeamFavorite, reorderFavoriteTeams } = await import('./api.ts') +const { createTeam, fetchTeamActivities, fetchTeams, setTeamFavorite, reorderFavoriteTeams } = await import('./api.ts') describe('fetchTeams', () => { it('drops circles the current user is not a member of', async () => { @@ -62,6 +62,45 @@ describe('fetchTeams', () => { }) }) +describe('fetchTeamActivities', () => { + it('requests the Activity endpoint with the stable team id', async () => { + vi.mocked(axios.get).mockResolvedValueOnce({ + data: { + ocs: { + data: [{ activity_id: 1, subject: 'Alice joined Design', datetime: '2026-09-30T12:00:00+00:00', user: 'alice' }], + }, + }, + headers: { + link: '; rel="next"', + }, + }) + + await expect(fetchTeamActivities('team-1', { actor: 'alice', limit: 25 })).resolves.toEqual({ + activities: [{ activity_id: 1, subject: 'Alice joined Design', datetime: '2026-09-30T12:00:00+00:00', user: 'alice' }], + nextSince: 1, + }) + expect(axios.get).toHaveBeenCalledWith( + '/ocs/apps/activity/api/v2/activity/team/{teamId}', + { params: { actor: 'alice', limit: 25 } }, + ) + }) + + it('treats Activity’s not-modified response as an empty page', async () => { + vi.mocked(axios.get).mockRejectedValueOnce({ response: { status: 304 } }) + + await expect(fetchTeamActivities('team-1')).resolves.toEqual({ activities: [] }) + }) + + it('defaults missing Activity data and rethrows other request failures', async () => { + vi.mocked(axios.get).mockResolvedValueOnce({ data: { ocs: {} }, headers: {} }) + await expect(fetchTeamActivities('team-1')).resolves.toEqual({ activities: [], nextSince: undefined }) + + const error = new Error('Activity unavailable') + vi.mocked(axios.get).mockRejectedValueOnce(error) + await expect(fetchTeamActivities('team-1')).rejects.toThrow(error) + }) +}) + describe('createTeam', () => { beforeEach(() => { vi.mocked(axios.post).mockResolvedValue({ diff --git a/src/teams/api.ts b/src/teams/api.ts index f5d66fe7d..05191c451 100644 --- a/src/teams/api.ts +++ b/src/teams/api.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -import type { Member, MemberCandidate, Resource, SharedResource, Team, TeamRole } from './types.ts' +import type { Member, MemberCandidate, Resource, SharedResource, Team, TeamActivity, TeamActivityPage, TeamActivityQuery, TeamRole } from './types.ts' import axios from '@nextcloud/axios' import { FileType } from '@nextcloud/files' @@ -21,6 +21,28 @@ interface OcsResponse { ocs: { data: T } } +/** + * Extract the Activity cursor from its RFC 5988 next-page link. + * + * @param link - The response's pagination Link header + */ +function getNextActivityCursor(link: string | undefined): number | undefined { + const match = link?.match(/[?&]since=(\d+)[^>]*>;\s*rel="next"/) + return match === null || match === undefined ? undefined : Number(match[1]) +} + +/** + * Whether Activity had no newer response for the current representation. + * + * @param error - A failed Activity request + */ +function isNotModifiedResponse(error: unknown): boolean { + return typeof error === 'object' + && error !== null + && 'response' in error + && (error as { response?: { status?: number } }).response?.status === 304 +} + /** Raw member as returned by the circles API. */ interface RawMember { singleId: string @@ -217,6 +239,30 @@ export async function fetchTeamMembers(teamId: string): Promise { return (res.data.ocs.data ?? []).map(mapFullMember) } +/** + * Fetch Activity events that are visible for a team member. + * + * @param teamId - The stable team single id + * @param query - Cursor and server-side filters for the stream + */ +export async function fetchTeamActivities(teamId: string, query: TeamActivityQuery = {}): Promise { + try { + const res = await axios.get>( + generateOcsUrl('apps/activity/api/v2/activity/team/{teamId}', { teamId }), + { params: query }, + ) + return { + activities: res.data.ocs.data ?? [], + nextSince: getNextActivityCursor(res.headers?.link), + } + } catch (error) { + if (isNotModifiedResponse(error)) { + return { activities: [] } + } + throw error + } +} + /** * Create a team and return its single id. * diff --git a/src/teams/components/TeamNavigation.vue b/src/teams/components/TeamNavigation.vue index 133f55c48..fff555bab 100644 --- a/src/teams/components/TeamNavigation.vue +++ b/src/teams/components/TeamNavigation.vue @@ -7,7 +7,7 @@ import type { RouteLocationRaw } from 'vue-router' import type { TeamPage } from '../api.ts' -import { mdiAccountMultiple, mdiAccountMultipleOutline, mdiArrowTopRight, mdiBookOpenPageVariantOutline, mdiCogOutline, mdiFileDocument, mdiFileDocumentOutline, mdiFolder, mdiFolderOutline, mdiFolderPlusOutline, mdiPlus, mdiShareVariant, mdiShareVariantOutline, mdiTextBoxPlusOutline, mdiTrashCanOutline, mdiViewDashboardOutline } from '@mdi/js' +import { mdiAccountMultiple, mdiAccountMultipleOutline, mdiArrowTopRight, mdiBookOpenPageVariantOutline, mdiCogOutline, mdiFileDocument, mdiFileDocumentOutline, mdiFolder, mdiFolderOutline, mdiFolderPlusOutline, mdiHistory, mdiPlus, mdiShareVariant, mdiShareVariantOutline, mdiTextBoxPlusOutline, mdiTrashCanOutline, mdiViewDashboardOutline } from '@mdi/js' import { showConfirmation, showError, showSuccess } from '@nextcloud/dialogs' import { t } from '@nextcloud/l10n' import { computed, nextTick, ref } from 'vue' @@ -65,6 +65,7 @@ const { canManage, isTeamAdmin } = useTeamActions(() => team.value) const settingsOpen = ref(false) const enabledApps = (window as unknown as { OC?: { appswebroots?: Record } }).OC?.appswebroots ?? {} +const activityAppEnabled = computed(() => enabledApps.activity !== undefined) // Per-team resource state (folder, resources, pages, order) lives in the // shared store, loaded by the team page (the owner of the team scope) and @@ -160,6 +161,18 @@ const orderedEntries = computed(() => { return [...known, ...unknown] }) +const activityEntry = computed(() => { + if (!activityAppEnabled.value) { + return null + } + return { + id: 'activity', + label: t('circles', 'Activity'), + icon: mdiHistory, + to: { name: 'team-activity', params: { teamId: teamId.value } }, + } +}) + // Reordering entries changes the team-level order, so team admins and above // only — the server enforces the same level on the save endpoint. const canReorder = computed(() => isTeamAdmin.value) @@ -612,6 +625,15 @@ async function onEntryDragEnd(): Promise {
    + + + + diff --git a/src/teams/router.ts b/src/teams/router.ts index 1e2a026f0..5bba2c5b0 100644 --- a/src/teams/router.ts +++ b/src/teams/router.ts @@ -10,6 +10,7 @@ import { createRouter, createWebHistory } from 'vue-router' import HomeView from './views/HomeView.vue' import JoinInvitation from './views/JoinInvitation.vue' import PageView from './views/PageView.vue' +import TeamActivityView from './views/TeamActivityView.vue' import TeamFolderView from './views/TeamFolderView.vue' import TeamHomeView from './views/TeamHomeView.vue' import TeamLandingView from './views/TeamLandingView.vue' @@ -44,6 +45,12 @@ const routes: RouteRecordRaw[] = [ component: TeamLandingView, props: true, }, + { + name: 'team-activity', + path: 'activity', + component: TeamActivityView, + props: true, + }, { name: 'team-folder', path: 'folder', diff --git a/src/teams/types.ts b/src/teams/types.ts index 4747b053f..02dfbcf08 100644 --- a/src/teams/types.ts +++ b/src/teams/types.ts @@ -72,6 +72,46 @@ export interface Team { resources: Resource[] } +/** A formatted Activity event scoped to a team. */ +export interface TeamActivity { + activity_id: number + subject: string + datetime: string + user: string + type?: string + icon?: string + object_type?: string + message?: string + subject_rich?: [string, Record | []] + message_rich?: [string, Record | []] +} + +/** A rich object embedded in an Activity subject or message. */ +export interface RichObject { + id: string | number + name: string + type: string + link?: string + server?: string +} + +/** Server-side filters for the Team Activity stream. */ +export interface TeamActivityQuery { + since?: number + limit?: number + sort?: 'asc' | 'desc' + search?: string + from?: number + to?: number + actor?: string +} + +/** One cursor-paginated page of Team Activity events. */ +export interface TeamActivityPage { + activities: TeamActivity[] + nextSince?: number +} + /** * A candidate member surfaced by the sharee autocompletion search (users, * groups, emails, contacts, other teams…), before they have been added to a diff --git a/src/teams/views/TeamActivityView.spec.ts b/src/teams/views/TeamActivityView.spec.ts new file mode 100644 index 000000000..0b0d26aa7 --- /dev/null +++ b/src/teams/views/TeamActivityView.spec.ts @@ -0,0 +1,185 @@ +/*! + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +import type * as L10n from '@nextcloud/l10n' + +import { mdiAccountMultipleOutline } from '@mdi/js' +import { flushPromises, shallowMount } from '@vue/test-utils' +import { beforeEach, describe, expect, it, vi } from 'vitest' +import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper' +import TeamActivityView from './TeamActivityView.vue' + +const fetchTeamActivities = vi.hoisted(() => vi.fn()) +const fetchTeamMembers = vi.hoisted(() => vi.fn()) + +vi.mock('@nextcloud/l10n', async (importOriginal) => { + const actual = await importOriginal() as typeof L10n + return { + ...actual, + t: (_app: string, text: string) => text, + } +}) + +vi.mock('../../logger.ts', () => ({ + logger: { error: vi.fn() }, +})) + +vi.mock('../api.ts', () => ({ + fetchTeamActivities, + fetchTeamMembers, +})) + +function mountView() { + return shallowMount(TeamActivityView, { + props: { teamId: 'team-1' }, + global: { + stubs: { + NcActionButton: { + emits: ['click'], + template: '', + }, + NcActions: { template: '
    ' }, + NcButton: { + emits: ['click'], + template: '', + }, + NcEmptyContent: { + props: ['name', 'description'], + template: '
    {{ name }}{{ description }}
    ', + }, + NcTextField: { + props: ['modelValue', 'helperText'], + emits: ['update:modelValue'], + template: '
    {{ helperText }}
    ', + }, + }, + }, + }) +} + +describe('TeamActivityView', () => { + beforeEach(() => { + vi.clearAllMocks() + fetchTeamMembers.mockResolvedValue([]) + }) + + it('loads and displays the current team activity', async () => { + fetchTeamActivities.mockResolvedValueOnce({ + activities: [{ + activity_id: 1, + subject: 'Alice joined Design', + subject_rich: ['{user} joined {team}', { + user: { id: 'alice', name: 'Alice', type: 'user' }, + team: { id: 'team-1', name: 'Design', type: 'circle' }, + }], + datetime: '2026-09-30T12:00:00+00:00', + user: 'alice', + object_type: 'circles', + }, { + activity_id: 2, + subject: 'Alice created a folder', + datetime: '2026-09-29T12:00:00+00:00', + user: 'alice', + }], + }) + + const wrapper = mountView() + await flushPromises() + + expect(fetchTeamActivities).toHaveBeenCalledWith('team-1', expect.objectContaining({ since: undefined })) + const richSubject = wrapper.findComponent({ name: 'NcRichText' }) + expect(richSubject.props('text')).toBe('{user} joined {team}') + expect(richSubject.props('arguments')).toMatchObject({ + user: { props: { displayName: 'Alice', user: 'alice' } }, + team: { props: { name: 'Design' } }, + }) + expect(wrapper.findComponent(NcIconSvgWrapper).props('path')).toBe(mdiAccountMultipleOutline) + expect(wrapper.findAll('.team-activity__group')).toHaveLength(2) + }) + + it('shows the empty state when the team has no activity', async () => { + fetchTeamActivities.mockResolvedValueOnce({ activities: [] }) + + const wrapper = mountView() + await flushPromises() + + expect(wrapper.text()).toContain('No activity yet') + }) + + it('shows an unavailable state when loading fails', async () => { + fetchTeamActivities.mockRejectedValueOnce(new Error('Network error')) + + const wrapper = mountView() + await flushPromises() + + expect(wrapper.text()).toContain('Activity unavailable') + }) + + it('loads the next activity page with the returned cursor', async () => { + fetchTeamActivities + .mockResolvedValueOnce({ + activities: [{ activity_id: 1, subject: 'First activity', datetime: '2026-09-30T12:00:00+00:00', user: 'alice' }], + nextSince: 42, + }) + .mockResolvedValueOnce({ + activities: [{ activity_id: 2, subject: 'Older activity', datetime: '2026-09-29T12:00:00+00:00', user: 'alice' }], + }) + + const wrapper = mountView() + await flushPromises() + + await wrapper.get('.team-activity__more .nc-button').trigger('click') + await flushPromises() + + expect(fetchTeamActivities).toHaveBeenLastCalledWith('team-1', expect.objectContaining({ since: 42 })) + expect(wrapper.findAllComponents({ name: 'NcRichText' }).map((component) => component.props('text'))).toEqual([ + 'First activity', + 'Older activity', + ]) + expect(wrapper.findAll('.team-activity__group')).toHaveLength(2) + expect(wrapper.find('.team-activity__more').exists()).toBe(false) + }) + + it('applies a debounced search only after the minimum term length', async () => { + vi.useFakeTimers() + fetchTeamActivities.mockResolvedValue({ activities: [] }) + const wrapper = mountView() + await flushPromises() + + const input = wrapper.get('.team-activity__search input') + await input.setValue('a') + expect(wrapper.text()).toContain('Enter at least {count} characters to search') + await vi.advanceTimersByTimeAsync(300) + await flushPromises() + expect(fetchTeamActivities).toHaveBeenLastCalledWith('team-1', expect.objectContaining({ search: undefined })) + + await input.setValue(' folders ') + await vi.advanceTimersByTimeAsync(300) + await flushPromises() + expect(fetchTeamActivities).toHaveBeenLastCalledWith('team-1', expect.objectContaining({ search: 'folders', since: undefined })) + vi.useRealTimers() + }) + + it('applies custom date inputs as Activity timestamps', async () => { + fetchTeamActivities.mockResolvedValue({ activities: [] }) + const wrapper = mountView() + await flushPromises() + + await wrapper.findAll('.nc-action-button').find((button) => button.text() === 'Custom range')!.trigger('click') + const [fromInput, toInput] = wrapper.findAll('input[type="date"]') + await fromInput.setValue('2026-09-01') + await toInput.setValue('2026-09-30') + await flushPromises() + + const from = new Date(2026, 8, 1) + from.setHours(0, 0, 0, 0) + const to = new Date(2026, 8, 30) + to.setHours(23, 59, 59, 999) + expect(fetchTeamActivities).toHaveBeenLastCalledWith('team-1', expect.objectContaining({ + from: Math.floor(from.getTime() / 1000), + to: Math.floor(to.getTime() / 1000), + })) + }) +}) diff --git a/src/teams/views/TeamActivityView.vue b/src/teams/views/TeamActivityView.vue new file mode 100644 index 000000000..54c458e6a --- /dev/null +++ b/src/teams/views/TeamActivityView.vue @@ -0,0 +1,752 @@ + + + + + + + diff --git a/tests/unit/lib/FederatedItems/MemberLevelTest.php b/tests/unit/lib/FederatedItems/MemberLevelTest.php new file mode 100644 index 000000000..8d7315b54 --- /dev/null +++ b/tests/unit/lib/FederatedItems/MemberLevelTest.php @@ -0,0 +1,49 @@ +createMock(MemberRequest::class); + $membershipService = $this->createMock(MembershipService::class); + $eventService = $this->createMock(EventService::class); + $item = new MemberLevel( + $memberRequest, + $membershipService, + $eventService, + $this->createMock(ConfigService::class), + ); + $circle = $this->createMock(Circle::class); + $member = (new Member())->setSingleId('bob')->setLevel(Member::LEVEL_MEMBER); + $event = (new FederatedEvent()) + ->setCircle($circle) + ->setMember($member) + ->setData(new SimpleDataStore(['level' => Member::LEVEL_MODERATOR])); + + $memberRequest->expects($this->once()) + ->method('updateLevel') + ->with($this->callback(static fn (Member $updated): bool => $updated->getLevel() === Member::LEVEL_MODERATOR)); + $membershipService->expects($this->once())->method('onUpdate')->with('bob'); + $eventService->expects($this->once())->method('memberLevelEditing')->with($event); + + $item->manage($event); + } +} diff --git a/tests/unit/lib/Service/ActivityServiceTest.php b/tests/unit/lib/Service/ActivityServiceTest.php new file mode 100644 index 000000000..74fe37218 --- /dev/null +++ b/tests/unit/lib/Service/ActivityServiceTest.php @@ -0,0 +1,186 @@ +activityManager = $this->createMock(IActivityManager::class); + $this->memberRequest = $this->createMock(MemberRequest::class); + $this->circleRequest = $this->createMock(CircleRequest::class); + $this->activityService = new ActivityService( + $this->activityManager, + $this->createMock(IUserManager::class), + $this->memberRequest, + $this->circleRequest, + $this->createMock(ConfigService::class), + ); + } + + private function createCircle(): Circle&MockObject { + $circle = $this->createMock(Circle::class); + $circle->method('getSingleId')->willReturn('team-single-id'); + $circle->method('getName')->willReturn('Design'); + $circle->method('getConfig')->willReturn(0); + $circle->method('getUrl')->willReturn(''); + + return $circle; + } + + public function testTeamActivityUsesTheResolvedActivityObjectId(): void { + $circle = $this->createCircle(); + $circle->method('isConfig')->willReturn(false); + $circle->method('hasInitiator')->willReturn(false); + + $user = $this->createMock(IUser::class); + $user->method('getUID')->willReturn('alice'); + $this->memberRequest->expects($this->once()) + ->method('getInheritedMembers') + ->with('team-single-id', false, 1) + ->willReturn([$user]); + $this->circleRequest->expects($this->once()) + ->method('getActivityObjectId') + ->with('team-single-id') + ->willReturn(42); + + $event = $this->createMock(IEvent::class); + $event->method('setApp')->willReturnSelf(); + $event->method('setType')->willReturnSelf(); + $event->expects($this->once()) + ->method('setObject') + ->with(Application::APP_ID, 42, 'Design') + ->willReturnSelf(); + $event->method('setSubject')->willReturnSelf(); + $event->method('setAffectedUser')->with('alice')->willReturnSelf(); + + $this->activityManager->expects($this->once()) + ->method('generateEvent') + ->willReturn($event); + $this->activityManager->expects($this->once()) + ->method('publish') + ->with($event); + + $this->activityService->onCircleDestruction($circle); + } + + public function testTeamActivityUsesTheInitiatorAsAuthor(): void { + $circle = $this->createCircle(); + $circle->method('isConfig')->willReturn(false); + $circle->method('hasInitiator')->willReturn(true); + + $initiator = $this->createMock(Member::class); + $initiator->method('getUserType')->willReturn(Member::TYPE_USER); + $initiator->method('getUserId')->willReturn('admin'); + $circle->method('getInitiator')->willReturn($initiator); + + $user = $this->createMock(IUser::class); + $user->method('getUID')->willReturn('alice'); + $this->memberRequest->method('getInheritedMembers')->willReturn([$user]); + + $event = $this->createMock(IEvent::class); + $event->method('setApp')->willReturnSelf(); + $event->method('setType')->willReturnSelf(); + $event->method('setObject')->willReturnSelf(); + $event->method('setSubject')->willReturnSelf(); + $event->method('setAffectedUser')->willReturnSelf(); + $event->expects($this->once())->method('setAuthor')->with('admin'); + + $this->activityManager->method('generateEvent')->willReturn($event); + $this->activityManager->expects($this->once())->method('publish')->with($event); + + $this->activityService->onCircleDestruction($circle); + } + + public function testTeamActivityPublishesMemberRoleChangesOnTheCircleObject(): void { + $circle = $this->createCircle(); + $circle->method('hasInitiator')->willReturn(false); + $member = $this->createMock(Member::class); + $member->method('getUserId')->willReturn('bob'); + $member->method('getDisplayName')->willReturn('Bob'); + $member->method('getUserType')->willReturn(Member::TYPE_USER); + $member->method('getLevel')->willReturn(Member::LEVEL_MEMBER); + $member->method('getStatus')->willReturn(Member::STATUS_MEMBER); + $member->method('getSingleId')->willReturn('bob-single-id'); + $moderator = $this->createMock(IUser::class); + $moderator->method('getUID')->willReturn('alice'); + $this->memberRequest->expects($this->once()) + ->method('getInheritedMembers') + ->with('team-single-id', false, Member::LEVEL_MODERATOR) + ->willReturn([$moderator]); + $this->circleRequest->expects($this->once()) + ->method('getActivityObjectId') + ->with('team-single-id') + ->willReturn(42); + $event = $this->createMock(IEvent::class); + $event->method('setApp')->with(Application::APP_ID)->willReturnSelf(); + $event->method('setType')->with('circles_as_moderator')->willReturnSelf(); + $event->expects($this->once())->method('setObject')->with(Application::APP_ID, 42, 'Design')->willReturnSelf(); + $event->expects($this->once())->method('setSubject')->with('member_level', [ + 'ver' => 2, + 'circle' => ['singleId' => 'team-single-id', 'name' => 'Design', 'config' => 0, 'url' => ''], + 'initiator' => null, + 'member' => ['userId' => 'bob', 'displayName' => 'Bob', 'type' => Member::TYPE_USER, 'level' => Member::LEVEL_MEMBER, 'status' => Member::STATUS_MEMBER], + 'level' => Member::LEVEL_MODERATOR, + ])->willReturnSelf(); + $event->expects($this->exactly(2))->method('setAffectedUser')->with($this->callback(static fn (string $userId): bool => in_array($userId, ['alice', 'bob'], true)))->willReturnSelf(); + $this->activityManager->expects($this->once())->method('generateEvent')->willReturn($event); + $this->activityManager->expects($this->exactly(2))->method('publish')->with($event); + + $this->activityService->onMemberLevel($circle, $member, Member::LEVEL_MODERATOR); + } + + public function testTeamActivityPublishesOwnerChangesToAllMembers(): void { + $circle = $this->createCircle(); + $circle->method('hasInitiator')->willReturn(false); + $member = $this->createMock(Member::class); + $member->method('getUserId')->willReturn('bob'); + $member->method('getDisplayName')->willReturn('Bob'); + $member->method('getUserType')->willReturn(Member::TYPE_USER); + $member->method('getLevel')->willReturn(Member::LEVEL_MEMBER); + $member->method('getStatus')->willReturn(Member::STATUS_MEMBER); + $member->method('getSingleId')->willReturn('bob-single-id'); + $this->memberRequest->expects($this->once())->method('getInheritedMembers')->with('team-single-id', false, Member::LEVEL_MEMBER)->willReturn([$member]); + $this->circleRequest->expects($this->once()) + ->method('getActivityObjectId') + ->with('team-single-id') + ->willReturn(42); + $event = $this->createMock(IEvent::class); + $event->method('setApp')->willReturnSelf(); + $event->method('setType')->with('circles_as_moderator')->willReturnSelf(); + $event->expects($this->once())->method('setObject')->with(Application::APP_ID, 42, 'Design')->willReturnSelf(); + $event->expects($this->once())->method('setSubject')->with('member_owner', $this->isType('array'))->willReturnSelf(); + $event->expects($this->once())->method('setAffectedUser')->with('bob')->willReturnSelf(); + $this->activityManager->expects($this->once())->method('generateEvent')->willReturn($event); + $this->activityManager->expects($this->once())->method('publish')->with($event); + + $this->activityService->onMemberLevel($circle, $member, Member::LEVEL_OWNER); + } + +} diff --git a/tests/unit/lib/Service/EventServiceTest.php b/tests/unit/lib/Service/EventServiceTest.php new file mode 100644 index 000000000..98845cc90 --- /dev/null +++ b/tests/unit/lib/Service/EventServiceTest.php @@ -0,0 +1,36 @@ +createMock(ActivityService::class); + $service = new EventService($this->createMock(IEventDispatcher::class), $activityService); + $circle = $this->createMock(Circle::class); + $event = (new FederatedEvent()) + ->setCircle($circle) + ->setData(new SimpleDataStore(['name' => 'New team title'])); + + $activityService->expects($this->once()) + ->method('onCircleEdited') + ->with($circle, 'name'); + + $service->circleEditing($event); + } + +} From da399ab0dfcc1c7bd523996e06a8fda1861f6b13 Mon Sep 17 00:00:00 2001 From: Stefan Lender Date: Mon, 12 Oct 2026 09:30:06 +0200 Subject: [PATCH 2/2] feat(teams): publish setting changes to activity Co-authored-by: Copilot GPT-5.6 Terra Signed-off-by: Stefan Lender --- lib/Activity/Provider.php | 1 + lib/Activity/ProviderParser.php | 3 +- lib/Activity/ProviderSubjectCircle.php | 85 +++++++++++++++++++ lib/FederatedItems/CircleConfig.php | 7 ++ lib/FederatedItems/CircleSetting.php | 3 + lib/Service/ActivityService.php | 81 ++++++++++++++++++ lib/Service/EventService.php | 9 ++ .../lib/FederatedItems/CircleSettingTest.php | 47 ++++++++++ .../unit/lib/Service/ActivityServiceTest.php | 47 ++++++++++ tests/unit/lib/Service/EventServiceTest.php | 23 +++++ 10 files changed, 305 insertions(+), 1 deletion(-) create mode 100644 tests/unit/lib/FederatedItems/CircleSettingTest.php diff --git a/lib/Activity/Provider.php b/lib/Activity/Provider.php index 0535e9724..ae4d6b0c4 100644 --- a/lib/Activity/Provider.php +++ b/lib/Activity/Provider.php @@ -113,6 +113,7 @@ private function parseAsMember( $this->parserCircle->parseSubjectCircleCreate($event, $params); $this->parserCircle->parseSubjectCircleDelete($event, $params); $this->parserCircle->parseSubjectCircleEdit($event, $params); + $this->parserCircle->parseSubjectCircleSettingChanged($event, $params); $this->parseMemberAsMember($event, $params); $this->parseCircleMemberAsMember($event, $params); } diff --git a/lib/Activity/ProviderParser.php b/lib/Activity/ProviderParser.php index 404881a4f..55c93a220 100644 --- a/lib/Activity/ProviderParser.php +++ b/lib/Activity/ProviderParser.php @@ -28,11 +28,12 @@ protected function parseCircleEvent( array $params, string $ownEvent, string $othersEvent, + array $additionalData = [], ): void { $data = [ 'author' => $this->generateUserParameter($params['initiator'] ?? []), 'circle' => $this->generateCircleParameter($params['circle']) - ]; + ] + $additionalData; if ($this->isViewerTheAuthor($params['initiator'] ?? [], $this->activityManager->getCurrentUserId())) { $this->setSubject($event, $ownEvent, $data); diff --git a/lib/Activity/ProviderSubjectCircle.php b/lib/Activity/ProviderSubjectCircle.php index 719872a25..f1d474b63 100644 --- a/lib/Activity/ProviderSubjectCircle.php +++ b/lib/Activity/ProviderSubjectCircle.php @@ -10,9 +10,31 @@ namespace OCA\Circles\Activity; use OCA\Circles\Exceptions\FakeException; +use OCA\Circles\Model\Circle; +use OCA\Circles\Service\ConfigService; use OCP\Activity\IEvent; class ProviderSubjectCircle extends ProviderParser { + private const SETTING_TEAM_TAB_ORDER = 'teamsTabOrder'; + private const SETTING_PASSWORD_SINGLE = 'password_single'; + private const SETTING_PASSWORD_SINGLE_ENABLED = 'password_single_enabled'; + private const CONFIG_ACTIVITY_SUBJECTS = [ + 'config_open_enabled' => ['enabled', 'Anyone can request membership'], + 'config_open_disabled' => ['disabled', 'Anyone can request membership'], + 'config_invite_enabled' => ['enabled', 'Members need to accept invitation'], + 'config_invite_disabled' => ['disabled', 'Members need to accept invitation'], + 'config_request_enabled' => ['enabled', 'Memberships must be confirmed or accepted by a moderator'], + 'config_request_disabled' => ['disabled', 'Memberships must be confirmed or accepted by a moderator'], + 'config_friend_enabled' => ['enabled', 'Members can also invite'], + 'config_friend_disabled' => ['disabled', 'Members can also invite'], + 'config_root_enabled' => ['enabled', 'Prevent teams from being a member of another team'], + 'config_root_disabled' => ['disabled', 'Prevent teams from being a member of another team'], + 'config_federated_enabled' => ['enabled', 'Allow federated members'], + 'config_federated_disabled' => ['disabled', 'Allow federated members'], + 'config_visible_enabled' => ['enabled', 'Visible to everyone'], + 'config_visible_disabled' => ['disabled', 'Visible to everyone'], + ]; + public function parseSubjectCircleCreate(IEvent $event, array $params): void { if ($event->getSubject() !== 'circle_create') { return; @@ -87,4 +109,67 @@ public function parseSubjectCircleEdit(IEvent $event, array $params): void { throw new FakeException(); } + public function parseSubjectCircleSettingChanged(IEvent $event, array $params): void { + if ($event->getSubject() !== 'circle_setting_changed') { + return; + } + + $setting = (string)($params['setting'] ?? ''); + if (isset(self::CONFIG_ACTIVITY_SUBJECTS[$setting])) { + [$state, $label] = self::CONFIG_ACTIVITY_SUBJECTS[$setting]; + $data = [ + 'author' => $this->generateUserParameter($params['initiator'] ?? []), + 'circle' => $this->generateCircleParameter($params['circle']), + 'state' => $this->generateHighlightParameter($state), + 'setting' => $this->generateHighlightParameter($label), + ]; + if ($this->isViewerTheAuthor($params['initiator'] ?? [], $this->activityManager->getCurrentUserId())) { + $this->setSubject($event, $this->l10n->t('You {state} "{setting}" for {circle}'), $data); + } else { + $this->setSubject($event, $this->l10n->t('{author} {state} "{setting}" for {circle}'), $data); + } + + throw new FakeException(); + } + + [$ownEvent, $othersEvent] = $this->getSettingActivitySubjects($setting); + + $this->parseCircleEvent( + $event, $params, + $ownEvent, + $othersEvent, + ); + + throw new FakeException(); + } + + /** @return array{string, string} */ + private function getSettingActivitySubjects(string $setting): array { + return match ($setting) { + Circle::SETTING_TEAM_FOLDER_QUOTA => [ + $this->l10n->t('You changed the Team Folder quota of {circle}'), + $this->l10n->t('{author} changed the Team Folder quota of {circle}'), + ], + self::SETTING_TEAM_TAB_ORDER => [ + $this->l10n->t('You changed the navigation order of {circle}'), + $this->l10n->t('{author} changed the navigation order of {circle}'), + ], + ConfigService::MEMBERS_LIMIT => [ + $this->l10n->t('You changed the member limit of {circle}'), + $this->l10n->t('{author} changed the member limit of {circle}'), + ], + ConfigService::ENFORCE_PASSWORD, self::SETTING_PASSWORD_SINGLE_ENABLED => [ + $this->l10n->t('You changed the password protection of {circle}'), + $this->l10n->t('{author} changed the password protection of {circle}'), + ], + self::SETTING_PASSWORD_SINGLE => [ + $this->l10n->t('You changed the password of {circle}'), + $this->l10n->t('{author} changed the password of {circle}'), + ], + default => [ + $this->l10n->t('You changed the settings of {circle}'), + $this->l10n->t('{author} changed the settings of {circle}'), + ], + }; + } } diff --git a/lib/FederatedItems/CircleConfig.php b/lib/FederatedItems/CircleConfig.php index 3f0115193..9eddec14f 100644 --- a/lib/FederatedItems/CircleConfig.php +++ b/lib/FederatedItems/CircleConfig.php @@ -18,6 +18,7 @@ use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Helpers\MemberHelper; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Service\EventService; use OCA\Circles\Service\PermissionService; use OCA\Circles\Tools\Traits\TDeserialize; @@ -41,6 +42,7 @@ public function __construct( private CircleRequest $circleRequest, private PermissionService $permissionService, private ConfigService $configService, + private EventService $eventService, ) { } @@ -146,6 +148,11 @@ public function manage(FederatedEvent $event): void { // TODO: sync if it is to broadcast to Trusted RemoteInstance $this->circleRequest->updateConfig($circle); + $this->eventService->circleConfigChanged( + $circle, + $event->getCircle()->getConfig(), + $config, + ); } /** diff --git a/lib/FederatedItems/CircleSetting.php b/lib/FederatedItems/CircleSetting.php index a20f02c79..b9360647f 100644 --- a/lib/FederatedItems/CircleSetting.php +++ b/lib/FederatedItems/CircleSetting.php @@ -16,6 +16,7 @@ use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Helpers\MemberHelper; use OCA\Circles\Service\ConfigService; +use OCA\Circles\Service\EventService; use OCA\Circles\Service\ShareTokenService; use OCA\Circles\Tools\Traits\TDeserialize; @@ -29,6 +30,7 @@ public function __construct( private CircleRequest $circleRequest, private ShareTokenService $shareTokenService, private ConfigService $configService, + private EventService $eventService, ) { } @@ -91,6 +93,7 @@ public function manage(FederatedEvent $event): void { // TODO: sync if it is to broadcast to Trusted RemoteInstance $this->circleRequest->updateSettings($circle); + $this->eventService->circleSettingChanged($circle, $event->getParams()->g('setting')); // refresh share password (in case of static password changes) // only is password are enforced for this Circle diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php index d41a663af..436404a65 100644 --- a/lib/Service/ActivityService.php +++ b/lib/Service/ActivityService.php @@ -24,6 +24,35 @@ use UnhandledMatchError; class ActivityService { + private const SETTING_TEAM_TAB_ORDER = 'teamsTabOrder'; + private const SETTING_PASSWORD_SINGLE = 'password_single'; + private const SETTING_PASSWORD_SINGLE_ENABLED = 'password_single_enabled'; + private const ACTIVITY_CONFIGS = [ + Circle::CFG_OPEN => 'open', + Circle::CFG_INVITE => 'invite', + Circle::CFG_REQUEST => 'request', + Circle::CFG_FRIEND => 'friend', + Circle::CFG_ROOT => 'root', + Circle::CFG_FEDERATED => 'federated', + Circle::CFG_VISIBLE => 'visible', + ]; + private const ACTIVITY_CONFIG_SETTINGS = [ + 'config_open_enabled', + 'config_open_disabled', + 'config_invite_enabled', + 'config_invite_disabled', + 'config_request_enabled', + 'config_request_disabled', + 'config_friend_enabled', + 'config_friend_disabled', + 'config_root_enabled', + 'config_root_disabled', + 'config_federated_enabled', + 'config_federated_disabled', + 'config_visible_enabled', + 'config_visible_disabled', + ]; + public function __construct( private readonly IActivityManager $activityManager, private readonly IUserManager $userManager, @@ -110,6 +139,42 @@ public function onCircleEdited(Circle $circle, string $change): void { ); } + public function onCircleSetting(Circle $circle, string $setting): void { + if ($circle->isConfig(Circle::CFG_PERSONAL)) { + return; + } + + $event = $this->generateEvent('circles_as_member', $circle); + $event->setSubject( + 'circle_setting_changed', + [ + 'ver' => 2, + 'circle' => $this->shortenCircleData($circle), + 'initiator' => ($circle->hasInitiator() ? $this->shortenMemberData($circle->getInitiator()) : null), + 'setting' => $this->getActivitySetting($setting), + ] + ); + + $this->publishEvent( + $event, + $this->memberRequest->getInheritedMembers($circle->getSingleId(), false, Member::LEVEL_MEMBER) + ); + } + + public function onCircleConfigChanged(Circle $circle, int $previousConfig, int $newConfig): void { + $changedConfig = $previousConfig ^ $newConfig; + foreach (self::ACTIVITY_CONFIGS as $config => $setting) { + if (($changedConfig & $config) === 0) { + continue; + } + + $this->onCircleSetting( + $circle, + 'config_' . $setting . (($newConfig & $config) === 0 ? '_disabled' : '_enabled'), + ); + } + } + /** * @param Circle $circle * @param Member $member @@ -445,6 +510,22 @@ private function generateEvent(string $type, ?Circle $circle = null): IEvent { return $event; } + private function getActivitySetting(string $setting): string { + return in_array( + $setting, + [ + Circle::SETTING_TEAM_FOLDER_QUOTA, + self::SETTING_TEAM_TAB_ORDER, + ConfigService::MEMBERS_LIMIT, + ConfigService::ENFORCE_PASSWORD, + self::SETTING_PASSWORD_SINGLE, + self::SETTING_PASSWORD_SINGLE_ENABLED, + ...self::ACTIVITY_CONFIG_SETTINGS, + ], + true, + ) ? $setting : 'generic'; + } + /** * Publish the event to the users. * - if user is IUser, we get userId, diff --git a/lib/Service/EventService.php b/lib/Service/EventService.php index f8858e9a7..323ea3a46 100644 --- a/lib/Service/EventService.php +++ b/lib/Service/EventService.php @@ -30,6 +30,7 @@ use OCA\Circles\Events\PreparingCircleMemberEvent; use OCA\Circles\Events\RemovingCircleMemberEvent; use OCA\Circles\Events\RequestingCircleMemberEvent; +use OCA\Circles\Model\Circle; use OCA\Circles\Model\Federated\FederatedEvent; use OCA\Circles\Model\Membership; use OCA\Circles\Model\Mount; @@ -104,6 +105,14 @@ public function circleDestroyed(FederatedEvent $federatedEvent, array $results): $this->eventDispatcher->dispatchTyped($event); } + public function circleSettingChanged(Circle $circle, string $setting): void { + $this->activityService->onCircleSetting($circle, $setting); + } + + public function circleConfigChanged(Circle $circle, int $previousConfig, int $newConfig): void { + $this->activityService->onCircleConfigChanged($circle, $previousConfig, $newConfig); + } + /** * @param FederatedEvent $federatedEvent */ diff --git a/tests/unit/lib/FederatedItems/CircleSettingTest.php b/tests/unit/lib/FederatedItems/CircleSettingTest.php new file mode 100644 index 000000000..7ebbfd115 --- /dev/null +++ b/tests/unit/lib/FederatedItems/CircleSettingTest.php @@ -0,0 +1,47 @@ +createMock(CircleRequest::class); + $eventService = $this->createMock(EventService::class); + $item = new CircleSetting( + $circleRequest, + $this->createMock(ShareTokenService::class), + $this->createMock(ConfigService::class), + $eventService, + ); + $circle = (new Circle())->setSingleId('team-single-id'); + $event = (new FederatedEvent()) + ->setCircle($circle) + ->setParams(new SimpleDataStore(['setting' => Circle::SETTING_TEAM_FOLDER_QUOTA])) + ->setData(new SimpleDataStore(['settings' => [Circle::SETTING_TEAM_FOLDER_QUOTA => 1073741824]])); + + $circleRequest->expects($this->once()) + ->method('updateSettings') + ->with($this->callback(static fn (Circle $updated): bool => $updated->getSettings()[Circle::SETTING_TEAM_FOLDER_QUOTA] === 1073741824)); + $eventService->expects($this->once()) + ->method('circleSettingChanged') + ->with($this->callback(static fn (Circle $updated): bool => $updated->getSettings()[Circle::SETTING_TEAM_FOLDER_QUOTA] === 1073741824), Circle::SETTING_TEAM_FOLDER_QUOTA); + + $item->manage($event); + } +} diff --git a/tests/unit/lib/Service/ActivityServiceTest.php b/tests/unit/lib/Service/ActivityServiceTest.php index 74fe37218..fd5ed9d6a 100644 --- a/tests/unit/lib/Service/ActivityServiceTest.php +++ b/tests/unit/lib/Service/ActivityServiceTest.php @@ -183,4 +183,51 @@ public function testTeamActivityPublishesOwnerChangesToAllMembers(): void { $this->activityService->onMemberLevel($circle, $member, Member::LEVEL_OWNER); } + public function testTeamActivityPublishesVisibleSettingChanges(): void { + $circle = $this->createCircle(); + $circle->method('isConfig')->willReturn(false); + $circle->method('hasInitiator')->willReturn(false); + $user = $this->createMock(IUser::class); + $user->method('getUID')->willReturn('alice'); + $this->memberRequest->expects($this->once())->method('getInheritedMembers')->with('team-single-id', false, Member::LEVEL_MEMBER)->willReturn([$user]); + $this->circleRequest->expects($this->once()) + ->method('getActivityObjectId') + ->with('team-single-id') + ->willReturn(42); + $event = $this->createMock(IEvent::class); + $event->method('setApp')->willReturnSelf(); + $event->method('setType')->with('circles_as_member')->willReturnSelf(); + $event->method('setObject')->with(Application::APP_ID, 42, 'Design')->willReturnSelf(); + $event->expects($this->once())->method('setSubject')->with('circle_setting_changed', [ + 'ver' => 2, + 'circle' => ['singleId' => 'team-single-id', 'name' => 'Design', 'config' => 0, 'url' => ''], + 'initiator' => null, + 'setting' => Circle::SETTING_TEAM_FOLDER_QUOTA, + ])->willReturnSelf(); + $event->method('setAffectedUser')->with('alice')->willReturnSelf(); + $this->activityManager->expects($this->once())->method('generateEvent')->willReturn($event); + $this->activityManager->expects($this->once())->method('publish')->with($event); + + $this->activityService->onCircleSetting($circle, Circle::SETTING_TEAM_FOLDER_QUOTA); + } + + public function testTeamActivityPublishesUnlistedSettingChangesWithoutTheSettingName(): void { + $circle = $this->createCircle(); + $circle->method('isConfig')->willReturn(false); + $circle->method('hasInitiator')->willReturn(false); + $this->memberRequest->method('getInheritedMembers')->willReturn([]); + $event = $this->createMock(IEvent::class); + $event->method('setApp')->willReturnSelf(); + $event->method('setType')->willReturnSelf(); + $event->method('setObject')->willReturnSelf(); + $event->expects($this->once())->method('setSubject')->with('circle_setting_changed', [ + 'ver' => 2, + 'circle' => ['singleId' => 'team-single-id', 'name' => 'Design', 'config' => 0, 'url' => ''], + 'initiator' => null, + 'setting' => 'generic', + ])->willReturnSelf(); + $this->activityManager->expects($this->once())->method('generateEvent')->willReturn($event); + + $this->activityService->onCircleSetting($circle, Circle::SETTING_EXTERNAL_ID); + } } diff --git a/tests/unit/lib/Service/EventServiceTest.php b/tests/unit/lib/Service/EventServiceTest.php index 98845cc90..3c0e10cfd 100644 --- a/tests/unit/lib/Service/EventServiceTest.php +++ b/tests/unit/lib/Service/EventServiceTest.php @@ -33,4 +33,27 @@ public function testCircleEditingPublishesActivity(): void { $service->circleEditing($event); } + public function testCircleSettingChangedPublishesActivity(): void { + $activityService = $this->createMock(ActivityService::class); + $service = new EventService($this->createMock(IEventDispatcher::class), $activityService); + $circle = $this->createMock(Circle::class); + + $activityService->expects($this->once()) + ->method('onCircleSetting') + ->with($circle, Circle::SETTING_TEAM_FOLDER_QUOTA); + + $service->circleSettingChanged($circle, Circle::SETTING_TEAM_FOLDER_QUOTA); + } + + public function testCircleConfigChangedPublishesActivity(): void { + $activityService = $this->createMock(ActivityService::class); + $service = new EventService($this->createMock(IEventDispatcher::class), $activityService); + $circle = $this->createMock(Circle::class); + + $activityService->expects($this->once()) + ->method('onCircleConfigChanged') + ->with($circle, Circle::CFG_VISIBLE, Circle::CFG_VISIBLE | Circle::CFG_OPEN); + + $service->circleConfigChanged($circle, Circle::CFG_VISIBLE, Circle::CFG_VISIBLE | Circle::CFG_OPEN); + } }