frontend, api: Link to correct folder in dashboard events

Closes pschlan#212
Suban05 · Oct 26, 2023 · 7c56517 · 7c56517
1 parent 80e6808
commit 7c56517
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/api/apimethods/GetDashboard.php b/api/apimethods/GetDashboard.php
@@ -24,19 +24,31 @@ public function validateRequest($request) {
   }
 
   public function execute($request, $sessionToken, $language) {
+    $jobs = (new JobManager($sessionToken))->getJobs();
+    if (!$jobs) {
+      throw new InternalErrorAPIException();
+    }
+
+    $jobIdToFolderId = [];
+    foreach ($jobs->jobs as $job) {
+      $jobIdToFolderId[$job->jobId] = $job->folderId;
+    }
+
     $events = (new HistoryManager($sessionToken))->getUserEvents();
-    $events = array_map(function ($item) {
+    $events = array_map(function ($item) use ($jobIdToFolderId) {
       $event = new stdClass;
       $event->type = get_class($item);
       $event->details = $item;
+
+      if ($event->type === 'HistoryItem') {
+        $event->details->jobFolderId = isset($jobIdToFolderId[$item->jobId])
+          ? $jobIdToFolderId[$item->jobId]
+          : 0;
+      }
+
       return $event;
     }, $events);
 
-    $jobs = (new JobManager($sessionToken))->getJobs();
-    if (!$jobs) {
-      throw new InternalErrorAPIException();
-    }
-
     $userProfile = (new UserManager($sessionToken))->getProfile();
 
     $result = (object)[

diff --git a/frontend/src/components/dashboard/Dashboard.jsx b/frontend/src/components/dashboard/Dashboard.jsx
@@ -152,7 +152,7 @@ export default function Dashboard() {
           size='small'
           startIcon={<DetailsIcon />}
           className={classes.actionButton}
-          onClick={() => history.push('/jobs/' + event.details.jobId + '/history')}
+          onClick={() => history.push('/jobs' + (event.details.jobFolderId === 0 ? '' : '/folders/' + event.details.jobFolderId) + '/' + event.details.jobId + '/history')}
           >
           {t('common.details')}
         </Button>