Merge 2a2c21a into 6e44a66

DSD-DBS · Oct 7, 2024 · e1d17e8 · e1d17e8
2 parents 6e44a66 + 2a2c21a
commit e1d17e8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/...r-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.component.html b/...r-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.component.html
@@ -106,8 +106,11 @@ <h1 class="text-lg font-bold">Session File Browser</h1>
       <button
         mat-icon-button
         (click)="node.isExpanded = !node.isExpanded"
-        [attr.aria-label]="'Expand ' + node.name"
-        data-testid="folder-button"
+        [attr.aria-label]="
+          (node.isExpanded ? 'Collapse ' : 'Expand ') + node.name
+        "
+        [attr.data-testid]="'folder-button-' + node.name"
+        [attr.data-expanded]="node.isExpanded ? 'true' : 'false'"
       >
         <mat-icon class="text-blue-900">
           @if (node.isExpanded) {

diff --git a/.../user-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.stories.ts b/.../user-sessions-wrapper/active-sessions/file-browser-dialog/file-browser-dialog.stories.ts
@@ -45,6 +45,7 @@ export const Files: Story = {
         name: 'workspace',
         type: 'directory',
         isNew: false,
+        isExpanded: true,
         children: [
           {
             path: '/workspace/file1',
@@ -62,6 +63,7 @@ export const Files: Story = {
             path: '/workspace/directory1',
             name: 'directory1',
             type: 'directory',
+            isExpanded: true,
             children: [
               {
                 path: '/workspace/directory1/file1',
@@ -95,10 +97,11 @@ export const Files: Story = {
   },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    let folderButtons = canvas.getAllByTestId('folder-button');
-    await userEvent.click(folderButtons[0]);
-    folderButtons = canvas.getAllByTestId('folder-button');
-    await userEvent.click(folderButtons[1]);
+    const folderButton = canvas.getByTestId('folder-button-directory2');
+
+    // Needed to trigger Angular change detection
+    await userEvent.click(folderButton);
+    await userEvent.click(folderButton);
   },
 };
 
@@ -110,7 +113,7 @@ export const UploadNewFile: Story = {
         path: '/workspace',
         name: 'workspace',
         type: 'directory',
-        isNew: false,
+        isExpanded: true,
         children: [
           {
             path: '/workspace/file1',
@@ -136,11 +139,6 @@ export const UploadNewFile: Story = {
       },
     ]),
   },
-  play: async ({ canvasElement }) => {
-    const canvas = within(canvasElement);
-    const folderButton = canvas.getByTestId('folder-button');
-    await userEvent.click(folderButton);
-  },
 };
 
 export const UploadInProgress: Story = {