Update breadcrumbs for improved navigation

Signed-off-by: EstyBiton <[email protected]>
konveyor · Oct 8, 2024 · 48565da · 48565da
1 parent 7fc6cbb
commit 48565da
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/client/src/app/Paths.ts b/client/src/app/Paths.ts
@@ -42,9 +42,9 @@ export const DevPaths = {
   dependencies: "/dependencies",
   tasks: "/tasks",
   taskDetails: "/tasks/:taskId",
-  //bread
-  applicationsTabTaskDetails: "/applications/:taskId",
-  //
+  /*bread
+   applicationsTabTaskDetails: "/applications/:taskId",
+  */
   taskDetailsAttachment: "/tasks/:taskId/attachments/:attachmentId",
 } as const;
 

diff --git a/client/src/app/hooks/table-controls/types.ts b/client/src/app/hooks/table-controls/types.ts
@@ -58,6 +58,7 @@ import { IColumnState } from "./column/useColumnState";
 export type TableFeature =
   | "filter"
   | "sort"
+  | "tabKey"
   | "pagination"
   | "selection"
   | "expansion"

diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -330,6 +330,7 @@ export const ApplicationsTable: React.FC = () => {
     isActiveItemEnabled: true,
     persistTo: {
       activeItem: "urlParams",
+      tabKey: "urlParams",
       filter: "urlParams",
       pagination: "sessionStorage",
       sort: "sessionStorage",

diff --git a/client/src/app/pages/tasks/TaskDetails.tsx b/client/src/app/pages/tasks/TaskDetails.tsx
@@ -21,30 +21,29 @@ const { application } = useFetchApplicationById(applicationId);
 
 export const TaskDetails = (isFApplication: TaskActionColumnProps) => {
   const { t } = useTranslation();
-  //bread
+  /*bread*/
   const appName: string = application?.name ?? t("terms.unknown");
 
   const { taskId, attachmentId } = useParams<TaskDetailsAttachmentRoute>();
-  const detailsPath = isFApplication
-    ? formatPath(Paths.applicationsTabTaskDetails, { taskId })
-    : formatPath(Paths.taskDetails, { taskId });
+  const detailsPath = formatPath(Paths.taskDetails, { taskId });
   return (
     <TaskDetailsBase
       breadcrumbs={[
         {
           title: t(isFApplication ? "terms.applications" : "terms.tasks"),
           path: isFApplication ? Paths.applications : Paths.tasks,
         },
-
-        {
-          title: appName,
-          path: `${Paths.applications}/?activeItem=${applicationId}&TabKey=${TabKey.Tasks}`,
-        },
+        isFApplication
+          ? {
+              title: appName,
+              path: `${Paths.applications}/?activeItem=${applicationId}&tabKey=${TabKey.Tasks}`,
+            }
+          : null,
         {
           title: t("titles.taskWithId", { taskId }),
           path: detailsPath,
         },
-      ]}
+      ].filter(Boolean)}
       detailsPath={detailsPath}
       formatTitle={(taskName) => `Task details for task ${taskId}, ${taskName}`}
       formatAttachmentPath={(attachmentId) =>