mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential white screen when creating workspaces (Closes #1833)

Browse Source
This commit is contained in:
Gregory Schier 2019-12-10 11:29:48 -05:00
parent d330bb5c70
commit 5eb529c33b
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/insomnia-app/app/ui/containers/app.js
View File

@ -91,10 +91,9 @@ class App extends PureComponent {
vcs: null,
forceRefreshCounter: 0,
forceRefreshHeaderCounter: 0,
isMigratingChildren: false,
};
this._isMigratingChildren = false;
this._getRenderContextPromiseCache = {};
this._savePaneWidth = debounce(paneWidth => this._updateActiveWorkspaceMeta({ paneWidth }));
@ -1025,7 +1024,7 @@ class App extends PureComponent {
document.removeEventListener('mousemove', this._handleMouseMove);
}
async _ensureWorkspaceChildren(props) {
_ensureWorkspaceChildren(props) {
const { activeWorkspace, activeCookieJar, environments } = props;
const baseEnvironments = environments.filter(e => e.parentId === activeWorkspace._id);
@ -1035,19 +1034,23 @@ class App extends PureComponent {
}
// We already started migrating. Let it finish.
if (this._isMigratingChildren) {
if (this.state.isMigratingChildren) {
return;
}
// Prevent rendering of everything
this._isMigratingChildren = true;
this.setState({ isMigratingChildren: true }, async () => {
console.log('START');
const flushId = await db.bufferChanges();
console.log('.');
await models.environment.getOrCreateForWorkspace(activeWorkspace);
console.log('.');
await models.cookieJar.getOrCreateForParentId(activeWorkspace._id);
console.log('.');
await db.flushChanges(flushId);
const flushId = await db.bufferChanges();
await models.environment.getOrCreateForWorkspace(activeWorkspace);
await models.cookieJar.getOrCreateForParentId(activeWorkspace._id);
await db.flushChanges(flushId);
this._isMigratingChildren = false;
this.setState({ isMigratingChildren: false });
});
}
componentWillReceiveProps(nextProps) {
@ -1065,11 +1068,13 @@ class App extends PureComponent {
}
render() {
if (this._isMigratingChildren) {
if (this.state.isMigratingChildren) {
console.log('[app] Waiting for migration to complete');
return null;
}
console.log('MIGRATION COMPLETE');
const { activeWorkspace } = this.props;
const {