HPCC-31030 ECL Watch v9 show FileAccessCost on DFU WU details

Signed-off-by: Jeremy Clements <[email protected]>
hpcc-systems · Jan 9, 2024 · c262c7f · c262c7f
1 parent 6f1f5a6
commit c262c7f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/esp/src/src-react/components/DFUWorkunitDetails.tsx b/esp/src/src-react/components/DFUWorkunitDetails.tsx
@@ -4,6 +4,7 @@ import { scopedLogger } from "@hpcc-js/util";
 import { SizeMe } from "react-sizeme";
 import nlsHPCC from "src/nlsHPCC";
 import * as FileSpray from "src/FileSpray";
+import { formatCost } from "src/Session";
 import { useConfirm } from "../hooks/confirm";
 import { useDfuWorkunit } from "../hooks/workunit";
 import { pivotItemStyle } from "../layouts/pivot";
@@ -213,6 +214,7 @@ export const DFUWorkunitDetails: React.FunctionComponent<DFUWorkunitDetailsProps
                         "protected": { label: nlsHPCC.Protected, type: "checkbox", value: _protected },
                         "command": { label: nlsHPCC.Command, type: "string", value: FileSpray.CommandMessages[workunit?.Command], readonly: true },
                         "state": { label: nlsHPCC.State, type: "string", value: FileSpray.States[workunit?.State], readonly: true },
+                        "accessCost": { label: nlsHPCC.FileAccessCost, type: "string", value: `${formatCost(workunit?.FileAccessCost ?? 0)}`, readonly: true },
                         "timeStarted": { label: nlsHPCC.TimeStarted, type: "string", value: workunit?.TimeStarted, readonly: true },
                         "secondsLeft": { label: nlsHPCC.SecondsRemaining, type: "number", value: workunit?.SecsLeft, readonly: true },
                         "timeStopped": { label: nlsHPCC.TimeStopped, type: "string", value: workunit?.TimeStopped, readonly: true },

diff --git a/esp/src/src-react/components/Scopes.tsx b/esp/src/src-react/components/Scopes.tsx
@@ -7,7 +7,6 @@ import { formatCost } from "src/Session";
 import * as Utility from "src/Utility";
 import nlsHPCC from "src/nlsHPCC";
 import { useConfirm } from "../hooks/confirm";
-import { useBuildInfo } from "../hooks/platform";
 import { useUserTheme } from "../hooks/theme";
 import { useMyAccount } from "../hooks/user";
 import { HolyGrail } from "../layouts/HolyGrail";
@@ -101,7 +100,6 @@ export const Scopes: React.FunctionComponent<ScopesProps> = ({
     const { currentUser } = useMyAccount();
     const [viewByScope, setViewByScope] = React.useState(true);
     const [uiState, setUIState] = React.useState({ ...defaultUIState });
-    const [, { currencyCode }] = useBuildInfo();
     const {
         selection, setSelection,
         setTotal,
@@ -197,14 +195,14 @@ export const Scopes: React.FunctionComponent<ScopesProps> = ({
             Modified: { label: nlsHPCC.ModifiedUTCGMT, width: 162 },
             AtRestCost: {
                 label: nlsHPCC.FileCostAtRest, width: 100,
-                formatter: (cost, row) => `${formatCost(cost ?? 0)} (${currencyCode || "$"})`
+                formatter: (cost, row) => `${formatCost(cost ?? 0)}`
             },
             AccessCost: {
                 label: nlsHPCC.FileAccessCost, width: 100,
-                formatter: (cost, row) => `${formatCost(cost ?? 0)} (${currencyCode || "$"})`
+                formatter: (cost, row) => `${formatCost(cost ?? 0)}`
             }
         };
-    }, [currencyCode, scopePath]);
+    }, [scopePath]);
 
     const [DeleteConfirm, setShowDeleteConfirm] = useConfirm({
         title: nlsHPCC.Delete,