Fix generated fronted urls

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · May 29, 2020 · 6910ba9 · 6910ba9
1 parent 30683fd
commit 6910ba9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
@@ -357,6 +357,6 @@ private function parseParamForChanges($subjectParams, $params, $event) {
 	}
 
 	public function deckUrl($endpoint) {
-		return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#!' . $endpoint;
+		return $this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#' . $endpoint;
 	}
 }
diff --git a/lib/Collaboration/Resources/ResourceProvider.php b/lib/Collaboration/Resources/ResourceProvider.php
@@ -70,7 +70,7 @@ public function getType(): string {
 	 */
 	public function getResourceRichObject(IResource $resource): array {
 		$board = $this->getBoard($resource);
-		$link = \OC::$server->getURLGenerator()->linkToRoute('deck.page.index') . '#!/board/' . $resource->getId();
+		$link = \OC::$server->getURLGenerator()->linkToRoute('deck.page.index') . '#/board/' . $resource->getId();
 
 		return [
 			'type' => self::RESOURCE_TYPE,

diff --git a/lib/Collaboration/Resources/ResourceProviderCard.php b/lib/Collaboration/Resources/ResourceProviderCard.php
@@ -90,7 +90,7 @@ public function getResourceRichObject(IResource $resource): array {
 			throw new ResourceException('No unique card found for resource, this should never happen');
 		}
 
-		$link = $this->urlGenerator->linkToRoute('deck.page.index') . '#/board/' . $board->getId() . '/cards/' . $resource->getId();
+		$link = $this->urlGenerator->linkToRoute('deck.page.index') . '#/board/' . $board->getId() . '/card/' . $resource->getId();
 
 		return [
 			'type' => self::RESOURCE_TYPE,

diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -115,15 +115,15 @@ public function prepare(INotification $notification, string $languageCode): INot
 						]
 					]
 				);
-				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
+				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/card/' . $cardId . '');
 				break;
 			case 'card-overdue':
 				$cardId = $notification->getObjectId();
 				$boardId = $this->cardMapper->findBoardId($cardId);
 				$notification->setParsedSubject(
 					(string) $l->t('The card "%s" on "%s" has reached its due date.', $params)
 				);
-				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
+				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/card/' . $cardId . '');
 				break;
 			case 'card-comment-mentioned':
 				$cardId = $notification->getObjectId();
@@ -150,7 +150,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 				if ($notification->getMessage() === '{message}') {
 					$notification->setParsedMessage($notification->getMessageParameters()['message']);
 				}
-				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/card/' . $cardId . '');
+				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/card/' . $cardId . '');
 				break;
 			case 'board-shared':
 				$boardId = $notification->getObjectId();
@@ -173,7 +173,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 						]
 					]
 				);
-				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#!/board/' . $boardId . '/');
+				$notification->setLink($this->url->linkToRouteAbsolute('deck.page.index') . '#/board/' . $boardId . '/');
 				break;
 		}
 		return $notification;

diff --git a/lib/Provider/DeckProvider.php b/lib/Provider/DeckProvider.php
@@ -253,7 +253,7 @@ public function improveSearchResult(ISearchResult $searchResult) {
 			try {
 				$board =
 					$this->fullTextSearchService->getBoardFromCardId((int)$document->getId());
-				$path = '#!/board/' . $board->getId() . '//card/' . $document->getId();
+				$path = '#/board/' . $board->getId() . '/card/' . $document->getId();
 				$document->setLink($this->urlGenerator->linkToRoute('deck.page.index') . $path);
 			} catch (DoesNotExistException $e) {
 			} catch (MultipleObjectsReturnedException $e) {

diff --git a/tests/unit/Activity/DeckProviderTest.php b/tests/unit/Activity/DeckProviderTest.php
@@ -151,7 +151,7 @@ public function testDeckUrl() {
 			->with('deck.page.index')
 			->willReturn('http://localhost/index.php/apps/deck/');
 		$this->assertEquals(
-			'http://localhost/index.php/apps/deck/#!board/1/card/1',
+			'http://localhost/index.php/apps/deck/#board/1/card/1',
 			$this->provider->deckUrl('board/1/card/1')
 		);
 	}
@@ -186,7 +186,7 @@ public function testParseObjectTypeBoard() {
 				'type' => 'highlight',
 				'id' => 1,
 				'name' => 'Board',
-				'link' => '#!/board/1',
+				'link' => '#/board/1',
 			],
 			'user' => [
 				'type' => 'user',
@@ -303,7 +303,7 @@ public function testParseParamForBoard() {
 				'type' => 'highlight',
 				'id' => 1,
 				'name' => 'Board name',
-				'link' => '#!/board/1/',
+				'link' => '#/board/1/',
 			],
 		];
 		$actual = $this->invokePrivate($this->provider, 'parseParamForBoard', ['board', $subjectParams, $params]);