[arvados-workbench2] updated: 2.6.0-28-g27542ce4

[git repository hosting]

Summary of changes:
 src/components/data-explorer/data-explorer.tsx     |  4 ++--
 .../data-table-multiselect-popover.tsx             |  8 ++-----
 src/components/data-table/data-table.tsx           |  1 -
 .../multiselectToolbar/MultiselectToolbar.tsx      | 28 +++++++++++++++-------
 4 files changed, 23 insertions(+), 18 deletions(-)

       via  27542ce48fa48c5bbe16e96a3ffd1cea0be0cc47 (commit)
       via  3e3cd928c063419a580c2202fb1b18b8784909e1 (commit)
       via  bc6b0f0c9586c28245e352189d7149a65417e0cf (commit)
      from  4d422259ee1fb0db9bada72ba6b100641c2f59f9 (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 27542ce48fa48c5bbe16e96a3ffd1cea0be0cc47
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed May 10 16:43:13 2023 -0400

    15768: proper buttons installed Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index 82ce5603..8d16aed2 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -14,7 +14,7 @@ import { DataTableFilters } from 'components/data-table-filters/data-table-filte
 import { CloseIcon, IconType, MaximizeIcon, UnMaximizeIcon, MoreOptionsIcon } from 'components/icon/icon';
 import { PaperProps } from '@material-ui/core/Paper';
 import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
-import MultiselectToolbar from 'components/multiselectToolbar/MultiselectToolbar';
+import { MultiselectToolbar, defaultActions } from 'components/multiselectToolbar/MultiselectToolbar';
 
 type CssRules = 'searchBox' | 'headerMenu' | 'toolbar' | 'footer' | 'root' | 'moreOptionsButton' | 'title' | 'dataTable' | 'container';
 
@@ -228,7 +228,7 @@ export const DataExplorer = withStyles(styles)(
                                             </Tooltip>
                                         )}
                                     </Toolbar>
-                                    {isMSToolbarVisible && <MultiselectToolbar />}
+                                    {isMSToolbarVisible && <MultiselectToolbar actions={defaultActions} />}
                                 </Grid>
                             )}
                         </div>
diff --git a/src/components/multiselectToolbar/MultiselectToolbar.tsx b/src/components/multiselectToolbar/MultiselectToolbar.tsx
index 46c33ee3..ea00860d 100644
--- a/src/components/multiselectToolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselectToolbar/MultiselectToolbar.tsx
@@ -4,7 +4,7 @@
 
 import React from 'react';
 import { connect } from 'react-redux';
-import { StyleRulesCallback, withStyles, WithStyles, Toolbar } from '@material-ui/core';
+import { StyleRulesCallback, withStyles, WithStyles, Toolbar, Button } from '@material-ui/core';
 import { ArvadosTheme } from 'common/custom-theme';
 import { RootState } from 'store/store';
 
@@ -26,19 +26,29 @@ type MultiselectToolbarAction = {
     fn: () => void;
 };
 
-export type MultiselectToolbarActions = MultiselectToolbarAction[];
+export type MultiselectToolbarActions = {
+    actions: Array<MultiselectToolbarAction>;
+};
+
+export const defaultActions: Array<MultiselectToolbarAction> = [
+    {
+        name: 'foo',
+        fn: () => console.log('yo'),
+    },
+];
 
-// type MultiselectToolbarProps = MultiselectToolbarActions & WithStyles<CssRules>;
-type MultiselectToolbarProps = WithStyles<CssRules>;
+type MultiselectToolbarProps = MultiselectToolbarActions & WithStyles<CssRules>;
 
-export default connect(mapStateToProps)(
+export const MultiselectToolbar = connect(mapStateToProps)(
     withStyles(styles)((props: MultiselectToolbarProps) => {
-        const { classes } = props;
+        const { classes, actions } = props;
         return (
             <Toolbar className={classes.root}>
-                <div className={classes.item}>test1</div>
-                <div className={classes.item}>test2</div>
-                <div className={classes.item}>test3</div>
+                {actions.map((action, i) => (
+                    <Button key={i} onClick={action.fn}>
+                        {action.name}
+                    </Button>
+                ))}
             </Toolbar>
         );
     })

commit 3e3cd928c063419a580c2202fb1b18b8784909e1
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed May 10 12:51:00 2023 -0400

    15768: infinite redux crash fixed Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index e241fd20..e89fe4dd 100644
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -150,7 +150,6 @@ export const DataTable = withStyles(styles)(
             if (!arraysAreCongruent(prevProps.items, items)) {
                 if (isSelected === true) this.setState({ isSelected: false });
                 if (items.length) this.initializeCheckedList(items);
-                toggleMSToolbar(false);
             }
             if (prevState.checkedList !== checkedList) {
                 toggleMSToolbar(this.isAnySelected() ? true : false);

commit bc6b0f0c9586c28245e352189d7149a65417e0cf
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed May 10 11:56:36 2023 -0400

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

diff --git a/src/components/data-table-multiselect-popover/data-table-multiselect-popover.tsx b/src/components/data-table-multiselect-popover/data-table-multiselect-popover.tsx
index 6ff13384..1b58f9e8 100644
--- a/src/components/data-table-multiselect-popover/data-table-multiselect-popover.tsx
+++ b/src/components/data-table-multiselect-popover/data-table-multiselect-popover.tsx
@@ -8,6 +8,7 @@ import classnames from 'classnames';
 import { DefaultTransformOrigin } from 'components/popover/helpers';
 import debounce from 'lodash/debounce';
 import { grey } from '@material-ui/core/colors';
+import { TCheckedList } from 'components/data-table/data-table';
 
 export type CssRules = 'root' | 'icon' | 'iconButton' | 'optionsContainer' | 'option';
 
@@ -60,7 +61,7 @@ export type DataTableMultiselectOption = {
 export interface DataTableMultiselectProps {
     name: string;
     options: DataTableMultiselectOption[];
-    checkedList: Record<string, boolean>;
+    checkedList: TCheckedList;
 }
 
 interface DataTableFMultiselectPopState {
@@ -109,11 +110,6 @@ export const DataTableMultiselectPopover = withStyles(styles)(
                                         </div>
                                     ))}
                             </div>
-                            {/* <CardActions>
-                                <Button color='primary' variant='outlined' size='small' onClick={this.close}>
-                                    Close
-                                </Button>
-                            </CardActions> */}
                         </Card>
                     </Popover>
                     <this.MountHandler />

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


hooks/post-receive
--