geonetwork-ui 2.5.0-dev.ee5be4e65 → 2.5.0-dev.f8f8616a0

package/src/libs/feature/record/src/lib/map-view/map-view.component.ts

@@ -82,13 +82,14 @@ marker('wfs.feature.limit')
   viewProviders: [provideIcons({ matClose })],
 })
 export class MapViewComponent implements AfterViewInit {
-  @Input() set excludeWfs(value: boolean) {
+  @Input() set exceedsLimit(value: boolean) {
     this.excludeWfs$.next(value)
   }
   @Input() displaySource = true
   @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
   excludeWfs$ = new BehaviorSubject(false)
+  hidePreview = false
   selection: Feature
   showLegend = true
   legendExists = false
@@ -139,9 +140,10 @@ export class MapViewComponent implements AfterViewInit {
         return of([])
       }
       if (excludeWfs && link.accessServiceProtocol === 'wfs') {
-        this.error = 'wfs.feature.limit'
+        this.hidePreview = true
         return of([])
       }
+      this.hidePreview = false
       this.loading = true
       this.error = null
       return this.getLayerFromLink(link).pipe(
@@ -239,7 +241,8 @@ export class MapViewComponent implements AfterViewInit {
           link.accessServiceProtocol === 'ogcFeatures')) ||
       link.type === 'download'
     ) {
-      return this.dataService.readAsGeoJson(link).pipe(
+      const cacheActive = true // TODO implement whether should be true or false
+      return this.dataService.readAsGeoJson(link, cacheActive).pipe(
         map((data) => ({
           type: 'geojson',
           data,

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -59,6 +59,19 @@ export class MdViewFacade {
     filter((incomplete) => incomplete !== null)
   )
 
+  isHighUpdateFrequency$ = this.metadata$.pipe(
+    map((record) => {
+      if (record.updateFrequency instanceof Object) {
+        return (
+          record.updateFrequency.per === 'day' &&
+          record.updateFrequency.updatedTimes > 1
+        )
+      }
+
+      return record.updateFrequency === 'continual'
+    })
+  )
+
   error$ = this.store.pipe(select(MdViewSelectors.getMetadataError))
 
   related$ = this.store.pipe(select(MdViewSelectors.getRelated))

package/src/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.html

@@ -9,4 +9,5 @@
   [preventCompleteOnSelection]="true"
   [autoFocus]="autoFocus"
   [allowSubmit]="true"
+  [forceTrackPosition]="forceTrackPosition"
 ></gn-ui-autocomplete>

package/src/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.ts

@@ -28,6 +28,7 @@ import { SearchFilters } from '../../../../../../libs/api/metadata-converter/src
 export class FuzzySearchComponent implements OnInit {
   @ViewChild(AutocompleteComponent) autocomplete: AutocompleteComponent
   @Input() autoFocus = false
+  @Input() forceTrackPosition = false
   @Output() itemSelected = new EventEmitter<CatalogRecord>()
   @Output() inputSubmitted = new EventEmitter<string>()
   searchInputValue$: Observable<{ title: string }>

package/src/libs/ui/elements/src/lib/application-banner/application-banner.component.html

@@ -1,12 +1,12 @@
 <div
   *ngIf="message && bannerOpen"
-  class="absolute top-0 text-wrap bg-white mt-4 max-h-24"
+  class="absolute left-0 right-0 text-wrap bg-white mt-4 max-h-24"
 >
   <div
     class="flex flex-row py-2.5 px-5 gap-5 justify-start border max-h-20"
     [ngClass]="classList"
   >
-    <div [ngClass]="{ 'pt-5': message.length > 200 }">
+    <div [ngClass]="message.length > 200 ? 'pt-5' : 'pt-1'">
       <ng-icon [name]="icon"></ng-icon>
     </div>
     <div class="flex flex-col justify-start gap-2.5">

package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { marked } from 'marked'
 
 @Component({
@@ -13,6 +13,6 @@ export class MarkdownParserComponent {
   @Input() whitoutStyles?: boolean
 
   get parsedMarkdown() {
-    return marked.parse(this.textContent)
+    return marked.parse(this.textContent ?? '')
   }
 }

package/src/libs/ui/inputs/src/index.ts

@@ -3,7 +3,6 @@ export * from './lib/badge/badge.component'
 export * from './lib/button/button.component'
 export * from './lib/check-toggle/check-toggle.component'
 export * from './lib/checkbox/checkbox.component'
-export * from './lib/chips-input/chips-input.component'
 export * from './lib/copy-text-button/copy-text-button.component'
 export * from './lib/date-picker/date-picker.component'
 export * from './lib/date-range-dropdown/date-range-dropdown.component'

package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.ts

@@ -83,6 +83,7 @@ export class AutocompleteComponent
   @Input() minCharacterCount? = 3
   // this will show a submit button next to the input; if false, a search icon will appear on the left
   @Input() allowSubmit = false
+  @Input() forceTrackPosition = false
   @Output() itemSelected = new EventEmitter<AutocompleteItem>()
   @Output() inputSubmitted = new EventEmitter<string>()
   @Output() inputCleared = new EventEmitter<void>()
@@ -98,6 +99,8 @@ export class AutocompleteComponent
   error: string | null = null
   suggestions$: Observable<AutocompleteItem[]>
   subscription = new Subscription()
+  private lastPosition: DOMRect | null = null
+  private intervalIdPosition: number | undefined
 
   @Input() displayWithFn: (item: AutocompleteItem) => string = (item) =>
     item.toString()
@@ -197,10 +200,49 @@ export class AutocompleteComponent
       this.inputRef.nativeElement.focus()
       this.cdRef.detectChanges()
     }
+
+    this.startTrackingPosition()
+  }
+
+  /**
+   * !!! This function is used only for web component mode,
+   * the autocomplete dropdown may not update its position
+   * if the page or container is disabling wind scroll.
+   */
+  private trackPosition = () => {
+    const dropdownOpened = this.triggerRef && this.triggerRef.panelOpen
+    const rect = this.inputRef.nativeElement.getBoundingClientRect()
+
+    if (
+      dropdownOpened &&
+      (!this.lastPosition ||
+        rect.top !== this.lastPosition.top ||
+        rect.left !== this.lastPosition.left)
+    ) {
+      this.triggerRef.updatePosition()
+    }
+
+    this.lastPosition = rect
+    requestAnimationFrame(this.trackPosition)
+  }
+
+  /**
+   * !!! This function is used only for web component mode,
+   * the autocomplete dropdown may not update its position
+   * if the page or container is disabling wind scroll.
+   */
+  startTrackingPosition() {
+    if (this.forceTrackPosition) {
+      requestAnimationFrame(this.trackPosition)
+    }
   }
 
   ngOnDestroy(): void {
     this.subscription?.unsubscribe()
+
+    if (this.intervalIdPosition) {
+      clearInterval(this.intervalIdPosition)
+    }
   }
 
   updateInputValue(value: AutocompleteItem) {

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

@@ -28,7 +28,6 @@ import { BadgeComponent } from './badge/badge.component'
 import { ButtonComponent } from './button/button.component'
 import { CheckToggleComponent } from './check-toggle/check-toggle.component'
 import { CheckboxComponent } from './checkbox/checkbox.component'
-import { ChipsInputComponent } from './chips-input/chips-input.component'
 import { DateRangePickerComponent } from './date-range-picker/date-range-picker.component'
 import { DragAndDropFileInputComponent } from './drag-and-drop-file-input/drag-and-drop-file-input.component'
 import { DropdownMultiselectComponent } from './dropdown-multiselect/dropdown-multiselect.component'
@@ -40,7 +39,6 @@ import { ViewportIntersectorComponent } from './viewport-intersector/viewport-in
 @NgModule({
   declarations: [
     DragAndDropFileInputComponent,
-    ChipsInputComponent,
     DropdownMultiselectComponent,
     ViewportIntersectorComponent,
     CheckboxComponent,
@@ -86,7 +84,6 @@ import { ViewportIntersectorComponent } from './viewport-intersector/viewport-in
     ButtonComponent,
     DragAndDropFileInputComponent,
     TextAreaComponent,
-    ChipsInputComponent,
     DropdownMultiselectComponent,
     ViewportIntersectorComponent,
     CheckToggleComponent,

package/src/libs/ui/inputs/src/lib/url-input/url-input.component.ts

@@ -31,7 +31,7 @@ import { iconoirArrowUp, iconoirLink } from '@ng-icons/iconoir'
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class UrlInputComponent implements OnChanges {
+export class UrlInputComponent {
   @Input() set value(v: string) {
     // we're making sure to only update the input if the URL representation of it has changed; otherwise we keep it identical
     // to avoid glitches when starting to write a URL and having some characters added/replaced automatically
@@ -59,12 +59,6 @@ export class UrlInputComponent implements OnChanges {
 
   constructor(private cd: ChangeDetectorRef) {}
 
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes['value']) {
-      this.inputValue = changes['value'].currentValue
-    }
-  }
-
   handleInput(event: Event) {
     const value = (event.target as HTMLInputElement).value
     this.inputValue = value

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

@@ -6,6 +6,7 @@
     >
       <ul class="flex flex-col gap-2 w-full">
         <gn-ui-button
+          *ngIf="!isDraftPage"
           type="light"
           extraClass="flex flex-row items-center gap-2 w-full justify-start"
           (buttonClick)="duplicate.emit()"
@@ -23,7 +24,10 @@
           (buttonClick)="displayDeleteMenu()"
           [disabled]="!canDelete"
           data-test="record-menu-delete-button"
-          ><span translate>record.action.delete</span></gn-ui-button
+          ><span *ngIf="!isDraftPage" translate>record.action.delete</span>
+          <span *ngIf="isDraftPage" translate
+            >record.action.rollback</span
+          ></gn-ui-button
         >
       </ul>
     </div>
@@ -60,4 +64,36 @@
       </div>
     </div>
   </ng-container>
+  <ng-container *ngSwitchCase="'rollbackMenu'">
+    <div
+      data-test="rollbackMenuSection"
+      class="w-80 p-6 flex flex-col gap-3 mt-2 border border-gray-100 bg-white shadow-2xl rounded-2xl"
+    >
+      <span class="text-lg font-bold text-center">{{
+        'editor.record.undo.confirmation.title' | translate
+      }}</span>
+      <span class="text-center">{{
+        'editor.record.undo.confirmation.message' | translate
+      }}</span>
+      <div class="flex flex-row gap-8 justify-center">
+        <gn-ui-button
+          (buttonClick)="rollback.emit()"
+          cdkFocusInitial
+          type="primary"
+          data-cy="confirm-button"
+          [style.--gn-ui-button-width]="'120px'"
+          >{{
+            'editor.record.undo.confirmation.confirmText' | translate
+          }}</gn-ui-button
+        >
+        <gn-ui-button
+          [style.--gn-ui-button-width]="'120px'"
+          (buttonClick)="closeActionMenu.emit()"
+          >{{
+            'editor.record.undo.confirmation.cancelText' | translate
+          }}</gn-ui-button
+        >
+      </div>
+    </div>
+  </ng-container>
 </ng-container>

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

@@ -13,7 +13,7 @@ import { ConfirmationDialogComponent } from '../../../../../../../libs/ui/elemen
 import { ButtonComponent } from '../../../../../../../libs/ui/inputs/src'
 import { TranslateModule } from '@ngx-translate/core'
 
-type ActionMenuPage = 'mainMenu' | 'deleteMenu'
+type ActionMenuPage = 'mainMenu' | 'deleteMenu' | 'rollbackMenu'
 
 @Component({
   selector: 'gn-ui-action-menu',
@@ -32,9 +32,11 @@ type ActionMenuPage = 'mainMenu' | 'deleteMenu'
 export class ActionMenuComponent {
   @Input() canDuplicate: boolean
   @Input() canDelete: boolean
+  @Input() isDraftPage: boolean
   @Output() duplicate = new EventEmitter<void>()
   @Output() delete = new EventEmitter<void>()
   @Output() closeActionMenu = new EventEmitter<void>()
+  @Output() rollback = new EventEmitter<void>()
 
   @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger
 
@@ -55,7 +57,11 @@ export class ActionMenuComponent {
   }
 
   displayDeleteMenu() {
-    this.sectionDisplayed = 'deleteMenu'
+    if (this.isDraftPage) {
+      this.sectionDisplayed = 'rollbackMenu'
+    } else {
+      this.sectionDisplayed = 'deleteMenu'
+    }
     this.cdr.markForCheck()
   }
 }

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

@@ -162,9 +162,11 @@
         <gn-ui-action-menu
           [canDuplicate]="canDuplicate(item) && !isDuplicating"
           [canDelete]="canDelete(item)"
+          [isDraftPage]="isDraftPage"
           (duplicate)="handleDuplicate(item)"
           (delete)="handleDelete(item)"
           (closeActionMenu)="closeActionMenu()"
+          (rollback)="handleRollback(item)"
         >
         </gn-ui-action-menu>
       </ng-template>

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

@@ -74,6 +74,7 @@ export class ResultsTableComponent {
   @Output() recordClick = new EventEmitter<CatalogRecord>()
   @Output() duplicateRecord = new EventEmitter<CatalogRecord>()
   @Output() deleteRecord = new EventEmitter<CatalogRecord>()
+  @Output() rollbackDraft = new EventEmitter<CatalogRecord>()
   @Output() recordsSelectedChange = new EventEmitter<
     [CatalogRecord[], boolean]
   >()
@@ -186,6 +187,11 @@ export class ResultsTableComponent {
     this.closeActionMenu()
   }
 
+  handleRollback(item: unknown) {
+    this.rollbackDraft.emit(item as CatalogRecord)
+    this.closeActionMenu()
+  }
+
   setSortBy(col: string, order: 'asc' | 'desc') {
     this.sortByChange.emit([col, order])
   }

package/src/libs/ui/widgets/src/index.ts

@@ -5,4 +5,3 @@ export * from './lib/loading-mask/loading-mask.component'
 export * from './lib/color-scale/color-scale.component'
 export * from './lib/popup-alert/popup-alert.component'
 export * from './lib/spinning-loader/spinning-loader.component'
-export * from './lib/step-bar/step-bar.component'

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

@@ -3,14 +3,13 @@ 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 { StepBarComponent } from './step-bar/step-bar.component'
 import { TagInputModule } from 'ngx-chips'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
 import { CommonModule } from '@angular/common'
 
 @NgModule({
-  declarations: [ColorScaleComponent, StepBarComponent],
+  declarations: [ColorScaleComponent],
   imports: [
     CommonModule,
     TranslateModule.forChild(),
@@ -21,6 +20,6 @@ import { CommonModule } from '@angular/common'
     UtilSharedModule,
     MatProgressSpinnerModule,
   ],
-  exports: [StepBarComponent],
+  exports: [],
 })
 export class UiWidgetsModule {}

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

@@ -17,10 +17,17 @@ export async function openDataset(
     namespace?: string
     wfsVersion?: WfsVersion
     wfsFeatureType?: string
-  }
+  },
+  cacheActive?: boolean
 ): Promise<BaseReader> {
   const fileType = await inferDatasetType(url, typeHint)
-  let reader: BaseReader
+  let reader:
+    | CsvReader
+    | JsonReader
+    | GeojsonReader
+    | ExcelReader
+    | GmlReader
+    | WfsReader
   try {
     switch (fileType) {
       case 'csv':
@@ -42,6 +49,7 @@ export async function openDataset(
         reader = await WfsReader.createReader(url, options.wfsFeatureType)
         break
     }
+    reader.setCacheActive(cacheActive)
     reader.load()
     return reader
   } catch (e: any) {
@@ -61,9 +69,10 @@ export async function openDataset(
 export async function readDataset(
   url: string,
   typeHint?: SupportedType,
-  options?: any
+  options?: any,
+  cacheActive = true
 ): Promise<DataItem[]> {
-  const reader = await openDataset(url, typeHint, options)
+  const reader = await openDataset(url, typeHint, options, cacheActive)
   try {
     return await reader.read()
   } catch (e: any) {

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

@@ -0,0 +1,14 @@
+import { BaseReader } from './base'
+
+export abstract class BaseCacheReader extends BaseReader {
+  constructor(
+    protected url: string,
+    protected cacheActive = true
+  ) {
+    super(url)
+  }
+
+  setCacheActive(value: boolean) {
+    this.cacheActive = value
+  }
+}

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

@@ -2,13 +2,14 @@ import { BaseReader } from './base'
 import { DataItem, DatasetInfo, PropertyInfo } from '../model'
 import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
+import { BaseCacheReader } from './base-cache'
 
 type ParseResult = {
   items: DataItem[]
   properties: PropertyInfo[]
 }
 
-export class BaseFileReader extends BaseReader {
+export class BaseFileReader extends BaseCacheReader {
   private parseResult_: Promise<ParseResult>
 
   protected getData(): Promise<ParseResult> {

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

@@ -11,8 +11,8 @@ import {
 
 export class BaseReader {
   protected selected: FieldName[] = null
-  protected groupedBy: FieldGroupBy[] = null
-  protected aggregations: FieldAggregation[] = null
+  public groupedBy: FieldGroupBy[] = null
+  public aggregations: FieldAggregation[] = null
   protected filter: FieldFilter = null
   protected sort: FieldSort[] = null
   protected startIndex: number = null

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

@@ -47,6 +47,6 @@ export function parseCsv(text: string): {
 
 export class CsvReader extends BaseFileReader {
   getData() {
-    return fetchDataAsText(this.url).then(parseCsv)
+    return fetchDataAsText(this.url, this.cacheActive).then(parseCsv)
   }
 }

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

@@ -28,6 +28,6 @@ export function parseExcel(buffer: ArrayBuffer): Promise<{
 
 export class ExcelReader extends BaseFileReader {
   getData() {
-    return fetchDataAsArrayBuffer(this.url).then(parseExcel)
+    return fetchDataAsArrayBuffer(this.url, this.cacheActive).then(parseExcel)
   }
 }

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

@@ -24,6 +24,6 @@ export function parseGeojson(text: string): {
 
 export class GeojsonReader extends BaseFileReader {
   getData() {
-    return fetchDataAsText(this.url).then(parseGeojson)
+    return fetchDataAsText(this.url, this.cacheActive).then(parseGeojson)
   }
 }

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

@@ -37,17 +37,17 @@ export function parseGml(
 }
 
 export class GmlReader extends BaseFileReader {
-  namespace: string
-  version: WfsVersion
-
-  constructor(url, namespace, version) {
+  constructor(
+    protected url: string,
+    protected namespace: string,
+    protected version: WfsVersion,
+    protected cacheActive = true
+  ) {
     super(url)
-    this.namespace = namespace
-    this.version = version
   }
 
   protected getData() {
-    return fetchDataAsText(this.url).then((text) =>
+    return fetchDataAsText(this.url, this.cacheActive).then((text) =>
       parseGml(text, this.namespace, this.version)
     )
   }

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

@@ -23,6 +23,6 @@ export function parseJson(text: string): {
 
 export class JsonReader extends BaseFileReader {
   getData() {
-    return fetchDataAsText(this.url).then(parseJson)
+    return fetchDataAsText(this.url, this.cacheActive).then(parseJson)
   }
 }

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

@@ -1,18 +1,24 @@
 import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
 import { DataItem, DatasetInfo, PropertyInfo } from '../model'
 import { fetchDataAsText } from '../utils'
-import { BaseReader } from './base'
 import { GmlReader, parseGml } from './gml'
 import { GeojsonReader, parseGeojson } from './geojson'
-import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { BaseCacheReader } from './base-cache'
+import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
+import { generateSqlQuery } from '../sql-utils'
 
-export class WfsReader extends BaseReader {
+export class WfsReader extends BaseCacheReader {
   endpoint: WfsEndpoint
   featureTypeName: string
   version: WfsVersion
 
-  constructor(url: string, wfsEndpoint: WfsEndpoint, featureTypeName: string) {
-    super(url)
+  constructor(
+    url: string,
+    wfsEndpoint: WfsEndpoint,
+    featureTypeName: string,
+    cacheActive?: boolean
+  ) {
+    super(url, cacheActive)
     this.endpoint = wfsEndpoint
     this.featureTypeName = featureTypeName
     this.version = this.endpoint.getVersion()
@@ -90,11 +96,10 @@ export class WfsReader extends BaseReader {
     }
   }
 
-  protected getData() {
-    if (this.aggregations || this.groupedBy) {
-      throw new Error(marker('wfs.aggregations.notsupported'))
+  public async getData(aggregation?, groupedBy?) {
+    if (aggregation || groupedBy) {
+      return { items: await this.getQueryData() }
     }
-
     const asJson = this.endpoint.supportsJson(this.featureTypeName)
     const attributes = this.selected ?? undefined
     let url = this.endpoint.getFeatureUrl(this.featureTypeName, {
@@ -117,18 +122,36 @@ export class WfsReader extends BaseReader {
       url = `${url}${finalUrl.search ? '&' : ''}SORTBY=${sorts}`
     }
 
-    return fetchDataAsText(url).then((text) =>
+    return fetchDataAsText(url, this.cacheActive).then((text) =>
       asJson
         ? parseGeojson(text)
         : parseGml(text, this.featureTypeName, this.version)
     )
   }
 
+  public async getQueryData() {
+    const items = (await this.getData()).items
+    const jsonItems = getJsonDataItemsProxy(items)
+    const query = generateSqlQuery(
+      this.selected,
+      this.filter,
+      this.sort,
+      this.startIndex,
+      this.count,
+      this.groupedBy,
+      this.aggregations
+    )
+    const result = await import('alasql').then((module) =>
+      module.default(query, [jsonItems])
+    )
+    return result.map(jsonToGeojsonFeature)
+  }
+
   load() {
     // Nothing to load for Wfs
   }
 
   async read(): Promise<DataItem[]> {
-    return (await this.getData()).items
+    return (await this.getData(this.aggregations, this.groupedBy)).items
   }
 }