Yadciel/taskcafe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix flashing on pollInterval

Browse Source
This commit is contained in:
Jordan Knott
2020-12-23 20:02:38 -06:00
parent 9f27bd157f
commit 8d3b0bd510
8 changed files with 27 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/Projects/Project/Board/index.tsx
View File

@ -459,9 +459,6 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
}
};
if (loading) {
return <BoardLoading />;
}
const getTaskStatusFilterLabel = (filter: TaskStatusFilter) => {
if (filter.status === TaskStatus.COMPLETE) {
return 'Complete';
@ -818,7 +815,7 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
);
}
return <span>Error</span>;
return <BoardLoading />;
};
export default ProjectBoard;

15
frontend/src/Projects/Project/index.tsx
View File

@ -517,14 +517,6 @@ const Project = () => {
document.title = `${data.findProject.name} | Taskcafé`;
}
}, [data]);
if (loading) {
return (
<>
<GlobalTopNavbar onSaveProjectName={NOOP} name="" projectID={null} />
<BoardLoading />
</>
);
}
if (error) {
history.push('/projects');
}
@ -637,7 +629,12 @@ const Project = () => {
</>
);
}
return <div>Error</div>;
return (
<>
<GlobalTopNavbar onSaveProjectName={NOOP} name="" projectID={null} />
<BoardLoading />
</>
);
};
export default Project;