Thanks to visit codestin.com
Credit goes to github.com

Skip to content

UFAL/License agreement loading spinner after submitting #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milanmajchrak merged 4 commits into from
Jul 10, 2025
Merged

UFAL/License agreement loading spinner after submitting #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5da471
Added loading spinner icon after 'I agree' button is clicked
jr-rk Jun 25, 2025
6626e58
Removed type annotation and rephrased comment
jr-rk Jun 25, 2025
dd55709
Changes isLoading to async object
jr-rk Jul 9, 2025
fe93206
Edited loading spinner visibility method - consistency fix
jr-rk Jul 9, 2025
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
8 changes: 7 additions & 1 deletion ...bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,14 @@ <h2 id="header" class="border-bottom pb-2">{{'clarin.license.agreement.title' |
</div>
<div class="row pt-3">
<div class="col-12">
<button class="btn btn-success max-width" [disabled]="error$.value.length !== 0" (click)="accept()">
<button class="btn btn-success max-width" [disabled]="error$.value.length !== 0 || (isLoading | async)" (click)="accept()">
{{'clarin.license.agreement.button.agree' | translate}}
<span
*ngIf="isLoading | async"
class="ml-1 spinner-border spinner-border-sm"
role="status"
aria-hidden="true"
></span>
</button>
</div>
</div>
Expand Down
11 changes: 9 additions & 2 deletions ...p/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Input, OnInit } from '@angular/core';
import { Bitstream } from '../../core/shared/bitstream.model';
import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
import { switchMap, take } from 'rxjs/operators';
import { finalize, switchMap, take } from 'rxjs/operators';
import { followLink } from '../../shared/utils/follow-link-config.model';
import { ClarinUserRegistration } from '../../core/shared/clarin/clarin-user-registration.model';
import { ClarinUserMetadata } from '../../core/shared/clarin/clarin-user-metadata.model';
Expand Down Expand Up @@ -122,6 +122,11 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
*/
licenseContentSeznam: BehaviorSubject<string> = new BehaviorSubject<string>('');

/**
* Indicates when the submission is in progress and resets after completion
*/
isLoading: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);

constructor(
protected clarinLicenseResourceMappingService: ClarinLicenseResourceMappingService,
protected configurationDataService: ConfigurationDataService,
Expand Down Expand Up @@ -186,6 +191,8 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
return;
}

this.isLoading.next(true);

const requestId = this.requestService.generateRequestId();
// Response type must be `text` because it throws response as error byd status code is 200 (Success).
const requestOptions: HttpOptions = Object.create({
Expand Down Expand Up @@ -216,7 +223,7 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
const response = this.rdbService.buildFromRequestUUID(requestId);
// Process response
response
.pipe(getFirstCompletedRemoteData())
.pipe(getFirstCompletedRemoteData(), finalize(() => this.isLoading.next(false)))
.subscribe(responseRD$ => {
if (hasFailed(responseRD$.state)) {
this.notificationService.error(
Expand Down