[arvados] updated: 2.7.0-6054-gf9e39b9d8a

git repository hosting git at public.arvados.org
Thu Feb 22 16:39:22 UTC 2024


Summary of changes:
 services/workbench2/cypress/integration/page-not-found.spec.js    | 2 +-
 .../data-table-default-view/data-table-default-view.tsx           | 2 +-
 services/workbench2/src/components/data-table/data-table.tsx      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

       via  f9e39b9d8ae46c3e1200e3eddc0bc68ea6ce0925 (commit)
      from  e86a96f413affec0a05a9843d2e8d960000843b6 (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 f9e39b9d8ae46c3e1200e3eddc0bc68ea6ce0925
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Thu Feb 22 11:39:18 2024 -0500

    21386: fixed not found test Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/cypress/integration/page-not-found.spec.js b/services/workbench2/cypress/integration/page-not-found.spec.js
index 6eab27c827..209dcdfac2 100644
--- a/services/workbench2/cypress/integration/page-not-found.spec.js
+++ b/services/workbench2/cypress/integration/page-not-found.spec.js
@@ -45,7 +45,7 @@ describe('Page not found tests', function() {
             cy.goToPath(path);
 
             // then
-            cy.get('[data-cy=not-found-view]').should('exist');
+            cy.get('[data-cy=data-table-default-view]').should('exist');
         });
     });
 })
diff --git a/services/workbench2/src/components/data-table-default-view/data-table-default-view.tsx b/services/workbench2/src/components/data-table-default-view/data-table-default-view.tsx
index b245c19ba9..caf0bef752 100644
--- a/services/workbench2/src/components/data-table-default-view/data-table-default-view.tsx
+++ b/services/workbench2/src/components/data-table-default-view/data-table-default-view.tsx
@@ -24,5 +24,5 @@ export const DataTableDefaultView = withStyles(styles)(
         const icon = props.icon || DetailsIcon;
         const filterWarning: string[] = props.filtersApplied ? ['Filters are applied to the data.'] : [];
         const messages = filterWarning.concat(props.messages || ['No items found']);
-        return <DefaultView {...classes} {...{ icon, messages }} />;
+        return <DefaultView data-cy="data-table-default-view" {...classes} {...{ icon, messages }} />;
     });
diff --git a/services/workbench2/src/components/data-table/data-table.tsx b/services/workbench2/src/components/data-table/data-table.tsx
index c1b5167b46..f58bbce1e3 100644
--- a/services/workbench2/src/components/data-table/data-table.tsx
+++ b/services/workbench2/src/components/data-table/data-table.tsx
@@ -168,7 +168,10 @@ export const DataTable = withStyles(styles)(
             if (prevProps.currentRoute !== this.props.currentRoute) {
                 this.initializeCheckedList([])
             }
-            if((prevProps.working === true && this.props.working === false || this.props.items.length > 0) && !this.state.isLoaded) {
+            if(prevProps.working === true && this.props.working === false) {
+                this.setState({ isLoaded: true });
+            }
+            if((this.props.items.length > 0) && !this.state.isLoaded) {
                 this.setState({ isLoaded: true });
             }
         }
@@ -295,7 +298,6 @@ export const DataTable = withStyles(styles)(
             const { isLoaded } = this.state;
             if (columns[0].name === this.checkBoxColumn.name) columns.shift();
             columns.unshift(this.checkBoxColumn);
-            console.log(items)
             return (
                 <div className={classes.root}>
                     <div className={classes.content}>
@@ -315,7 +317,6 @@ export const DataTable = withStyles(styles)(
             const { isLoaded } = this.state;
             const { working, isNotFound } = this.props;
             const dirty = columns.some(column => getTreeDirty("")(column.filters));
-            console.log('isNotFound', isNotFound, 'isLoaded', isLoaded, 'working', working, )
             if (isNotFound && isLoaded) {
                 return (
                     <DataTableDefaultView 
@@ -410,7 +411,6 @@ export const DataTable = withStyles(styles)(
         );
 
         renderBodyRow = (item: any, index: number) => {
-            console.log('item', item)
             const { onRowClick, onRowDoubleClick, extractKey, classes, currentItemUuid, currentRoute } = this.props;
             return (
                 <TableRow

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list