mirror of
https://github.com/GNS3/gns3-web-ui.git
synced 2024-12-30 09:48:53 +00:00
I resoleved loader error and message
This commit is contained in:
parent
667c8fc7f0
commit
ea1e280e66
@ -16,8 +16,8 @@ export class UploadServiceService {
|
||||
processBarCount(processCount:number) {
|
||||
this.countSource.next(processCount)
|
||||
}
|
||||
cancelFileUploading(){
|
||||
this.cancelItem.next(true)
|
||||
cancelFileUploading(isCancel){
|
||||
this.cancelItem.next(isCancel)
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ export class UploadingProcessbarComponent implements OnInit {
|
||||
this._snackRef.dismiss();
|
||||
}
|
||||
cancelItem() {
|
||||
this._US.cancelFileUploading()
|
||||
this._US.cancelFileUploading(true)
|
||||
}
|
||||
ngOnDestroy() {
|
||||
this.subscription.unsubscribe();
|
||||
|
@ -1,3 +1,4 @@
|
||||
import { Location } from '@angular/common';
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
@ -62,7 +63,7 @@ export class AddIosTemplateComponent implements OnInit {
|
||||
private iosConfigurationService: IosConfigurationService,
|
||||
private computeService: ComputeService,
|
||||
private uploadServiceService: UploadServiceService,
|
||||
private snackBar : MatSnackBar
|
||||
private snackBar : MatSnackBar,
|
||||
) {
|
||||
this.iosTemplate = new IosTemplate();
|
||||
|
||||
@ -156,7 +157,6 @@ export class AddIosTemplateComponent implements OnInit {
|
||||
this.snackBar.openFromComponent(UploadingProcessbarComponent, {
|
||||
panelClass: 'uplaoding-file-snackabar',
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
addTemplate() {
|
||||
@ -273,6 +273,9 @@ export class AddIosTemplateComponent implements OnInit {
|
||||
cancelUploading() {
|
||||
this.uploader.clearQueue();
|
||||
this.uploadServiceService.processBarCount(100)
|
||||
this.toasterService.warning('Image imported canceled');
|
||||
this.toasterService.warning('Image upload cancelled');
|
||||
this.uploadServiceService.cancelFileUploading(false)
|
||||
window.location.reload()
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { UploadServiceService } from 'app/common/uploading-processbar/upload-service.service';
|
||||
import { UploadingProcessbarComponent } from 'app/common/uploading-processbar/uploading-processbar.component';
|
||||
import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { v4 as uuid } from 'uuid';
|
||||
import { Compute } from '../../../../models/compute';
|
||||
import { IouImage } from '../../../../models/iou/iou-image';
|
||||
@ -34,7 +35,9 @@ export class AddIouTemplateComponent implements OnInit {
|
||||
templateNameForm: FormGroup;
|
||||
imageForm: FormGroup;
|
||||
isLocalComputerChosen: boolean = true;
|
||||
uploadProgress:number = 0
|
||||
uploadProgress: number = 0
|
||||
subscription: Subscription;
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private serverService: ServerService,
|
||||
@ -44,8 +47,8 @@ export class AddIouTemplateComponent implements OnInit {
|
||||
private formBuilder: FormBuilder,
|
||||
private templateMocksService: TemplateMocksService,
|
||||
private computeService: ComputeService,
|
||||
private uploadServiceService : UploadServiceService,
|
||||
private snackBar : MatSnackBar
|
||||
private uploadServiceService: UploadServiceService,
|
||||
private snackBar: MatSnackBar
|
||||
) {
|
||||
this.iouTemplate = new IouTemplate();
|
||||
|
||||
@ -65,6 +68,7 @@ export class AddIouTemplateComponent implements OnInit {
|
||||
};
|
||||
this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => {
|
||||
this.toasterService.error('An error occured: ' + response);
|
||||
this.setDiskImage('existingImage')
|
||||
};
|
||||
this.uploader.onProgressItem = (progress: any) => {
|
||||
this.uploadProgress = progress['progress'];
|
||||
@ -133,7 +137,10 @@ export class AddIouTemplateComponent implements OnInit {
|
||||
cancelUploading() {
|
||||
this.uploader.clearQueue();
|
||||
this.uploadServiceService.processBarCount(100)
|
||||
this.toasterService.warning('Image imported canceled');
|
||||
this.toasterService.warning('Image upload cancelled');
|
||||
this.uploadServiceService.cancelFileUploading(false)
|
||||
window.location.reload()
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -164,6 +164,8 @@ export class AddQemuVmTemplateComponent implements OnInit {
|
||||
this.uploader.clearQueue();
|
||||
this.uploadServiceService.processBarCount(100)
|
||||
this.toasterService.warning('Image Uploading canceled');
|
||||
this.uploadServiceService.cancelFileUploading(false)
|
||||
|
||||
}
|
||||
|
||||
goBack() {
|
||||
|
@ -429,7 +429,9 @@ export class NewTemplateDialogComponent implements OnInit {
|
||||
cancelUploading() {
|
||||
this.uploaderImage.clearQueue();
|
||||
this.uploadServiceService.processBarCount(100)
|
||||
this.toasterService.warning('Image imported canceled');
|
||||
this.toasterService.warning('Image upload cancelled');
|
||||
this.uploadServiceService.cancelFileUploading(false)
|
||||
|
||||
}
|
||||
|
||||
checkImageFromVersion(image: string): boolean {
|
||||
|
Loading…
Reference in New Issue
Block a user