geonetwork-ui 2.7.0-dev.fa54bd3a5 → 2.7.0-dev.fd871c105

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -4,7 +4,10 @@ import {
   EditorField,
   EditorSection,
 } from './models/editor-config.model'
-import { Keyword } from '../../../../../libs/common/domain/src/lib/model/record'
+import {
+  INSPIRE_theme,
+  Keyword,
+} from '../../../../../libs/common/domain/src/lib/model/record'
 
 /**
  * This file contains the configuration of the fields that will be displayed in the editor.
@@ -63,8 +66,11 @@ export const RECORD_KEYWORDS_FIELD: EditorField = {
   model: 'keywords',
   formFieldConfig: {},
 }
-// keeping track of the label to not lose existing translation
-marker('editor.record.form.field.keywords')
+
+export const RECORD_TOPICS_FIELD: EditorField = {
+  model: 'topics',
+  formFieldConfig: {},
+}
 
 export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
   model: 'resourceCreated',
@@ -237,6 +243,13 @@ export const CLASSIFICATION_SECTION: EditorSection = {
   fields: [RECORD_KEYWORDS_FIELD],
 }
 
+export const INSPIRE_SECTION: EditorSection = {
+  labelKey: marker('editor.record.form.section.inspire.label'),
+  descriptionKey: marker('editor.record.form.section.inspire.description'),
+  hidden: false,
+  fields: [RECORD_TOPICS_FIELD],
+}
+
 export const USE_AND_ACCESS_CONDITIONS_SECTION: EditorSection = {
   labelKey: marker('editor.record.form.section.useAndAccessConditions.label'),
   hidden: false,
@@ -276,6 +289,7 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
       sections: [
         TITLE_SECTION,
         CLASSIFICATION_SECTION,
+        INSPIRE_SECTION,
         ABOUT_SECTION,
         GEOGRAPHICAL_COVERAGE_SECTION,
       ],
@@ -343,3 +357,71 @@ export const SPATIAL_SCOPES: Keyword[] = [
     type: 'theme',
   },
 ]
+
+/************************************************************
+ ***************           INSPIRE THEMES            **************
+ ************************************************************
+ */
+
+export const INSPIRE_THEMES: INSPIRE_theme[] = [
+  { value: 'biota', label: 'editor.record.form.inspire.biota' },
+  { value: 'boundaries', label: 'editor.record.form.inspire.boundaries' },
+  {
+    value: 'climatologyMeteorologyAtmosphere',
+    label: 'editor.record.form.inspire.climatology',
+  },
+  { value: 'economy', label: 'editor.record.form.inspire.economy' },
+  { value: 'elevation', label: 'editor.record.form.inspire.elevation' },
+  { value: 'environment', label: 'editor.record.form.inspire.environnement' },
+  { value: 'farming', label: 'editor.record.form.inspire.farming' },
+  {
+    value: 'geoscientific information',
+    label: 'editor.record.form.inspire.geoscientific',
+  },
+  { value: 'health', label: 'editor.record.form.inspire.health' },
+  {
+    value: 'imageryBaseMapsEarthCover',
+    label: 'editor.record.form.inspire.imagery',
+  },
+  { value: 'inlandWaters', label: 'editor.record.form.inspire.waters' },
+  {
+    value: 'intelligenceMilitary',
+    label: 'editor.record.form.inspire.intelligence',
+  },
+  { value: 'Location', label: 'editor.record.form.inspire.location' },
+  { value: 'Oceans', label: 'editor.record.form.inspire.oceans' },
+  {
+    value: 'planningCadastre',
+    label: 'editor.record.form.inspire.planning',
+  },
+  { value: 'Society', label: 'editor.record.form.inspire.society' },
+  { value: 'Structure', label: 'editor.record.form.inspire.structure' },
+  {
+    value: 'Transportation',
+    label: 'editor.record.form.inspire.transportation',
+  },
+  {
+    value: 'utilitiesCommunication',
+    label: 'editor.record.form.inspire.utilities',
+  },
+]
+
+marker('editor.record.form.inspire.biota')
+marker('editor.record.form.inspire.boundaries')
+marker('editor.record.form.inspire.climatology')
+marker('editor.record.form.inspire.economy')
+marker('editor.record.form.inspire.elevation')
+marker('editor.record.form.inspire.environnement')
+marker('editor.record.form.inspire.farming')
+marker('editor.record.form.inspire.geoscientific')
+marker('editor.record.form.inspire.health')
+marker('editor.record.form.inspire.imagery')
+marker('editor.record.form.inspire.intelligence')
+marker('editor.record.form.inspire.location')
+marker('editor.record.form.inspire.oceans')
+marker('editor.record.form.inspire.planning')
+marker('editor.record.form.inspire.society')
+marker('editor.record.form.inspire.structure')
+marker('editor.record.form.inspire.transportation')
+marker('editor.record.form.inspire.utilities')
+marker('editor.record.form.inspire.waters')

package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-from-catalog.component.ts

@@ -3,6 +3,7 @@ import {
   FeatureSearchModule,
   FIELDS_BRIEF,
   FuzzySearchComponent,
+  ResultsListContainerComponent,
   SearchFacade,
   SearchService,
 } from '../../../../../../libs/feature/search/src'
@@ -11,6 +12,7 @@ import {
   ResultsLayoutConfigItem,
 } from '../../../../../../libs/ui/search/src'
 import { AddLayerRecordPreviewComponent } from './add-layer-record-preview/add-layer-record-preview.component'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-add-layer-from-catalog',
@@ -33,7 +35,12 @@ import { AddLayerRecordPreviewComponent } from './add-layer-record-preview/add-l
       },
     },
   ],
-  imports: [FeatureSearchModule, FuzzySearchComponent],
+  imports: [
+    CommonModule,
+    FeatureSearchModule,
+    FuzzySearchComponent,
+    ResultsListContainerComponent,
+  ],
 })
 export class AddLayerFromCatalogComponent implements OnInit {
   constructor(private searchFacade: SearchFacade) {}

package/src/libs/feature/map/src/lib/utils/map-utils.service.ts

@@ -1,25 +1,25 @@
 import { Injectable } from '@angular/core'
-import { extend, Extent } from 'ol/extent'
-import GeoJSON from 'ol/format/GeoJSON'
+import { extend } from 'ol/extent'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
-
-const GEOJSON = new GeoJSON()
+import { BoundingBox, getGeometryBoundingBox } from '../../../../../../libs/util/shared/src'
 
 @Injectable({
   providedIn: 'root',
 })
 export class MapUtilsService {
-  getRecordExtent(record: Partial<CatalogRecord>): Extent {
+  getRecordExtent(record: Partial<CatalogRecord>): BoundingBox {
     if (!('spatialExtents' in record) || record.spatialExtents.length === 0) {
       return null
     }
     // extend all the spatial extents into an including bbox
     return record.spatialExtents.reduce(
       (prev, curr) => {
-        if ('bbox' in curr) return extend(prev, curr.bbox)
+        if ('bbox' in curr) return extend(prev, curr.bbox) as BoundingBox
         else if ('geometry' in curr) {
-          const geom = GEOJSON.readGeometry(curr.geometry)
-          return extend(prev, geom.getExtent())
+          return extend(
+            prev,
+            getGeometryBoundingBox(curr.geometry)
+          ) as BoundingBox
         }
         return prev
       },

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

@@ -1,3 +1,2 @@
-export * from './lib/feature-notifications.module'
 export * from './lib/notifications.service'
 export * from './lib/notifications-container/notifications-container.component'

package/src/libs/feature/record/src/lib/data-view/data-view.component.html

@@ -9,6 +9,7 @@
       class="h-[44px] w-full"
       extraBtnClass="font-sans font-bold"
       [choices]="choices"
+      [selected]="_selectedChoice"
       (selectValue)="selectLink($event)"
     ></gn-ui-dropdown-selector>
   </div>
@@ -35,6 +36,7 @@
         [cacheActive]="cacheActive$ | async"
         [link]="selectedLink$ | async"
         [featureCatalog]="mdViewFacade.featureCatalog$ | async"
+        [userChartConfig]="_chartConfig"
       ></gn-ui-chart-view>
     </div>
   </ng-template>

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

@@ -5,15 +5,16 @@ import {
   Input,
   Output,
 } from '@angular/core'
-import { getLinkLabel, getLinkPriority } from '../../../../../../libs/util/shared/src'
+import {
+  getLinkId,
+  getLinkLabel,
+  getLinkPriority,
+} from '../../../../../../libs/util/shared/src'
 import { BehaviorSubject, combineLatest } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { MdViewFacade } from '../state'
 import { DatavizChartConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
-import {
-  DatasetOnlineResource,
-  DatasetServiceDistribution,
-} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { DropdownSelectorComponent } from '../../../../../../libs/ui/inputs/src'
 import {
   ChartViewComponent,
@@ -45,13 +46,30 @@ export class DataViewComponent {
   @Input() set exceedsLimit(value: boolean) {
     this.excludeWfs$.next(value)
   }
+  linkMap: Map<string, DatasetOnlineResource> = new Map()
   _selectedView = ''
+  _chartConfig = null
+  _selectedChoice = null
   @Input() set selectedView(value: string) {
     this._selectedView = value
-    if (value !== 'map') {
+    if (this.mode === value) {
       this.linkSelected.emit(this.selectedLink$.value)
     }
   }
+  @Input() set datavizConfig(value: any) {
+    if ((value && value.view === 'table') || value.view === 'chart') {
+      this._selectedView = value.view
+    }
+    if (this.mode === value.view) {
+      if (!value.source) {
+        this.linkSelected.emit(this.selectedLink$.value)
+      } else {
+        this._chartConfig = value.chartConfig
+        this._selectedChoice = getLinkId(value.source)
+        this.selectedLink$.next(value.source)
+      }
+    }
+  }
   @Output() chartConfig$ = new BehaviorSubject<DatavizChartConfigModel>(null)
   @Output() linkSelected = new EventEmitter<DatasetOnlineResource>()
   cacheActive$ = this.mdViewFacade.isHighUpdateFrequency$.pipe(
@@ -69,15 +87,19 @@ export class DataViewComponent {
     })
   )
   dropdownChoices$ = this.compatibleDataLinks$.pipe(
-    tap((links) => {
-      if (links.indexOf(this.selectedLink$.value) === -1) {
-        this.selectLink(JSON.stringify(links[0]))
+    tap((links: DatasetOnlineResource[]) => {
+      this.linkMap.clear()
+      links.forEach((link: DatasetOnlineResource) =>
+        this.linkMap.set(getLinkId(link), link)
+      )
+      if (!links.some((l) => l.url === this.selectedLink$.value?.url)) {
+        this.selectLink(getLinkId(links[0]))
       }
     }),
     map((links) =>
-      links.map((link) => ({
+      links.map((link: DatasetOnlineResource) => ({
         label: getLinkLabel(link),
-        value: JSON.stringify(link),
+        value: getLinkId(link),
       }))
     )
   )
@@ -93,12 +115,11 @@ export class DataViewComponent {
     this.mdViewFacade.setChartConfig(event)
   }
 
-  selectLink(linkAsString: string) {
-    const link: DatasetOnlineResource = JSON.parse(linkAsString)
-    if (this._selectedView && this._selectedView !== 'map') {
+  selectLink(linkId: string) {
+    const link = this.linkMap.get(linkId)
+    if (this._selectedView && this._selectedView === this.mode) {
       this.linkSelected.emit(link)
     }
-    link.url = new URL(link.url)
     this.selectedLink$.next(link)
   }
 }

package/src/libs/feature/record/src/lib/external-viewer-button/external-viewer-button.component.ts

@@ -11,7 +11,7 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import { getFileFormat } from '../../../../../../libs/util/shared/src'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
-import { NgIcon, provideIcons } from '@ng-icons/core'
+import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 import { CommonModule } from '@angular/common'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
 
@@ -32,7 +32,12 @@ export const EXTERNAL_VIEWER_OPEN_NEW_TAB = new InjectionToken<boolean>(
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [CommonModule, ButtonComponent, NgIcon, TranslatePipe],
-  viewProviders: [provideIcons({ matOpenInNew })],
+  viewProviders: [
+    provideIcons({ matOpenInNew }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
+  ],
 })
 export class ExternalViewerButtonComponent {
   @Input() link: DatasetOnlineResource

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

@@ -1,40 +1,20 @@
 import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
 import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
 import { FeatureMapModule } from '../../../../../libs/feature/map/src'
-import { DropdownSelectorComponent } from '../../../../../libs/ui/inputs/src'
 import { MdViewFacade } from './state'
 import { MdViewEffects } from './state/mdview.effects'
 import {
   METADATA_VIEW_FEATURE_STATE_KEY,
   reducer,
 } from './state/mdview.reducer'
-import { MatTabsModule } from '@angular/material/tabs'
-import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
-import { FeatureCatalogModule } from '../../../../../libs/feature/catalog/src'
-import { DataTableComponent } from '../../../../../libs/ui/dataviz/src'
-import { NgIconsModule, provideNgIconsConfig } from '@ng-icons/core'
 
 @NgModule({
   imports: [
-    CommonModule,
     StoreModule.forFeature(METADATA_VIEW_FEATURE_STATE_KEY, reducer),
     EffectsModule.forFeature([MdViewEffects]),
     FeatureMapModule,
-    FeatureCatalogModule,
-    MatTabsModule,
-    TranslateDirective,
-    TranslatePipe,
-    DataTableComponent,
-    NgIconsModule,
-    DropdownSelectorComponent,
-  ],
-  providers: [
-    MdViewFacade,
-    provideNgIconsConfig({
-      size: '1.5em',
-    }),
   ],
+  providers: [MdViewFacade],
 })
 export class FeatureRecordModule {}

package/src/libs/feature/record/src/lib/gpf-api-dl-list-item/gpf-api-dl-list-item.component.ts

@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common'
 import { HttpClient } from '@angular/common/http'
 import { Component, Input, OnInit } from '@angular/core'
-import { NgIconsModule, provideIcons } from '@ng-icons/core'
+import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { map, mergeMap, Observable } from 'rxjs'
 import { matCloudDownloadOutline } from '@ng-icons/material-icons/outline'
@@ -11,11 +11,14 @@ import { matCloudDownloadOutline } from '@ng-icons/material-icons/outline'
   templateUrl: './gpf-api-dl-list-item.component.html',
   styleUrls: ['./gpf-api-dl-list-item.component.css'],
   standalone: true,
-  imports: [CommonModule, TranslateDirective, TranslatePipe, NgIconsModule],
+  imports: [CommonModule, TranslateDirective, TranslatePipe, NgIcon],
   providers: [
     provideIcons({
       matCloudDownloadOutline,
     }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
   ],
 })
 export class GpfApiDlListItemComponent implements OnInit {

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

@@ -8,6 +8,7 @@
       extraBtnClass="font-sans font-bold"
       [title]="'map.select.layer' | translate"
       [choices]="dropdownChoices$ | async"
+      [selected]="_selectedChoice"
       (selectValue)="selectLinkToDisplay($event)"
     ></gn-ui-dropdown-selector>
 
@@ -17,6 +18,7 @@
         extraBtnClass="font-sans font-bold"
         [title]="'map.select.style' | translate"
         [choices]="styleDropdownChoices$ | async"
+        [selected]="_styleFromConfig"
         (selectValue)="selectStyleToDisplay($event)"
       ></gn-ui-dropdown-selector>
     </ng-container>

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

@@ -9,7 +9,7 @@ import {
   ViewChild,
 } from '@angular/core'
 import { MapUtilsService } from '../../../../../../libs/feature/map/src'
-import { getLinkLabel } from '../../../../../../libs/util/shared/src'
+import { getLinkId, getLinkLabel } from '../../../../../../libs/util/shared/src'
 import {
   BehaviorSubject,
   combineLatest,
@@ -49,7 +49,11 @@ import {
   prioritizePageScroll,
 } from '../../../../../../libs/ui/map/src'
 import { Feature } from 'geojson'
-import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
 import { matClose } from '@ng-icons/material-icons/baseline'
 import { CommonModule } from '@angular/common'
 import {
@@ -94,21 +98,39 @@ marker('map.select.style')
     ButtonComponent,
     MapLegendComponent,
   ],
-  viewProviders: [provideIcons({ matClose })],
+  viewProviders: [
+    provideIcons({ matClose }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
+  ],
 })
 export class MapViewComponent implements AfterViewInit {
   @Input() set exceedsLimit(value: boolean) {
     this.excludeWfs$.next(value)
   }
+  linkFromConfig$ = new BehaviorSubject(null)
+  _selectedChoice = null
+  _styleFromConfig = null
+
+  linkMap: Map<string, DatasetOnlineResource> = new Map()
   @Input() set selectedView(value: string) {
-    if (value === 'map') {
-      this.selectedLink$.pipe(take(1)).subscribe((link) => {
-        this.linkSelected.emit(link)
-      })
+    this.selectedView$.next(value)
+  }
+  @Input() set datavizConfig(value: any) {
+    if (value && value.view === 'map') {
+      this.selectedView$.next(value.view)
+      if (value.styleTMSIndex) {
+        this._styleFromConfig = value.styleTMSIndex
+      }
+      if (value.source) {
+        this.linkFromConfig$.next(value.source)
+      }
     }
   }
   @Input() displaySource = true
   @Output() linkSelected = new EventEmitter<DatasetOnlineResource>()
+  @Output() styleSelected = new EventEmitter<number>()
   @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
   excludeWfs$ = new BehaviorSubject(false)
@@ -119,12 +141,13 @@ export class MapViewComponent implements AfterViewInit {
   loading = false
   error = null
 
-  selectLinkToDisplay(i: number) {
-    this.selectedLinkIndex$.next(i)
+  selectLinkToDisplay(id: string) {
+    this.selectedLinkId$.next(id)
   }
 
   selectStyleToDisplay(i: number) {
-    this.selectedStyleIndex$.next(i)
+    this.selectedStyleId$.next(i)
+    this.styleSelected.emit(i)
   }
 
   toggleLegend() {
@@ -146,29 +169,54 @@ export class MapViewComponent implements AfterViewInit {
   )
 
   dropdownChoices$ = this.compatibleMapLinks$.pipe(
-    map((links) =>
-      links.length
-        ? links.map((link, index) => ({
+    map((links) => {
+      this.linkMap.clear()
+      links.forEach((link: DatasetOnlineResource) =>
+        this.linkMap.set(getLinkId(link), link)
+      )
+      return links.length
+        ? links.map((link) => ({
             label: getLinkLabel(link),
-            value: index,
+            value: getLinkId(link),
           }))
-        : [{ label: 'map.dropdown.placeholder', value: 0 }]
-    )
+        : [{ label: 'map.dropdown.placeholder', value: '' }]
+    })
   )
 
-  selectedLinkIndex$ = new BehaviorSubject(0)
-  private selectedStyleIndex$ = new BehaviorSubject(0)
+  selectedView$ = new BehaviorSubject(null)
+  selectedLinkId$ = new BehaviorSubject(null)
+  selectedStyleId$ = new BehaviorSubject(null)
 
   selectedSourceLink$ = combineLatest([
     this.compatibleMapLinks$,
-    this.selectedLinkIndex$.pipe(distinctUntilChanged()),
+    this.linkFromConfig$,
+    this.selectedLinkId$.pipe(distinctUntilChanged()),
+    this.selectedView$,
   ]).pipe(
     tap(() => {
       this.error = null
     }),
-    map(([links, index]) => {
-      this.linkSelected.emit(links[index])
-      return links[index]
+    map(([compatibleLinks, configLink, id, view]) => {
+      if (view === 'map') {
+        if (
+          configLink &&
+          !id &&
+          compatibleLinks.some(
+            (link) => getLinkId(link) === getLinkId(configLink)
+          )
+        ) {
+          this._selectedChoice = getLinkId(configLink)
+          this.linkSelected.emit(configLink)
+          return configLink
+        } else if (id) {
+          this._selectedChoice = id
+          this.linkSelected.emit(this.linkMap.get(id))
+          return this.linkMap.get(id)
+        } else {
+          this.linkSelected.emit(compatibleLinks[0])
+          return compatibleLinks[0]
+        }
+      }
     })
   )
 
@@ -205,7 +253,13 @@ export class MapViewComponent implements AfterViewInit {
       }
       return of([])
     }),
-    tap(() => this.selectedStyleIndex$.next(0)),
+    tap((styles) => {
+      if (this._styleFromConfig && this._styleFromConfig <= styles.length) {
+        this.selectedStyleId$.next(this._styleFromConfig)
+      } else {
+        this.selectedStyleId$.next(0)
+      }
+    }),
     shareReplay(1)
   )
 
@@ -228,7 +282,7 @@ export class MapViewComponent implements AfterViewInit {
   selectedLink$ = combineLatest([
     this.selectedSourceLink$,
     this.styleLinks$,
-    this.selectedStyleIndex$.pipe(distinctUntilChanged()),
+    this.selectedStyleId$.pipe(distinctUntilChanged()),
   ]).pipe(
     map(([src, styles, styleIdx]) => (styles.length ? styles[styleIdx] : src)),
     shareReplay(1)
@@ -344,7 +398,9 @@ export class MapViewComponent implements AfterViewInit {
     ) {
       // FIXME: here we're assuming that the TMS serves vector tiles only; should be checked with ogc-client first
       return of({
-        url: link.url.toString().replace(/\/?$/, '/{z}/{x}/{y}.pbf'),
+        url: link.url
+          .toString()
+          .replace(/\/?$/, `/${link.name}/{z}/{x}/{y}.pbf`),
         type: 'xyz',
         tileFormat: 'application/vnd.mapbox-vector-tile',
         name: link.name,

package/src/libs/feature/record/src/lib/record-meta/record-meta.component.ts

@@ -1,3 +1,4 @@
+import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
   Component,
@@ -13,6 +14,7 @@ import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/mode
   template: '',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
+  imports: [CommonModule],
 })
 export class RecordMetaComponent implements OnDestroy, OnChanges {
   @Input() metadata: CatalogRecord

package/src/libs/feature/router/src/lib/default/container/search-router.container.directive.ts

@@ -11,6 +11,7 @@ import { RouterSearchService } from '../services/router-search.service'
       useClass: RouterSearchService,
     },
   ],
+  standalone: true,
 })
 export class SearchRouterContainerDirective implements OnInit {
   @Input('gnUiSearchRouterContainer') searchId: string

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

@@ -8,7 +8,6 @@ import {
 } from '@ngrx/router-store'
 import { StoreModule } from '@ngrx/store'
 import { ROUTER_STATE_KEY } from './constants'
-import { SearchRouterContainerDirective } from './container/search-router.container.directive'
 import { RouterService } from './router.service'
 import { SearchRouteReuseStrategy } from './SearchRouteReuseStrategy'
 import { RouterFacade } from './state/router.facade'
@@ -16,8 +15,6 @@ import { RouterEffects } from './state/router.effects'
 import { ROUTER_CONFIG, RouterConfigModel } from './router.config'
 
 @NgModule({
-  declarations: [SearchRouterContainerDirective],
-  exports: [SearchRouterContainerDirective],
   imports: [
     StoreModule.forFeature(ROUTER_STATE_KEY, routerReducer),
     StoreRouterConnectingModule.forRoot({

package/src/libs/feature/router/src/lib/default/state/query-params.utils.ts

@@ -14,7 +14,10 @@ export function flattenQueryParams(
       Array.isArray(flattened[key]) &&
       (flattened[key] as string[]).length > 0
     ) {
-      flattened[key] = [(flattened[key] as string[]).join(',')]
+      const encoded = (flattened[key] as string[]).map((value) =>
+        typeof value === 'string' ? value.replace(/,/g, '%2C') : value
+      )
+      flattened[key] = [encoded.join(',')]
     } else if (isDateRange(flattened[key] as DateRange)) {
       const start = (flattened[key] as DateRange).start
       const end = (flattened[key] as DateRange).end
@@ -48,7 +51,7 @@ export function expandQueryParams(
           ...(end && { end: new Date(`${end}T00:00:00`) }),
         }
       } else {
-        expanded[key] = value.split(',')
+        expanded[key] = value.split(',').map((v) => v.replace(/%2C/g, ','))
       }
     }
   }

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

@@ -63,7 +63,8 @@ export class RouterFacade {
   }
 
   goToOrganization(organizationName: string) {
-    const path = `${this.routerService.getOrganizationPageRoute()}/${organizationName}`
+    const safeOrgName = organizationName.replace(/\//g, '')
+    const path = `${this.routerService.getOrganizationPageRoute()}/${safeOrgName}`
     this.go({
       path,
       queryParamsHandling: '',