[arvados] updated: 2.7.0-6821-geb8af005bb

[git repository hosting]

Summary of changes:
 .../src/components/data-explorer/data-explorer.tsx | 45 +++++++++++++----
 .../store/data-explorer/data-explorer-action.ts    |  2 +
 .../store/data-explorer/data-explorer-reducer.ts   |  3 ++
 .../src/store/search-bar/search-bar-actions.ts     |  7 +++
 .../src/store/search-bar/search-bar-reducer.ts     |  5 ++
 .../search-results-middleware-service.ts           | 57 +++++++++++++++++++++-
 .../data-explorer/data-explorer.tsx                |  5 +-
 .../search-bar/search-bar-view.tsx                 | 22 +++++++++
 .../src/views-components/search-bar/search-bar.tsx | 10 ++--
 9 files changed, 140 insertions(+), 16 deletions(-)

       via  eb8af005bbc329134a5047b263cc983e349a5fa3 (commit)
       via  1c748824a9df111d738f79bbf1a824715b51ced5 (commit)
       via  1d2c756a9f8d3a6de62091d45e2a62702317b504 (commit)
       via  6af02d6e6596f45ac761daa04a53b2466e86ea98 (commit)
       via  1c9cbb14d4e9c7819b1c2eda89b15ca33b7118a3 (commit)
       via  f15581587eff2700fa6f32f85c82ecbcb5af68e8 (commit)
       via  18e6bbd6a0bb60b7f1137fab2dfb88ed7804a8ac (commit)
       via  48f4ed31a9a20400e4f0707fdbf1c64ac6d04157 (commit)
       via  7a840279498805223af62491cb9b18fd1335bc9c (commit)
       via  14ea76bb7d708577c4ea59f6baafc1f6facaf91b (commit)
       via  5b7b834bcab1a32fe77851d78fd984e1c96465ee (commit)
       via  1406963ff0e93a3493333d9cc4ed3b3f7f3264d8 (commit)
       via  fc1dd95eef3ad41a0bc73bdc1423cd6877e5eb8c (commit)
       via  11f199f276312d4f73b7a80bd00abce337176917 (commit)
      from  0c731f41511ab1fbfa08b2de7967ca1df5f7f28d (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 eb8af005bbc329134a5047b263cc983e349a5fa3
Merge: 0c731f4151 1c748824a9
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Fri May 31 14:27:51 2024 -0400

    Merge branch '21364-load-more-button'
    
    closes #21364
    
    Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --cc services/workbench2/src/components/data-explorer/data-explorer.tsx
index d1e55b7c8b,063e34cda7..dbdf68b693
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@@ -17,7 -17,7 +17,7 @@@ import { CloseIcon, IconType, MaximizeI
  import { PaperProps } from "@material-ui/core/Paper";
  import { MPVPanelProps } from "components/multi-panel-view/multi-panel-view";
  
- type CssRules = "titleWrapper" | "msToolbarStyles" | "subpanelToolbarStyles" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
 -type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "loadMoreContainer" | "numResults" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
++type CssRules = "titleWrapper" | "msToolbarStyles" | "subpanelToolbarStyles" | "searchBox" | "headerMenu" | "toolbar" | "footer"| "loadMoreContainer" | "numResults" | "root" | "moreOptionsButton" | "title" | 'subProcessTitle' | "dataTable" | "container";
  
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      titleWrapper: {
@@@ -41,10 -35,11 +41,13 @@@
      footer: {
          overflow: "auto",
      },
+     loadMoreContainer: {
+         minWidth: '8rem',
+     },
      root: {
          height: "100%",
 +        flex: 1,
 +        overflowY: "auto",
      },
      moreOptionsButton: {
          padding: 0,
@@@ -130,11 -131,9 +141,12 @@@ type DataExplorerProps<T> = DataExplore
  
  export const DataExplorer = withStyles(styles)(
      class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
 +        state = {
 +            msToolbarInDetailsCard: true,
 +        };
  
          multiSelectToolbarInTitle = !this.props.title && !this.props.progressBar;
+         maxItemsAvailable = 0;
  
          componentDidMount() {
              if (this.props.onSetColumns) {
@@@ -143,11 -142,11 +155,16 @@@
          }
  
          componentDidUpdate( prevProps: Readonly<DataExplorerProps<T>>, prevState: Readonly<{}>, snapshot?: any ): void {
 +            const { selectedResourceUuid, currentRouteUuid } = this.props;
 +            if(selectedResourceUuid !== prevProps.selectedResourceUuid || currentRouteUuid !== prevProps.currentRouteUuid) {
 +                this.setState({
 +                    msToolbarInDetailsCard: selectedResourceUuid === this.props.currentRouteUuid,
 +                })
+             if (this.props.itemsAvailable !== prevProps.itemsAvailable) {
+                 this.maxItemsAvailable = Math.max(this.maxItemsAvailable, this.props.itemsAvailable);
+             }
+             if (this.props.searchBarValue !== prevProps.searchBarValue) {
+                 this.maxItemsAvailable = 0;
              }
          }
  
diff --cc services/workbench2/src/views-components/data-explorer/data-explorer.tsx
index 37a15bcf77,21818fac30..0f4fc56358
--- a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
@@@ -23,20 -22,24 +23,21 @@@ interface Props 
      working?: boolean;
  }
  
- const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect, selectedResourceUuid, properties}: RootState, { id }: Props) => {
-     const working = !!progressIndicator.some(p => p.id === id && p.working);
 -const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect, detailsPanel, properties, searchBar}: RootState, { id }: Props) => {
++const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect, selectedResourceUuid, properties, searchBar}: RootState, { id }: Props) => {
+     const working = !!progressIndicator.some(p => p.working);
      const dataExplorerState = getDataExplorer(dataExplorer, id);
      const currentRoute = router.location ? router.location.pathname : "";
 -    const isDetailsResourceChecked = multiselect.checkedList[detailsPanel.resourceUuid]
 -    const isOnlyOneSelected = Object.values(multiselect.checkedList).filter(x => x === true).length === 1;
 -    const currentItemUuid =
 -        currentRoute === '/workflows' ? properties.workflowPanelDetailsUuid : isDetailsResourceChecked && isOnlyOneSelected ? detailsPanel.resourceUuid : multiselect.selectedUuid;
      const isMSToolbarVisible = multiselect.isVisible;
      return {
          ...dataExplorerState,
          currentRoute: currentRoute,
          paperKey: currentRoute,
 -        currentItemUuid,
 +        currentRouteUuid: properties.currentRouteUuid,
          isMSToolbarVisible,
 +        selectedResourceUuid,
          checkedList: multiselect.checkedList,
          working,
+         searchBarValue: searchBar.searchValue,
      };
  };
  

-----------------------------------------------------------------------


hooks/post-receive
--