geonetwork-ui 2.2.0-dev.5b8d393f → 2.2.0-dev.6695ae4d

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -48,13 +48,7 @@ export const RecordStatusValues = [
 ]
 export type RecordStatus = typeof RecordStatusValues[number]
 
-export type AccessConstraintType = 'security' | 'privacy' | 'legal' | 'other'
-export interface AccessConstraint {
-  text: string
-  type: AccessConstraintType
-}
-
-export type License = {
+export type Constraint = {
   text: string
   url?: URL
 }
@@ -77,10 +71,10 @@ export interface BaseRecord {
   kind: RecordKind
   themes: Array<string> // TODO: handle codelists
   keywords: Array<string> // TODO: handle thesaurus and id
-  accessConstraints: Array<AccessConstraint>
-  useLimitations: Array<string>
-  legalConstraints?: Array<string>
-  licenses: Array<License>
+  licenses: Array<Constraint>
+  legalConstraints: Array<Constraint>
+  securityConstraints: Array<Constraint>
+  otherConstraints: Array<Constraint>
   overviews: Array<GraphicOverview>
   extras?: Record<string, unknown>
   landingPage?: URL

package/src/libs/common/domain/src/lib/model/search/aggregation.model.ts

@@ -1,4 +1,4 @@
-import { FieldName } from './search.model'
+import { FieldName } from './field.model'
 import { FieldFilters } from './filter.model'
 
 export interface TermsAggregationParams {

package/src/libs/common/domain/src/lib/model/search/field.model.ts

@@ -0,0 +1 @@
+export type FieldName = string

package/src/libs/common/domain/src/lib/model/search/filter.model.ts

@@ -1,4 +1,4 @@
-import { FieldName } from './search.model'
+import { FieldName } from './field.model'
 
 export type FieldFilterByValues = Record<string, boolean>
 export type FieldFilterByExpression = string | number

package/src/libs/common/domain/src/lib/model/search/index.ts

@@ -2,3 +2,4 @@ export * from './aggregation.model'
 export * from './filter.model'
 export * from './search.model'
 export * from './sort-by.model'
+export * from './field.model'

package/src/libs/common/domain/src/lib/model/search/search.model.ts

@@ -1,10 +1,10 @@
 import { FieldFilters } from './filter.model'
 import { CatalogRecord } from '../record'
 import { Geometry } from 'geojson'
+import { FieldName } from './field.model'
 
 export type FieldSort = ['desc' | 'asc', FieldName]
 export type SortByField = FieldSort | FieldSort[] // several sort criteria can be used!
-export type FieldName = string
 
 export interface SearchParams {
   filters?: FieldFilters

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

@@ -50,7 +50,7 @@ const mdViewReducer = createReducer(
     chartConfig,
   })),
   on(MdViewActions.close, (state) => {
-    // eslint-disable-next-line
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { metadata, related, ...stateWithoutMd } = state
     return stateWithoutMd
   })

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

@@ -1,4 +1,6 @@
 export * from './lib/feature-search.module'
+export * from './lib/filter-geometry.token'
+export * from './lib/record-url.token'
 export * from './lib/state/actions'
 export * from './lib/state/selectors'
 export * from './lib/state/search.facade'

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

@@ -15,24 +15,15 @@ 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 { InjectionToken, NgModule } from '@angular/core'
+import { NgModule } from '@angular/core'
 import { UiElementsModule } from '../../../../../libs/ui/elements/src'
 import { FavoriteStarComponent } from './favorites/favorite-star/favorite-star.component'
 import { MatIconModule } from '@angular/material/icon'
 import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
-import { Geometry } from 'geojson'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { RecordsRepositoryInterface } from '../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { Gn4Repository } from '../../../../../libs/api/repository/src'
 
-// this geometry will be used to filter & boost results accordingly
-export const FILTER_GEOMETRY = new InjectionToken<Promise<Geometry>>(
-  'filter-geometry'
-)
-
-// expects the replacement key ${uuid}
-export const RECORD_URL_TOKEN = new InjectionToken<string>('record-url-token')
-
 @NgModule({
   declarations: [
     SortByComponent,

package/src/libs/feature/search/src/lib/filter-geometry.token.ts

@@ -0,0 +1,7 @@
+// this geometry will be used to filter & boost results accordingly
+import { InjectionToken } from '@angular/core'
+import { Geometry } from 'geojson'
+
+export const FILTER_GEOMETRY = new InjectionToken<Promise<Geometry>>(
+  'filter-geometry'
+)

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

@@ -11,12 +11,13 @@ import {
   AutocompleteComponent,
   AutocompleteItem,
 } from '../../../../../../libs/ui/inputs/src'
-import { Observable } from 'rxjs'
+import { Observable, firstValueFrom } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { SearchFacade } from '../state/search.facade'
 import { SearchService } from '../utils/service/search.service'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { SearchFilters } from '../../../../../../libs/api/metadata-converter/src'
 
 @Component({
   selector: 'gn-ui-fuzzy-search',
@@ -75,7 +76,12 @@ export class FuzzySearchComponent implements OnInit {
     }
   }
 
-  handleInputCleared() {
-    this.searchService.updateFilters({ any: '' })
+  async handleInputCleared() {
+    const currentSearchFilters: SearchFilters = await firstValueFrom(
+      this.searchFacade.searchFilters$
+    )
+    if (currentSearchFilters.any) {
+      this.searchService.updateFilters({ any: '' })
+    }
   }
 }

package/src/libs/feature/search/src/lib/record-url.token.ts

@@ -0,0 +1,4 @@
+import { InjectionToken } from '@angular/core'
+
+// expects the replacement key ${uuid}
+export const RECORD_URL_TOKEN = new InjectionToken<string>('record-url-token')

package/src/libs/feature/search/src/lib/results-list/results-list.container.component.ts

@@ -17,7 +17,7 @@ import {
   ResultsLayoutConfigItem,
   ResultsLayoutConfigModel,
 } from '../../../../../../libs/ui/search/src'
-import { RECORD_URL_TOKEN } from '../feature-search.module'
+import { RECORD_URL_TOKEN } from '../record-url.token'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export type ResultsListShowMoreStrategy = 'auto' | 'button' | 'none'

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

@@ -1,135 +1,112 @@
-<div>
-  <div class="flex" data-cy="records-information">
-    <div
-      translate
-      class="my-8 ml-4 block text-gray-800"
-      [translateParams]="{
-        displayed: (records$ | async).length,
-        hits: (recordCount$ | async)
-      }"
-    >
-      results.records.hits.displayedOn
-    </div>
-    <div
-      *ngIf="(selectedRecords$ | async).length as selectedRecordCount"
-      class="my-8 ml-6 block text-gray-400 selected-records"
-      translate
-      [translateParams]="{ amount: selectedRecordCount }"
-    >
-      results.records.hits.selected
-    </div>
-  </div>
+<gn-ui-interactive-table
+  [items]="records$ | async"
+  (itemClick)="handleRecordClick($event)"
+>
+  <!-- SELECTED COLUMN -->
+  <gn-ui-interactive-table-column>
+    <ng-template #header>
+      <gn-ui-checkbox
+        [checked]="isAllSelected() | async"
+        [indeterminate]="isSomeSelected() | async"
+        (changed)="toggleSelectAll()"
+        type="default"
+        class="-m-2 mr-3"
+      >
+      </gn-ui-checkbox>
+    </ng-template>
+    <ng-template #cell let-item>
+      <gn-ui-checkbox
+        [checked]="isChecked(item) | async"
+        (changed)="handleRecordSelectedChange($event, item)"
+        class="-m-2"
+        type="default"
+      ></gn-ui-checkbox>
+    </ng-template>
+  </gn-ui-interactive-table-column>
 
-  <gn-ui-interactive-table
-    [items]="records$ | async"
-    (itemClick)="handleRecordClick($event)"
+  <!-- TITLE COLUMN -->
+  <gn-ui-interactive-table-column
+    [sortable]="true"
+    [activeSort]="isSortedBy('resourceTitleObject.default.keyword') | async"
+    (sortChange)="setSortBy('resourceTitleObject.default.keyword', $event)"
   >
-    <!-- SELECTED COLUMN -->
-    <gn-ui-interactive-table-column>
-      <ng-template #header>
-        <gn-ui-checkbox
-          [checked]="isAllSelected() | async"
-          [indeterminate]="isSomeSelected() | async"
-          (changed)="toggleSelectAll()"
-          type="default"
-          class="-m-2 mr-3"
-        >
-        </gn-ui-checkbox>
-      </ng-template>
-      <ng-template #cell let-item>
-        <gn-ui-checkbox
-          [checked]="isChecked(item) | async"
-          (changed)="handleRecordSelectedChange($event, item)"
-          class="-m-2"
-          type="default"
-        ></gn-ui-checkbox>
-      </ng-template>
-    </gn-ui-interactive-table-column>
-
-    <!-- TITLE COLUMN -->
-    <gn-ui-interactive-table-column
-      [sortable]="true"
-      [activeSort]="isSortedBy('resourceTitleObject.default.keyword') | async"
-      (sortChange)="setSortBy('resourceTitleObject.default.keyword', $event)"
-    >
-      <ng-template #header>
-        <span translate>record.metadata.title</span>
-      </ng-template>
-      <ng-template #cell let-item>
-        {{ item.title }}
-      </ng-template>
-    </gn-ui-interactive-table-column>
+    <ng-template #header>
+      <span translate>record.metadata.title</span>
+    </ng-template>
+    <ng-template #cell let-item>
+      {{ item.title }}
+    </ng-template>
+  </gn-ui-interactive-table-column>
 
-    <!-- FORMATS COLUMN -->
-    <gn-ui-interactive-table-column>
-      <ng-template #header>
-        <span translate>record.metadata.formats</span>
-      </ng-template>
-      <ng-template #cell let-item>
-        <div
-          class="flex justify-start items-center gap-2"
-          *ngIf="getRecordFormats(item) as formats"
-          [title]="formats.join(', ')"
+  <!-- FORMATS COLUMN -->
+  <gn-ui-interactive-table-column>
+    <ng-template #header>
+      <span translate>record.metadata.formats</span>
+    </ng-template>
+    <ng-template #cell let-item>
+      <div
+        class="flex justify-start items-center gap-2"
+        *ngIf="getRecordFormats(item) as formats"
+        [title]="formats.join(', ')"
+      >
+        <span
+          class="badge-btn min-w-[45px] text-sm text-white px-2 flex-shrink-0"
+          [style.background-color]="getBadgeColor(formats[0])"
+          *ngIf="formats[0]"
+        >
+          {{ formats[0] }}
+        </span>
+        <span
+          class="badge-btn min-w-[45px] text-sm text-white px-2 flex-shrink-0"
+          [style.background-color]="getBadgeColor(formats[1])"
+          *ngIf="formats[1]"
         >
-          <span
-            class="badge-btn min-w-[45px] text-sm text-white px-2 flex-shrink-0"
-            [style.background-color]="getBadgeColor(formats[0])"
-            *ngIf="formats[0]"
-          >
-            {{ formats[0] }}
-          </span>
-          <span
-            class="badge-btn min-w-[45px] text-sm text-white px-2 flex-shrink-0"
-            [style.background-color]="getBadgeColor(formats[1])"
-            *ngIf="formats[1]"
-          >
-            {{ formats[1] }}
-          </span>
-          <div class="flex-shrink-0" *ngIf="formats.slice(2).length > 0">
-            <span>+{{ formats.slice(2).length }}</span>
-          </div>
+          {{ formats[1] }}
+        </span>
+        <div class="flex-shrink-0" *ngIf="formats.slice(2).length > 0">
+          <span>+{{ formats.slice(2).length }}</span>
         </div>
-        <div *ngIf="!getRecordFormats(item)"></div>
-      </ng-template>
-    </gn-ui-interactive-table-column>
+      </div>
+      <div *ngIf="!getRecordFormats(item)"></div>
+    </ng-template>
+  </gn-ui-interactive-table-column>
 
-    <!-- OWNER COLUMN -->
-    <gn-ui-interactive-table-column
-      [sortable]="true"
-      [activeSort]="isSortedBy('recordOwner') | async"
-      (sortChange)="setSortBy('recordOwner', $event)"
-    >
-      <ng-template #header>
-        <span translate>record.metadata.author</span>
-      </ng-template>
-      <ng-template #cell let-item>
-        <mat-icon class="material-symbols-outlined">person</mat-icon>
-        <span>{{ formatUserInfo(item.extras?.ownerInfo) }}</span>
-      </ng-template>
-    </gn-ui-interactive-table-column>
+  <!-- OWNER COLUMN -->
+  <gn-ui-interactive-table-column
+    [sortable]="true"
+    [activeSort]="isSortedBy('recordOwner') | async"
+    (sortChange)="setSortBy('recordOwner', $event)"
+  >
+    <ng-template #header>
+      <span translate>record.metadata.author</span>
+    </ng-template>
+    <ng-template #cell let-item>
+      <mat-icon class="material-symbols-outlined">person</mat-icon>
+      <span>{{ formatUserInfo(item.extras?.ownerInfo) }}</span>
+    </ng-template>
+  </gn-ui-interactive-table-column>
 
-    <!-- STATUS COLUMN -->
-    <gn-ui-interactive-table-column>
-      <ng-template #header>
-        <span translate>record.metadata.status</span>
-      </ng-template>
-      <ng-template #cell let-item>
-        {{ item.status }}
-      </ng-template>
-    </gn-ui-interactive-table-column>
+  <!-- STATUS COLUMN -->
+  <gn-ui-interactive-table-column>
+    <ng-template #header>
+      <span translate>record.metadata.status</span>
+    </ng-template>
+    <ng-template #cell let-item>
+      {{ item.status }}
+    </ng-template>
+  </gn-ui-interactive-table-column>
 
-    <!-- UPDATE DATE COLUMN -->
-    <gn-ui-interactive-table-column
-      [sortable]="true"
-      [activeSort]="isSortedBy('changeDate') | async"
-      (sortChange)="setSortBy('changeDate', $event)"
-    >
-      <ng-template #header>
-        <span translate>record.metadata.updatedOn</span>
-      </ng-template>
-      <ng-template #cell let-item>
-        {{ dateToString(item.recordUpdated) }}
-      </ng-template>
-    </gn-ui-interactive-table-column>
-  </gn-ui-interactive-table>
-</div>
+  <!-- UPDATE DATE COLUMN -->
+  <gn-ui-interactive-table-column
+    [sortable]="true"
+    [activeSort]="isSortedBy('changeDate') | async"
+    (sortChange)="setSortBy('changeDate', $event)"
+  >
+    <ng-template #header>
+      <span translate>record.metadata.updatedOn</span>
+    </ng-template>
+    <ng-template #cell let-item>
+      {{ dateToString(item.recordUpdated) }}
+    </ng-template>
+  </gn-ui-interactive-table-column>
+</gn-ui-interactive-table>

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

@@ -39,7 +39,6 @@ export class ResultsTableComponent {
   @Output() recordClick = new EventEmitter<CatalogRecord>()
 
   records$ = this.searchFacade.results$
-  recordCount$ = this.searchFacade.resultsHits$
   selectedRecords$ = this.selectionService.selectedRecordsIdentifiers$
 
   constructor(

package/src/libs/feature/search/src/lib/state/effects.ts

@@ -41,7 +41,7 @@ import { getSearchStateSearch } from './selectors'
 import { HttpErrorResponse } from '@angular/common/http'
 import { switchMapWithSearchId } from '../utils/operators/search.operator'
 import { Geometry } from 'geojson'
-import { FILTER_GEOMETRY } from '../feature-search.module'
+import { FILTER_GEOMETRY } from '../filter-geometry.token'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { FavoritesService } from '../../../../../../libs/api/repository/src'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'

package/src/libs/feature/search/src/lib/state/search.facade.ts

@@ -40,7 +40,7 @@ import {
   isEndOfResults,
   totalPages,
 } from './selectors'
-import { FILTER_GEOMETRY } from '../feature-search.module'
+import { FILTER_GEOMETRY } from '../filter-geometry.token'
 import { Geometry } from 'geojson'
 import { catchError, map, shareReplay } from 'rxjs/operators'
 import {
@@ -215,5 +215,6 @@ export class SearchFacade {
     this.store.dispatch(new SetFilters({}, this.searchId))
     this.store.dispatch(new SetSortBy([], this.searchId))
     this.store.dispatch(new SetFavoritesOnly(false, this.searchId))
+    return this
   }
 }

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

@@ -74,12 +74,12 @@
   margin-top: 0;
   margin-bottom: 10px;
   color: var(--color-primary) !important;
-  text-decoration: none !important;
-  @apply font-bold;
+  text-decoration: none;
 }
 
 :host ::ng-deep .markdown-body p > a:hover {
   color: var(--color-primary-darker) !important;
+  @apply underline;
 }
 
 /** Blockquotes **/

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -10,6 +10,50 @@
   </gn-ui-content-ghost>
 </div>
 
+<gn-ui-expandable-panel [title]="'record.metadata.usage' | translate">
+  <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
+    <ng-container *ngFor="let license of licenses">
+      <div *ngIf="license.url; else noUrl" class="text-primary">
+        <a
+          [href]="license.url"
+          target="_blank"
+          class="cursor-pointer hover:underline transition-all"
+        >
+          {{ license.text }}
+          <mat-icon
+            class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
+            >open_in_new</mat-icon
+          >
+        </a>
+      </div>
+      <ng-template #noUrl>
+        <div class="text-primary" gnUiLinkify>
+          {{ license.text }}
+        </div>
+      </ng-template>
+    </ng-container>
+    <ng-container *ngIf="legalConstraints.length">
+      <gn-ui-markdown-parser
+        *ngFor="let constraint of legalConstraints"
+        [textContent]="constraint"
+      >
+      </gn-ui-markdown-parser>
+    </ng-container>
+    <ng-container *ngIf="otherConstraints.length">
+      <div gnUiLinkify *ngFor="let constraint of otherConstraints">
+        <h5 translate class="font-medium text-black text-sm mb-[2px] mt-[16px]">
+          record.metadata.otherConstraints
+        </h5>
+        <gn-ui-markdown-parser [textContent]="constraint">
+        </gn-ui-markdown-parser>
+      </div>
+    </ng-container>
+
+    <span class="noUsage" *ngIf="!hasUsage">
+      {{ 'record.metadata.noUsage' | translate }}
+    </span>
+  </div>
+</gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   class="metadata-origin"
   *ngIf="
@@ -22,7 +66,7 @@
 >
   <p
     *ngIf="metadata.lineage"
-    class="mb-5 pt-4 whitespace-pre-line break-words"
+    class="mb-5 pt-4 whitespace-pre-line break-words text-gray-900"
     gnUiLinkify
   >
     {{ metadata.lineage }}
@@ -54,23 +98,6 @@
     </div>
   </div>
 </gn-ui-expandable-panel>
-<gn-ui-expandable-panel [title]="'record.metadata.usage' | translate">
-  <div class="py-4 px-6 rounded bg-gray-100 text-gray-700 flex flex-wrap gap-2">
-    <gn-ui-badge *ngIf="metadata.extras?.isOpenData">
-      <span translate>record.metadata.isOpenData</span>
-    </gn-ui-badge>
-    <span
-      class="text-primary font-medium"
-      *ngFor="let usage of usages"
-      gnUiLinkify
-    >
-      {{ usage }}
-    </span>
-    <span class="text-primary font-medium noUsage" *ngIf="!hasUsage">
-      {{ 'record.metadata.noUsage' | translate }}
-    </span>
-  </div>
-</gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   *ngIf="metadata.landingPage"
   [title]="'record.metadata.details' | translate"

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts

@@ -22,18 +22,42 @@ export class MetadataInfoComponent {
   get hasUsage() {
     return (
       this.metadata.extras?.isOpenData === true ||
-      this.metadata.useLimitations?.length ||
-      this.metadata.accessConstraints?.length
+      (this.metadata.legalConstraints?.length > 0 &&
+        this.legalConstraints.length > 0) ||
+      (this.metadata.otherConstraints?.length > 0 &&
+        this.otherConstraints.length > 0) ||
+      (this.metadata.licenses?.length > 0 && this.licenses.length > 0)
     )
   }
 
-  get usages(): string[] {
+  get legalConstraints() {
     let array = []
-    if (this.metadata.useLimitations?.length) {
-      array = array.concat(this.metadata.useLimitations)
+    if (this.metadata.legalConstraints?.length) {
+      array = array.concat(
+        this.metadata.legalConstraints.filter((c) => c.text).map((c) => c.text)
+      )
     }
-    if (this.metadata.accessConstraints?.length) {
-      array = array.concat(this.metadata.accessConstraints.map((c) => c.text))
+    return array
+  }
+
+  get otherConstraints() {
+    let array = []
+    if (this.metadata.otherConstraints?.length) {
+      array = array.concat(
+        this.metadata.otherConstraints.filter((c) => c.text).map((c) => c.text)
+      )
+    }
+    return array
+  }
+
+  get licenses(): { text: string; url: string }[] {
+    let array = []
+    if (this.metadata.licenses?.length) {
+      array = array.concat(
+        this.metadata.licenses
+          .filter((c) => c.text)
+          .map((c) => ({ text: c.text, url: c.url }))
+      )
     }
     return array
   }
@@ -56,9 +80,4 @@ export class MetadataInfoComponent {
   onKeywordClick(keyword: string) {
     this.keyword.emit(keyword)
   }
-
-  copyText() {
-    navigator.clipboard.writeText(this.metadata.uniqueIdentifier)
-    ;(event.target as HTMLElement).blur()
-  }
 }

package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html

@@ -19,8 +19,8 @@
         <div class="flex flex-row items-center gap-2">
           <gn-ui-text-input
             class="mr-2 w-20"
-            (input)="setLimit($event.target.value)"
-            [value]="limit$ | async"
+            (valueChange)="setLimit($event)"
+            [value]="displayLimit$ | async"
             hint=""
           >
           </gn-ui-text-input>
@@ -28,8 +28,8 @@
             <input
               class="mr-2 cursor-pointer"
               type="checkbox"
-              [checked]="(limit$ | async) === ''"
-              (change)="setLimit('')"
+              [checked]="noLimitChecked$ | async"
+              (change)="setLimit('-1')"
             />
             <span class="text-sm" translate
               >record.metadata.api.form.limit.all</span
@@ -42,7 +42,7 @@
         <gn-ui-text-input
           class="w-20"
           [value]="offset$ | async"
-          (input)="setOffset($event.target.value)"
+          (valueChange)="setOffset($event)"
           hint=""
         >
         </gn-ui-text-input>