geonetwork-ui 2.4.0-dev.fdf8f64b → 2.4.1-dev.73bac9979

package/src/libs/ui/search/src/lib/results-table/results-table.component.html

@@ -3,17 +3,7 @@
   (itemClick)="handleRecordClick($event)"
 >
   <!-- SELECTED COLUMN -->
-  <gn-ui-interactive-table-column>
-    <ng-template #header>
-      <gn-ui-checkbox
-        [checked]="isAllSelected()"
-        [indeterminate]="isSomeSelected()"
-        (changed)="toggleSelectAll()"
-        type="default"
-        class="-m-2 mr-3"
-      >
-      </gn-ui-checkbox>
-    </ng-template>
+  <gn-ui-interactive-table-column [width]="'3rem'">
     <ng-template #cell let-item>
       <gn-ui-checkbox
         [checked]="isChecked(item)"
@@ -36,7 +26,9 @@
     </ng-template>
     <ng-template #cell let-item>
       <div class="flex flex-row items-center gap-2 max-w-full font-semibold">
-        <span class="overflow-hidden text-ellipsis">{{ item.title }}</span>
+        <span data-cy="resultItemTitle" class="overflow-hidden text-ellipsis">{{
+          item.title
+        }}</span>
         <gn-ui-badge
           *ngIf="hasDraft(item)"
           [style.--gn-ui-badge-padding]="'0.2em 0.6em'"
@@ -52,7 +44,7 @@
   </gn-ui-interactive-table-column>
 
   <!-- FORMATS COLUMN -->
-  <gn-ui-interactive-table-column>
+  <gn-ui-interactive-table-column [width]="'9rem'">
     <ng-template #header>
       <span translate>record.metadata.formats</span>
     </ng-template>
@@ -63,14 +55,14 @@
         [title]="formats.join(', ')"
       >
         <span
-          class="badge-btn min-w-[45px] text-xs text-white px-2 shrink-0"
+          class="badge-btn min-w-[45px] text-xs text-gray-900 px-2 shrink-0"
           [style.background-color]="getBadgeColor(formats[0])"
           *ngIf="formats[0]"
         >
           {{ formats[0] }}
         </span>
         <span
-          class="badge-btn min-w-[45px] text-xs text-white px-2 shrink-0"
+          class="badge-btn min-w-[45px] text-xs text-gray-900 px-2 shrink-0"
           [style.background-color]="getBadgeColor(formats[1])"
           *ngIf="formats[1]"
         >
@@ -86,21 +78,24 @@
 
   <!-- OWNER COLUMN -->
   <gn-ui-interactive-table-column
+    [width]="'9rem'"
     [sortable]="true"
     [activeSort]="isSortedBy('recordOwner')"
     (sortChange)="setSortBy('recordOwner', $event)"
   >
     <ng-template #header>
-      <span translate>record.metadata.author</span>
+      <span translate>search.filters.user</span>
     </ng-template>
     <ng-template #cell let-item>
-      <mat-icon class="material-symbols-outlined">person</mat-icon>
-      <span class="text-xs">{{ formatUserInfo(item.extras?.ownerInfo) }}</span>
+      <ng-icon name="iconoirUser" size="16px"></ng-icon>
+      <span data-cy="ownerInfo" class="text-xs">{{
+        formatUserInfo(item.extras?.ownerInfo)
+      }}</span>
     </ng-template>
   </gn-ui-interactive-table-column>
 
   <!-- STATUS COLUMN -->
-  <gn-ui-interactive-table-column>
+  <gn-ui-interactive-table-column [width]="'6rem'">
     <ng-template #header>
       <span translate>record.metadata.status</span>
     </ng-template>
@@ -118,15 +113,16 @@
 
   <!-- UPDATE DATE COLUMN -->
   <gn-ui-interactive-table-column
+    [width]="'8rem'"
     [sortable]="true"
     [activeSort]="isSortedBy('changeDate')"
     (sortChange)="setSortBy('changeDate', $event)"
   >
     <ng-template #header>
-      <span translate>record.metadata.updatedOn</span>
+      <span translate>search.filters.changeDate</span>
     </ng-template>
     <ng-template #cell let-item>
-      <div class="flex justify-center w-full text-xs">
+      <div class="flex text-left w-full text-xs">
         {{ isUnsavedDraft(item) ? '-' : dateToString(item.recordUpdated) }}
       </div>
     </ng-template>
@@ -136,13 +132,25 @@
   <gn-ui-interactive-table-column>
     <ng-template #header> </ng-template>
     <ng-template #cell let-item>
-      <gn-ui-action-menu
-        [canDuplicate]="canDuplicate(item)"
-        [canDelete]="canDelete(item)"
-        (duplicate)="handleDuplicate(item)"
-        (delete)="handleDelete(item)"
+      <gn-ui-button
+        cdkOverlayOrigin
+        #actionMenuButton
+        (buttonClick)="openActionMenu(item, template)"
+        type="light"
+        data-test="record-menu-button"
       >
-      </gn-ui-action-menu>
+        <ng-icon name="matMoreVert"></ng-icon>
+      </gn-ui-button>
+      <ng-template #template>
+        <gn-ui-action-menu
+          [canDuplicate]="canDuplicate(item)"
+          [canDelete]="canDelete(item)"
+          (duplicate)="handleDuplicate(item)"
+          (delete)="handleDelete(item)"
+          (closeActionMenu)="closeActionMenu()"
+        >
+        </gn-ui-action-menu>
+      </ng-template>
     </ng-template>
   </gn-ui-interactive-table-column>
 </gn-ui-interactive-table>

package/src/libs/ui/search/src/lib/results-table/results-table.component.ts

@@ -1,6 +1,15 @@
 import { CommonModule } from '@angular/common'
-import { Component, EventEmitter, Input, Output } from '@angular/core'
-import { MatIconModule } from '@angular/material/icon'
+import {
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  Output,
+  QueryList,
+  ViewChildren,
+  ViewContainerRef,
+} from '@angular/core'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   FieldSort,
@@ -13,12 +22,23 @@ import {
 } from '../../../../../../libs/ui/layout/src'
 import {
   FileFormat,
+  formatUserInfo,
   getBadgeColor,
   getFileFormat,
   getFormatPriority,
 } from '../../../../../../libs/util/shared/src'
 import { TranslateModule } from '@ngx-translate/core'
 import { ActionMenuComponent } from './action-menu/action-menu.component'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import { iconoirUser } from '@ng-icons/iconoir'
+import {
+  CdkConnectedOverlay,
+  CdkOverlayOrigin,
+  Overlay,
+  OverlayRef,
+} from '@angular/cdk/overlay'
+import { TemplatePortal } from '@angular/cdk/portal'
+import { matMoreVert } from '@ng-icons/material-icons/baseline'
 
 @Component({
   selector: 'gn-ui-results-table',
@@ -30,11 +50,14 @@ import { ActionMenuComponent } from './action-menu/action-menu.component'
     UiInputsModule,
     InteractiveTableComponent,
     InteractiveTableColumnComponent,
-    MatIconModule,
     TranslateModule,
     BadgeComponent,
     ActionMenuComponent,
+    NgIconComponent,
+    CdkOverlayOrigin,
+    CdkConnectedOverlay,
   ],
+  providers: [provideIcons({ iconoirUser, matMoreVert })],
 })
 export class ResultsTableComponent {
   @Input() records: CatalogRecord[] = []
@@ -54,6 +77,67 @@ export class ResultsTableComponent {
     [CatalogRecord[], boolean]
   >()
 
+  @ViewChildren('actionMenuButton', { read: ElementRef })
+  actionMenuButtons!: QueryList<ElementRef>
+  private overlayRef!: OverlayRef
+
+  isActionMenuOpen = false
+
+  constructor(
+    private overlay: Overlay,
+    private viewContainerRef: ViewContainerRef,
+    private cdr: ChangeDetectorRef
+  ) {}
+
+  openActionMenu(item, template) {
+    this.isActionMenuOpen = true
+    const index = this.records.indexOf(item)
+    const buttonElement = this.actionMenuButtons.toArray()[index]
+
+    const positionStrategy = this.overlay
+      .position()
+      .flexibleConnectedTo(buttonElement)
+      .withFlexibleDimensions(true)
+      .withPush(true)
+      .withPositions([
+        {
+          originX: 'end',
+          originY: 'bottom',
+          overlayX: 'end',
+          overlayY: 'top',
+        },
+        {
+          originX: 'end',
+          originY: 'top',
+          overlayX: 'end',
+          overlayY: 'bottom',
+        },
+      ])
+
+    this.overlayRef = this.overlay.create({
+      hasBackdrop: true,
+      backdropClass: 'cdk-overlay-transparent-backdrop',
+      positionStrategy: positionStrategy,
+      scrollStrategy: this.overlay.scrollStrategies.reposition(),
+    })
+
+    const portal = new TemplatePortal(template, this.viewContainerRef)
+
+    this.overlayRef.attach(portal)
+
+    this.overlayRef.backdropClick().subscribe(() => {
+      this.closeActionMenu()
+    })
+  }
+
+  closeActionMenu() {
+    if (this.overlayRef) {
+      this.isActionMenuOpen = false
+      this.overlayRef.dispose()
+      this.cdr.markForCheck()
+    }
+  }
+
   dateToString(date: Date): string {
     return date?.toLocaleDateString(undefined, {
       year: 'numeric',
@@ -79,11 +163,7 @@ export class ResultsTableComponent {
   }
 
   formatUserInfo(userInfo: string | unknown): string {
-    const infos = (typeof userInfo === 'string' ? userInfo : '').split('|')
-    if (infos && infos.length === 4) {
-      return `${infos[2]} ${infos[1]}`
-    }
-    return undefined
+    return formatUserInfo(userInfo)
   }
 
   getBadgeColor(format: FileFormat): string {
@@ -100,6 +180,7 @@ export class ResultsTableComponent {
 
   handleDelete(item: unknown) {
     this.deleteRecord.emit(item as CatalogRecord)
+    this.closeActionMenu()
   }
 
   setSortBy(col: string, order: 'asc' | 'desc') {
@@ -128,24 +209,4 @@ export class ResultsTableComponent {
   handleRecordSelectedChange(selected: boolean, record: CatalogRecord) {
     this.recordsSelectedChange.emit([[record], selected])
   }
-
-  async toggleSelectAll() {
-    this.recordsSelectedChange.emit([this.records, !this.isAllSelected()])
-  }
-
-  isAllSelected(): boolean {
-    return this.records.every((record) =>
-      this.selectedRecordsIdentifiers.includes(record.uniqueIdentifier)
-    )
-  }
-
-  isSomeSelected(): boolean {
-    const allSelected = this.records.every((record) =>
-      this.selectedRecordsIdentifiers.includes(record.uniqueIdentifier)
-    )
-    const someSelected = this.records.some((record) =>
-      this.selectedRecordsIdentifiers.includes(record.uniqueIdentifier)
-    )
-    return !allSelected && someSelected
-  }
 }

package/src/libs/ui/search/src/lib/ui-search.module.ts

@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core'
-import { MatIconModule } from '@angular/material/icon'
 import { RouterLink } from '@angular/router'
 import { UtilSharedModule } from '../../../../../libs/util/shared/src'
 import { TranslateModule } from '@ngx-translate/core'
@@ -22,12 +21,22 @@ import { TagInputModule } from 'ngx-chips'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { ResultsListItemComponent } from './results-list-item/results-list-item.component'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
-import { UiElementsModule } from '../../../../../libs/ui/elements/src'
+import {
+  MetadataQualityComponent,
+  UiElementsModule,
+} from '../../../../../libs/ui/elements/src'
 import { RecordPreviewFeedComponent } from './record-preview-feed/record-preview-feed.component'
 import { CommonModule } from '@angular/common'
 import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { MatCheckboxModule } from '@angular/material/checkbox'
 import { InteractiveTableComponent } from '../../../../../libs/ui/layout/src'
+import { NgIconsModule, provideNgIconsConfig } from '@ng-icons/core'
+import {
+  matCloudDownloadOutline,
+  matHomeWorkOutline,
+  matMapOutline,
+} from '@ng-icons/material-icons/outline'
+import { matFace } from '@ng-icons/material-icons/baseline'
 
 @NgModule({
   declarations: [
@@ -55,10 +64,17 @@ import { InteractiveTableComponent } from '../../../../../libs/ui/layout/src'
     UiWidgetsModule,
     UiInputsModule,
     UiElementsModule,
-    MatIconModule,
     MatCheckboxModule,
     RouterLink,
     InteractiveTableComponent,
+    // FIXME: these imports are required by non-standalone components and should be removed once all components have been made standalone
+    NgIconsModule.withIcons({
+      matMapOutline,
+      matCloudDownloadOutline,
+      matFace,
+      matHomeWorkOutline,
+    }),
+    MetadataQualityComponent,
   ],
   exports: [
     RecordPreviewListComponent,
@@ -74,6 +90,9 @@ import { InteractiveTableComponent } from '../../../../../libs/ui/layout/src'
     RecordPreviewRowComponent,
   ],
   providers: [
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
     { provide: RESULTS_LAYOUT_CONFIG, useValue: DEFAULT_RESULTS_LAYOUT_CONFIG },
   ],
 })

package/src/libs/ui/widgets/src/lib/loading-mask/loading-mask.component.ts

@@ -1,15 +1,13 @@
-import {
-  Component,
-  OnInit,
-  ChangeDetectionStrategy,
-  Input,
-} from '@angular/core'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
 
 @Component({
   selector: 'gn-ui-loading-mask',
   templateUrl: './loading-mask.component.html',
   styleUrls: ['./loading-mask.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [MatProgressSpinnerModule],
+  standalone: true,
 })
 export class LoadingMaskComponent {
   @Input() message: string

package/src/libs/ui/widgets/src/lib/popup-alert/popup-alert.component.html

@@ -8,14 +8,12 @@
       expanded: this.expanded,
       'bg-red-500': type === 'danger',
       'bg-yellow-500': type === 'warning',
-      'bg-blue-500': type === 'info'
+      'bg-blue-500': type === 'info',
     }"
     (mouseenter)="expand()"
     (mouseleave)="expandAndClose()"
   >
-    <mat-icon class="material-symbols-outlined mr-2 shrink-0 select-none">{{
-      icon
-    }}</mat-icon>
+    <ng-icon class="mr-2 shrink-0 select-none" [name]="icon"></ng-icon>
     <div class="grow" #content [ngClass]="{ invisible: !expanded }">
       <ng-content></ng-content>
     </div>

package/src/libs/ui/widgets/src/lib/popup-alert/popup-alert.component.ts

@@ -8,7 +8,12 @@ import {
   ViewChild,
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { MatIconModule } from '@angular/material/icon'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { matErrorOutlineOutline } from '@ng-icons/material-icons/outline'
 
 @Component({
   selector: 'gn-ui-popup-alert',
@@ -16,7 +21,8 @@ import { MatIconModule } from '@angular/material/icon'
   styleUrls: ['./popup-alert.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, MatIconModule],
+  imports: [CommonModule, NgIconComponent],
+  providers: [provideIcons({ matErrorOutlineOutline })],
 })
 export class PopupAlertComponent implements OnInit {
   @Input() icon: string

package/src/libs/ui/widgets/src/lib/progress-bar/progress-bar.component.ts

@@ -10,6 +10,7 @@ interface ColorScheme {
   selector: 'gn-ui-progress-bar',
   templateUrl: './progress-bar.component.html',
   styleUrls: ['./progress-bar.component.css'],
+  standalone: true,
 })
 export class ProgressBarComponent {
   @Input() value = 0

package/src/libs/ui/widgets/src/lib/spinning-loader/spinning-loader.component.ts

@@ -4,5 +4,6 @@ import { Component } from '@angular/core'
   selector: 'gn-ui-spinning-loader',
   templateUrl: './spinning-loader.component.html',
   styleUrls: ['./spinning-loader.component.css'],
+  standalone: true,
 })
 export class SpinningLoaderComponent {}

package/src/libs/ui/widgets/src/lib/step-bar/step-bar.component.ts

@@ -45,8 +45,8 @@ export class StepBarComponent {
     return index === this.currentStep
       ? 'bg-black'
       : index < this.currentStep
-      ? 'bg-white'
-      : this.color.innerBar
+        ? 'bg-white'
+        : this.color.innerBar
   }
 
   getChecked(index: number): boolean {

package/src/libs/ui/widgets/src/lib/ui-widgets.module.ts

@@ -3,24 +3,14 @@ import { UtilSharedModule } from '../../../../../libs/util/shared/src'
 import { TranslateModule } from '@ngx-translate/core'
 import { NgxDropzoneModule } from 'ngx-dropzone'
 import { ColorScaleComponent } from './color-scale/color-scale.component'
-import { ProgressBarComponent } from './progress-bar/progress-bar.component'
 import { StepBarComponent } from './step-bar/step-bar.component'
 import { TagInputModule } from 'ngx-chips'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { LoadingMaskComponent } from './loading-mask/loading-mask.component'
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
-import { MatIconModule } from '@angular/material/icon'
-import { SpinningLoaderComponent } from './spinning-loader/spinning-loader.component'
 import { CommonModule } from '@angular/common'
 
 @NgModule({
-  declarations: [
-    ColorScaleComponent,
-    ProgressBarComponent,
-    StepBarComponent,
-    LoadingMaskComponent,
-    SpinningLoaderComponent,
-  ],
+  declarations: [ColorScaleComponent, StepBarComponent],
   imports: [
     CommonModule,
     TranslateModule.forChild(),
@@ -30,13 +20,7 @@ import { CommonModule } from '@angular/common'
     TagInputModule,
     UtilSharedModule,
     MatProgressSpinnerModule,
-    MatIconModule,
-  ],
-  exports: [
-    ProgressBarComponent,
-    StepBarComponent,
-    LoadingMaskComponent,
-    SpinningLoaderComponent,
   ],
+  exports: [StepBarComponent],
 })
 export class UiWidgetsModule {}

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -98,6 +98,7 @@ export function loadAppConfig() {
           'proxy_path',
           'metadata_language',
           'login_url',
+          'logout_url',
           'web_component_embedder_url',
           'languages',
           'contact_email',
@@ -124,6 +125,8 @@ export function loadAppConfig() {
                   ).toLowerCase()
                 : undefined,
               LOGIN_URL: parsedGlobalSection.login_url,
+              LOGOUT_URL: parsedGlobalSection.logout_url,
+              SETTINGS_URL: parsedGlobalSection.settings_url,
               WEB_COMPONENT_EMBEDDER_URL:
                 parsedGlobalSection.web_component_embedder_url,
               LANGUAGES: parsedGlobalSection.languages,
@@ -134,7 +137,7 @@ export function loadAppConfig() {
         parsed,
         'map_layer',
         ['type'],
-        ['name', 'url', 'data'],
+        ['name', 'url', 'data', 'styleUrl', 'accessToken'],
         warnings,
         errors
       )
@@ -146,6 +149,7 @@ export function loadAppConfig() {
           'max_zoom',
           'do_not_tile_wms',
           'max_extent',
+          'max_feature_count',
           'baselayer',
           'do_not_use_default_basemap',
           'external_viewer_url_template',
@@ -161,6 +165,7 @@ export function loadAppConfig() {
               MAX_ZOOM: parsedMapSection.max_zoom,
               DO_NOT_TILE_WMS: parsedMapSection.do_not_tile_wms,
               MAX_EXTENT: parsedMapSection.max_extent,
+              MAX_FEATURE_COUNT: parsedMapSection.max_feature_count,
               EXTERNAL_VIEWER_URL_TEMPLATE:
                 parsedMapSection.external_viewer_url_template,
               EXTERNAL_VIEWER_OPEN_NEW_TAB:
@@ -174,7 +179,9 @@ export function loadAppConfig() {
                     URL: map_layer.url,
                     NAME: map_layer.name,
                     DATA: map_layer.data,
-                  } as LayerConfig)
+                    STYLE_URL: map_layer.styleUrl,
+                    ACCESS_TOKEN: map_layer.accessToken,
+                  }) as LayerConfig
               ),
             } as MapConfig)
 

package/src/libs/util/app-config/src/lib/fixtures.ts

@@ -6,6 +6,7 @@ geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
 metadata_language = "fre"
 login_url = "/cas/login?service="
+logout_url = "/geonetwork/signout"
 web_component_embedder_url = "/datahub/wc-embedder.html"
 
 [map]

package/src/libs/util/app-config/src/lib/map-layers.ts

@@ -27,5 +27,11 @@ export function getMapContextLayerFromConfig(
         type: config.TYPE,
         ...(config.DATA ? { data: config.DATA } : { url: config.URL }),
       }
+    case 'maplibre-style':
+      return {
+        type: config.TYPE,
+        styleUrl: config.STYLE_URL,
+        accessToken: config.ACCESS_TOKEN,
+      }
   }
 }

package/src/libs/util/app-config/src/lib/model.ts

@@ -6,22 +6,27 @@ export interface GlobalConfig {
   PROXY_PATH?: string
   METADATA_LANGUAGE?: string
   LOGIN_URL?: string
+  LOGOUT_URL?: string
+  SETTINGS_URL?: string
   WEB_COMPONENT_EMBEDDER_URL?: string
   LANGUAGES?: string[]
   CONTACT_EMAIL?: string
 }
 
 export interface LayerConfig {
-  TYPE: 'xyz' | 'wms' | 'wfs' | 'geojson'
+  TYPE: 'xyz' | 'wms' | 'wfs' | 'geojson' | 'maplibre-style'
   URL?: string
   NAME?: string
   DATA?: string
+  STYLE_URL?: string
+  ACCESS_TOKEN?: string
 }
 
 export interface MapConfig {
   MAX_ZOOM?: number
   DO_NOT_TILE_WMS: boolean
   MAX_EXTENT?: [number, number, number, number] // Expressed as [minx, miny, maxx, maxy]
+  MAX_FEATURE_COUNT?: number
   EXTERNAL_VIEWER_URL_TEMPLATE?: string
   EXTERNAL_VIEWER_OPEN_NEW_TAB?: boolean
   DO_NOT_USE_DEFAULT_BASEMAP: boolean

package/src/libs/util/data-fetcher/src/lib/model.ts

@@ -48,11 +48,11 @@ export const ExcelMimeTypes = [
 export const GmlMimeTypes = ['application/gml+xml'] as const
 
 export type SupportedMimeType =
-  | typeof CsvMimeTypes[number]
-  | typeof JsonMimeTypes[number]
-  | typeof GeoJsonMimeTypes[number]
-  | typeof ExcelMimeTypes[number]
-  | typeof GmlMimeTypes[number]
+  | (typeof CsvMimeTypes)[number]
+  | (typeof JsonMimeTypes)[number]
+  | (typeof GeoJsonMimeTypes)[number]
+  | (typeof ExcelMimeTypes)[number]
+  | (typeof GmlMimeTypes)[number]
 
 export const SupportedTypes = [
   'csv',
@@ -61,7 +61,7 @@ export const SupportedTypes = [
   'excel',
   'gml',
 ] as const
-export type SupportedType = typeof SupportedTypes[number]
+export type SupportedType = (typeof SupportedTypes)[number]
 
 export const AllMimeTypes = {
   csv: CsvMimeTypes,

package/src/libs/util/data-fetcher/src/lib/readers/base-file.ts

@@ -28,7 +28,7 @@ export class BaseFileReader extends BaseReader {
       (result) =>
         ({
           itemsCount: result.items.length,
-        } as DatasetInfo)
+        }) as DatasetInfo
     )
   }