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
24 changes: 20 additions & 4 deletions src/app/core/store/user-emails/user-emails.state.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action, State, StateContext, Store } from '@ngxs/store';

import { catchError, tap, throwError } from 'rxjs';
import { catchError, tap } from 'rxjs';

import { inject, Injectable } from '@angular/core';

Expand Down Expand Up @@ -140,9 +140,25 @@ export class UserEmailsState {

@Action(ResendConfirmation)
resendConfirmation(ctx: StateContext<UserEmailsStateModel>, action: ResendConfirmation) {
return this.userEmailsService
.resendConfirmation(action.emailId)
.pipe(catchError((error) => throwError(() => error)));
ctx.patchState({
emails: {
...ctx.getState().emails,
isSubmitting: true,
error: null,
},
});

return this.userEmailsService.resendConfirmation(action.emailId).pipe(
tap(() => {
ctx.patchState({
emails: {
...ctx.getState().emails,
isSubmitting: false,
},
});
}),
catchError((error) => handleSectionError(ctx, 'emails', error))
);
}

@Action(MakePrimary)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,13 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
class="w-6 md:w-9rem"
styleClass="w-full"
[label]="'common.buttons.next' | translate"
(onClick)="nextButtonClicked()"
[disabled]="!preprint()?.primaryFileId || versionFileMode()"
[pTooltip]="
!preprint()?.primaryFileId || versionFileMode()
? ('preprints.preprintStepper.common.validation.fillRequiredFields' | translate)
: ''
"
tooltipPosition="top"
(onClick)="nextButtonClicked()"
/>
</section>
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ import { environment } from 'src/environments/environment';
export class RegistrationsComponent implements OnInit {
private readonly route = inject(ActivatedRoute);
private readonly router = inject(Router);

readonly projectId = toSignal(this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined));
protected registrations = select(RegistrationsSelectors.getRegistrations);
protected isRegistrationsLoading = select(RegistrationsSelectors.isRegistrationsLoading);
protected actions = createDispatchMap({ getRegistrations: GetRegistrations });

registrations = select(RegistrationsSelectors.getRegistrations);
isRegistrationsLoading = select(RegistrationsSelectors.isRegistrationsLoading);
actions = createDispatchMap({ getRegistrations: GetRegistrations });

ngOnInit(): void {
this.actions.getRegistrations(this.projectId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { map, Observable } from 'rxjs';
import { inject, Injectable } from '@angular/core';

import { RegistrationMapper } from '@osf/shared/mappers/registration';
import { RegistrationCard, RegistrationDataJsonApi, ResponseJsonApi } from '@osf/shared/models';
import { PaginatedData, RegistrationCard, RegistrationDataJsonApi, ResponseJsonApi } from '@osf/shared/models';
import { JsonApiService } from '@osf/shared/services';

import { environment } from 'src/environments/environment';
Expand All @@ -14,10 +14,9 @@ import { environment } from 'src/environments/environment';
export class RegistrationsService {
private readonly jsonApiService = inject(JsonApiService);

getRegistrations(projectId: string): Observable<{ data: RegistrationCard[]; totalCount: number }> {
const params: Record<string, unknown> = {
embed: 'contributors',
};
getRegistrations(projectId: string): Observable<PaginatedData<RegistrationCard[]>> {
const params: Record<string, unknown> = { embed: 'contributors' };

const url = `${environment.apiUrl}/nodes/${projectId}/linked_by_registrations/`;

return this.jsonApiService.get<ResponseJsonApi<RegistrationDataJsonApi[]>>(url, params).pipe(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import { RegistrationCard } from '@osf/shared/models';
import { AsyncStateWithTotalCount } from '@osf/shared/models/store';
import { AsyncStateWithTotalCount, RegistrationCard } from '@osf/shared/models';

export interface RegistrationsStateModel {
registrations: AsyncStateWithTotalCount<RegistrationCard[]>;
}

export const REGISTRATIONS_STATE_DEFAULTS: RegistrationsStateModel = {
registrations: {
data: [],
isLoading: false,
error: null,
totalCount: 0,
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,4 @@ export class RegistrationsSelectors {
static isRegistrationsLoading(state: RegistrationsStateModel) {
return state.registrations.isLoading;
}

@Selector([RegistrationsState])
static getRegistrationsError(state: RegistrationsStateModel) {
return state.registrations.error;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,11 @@ import { handleSectionError } from '@osf/shared/helpers';
import { RegistrationsService } from '../services';

import { GetRegistrations } from './registrations.actions';
import { RegistrationsStateModel } from './registrations.model';
import { REGISTRATIONS_STATE_DEFAULTS, RegistrationsStateModel } from './registrations.model';

@State<RegistrationsStateModel>({
name: 'registrations',
defaults: {
registrations: {
data: [],
isLoading: false,
error: null,
totalCount: 0,
},
},
defaults: REGISTRATIONS_STATE_DEFAULTS,
})
@Injectable()
export class RegistrationsState {
Expand All @@ -36,9 +29,7 @@ export class RegistrationsState {

return this.registrationsService.getRegistrations(action.projectId).pipe(
tap((registrations) => {
const state = ctx.getState();
ctx.setState({
...state,
registrations: {
data: registrations.data,
isLoading: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ <h2>{{ 'settings.accountSettings.connectedEmails.title' | translate }}</h2>
) | translate
"
severity="secondary"
[disabled]="isEmailsSubmitting()"
[loading]="isEmailsSubmitting()"
(click)="resendConfirmation(email)"
>
</p-button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Card } from 'primeng/card';
import { DialogService } from 'primeng/dynamicdialog';
import { Skeleton } from 'primeng/skeleton';

import { filter, finalize } from 'rxjs';
import { filter, finalize, throttleTime } from 'rxjs';

import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject } from '@angular/core';
import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
Expand Down Expand Up @@ -42,6 +42,7 @@ export class ConnectedEmailsComponent {
protected readonly currentUser = select(UserSelectors.getCurrentUser);
protected readonly emails = select(UserEmailsSelectors.getEmails);
protected readonly isEmailsLoading = select(UserEmailsSelectors.isEmailsLoading);
protected readonly isEmailsSubmitting = select(UserEmailsSelectors.isEmailsSubmitting);

private readonly actions = createDispatchMap({
resendConfirmation: ResendConfirmation,
Expand Down Expand Up @@ -98,6 +99,7 @@ export class ConnectedEmailsComponent {
this.actions
.resendConfirmation(email.id)
.pipe(
throttleTime(2000),
finalize(() => this.loaderService.hide()),
takeUntilDestroyed(this.destroyRef)
)
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2037,7 +2037,7 @@
},
"common": {
"validation": {
"fillRequiredFields": "Fill in 'Required' fields to continue"
"fillRequiredFields": "Fill in Required fields to continue"
},
"successMessages": {
"preprintSaved": "Preprint saved",
Expand Down
Loading