[arvados-workbench2] updated: 2.6.0-119-gddfb91e9

git repository hosting git at public.arvados.org
Tue Oct 3 14:02:23 UTC 2023


Summary of changes:
 cypress/integration/collection.spec.js             |  2 +-
 cypress/integration/process.spec.js                |  2 +-
 .../data-table-multiselect-popover.tsx             | 87 ++++++++++------------
 3 files changed, 43 insertions(+), 48 deletions(-)

       via  ddfb91e9eee0902fba8b972e2724b2eb4707654a (commit)
       via  e579262441bc63d300de37eef08c827e0d69ead6 (commit)
       via  29bf848cd280e8873dc82b7407bac31390e8dc9d (commit)
      from  09749ef22f0e66b55aa6f448f23dbeadcd2e6321 (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 ddfb91e9eee0902fba8b972e2724b2eb4707654a
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Tue Oct 3 10:02:15 2023 -0400

    15768: removed submit func from ms popover 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 6a38581e..08ff6b02 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
@@ -2,34 +2,34 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import React, { useEffect } from 'react';
-import { WithStyles, withStyles, ButtonBase, StyleRulesCallback, Theme, Popover, Card, Tooltip, IconButton } from '@material-ui/core';
-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';
+import React, { useEffect } from "react";
+import { WithStyles, withStyles, ButtonBase, StyleRulesCallback, Theme, Popover, Card, Tooltip, IconButton } from "@material-ui/core";
+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' | 'disabled' | 'optionsContainer' | 'option';
+export type CssRules = "root" | "icon" | "iconButton" | "disabled" | "optionsContainer" | "option";
 
 const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
     root: {
-        borderRadius: '7px',
-        '&:hover': {
+        borderRadius: "7px",
+        "&:hover": {
             backgroundColor: grey[200],
         },
-        '&:focus': {
+        "&:focus": {
             color: theme.palette.text.primary,
         },
     },
     icon: {
-        cursor: 'pointer',
+        cursor: "pointer",
         fontSize: 20,
-        userSelect: 'none',
-        '&:hover': {
+        userSelect: "none",
+        "&:hover": {
             color: theme.palette.text.primary,
         },
-        paddingBottom: '5px',
+        paddingBottom: "5px",
     },
     iconButton: {
         color: theme.palette.text.primary,
@@ -41,17 +41,17 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
         color: grey[500],
     },
     optionsContainer: {
-        padding: '1rem 0',
+        padding: "1rem 0",
         flex: 1,
     },
     option: {
-        cursor: 'pointer',
-        display: 'flex',
-        padding: '3px 2rem',
-        fontSize: '0.9rem',
-        alignItems: 'center',
-        '&:hover': {
-            backgroundColor: 'rgba(0, 0, 0, 0.08)',
+        cursor: "pointer",
+        display: "flex",
+        padding: "3px 2rem",
+        fontSize: "0.9rem",
+        alignItems: "center",
+        "&:hover": {
+            backgroundColor: "rgba(0, 0, 0, 0.08)",
         },
     },
 });
@@ -83,13 +83,25 @@ export const DataTableMultiselectPopover = withStyles(styles)(
             const { classes, children, options, checkedList, disabled } = this.props;
             return (
                 <>
-                    <Tooltip disableFocusListener title='Select Options'>
-                        <ButtonBase className={classnames(classes.root)} component='span' onClick={disabled ? () => {} : this.open} disableRipple>
+                    <Tooltip
+                        disableFocusListener
+                        title="Select Options"
+                    >
+                        <ButtonBase
+                            className={classnames(classes.root)}
+                            component="span"
+                            onClick={disabled ? () => {} : this.open}
+                            disableRipple
+                        >
                             {children}
-                            <IconButton component='span' classes={{ root: classes.iconButton }} tabIndex={-1}>
+                            <IconButton
+                                component="span"
+                                classes={{ root: classes.iconButton }}
+                                tabIndex={-1}
+                            >
                                 <i
-                                    className={`${classnames(['fas fa-sort-down', classes.icon])}${disabled ? ` ${classes.disabled}` : ''}`}
-                                    data-fa-transform='shrink-3'
+                                    className={`${classnames(["fas fa-sort-down", classes.icon])}${disabled ? ` ${classes.disabled}` : ""}`}
+                                    data-fa-transform="shrink-3"
                                     ref={this.icon}
                                 />
                             </IconButton>
@@ -120,7 +132,6 @@ export const DataTableMultiselectPopover = withStyles(styles)(
                             </div>
                         </Card>
                     </Popover>
-                    <this.MountHandler />
                 </>
             );
         }
@@ -129,24 +140,8 @@ export const DataTableMultiselectPopover = withStyles(styles)(
             this.setState({ anchorEl: this.icon.current || undefined });
         };
 
-        submit = debounce(() => {
-            // const { onChange } = this.props;
-            // if (onChange) {
-            //     onChange(this.state.filters);
-            // }
-        }, 1000);
-
-        MountHandler = () => {
-            useEffect(() => {
-                return () => {
-                    this.submit.cancel();
-                };
-            }, []);
-            return null;
-        };
-
         close = () => {
-            this.setState((prev) => ({
+            this.setState(prev => ({
                 ...prev,
                 anchorEl: undefined,
             }));

commit e579262441bc63d300de37eef08c827e0d69ead6
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Tue Oct 3 09:43:46 2023 -0400

    15768: uncommented image preview test spec Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/cypress/integration/process.spec.js b/cypress/integration/process.spec.js
index 3774c3ea..4424b035 100644
--- a/cypress/integration/process.spec.js
+++ b/cypress/integration/process.spec.js
@@ -1015,7 +1015,7 @@ describe("Process tests", function () {
                     cy.get('[data-cy="io-preview-image-toggle"]').click({ waitForAnimations: false });
                     const outPdh = testOutputCollection.portable_data_hash;
                     verifyIOParameter("output_file", null, "Label Description", "cat.png", `${outPdh}`);
-                    // verifyIOParameterImage("output_file", `/c=${outPdh}/cat.png`);
+                    verifyIOParameterImage("output_file", `/c=${outPdh}/cat.png`);
                     verifyIOParameter("output_file_with_secondary", null, "Doc Description", "main.dat", `${outPdh}`);
                     verifyIOParameter("output_file_with_secondary", null, "Doc Description", "secondary.dat", undefined, true);
                     verifyIOParameter("output_file_with_secondary", null, "Doc Description", "secondary2.dat", undefined, true);

commit 29bf848cd280e8873dc82b7407bac31390e8dc9d
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Tue Oct 3 09:38:51 2023 -0400

    15768: fixed waitfordom args in collection spec Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index 719a75fa..8145ec3f 100644
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -1011,7 +1011,7 @@ describe("Collection panel tests", function () {
                         // subdir gets unselected, I think this is a bug but
                         // for the time being let's just make sure the test works.
                         cy.get("[data-cy=collection-files-panel]").contains("subdir").click();
-                        cy.waitForDom({ ficre: true }).get("[data-cy=collection-files-right-panel]").contains("5mb_b.bin").should("exist");
+                        cy.waitForDom().get("[data-cy=collection-files-right-panel]").contains("5mb_b.bin").should("exist");
                     });
                 });
             });

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list