Merge pull request #1351 from geonetwork/backport/2.6.x/pr-1319

[2.6.x] [Datahub]: Fix organizations with slash (#1319)

Author: LHBruneton-C2C

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

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

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

@@ -40,7 +40,8 @@ export class OrganizationPageComponent implements OnInit {
       filter(([pathParams, _]) => Object.keys(pathParams).length > 0),
       switchMap(([pathParams, organizations]) => {
         const organization = organizations.find(
-          (organization) => organization.name === pathParams['name']
+          (organization) =>
+            organization.name.replace('/', '') === pathParams['name']
         )
         return of(organization)
       })

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('/', '')
+    const path = `${this.routerService.getOrganizationPageRoute()}/${safeOrgName}`
     this.go({
       path,
       queryParamsHandling: '',