This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 2a57d03 Fix upload file quantity in Bucket browser
2a57d03 is described below
commit 2a57d035000c45aaa55d6ccd01146aabbda9ad79
Author: Dmytro_Gnatyshyn <di1...@ukr.net>
AuthorDate: Thu Jun 25 17:09:15 2020 +0300
Fix upload file quantity in Bucket browser
---
.../src/app/resources/bucket-browser/bucket-browser.component.html | 2 --
.../src/app/resources/bucket-browser/bucket-browser.component.ts | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
index c5486fd..9dfa1fb 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
@@ -245,8 +245,6 @@
</div>
<div class="size">{{file.size | convertFileSize}} </div>
<div class="state">
- <!-- <button mat-raised-button
(click)="uploadNewFile(file)" *ngIf="!file.isUploading && !file.uploaded &&
!file.errorUploading">Upload</button>-->
- <!-- <mat-progress-bar mode="indeterminate"
*ngIf="file.isUploading"></mat-progress-bar>-->
<span *ngIf="file.status === 'uploaded'"
class="running">Uploaded</span>
<div class="progres" *ngIf="file.status === 'uploading'">
<span class="progress-bar-text">{{file.progress || 0}}%
Uploading...</span>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
index 9019b58..2485a40 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
@@ -62,6 +62,8 @@ export class BucketBrowserComponent implements OnInit {
public isFilterVisible: boolean;
public buckets;
public isFileUploading: boolean;
+ public uploadingQueueLength: number = 5;
+ public maxFileSize: number = 4294967296;
@ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent;
@@ -134,7 +136,7 @@ export class BucketBrowserComponent implements OnInit {
public handleFileInput(event) {
const fullFilesList = Object['values'](event.target.files);
if (fullFilesList.length > 0) {
- const files = fullFilesList.filter(v => v.size < 4294967296);
+ const files = fullFilesList.filter(v => v.size < this.maxFileSize);
const toBigFile = fullFilesList.length !== files.length;
const toMany = files.length > 50;
if (files.length > 50) {
@@ -294,7 +296,7 @@ export class BucketBrowserComponent implements OnInit {
if ((this.refreshTokenLimit > this.getTokenValidTime()) &&
!this.isTokenRefreshing) {
this.refreshToken();
}
- if (waitUploading.length && uploading.length < 10) {
+ if (waitUploading.length && uploading.length < this.uploadingQueueLength) {
if (!file) {
file = waitUploading[0];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
