[arvados] created: 2.7.0-6002-gaf8d161b1c

[git repository hosting]

        at  af8d161b1c3466d2d6fdfb3b1ce94ca73d8fea86 (commit)


commit af8d161b1c3466d2d6fdfb3b1ce94ca73d8fea86
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Mon Feb 12 15:15:24 2024 -0500

    21386: not found only shows on 404 Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/components/details-attribute/details-attribute.tsx b/services/workbench2/src/components/details-attribute/details-attribute.tsx
index c10f558e77..d965b60f5b 100644
--- a/services/workbench2/src/components/details-attribute/details-attribute.tsx
+++ b/services/workbench2/src/components/details-attribute/details-attribute.tsx
@@ -87,7 +87,7 @@ export const DetailsAttribute = connect(mapStateToProps)(withStyles(styles)(
 
         render() {
             const { uuidEnhancer, link, value, classes, linkToUuid,
-                localCluster, remoteHostsConfig, sessions, label } = this.props;
+                localCluster, remoteHostsConfig, sessions } = this.props;
             let valueNode: React.ReactNode;
 
             if (linkToUuid) {
diff --git a/services/workbench2/src/views/project-panel/project-panel.tsx b/services/workbench2/src/views/project-panel/project-panel.tsx
index 83b6c8ba47..9e42513e06 100644
--- a/services/workbench2/src/views/project-panel/project-panel.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel.tsx
@@ -244,6 +244,7 @@ interface ProjectPanelDataProps {
     isAdmin: boolean;
     userUuid: string;
     dataExplorerItems: any;
+    working: boolean;
 }
 
 type ProjectPanelProps = ProjectPanelDataProps & DispatchProp & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
@@ -251,7 +252,9 @@ 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);
     return {
+        working,
         currentItemId,
         project,
         resources: state.resources,
@@ -259,9 +262,28 @@ const mapStateToProps = (state: RootState) => {
     };
 }
 
+type ProjectPanelState = {
+    isLoaded: boolean;
+};
+
 export const ProjectPanel = withStyles(styles)(
     connect(mapStateToProps)(
         class extends React.Component<ProjectPanelProps> {
+
+            state: ProjectPanelState ={
+                isLoaded: false,
+            }
+
+            componentDidMount(): void {
+                this.setState({ isLoaded: false });
+            }
+
+            componentDidUpdate( prevProps: Readonly<ProjectPanelProps>, prevState: Readonly<{}>, snapshot?: any ): void {
+                if(prevProps.working === true && this.props.working === false) {
+                    this.setState({ isLoaded: true });
+                }
+            }
+
             render() {
                 const { classes } = this.props;
 
@@ -277,11 +299,12 @@ export const ProjectPanel = withStyles(styles)(
                             defaultViewMessages={DEFAULT_VIEW_MESSAGES}
                         />
                     </div>
-                    :
+                    : this.state.isLoaded ?
                     <NotFoundView
                         icon={ProjectIcon}
                         messages={["Project not found"]}
                     />
+                    : null
             }
 
             isCurrentItemChild = (resource: Resource) => {

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


hooks/post-receive
--