projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2cfa435
)
21386: cleanup Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>
author
Lisa Knox <lisaknox83@gmail.com>
Tue, 20 Feb 2024 18:53:43 +0000
(13:53 -0500)
committer
Lisa Knox <lisaknox83@gmail.com>
Tue, 20 Feb 2024 18:53:43 +0000
(13:53 -0500)
services/workbench2/src/components/data-table/data-table.tsx
patch
|
blob
|
history
services/workbench2/src/views-components/data-explorer/data-explorer.tsx
patch
|
blob
|
history
services/workbench2/src/views/project-panel/project-panel.tsx
patch
|
blob
|
history
diff --git
a/services/workbench2/src/components/data-table/data-table.tsx
b/services/workbench2/src/components/data-table/data-table.tsx
index d1c7e1fc9d55758099fb96e18b678d3665b7f321..fb5886681c3352d04436f559ef124a3ea2f1a140 100644
(file)
--- 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() {
};
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);
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}
return (
<DataTableDefaultView
icon={this.props.defaultViewIcon}
- messages={["
Project
not found"]}
+ messages={["
Item
not found"]}
/>
);
} else {
/>
);
} else {
+ //if (isLoaded && !is404)
return (
<DataTableDefaultView
icon={this.props.defaultViewIcon}
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 a56c839242678d756ced6b0ab44f5d4dec1ba878..978c2014d4bf0c67c4c345d13cabe819bd337e7b 100644
(file)
--- 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 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) || "";
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,
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 5e09bfa8345f4e9f24c34f5efc0871c27814a6e6..458c312742cf18866cd92e6f2b330ad19841e8f5 100644
(file)
--- 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 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 {
const is404 = state.dataExplorer[PROJECT_PANEL_ID].isResponse404;
return {
- working,
currentItemId,
project,
is404,
currentItemId,
project,
is404,
@@
-291,7
+289,6
@@
export const ProjectPanel = withStyles(styles)(
contextMenuColumn={true}
defaultViewIcon={ProjectIcon}
defaultViewMessages={DEFAULT_VIEW_MESSAGES}
contextMenuColumn={true}
defaultViewIcon={ProjectIcon}
defaultViewMessages={DEFAULT_VIEW_MESSAGES}
- working={this.props.working}
is404={this.props.is404}
/>
</div>
is404={this.props.is404}
/>
</div>