fix(bulk): broken gdrive type detection (#744)

adobe · May 24, 2024 · 545d114 · 545d114
1 parent f1f837a
commit 545d114
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/src/extension/module.js b/src/extension/module.js
@@ -1758,7 +1758,7 @@ import sampleRUM from './rum.js';
         return [...document.querySelectorAll('#drive_main_page [role="row"][aria-selected="true"]')]
           // extract file name and type
           .map((row) => {
-            const typeHint = (row.querySelector(':scope div[role="gridcell"] > div:nth-child(2) > div > div[data-tooltip]') // list layout
+            const typeHint = (row.querySelector(':scope div[role="gridcell"] > div:nth-child(2) > div:nth-child(1)') // list layout
               || row.querySelector(':scope div[role="gridcell"]'))?.getAttribute('aria-label'); // grid layout
             let type = 'unknown';
             if (typeHint) {

diff --git a/test/fixtures/admin-gdrive.html b/test/fixtures/admin-gdrive.html
@@ -9,9 +9,7 @@
         <div>
         </div>
         <div>
-          <div>
-            <div data-tooltip="Google Drive Folder: folder" aria-label="Google Drive Folder: folder">folder</div>
-          </div>
+          <div data-tooltip="Google Drive Folder: folder" aria-label="folder Shared Google Drive Folder">folder</div>
         </div>
       </div>
     </div>
@@ -20,9 +18,7 @@
         <div>
         </div>
         <div>
-          <div>
-            <div data-tooltip="PDF: file.pdf" aria-label="PDF: file.pdf">file.pdf</div>
-          </div>
+          <div data-tooltip="PDF: file.pdf" aria-label="file.pdf Shared PDF">file.pdf</div>
         </div>
       </div>
     </div>
@@ -31,9 +27,7 @@
         <div>
         </div>
         <div>
-          <div>
-            <div data-tooltip="Google Docs: document" aria-label="Google Docs: document">document</div>
-          </div>
+          <div data-tooltip="Google Docs: document" aria-label="document Shared Google Docs">document</div>
         </div>
       </div>
     </div>
@@ -42,9 +36,7 @@
         <div>
         </div>
         <div>
-          <div>
-            <div data-tooltip="Google Sheets: spreadsheet" aria-label="Google Sheets: spreadsheet">spreadsheet</div>
-          </div>
+          <div data-tooltip="Google Sheets: spreadsheet" aria-label="spreadsheet Shared Google Sheets">spreadsheet</div>
         </div>
       </div>
     </div>
@@ -53,9 +45,7 @@
         <div>
         </div>
         <div>
-          <div>
-            <div data-tooltip="Word: document.docx" aria-label="Word: document.docx">document.docx</div>
-          </div>
+          <div data-tooltip="Word: document.docx" aria-label="document.docx Shared Word">document.docx</div>
         </div>
       </div>
     </div>
@@ -64,9 +54,7 @@
         <div>
         </div>
         <div>
-          <div>
-            <div data-tooltip="Excel: spreadsheet.xlsx" aria-label="Excel: spreadsheet.xlsx">spreadsheet.xlsx</div>
-          </div>
+          <div data-tooltip="Excel: spreadsheet.xlsx" aria-label="spreadsheet.xlsx Shared Excel">spreadsheet.xlsx</div>
         </div>
       </div>
     </div>
@@ -75,9 +63,7 @@
         <div>
         </div>
         <div>
-          <div>
-            <div data-tooltip="Google Docs: foo/../bar" aria-label="Google Docs: foo/../bar">foo/../bar</div>
-          </div>
+          <div data-tooltip="Google Docs: foo/../bar" aria-label="foo/../bar Shared Google Docs">foo/../bar</div>
         </div>
       </div>
     </div>