diff --git a/src/app/mapping/dialog/feedback-dialog/feedback-dialog.component.html b/src/app/mapping/dialog/feedback-dialog/feedback-dialog.component.html index 0c888a04a5cc64409ec058689e9dd2fd106a13e0..599d87338f11c260ade9f143617887f7fc557105 100644 --- a/src/app/mapping/dialog/feedback-dialog/feedback-dialog.component.html +++ b/src/app/mapping/dialog/feedback-dialog/feedback-dialog.component.html @@ -13,7 +13,7 @@ </nb-card> <nb-card> <nb-card-body> - <p class="success" *ngIf="data.postedMetadatas.length > 0">Athe following datasets have been published successfully: </p> + <p class="success" *ngIf="data.postedMetadatas.length > 0">The following datasets have been published successfully: </p> <ul *ngFor="let data of data.postedMetadatas"> <li class="success" >{{ data }}</li> </ul> diff --git a/src/app/mapping/mapping.component.html b/src/app/mapping/mapping.component.html index ae7dad6db7eadfc74487d4b3e7cb49cbcad724e5..eea8261a50e724c521a6a8658b5f7837edaea0ac 100644 --- a/src/app/mapping/mapping.component.html +++ b/src/app/mapping/mapping.component.html @@ -1,8 +1,7 @@ <form #form="ngForm"> <div class="card-row"> <div class="card-col"> - <nb-card size="giant" [nbSpinner]="loading" nbSpinnerStatus="primary" nbSpinnerSize="large" - nbSpinnerMessage="Loading..."> + <nb-card size="giant" > <nb-card-header>Dataset metadata</nb-card-header> <nb-card-body> @@ -71,7 +70,7 @@ </form> <div class="card-row"> <div class="card-col"> - <nb-card [nbSpinner]="loading" nbSpinnerStatus="primary" nbSpinnerSize="large" nbSpinnerMessage="loading"> + <nb-card [nbSpinner]="loadingCr" nbSpinnerStatus="primary" nbSpinnerSize="large" nbSpinnerMessage="loading"> <nb-card-header>Map</nb-card-header> <nb-card-body> <nb-list> @@ -108,7 +107,7 @@ </div> <div class="row"> <div class="button-center" *ngIf="!first "> - <button nbButton status="primary" (click)=" publishDataset()">Publish</button> + <button nbButton status="primary" (click)=" publishDataset()" [nbSpinner]="loading" nbSpinnerStatus="basic" >Publish</button> </div> </div> diff --git a/src/app/mapping/mapping.component.ts b/src/app/mapping/mapping.component.ts index b274ed694229ddc3fa32861ffd349c2274fcee98..32b64d448b6c54885117c873215f48239137cade 100644 --- a/src/app/mapping/mapping.component.ts +++ b/src/app/mapping/mapping.component.ts @@ -31,6 +31,7 @@ export class MappingComponent implements OnInit { index: number = 0 first: boolean = true; loading: boolean = false; + loadingCr = false; FDP_URL = environment.fdpUrl; ids: number []; @@ -71,6 +72,7 @@ export class MappingComponent implements OnInit { } createDataset(item: Object): Map<string, string> { + this.loadingCr = true; let mappedMetadata: Map<string, string> = new Map() for (let i = 0; i < this.selectedPaths.length; i++) { if (this.selectedPaths[i]) { @@ -78,6 +80,7 @@ export class MappingComponent implements OnInit { mappedMetadata.set(this.datasetModel[i].identifier, this.getValue(tab, item)); } } + this.loadingCr = false return mappedMetadata; } @@ -242,6 +245,7 @@ export class MappingComponent implements OnInit { this.first = false; } next() { + this.loadingCr = true; if (this.index < this.itemsdataset.length) { this.index += 1; this.createDataset(this.itemsdataset[this.index]) @@ -249,6 +253,7 @@ export class MappingComponent implements OnInit { } } prev() { + this.loadingCr = true; if (this.index > 0) { this.index -= 1; }