@igo2/integration 21.0.0-next.40 → 21.0.0-next.42

package/fesm2022/igo2-integration.mjs

@@ -26,7 +26,7 @@ import { BehaviorSubject, combineLatest, forkJoin, map as map$1, of, merge, Subj
 import { take, switchMap, concatAll, map, toArray, skipWhile, distinctUntilChanged, takeUntil, tap, debounceTime, skip } from 'rxjs/operators';
 import { StorageService, StorageScope, StorageServiceEventEnum } from '@igo2/core/storage';
 import { ContextService, ContextEditComponent, ContextListComponent, ContextPermissionsComponent, ShareMapComponent, ContextImportExportComponent } from '@igo2/context';
-import { createExcelWorkBook, addExcelSheetToWorkBook, writeExcelFile, ObjectUtils, uuid, NumberUtils } from '@igo2/utils';
+import { ObjectUtils, createExcelWorkBook, addExcelSheetToWorkBook, writeExcelFile, uuid, NumberUtils } from '@igo2/utils';
 import { toSignal, toObservable, takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MediaService, Media } from '@igo2/core/media';
 import { MessageService } from '@igo2/core/message';
@@ -661,34 +661,34 @@ let CatalogLibraryToolComponent = class CatalogLibraryToolComponent {
                 .map((layer) => getInfoFromSourceOptions(layer.sourceOptions, detailedContext.title ?? detailedContext.uri ?? ''));
         }), concatAll(), toArray());
     }
+    /**
+     * Sort items like the catalog browser display does (by title when a direction is set)
+     */
+    sortItemsForDisplay(items, direction) {
+        if (direction === undefined) {
+            return items;
+        }
+        return [...items].sort((a, b) => ObjectUtils.naturalCompare(a.title, b.title, direction));
+    }
     listExportFromCatalogs() {
-        let rank = 1;
-        const finalListExportOutputs = [];
         return this.store.entities$.pipe(switchMap((catalogs) => combineLatest(catalogs.map((catalog) => this.catalogService.loadCatalogItems(catalog).pipe(map((items) => {
             return { catalog, items };
         }))))), map((catalogsWithItems) => {
-            catalogsWithItems.forEach((catalogAndItems) => {
-                const catalog = catalogAndItems.catalog;
-                const loadedCatalogItems = catalogAndItems.items;
-                const catalogListExports = loadedCatalogItems.reduce((catalogListExports, item) => {
+            let rank = 1;
+            const listExports = [];
+            const collect = (items, direction, groupTitle, catalogTitle) => {
+                for (const item of this.sortItemsForDisplay(items, direction)) {
                     if (item.type === CatalogItemType.Group) {
                         const group = item;
-                        group.items?.forEach((item) => {
-                            const layer = item;
-                            catalogListExports.push(this.formatLayer(layer, rank, group.title, catalog.title));
-                            rank++;
-                        });
+                        collect(group.items ?? [], group.sortDirection, group.title, catalogTitle);
                     }
                     else {
-                        const layer = item;
-                        catalogListExports.push(this.formatLayer(layer, rank, '', catalog.title));
-                        rank++;
+                        listExports.push(this.formatLayer(item, rank++, groupTitle, catalogTitle));
                     }
-                    return catalogListExports;
-                }, []);
-                finalListExportOutputs.push(...catalogListExports);
-            });
-            return finalListExportOutputs;
+                }
+            };
+            catalogsWithItems.forEach(({ catalog, items }) => collect(items, catalog.sortDirection, '', catalog.title));
+            return listExports;
         }));
     }
     async getCatalogList() {
@@ -1826,8 +1826,8 @@ class WorkspaceState {
         this._store = new WorkspaceStore([]);
         this._store.stateView
             .firstBy$((record) => record.state.active === true)
-            .subscribe((record) => {
-            const workspace = record ? record.entity : undefined;
+            .pipe(map((record) => (record ? record.entity : undefined)), distinctUntilChanged())
+            .subscribe((workspace) => {
             this.workspace$.next(workspace);
         });
         this._store.stateView.all$().subscribe((workspaces) => {