Refine wording, remove duplicated TaskDetailsBase

Signed-off-by: Radoslaw Szwajkowski <[email protected]>
konveyor · Jun 25, 2024 · 501792e · 501792e
1 parent 0df63c7
commit 501792e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 96 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -55,7 +55,7 @@
     "selectNone": "Select none",
     "selectPage": "Select page",
     "submitReview": "Submit review",
-    "taskDetails": "Task details",
+    "taskDetails": "Task {{taskId}}",
     "unlink": "Unlink",
     "view": "View",
     "viewErrorReport": "View error report",

diff --git a/client/src/app/pages/applications/analysis-details/AnalysisDetails.tsx b/client/src/app/pages/applications/analysis-details/AnalysisDetails.tsx
@@ -6,7 +6,7 @@ import { AnalysisDetailsAttachmentRoute, Paths } from "@app/Paths";
 import { formatPath } from "@app/utils/utils";
 
 import "@app/components/simple-document-viewer/SimpleDocumentViewer.css";
-import { TaskDetailsBase } from "@app/pages/tasks/TaskDetails";
+import { TaskDetailsBase } from "@app/pages/tasks/TaskDetailsBase";
 import { useFetchApplicationById } from "@app/queries/applications";
 
 export const AnalysisDetails = () => {

diff --git a/client/src/app/pages/tasks/TaskDetails.tsx b/client/src/app/pages/tasks/TaskDetails.tsx
@@ -1,101 +1,11 @@
 import React from "react";
-import { useHistory, useLocation, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 
-import { PageSection } from "@patternfly/react-core";
-
 import { Paths, TaskDetailsAttachmentRoute } from "@app/Paths";
-import { PageHeader, PageHeaderProps } from "@app/components/PageHeader";
-import {
-  DocumentId,
-  SimpleDocumentViewer,
-} from "@app/components/simple-document-viewer";
-import { useFetchTaskByID } from "@app/queries/tasks";
 import "@app/components/simple-document-viewer/SimpleDocumentViewer.css";
 import { formatPath } from "@app/utils/utils";
-
-export const TaskDetailsBase: React.FC<{
-  breadcrumbs: PageHeaderProps["breadcrumbs"];
-  formatTitle: (taskName: string) => string;
-  detailsPath: string;
-  formatAttachmentPath: (attachmentId: number | string) => string;
-  taskId: number;
-  attachmentId?: string;
-}> = ({
-  breadcrumbs,
-  formatTitle,
-  detailsPath,
-  formatAttachmentPath,
-  taskId,
-  attachmentId,
-}) => {
-  const { t } = useTranslation();
-
-  const { search } = useLocation();
-  const hasMergedParam = new URLSearchParams(search).has("merged");
-
-  const history = useHistory();
-  const onDocumentChange = (documentId: DocumentId) =>
-    typeof documentId === "number"
-      ? history.push(formatAttachmentPath(documentId))
-      : history.push({
-          pathname: detailsPath,
-          search: documentId === "MERGED_VIEW" ? "?merged=true" : undefined,
-        });
-
-  const { task } = useFetchTaskByID(taskId);
-
-  const taskName: string = task?.name ?? t("terms.unknown");
-  const attachmentName = task?.attached?.find(
-    ({ id }) => String(id) === attachmentId
-  )?.name;
-  const resolvedAttachmentId = attachmentName
-    ? Number(attachmentId)
-    : undefined;
-  const resolvedLogMode = hasMergedParam ? "MERGED_VIEW" : "LOG_VIEW";
-
-  return (
-    <>
-      <PageSection variant="light">
-        <PageHeader
-          title={formatTitle(taskName)}
-          breadcrumbs={[
-            ...breadcrumbs,
-            ...(attachmentName && attachmentId
-              ? [
-                  {
-                    title: t("terms.attachments"),
-                  },
-                  {
-                    title: attachmentName,
-                    path: formatAttachmentPath(attachmentId),
-                  },
-                ]
-              : []),
-          ]}
-        />
-      </PageSection>
-      <PageSection>
-        <div
-          style={{
-            backgroundColor: "var(--pf-v5-global--BackgroundColor--100)",
-          }}
-          className="simple-task-viewer-container"
-        >
-          <SimpleDocumentViewer
-            // force re-creating viewer via keys
-            key={`${task?.id}/${task?.attached?.length}`}
-            taskId={task ? taskId : undefined}
-            documentId={resolvedAttachmentId || resolvedLogMode}
-            attachments={task?.attached ?? []}
-            onDocumentChange={onDocumentChange}
-            height="full"
-          />
-        </div>
-      </PageSection>
-    </>
-  );
-};
+import { TaskDetailsBase } from "./TaskDetailsBase";
 
 export const TaskDetails = () => {
   const { t } = useTranslation();
@@ -109,12 +19,12 @@ export const TaskDetails = () => {
           path: Paths.tasks,
         },
         {
-          title: t("actions.taskDetails"),
+          title: t("actions.taskDetails", { taskId }),
           path: detailsPath,
         },
       ]}
       detailsPath={detailsPath}
-      formatTitle={(taskName) => `Details for ${taskName}`}
+      formatTitle={(taskName) => `Task details for task ${taskId}, ${taskName}`}
       formatAttachmentPath={(attachmentId) =>
         formatPath(Paths.taskDetailsAttachment, {
           taskId,