diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json index a137710f749..19feeae0d55 100644 --- a/esp/src/package-lock.json +++ b/esp/src/package-lock.json @@ -17,7 +17,7 @@ "@hpcc-js/chart": "2.81.4", "@hpcc-js/codemirror": "2.60.9", "@hpcc-js/common": "2.71.9", - "@hpcc-js/comms": "2.83.2", + "@hpcc-js/comms": "2.84.4", "@hpcc-js/dataflow": "8.1.4", "@hpcc-js/eclwatch": "2.73.22", "@hpcc-js/graph": "2.85.5", @@ -152,6 +152,14 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@fastify/busboy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", + "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==", + "engines": { + "node": ">=14" + } + }, "node_modules/@floating-ui/core": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.3.1.tgz", @@ -1569,17 +1577,26 @@ } }, "node_modules/@hpcc-js/comms": { - "version": "2.83.2", - "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.83.2.tgz", - "integrity": "sha512-STLvMEIXQUSrgNGbNkimlNf4Y1Yso52jnWyCRc/uZUN8cEd7z3Jim6Xj+cjKizrRfDVBRbg006H5HzaEbUu7Jg==", + "version": "2.84.4", + "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.84.4.tgz", + "integrity": "sha512-GkKUyttPRYPb/jluoNtxY6jEqJhF2Dr0srzXrF+Vs0biyr4GvwQzMcoQfU97PQl7PJx8M+FUquMchfuQ7sqSWA==", "dependencies": { - "@hpcc-js/ddl-shim": "^2.20.3", - "@hpcc-js/util": "^2.50.3", - "@xmldom/xmldom": "0.8.8", + "@hpcc-js/ddl-shim": "^2.20.6", + "@hpcc-js/util": "^2.50.6", + "@xmldom/xmldom": "0.8.10", "abort-controller": "3.0.0", - "node-fetch": "2.6.11", + "node-fetch": "2.7.0", "safe-buffer": "5.2.1", - "tmp": "0.2.1" + "tmp": "0.2.1", + "undici": "5.26.3" + } + }, + "node_modules/@hpcc-js/comms/node_modules/@hpcc-js/util": { + "version": "2.50.6", + "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.50.6.tgz", + "integrity": "sha512-k4yDXdYX5h2RcccVy9sW1djcOP1w6G/GYAAs7duEPbx0TyvpMuK/Bo/gKW6Wq89Ce46moOtEq+7WyOqvLXsQgg==", + "dependencies": { + "tslib": "2.6.2" } }, "node_modules/@hpcc-js/comms/node_modules/safe-buffer": { @@ -1601,15 +1618,20 @@ } ] }, + "node_modules/@hpcc-js/comms/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@hpcc-js/dataflow": { "version": "8.1.4", "resolved": "https://registry.npmjs.org/@hpcc-js/dataflow/-/dataflow-8.1.4.tgz", "integrity": "sha512-T6rz2FqwI+suNwCzvVTHwtGBAtxm5L+aNnnXjJpXO5+KzvdtIAOV+1+WBuRCAkogj/gRdhEwW3XPzK5x3DbYkw==" }, "node_modules/@hpcc-js/ddl-shim": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.20.3.tgz", - "integrity": "sha512-2ZS1am7xCmLxzezM3CqTHmaPlAU7NQMQ4v6B5Mv7BMy6mkrSMeP2VAYYtNbwjrMUSa0ZFw4pimPFd3QWEH7bJQ==", + "version": "2.20.6", + "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.20.6.tgz", + "integrity": "sha512-0N9KwRr2rzSJEhfXjEDmT2IBf2Bm6QJ4ReOzhu1wTN3O3gKkUXxNxJMDePFyCNaeHaNWGEQOxewf1q9NtrSkbA==", "hasInstallScript": true, "dependencies": { "ajv": "6.12.6" @@ -2702,9 +2724,9 @@ } }, "node_modules/@xmldom/xmldom": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.8.tgz", - "integrity": "sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==", + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", "engines": { "node": ">=10.0.0" } @@ -6384,9 +6406,9 @@ "dev": true }, "node_modules/node-fetch": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", - "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -8638,6 +8660,17 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" }, + "node_modules/undici": { + "version": "5.26.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.3.tgz", + "integrity": "sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==", + "dependencies": { + "@fastify/busboy": "^2.0.0" + }, + "engines": { + "node": ">=14.0" + } + }, "node_modules/universal-router": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/universal-router/-/universal-router-9.1.0.tgz", diff --git a/esp/src/package.json b/esp/src/package.json index 29a6c910bbd..5d4291daee2 100644 --- a/esp/src/package.json +++ b/esp/src/package.json @@ -42,7 +42,7 @@ "@hpcc-js/chart": "2.81.4", "@hpcc-js/codemirror": "2.60.9", "@hpcc-js/common": "2.71.9", - "@hpcc-js/comms": "2.83.2", + "@hpcc-js/comms": "2.84.4", "@hpcc-js/dataflow": "8.1.4", "@hpcc-js/eclwatch": "2.73.22", "@hpcc-js/graph": "2.85.5", diff --git a/esp/src/src-react/components/DFUWorkunitDetails.tsx b/esp/src/src-react/components/DFUWorkunitDetails.tsx index 5b28af9388b..c8c36f1e834 100644 --- a/esp/src/src-react/components/DFUWorkunitDetails.tsx +++ b/esp/src/src-react/components/DFUWorkunitDetails.tsx @@ -48,7 +48,7 @@ export const DFUWorkunitDetails: React.FunctionComponent { if (!workunit) return; workunit?.fetchXML().then(response => { - setWuXML(response.file); + setWuXML(response); }).catch(err => logger.error(err)); }, [workunit]); diff --git a/esp/src/src-react/hooks/platform.ts b/esp/src/src-react/hooks/platform.ts index a987410b3ec..9a278eaff34 100644 --- a/esp/src/src-react/hooks/platform.ts +++ b/esp/src/src-react/hooks/platform.ts @@ -1,6 +1,6 @@ import * as React from "react"; import { scopedLogger } from "@hpcc-js/util"; -import { Topology, TpLogicalClusterQuery } from "@hpcc-js/comms"; +import { Topology, WsTopology } from "@hpcc-js/comms"; import { getBuildInfo, BuildInfo } from "src/Session"; import { cmake_build_type, containerized } from "src/BuildInfo"; @@ -33,9 +33,9 @@ export function useBuildInfo(): [BuildInfo, { isContainer: boolean, currencyCode return [buildInfo, { isContainer, currencyCode, opsCategory }]; } -export function useLogicalClusters(): [TpLogicalClusterQuery.TpLogicalCluster[] | undefined, TpLogicalClusterQuery.TpLogicalCluster | undefined] { - const [targetClusters, setTargetClusters] = React.useState(); - const [defaultCluster, setDefaultCluster] = React.useState(); +export function useLogicalClusters(): [WsTopology.TpLogicalCluster[] | undefined, WsTopology.TpLogicalCluster | undefined] { + const [targetClusters, setTargetClusters] = React.useState(); + const [defaultCluster, setDefaultCluster] = React.useState(); React.useEffect(() => { const topology = Topology.attach({ baseUrl: "" }); @@ -43,9 +43,9 @@ export function useLogicalClusters(): [TpLogicalClusterQuery.TpLogicalCluster[] topology.fetchLogicalClusters().then(response => { if (active) { setTargetClusters(response); - let firstRow: TpLogicalClusterQuery.TpLogicalCluster; - let firstHThor: TpLogicalClusterQuery.TpLogicalCluster; - let firstThor: TpLogicalClusterQuery.TpLogicalCluster; + let firstRow: WsTopology.TpLogicalCluster; + let firstHThor: WsTopology.TpLogicalCluster; + let firstThor: WsTopology.TpLogicalCluster; response.forEach(row => { if (firstRow === undefined) { firstRow = row;