Skip to content

Commit b6e2fdf

Browse files
committed
Pushed linting and error handling fix
1 parent c2843a0 commit b6e2fdf

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

packages/test-app-frontend/src/App/ITwinJsApp/AppUi/PropertyComparisonTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ function mapStateToProps(state: { versionCompareState: VersionCompareState; }, o
5656
await manager.enableVisualization(true, selection);
5757
updateVersionComparisonTransparencies(viewports[0], 0.5, 0.5);
5858
},
59-
10000,
59+
1000,
6060
);
6161
} else if (PropertyComparisonFrontstage.isSideBySide) {
6262
await VersionCompareFrontstageManager.onViewPortMounts(
6363
2,
6464
async () => {
6565
await manager.enableSideBySideVisualization();
6666
},
67-
10000,
67+
1000,
6868
);
6969
}
7070
};

packages/test-app-frontend/src/App/ITwinJsApp/AppUi/VersionCompareFrontstageManager.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export class VersionCompareFrontstageManager {
137137
viewports[1].applyViewState(this._targetViewportState);
138138
await this._onPropertyComparisonFrontstageOpened();
139139
},
140-
10000,
140+
1000,
141141
);
142142
} else {
143143
// Stop property comparison
@@ -418,14 +418,17 @@ export class VersionCompareFrontstageManager {
418418
// Timeout to prevent hanging
419419
setTimeout(() => {
420420
IModelApp.viewManager.onViewOpen.removeListener(onViewOpenHandler);
421-
vps.length = 0;
422-
for( const vp of IModelApp.viewManager) {
423-
vps.push(vp);
424-
}
425-
if( vps.length === numberOfViewPorts) {
426-
// Call function once view ports are mounted
427-
func(vps).then(resolve).catch(reject);
428-
return;
421+
// try to repopulate vps in case viewports were opened before we added the listener
422+
if (vps.length !== numberOfViewPorts) {
423+
vps.length = 0;
424+
for (const vp of IModelApp.viewManager) {
425+
vps.push(vp);
426+
}
427+
if (vps.length === numberOfViewPorts) {
428+
// Call function once view ports are mounted
429+
func(vps).then(resolve).catch(reject);
430+
return;
431+
}
429432
}
430433
reject(new Error(`Timeout: Expected ${numberOfViewPorts} viewports to mount within ${timeoutMs}ms`));
431434
}, timeoutMs);

0 commit comments

Comments
 (0)