Merge pull request nextcloud#52410 from nextcloud/fix/caldav/use-direct-route-event-activity

fix(caldav): use direct.edit route in event activities

Author: st3iny

apps/dav/lib/CalDAV/Activity/Provider/Event.php

@@ -78,14 +78,9 @@ protected function generateObjectParameter(array $eventData, string $affectedUse
 					//       as seen from the affected user.
 					$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
 				}
-				$link = [
-					'view' => 'dayGridMonth',
-					'timeRange' => 'now',
-					'mode' => 'sidebar',
+				$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
 					'objectId' => $objectId,
-					'recurrenceId' => 'next'
-				];
-				$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexview.timerange.edit', $link);
+				]);
 			} catch (\Exception $error) {
 				// Do nothing
 			}

apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php

@@ -75,11 +75,7 @@ public function testGenerateObjectParameter(int $id, string $name, ?array $link,
 		if ($link) {
 			$affectedUser = $link['owner'];
 			$generatedLink = [
-				'view' => 'dayGridMonth',
-				'timeRange' => 'now',
-				'mode' => 'sidebar',
 				'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
-				'recurrenceId' => 'next'
 			];
 			$this->appManager->expects($this->once())
 				->method('isEnabledForUser')
@@ -90,7 +86,7 @@ public function testGenerateObjectParameter(int $id, string $name, ?array $link,
 					->method('getWebroot');
 				$this->url->expects($this->once())
 					->method('linkToRouteAbsolute')
-					->with('calendar.view.indexview.timerange.edit', $generatedLink)
+					->with('calendar.view.indexdirect.edit', $generatedLink)
 					->willReturn('fullLink');
 			}
 		}
@@ -159,11 +155,7 @@ public static function generateObjectParameterLinkEncodingDataProvider(): array
 	 */
 	public function testGenerateObjectParameterLinkEncoding(array $link, string $objectId): void {
 		$generatedLink = [
-			'view' => 'dayGridMonth',
-			'timeRange' => 'now',
-			'mode' => 'sidebar',
 			'objectId' => $objectId,
-			'recurrenceId' => 'next'
 		];
 		$this->appManager->expects($this->once())
 			->method('isEnabledForUser')
@@ -173,7 +165,7 @@ public function testGenerateObjectParameterLinkEncoding(array $link, string $obj
 			->method('getWebroot');
 		$this->url->expects($this->once())
 			->method('linkToRouteAbsolute')
-			->with('calendar.view.indexview.timerange.edit', $generatedLink)
+			->with('calendar.view.indexdirect.edit', $generatedLink)
 			->willReturn('fullLink');
 		$objectParameter = ['id' => 42, 'name' => 'calendar', 'link' => $link];
 		$result = [