geonetwork-ui 2.3.0-dev.6e2b8bea → 2.3.0-dev.82249397

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

@@ -1,7 +1,13 @@
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 import { createAction, props } from '@ngrx/store'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  UserFeedback,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 
+/*
+  Metadata actions
+ */
 export const loadFullMetadata = createAction(
   '[Metadata view] Load full metadata',
   props<{ uuid: string }>()
@@ -12,24 +18,63 @@ export const setIncompleteMetadata = createAction(
   props<{ incomplete: Partial<CatalogRecord> }>()
 )
 
-export const loadFullSuccess = createAction(
-  '[Metadata view] Load full success',
+export const loadFullMetadataSuccess = createAction(
+  '[Metadata view] Load full metadata success',
   props<{ full: CatalogRecord }>()
 )
 
-export const loadFullFailure = createAction(
-  '[Metadata view] Load full failure',
+export const loadFullMetadataFailure = createAction(
+  '[Metadata view] Load full metadata failure',
   props<{ otherError?: string; notFound?: boolean }>()
 )
 
+export const closeMetadata = createAction('[Metadata view] close')
+
+/*
+  Related actions
+ */
 export const setRelated = createAction(
   '[Metadata view] Set related records',
   props<{ related: CatalogRecord[] }>()
 )
 
+/*
+  ChartConfig actions
+ */
 export const setChartConfig = createAction(
   '[Metadata view] Set chart config',
   props<{ chartConfig: DatavizConfigurationModel }>()
 )
 
-export const close = createAction('[Metadata view] close')
+/*
+  User Feedbacks actions
+ */
+export const addUserFeedback = createAction(
+  '[Metadata view] Add UserFeedback',
+  props<{ userFeedback: UserFeedback }>()
+)
+
+export const addUserFeedbackSuccess = createAction(
+  '[Metadata view] Add UserFeedback Success',
+  props<{ datasetUuid: string }>()
+)
+
+export const addUserFeedbackFailure = createAction(
+  '[Metadata view] Add UserFeedback Failure',
+  props<{ otherError?: string; notFound?: boolean }>()
+)
+
+export const loadUserFeedbacks = createAction(
+  '[Metadata view] Load UserFeedbacks',
+  props<{ datasetUuid: string }>()
+)
+
+export const loadUserFeedbacksSuccess = createAction(
+  '[Metadata view] Load UserFeedbacks Success',
+  props<{ userFeedbacks: UserFeedback[] }>()
+)
+
+export const loadUserFeedbacksFailure = createAction(
+  '[Metadata view] Load UserFeedbacks Failure',
+  props<{ otherError?: string; notFound?: boolean }>()
+)

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

@@ -1,18 +1,23 @@
 import { Injectable } from '@angular/core'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
-import { of } from 'rxjs'
+import { exhaustMap, mergeMap, of } from 'rxjs'
 import { catchError, map, switchMap } from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 
 @Injectable()
 export class MdViewEffects {
   constructor(
     private actions$: Actions,
-    private recordsRepository: RecordsRepositoryInterface
+    private recordsRepository: RecordsRepositoryInterface,
+    private platformServiceInterface: PlatformServiceInterface
   ) {}
 
-  loadFull$ = createEffect(() =>
+  /*
+    Metadata effects
+  */
+  loadFullMetadata$ = createEffect(() =>
     this.actions$.pipe(
       ofType(MdViewActions.loadFullMetadata),
       switchMap(({ uuid }) =>
@@ -20,19 +25,22 @@ export class MdViewEffects {
       ),
       map((record) => {
         if (record === null) {
-          return MdViewActions.loadFullFailure({ notFound: true })
+          return MdViewActions.loadFullMetadataFailure({ notFound: true })
         }
-        return MdViewActions.loadFullSuccess({ full: record })
+        return MdViewActions.loadFullMetadataSuccess({ full: record })
       }),
       catchError((error) =>
-        of(MdViewActions.loadFullFailure({ otherError: error.message }))
+        of(MdViewActions.loadFullMetadataFailure({ otherError: error.message }))
       )
     )
   )
 
+  /*
+    Related effects
+  */
   loadRelatedRecords$ = createEffect(() =>
     this.actions$.pipe(
-      ofType(MdViewActions.loadFullSuccess),
+      ofType(MdViewActions.loadFullMetadataSuccess),
       switchMap(({ full }) => this.recordsRepository.getSimilarRecords(full)),
       map((related) => {
         return MdViewActions.setRelated({ related })
@@ -40,4 +48,71 @@ export class MdViewEffects {
       catchError((error) => of(MdViewActions.setRelated({ related: null })))
     )
   )
+
+  /*
+    UserFeedback effects
+  */
+  loadUserFeedbacks$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(MdViewActions.loadUserFeedbacks),
+      exhaustMap(({ datasetUuid }) =>
+        this.platformServiceInterface.getUserFeedbacks(datasetUuid).pipe(
+          map((userFeedbacks) =>
+            MdViewActions.loadUserFeedbacksSuccess({ userFeedbacks })
+          ),
+          catchError((error) =>
+            of(
+              MdViewActions.loadUserFeedbacksFailure({
+                otherError: error.message,
+              })
+            )
+          )
+        )
+      )
+    )
+  )
+
+  reloadUserFeedbacks$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(MdViewActions.addUserFeedbackSuccess),
+      exhaustMap(({ datasetUuid }) =>
+        this.platformServiceInterface.getUserFeedbacks(datasetUuid).pipe(
+          map((userFeedbacks) =>
+            MdViewActions.loadUserFeedbacksSuccess({ userFeedbacks })
+          ),
+          catchError((error) =>
+            of(
+              MdViewActions.loadUserFeedbacksFailure({
+                otherError: error.message,
+              })
+            )
+          )
+        )
+      )
+    )
+  )
+
+  addUserFeedback$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(MdViewActions.addUserFeedback),
+      mergeMap((action) =>
+        this.platformServiceInterface
+          .postUserFeedbacks(action.userFeedback)
+          .pipe(
+            map(() =>
+              MdViewActions.addUserFeedbackSuccess({
+                datasetUuid: action.userFeedback.metadataUUID,
+              })
+            ),
+            catchError((error) => {
+              return of(
+                MdViewActions.addUserFeedbackFailure({
+                  otherError: error.message,
+                })
+              )
+            })
+          )
+      )
+    )
+  )
 }

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

@@ -5,7 +5,11 @@ import * as MdViewActions from './mdview.actions'
 import * as MdViewSelectors from './mdview.selectors'
 import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  UserFeedback,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src'
 
 @Injectable()
 /**
@@ -15,19 +19,31 @@ import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/mode
  * To clear the current record use the `close()` method.
  */
 export class MdViewFacade {
+  constructor(
+    private store: Store,
+    private linkClassifier: LinkClassifierService,
+    private avatarService: AvatarServiceInterface
+  ) {}
+
   isPresent$ = this.store.pipe(
     select(MdViewSelectors.getMetadataUuid),
     map((uuid) => !!uuid)
   )
-  isLoading$ = this.store.pipe(select(MdViewSelectors.getMetadataIsLoading))
+
+  isMetadataLoading$ = this.store.pipe(
+    select(MdViewSelectors.getMetadataIsLoading)
+  )
+
   metadata$ = this.store.pipe(
     select(MdViewSelectors.getMetadata),
     filter((md) => !!md)
   )
+
   isIncomplete$ = this.store.pipe(
     select(MdViewSelectors.getMetadataIsIncomplete),
     filter((incomplete) => incomplete !== null)
   )
+
   error$ = this.store.pipe(select(MdViewSelectors.getMetadataError))
 
   related$ = this.store.pipe(select(MdViewSelectors.getRelated))
@@ -37,11 +53,13 @@ export class MdViewFacade {
   allLinks$ = this.metadata$.pipe(
     map((record) => ('distributions' in record ? record.distributions : []))
   )
+
   apiLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.API))
     )
   )
+
   mapApiLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) =>
@@ -49,6 +67,7 @@ export class MdViewFacade {
       )
     )
   )
+
   downloadLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) =>
@@ -56,11 +75,13 @@ export class MdViewFacade {
       )
     )
   )
+
   dataLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.DATA))
     )
   )
+
   geoDataLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) =>
@@ -68,9 +89,11 @@ export class MdViewFacade {
       )
     )
   )
+
   landingPageLinks$ = this.metadata$.pipe(
     map((record) => ('landingPage' in record ? [record.landingPage] : []))
   )
+
   otherLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) =>
@@ -79,10 +102,13 @@ export class MdViewFacade {
     )
   )
 
-  constructor(
-    private store: Store,
-    private linkClassifier: LinkClassifierService
-  ) {}
+  userFeedbacks$ = this.store.pipe(select(MdViewSelectors.getUserFeedbacks))
+  isAllUserFeedbackLoading$ = this.store.pipe(
+    select(MdViewSelectors.getAllUserFeedbacksLoading)
+  )
+  isAddUserFeedbackLoading$ = this.store.pipe(
+    select(MdViewSelectors.getAddUserFeedbacksLoading)
+  )
 
   /**
    * This will show an incomplete record (e.g. from a search result) as a preview
@@ -91,16 +117,30 @@ export class MdViewFacade {
   setIncompleteMetadata(incomplete: CatalogRecord) {
     this.store.dispatch(MdViewActions.setIncompleteMetadata({ incomplete }))
   }
+
   /**
    * This will trigger the load of a full metadata record
    */
   loadFull(uuid: string) {
     this.store.dispatch(MdViewActions.loadFullMetadata({ uuid }))
   }
-  close() {
-    this.store.dispatch(MdViewActions.close())
+
+  closeMetadata() {
+    this.store.dispatch(MdViewActions.closeMetadata())
   }
+
   setChartConfig(chartConfig: DatavizConfigurationModel) {
     this.store.dispatch(MdViewActions.setChartConfig({ chartConfig }))
   }
+
+  /**
+   * UserFeedbacks
+   */
+  addUserFeedback(userFeedback: UserFeedback) {
+    this.store.dispatch(MdViewActions.addUserFeedback({ userFeedback }))
+  }
+
+  loadUserFeedbacks(datasetUuid: string) {
+    this.store.dispatch(MdViewActions.loadUserFeedbacks({ datasetUuid }))
+  }
 }

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

@@ -1,61 +1,118 @@
 import { Action, createReducer, on } from '@ngrx/store'
-import * as MdViewActions from './mdview.actions'
+import * as MetadataViewActions from './mdview.actions'
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  UserFeedback,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 
-export const MD_VIEW_FEATURE_STATE_KEY = 'mdView'
+export const METADATA_VIEW_FEATURE_STATE_KEY = 'metadataView'
 
-export interface MdViewState {
+export interface MetadataViewState {
   loadingFull: boolean
   error: { notFound?: boolean; otherError?: string } | null
   metadata?: Partial<CatalogRecord>
   related?: CatalogRecord[]
+  userFeedbacks?: UserFeedback[]
+  allUserFeedbacksLoading: boolean
+  addUserFeedbackLoading: boolean
   chartConfig?: DatavizConfigurationModel
 }
 
-export const initialMdviewState: MdViewState = {
+export const initialMetadataViewState: MetadataViewState = {
   error: null,
   loadingFull: false,
+  allUserFeedbacksLoading: false,
+  addUserFeedbackLoading: false,
 }
 
-const mdViewReducer = createReducer(
-  initialMdviewState,
-  on(MdViewActions.loadFullMetadata, (state) => ({
+const metadataViewReducer = createReducer(
+  initialMetadataViewState,
+
+  /*
+    Metadata reducers
+  */
+  on(MetadataViewActions.loadFullMetadata, (state) => ({
     ...state,
     error: null,
     loadingFull: true,
   })),
-  on(MdViewActions.setIncompleteMetadata, (state, { incomplete }) => ({
+  on(MetadataViewActions.setIncompleteMetadata, (state, { incomplete }) => ({
     ...state,
     error: null,
     metadata: incomplete,
   })),
-  on(MdViewActions.loadFullSuccess, (state, { full }) => ({
+  on(MetadataViewActions.loadFullMetadataSuccess, (state, { full }) => ({
     ...state,
     error: null,
     metadata: full,
     loadingFull: false,
   })),
-  on(MdViewActions.loadFullFailure, (state, { otherError, notFound }) => ({
-    ...state,
-    error: { otherError, notFound },
-    loadingFull: false,
-  })),
-  on(MdViewActions.setRelated, (state, { related }) => ({
+  on(
+    MetadataViewActions.loadFullMetadataFailure,
+    (state, { otherError, notFound }) => ({
+      ...state,
+      error: { otherError, notFound },
+      loadingFull: false,
+    })
+  ),
+  on(MetadataViewActions.closeMetadata, (state) => {
+    const { metadata, related, userFeedbacks, ...stateWithoutMetadata } = state
+    return stateWithoutMetadata
+  }),
+
+  /*
+    Related reducers
+  */
+  on(MetadataViewActions.setRelated, (state, { related }) => ({
     ...state,
     related,
   })),
-  on(MdViewActions.setChartConfig, (state, { chartConfig }) => ({
+
+  /*
+    ChartConfig reducers
+  */
+  on(MetadataViewActions.setChartConfig, (state, { chartConfig }) => ({
     ...state,
     chartConfig,
   })),
-  on(MdViewActions.close, (state) => {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { metadata, related, ...stateWithoutMd } = state
-    return stateWithoutMd
-  })
+
+  /*
+    UserFeedbacks reducers
+  */
+  on(MetadataViewActions.loadUserFeedbacks, (state) => ({
+    ...state,
+    error: null,
+    allUserFeedbacksLoading: true,
+  })),
+  on(MetadataViewActions.addUserFeedback, (state) => ({
+    ...state,
+    addUserFeedbackLoading: true,
+  })),
+  on(
+    MetadataViewActions.loadUserFeedbacksSuccess,
+    (state, { userFeedbacks }) => ({
+      ...state,
+      error: null,
+      userFeedbacks: userFeedbacks,
+      addUserFeedbackLoading: false,
+      allUserFeedbacksLoading: false,
+    })
+  ),
+  on(
+    MetadataViewActions.loadUserFeedbacksFailure,
+    (state, { otherError, notFound }) => ({
+      ...state,
+      error: { otherError, notFound },
+      addUserFeedbackLoading: false,
+      allUserFeedbacksLoading: false,
+    })
+  )
 )
 
-export function reducer(state: MdViewState | undefined, action: Action) {
-  return mdViewReducer(state, action)
+export function reducer(
+  metadataViewState: MetadataViewState | undefined,
+  action: Action
+) {
+  return metadataViewReducer(metadataViewState, action)
 }

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

@@ -1,36 +1,66 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store'
-import { MD_VIEW_FEATURE_STATE_KEY, MdViewState } from './mdview.reducer'
+import {
+  METADATA_VIEW_FEATURE_STATE_KEY,
+  MetadataViewState,
+} from './mdview.reducer'
 
-export const getMdViewState = createFeatureSelector<MdViewState>(
-  MD_VIEW_FEATURE_STATE_KEY
+export const getMdViewState = createFeatureSelector<MetadataViewState>(
+  METADATA_VIEW_FEATURE_STATE_KEY
 )
 
+/*
+  Metadata selectors
+*/
 export const getMetadataUuid = createSelector(
   getMdViewState,
-  (state: MdViewState) =>
+  (state: MetadataViewState) =>
     state.metadata ? state.metadata.uniqueIdentifier : null
 )
 export const getMetadata = createSelector(
   getMdViewState,
-  (state: MdViewState) => state.metadata
+  (state: MetadataViewState) => state.metadata
 )
 export const getMetadataIsIncomplete = createSelector(
   getMdViewState,
-  (state: MdViewState) => (state.metadata ? state.loadingFull : null)
+  (state: MetadataViewState) => (state.metadata ? state.loadingFull : null)
 )
 export const getMetadataIsLoading = createSelector(
   getMdViewState,
-  (state: MdViewState) => state.loadingFull
+  (state: MetadataViewState) => state.loadingFull
 )
 export const getMetadataError = createSelector(
   getMdViewState,
-  (state: MdViewState) => state.error
+  (state: MetadataViewState) => state.error
 )
+
+/*
+  Related selectors
+*/
 export const getRelated = createSelector(
   getMdViewState,
-  (state: MdViewState) => state.related
+  (state: MetadataViewState) => state.related
 )
+
+/*
+  Metadata selectors
+*/
 export const getChartConfig = createSelector(
   getMdViewState,
-  (state: MdViewState) => state.chartConfig
+  (state: MetadataViewState) => state.chartConfig
+)
+
+/*
+  UserFeedback selectors
+*/
+export const getUserFeedbacks = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.userFeedbacks
+)
+export const getAllUserFeedbacksLoading = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.allUserFeedbacksLoading
+)
+export const getAddUserFeedbacksLoading = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.addUserFeedbackLoading
 )

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

@@ -15,7 +15,7 @@ import {
 } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { navigation } from '@ngrx/router-store/data-persistence'
-import { of, pairwise, startWith, withLatestFrom } from 'rxjs'
+import { of, pairwise, startWith } from 'rxjs'
 import { map, mergeMap, tap } from 'rxjs/operators'
 import * as RouterActions from './router.actions'
 import { RouterFacade } from './router.facade'
@@ -141,7 +141,7 @@ export class RouterEffects {
   navigateToSearch$ = createEffect(() =>
     this._actions$.pipe(
       navigation(this.routerConfig.searchRouteComponent, {
-        run: () => MdViewActions.close(),
+        run: () => MdViewActions.closeMetadata(),
       })
     )
   )

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

@@ -8,6 +8,7 @@ export * from './lib/state/effects'
 export * from './lib/state/reducer'
 export * from './lib/utils/service/search.service'
 export * from './lib/utils/service/fields.service'
+export * from './lib/utils/service/fields'
 export * from './lib/results-list/results-list.container.component'
 export * from './lib/filter-dropdown/filter-dropdown.component'
 export * from './lib/constants'

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

@@ -50,20 +50,20 @@
         [title]="formats.join(', ')"
       >
         <span
-          class="badge-btn min-w-[45px] text-sm text-white px-2 flex-shrink-0"
+          class="badge-btn min-w-[45px] text-sm text-white px-2 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"
+          class="badge-btn min-w-[45px] text-sm text-white px-2 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">
+        <div class="shrink-0" *ngIf="formats.slice(2).length > 0">
           <span>+{{ formats.slice(2).length }}</span>
         </div>
       </div>

package/src/libs/feature/search/src/lib/utils/service/fields.service.ts

@@ -36,7 +36,7 @@ marker('search.filters.contact')
   providedIn: 'root',
 })
 export class FieldsService {
-  private fields = {
+  protected fields = {
     publisher: new OrganizationSearchField(this.injector),
     format: new SimpleSearchField('format', this.injector, 'asc'),
     resourceType: new TranslatedSearchField(
@@ -76,7 +76,7 @@ export class FieldsService {
     return Object.keys(this.fields)
   }
 
-  constructor(private injector: Injector) {}
+  constructor(protected injector: Injector) {}
 
   getAvailableValues(fieldName: string) {
     if (this.supportedFields.indexOf(fieldName) === -1)

package/src/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html

@@ -4,7 +4,7 @@
     [title]="organisation.name"
   >
     <div
-      class="flex-shrink-0 bg-gray-100 rounded-lg overflow-hidden w-full border border-gray-300 h-36"
+      class="shrink-0 bg-gray-100 rounded-lg overflow-hidden w-full border border-gray-300 h-36"
     >
       <gn-ui-thumbnail
         class="relative h-full w-full"
@@ -13,20 +13,20 @@
       >
       </gn-ui-thumbnail>
     </div>
-    <div class="px-3 pb-2 capitalize flex flex-col flex-grow overflow-hidden">
+    <div class="px-3 pb-2 capitalize flex flex-col grow overflow-hidden">
       <span
-        class="flex-shrink-0 mb-3 mt-5 font-title text-21 text-title group-hover:text-primary line-clamp-2 sm:mt-2 transition-colors"
+        class="shrink-0 mb-3 mt-5 font-title text-21 text-title group-hover:text-primary line-clamp-2 sm:mt-2 transition-colors"
         data-cy="organizationName"
       >
         {{ organisation.name }}</span
       >
       <p
-        class="abstract mt-4 mb-5 sm:mb-2 sm:mt-0 flex-grow flex-shrink-1 overflow-hidden"
+        class="abstract mt-4 mb-5 sm:mb-2 sm:mt-0 grow shrink-1 overflow-hidden"
         data-cy="organizationDesc"
       >
         {{ organisation.description }}
       </p>
-      <div class="flex-shrink-0 text-primary opacity-50 flex leading-6">
+      <div class="shrink-0 text-primary opacity-50 flex leading-6">
         <mat-icon class="material-symbols-outlined text-primary opacity-50 mr-1"
           >folder_open
         </mat-icon>