From d9e85310c7b3b456d68dcb7099f0855f8465d94d Mon Sep 17 00:00:00 2001
From: Gordon Smith <GordonJSmith@gmail.com>
Date: Mon, 29 Apr 2024 18:05:33 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/candidate-9.4.x' into
 candidate-9.6.x

Fix merge conflict

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
---
 esp/src/src-react/components/InfoGrid.tsx        | 2 +-
 esp/src/src-react/components/WorkunitSummary.tsx | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esp/src/src-react/components/InfoGrid.tsx b/esp/src/src-react/components/InfoGrid.tsx
index c8be1da59b0..143cbf1be48 100644
--- a/esp/src/src-react/components/InfoGrid.tsx
+++ b/esp/src/src-react/components/InfoGrid.tsx
@@ -80,7 +80,7 @@ export const InfoGrid: React.FunctionComponent<InfoGridProps> = ({
                     return "";
                 }
             },
-            Priority: {
+            Cost: {
                 label: `${nlsHPCC.Source} / ${nlsHPCC.Cost}`, width: 144,
                 formatter: (Source, row) => {
                     if (Source === "Cost Optimizer") {
diff --git a/esp/src/src-react/components/WorkunitSummary.tsx b/esp/src/src-react/components/WorkunitSummary.tsx
index e14fc5e53fe..cd7c2d86f26 100644
--- a/esp/src/src-react/components/WorkunitSummary.tsx
+++ b/esp/src/src-react/components/WorkunitSummary.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { CommandBar, ContextualMenuItemType, ICommandBarItemProps, MessageBar, MessageBarType, ScrollablePane, ScrollbarVisibility, Sticky, StickyPositionType } from "@fluentui/react";
-import { WUQuery, WorkunitsService } from "@hpcc-js/comms";
+import { WorkunitsService, WsWorkunits } from "@hpcc-js/comms";
 import { scopedLogger } from "@hpcc-js/util";
 import nlsHPCC from "src/nlsHPCC";
 import { WUStatus } from "src/react/index";
@@ -84,7 +84,7 @@ export const WorkunitSummary: React.FunctionComponent<WorkunitSummaryProps> = ({
         }, [workunit])
     });
 
-    const nextWuid = React.useCallback((wuids: WUQuery.ECLWorkunit[]) => {
+    const nextWuid = React.useCallback((wuids: WsWorkunits.ECLWorkunit[]) => {
         let found = false;
         for (const wu of wuids) {
             if (wu.Wuid !== wuid) {
@@ -104,7 +104,7 @@ export const WorkunitSummary: React.FunctionComponent<WorkunitSummaryProps> = ({
             onClick: () => {
                 const now = new Date(Date.now());
                 const tomorrow = new Date(now.getTime() + (24 * 60 * 60 * 1000));
-                workunitService.WUQuery({ StartDate: `${wuidToDate(wuid)}T${wuidToTime(wuid)}Z`, EndDate: tomorrow.toISOString(), Sortby: "Wuid", Descending: false, Count: 2 } as WUQuery.Request).then(response => {
+                workunitService.WUQuery({ StartDate: `${wuidToDate(wuid)}T${wuidToTime(wuid)}Z`, EndDate: tomorrow.toISOString(), Sortby: "Wuid", Descending: false, Count: 2 } as WsWorkunits.WUQuery).then(response => {
                     nextWuid(response?.Workunits?.ECLWorkunit || []);
                 }).catch(err => logger.error(err));
             }
@@ -112,7 +112,7 @@ export const WorkunitSummary: React.FunctionComponent<WorkunitSummaryProps> = ({
         {
             key: "previous", iconOnly: true, tooltipHostProps: { content: nlsHPCC.PreviousWorkunit }, iconProps: { iconName: "Next" },
             onClick: () => {
-                workunitService.WUQuery({ EndDate: `${wuidToDate(wuid)}T${wuidToTime(wuid)}Z`, Count: 2 } as WUQuery.Request).then(response => {
+                workunitService.WUQuery({ EndDate: `${wuidToDate(wuid)}T${wuidToTime(wuid)}Z`, Count: 2 } as WsWorkunits.WUQuery).then(response => {
                     nextWuid(response?.Workunits?.ECLWorkunit || []);
                 }).catch(err => logger.error(err));
             }