geonetwork-ui 2.4.0-dev.f6f2f023 → 2.4.0-dev.fe59f179

package/src/libs/common/fixtures/src/lib/organisations.fixture.ts

@@ -5,84 +5,112 @@ export const ORGANISATIONS_FIXTURE: Organization[] = deepFreeze([
   {
     name: 'I Data Org',
     description: 'one org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo1.png'),
     recordCount: 12,
   },
   {
     name: 'H Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo2.png'),
     recordCount: 15,
   },
   {
     name: 'J Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo3.png'),
     recordCount: 6,
   },
   {
     name: 'G Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo4.png'),
     recordCount: 8,
   },
   {
     name: 'B Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo5.png'),
     recordCount: 2,
   },
   {
     name: 'D Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo6.png'),
     recordCount: 17,
   },
   {
     name: 'F Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo7.png'),
     recordCount: 14,
   },
   {
     name: 'A Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo8.png'),
     recordCount: 3,
   },
   {
     name: 'C Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo9.png'),
     recordCount: 9,
   },
   {
     name: 'E Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo10.png'),
     recordCount: 1,
   },
   {
     name: 'é Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo10.png'),
     recordCount: 2,
   },
   {
     name: 'wizard-org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo11.png'),
     recordCount: 2,
   },
   {
     name: "Université de l'Ingénierie",
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo12.png'),
     recordCount: 2,
   },
   {
     name: 'ARS / Agence régionale de santé',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo12.png'),
     recordCount: 2,
   },

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -233,6 +233,14 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
         description: 'Téléchargement du fichier',
         mimeType: 'x-gis/x-shapefile',
       },
+      {
+        type: 'service',
+        url: new URL('https://my-org.net/ogc'),
+        accessServiceProtocol: 'ogcFeatures',
+        name: 'ogcFeaturesSecondRecord',
+        description: 'This OGC service is the second part of the download',
+        identifierInService: 'my:featuretype',
+      },
     ],
     lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
 Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,

package/src/libs/data-access/datafeeder/src/openapi/model/datasetMetadata.api.model.ts

@@ -38,4 +38,8 @@ export interface DatasetMetadataApiModel {
    * textual description of dataset lineage
    */
   creationProcessDescription?: string
+  /**
+   * Optional, additional options for the dataset
+   */
+  options: any
 }

package/src/libs/data-access/datafeeder/src/openapi/model/datasetUploadStatus.api.model.ts

@@ -34,4 +34,6 @@ export interface DatasetUploadStatusApiModel {
    * detected charset
    */
   encoding?: string
+  format?: 'CSV' | 'SHAPEFILE'
+  options?: any
 }

package/src/libs/data-access/gn4/src/openapi/model/user.api.model.ts

@@ -21,7 +21,7 @@ export interface UserApiModel {
   emailAddresses?: Set<string>
   addresses?: Set<AddressApiModel>
   primaryAddress?: AddressApiModel
-  organisation?: string
+  organization?: string
   kind?: string
   lastLoginDate?: string
   authorities?: Array<GrantedAuthorityApiModel>

package/src/libs/feature/catalog/src/index.ts

@@ -1,4 +1,5 @@
 export * from './lib/feature-catalog.module'
+export * from './lib/organization-url.token'
 export * from './lib/sources/sources.service'
 export * from './lib/sources/sources.model'
 export * from './lib/records/records.service'

package/src/libs/feature/catalog/src/lib/feature-catalog.module.ts

@@ -4,7 +4,6 @@ import { UiCatalogModule } from '../../../../../libs/ui/catalog/src'
 import {
   GroupsApiService,
   SearchApiService,
-  SiteApiService,
 } from '../../../../../libs/data-access/gn4/src'
 import { CommonModule } from '@angular/common'
 import { SourceLabelComponent } from './source-label/source-label.component'

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.html

@@ -19,7 +19,7 @@
     [showContent]="!!organisation.name"
   >
     <gn-ui-organisation-preview
-      [organisation]="organisation"
+      [organization]="organisation"
       [organisationUrl]="getOrganisationUrl(organisation)"
       (clickedOrganisation)="orgSelect.emit($event)"
     ></gn-ui-organisation-preview>

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.ts

@@ -10,10 +10,10 @@ import {
 import { Organization } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs'
 import { map, startWith, tap } from 'rxjs/operators'
-import { ORGANIZATION_URL_TOKEN } from '../feature-catalog.module'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import { SortByField } from '../../../../../../libs/common/domain/src/lib/model/search'
 import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
+import { ORGANIZATION_PAGE_URL_TOKEN } from '../organization-url.token'
 
 @Component({
   selector: 'gn-ui-organisations',
@@ -28,7 +28,7 @@ export class OrganisationsComponent {
   constructor(
     private organisationsService: OrganizationsServiceInterface,
     @Optional()
-    @Inject(ORGANIZATION_URL_TOKEN)
+    @Inject(ORGANIZATION_PAGE_URL_TOKEN)
     private urlTemplate: string
   ) {}
 

package/src/libs/feature/catalog/src/lib/organization-url.token.ts

@@ -0,0 +1,6 @@
+import { InjectionToken } from '@angular/core'
+
+// expects the replacement key ${name}
+export const ORGANIZATION_PAGE_URL_TOKEN = new InjectionToken<string>(
+  'organization-page-url-token'
+)

package/src/libs/feature/catalog/src/lib/records/records.service.ts

@@ -1,18 +1,16 @@
 import { Injectable } from '@angular/core'
-import { Observable, of } from 'rxjs'
-import { catchError, shareReplay } from 'rxjs/operators'
+import { Observable, of, switchMap } from 'rxjs'
+import { shareReplay } from 'rxjs/operators'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
 @Injectable({
   providedIn: 'root',
 })
 export class RecordsService {
-  recordsCount$: Observable<number> = this.recordsRepository
-    .getMatchesCount({})
-    .pipe(
-      shareReplay(1),
-      catchError(() => of(0))
-    )
+  recordsCount$: Observable<number> = of(true).pipe(
+    switchMap(() => this.recordsRepository.getMatchesCount({})),
+    shareReplay(1)
+  )
 
   constructor(private recordsRepository: RecordsRepositoryInterface) {}
 }

package/src/libs/feature/dataviz/src/lib/feature-dataviz.module.ts

@@ -12,7 +12,7 @@ import {
 import { TableViewComponent } from './table-view/table-view.component'
 import { ChartViewComponent } from './chart-view/chart-view.component'
 import { TranslateModule } from '@ngx-translate/core'
-import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
+import { PopupAlertComponent, UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 
 @NgModule({
@@ -26,6 +26,7 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
     TranslateModule,
     ChartComponent,
     UiInputsModule,
+    PopupAlertComponent,
   ],
   declarations: [
     GeoTableViewComponent,

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-keywords/form-field-keywords.component.html

@@ -4,10 +4,9 @@
     [displayWithFn]="displayWithFn"
     [action]="autoCompleteAction"
     (itemSelected)="handleItemSelection($event)"
-    (inputSubmitted)="handleInputSubmission($event)"
-    (inputCleared)="handleInputCleared()"
-    [value]="searchInputValue$ | async"
     [clearOnSelection]="true"
+    [minCharacterCount]="0"
+    [allowSubmit]="false"
   ></gn-ui-autocomplete>
   <div class="flex gap-2 flex-wrap">
     <gn-ui-badge

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-keywords/form-field-keywords.component.ts

@@ -1,24 +1,17 @@
 import { CommonModule } from '@angular/common'
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-} from '@angular/core'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { FormControl } from '@angular/forms'
-import {
-  KeywordType,
-  ThesaurusModel,
-} from '../../../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import {
+  AutocompleteComponent,
   DropdownSelectorComponent,
   UiInputsModule,
 } from '../../../../../../../../../libs/ui/inputs/src'
 import { UiWidgetsModule } from '../../../../../../../../../libs/ui/widgets/src'
-import { Observable, map } from 'rxjs'
+import { map } from 'rxjs'
+import { Keyword } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+
+type AutocompleteItem = { title: string; value: Keyword }
 
 @Component({
   selector: 'gn-ui-form-field-keywords',
@@ -31,69 +24,36 @@ import { Observable, map } from 'rxjs'
     UiInputsModule,
     CommonModule,
     UiWidgetsModule,
+    AutocompleteComponent,
   ],
 })
-export class FormFieldKeywordsComponent implements OnInit {
-  @Input() control: FormControl<any>
-  @Output() itemSelected = new EventEmitter<string>()
-  @Output() inputSubmitted = new EventEmitter<string>()
-  searchInputValue$: Observable<void | { title: string }>
-  allThesaurus$: Observable<any[]>
+export class FormFieldKeywordsComponent {
+  @Input() control: FormControl<Keyword[]>
 
-  displayWithFn = (item) => {
-    if (item) {
-      return `${item?.title} (${item?.value?.name})`
-    }
-    return null
+  displayWithFn = (item: AutocompleteItem) => {
+    return `${item.title} (${item.value.thesaurus?.name})`
   }
 
   autoCompleteAction = (query: string) => {
-    const keywords$ = this.platformService.searchKeywords(query).pipe(
-      map((thesaurus) =>
-        thesaurus.map((thes) => {
-          return { title: thes.label, value: thes.thesaurus }
-        })
+    return this.platformService
+      .searchKeywords(query, ['temporal', 'theme', 'other'])
+      .pipe(
+        map((keywords) =>
+          keywords.map((keyword) => {
+            return { title: keyword.label, value: keyword }
+          })
+        )
       )
-    )
-
-    return keywords$
   }
 
   constructor(private platformService: PlatformServiceInterface) {}
 
-  ngOnInit(): void {
-    this.searchInputValue$ = this.autoCompleteAction('')[0]
-  }
-
-  // type: { title: string; value: ThesaurusModel }
-  handleItemSelection(item) {
-    this.addKeyword({
-      label: item.title,
-      thesaurus: item.value,
-      type: item.value.type,
-    })
-  }
-
-  handleInputSubmission(any: string) {
-    // Should there be an input submission?
-
-    if (this.inputSubmitted.observers.length > 0) {
-      this.inputSubmitted.emit(any)
-    } else {
-      // this.searchService.updateFilters({ any })
-    }
-  }
-
-  async handleInputCleared() {
-    this.autoCompleteAction('')
+  handleItemSelection(item: AutocompleteItem) {
+    this.addKeyword(item.value)
   }
 
-  addKeyword(item: {
-    label: string
-    thesaurus: ThesaurusModel
-    type: KeywordType
-  }) {
-    const addedKeywords = [...this.control.value, item]
+  addKeyword(keyword: Keyword) {
+    const addedKeywords = [...this.control.value, keyword]
 
     // remove duplicates from keyword
     const filteredKeywords = addedKeywords.filter((value, index, self) => {

package/src/libs/feature/record/src/lib/feature-record.module.ts

@@ -1,4 +1,4 @@
-import { InjectionToken, NgModule } from '@angular/core'
+import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { UiMapModule } from '../../../../../libs/ui/map/src'
 import { StoreModule } from '@ngrx/store'
@@ -17,7 +17,7 @@ import {
 } from './state/mdview.reducer'
 import { MatTabsModule } from '@angular/material/tabs'
 import { MatIconModule } from '@angular/material/icon'
-import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
+import { PopupAlertComponent, UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { TranslateModule } from '@ngx-translate/core'
 import { ExternalViewerButtonComponent } from './external-viewer-button/external-viewer-button.component'
 import { FeatureCatalogModule } from '../../../../../libs/feature/catalog/src'
@@ -52,6 +52,7 @@ import { DataViewShareComponent } from './data-view-share/data-view-share.compon
     TranslateModule,
     TableComponent,
     FeatureDatavizModule,
+    PopupAlertComponent,
   ],
   providers: [MdViewFacade],
   exports: [

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

@@ -1,6 +1,14 @@
 import { Injectable } from '@angular/core'
 import { select, Store } from '@ngrx/store'
-import { defaultIfEmpty, filter, map, mergeMap, scan } from 'rxjs/operators'
+import {
+  catchError,
+  defaultIfEmpty,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  toArray,
+} from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
 import * as MdViewSelectors from './mdview.selectors'
 import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
@@ -95,36 +103,39 @@ export class MdViewFacade {
   )
 
   geoDataLinksWithGeometry$ = this.allLinks$.pipe(
-    mergeMap((links) => {
-      return from(links)
-    }),
-    mergeMap((link) => {
-      if (this.linkClassifier.hasUsage(link, LinkUsage.GEODATA)) {
-        if (
-          link.type === 'service' &&
-          link.accessServiceProtocol === 'ogcFeatures'
-        ) {
-          return from(this.dataService.getItemsFromOgcApi(link.url.href)).pipe(
-            map((collectionRecords: OgcApiRecord) => {
-              return collectionRecords && collectionRecords.geometry
-                ? link
-                : null
-            }),
-            defaultIfEmpty(null)
-          )
-        } else {
-          return of(link)
-        }
-      } else {
-        return of(null)
-      }
-    }),
-    scan((acc, val) => {
-      if (val !== null && !acc.includes(val)) {
-        acc.push(val)
-      }
-      return acc
-    }, [])
+    switchMap((links) =>
+      from(links).pipe(
+        mergeMap((link) => {
+          if (this.linkClassifier.hasUsage(link, LinkUsage.GEODATA)) {
+            if (
+              link.type === 'service' &&
+              link.accessServiceProtocol === 'ogcFeatures'
+            ) {
+              return from(
+                this.dataService.getItemsFromOgcApi(link.url.href)
+              ).pipe(
+                map((collectionRecords: OgcApiRecord) => {
+                  return collectionRecords && collectionRecords.geometry
+                    ? link
+                    : null
+                }),
+                defaultIfEmpty(null),
+                catchError((e) => {
+                  console.error(e)
+                  return of(null)
+                })
+              )
+            } else {
+              return of(link)
+            }
+          } else {
+            return of(null)
+          }
+        }),
+        toArray(),
+        map((links) => links.filter((link) => link !== null))
+      )
+    )
   )
 
   landingPageLinks$ = this.metadata$.pipe(

package/src/libs/feature/router/src/lib/default/constants.ts

@@ -2,6 +2,7 @@ export const ROUTER_STATE_KEY = 'router'
 
 export const ROUTER_ROUTE_SEARCH = 'search'
 export const ROUTER_ROUTE_DATASET = 'dataset'
+export const ROUTER_ROUTE_ORGANIZATION = 'organization'
 
 export enum ROUTE_PARAMS {
   SORT = '_sort',

package/src/libs/feature/router/src/lib/default/router.config.ts

@@ -4,6 +4,7 @@ export interface RouterConfigModel {
   searchStateId: string
   searchRouteComponent: Type<any>
   recordRouteComponent: Type<any>
+  organizationRouteComponent: Type<any>
 }
 
 export const ROUTER_CONFIG = new InjectionToken<RouterConfigModel>(

package/src/libs/feature/router/src/lib/default/router.service.ts

@@ -1,5 +1,9 @@
 import { Inject, Injectable } from '@angular/core'
-import { ROUTER_ROUTE_DATASET, ROUTER_ROUTE_SEARCH } from '.'
+import {
+  ROUTER_ROUTE_DATASET,
+  ROUTER_ROUTE_ORGANIZATION,
+  ROUTER_ROUTE_SEARCH,
+} from '.'
 import { Router, Routes } from '@angular/router'
 import { ROUTER_CONFIG, RouterConfigModel } from './router.config'
 
@@ -30,10 +34,18 @@ export class RouterService {
         path: `${ROUTER_ROUTE_DATASET}/:metadataUuid`,
         component: this.routerConfig.recordRouteComponent,
       },
+      {
+        path: `${ROUTER_ROUTE_ORGANIZATION}/:name`,
+        component: this.routerConfig.organizationRouteComponent,
+      },
     ]
   }
 
   getSearchRoute(): string {
     return ROUTER_ROUTE_SEARCH
   }
+
+  getOrganizationPageRoute(): string {
+    return ROUTER_ROUTE_ORGANIZATION
+  }
 }

package/src/libs/feature/router/src/lib/default/state/router.facade.ts

@@ -3,7 +3,7 @@ import { MdViewActions } from '../../../../../../../libs/feature/record/src'
 import { RouterService } from '../router.service'
 import { RouterReducerState } from '@ngrx/router-store'
 import { select, Store } from '@ngrx/store'
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'
+import { distinctUntilChanged, filter, map, take, tap } from 'rxjs/operators'
 import {
   ROUTER_ROUTE_DATASET,
   ROUTER_ROUTE_SEARCH,
@@ -51,6 +51,14 @@ export class RouterFacade {
       })
   }
 
+  goToOrganization(organizationName: string) {
+    const path = `${this.routerService.getOrganizationPageRoute()}/${organizationName}`
+    this.go({
+      path,
+      queryParamsHandling: '',
+    })
+  }
+
   updateSearch(query?: SearchRouteParams) {
     this.go({
       path: this.routerService.getSearchRoute(),

package/src/libs/feature/search/src/index.ts

@@ -21,4 +21,4 @@ export * from './lib/results-hits-number/results-hits.container.component'
 export * from './lib/results-layout/results-layout.component'
 export * from './lib/sort-by/sort-by.component'
 export * from './lib/state/container/search-state.container.directive'
-export * from './lib/results-table/results-table.component'
+export * from './lib/results-table/results-table-container.component'

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

@@ -14,7 +14,7 @@ import { SearchEffects } from './state/effects'
 import { initialState, reducer, SEARCH_FEATURE_KEY } from './state/reducer'
 import { ResultsHitsContainerComponent } from './results-hits-number/results-hits.container.component'
 import { SearchStateContainerDirective } from './state/container/search-state.container.directive'
-import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
+import { AutocompleteComponent, UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { NgModule } from '@angular/core'
 import { UiElementsModule } from '../../../../../libs/ui/elements/src'
 import { FavoriteStarComponent } from './favorites/favorite-star/favorite-star.component'
@@ -51,6 +51,7 @@ import { Gn4Repository } from '../../../../../libs/api/repository/src'
     FacetsModule,
     MatIconModule,
     UiWidgetsModule,
+    AutocompleteComponent,
   ],
   exports: [
     SortByComponent,

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

@@ -11,7 +11,7 @@ import {
   AutocompleteComponent,
   AutocompleteItem,
 } from '../../../../../../libs/ui/inputs/src'
-import { Observable, firstValueFrom } from 'rxjs'
+import { firstValueFrom, Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { SearchFacade } from '../state/search.facade'
 import { SearchService } from '../utils/service/search.service'
@@ -32,7 +32,7 @@ export class FuzzySearchComponent implements OnInit {
   @Output() inputSubmitted = new EventEmitter<string>()
   searchInputValue$: Observable<{ title: string }>
 
-  displayWithFn: (record: CatalogRecord) => string = (record) => record?.title
+  displayWithFn: (record: CatalogRecord) => string = (record) => record.title
 
   autoCompleteAction = (query: string) =>
     this.recordsRepository

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

@@ -0,0 +1,9 @@
+<gn-ui-results-table
+  [records]="records$ | async"
+  [recordHasDraft]="hasDraft"
+  [selectedRecordsIdentifiers]="selectedRecords$ | async"
+  [sortOrder]="sortBy$ | async"
+  (recordClick)="handleRecordClick($event)"
+  (recordsSelectedChange)="handleRecordsSelectedChange($event[0], $event[1])"
+  (sortByChange)="handleSortByChange($event[0], $event[1])"
+></gn-ui-results-table>