[arvados] updated: 2.7.0-6007-g2ace2e7ca4
git repository hosting
git at public.arvados.org
Tue Feb 20 18:53:51 UTC 2024
Summary of changes:
services/workbench2/src/components/data-table/data-table.tsx | 5 +++--
.../workbench2/src/views-components/data-explorer/data-explorer.tsx | 2 ++
services/workbench2/src/views/project-panel/project-panel.tsx | 3 ---
3 files changed, 5 insertions(+), 5 deletions(-)
via 2ace2e7ca42a3949de3e6c0327cd2648f344dee9 (commit)
from 2cfa4357aa0c3e5fe45324b2a37a90ddbf689b2a (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 2ace2e7ca42a3949de3e6c0327cd2648f344dee9
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Feb 20 13:53:43 2024 -0500
21386: cleanup Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/data-table/data-table.tsx b/services/workbench2/src/components/data-table/data-table.tsx
index d1c7e1fc9d..fb5886681c 100644
--- a/services/workbench2/src/components/data-table/data-table.tsx
+++ b/services/workbench2/src/components/data-table/data-table.tsx
@@ -291,7 +291,7 @@ export const DataTable = withStyles(styles)(
};
render() {
- const { items, classes, working, columns, is404 } = this.props;
+ const { items, classes, columns, is404 } = this.props;
const { isLoaded } = this.state;
if (columns[0].name === this.checkBoxColumn.name) columns.shift();
columns.unshift(this.checkBoxColumn);
@@ -323,10 +323,11 @@ export const DataTable = withStyles(styles)(
return (
<DataTableDefaultView
icon={this.props.defaultViewIcon}
- messages={["Project not found"]}
+ messages={["Item not found"]}
/>
);
} else {
+ //if (isLoaded && !is404)
return (
<DataTableDefaultView
icon={this.props.defaultViewIcon}
diff --git a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
index a56c839242..978c2014d4 100644
--- a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
@@ -25,6 +25,7 @@ interface Props {
}
const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect, detailsPanel, properties}: RootState, { id }: Props) => {
+ const working = !!progressIndicator.some(p => p.id === id && p.working);
const dataExplorerState = getDataExplorer(dataExplorer, id);
const currentRoute = router.location ? router.location.pathname : "";
const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || "";
@@ -41,6 +42,7 @@ const mapStateToProps = ({ progressIndicator, dataExplorer, router, multiselect,
currentItemUuid,
isMSToolbarVisible,
checkedList: multiselect.checkedList,
+ working,
};
};
diff --git a/services/workbench2/src/views/project-panel/project-panel.tsx b/services/workbench2/src/views/project-panel/project-panel.tsx
index 5e09bfa834..458c312742 100644
--- a/services/workbench2/src/views/project-panel/project-panel.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel.tsx
@@ -264,10 +264,8 @@ type ProjectPanelProps = ProjectPanelDataProps & DispatchProp & WithStyles<CssRu
const mapStateToProps = (state: RootState) => {
const currentItemId = getProperty<string>(PROJECT_PANEL_CURRENT_UUID)(state.properties);
const project = getResource<GroupResource>(currentItemId || "")(state.resources);
- const working = !!state.progressIndicator.some(p => p.id === PROJECT_PANEL_ID && p.working);
const is404 = state.dataExplorer[PROJECT_PANEL_ID].isResponse404;
return {
- working,
currentItemId,
project,
is404,
@@ -291,7 +289,6 @@ export const ProjectPanel = withStyles(styles)(
contextMenuColumn={true}
defaultViewIcon={ProjectIcon}
defaultViewMessages={DEFAULT_VIEW_MESSAGES}
- working={this.props.working}
is404={this.props.is404}
/>
</div>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list