fix links from integrations to reports

Rello · Dec 16, 2024 · 414229c · 414229c
1 parent dc7e92f
commit 414229c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### FIXED
 - import data from file
+- fix links from integrations to reports
 
 ## 5.2.0 - 2024-12-08
 ### Added

diff --git a/lib/Activity/Provider.php b/lib/Activity/Provider.php
@@ -126,6 +126,6 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
 	}
 
 	public function Url($endpoint) {
-		return $this->urlGenerator->linkToRouteAbsolute('analytics.page.index') . '#/r/' . $endpoint;
+		return $this->urlGenerator->linkToRouteAbsolute('analytics.page.report') . 'r/' . $endpoint;
 	}
 }
diff --git a/lib/ContextChat/ContentProvider.php b/lib/ContextChat/ContentProvider.php
@@ -63,7 +63,7 @@ public function getAppId(): string {
 	 * @since 1.1.0
 	 */
 	public function getItemUrl(string $id): string {
-		return $this->urlGenerator->linkToRouteAbsolute('analytics.page.index') . '#/r/' . $id;
+		return $this->urlGenerator->linkToRouteAbsolute('analytics.page.report') . 'r/' . $id;
 	}
 
 	/**

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -170,7 +170,7 @@ public function indexPublic($token, string $password = '')
         if (empty($share)) {
             // Dataset not shared or wrong token
             return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', [
-                'redirect_url' => $this->urlGenerator->linkToRoute($this->appName . '.page.index', ['token' => $token]),
+                'redirect_url' => $this->urlGenerator->linkToRoute($this->appName . '.page.report', ['token' => $token]),
             ]));
         } else {
             if ($share['password'] !== null) {
@@ -207,7 +207,7 @@ public function indexPublicMin($token, string $password = '')
         if (empty($share)) {
             // Dataset not shared or wrong token
             return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', [
-                'redirect_url' => $this->urlGenerator->linkToRoute($this->appName . '.page.index', ['token' => $token]),
+                'redirect_url' => $this->urlGenerator->linkToRoute($this->appName . '.page.report', ['token' => $token]),
             ]));
         } else {
             if ($share['password'] !== null) {

diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -89,7 +89,7 @@ public function prepare(INotification $notification, string $languageCode): INot
         switch ($notification->getObjectType()) {
             case NotificationManager::SUBJECT_THRESHOLD:
                 $parsedSubject = $l->t("Report '{report}': {subject} reached the threshold of {rule} {value}");
-                $link = $this->urlGenerator->linkToRouteAbsolute('analytics.page.index') . '#/r/' . $notification->getObjectId();
+                $link = $this->urlGenerator->linkToRouteAbsolute('analytics.page.report') . 'r/' . $notification->getObjectId();
 
                 $notification->setRichSubject(
                     $parsedSubject,
@@ -121,7 +121,7 @@ public function prepare(INotification $notification, string $languageCode): INot
                 break;
             case NotificationManager::DATALOAD_ERROR:
                 $parsedSubject = $l->t("Error during data load \"{dataloadName}\" for data set \"{datasetName}\"" );
-                $link = $this->urlGenerator->linkToRouteAbsolute('analytics.page.index') . 'a/#/r/' . $notification->getObjectId();
+                $link = $this->urlGenerator->linkToRouteAbsolute('analytics.page.advanced') . 'd/' . $notification->getObjectId();
 
                 $notification->setRichSubject(
                     $parsedSubject,
@@ -143,7 +143,7 @@ public function prepare(INotification $notification, string $languageCode): INot
                 break;
             default: // legacy due to switch to subject field filled with an id for notification removal
                 //$parsedSubject = $l->t("Report '{report}': {subject} reached the threshold of {rule} {value}");
-                //$link = $this->urlGenerator->linkToRouteAbsolute('analytics.page.index') . '#/r/' . $notification->getObjectId();
+                //$link = $this->urlGenerator->linkToRouteAbsolute('analytics.page.report') . 'r/' . $notification->getObjectId();
         }
 
 

diff --git a/lib/Search/SearchProvider.php b/lib/Search/SearchProvider.php
@@ -61,7 +61,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult
                 $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('analytics', 'app-dark.svg')),
                 $dataset['name'],
                 '',
-                $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('analytics.page.index') . '#/r/' . $dataset['id']),
+                $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('analytics.page.report') . 'r/' . $dataset['id']),
                 ''
             );
         }