geonetwork-ui 2.7.0-dev.8de7be79f → 2.7.0-dev.9cba4b227

package/src/libs/feature/editor/src/lib/+state/editor.effects.ts

@@ -11,14 +11,14 @@ import {
   selectRecordSource,
 } from './editor.selectors'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
-import { Gn4PlatformService } from '../../../../../../libs/api/repository/src'
+import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 
 @Injectable()
 export class EditorEffects {
   private actions$ = inject(Actions)
   private editorService = inject(EditorService)
   private recordsRepository = inject(RecordsRepositoryInterface)
-  private gn4PlateformService = inject(Gn4PlatformService)
+  private plateformService = inject(PlatformServiceInterface)
   private store = inject(Store)
 
   saveRecord$ = createEffect(() =>
@@ -64,7 +64,7 @@ export class EditorEffects {
         withLatestFrom(this.store.select(selectRecord)),
         switchMap(([_, record]) => {
           if (record.uniqueIdentifier !== null) {
-            this.gn4PlateformService.cleanRecordAttachments(record).subscribe({
+            this.plateformService.cleanRecordAttachments(record).subscribe({
               next: (_) => undefined,
               error: (err) => {
                 console.error(err)

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts

@@ -12,7 +12,11 @@ import { map } from 'rxjs'
 import { Keyword } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 import { TranslatePipe } from '@ngx-translate/core'
-import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
 import { matWarningAmberOutline } from '@ng-icons/material-icons/outline'
 
 type AutocompleteItem = { title: string; value: Keyword }
@@ -34,6 +38,9 @@ type AutocompleteItem = { title: string; value: Keyword }
     provideIcons({
       matWarningAmberOutline,
     }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
   ],
 })
 export class GenericKeywordsComponent {

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

@@ -0,0 +1,22 @@
+<div class="flex flex-col gap-3">
+  <div class="flex flex-col gap-4">
+    <gn-ui-dropdown-multiselect
+      class="w-full"
+      [title]="'editor.record.form.topics.placeholder' | translate"
+      [maxRows]="6"
+      [selected]="topics"
+      [choices]="availableTopics || []"
+      [allowSearch]="true"
+      (selectValues)="handleItemSelection($event)"
+    >
+    </gn-ui-dropdown-multiselect>
+    <div class="flex gap-2 flex-wrap">
+      <gn-ui-badge
+        *ngFor="let topic of topics"
+        [removable]="true"
+        (badgeRemoveClicked)="removeTopic(topic)"
+        >{{ getTranslatedTopic(topic) }}
+      </gn-ui-badge>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,57 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import {
+  AutocompleteComponent,
+  BadgeComponent,
+  DropdownMultiselectComponent,
+} from '../../../../../../../../../libs/ui/inputs/src'
+import { NgIconComponent } from '@ng-icons/core'
+import { INSPIRE_TOPICS } from '../../../../fields.config'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-form-field-topics',
+  standalone: true,
+  imports: [
+    CommonModule,
+    AutocompleteComponent,
+    NgIconComponent,
+    BadgeComponent,
+    TranslatePipe,
+    DropdownMultiselectComponent,
+  ],
+  templateUrl: './form-field-topics.component.html',
+  styleUrl: './form-field-topics.component.css',
+})
+export class FormFieldTopicsComponent {
+  topics = []
+  @Input() set value(topics: string[]) {
+    this.topics = topics
+  }
+  @Output() valueChange: EventEmitter<string[]> = new EventEmitter()
+  availableTopics = INSPIRE_TOPICS.map((topic) => {
+    return {
+      label: this.translateService.instant(topic.label),
+      value: topic.value,
+    }
+  })
+
+  constructor(private translateService: TranslateService) {}
+
+  handleItemSelection(selectedItems: string[]) {
+    this.topics = selectedItems
+    this.valueChange.emit(this.topics)
+  }
+
+  removeTopic(topic: string) {
+    this.topics = this.topics.filter((t) => t !== topic)
+    this.valueChange.emit(this.topics)
+  }
+
+  getTranslatedTopic(topic: string) {
+    const topicKey = this.availableTopics.find(
+      (avail) => avail.value === topic
+    )?.label
+    return topicKey ? this.translateService.instant(topicKey) : ''
+  }
+}

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

@@ -109,6 +109,12 @@
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-keywords>
     </ng-container>
+    <ng-container *ngSwitchCase="'topics'">
+      <gn-ui-form-field-topics
+        [value]="valueAsTopics"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-topics>
+    </ng-container>
     <ng-container *ngSwitchCase="'licenses'">
       <gn-ui-form-field-license
         [label]="config.labelKey! | translate"

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

@@ -45,6 +45,7 @@ import { FormFieldConstraintsShortcutsComponent } from './form-field-constraints
 import { FormFieldConstraintsComponent } from './form-field-constraints/form-field-constraints.component'
 import { TextFieldModule } from '@angular/cdk/text-field'
 import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/form-field-spatial-toggle.component'
+import { FormFieldTopicsComponent } from './form-field-topics/form-field-topics.component'
 
 @Component({
   selector: 'gn-ui-form-field',
@@ -73,6 +74,7 @@ import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/for
     FormFieldConstraintsComponent,
     FormFieldConstraintsShortcutsComponent,
     FormFieldSpatialToggleComponent,
+    FormFieldTopicsComponent,
     TextFieldModule,
   ],
 })
@@ -128,6 +130,9 @@ export class FormFieldComponent {
   get valueAsKeywords() {
     return this.value as Array<Keyword>
   }
+  get valueAsTopics() {
+    return this.value as Array<string>
+  }
   get valueAsConstraints() {
     return this.value as Array<Constraint>
   }

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

@@ -10,3 +10,4 @@ export * from './form-field-array/form-field-array.component'
 export * from './form-field-spatial-extent/form-field-spatial-extent.component'
 export * from './form-field.component'
 export * from './form-field-constraints-shortcuts/constraints.utils'
+export * from './form-field-topics/form-field-topics.component'

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

@@ -1,35 +1,19 @@
-import { CommonModule } from '@angular/common'
-import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'
+import { provideHttpClient } from '@angular/common/http'
 import { NgModule } from '@angular/core'
-import { MatNativeDateModule } from '@angular/material/core'
-import { MatDatepickerModule } from '@angular/material/datepicker'
-import { MatFormFieldModule } from '@angular/material/form-field'
-import { TextInputComponent } from '../../../../../libs/ui/inputs/src'
 import { EffectsModule } from '@ngrx/effects'
 import { StoreModule } from '@ngrx/store'
-import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { EditorEffects } from './+state/editor.effects'
 import { EditorFacade } from './+state/editor.facade'
 import * as fromEditor from './+state/editor.reducer'
-import { Gn4PlatformService } from '../../../../../libs/api/repository/src'
 
 @NgModule({
   imports: [
-    CommonModule,
-    TranslateDirective,
-    TranslatePipe,
-    MatDatepickerModule,
-    MatNativeDateModule,
-    MatFormFieldModule,
-    HttpClientModule,
-    HttpClientXsrfModule,
     StoreModule.forFeature(
       fromEditor.EDITOR_FEATURE_KEY,
       fromEditor.editorReducer
     ),
     EffectsModule.forFeature([EditorEffects]),
-    TextInputComponent,
   ],
-  providers: [EditorFacade, Gn4PlatformService],
+  providers: [EditorFacade, provideHttpClient()],
 })
 export class FeatureEditorModule {}

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_topic,
+  Keyword,
+} from '../../../../../libs/common/domain/src/lib/model/record'
 
 /**
  * This file contains the configuration of the fields that will be displayed in the editor.
@@ -64,6 +67,11 @@ export const RECORD_KEYWORDS_FIELD: EditorField = {
   formFieldConfig: {},
 }
 
+export const RECORD_TOPICS_FIELD: EditorField = {
+  model: 'topics',
+  formFieldConfig: {},
+}
+
 export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
   model: 'resourceCreated',
   formFieldConfig: {
@@ -235,6 +243,13 @@ export const CLASSIFICATION_SECTION: EditorSection = {
   fields: [RECORD_KEYWORDS_FIELD],
 }
 
+export const TOPICS_SECTION: EditorSection = {
+  labelKey: marker('editor.record.form.section.topics.label'),
+  descriptionKey: marker('editor.record.form.section.topics.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,
@@ -274,6 +289,7 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
       sections: [
         TITLE_SECTION,
         CLASSIFICATION_SECTION,
+        TOPICS_SECTION,
         ABOUT_SECTION,
         GEOGRAPHICAL_COVERAGE_SECTION,
       ],
@@ -341,3 +357,77 @@ export const SPATIAL_SCOPES: Keyword[] = [
     type: 'theme',
   },
 ]
+
+/************************************************************
+ ***************           INSPIRE TOPICS            **************
+ ************************************************************
+ */
+
+export const INSPIRE_TOPICS: INSPIRE_topic[] = [
+  { value: 'biota', label: 'editor.record.form.topics.inspire.biota' },
+  {
+    value: 'boundaries',
+    label: 'editor.record.form.topics.inspire.boundaries',
+  },
+  {
+    value: 'climatologyMeteorologyAtmosphere',
+    label: 'editor.record.form.topics.inspire.climatology',
+  },
+  { value: 'economy', label: 'editor.record.form.topics.inspire.economy' },
+  { value: 'elevation', label: 'editor.record.form.topics.inspire.elevation' },
+  {
+    value: 'environment',
+    label: 'editor.record.form.topics.inspire.environnement',
+  },
+  { value: 'farming', label: 'editor.record.form.topics.inspire.farming' },
+  {
+    value: 'geoscientific information',
+    label: 'editor.record.form.topics.inspire.geoscientific',
+  },
+  { value: 'health', label: 'editor.record.form.topics.inspire.health' },
+  {
+    value: 'imageryBaseMapsEarthCover',
+    label: 'editor.record.form.topics.inspire.imagery',
+  },
+  { value: 'inlandWaters', label: 'editor.record.form.topics.inspire.waters' },
+  {
+    value: 'intelligenceMilitary',
+    label: 'editor.record.form.topics.inspire.intelligence',
+  },
+  { value: 'Location', label: 'editor.record.form.topics.inspire.location' },
+  { value: 'Oceans', label: 'editor.record.form.topics.inspire.oceans' },
+  {
+    value: 'planningCadastre',
+    label: 'editor.record.form.topics.inspire.planning',
+  },
+  { value: 'Society', label: 'editor.record.form.topics.inspire.society' },
+  { value: 'Structure', label: 'editor.record.form.topics.inspire.structure' },
+  {
+    value: 'Transportation',
+    label: 'editor.record.form.topics.inspire.transportation',
+  },
+  {
+    value: 'utilitiesCommunication',
+    label: 'editor.record.form.topics.inspire.utilities',
+  },
+]
+
+marker('editor.record.form.topics.inspire.biota')
+marker('editor.record.form.topics.inspire.boundaries')
+marker('editor.record.form.topics.inspire.climatology')
+marker('editor.record.form.topics.inspire.economy')
+marker('editor.record.form.topics.inspire.elevation')
+marker('editor.record.form.topics.inspire.environnement')
+marker('editor.record.form.topics.inspire.farming')
+marker('editor.record.form.topics.inspire.geoscientific')
+marker('editor.record.form.topics.inspire.health')
+marker('editor.record.form.topics.inspire.imagery')
+marker('editor.record.form.topics.inspire.intelligence')
+marker('editor.record.form.topics.inspire.location')
+marker('editor.record.form.topics.inspire.oceans')
+marker('editor.record.form.topics.inspire.planning')
+marker('editor.record.form.topics.inspire.society')
+marker('editor.record.form.topics.inspire.structure')
+marker('editor.record.form.topics.inspire.transportation')
+marker('editor.record.form.topics.inspire.utilities')
+marker('editor.record.form.topics.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.ts

@@ -57,7 +57,9 @@ export class DataViewComponent {
     }
   }
   @Input() set datavizConfig(value: any) {
-    this._selectedView = value.view
+    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)

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.ts

@@ -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,7 +98,12 @@ 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) {
@@ -109,7 +118,7 @@ export class MapViewComponent implements AfterViewInit {
     this.selectedView$.next(value)
   }
   @Input() set datavizConfig(value: any) {
-    if (value.view === 'map') {
+    if (value && value.view === 'map') {
       this.selectedView$.next(value.view)
       if (value.styleTMSIndex) {
         this._styleFromConfig = value.styleTMSIndex

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/record/src/lib/state/mdview.facade.ts

@@ -139,8 +139,10 @@ export class MdViewFacade {
               return from(
                 this.dataService.getItemsFromOgcApi(link.url.href)
               ).pipe(
-                map((collectionRecords: OgcApiRecord) => {
-                  return collectionRecords && collectionRecords.geometry
+                map((collectionRecords: OgcApiRecord[]) => {
+                  return collectionRecords &&
+                    collectionRecords[0] &&
+                    collectionRecords[0].geometry
                     ? link
                     : null
                 }),

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: '',

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

@@ -13,7 +13,6 @@ export * from './lib/results-list/results-list.container.component'
 export * from './lib/filter-dropdown/filter-dropdown.component'
 export * from './lib/constants'
 export * from './lib/fuzzy-search/fuzzy-search.component'
-export * from './lib/facets/facets.module'
 export * from './lib/facets/facets-container/facets-container.component'
 export * from './lib/records-metrics/records-metrics.component'
 export * from './lib/favorites/favorite-star/favorite-star.component'