Merge branch 'main' from arvados-workbench2.git

refs #18874

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

diff --cc services/workbench2/cypress/integration/side-panel.spec.js
Simple merge

diff --cc services/workbench2/package.json
Simple merge

diff --cc services/workbench2/public/mui-start-icon.svg
index 0000000000000000000000000000000000000000,3140cc336c2a88640327759edb84e9ab8502b648..3140cc336c2a88640327759edb84e9ab8502b648
mode 000000,100644..100644
--- /dev/null
--- 2/public/mui-start-icon.svg
+++ b/services/workbench2/public/mui-start-icon.svg

diff --cc services/workbench2/src/components/data-explorer/data-explorer.tsx
Simple merge

diff --cc services/workbench2/src/components/icon/icon.tsx
Simple merge

diff --cc services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
Simple merge

diff --cc services/workbench2/src/components/subprocess-progress-bar/subprocess-progress-bar.test.tsx
index 0000000000000000000000000000000000000000,bd8603f9c2462b965504c3989c0ded5cdec87cf3..bd8603f9c2462b965504c3989c0ded5cdec87cf3
mode 000000,100644..100644
--- /dev/null
--- 2/src/components/subprocess-progress-bar/subprocess-progress-bar.test.tsx
+++ b/services/workbench2/src/components/subprocess-progress-bar/subprocess-progress-bar.test.tsx

diff --cc services/workbench2/src/components/subprocess-progress-bar/subprocess-progress-bar.tsx
index 0000000000000000000000000000000000000000,b21d879185ace8f4e2c4f66fc5da653d90438ed6..b21d879185ace8f4e2c4f66fc5da653d90438ed6
mode 000000,100644..100644
--- /dev/null
--- 2/src/components/subprocess-progress-bar/subprocess-progress-bar.tsx
+++ b/services/workbench2/src/components/subprocess-progress-bar/subprocess-progress-bar.tsx

diff --cc services/workbench2/src/components/tree/tree.tsx
Simple merge

diff --cc services/workbench2/src/index.tsx
Simple merge

diff --cc services/workbench2/src/store/favorites/favorites-actions.ts
Simple merge

diff --cc services/workbench2/src/store/navigation/navigation-action.ts
Simple merge

diff --cc services/workbench2/src/store/public-favorites/public-favorites-actions.ts
Simple merge

diff --cc services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts
Simple merge

diff --cc services/workbench2/src/store/subprocess-panel/subprocess-panel-actions.ts
Simple merge

diff --cc services/workbench2/src/store/tree-picker/tree-picker-actions.test.ts
Simple merge

diff --cc services/workbench2/src/store/workbench/workbench-actions.ts
Simple merge

diff --cc services/workbench2/src/views-components/data-explorer/renderers.tsx
Simple merge

diff --cc services/workbench2/src/views-components/side-panel-toggle/side-panel-toggle.tsx
Simple merge

diff --cc services/workbench2/src/views-components/side-panel-tree/side-panel-tree.tsx
Simple merge

diff --cc services/workbench2/src/views-components/side-panel/side-panel-collapsed.tsx
index 0000000000000000000000000000000000000000,d2f5cfec3b43b7850f8008c2977502ac1f011da8..d2f5cfec3b43b7850f8008c2977502ac1f011da8
mode 000000,100644..100644
--- /dev/null
--- 2/src/views-components/side-panel/side-panel-collapsed.tsx
+++ b/services/workbench2/src/views-components/side-panel/side-panel-collapsed.tsx

diff --cc services/workbench2/src/views-components/side-panel/side-panel.tsx
Simple merge

diff --cc services/workbench2/src/views/process-panel/process-panel-root.tsx
Simple merge

diff --cc services/workbench2/src/views/shared-with-me-panel/shared-with-me-panel.tsx
Simple merge

diff --cc services/workbench2/src/views/subprocess-panel/subprocess-panel-root.tsx
Simple merge

diff --cc services/workbench2/src/views/subprocess-panel/subprocess-panel.tsx
Simple merge

diff --cc services/workbench2/src/views/workbench/workbench.tsx
Simple merge

diff --cc services/workbench2/yarn.lock
Simple merge