Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/app/core/guards/registration-moderation.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ export const registrationModerationGuard: CanActivateFn = (route) => {
if (provider?.reviewsWorkflow) {
return true;
}

const id = route.params['providerId'];

return store.dispatch(new GetRegistryProvider(id)).pipe(
switchMap(() => {
return store.select(RegistrationProviderSelectors.getBrandedProvider).pipe(
switchMap(() =>
store.select(RegistrationProviderSelectors.getBrandedProvider).pipe(
take(1),
map((provider) => {
if (!provider?.reviewsWorkflow) {
Expand All @@ -29,7 +31,7 @@ export const registrationModerationGuard: CanActivateFn = (route) => {

return true;
})
);
})
)
)
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Router } from '@angular/router';

import { MyRegistrationsRedirectComponent } from './my-registrations-redirect.component';

import { RouterMock } from '@testing/providers/router-provider.mock';

describe('MyRegistrationsRedirectComponent', () => {
let component: MyRegistrationsRedirectComponent;
let fixture: ComponentFixture<MyRegistrationsRedirectComponent>;
let router: jest.Mocked<Router>;

beforeEach(async () => {
const routerMock = RouterMock.create().build();

await TestBed.configureTestingModule({
imports: [MyRegistrationsRedirectComponent],
providers: [{ provide: Router, useValue: routerMock }],
}).compileComponents();

fixture = TestBed.createComponent(MyRegistrationsRedirectComponent);
component = fixture.componentInstance;
router = TestBed.inject(Router) as jest.Mocked<Router>;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});

it('should be an instance of MyRegistrationsRedirectComponent', () => {
expect(component).toBeInstanceOf(MyRegistrationsRedirectComponent);
});

it('should navigate to /my-registrations on component creation', () => {
expect(router.navigate).toHaveBeenCalledWith(['/my-registrations'], {
queryParamsHandling: 'preserve',
replaceUrl: true,
});
});

it('should preserve query parameters during navigation', () => {
const navigationOptions = router.navigate.mock.calls[0][1];
expect(navigationOptions?.queryParamsHandling).toBe('preserve');
});

it('should replace the current URL in browser history', () => {
const navigationOptions = router.navigate.mock.calls[0][1];
expect(navigationOptions?.replaceUrl).toBe(true);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Component, inject } from '@angular/core';
import { Router } from '@angular/router';

@Component({
template: '',
})
export class MyRegistrationsRedirectComponent {
private readonly router = inject(Router);

constructor() {
this.router.navigate(['/my-registrations'], { queryParamsHandling: 'preserve', replaceUrl: true });
}
}
12 changes: 12 additions & 0 deletions src/app/features/registries/registries.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ export const registriesRoutes: Routes = [
(c) => c.RegistriesLandingComponent
),
},
{
path: 'my-registrations',
loadComponent: () =>
import('./pages/my-registrations-redirect/my-registrations-redirect.component').then(
(c) => c.MyRegistrationsRedirectComponent
),
},
{
path: ':providerId',
loadComponent: () =>
Expand All @@ -65,6 +72,11 @@ export const registriesRoutes: Routes = [
path: 'drafts',
loadComponent: () => import('./components/drafts/drafts.component').then((mod) => mod.DraftsComponent),
children: [
{
path: ':id',
redirectTo: ':id/metadata',
pathMatch: 'full',
},
{
path: ':id/metadata',
loadComponent: () =>
Expand Down