[arvados-workbench2] updated: 2.6.3-45-g28d2b693
git repository hosting
git at public.arvados.org
Thu Aug 3 15:36:51 UTC 2023
Summary of changes:
package.json | 6 +++---
src/store/process-logs-panel/process-logs-panel-actions.ts | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
via 28d2b693f71febe45d75246c379b8d192b05018c (commit)
via 9b64a168b39ccabc9f953163b289e8b017c7bc1f (commit)
from 32e9b073f9a153a02cecd6adb902b3bfa36e2ff3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 28d2b693f71febe45d75246c379b8d192b05018c
Author: Stephen Smith <stephen at curii.com>
Date: Thu Aug 3 11:36:14 2023 -0400
20219: Log with level error and with promise rejection reason when polling fails
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/process-logs-panel/process-logs-panel-actions.ts b/src/store/process-logs-panel/process-logs-panel-actions.ts
index 383de53d..781c8903 100644
--- a/src/store/process-logs-panel/process-logs-panel-actions.ts
+++ b/src/store/process-logs-panel/process-logs-panel-actions.ts
@@ -102,7 +102,7 @@ export const pollProcessLogs = (processUuid: string) =>
return Promise.resolve();
} catch (e) {
// Remove log when polling error is handled in some way instead of being ignored
- console.log("Polling process logs failed");
+ console.error("Error occurred in pollProcessLogs:", e);
return Promise.reject();
}
};
@@ -144,7 +144,10 @@ const loadContainerLogFileContents = async (logFilesWithProgress: FileWithProgre
if (res.length && res.every(promiseResult => (promiseResult.status === 'rejected'))) {
// Since allSettled does not pass promise rejection we throw an
// error if every request failed
- return Promise.reject("Failed to load logs");
+ const error = res.find(
+ (promiseResult): promiseResult is PromiseRejectedResult => promiseResult.status === 'rejected'
+ )?.reason;
+ return Promise.reject(error);
}
return res.filter((promiseResult): promiseResult is PromiseFulfilledResult<LogFragment[]> => (
// Filter out log files with rejected promises
commit 9b64a168b39ccabc9f953163b289e8b017c7bc1f
Author: Stephen Smith <stephen at curii.com>
Date: Thu Aug 3 11:09:12 2023 -0400
20219: Move dev dependencies into devDependencies
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/package.json b/package.json
index 5f1f647d..bc480e4c 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
"@fortawesome/react-fontawesome": "0.1.9",
"@material-ui/core": "3.9.3",
"@material-ui/icons": "3.0.1",
- "@sinonjs/fake-timers": "^10.3.0",
"@types/debounce": "3.0.0",
"@types/file-saver": "2.0.0",
"@types/js-yaml": "3.11.2",
@@ -77,8 +76,6 @@
"shell-escape": "^0.2.0",
"sinon": "7.3",
"tippy.js": "^6.3.7",
- "tslint": "5.20.0",
- "tslint-etc": "1.6.0",
"unionize": "2.1.2",
"uuid": "3.3.2"
},
@@ -94,6 +91,7 @@
"watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive"
},
"devDependencies": {
+ "@sinonjs/fake-timers": "^10.3.0",
"@types/classnames": "2.2.6",
"@types/enzyme": "3.1.14",
"@types/enzyme-adapter-react-16": "1.0.3",
@@ -119,6 +117,8 @@
"redux-devtools": "3.4.1",
"redux-mock-store": "1.5.4",
"ts-mock-imports": "1.3.7",
+ "tslint": "5.20.0",
+ "tslint-etc": "1.6.0",
"typescript": "4.3.4",
"wait-on": "4.0.2",
"yamljs": "0.3.0"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list