Merge pull request #1352 from geonetwork/backport/2.6.x/pr-1334

[2.6.x] Wrong slash and comma behaviour for organizations  (#1334)

Author: LHBruneton-C2C

apps/datahub/src/app/organization/organization-details/organization-details.component.html

@@ -35,7 +35,9 @@
             <a
               data-test="organizationDatasetCount"
               [routerLink]="['/', ROUTER_ROUTE_SEARCH]"
-              [queryParams]="{ organization: organization.name }"
+              [queryParams]="{
+                organization: sanitizeOrgName(organization.name),
+              }"
             >
               <gn-ui-figure
                 class="py-[37px] pl-[47px] rounded-lg border bg-white mb-5 card-shadow cursor-pointer"
@@ -78,7 +80,9 @@
               [records]="lastPublishedDatasets"
               [routerLinkButton]="{
                 routerLink: ['/', ROUTER_ROUTE_SEARCH],
-                queryParams: { organization: organization.name },
+                queryParams: {
+                  organization: sanitizeOrgName(organization.name),
+                },
                 label:
                   'organization.details.lastPublishedDatasets.searchAllButton'
                   | translate,

apps/datahub/src/app/organization/organization-details/organization-details.component.ts

@@ -118,4 +118,8 @@ export class OrganizationDetailsComponent implements OnInit, OnDestroy {
   }
 
   protected readonly errorTypes = ErrorType
+
+  sanitizeOrgName(name: string): string {
+    return name ? name.replace(/,/g, '%2C') : name
+  }
 }

apps/datahub/src/app/organization/organization-page/organization-page.component.spec.ts

@@ -82,5 +82,24 @@ describe('OrganizationPageComponent', () => {
         expect(org).toEqual(orgWithSlash)
       })
     })
+
+    it('should match orgs with multiple slash', () => {
+      const orgWithSlash = {
+        ...expectedOrganization,
+        name: 'org/with/multiples/slash',
+      }
+
+      const orgService = TestBed.inject(OrganizationsServiceInterface) as any
+      orgService.organisations$ = of([orgWithSlash])
+
+      const router = TestBed.inject(RouterFacade) as any
+      router.pathParams$ = of({ name: 'orgwithmultiplesslash' })
+
+      component.ngOnInit()
+
+      component.organization$.subscribe((org) => {
+        expect(org).toEqual(orgWithSlash)
+      })
+    })
   })
 })

apps/datahub/src/app/organization/organization-page/organization-page.component.ts

@@ -41,7 +41,7 @@ export class OrganizationPageComponent implements OnInit {
       switchMap(([pathParams, organizations]) => {
         const organization = organizations.find(
           (organization) =>
-            organization.name.replace('/', '') === pathParams['name']
+            organization.name.replaceAll('/', '') === pathParams['name']
         )
         return of(organization)
       })

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

@@ -24,6 +24,15 @@ describe('query params utilities', () => {
         emptyParam: [],
       })
     })
+
+    it('correctly encodes organization names with commas', () => {
+      const params = flattenQueryParams({
+        organization: ['Société, Inc., Main Branch', 'Other Org'],
+      })
+      expect(params).toEqual({
+        organization: ['Société%2C Inc.%2C Main Branch,Other Org'],
+      })
+    })
   })
   describe('expandQueryParams', () => {
     it('restores full route parameters from serialized query params in arrays', () => {
@@ -55,5 +64,13 @@ describe('query params utilities', () => {
         },
       })
     })
+    it('correctly handles organization names with commas', () => {
+      const params = expandQueryParams({
+        organization: ['Société%2C Inc.%2C Main Branch,Other Org'],
+      })
+      expect(params).toEqual({
+        organization: ['Société, Inc., Main Branch', 'Other Org'],
+      })
+    })
   })
 })

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, ','))
       }
     }
   }

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

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