From 343cab271f2a0f7711032f321d389ffe45a3fbf4 Mon Sep 17 00:00:00 2001 From: PintoGideon Date: Fri, 16 Feb 2024 15:03:10 -0500 Subject: [PATCH 1/3] Improve typing --- src/components/Pacs/components/StudyCard.tsx | 2 ++ src/components/Pacs/context/index.tsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Pacs/components/StudyCard.tsx b/src/components/Pacs/components/StudyCard.tsx index 4979ff1a1..255c2a057 100644 --- a/src/components/Pacs/components/StudyCard.tsx +++ b/src/components/Pacs/components/StudyCard.tsx @@ -57,6 +57,7 @@ const StudyCard = ({ study }: { study: any }) => { setFetchNextStatus(!fetchNextStatus); dispatch({ type: Types.SET_PULL_STUDY, + payload: null, }); } } @@ -229,6 +230,7 @@ const StudyCard = ({ study }: { study: any }) => { onClick={() => { dispatch({ type: Types.SET_PULL_STUDY, + payload: null, }); setFetchNextStatus(!fetchNextStatus); diff --git a/src/components/Pacs/context/index.tsx b/src/components/Pacs/context/index.tsx index fa200401d..36f9e0b6b 100644 --- a/src/components/Pacs/context/index.tsx +++ b/src/components/Pacs/context/index.tsx @@ -102,7 +102,7 @@ type PacsQueryPayload = { clearSeriesPreview: boolean; }; - [Types.SET_PULL_STUDY]: Record; + [Types.SET_PULL_STUDY]: null; [Types.SET_SERIES_UPDATE]: { currentStep: string; From 349ffbad1a2e5429f14c7735f3d86b0072b12315 Mon Sep 17 00:00:00 2001 From: PintoGideon Date: Fri, 16 Feb 2024 15:23:10 -0500 Subject: [PATCH 2/3] Adding consistency to Loading Messages --- package-lock.json | 190 +----------- package.json | 3 - .../FeedOutputBrowser/FileBrowser.tsx | 55 ++-- src/components/LibraryCopy/Cart.tsx | 4 +- src/components/NodeDetails/NodeDetails.tsx | 279 +++++++++--------- src/components/NodeDetails/PluginLog.tsx | 2 +- 6 files changed, 171 insertions(+), 362 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3574cdf6a..d2ad030f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,9 +25,6 @@ "antd": "^5.13.2", "axios": "^1.6.5", "chris-utility": "^1.1.6", - "cornerstone-file-image-loader": "^0.3.0", - "cornerstone-math": "^0.1.10", - "cornerstone-wado-image-loader": "^4.13.2", "d3-hierarchy": "^1.1.9", "d3-selection": "^1.4.2", "d3-shape": "^2.1.0", @@ -301,39 +298,6 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/eslint-parser": { - "version": "7.23.10", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.10.tgz", - "integrity": "sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw==", - "dependencies": { - "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", - "eslint-visitor-keys": "^2.1.0", - "semver": "^6.3.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || >=14.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.11.0", - "eslint": "^7.5.0 || ^8.0.0" - } - }, - "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "engines": { - "node": ">=10" - } - }, - "node_modules/@babel/eslint-parser/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/generator": { "version": "7.23.3", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", @@ -1404,6 +1368,7 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, "engines": { "node": ">=8" } @@ -1463,18 +1428,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@jsdevtools/coverage-istanbul-loader": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz", - "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==", - "dependencies": { - "convert-source-map": "^1.7.0", - "istanbul-lib-instrument": "^4.0.3", - "loader-utils": "^2.0.0", - "merge-source-map": "^1.1.0", - "schema-utils": "^2.7.0" - } - }, "node_modules/@juggle/resize-observer": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz", @@ -1567,14 +1520,6 @@ "node": ">= 8" } }, - "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { - "version": "5.1.1-v1", - "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", - "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", - "dependencies": { - "eslint-scope": "5.1.1" - } - }, "node_modules/@niivue/niivue": { "version": "0.38.10", "resolved": "https://registry.npmjs.org/@niivue/niivue/-/niivue-0.38.10.tgz", @@ -3403,7 +3348,8 @@ "node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true }, "node_modules/cookie": { "version": "0.6.0", @@ -3431,44 +3377,6 @@ "url": "https://opencollective.com/core-js" } }, - "node_modules/cornerstone-file-image-loader": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/cornerstone-file-image-loader/-/cornerstone-file-image-loader-0.3.0.tgz", - "integrity": "sha512-q6Qd1TvXT3JiXQaU9Yy0LsfKZFBlrHCLdzqC82yn+qfrwws/OYXSeTZDUfhpmb4B3T9QSq8YQGDHM1IlgJ14jg==", - "dependencies": { - "serialize-javascript": "^2.1.2" - } - }, - "node_modules/cornerstone-math": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/cornerstone-math/-/cornerstone-math-0.1.10.tgz", - "integrity": "sha512-23XSAyP7t70ANvhFyqwvva+zFd1bQ2d5GL7tg9qKE932WmImjA2Y9tiy5n0iTtnf51W/78Png8Lia2o4dCdJaQ==" - }, - "node_modules/cornerstone-wado-image-loader": { - "version": "4.13.2", - "resolved": "https://registry.npmjs.org/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.13.2.tgz", - "integrity": "sha512-NGqH44bY1VMY8OYuVykkLriNtZQrmoZU/S6f/1t1xX3rMc+WUMNN+yi4Nu3jp6nckLdH/bVGiigoJXrp0dTrAg==", - "dependencies": { - "@babel/eslint-parser": "^7.19.1", - "@cornerstonejs/codec-charls": "^1.2.3", - "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", - "@cornerstonejs/codec-openjpeg": "^1.2.2", - "@cornerstonejs/codec-openjph": "^2.4.2", - "coverage-istanbul-loader": "^3.0.5", - "date-format": "^4.0.14", - "dicom-parser": "^1.8.9", - "pako": "^2.0.4", - "uuid": "^9.0.0" - }, - "peerDependencies": { - "cornerstone-core": "^2.6.0" - } - }, - "node_modules/cornerstone-wado-image-loader/node_modules/pako": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz", - "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==" - }, "node_modules/cosmiconfig": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", @@ -3484,17 +3392,6 @@ "node": ">=10" } }, - "node_modules/coverage-istanbul-loader": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz", - "integrity": "sha512-xsw2phF0VNqUPk47V/vHXkdcTyl0tkMSmaZfLrTOhoPhPMXFelNju7utl5s7I93KXzipqDEK0YwofQSSflPz8A==", - "dependencies": { - "@jsdevtools/coverage-istanbul-loader": "3.0.5" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/cross-fetch": { "version": "3.1.8", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", @@ -3739,14 +3636,6 @@ "url": "https://github.com/sponsors/kossnocorp" } }, - "node_modules/date-format": { - "version": "4.0.14", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz", - "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==", - "engines": { - "node": ">=4.0" - } - }, "node_modules/dayjs": { "version": "1.11.10", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", @@ -4113,18 +4002,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", @@ -4166,33 +4043,6 @@ "node": ">=4" } }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "engines": { - "node": ">=4.0" - } - }, "node_modules/estree-walker": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", @@ -4983,6 +4833,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, "engines": { "node": ">=8" } @@ -5003,6 +4854,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, "dependencies": { "@babel/core": "^7.7.5", "@istanbuljs/schema": "^0.1.2", @@ -5017,6 +4869,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, "bin": { "semver": "bin/semver.js" } @@ -5495,14 +5348,6 @@ "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" }, - "node_modules/merge-source-map": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "dependencies": { - "source-map": "^0.6.1" - } - }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -10337,23 +10182,6 @@ "loose-envify": "^1.1.0" } }, - "node_modules/schema-utils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", - "dependencies": { - "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 8.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/scroll-into-view-if-needed": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.1.0.tgz", @@ -10408,11 +10236,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/serialize-javascript": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", - "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==" - }, "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -10549,6 +10372,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, "engines": { "node": ">=0.10.0" } diff --git a/package.json b/package.json index 1e2f69483..d3ecc613c 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,6 @@ "antd": "^5.13.2", "axios": "^1.6.5", "chris-utility": "^1.1.6", - "cornerstone-file-image-loader": "^0.3.0", - "cornerstone-math": "^0.1.10", - "cornerstone-wado-image-loader": "^4.13.2", "d3-hierarchy": "^1.1.9", "d3-selection": "^1.4.2", "d3-shape": "^2.1.0", diff --git a/src/components/FeedOutputBrowser/FileBrowser.tsx b/src/components/FeedOutputBrowser/FileBrowser.tsx index ba4344859..e64fd55f7 100644 --- a/src/components/FeedOutputBrowser/FileBrowser.tsx +++ b/src/components/FeedOutputBrowser/FileBrowser.tsx @@ -69,7 +69,7 @@ const FileBrowser = (props: FileBrowserProps) => { }; const items = files && folders ? [...files, ...folders] : []; const { id, plugin_name } = selected.data; - const pathSplit = path && path.split(`/${plugin_name}_${id}/`); + const pathSplit = path?.split(`/${plugin_name}_${id}/`); const breadcrumb = path ? pathSplit[1].split("/") : []; const handleDownloadClick = async (item: FeedFile) => { @@ -93,17 +93,16 @@ const FileBrowser = (props: FileBrowserProps) => { dispatch(clearSelectedFile()); if (index === breadcrumb.length - 1) { return; - } else { - const findIndex = breadcrumb.findIndex((path) => path === value); - if (findIndex !== -1) { - const newPathList = breadcrumb.slice(0, findIndex + 1); - const combinedPathList = [ - ...pathSplit[0].split("/"), - `${plugin_name}_${id}`, - ...newPathList, - ]; - handleFileClick(combinedPathList.join("/")); - } + } + const findIndex = breadcrumb.findIndex((path) => path === value); + if (findIndex !== -1) { + const newPathList = breadcrumb.slice(0, findIndex + 1); + const combinedPathList = [ + ...pathSplit[0].split("/"), + `${plugin_name}_${id}`, + ...newPathList, + ]; + handleFileClick(combinedPathList.join("/")); } }; @@ -172,20 +171,19 @@ const FileBrowser = (props: FileBrowserProps) => { handleMinimize={() => { handleMinimize("preview", dispatch); }} - maximized={drawerState["preview"].maximized} + maximized={drawerState.preview.maximized} /> - {drawerState["preview"].currentlyActive === "preview" && - selectedFile && ( - - )} - {drawerState["preview"].currentlyActive === "xtk" && } + {drawerState.preview.currentlyActive === "preview" && selectedFile && ( + + )} + {drawerState.preview.currentlyActive === "xtk" && } ); @@ -235,13 +233,16 @@ const FileBrowser = (props: FileBrowserProps) => { {filesLoading ? ( - + ) : !filesLoading && items.length === 0 ? ( ) : ( {items.map((item: string | FeedFile, index) => { - let type, icon, fsize, fileName; + let type; + let icon; + let fsize; + let fileName; type = "UNKNOWN FORMAT"; const isPreviewing = selectedFile === item; let currentStatus = 0; @@ -269,7 +270,7 @@ const FileBrowser = (props: FileBrowserProps) => { const fileNameComponent = (
{ fetchData(); }, [selectedPlugin]); - const command = React.useCallback(getCommand, [ - plugin, - instanceParameters, - pluginParameters, - ]); + const command = React.useCallback(getCommand, []); const text = plugin && instanceParameters && pluginParameters ? command(plugin, instanceParameters, pluginParameters) : ""; - const runTime = React.useCallback(getRuntimeString, [selectedPlugin]); + const runTime = React.useCallback(getRuntimeString, []); const cancelled = selectedPlugin?.data.status === "cancelled" || @@ -119,156 +115,148 @@ const NodeDetails: React.FC = () => { if (!selectedPlugin) { return ; - } else { - const Time = ( - <> - - - {selectedPlugin.data.start_date} - - ); - return ( - { - feed && navigate(`/feeds/${feed.data.id}`); - }} - variant="link" - > - Refresh - - } - > -
- {drawerState["node"].currentlyActive === "terminal" ? ( - - ) : drawerState["node"].currentlyActive === "note" ? ( - - ) : ( - <> -
- -
+ } + const Time = ( + <> + + {selectedPlugin.data.start_date} + + ); + return ( + { + feed && navigate(`/feeds/${feed.data.id}`); + }} + variant="link" + > + Refresh + + } + > +
+ {drawerState.node.currentlyActive === "terminal" ? ( + + ) : drawerState.node.currentlyActive === "note" ? ( + + ) : ( + <> +
+ +
+ + + {renderGridItem("Status", )} + + + + setIsExpanded(!isExpanded)} + isExpanded={isExpanded} + className="node-details__expandable" + > - {renderGridItem("Status", )} - - - - setIsExpanded(!isExpanded)} - isExpanded={isExpanded} - className="node-details__expandable" - > - - {renderGridItem("Feed Name", <>{feed && feed.data.name})} - {renderGridItem( - "Feed Author", - <>{feed && feed.data.creator_username}, + {renderGridItem("Feed Name", feed?.data?.name)} + {renderGridItem("Feed Author", feed?.data.creator_username)} + {selectedPlugin.data.previous_id && + renderGridItem( + "Parent Node ID", + {selectedPlugin.data.previous_id}, )} - {selectedPlugin.data.previous_id && - renderGridItem( - "Parent Node ID", - {selectedPlugin.data.previous_id}, + {renderGridItem( + "Selected Node ID", + {selectedPlugin.data.id}, + )} + {renderGridItem( + "Plugin", + + {selectedPlugin.data.plugin_name}, ver{" "} + {selectedPlugin.data.plugin_version} + , + )} + {renderGridItem("Created", Time)} + {renderGridItem( + "Compute Environment", + {compute_env}, + )} + {runTime && ( + + {renderGridItem( + "Total Runtime", + + {selectedPlugin?.data && runTime(selectedPlugin)} + , )} - {renderGridItem( - "Selected Node ID", - {selectedPlugin.data.id}, - )} - {renderGridItem( - "Plugin", - - {selectedPlugin.data.plugin_name}, ver{" "} - {selectedPlugin.data.plugin_version} - , - )} - {renderGridItem("Created", Time)} - {renderGridItem( - "Compute Environment", - {compute_env}, - )} - {runTime && ( - - {renderGridItem( - "Total Runtime", + + )} + {cancelled && + renderGridItem( + "Error Code", + + {error_code ? ( - {selectedPlugin && - selectedPlugin.data && - runTime(selectedPlugin)} - , + {error_code}  + {isErrorExpanded && ( + + {getErrorCodeMessage(error_code)}  + + )} + + + ) : ( + "None" )} - + , )} - {cancelled && - renderGridItem( - "Error Code", - - {error_code ? ( - - {error_code}  - {isErrorExpanded && ( - - {getErrorCodeMessage(error_code)}  - - )} - - - ) : ( - "None" - )} - , - )} - - + + + - - {cancelled ? null : ( - - - {" "} - - - - )} - - - - - - + {cancelled ? null : ( + + + {" "} + + + + )} + + + + + + + + + + + - + {selectedPlugin.data.previous_id !== undefined && ( - + - - {selectedPlugin.data.previous_id !== undefined && ( - - - - )} - + )} - - )} -
- - ); - } + + + )} +
+ + ); }; export default NodeDetails; @@ -340,7 +328,7 @@ function getCommand( (param) => `${param.name} ${param.value}`, ); if (parameterCommand.length > 0) { - command += parameterCommand.join(" ") + " \\\n"; + command += `${parameterCommand.join(" ")} \\\n`; } } command = `${command}/incoming /outgoing \n \n`; @@ -354,5 +342,4 @@ const RenderButtonGridItem = ({ children }: { children: ReactNode }) => { {children} ); - 4; }; diff --git a/src/components/NodeDetails/PluginLog.tsx b/src/components/NodeDetails/PluginLog.tsx index 933fb0bcf..6f94ce847 100644 --- a/src/components/NodeDetails/PluginLog.tsx +++ b/src/components/NodeDetails/PluginLog.tsx @@ -7,7 +7,7 @@ import usePluginInstanceResource from "./usePluginInstanceResource"; const PluginLog = ({ text }: NodeDetailsProps) => { const pluginInstanceResource = usePluginInstanceResource(); - const log = pluginInstanceResource && pluginInstanceResource.pluginLog; + const log = pluginInstanceResource?.pluginLog; let terminalOutput = text ? text : ""; terminalOutput += From af2d6cc9c4b7a5b655dd43185b71cad4c4f41e99 Mon Sep 17 00:00:00 2001 From: PintoGideon Date: Fri, 16 Feb 2024 15:25:54 -0500 Subject: [PATCH 3/3] Remove console.logs --- src/components/Preview/HelperComponent.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Preview/HelperComponent.tsx b/src/components/Preview/HelperComponent.tsx index 1aceca09d..29772a307 100644 --- a/src/components/Preview/HelperComponent.tsx +++ b/src/components/Preview/HelperComponent.tsx @@ -56,7 +56,6 @@ export const TagInfoModal = ({ output?: any[]; file?: FeedFile; }) => { - console.log("Parsing Error", parsingError); return (