Skip to content

feat: conditional selection #246

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
amhsirak merged 8 commits into from
Dec 11, 2024
Merged

feat: conditional selection #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c994072
feat: pass listSelector getRect and getElementInfo
amhsirak Dec 10, 2024
81bbba4
feat: condtionally handle getRect & getelementInfo
amhsirak Dec 10, 2024
a34e865
chore: lint
amhsirak Dec 10, 2024
8533ea5
chore: remove unused imprts
amhsirak Dec 10, 2024
0b1b243
chore: remove todo
amhsirak Dec 10, 2024
fea0c03
chore: cleanup
amhsirak Dec 10, 2024
b72baca
docs: re-add jsdoc
amhsirak Dec 10, 2024
d6e4b88
chore: remove console logs
amhsirak Dec 10, 2024
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
9 changes: 3 additions & 6 deletions server/src/workflow-management/classes/Generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,7 @@ export class WorkflowGenerator {
* @returns {Promise<string|null>}
*/
private generateSelector = async (page: Page, coordinates: Coordinates, action: ActionType) => {
const elementInfo = await getElementInformation(page, coordinates);

const elementInfo = await getElementInformation(page, coordinates, this.listSelector);
const selectorBasedOnCustomAction = (this.getList === true)
? await getNonUniqueSelectors(page, coordinates)
: await getSelectors(page, coordinates);
Expand Down Expand Up @@ -570,16 +569,14 @@ export class WorkflowGenerator {
* @returns {Promise<void>}
*/
public generateDataForHighlighter = async (page: Page, coordinates: Coordinates) => {
const rect = await getRect(page, coordinates);
const rect = await getRect(page, coordinates, this.listSelector);
const displaySelector = await this.generateSelector(page, coordinates, ActionType.Click);
const elementInfo = await getElementInformation(page, coordinates);
const elementInfo = await getElementInformation(page, coordinates, this.listSelector);
if (rect) {
if (this.getList === true) {
if (this.listSelector !== '') {
const childSelectors = await getChildSelectors(page, this.listSelector || '');
this.socket.emit('highlighter', { rect, selector: displaySelector, elementInfo, childSelectors })
console.log(`Child Selectors: ${childSelectors}`)
console.log(`Parent Selector: ${this.listSelector}`)
} else {
this.socket.emit('highlighter', { rect, selector: displaySelector, elementInfo });
}
Expand Down
Loading