Skip to content

Commit 893771d

Browse files
added extended attribute
1 parent 61d7ef3 commit 893771d

File tree

2 files changed

+8
-9
lines changed
  • redisinsight/ui/src/pages/browser/components/virtual-tree/components/Node
  • tests/e2e/pageObjects/components/browser

2 files changed

+8
-9
lines changed

redisinsight/ui/src/pages/browser/components/virtual-tree/components/Node/Node.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ const Node = ({
154154
onKeyDown={handleKeyDown}
155155
tabIndex={0}
156156
onFocus={() => {}}
157-
data-testid={`node-item_${fullName}`}
157+
data-testid={`node-item_${fullName}${isOpen && !isLeaf ? '--expanded' : ''}`}
158158
>
159159
{!isLeaf && <Folder />}
160160
{isLeaf && <Leaf />}

tests/e2e/pageObjects/components/browser/tree-view.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ export class TreeView {
9393
*/
9494
async openTreeFolders(names: string[]): Promise<void> {
9595
let base = `node-item_${names[0]}:`;
96-
await this.clickElementIfNotExpanded(base, names[0]);
96+
await this.clickElementIfNotExpanded(base);
9797
if (names.length > 1) {
9898
for (let i = 1; i < names.length; i++) {
9999
base = `${base }${names[i]}:`;
100-
await this.clickElementIfNotExpanded(base, names[i]);
100+
await this.clickElementIfNotExpanded(base);
101101
}
102102
}
103103
}
@@ -124,13 +124,12 @@ export class TreeView {
124124
/**
125125
* click on the folder element if it is not expanded
126126
* @param base the base element
127-
* @param name of the folder
128127
*/
129-
private async clickElementIfNotExpanded(base: string, name: string): Promise<void> {
130-
const folderArrow = Selector(`[data-test-subj="node-arrow-icon_"${name[0]}"]`);
131-
const baseSelector = Selector(`[data-testid="${base}"]`);
132-
if (await baseSelector.find('div').count === 0 && await folderArrow.exists) {
133-
await t.click(Selector(`[data-testid="${base}"]`));
128+
private async clickElementIfNotExpanded(base: string): Promise<void> {
129+
const baseSelector = Selector(`[data-testid^="${base}"]`);
130+
const elementSelector = await baseSelector.getAttribute('data-testid');
131+
if (!elementSelector?.includes('expanded')) {
132+
await t.click(Selector(`[data-testid^="${base}"]`));
134133
}
135134
}
136135
}

0 commit comments

Comments
 (0)