{{ 'project.overview.metadata.dateCreated' | translate }}
-+
{{ dateCreated() | date: dateFormat }}
@@ -15,7 +15,7 @@{{ 'project.overview.metadata.dateUpdated' | translate }}
-+
{{ dateModified() | date: dateFormat }}
diff --git a/src/app/features/metadata/components/metadata-registry-info/metadata-registry-info.component.html b/src/app/features/metadata/components/metadata-registry-info/metadata-registry-info.component.html new file mode 100644 index 000000000..3f1465c0d --- /dev/null +++ b/src/app/features/metadata/components/metadata-registry-info/metadata-registry-info.component.html @@ -0,0 +1,13 @@ +
+
+
+
+
+ {{ 'registry.overview.metadata.type' | translate }}
+{{ type() }}
+
+
+ {{ 'registry.overview.metadata.registry' | translate }}
+{{ provider()?.name }}
+Test description
', + permissions: [], + brand: null, + iri: 'https://example.com/registry', + reviewsWorkflow: 'standard', + }; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MetadataRegistryInfoComponent, OSFTestingModule], + }).compileComponents(); + + fixture = TestBed.createComponent(MetadataRegistryInfoComponent); + component = fixture.componentInstance; + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should initialize with default values', () => { + expect(component.type()).toBe(''); + expect(component.provider()).toBeUndefined(); + }); + + it('should set type input', () => { + const mockType = 'Clinical Trial'; + fixture.componentRef.setInput('type', mockType); + fixture.detectChanges(); + + expect(component.type()).toBe(mockType); + }); + + it('should set provider input', () => { + fixture.componentRef.setInput('provider', mockProvider); + fixture.detectChanges(); + + expect(component.provider()).toEqual(mockProvider); + }); + + it('should handle undefined type input', () => { + fixture.componentRef.setInput('type', undefined); + fixture.detectChanges(); + + expect(component.type()).toBeUndefined(); + }); + + it('should handle null provider input', () => { + fixture.componentRef.setInput('provider', null); + fixture.detectChanges(); + + expect(component.provider()).toBeNull(); + }); + + it('should render type in template', () => { + const mockType = 'Preprint'; + fixture.componentRef.setInput('type', mockType); + fixture.detectChanges(); + + const compiled = fixture.nativeElement; + const typeElement = compiled.querySelector('[data-test-display-registry-type]'); + expect(typeElement).toBeTruthy(); + expect(typeElement.textContent.trim()).toBe(mockType); + }); + + it('should render provider name in template', () => { + fixture.componentRef.setInput('provider', mockProvider); + fixture.detectChanges(); + + const compiled = fixture.nativeElement; + const providerElement = compiled.querySelector('[data-test-display-registry-provider]'); + expect(providerElement).toBeTruthy(); + expect(providerElement.textContent.trim()).toBe(mockProvider.name); + }); + + it('should display empty string when type is empty', () => { + fixture.componentRef.setInput('type', ''); + fixture.detectChanges(); + + const compiled = fixture.nativeElement; + const typeElement = compiled.querySelector('[data-test-display-registry-type]'); + expect(typeElement.textContent.trim()).toBe(''); + }); + + it('should display empty string when provider is null', () => { + fixture.componentRef.setInput('provider', null); + fixture.detectChanges(); + + const compiled = fixture.nativeElement; + const providerElement = compiled.querySelector('[data-test-display-registry-provider]'); + expect(providerElement.textContent.trim()).toBe(''); + }); + + it('should display both type and provider when both are set', () => { + const mockType = 'Registered Report'; + fixture.componentRef.setInput('type', mockType); + fixture.componentRef.setInput('provider', mockProvider); + fixture.detectChanges(); + + const compiled = fixture.nativeElement; + const typeElement = compiled.querySelector('[data-test-display-registry-type]'); + const providerElement = compiled.querySelector('[data-test-display-registry-provider]'); + + expect(typeElement.textContent.trim()).toBe(mockType); + expect(providerElement.textContent.trim()).toBe(mockProvider.name); + }); + + it('should display translated labels', () => { + fixture.detectChanges(); + + const compiled = fixture.nativeElement; + const headings = compiled.querySelectorAll('h2'); + expect(headings.length).toBe(2); + }); +}); diff --git a/src/app/features/metadata/components/metadata-registry-info/metadata-registry-info.component.ts b/src/app/features/metadata/components/metadata-registry-info/metadata-registry-info.component.ts new file mode 100644 index 000000000..25c83a0f0 --- /dev/null +++ b/src/app/features/metadata/components/metadata-registry-info/metadata-registry-info.component.ts @@ -0,0 +1,19 @@ +import { TranslatePipe } from '@ngx-translate/core'; + +import { Card } from 'primeng/card'; + +import { ChangeDetectionStrategy, Component, input } from '@angular/core'; + +import { RegistryProviderDetails } from '@osf/shared/models/provider/registry-provider.model'; + +@Component({ + selector: 'osf-metadata-registry-info', + imports: [Card, TranslatePipe], + templateUrl: './metadata-registry-info.component.html', + styleUrl: './metadata-registry-info.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class MetadataRegistryInfoComponent { + type = input{{ submission().title }}
+
diff --git a/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.ts b/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.ts
index 770db64d4..93b331b09 100644
--- a/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.ts
+++ b/src/app/features/moderation/components/registry-submission-item/registry-submission-item.component.ts
@@ -10,6 +10,7 @@ import { ContributorsListComponent } from '@osf/shared/components/contributors-l
import { IconComponent } from '@osf/shared/components/icon/icon.component';
import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/truncated-text.component';
import { DateAgoPipe } from '@osf/shared/pipes/date-ago.pipe';
+import { FunderAwardsListComponent } from '@shared/funder-awards-list/funder-awards-list.component';
import { REGISTRY_ACTION_LABEL, ReviewStatusIcon } from '../../constants';
import { ActionStatus, SubmissionReviewStatus } from '../../enums';
@@ -29,6 +30,7 @@ import { RegistryModeration } from '../../models';
AccordionHeader,
AccordionContent,
ContributorsListComponent,
+ FunderAwardsListComponent,
],
templateUrl: './registry-submission-item.component.html',
styleUrl: './registry-submission-item.component.scss',
@@ -37,9 +39,8 @@ import { RegistryModeration } from '../../models';
export class RegistrySubmissionItemComponent {
status = input.required{{ 'shared.license.title' | translate }}
{{ currentUser()?.fullName }}
} +
+ @for (institution of currentUserInstitutions(); track $index) {
+
+ ![]()
+
+ }
+
+
@if (!isMedium() && showEdit()) {
{{ section.title }}
}
- @if (inProgress) {
+ @if (inProgress()) {
{{ section.title }}
(onClick)="submit()"
[loading]="isSchemaResponseLoading()"
>
- } @else if (isUnapproved) {
+ } @else if (isUnapproved()) {
{
let component: JustificationReviewComponent;
let fixture: ComponentFixture;
- let mockActivatedRoute: ReturnType;
- let mockRouter: ReturnType;
- let mockCustomDialogService: ReturnType;
- let mockCustomConfirmationService: ReturnType;
- let mockToastService: ReturnType;
-
- const MOCK_SCHEMA_RESPONSE = {
- id: 'rev-1',
+ let store: Store;
+ let mockRouter: RouterMockType;
+ let mockCustomDialogService: CustomDialogServiceMockType;
+ let customConfirmationService: CustomConfirmationServiceMockType;
+ let toastService: ToastServiceMockType;
+
+ const MOCK_SCHEMA_RESPONSE: Partial = {
registrationId: 'reg-1',
- reviewsState: RevisionReviewStates.RevisionInProgress,
updatedResponseKeys: ['field1'],
- } as any;
+ };
- beforeEach(async () => {
- mockActivatedRoute = ActivatedRouteMockBuilder.create().withParams({ id: 'rev-1' }).build();
+ beforeEach(() => {
+ const mockActivatedRoute = ActivatedRouteMockBuilder.create().withParams({ id: 'rev-1' }).build();
mockRouter = RouterMockBuilder.create().withUrl('/x').build();
mockCustomDialogService = CustomDialogServiceMockBuilder.create().withDefaultOpen().build();
- mockCustomConfirmationService = CustomConfirmationServiceMockBuilder.create().build();
- mockToastService = ToastServiceMockBuilder.create().build();
+ toastService = ToastServiceMock.simple();
+ customConfirmationService = CustomConfirmationServiceMock.simple();
- await TestBed.configureTestingModule({
- imports: [JustificationReviewComponent, OSFTestingModule, MockComponent(RegistrationBlocksDataComponent)],
+ TestBed.configureTestingModule({
+ imports: [JustificationReviewComponent, MockComponent(RegistrationBlocksDataComponent)],
providers: [
+ provideOSFCore(),
MockProvider(ActivatedRoute, mockActivatedRoute),
MockProvider(Router, mockRouter),
+ MockProvider(ToastService, toastService),
+ MockProvider(CustomConfirmationService, customConfirmationService),
MockProvider(CustomDialogService, mockCustomDialogService),
- MockProvider(CustomConfirmationService, mockCustomConfirmationService),
- MockProvider(ToastService, mockToastService),
provideMockStore({
signals: [
{ selector: RegistriesSelectors.getPagesSchema, value: MOCK_PAGES_SCHEMA },
@@ -65,8 +77,9 @@ describe('JustificationReviewComponent', () => {
],
}),
],
- }).compileComponents();
+ });
+ store = TestBed.inject(Store);
fixture = TestBed.createComponent(JustificationReviewComponent);
component = fixture.componentInstance;
fixture.detectChanges();
@@ -85,55 +98,46 @@ describe('JustificationReviewComponent', () => {
expect(mockRouter.navigate).toHaveBeenCalled();
});
- it('should submit revision for review', () => {
- const mockActions = {
- handleSchemaResponse: jest.fn().mockReturnValue(of({})),
- } as any;
- Object.defineProperty(component, 'actions', { value: mockActions });
+ it('should dispatch handleSchemaResponse on submit', () => {
+ (store.dispatch as jest.Mock).mockClear();
component.submit();
- expect(mockActions.handleSchemaResponse).toHaveBeenCalledWith('rev-1', SchemaActionTrigger.Submit);
- expect(mockToastService.showSuccess).toHaveBeenCalledWith('registries.justification.successSubmit');
+ expect(store.dispatch).toHaveBeenCalledWith(new HandleSchemaResponse('rev-1', SchemaActionTrigger.Submit));
+ expect(toastService.showSuccess).toHaveBeenCalledWith('registries.justification.successSubmit');
});
- it('should accept changes', () => {
- const mockActions = {
- handleSchemaResponse: jest.fn().mockReturnValue(of({})),
- } as any;
- Object.defineProperty(component, 'actions', { value: mockActions });
+ it('should dispatch handleSchemaResponse on acceptChanges', () => {
+ (store.dispatch as jest.Mock).mockClear();
component.acceptChanges();
- expect(mockActions.handleSchemaResponse).toHaveBeenCalledWith('rev-1', SchemaActionTrigger.Approve);
- expect(mockToastService.showSuccess).toHaveBeenCalledWith('registries.justification.successAccept');
+ expect(store.dispatch).toHaveBeenCalledWith(new HandleSchemaResponse('rev-1', SchemaActionTrigger.Approve));
+ expect(toastService.showSuccess).toHaveBeenCalledWith('registries.justification.successAccept');
expect(mockRouter.navigateByUrl).toHaveBeenCalledWith('/reg-1/overview');
});
- it('should continue editing and show decision recorded toast when confirmed', () => {
- jest.spyOn(mockCustomDialogService, 'open').mockReturnValue({ onClose: of(true) } as any);
+ it('should show decision recorded toast when continueEditing confirmed', () => {
+ mockCustomDialogService.open.mockReturnValue({ onClose: of(true) } as any);
component.continueEditing();
expect(mockCustomDialogService.open).toHaveBeenCalled();
- expect(mockToastService.showSuccess).toHaveBeenCalledWith('registries.justification.decisionRecorded');
+ expect(toastService.showSuccess).toHaveBeenCalledWith('registries.justification.decisionRecorded');
});
- it('should delete draft update after confirmation', () => {
- const mockActions = {
- deleteSchemaResponse: jest.fn().mockReturnValue(of({})),
- clearState: jest.fn(),
- } as any;
- Object.defineProperty(component, 'actions', { value: mockActions });
+ it('should dispatch deleteSchemaResponse and clearState after confirmation', () => {
+ (store.dispatch as jest.Mock).mockClear();
component.deleteDraftUpdate();
- expect(mockCustomConfirmationService.confirmDelete).toHaveBeenCalled();
- const call = (mockCustomConfirmationService.confirmDelete as any).mock.calls[0][0];
+
+ expect(customConfirmationService.confirmDelete).toHaveBeenCalled();
+ const call = customConfirmationService.confirmDelete.mock.calls[0][0];
call.onConfirm();
- expect(mockActions.deleteSchemaResponse).toHaveBeenCalledWith('rev-1');
- expect(mockToastService.showSuccess).toHaveBeenCalledWith('registries.justification.successDeleteDraft');
- expect(mockActions.clearState).toHaveBeenCalled();
+ expect(store.dispatch).toHaveBeenCalledWith(new DeleteSchemaResponse('rev-1'));
+ expect(toastService.showSuccess).toHaveBeenCalledWith('registries.justification.successDeleteDraft');
+ expect(store.dispatch).toHaveBeenCalledWith(new ClearState());
expect(mockRouter.navigateByUrl).toHaveBeenCalledWith('/reg-1/overview');
});
});
diff --git a/src/app/features/registries/components/justification-review/justification-review.component.ts b/src/app/features/registries/components/justification-review/justification-review.component.ts
index 26cb214f7..050fc1fa1 100644
--- a/src/app/features/registries/components/justification-review/justification-review.component.ts
+++ b/src/app/features/registries/components/justification-review/justification-review.component.ts
@@ -6,12 +6,14 @@ import { Button } from 'primeng/button';
import { Card } from 'primeng/card';
import { Message } from 'primeng/message';
-import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core';
+import { filter } from 'rxjs';
+
+import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute, Router } from '@angular/router';
import { RegistrationBlocksDataComponent } from '@osf/shared/components/registration-blocks-data/registration-blocks-data.component';
import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants/input-validation-messages.const';
-import { FieldType } from '@osf/shared/enums/field-type.enum';
import { RevisionReviewStates } from '@osf/shared/enums/revision-review-states.enum';
import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
import { CustomDialogService } from '@osf/shared/services/custom-dialog.service';
@@ -34,6 +36,7 @@ export class JustificationReviewComponent {
private readonly customConfirmationService = inject(CustomConfirmationService);
private readonly customDialogService = inject(CustomDialogService);
private readonly toastService = inject(ToastService);
+ private readonly destroyRef = inject(DestroyRef);
readonly pages = select(RegistriesSelectors.getPagesSchema);
readonly schemaResponse = select(RegistriesSelectors.getSchemaResponse);
@@ -42,10 +45,8 @@ export class JustificationReviewComponent {
readonly isSchemaResponseLoading = select(RegistriesSelectors.getSchemaResponseLoading);
readonly INPUT_VALIDATION_MESSAGES = INPUT_VALIDATION_MESSAGES;
- readonly FieldType = FieldType;
- readonly RevisionReviewStates = RevisionReviewStates;
- actions = createDispatchMap({
+ private readonly actions = createDispatchMap({
deleteSchemaResponse: DeleteSchemaResponse,
handleSchemaResponse: HandleSchemaResponse,
clearState: ClearState,
@@ -53,50 +54,27 @@ export class JustificationReviewComponent {
private readonly revisionId = this.route.snapshot.params['id'];
- get isUnapproved() {
- return this.schemaResponse()?.reviewsState === RevisionReviewStates.Unapproved;
- }
-
- get inProgress() {
- return this.schemaResponse()?.reviewsState === RevisionReviewStates.RevisionInProgress;
- }
+ readonly isUnapproved = computed(() => this.schemaResponse()?.reviewsState === RevisionReviewStates.Unapproved);
+ readonly inProgress = computed(() => this.schemaResponse()?.reviewsState === RevisionReviewStates.RevisionInProgress);
changes = computed(() => {
- let questions: Record = {};
- this.pages().forEach((page) => {
- if (page.sections?.length) {
- questions = {
- ...questions,
- ...Object.fromEntries(
- page.sections.flatMap(
- (section) => section.questions?.map((q) => [q.responseKey, q.displayText || '']) || []
- )
- ),
- };
- } else {
- questions = {
- ...questions,
- ...Object.fromEntries(page.questions?.map((q) => [q.responseKey, q.displayText]) || []),
- };
- }
- });
- const updatedFields = this.updatedFields();
+ const questions = this.buildQuestionMap();
const updatedResponseKeys = this.schemaResponse()?.updatedResponseKeys || [];
- const uniqueKeys = new Set([...updatedResponseKeys, ...Object.keys(updatedFields)]);
+ const uniqueKeys = new Set([...updatedResponseKeys, ...Object.keys(this.updatedFields())]);
return Array.from(uniqueKeys).map((key) => questions[key]);
});
submit(): void {
- this.actions.handleSchemaResponse(this.revisionId, SchemaActionTrigger.Submit).subscribe({
- next: () => {
+ this.actions
+ .handleSchemaResponse(this.revisionId, SchemaActionTrigger.Submit)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe(() => {
this.toastService.showSuccess('registries.justification.successSubmit');
- },
- });
+ });
}
goBack(): void {
- const previousStep = this.pages().length;
- this.router.navigate(['../', previousStep], { relativeTo: this.route });
+ this.router.navigate(['../', this.pages().length], { relativeTo: this.route });
}
deleteDraftUpdate() {
@@ -105,24 +83,26 @@ export class JustificationReviewComponent {
messageKey: 'registries.justification.confirmDeleteUpdate.message',
onConfirm: () => {
const registrationId = this.schemaResponse()?.registrationId || '';
- this.actions.deleteSchemaResponse(this.revisionId).subscribe({
- next: () => {
+ this.actions
+ .deleteSchemaResponse(this.revisionId)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe(() => {
this.toastService.showSuccess('registries.justification.successDeleteDraft');
this.actions.clearState();
this.router.navigateByUrl(`/${registrationId}/overview`);
- },
- });
+ });
},
});
}
acceptChanges() {
- this.actions.handleSchemaResponse(this.revisionId, SchemaActionTrigger.Approve).subscribe({
- next: () => {
+ this.actions
+ .handleSchemaResponse(this.revisionId, SchemaActionTrigger.Approve)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe(() => {
this.toastService.showSuccess('registries.justification.successAccept');
this.router.navigateByUrl(`/${this.schemaResponse()?.registrationId}/overview`);
- },
- });
+ });
}
continueEditing() {
@@ -130,14 +110,23 @@ export class JustificationReviewComponent {
.open(ConfirmContinueEditingDialogComponent, {
header: 'registries.justification.confirmContinueEditing.header',
width: '552px',
- data: {
- revisionId: this.revisionId,
- },
+ data: { revisionId: this.revisionId },
})
- .onClose.subscribe((result) => {
- if (result) {
- this.toastService.showSuccess('registries.justification.decisionRecorded');
- }
- });
+ .onClose.pipe(
+ filter((result) => !!result),
+ takeUntilDestroyed(this.destroyRef)
+ )
+ .subscribe(() => this.toastService.showSuccess('registries.justification.decisionRecorded'));
+ }
+
+ private buildQuestionMap(): Record {
+ return Object.fromEntries(
+ this.pages().flatMap((page) => {
+ const questions = page.sections?.length
+ ? page.sections.flatMap((section) => section.questions || [])
+ : page.questions || [];
+ return questions.map((q) => [q.responseKey, q.displayText || '']);
+ })
+ );
}
}
diff --git a/src/app/features/registries/components/justification-step/justification-step.component.html b/src/app/features/registries/components/justification-step/justification-step.component.html
index e1265453e..7b3be3e89 100644
--- a/src/app/features/registries/components/justification-step/justification-step.component.html
+++ b/src/app/features/registries/components/justification-step/justification-step.component.html
@@ -12,7 +12,7 @@
{{ INPUT_VALIDATION_MESSAGES.required | translate }}
@@ -25,7 +25,7 @@
diff --git a/src/app/features/registries/components/justification-step/justification-step.component.spec.ts b/src/app/features/registries/components/justification-step/justification-step.component.spec.ts
index c3b98e705..5e7c73b47 100644
--- a/src/app/features/registries/components/justification-step/justification-step.component.spec.ts
+++ b/src/app/features/registries/components/justification-step/justification-step.component.spec.ts
@@ -1,57 +1,67 @@
-import { MockProvider } from 'ng-mocks';
+import { Store } from '@ngxs/store';
-import { of } from 'rxjs';
+import { MockProvider } from 'ng-mocks';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute, Router } from '@angular/router';
-import { RegistriesSelectors } from '@osf/features/registries/store';
+import {
+ ClearState,
+ DeleteSchemaResponse,
+ RegistriesSelectors,
+ UpdateSchemaResponse,
+ UpdateStepState,
+} from '@osf/features/registries/store';
+import { SchemaResponse } from '@osf/shared/models/registration/schema-response.model';
import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
import { ToastService } from '@osf/shared/services/toast.service';
import { JustificationStepComponent } from './justification-step.component';
-import { OSFTestingModule } from '@testing/osf.testing.module';
-import { CustomConfirmationServiceMockBuilder } from '@testing/providers/custom-confirmation-provider.mock';
+import { provideOSFCore } from '@testing/osf.testing.provider';
+import {
+ CustomConfirmationServiceMock,
+ CustomConfirmationServiceMockType,
+} from '@testing/providers/custom-confirmation-provider.mock';
import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
+import { RouterMockBuilder, RouterMockType } from '@testing/providers/router-provider.mock';
import { provideMockStore } from '@testing/providers/store-provider.mock';
-import { ToastServiceMockBuilder } from '@testing/providers/toast-provider.mock';
+import { ToastServiceMock, ToastServiceMockType } from '@testing/providers/toast-provider.mock';
describe('JustificationStepComponent', () => {
let component: JustificationStepComponent;
let fixture: ComponentFixture;
- let mockActivatedRoute: ReturnType;
- let mockRouter: jest.Mocked;
- let mockCustomConfirmationService: ReturnType;
- let mockToastService: ReturnType;
+ let store: Store;
+ let mockRouter: RouterMockType;
+ let toastService: ToastServiceMockType;
+ let customConfirmationService: CustomConfirmationServiceMockType;
- const MOCK_SCHEMA_RESPONSE = {
+ const MOCK_SCHEMA_RESPONSE: Partial = {
registrationId: 'reg-1',
revisionJustification: 'reason',
- } as any;
+ };
- beforeEach(async () => {
- mockActivatedRoute = ActivatedRouteMockBuilder.create().withParams({ id: 'rev-1' }).build();
- mockRouter = { navigate: jest.fn(), navigateByUrl: jest.fn(), url: '/x' } as any;
- mockCustomConfirmationService = CustomConfirmationServiceMockBuilder.create().build();
- mockToastService = ToastServiceMockBuilder.create().build();
+ beforeEach(() => {
+ const mockActivatedRoute = ActivatedRouteMockBuilder.create().withParams({ id: 'rev-1' }).build();
+ mockRouter = RouterMockBuilder.create().withUrl('/x').build();
+ toastService = ToastServiceMock.simple();
+ customConfirmationService = CustomConfirmationServiceMock.simple();
- await TestBed.configureTestingModule({
- imports: [JustificationStepComponent, OSFTestingModule],
+ TestBed.configureTestingModule({
+ imports: [JustificationStepComponent],
providers: [
+ provideOSFCore(),
+ MockProvider(ToastService, toastService),
MockProvider(ActivatedRoute, mockActivatedRoute),
MockProvider(Router, mockRouter),
- MockProvider(CustomConfirmationService, mockCustomConfirmationService as any),
- MockProvider(ToastService, mockToastService),
+ MockProvider(CustomConfirmationService, customConfirmationService),
provideMockStore({
- signals: [
- { selector: RegistriesSelectors.getSchemaResponse, value: MOCK_SCHEMA_RESPONSE },
- { selector: RegistriesSelectors.getStepsState, value: {} },
- ],
+ signals: [{ selector: RegistriesSelectors.getSchemaResponse, value: MOCK_SCHEMA_RESPONSE }],
}),
],
- }).compileComponents();
+ });
+ store = TestBed.inject(Store);
fixture = TestBed.createComponent(JustificationStepComponent);
component = fixture.componentInstance;
fixture.detectChanges();
@@ -66,16 +76,12 @@ describe('JustificationStepComponent', () => {
});
it('should submit justification and navigate to first step', () => {
- const mockActions = {
- updateRevision: jest.fn().mockReturnValue(of({})),
- updateStepState: jest.fn(),
- } as any;
- Object.defineProperty(component, 'actions', { value: mockActions });
-
component.justificationForm.patchValue({ justification: 'new reason' });
+ (store.dispatch as jest.Mock).mockClear();
+
component.submit();
- expect(mockActions.updateRevision).toHaveBeenCalledWith('rev-1', 'new reason');
+ expect(store.dispatch).toHaveBeenCalledWith(new UpdateSchemaResponse('rev-1', 'new reason'));
expect(mockRouter.navigate).toHaveBeenCalledWith(['../1'], {
relativeTo: expect.any(Object),
onSameUrlNavigation: 'reload',
@@ -83,21 +89,36 @@ describe('JustificationStepComponent', () => {
});
it('should delete draft update after confirmation', () => {
- const mockActions = {
- deleteSchemaResponse: jest.fn().mockReturnValue(of({})),
- clearState: jest.fn(),
- } as any;
- Object.defineProperty(component, 'actions', { value: mockActions });
+ (store.dispatch as jest.Mock).mockClear();
component.deleteDraftUpdate();
- expect(mockCustomConfirmationService.confirmDelete).toHaveBeenCalled();
- const call = (mockCustomConfirmationService.confirmDelete as any).mock.calls[0][0];
+ expect(customConfirmationService.confirmDelete).toHaveBeenCalled();
+ const call = customConfirmationService.confirmDelete.mock.calls[0][0];
call.onConfirm();
- expect(mockActions.deleteSchemaResponse).toHaveBeenCalledWith('rev-1');
- expect(mockToastService.showSuccess).toHaveBeenCalledWith('registries.justification.successDeleteDraft');
- expect(mockActions.clearState).toHaveBeenCalled();
+ expect(store.dispatch).toHaveBeenCalledWith(new DeleteSchemaResponse('rev-1'));
+ expect(toastService.showSuccess).toHaveBeenCalledWith('registries.justification.successDeleteDraft');
+ expect(store.dispatch).toHaveBeenCalledWith(new ClearState());
expect(mockRouter.navigateByUrl).toHaveBeenCalledWith('/reg-1/overview');
});
+
+ it('should dispatch updateStepState and updateRevision on destroy when form changed', () => {
+ component.justificationForm.patchValue({ justification: 'changed reason' });
+ (store.dispatch as jest.Mock).mockClear();
+
+ component.ngOnDestroy();
+
+ expect(store.dispatch).toHaveBeenCalledWith(new UpdateStepState('0', false, true));
+ expect(store.dispatch).toHaveBeenCalledWith(new UpdateSchemaResponse('rev-1', 'changed reason'));
+ });
+
+ it('should not dispatch updateRevision on destroy when form is unchanged', () => {
+ (store.dispatch as jest.Mock).mockClear();
+
+ component.ngOnDestroy();
+
+ expect(store.dispatch).toHaveBeenCalledWith(new UpdateStepState('0', false, true));
+ expect(store.dispatch).not.toHaveBeenCalledWith(expect.any(UpdateSchemaResponse));
+ });
});
diff --git a/src/app/features/registries/components/justification-step/justification-step.component.ts b/src/app/features/registries/components/justification-step/justification-step.component.ts
index eee067b61..0ba540a0f 100644
--- a/src/app/features/registries/components/justification-step/justification-step.component.ts
+++ b/src/app/features/registries/components/justification-step/justification-step.component.ts
@@ -6,9 +6,10 @@ import { Button } from 'primeng/button';
import { Message } from 'primeng/message';
import { Textarea } from 'primeng/textarea';
-import { tap } from 'rxjs';
+import { filter, take } from 'rxjs';
-import { ChangeDetectionStrategy, Component, effect, inject, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, DestroyRef, inject, OnDestroy, signal } from '@angular/core';
+import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
@@ -40,13 +41,13 @@ export class JustificationStepComponent implements OnDestroy {
private readonly router = inject(Router);
private readonly customConfirmationService = inject(CustomConfirmationService);
private readonly toastService = inject(ToastService);
+ private readonly destroyRef = inject(DestroyRef);
readonly schemaResponse = select(RegistriesSelectors.getSchemaResponse);
- readonly stepsState = select(RegistriesSelectors.getStepsState);
readonly INPUT_VALIDATION_MESSAGES = INPUT_VALIDATION_MESSAGES;
- actions = createDispatchMap({
+ private readonly actions = createDispatchMap({
updateStepState: UpdateStepState,
updateRevision: UpdateSchemaResponse,
deleteSchemaResponse: DeleteSchemaResponse,
@@ -54,40 +55,51 @@ export class JustificationStepComponent implements OnDestroy {
});
private readonly revisionId = this.route.snapshot.params['id'];
+ private readonly isDraftDeleted = signal(false);
- justificationForm = this.fb.group({
+ readonly justificationForm = this.fb.group({
justification: ['', [Validators.maxLength(InputLimits.description.maxLength), CustomValidators.requiredTrimmed()]],
});
- get isJustificationValid(): boolean {
+ get showJustificationError(): boolean {
const control = this.justificationForm.controls['justification'];
return control.errors?.['required'] && (control.touched || control.dirty);
}
- isDraftDeleted = false;
-
constructor() {
- effect(() => {
- const revisionJustification = this.schemaResponse()?.revisionJustification;
- if (revisionJustification) {
- this.justificationForm.patchValue({ justification: revisionJustification });
- }
- });
+ this.setupInitialJustification();
+ }
+
+ ngOnDestroy(): void {
+ if (this.isDraftDeleted()) {
+ return;
+ }
+
+ this.actions.updateStepState('0', this.justificationForm.invalid, true);
+
+ const changes = findChangedFields(
+ { justification: this.justificationForm.value.justification! },
+ { justification: this.schemaResponse()?.revisionJustification }
+ );
+
+ if (Object.keys(changes).length > 0) {
+ this.actions.updateRevision(this.revisionId, this.justificationForm.value.justification!);
+ }
+
+ this.justificationForm.markAllAsTouched();
}
submit(): void {
this.actions
.updateRevision(this.revisionId, this.justificationForm.value.justification!)
- .pipe(
- tap(() => {
- this.justificationForm.markAllAsTouched();
- this.router.navigate(['../1'], {
- relativeTo: this.route,
- onSameUrlNavigation: 'reload',
- });
- })
- )
- .subscribe();
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe(() => {
+ this.justificationForm.markAllAsTouched();
+ this.router.navigate(['../1'], {
+ relativeTo: this.route,
+ onSameUrlNavigation: 'reload',
+ });
+ });
}
deleteDraftUpdate() {
@@ -96,29 +108,25 @@ export class JustificationStepComponent implements OnDestroy {
messageKey: 'registries.justification.confirmDeleteUpdate.message',
onConfirm: () => {
const registrationId = this.schemaResponse()?.registrationId || '';
- this.actions.deleteSchemaResponse(this.revisionId).subscribe({
- next: () => {
- this.isDraftDeleted = true;
+ this.actions
+ .deleteSchemaResponse(this.revisionId)
+ .pipe(takeUntilDestroyed(this.destroyRef))
+ .subscribe(() => {
+ this.isDraftDeleted.set(true);
this.actions.clearState();
this.toastService.showSuccess('registries.justification.successDeleteDraft');
this.router.navigateByUrl(`/${registrationId}/overview`);
- },
- });
+ });
},
});
}
- ngOnDestroy(): void {
- if (!this.isDraftDeleted) {
- this.actions.updateStepState('0', this.justificationForm.invalid, true);
- const changes = findChangedFields(
- { justification: this.justificationForm.value.justification! },
- { justification: this.schemaResponse()?.revisionJustification }
- );
- if (Object.keys(changes).length > 0) {
- this.actions.updateRevision(this.revisionId, this.justificationForm.value.justification!);
- }
- this.justificationForm.markAllAsTouched();
- }
+ private setupInitialJustification() {
+ toObservable(this.schemaResponse)
+ .pipe(
+ filter((response) => !!response?.revisionJustification),
+ take(1)
+ )
+ .subscribe((response) => this.justificationForm.patchValue({ justification: response!.revisionJustification }));
}
}
diff --git a/src/app/features/registries/components/new-registration/new-registration.component.html b/src/app/features/registries/components/new-registration/new-registration.component.html
index 8ce2cb21f..7c46cb5e9 100644
--- a/src/app/features/registries/components/new-registration/new-registration.component.html
+++ b/src/app/features/registries/components/new-registration/new-registration.component.html
@@ -16,25 +16,25 @@