Skip to content

fix: improve peformance while retrieving multiple elements #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vobu merged 2 commits into from
May 16, 2025
Merged

fix: improve peformance while retrieving multiple elements #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be4714c
fix: improve peformance while retrieving multiple elements
Siolto Apr 17, 2025
8d17461
feat: check for UI5 manually when retrieving multiple controls
Siolto May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions client-side-js/getControl.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ async function clientSide_getControl(controlSelector, browserInstance) {
if (controlSelector.timeout) {
waitForUI5Options.timeout = controlSelector.timeout
}

try {
await window.bridge.waitForUI5(waitForUI5Options)
} catch (error) {
return window.wdi5.errorHandling(error)
// skip waitForUI5 (only used internally!)
if (!controlSelector._skipWaitForUI5) {
try {
await window.bridge.waitForUI5(waitForUI5Options)
} catch (error) {
return window.wdi5.errorHandling(error)
}
}

window.wdi5.Log.info("[browser wdi5] locating " + JSON.stringify(controlSelector))
Expand Down
14 changes: 7 additions & 7 deletions src/lib/wdi5-control.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { clientSide_getControl } from "../../client-side-js/getControl.cjs"
import { clientSide_interactWithControl } from "../../client-side-js/interactWithControl.cjs"
import { clientSide_executeControlMethod } from "../../client-side-js/executeControlMethod.cjs"
import { clientSide_getAggregation } from "../../client-side-js/_getAggregation.cjs"
import { clientSide__checkForUI5Ready } from "../../client-side-js/_checkForUI5Ready.cjs"
import { clientSide_fireEvent } from "../../client-side-js/fireEvent.cjs"
import { clientSide_ui5Response, wdi5ControlMetadata, wdi5Selector } from "../types/wdi5.types.js"
import { Logger as _Logger } from "./Logger.js"
Expand Down Expand Up @@ -369,17 +370,16 @@ export class WDI5Control {
forceSelect: this._forceSelect,
selector: {
id: control.id
}
},
// skip the waitForUI5 check. We will do this manually once before the actual control retrieval
_skipWaitForUI5: true
}

// get wdi5 control
// TODO bidi is to fast for Promise.all so we await it right away => makes it slower
if (this._browserInstance.isBidi) {
aResultOfPromises.push(await this._browserInstance.asControl(selector))
} else {
aResultOfPromises.push(this._browserInstance.asControl(selector))
}
aResultOfPromises.push(this._browserInstance.asControl(selector))
}
// waitForUI5 check manually
await clientSide__checkForUI5Ready(this._browserInstance)
return await Promise.all(aResultOfPromises)
} else {
if (this._logging) {
Expand Down
Loading