X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c08ec9f2612ffa2ceef5405d357e5c5b8cb608c9..04704ea80b294655fe14d0c8cddf4ec1a6b21b4d:/services/workbench2/src/views/project-panel/project-panel.tsx diff --git a/services/workbench2/src/views/project-panel/project-panel.tsx b/services/workbench2/src/views/project-panel/project-panel.tsx index 112f09968a..2ddfca8178 100644 --- a/services/workbench2/src/views/project-panel/project-panel.tsx +++ b/services/workbench2/src/views/project-panel/project-panel.tsx @@ -51,12 +51,9 @@ import { GroupClass, GroupResource } from 'models/group'; import { CollectionResource } from 'models/collection'; import { resourceIsFrozen } from 'common/frozen-resources'; import { ProjectResource } from 'models/project'; -import { NotFoundView } from 'views/not-found-panel/not-found-panel'; import { deselectAllOthers, toggleOne } from 'store/multiselect/multiselect-actions'; -import { PendingIcon } from 'components/icon/icon'; -import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view'; -type CssRules = 'root' | 'button' | 'loader' | 'notFoundView'; +type CssRules = 'root' | 'button' ; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { @@ -65,18 +62,6 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ button: { marginLeft: theme.spacing.unit, }, - loader: { - top: "25%", - left: "46.5%", - marginLeft: "-84px", - position: "absolute", - }, - notFoundView: { - top: "30%", - left: "50%", - marginLeft: "-84px", - position: "absolute", - }, }); export enum ProjectPanelColumnNames { @@ -266,9 +251,7 @@ type ProjectPanelProps = ProjectPanelDataProps & DispatchProp & WithStyles { const currentItemId = getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties); const project = getResource(currentItemId || "")(state.resources); - const working = !!state.progressIndicator.some(p => p.id === PROJECT_PANEL_ID && p.working); return { - working, currentItemId, project, resources: state.resources, @@ -276,57 +259,23 @@ const mapStateToProps = (state: RootState) => { }; } -type ProjectPanelState = { - isLoaded: boolean; -}; - export const ProjectPanel = withStyles(styles)( connect(mapStateToProps)( class extends React.Component { - state: ProjectPanelState ={ - isLoaded: false, - } - - componentDidMount(): void { - this.setState({ isLoaded: false }); - } - - componentDidUpdate( prevProps: Readonly, prevState: Readonly<{}>, snapshot?: any ): void { - if(prevProps.working === true && this.props.working === false) { - this.setState({ isLoaded: true }); - } - } - render() { const { classes } = this.props; - - return this.props.project ? -
- -
- : this.state.isLoaded ? -
- -
- : -
- -
+ return
+ +
} isCurrentItemChild = (resource: Resource) => {