@yuuvis/app-drive 3.4.2 → 3.4.3

package/fesm2022/yuuvis-app-drive.mjs

@@ -2358,7 +2358,7 @@ class SearchFilterComponent {
                 value: this.ANY_OPTION
             },
             ...this.#flavors.map((f) => ({
-                label: this.translate.instant(f.id),
+                label: this.#shell.getFlavorLabel(f.id),
                 value: f.sot
             }))
         ]);
@@ -2574,11 +2574,21 @@ class FilesPageComponent {
         }
     ];
     currentPage = this.dataSource[0].route;
+    _autoSelectHandled = false;
     itemSelected(idx) {
         const node = this.dataSource.find(({ id }) => id === idx[0]);
-        if (node) {
-            this.routeChange(node);
+        if (!node)
+            return;
+        if (!this._autoSelectHandled) {
+            this._autoSelectHandled = true;
+            // Suppress the initial auto-selection if it would navigate away from the current route.
+            // When returning from object view to a subfolder, autoSelect fires 'mydrive' but we're
+            // already on the correct subfolder route — navigating to root would be wrong.
+            const currentId = this.id();
+            if (node.route === 'mydrive' && currentId !== DRIVE_ROOT_FOLDER_ID)
+                return;
         }
+        this.routeChange(node);
     }
     routeChange(node) {
         const commands = node.route === 'mydrive'
@@ -2616,12 +2626,17 @@ class FilesPageComponent {
             if (this.currentFolderID === DRIVE_ROOT_FOLDER_ID)
                 this.currentFolderID = undefined;
             if (this.currentFolderID) {
-                this.dmsService.getDmsObject(this.currentFolderID).subscribe({
+                const folderIdSnapshot = this.currentFolderID;
+                this.dmsService.getDmsObject(folderIdSnapshot).subscribe({
                     next: (o) => {
+                        if (this.currentFolderID !== folderIdSnapshot)
+                            return;
                         this.currentFolder = o;
                         this._setFolderQuery(this.#getTitle(o));
                     },
                     error: (e) => {
+                        if (this.currentFolderID !== folderIdSnapshot)
+                            return;
                         console.error('Error getting folder', e);
                         this.#processLoadError(e);
                     }