diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index a4de299d5a..6244961e03 100644 --- a/client/public/locales/en/translation.json +++ b/client/public/locales/en/translation.json @@ -326,6 +326,7 @@ "details": "Details", "displayName": "Display name", "effort": "Effort", + "totalEffort": "Total Effort", "effortEstimate": "Effort estimate", "email": "Email", "error": "Error", diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx index 51f2cefe11..ea30554b43 100644 --- a/client/src/app/pages/applications/applications-table/applications-table.tsx +++ b/client/src/app/pages/applications/applications-table/applications-table.tsx @@ -15,6 +15,7 @@ import { DropdownItem, Modal, Tooltip, + Text, } from "@patternfly/react-core"; import { PencilAltIcon, TagIcon } from "@patternfly/react-icons"; import { @@ -109,6 +110,8 @@ import { useFetchArchetypes } from "@app/queries/archetypes"; import { ApplicationFormModal } from "../components/application-form"; import { ManageColumnsToolbar } from "./components/manage-columns-toolbar"; +import { QuestionCircleIcon } from "@patternfly/react-icons"; + export const ApplicationsTable: React.FC = () => { const { t } = useTranslation(); const history = useHistory(); @@ -845,9 +848,35 @@ export const ApplicationsTable: React.FC = () => { )} {getColumnVisibility("effort") && ( - + +
+
+ Effort +
+
+ + + This column shows the total application effort. + + + } + position="right" + > +
+ +
+
+
+
+ )} - diff --git a/client/src/app/pages/issues/affected-applications/affected-applications.tsx b/client/src/app/pages/issues/affected-applications/affected-applications.tsx index c0db18e0fd..e861b31396 100644 --- a/client/src/app/pages/issues/affected-applications/affected-applications.tsx +++ b/client/src/app/pages/issues/affected-applications/affected-applications.tsx @@ -9,6 +9,7 @@ import { Toolbar, ToolbarContent, ToolbarItem, + Tooltip, } from "@patternfly/react-core"; import { useTranslation } from "react-i18next"; import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table"; @@ -36,6 +37,7 @@ import { } from "../helpers"; import { IssueDetailDrawer } from "../issue-detail-drawer"; import { TablePersistenceKeyPrefix } from "@app/Constants"; +import { QuestionCircleIcon } from "@patternfly/react-icons"; interface IAffectedApplicationsRouteParams { ruleset: string; @@ -60,7 +62,7 @@ export const AffectedApplications: React.FC = () => { name: "Name", description: "Description", businessService: "Business service", - effort: "Total Effort", + effort: "Effort", incidents: "Incidents", }, isFilterEnabled: true, @@ -181,7 +183,35 @@ export const AffectedApplications: React.FC = () => { - + +
+
+ Effort +
+
+ + + This column shows the total calculated effort + for all incidents related to this file. + + + } + position="right" + > +
+ +
+
+
+
+ diff --git a/client/src/app/pages/issues/issues-table.tsx b/client/src/app/pages/issues/issues-table.tsx index 9e831c3e3a..e4dbbb9eb7 100644 --- a/client/src/app/pages/issues/issues-table.tsx +++ b/client/src/app/pages/issues/issues-table.tsx @@ -70,6 +70,7 @@ import { AffectedAppsLink } from "./affected-apps-link"; import { ConditionalTooltip } from "@app/components/ConditionalTooltip"; import { IssueDetailDrawer } from "./issue-detail-drawer"; import { IssueDescriptionAndLinks } from "./components/issue-description-and-links"; +import { QuestionCircleIcon } from "@patternfly/react-icons"; export interface IIssuesTableProps { mode: "allIssues" | "singleApp"; @@ -328,7 +329,33 @@ export const IssuesTable: React.FC = ({ mode }) => { - + +
+
+ Effort +
+
+ + + This column shows the effort weight for a single + issue incident. + + + } + position="right" + > +
+ +
+
+
+
+