Merge branch 'main' from workbench2.git
authorTom Clegg <tom@curii.com>
Mon, 6 Nov 2023 17:14:51 +0000 (12:14 -0500)
committerTom Clegg <tom@curii.com>
Mon, 6 Nov 2023 17:14:51 +0000 (12:14 -0500)
refs #18874

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

14 files changed:
1  2 
services/workbench2/cypress/integration/page-not-found.spec.js
services/workbench2/src/components/collection-panel-files/collection-panel-files.tsx
services/workbench2/src/index.tsx
services/workbench2/src/services/collection-service/collection-service.ts
services/workbench2/src/store/process-logs-panel/process-logs-panel-actions.ts
services/workbench2/src/store/process-panel/process-panel-actions.ts
services/workbench2/src/store/project-panel/project-panel-middleware-service.ts
services/workbench2/src/store/trash/trash-actions.ts
services/workbench2/src/store/workbench/workbench-actions.ts
services/workbench2/src/views/collection-panel/collection-panel.tsx
services/workbench2/src/views/not-found-panel/not-found-panel.tsx
services/workbench2/src/views/process-panel/process-panel-root.tsx
services/workbench2/src/views/project-panel/project-panel.tsx
services/workbench2/src/views/workflow-panel/registered-workflow-panel.tsx

Simple merge