Update popover paths breadcrumbs display application page

Signed-off-by: EstyBiton <esty.b.5673@gmail.com>
konveyor · Nov 4, 2024 · a7fee8b · a7fee8b
1 parent 033323d
commit a7fee8b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/client/src/app/Paths.ts b/client/src/app/Paths.ts
@@ -4,6 +4,7 @@ export const DevPaths = {
   applicationsAnalysisDetails:
     "/applications/:applicationId/analysis-details/:taskId",
   applicationsTaskDetails: "/applications/:applicationId/tasks/:taskId",
+  applicationPopoverTasks: "/applications/tasks/:taskId",
   applicationsAnalysisDetailsAttachment:
     "/applications/:applicationId/analysis-details/:taskId/attachments/:attachmentId",
   applicationsAnalysisTab: "/applications/analysis-tab",

diff --git a/client/src/app/Routes.tsx b/client/src/app/Routes.tsx
@@ -90,6 +90,11 @@ export const devRoutes: IRoute<DevPathValues>[] = [
     comp: TaskDetails,
     exact: true,
   },
+  {
+    path: Paths.applicationPopoverTasks,
+    comp: TaskDetails,
+    exact: true,
+  },
   {
     path: Paths.applicationsAnalysisDetailsAttachment,
     comp: AnalysisDetails,

diff --git a/client/src/app/pages/applications/applications-table/components/column-application-name.tsx b/client/src/app/pages/applications/applications-table/components/column-application-name.tsx
@@ -97,7 +97,7 @@ const linkToTasks = (applicationName: string) => {
 };
 
 const linkToDetails = (task: TaskDashboard) => {
-  return formatPath(Paths.taskDetails, {
+  return formatPath(Paths.applicationPopoverTasks, {
     taskId: task.id,
   });
 };

diff --git a/client/src/app/pages/tasks/TaskDetails.tsx b/client/src/app/pages/tasks/TaskDetails.tsx
@@ -14,6 +14,9 @@ export const TaskDetails = () => {
     useParams<TaskDetailsAttachmentRoute>();
   const currentPath = window.location.pathname;
   const isFromApplication = currentPath.includes("application") ? true : false;
+  const isContainApplicationId = currentPath.includes(applicationId)
+    ? true
+    : false;
   const { application } = useFetchApplicationById(applicationId);
 
   const appName: string = application?.name ?? t("terms.unknown");
@@ -32,7 +35,7 @@ export const TaskDetails = () => {
           title: t(isFromApplication ? "terms.applications" : "terms.tasks"),
           path: isFromApplication ? Paths.applications : Paths.tasks,
         },
-        isFromApplication
+        isFromApplication && isContainApplicationId
           ? {
               title: appName,
               path: `${Paths.applications}/?activeItem=${applicationId}`,