21128: Merge branch 'main' into 21128-toolbar-context-menu

refs #21128

Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>

diff --cc cypress/integration/process.spec.js
Simple merge

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

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

diff --cc src/components/multiselect-toolbar/MultiselectToolbar.tsx
index d9024cd15244296f9b4f1c4c08ac115a275eb76a,4eff8885fcd5e6e7e034eab672588c340bf92f22..30d5bd7912f1d232d7687ea847d842506841fb55
--- 1/src/components/multiselect-toolbar/MultiselectToolbar.tsx
--- 2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@@ -42,35 -26,13 +42,36 @@@ type CssRules = "root" | "transition" 
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      root: {
          display: "flex",
+         flexShrink: 0,
          flexDirection: "row",
          width: 0,
 +        height: '2.7rem',
          padding: 0,
          margin: "1rem auto auto 0.5rem",
 -        overflow: "hidden",
 -        transition: "width 150ms",
 +        overflowY: 'auto',
 +        scrollBehavior: 'smooth',
 +        '&::-webkit-scrollbar': {
 +            width: 0,
 +            height: 2
 +        },
 +        '&::-webkit-scrollbar-track': {
 +            width: 0,
 +            height: 2
 +        },
 +        '&::-webkit-scrollbar-thumb': {
 +            backgroundColor: '#757575',
 +            borderRadius: 2
 +        }
 +    },
 +    transition: {
 +        display: "flex",
 +        flexDirection: "row",
 +        width: 0,
 +        height: '2.7rem',
 +        padding: 0,
 +        margin: "1rem auto auto 0.5rem",
 +        overflow: 'hidden',
 +        transition: `width ${WIDTH_TRANSITION}ms`,
      },
      button: {
          width: "2.5rem",

diff --cc src/store/favorites/favorites-actions.ts
index a1667326324a7b38485acbc5d9f0e3e6743ab869,1e23f35cbfd8b4d1beced3aae5ee043c28875a53..da454ed77dbc9561116cf43c6de5fc25ae8edc95
--- 1/src/store/favorites/favorites-actions.ts
--- 2/src/store/favorites/favorites-actions.ts
+++ b/src/store/favorites/favorites-actions.ts
@@@ -10,8 -10,7 +10,9 @@@ import { checkFavorite } from "./favori
  import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions";
  import { ServiceRepository } from "services/services";
  import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
 +import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
 +import { addDisabledButton, removeDisabledButton } from "store/multiselect/multiselect-actions";
+ import { loadFavoritesTree} from "store/side-panel-tree/side-panel-tree-actions";
  
  export const favoritesActions = unionize({
      TOGGLE_FAVORITE: ofType<{ resourceUuid: string }>(),
@@@ -53,8 -51,8 +54,9 @@@ export const toggleFavorite = (resource
                      hideDuration: 2000,
                      kind: SnackbarKind.SUCCESS
                  }));
 +                dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_FAVORITES))
                  dispatch(progressIndicatorActions.STOP_WORKING("toggleFavorite"));
+                 dispatch<any>(loadFavoritesTree())
              })
              .catch((e: any) => {
                  dispatch(progressIndicatorActions.STOP_WORKING("toggleFavorite"));

diff --cc src/store/public-favorites/public-favorites-actions.ts
index 5bf5078d30a9a198d77f3e6fd0f40923a168c9db,363b0b44a97018b6885f68ca1ac0d589ef410f52..0f8ed6c2611c72e55fc769a2d5f4b7ab3d4c6408
--- 1/src/store/public-favorites/public-favorites-actions.ts
--- 2/src/store/public-favorites/public-favorites-actions.ts
+++ b/src/store/public-favorites/public-favorites-actions.ts
@@@ -9,8 -9,7 +9,9 @@@ import { checkPublicFavorite } from "./
  import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
  import { ServiceRepository } from "services/services";
  import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
 +import { addDisabledButton, removeDisabledButton } from "store/multiselect/multiselect-actions";
 +import { MultiSelectMenuActionNames } from "views-components/multiselect-toolbar/ms-menu-actions";
+ import { loadPublicFavoritesTree } from "store/side-panel-tree/side-panel-tree-actions";
  
  export const publicFavoritesActions = unionize({
      TOGGLE_PUBLIC_FAVORITE: ofType<{ resourceUuid: string }>(),
@@@ -50,8 -48,8 +51,9 @@@ export const togglePublicFavorite = (re
                      hideDuration: 2000,
                      kind: SnackbarKind.SUCCESS
                  }));
 +                dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_PUBLIC_FAVORITES))
                  dispatch(progressIndicatorActions.STOP_WORKING("togglePublicFavorite"));
+                 dispatch<any>(loadPublicFavoritesTree())
              })
              .catch((e: any) => {
                  dispatch(progressIndicatorActions.STOP_WORKING("togglePublicFavorite"));

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

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

diff --cc src/views/shared-with-me-panel/shared-with-me-panel.tsx
index 7731df6bc84693ee6528e9395afdb2e97cdafdd4,250447ea95d10cc927f78ee85aae0df5c5bfe740..f3f827d1469fc27fe8c90d8f543123ba4755698d
--- 1/src/views/shared-with-me-panel/shared-with-me-panel.tsx
--- 2/src/views/shared-with-me-panel/shared-with-me-panel.tsx
+++ b/src/views/shared-with-me-panel/shared-with-me-panel.tsx
@@@ -17,8 -18,35 +18,36 @@@ import 
      openContextMenu,
      resourceUuidToContextMenuKind
  } from 'store/context-menu/context-menu-actions';
+ import {
+     ResourceName,
+     ProcessStatus as ResourceStatus,
+     ResourceType,
+     ResourceOwnerWithNameLink,
+     ResourcePortableDataHash,
+     ResourceFileSize,
+     ResourceFileCount,
+     ResourceUUID,
+     ResourceContainerUuid,
+     ContainerRunTime,
+     ResourceOutputUuid,
+     ResourceLogUuid,
+     ResourceParentProcess,
+     ResourceModifiedByUserUuid,
+     ResourceVersion,
+     ResourceCreatedAtDate,
+     ResourceLastModifiedDate,
+     ResourceTrashDate,
+     ResourceDeleteDate,
+ } from 'views-components/data-explorer/renderers';
+ import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters';
  import { GroupContentsResource } from 'services/groups-service/groups-service';
 +import { toggleOne } from 'store/multiselect/multiselect-actions';
+ import { DataColumns } from 'components/data-table/data-table';
+ import { ContainerRequestState } from 'models/container-request';
+ import { ProjectResource } from 'models/project';
+ import { createTree } from 'models/tree';
+ import { SortDirection } from 'components/data-table/data-column';
+ import { getInitialResourceTypeFilters, getInitialProcessStatusFilters } from 'store/resource-type-filters/resource-type-filters';
  
  type CssRules = "toolbar" | "button" | "root";
  

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