You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/06/17 12:49:22 UTC
[incubator-dlab] 01/01: [DLAB-1881]: Updated folder creation in
bucket-browser, Changed refresh token time to 25min
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1881
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7379170b05d08a8339e95d20a2f9f36571b5458a
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Jun 17 15:48:03 2020 +0300
[DLAB-1881]: Updated folder creation in bucket-browser, Changed refresh token time to 25min
---
.../services/applicationServiceFacade.service.ts | 6 ++++
.../app/core/services/bucket-browser.service.ts | 8 +++++
.../bucket-browser/bucket-browser.component.ts | 2 +-
.../folder-tree/folder-tree.component.html | 2 +-
.../folder-tree/folder-tree.component.ts | 34 ++++++++++++----------
5 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index a207f97..7d0e3dc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -266,6 +266,12 @@ export class ApplicationServiceFacade {
data, { reportProgress: true, observe: 'events' });
}
+ public buildCreateFolderInBucket(data): Observable<any> {
+ return this.buildRequest(HTTPMethod.POST,
+ this.requestRegistry.Item(ApplicationServiceFacade.BUCKET) + '/folder/upload',
+ data);
+ }
+
public buildDownloadFileFromBucket(data) {
return this.buildRequest(HTTPMethod.GET,
this.requestRegistry.Item(ApplicationServiceFacade.BUCKET),
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
index 8b2c4f6..4d2fe83 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
@@ -49,6 +49,14 @@ export class BucketBrowserService {
catchError(ErrorUtils.handleServiceError));
}
+ public createFolder(data) {
+ return this.applicationServiceFacade
+ .buildCreateFolderInBucket(data)
+ .pipe(
+ map(response => response),
+ catchError(ErrorUtils.handleServiceError));
+ }
+
public deleteFile(data) {
return this.applicationServiceFacade
.buildDeleteFileFromBucket(data)
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 040ed1e..9e3bcd8 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
@@ -56,7 +56,7 @@ export class BucketBrowserComponent implements OnInit {
public selectedItems;
public searchValue: string;
public isQueueFull: boolean;
- public refreshTokenLimit = 900000;
+ public refreshTokenLimit = 1500000;
private isTokenRefreshing = false;
public isSelectionOpened: any;
public isFilterVisible: boolean;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
index dab723d..6f67609 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.html
@@ -25,7 +25,7 @@
Folder with this name already exists
</mat-error>
</mat-form-field>
- <button (click)="saveNode(node, itemValue.value)"
+ <button (click)="createFolder(node, itemValue.value)"
[ngClass]="{'check': folderFormControl.valid && folderFormControl.dirty && !folderCreating}"
mat-icon-button class="btn action-btn"
[disabled]="!folderFormControl.valid || !folderFormControl.dirty"
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
index fa40d1e..9574434 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
@@ -8,7 +8,6 @@ import {FormControl, FormGroupDirective, NgForm, Validators} from '@angular/form
import {ErrorStateMatcher} from '@angular/material/core';
import {PATTERNS} from '../../../core/util';
import {ToastrService} from 'ngx-toastr';
-import {HttpResponse} from '@angular/common/http';
export class MyErrorStateMatcher implements ErrorStateMatcher {
isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
@@ -204,7 +203,7 @@ private addNewItem(node: TodoItemFlatNode, file, isFile) {
this.resetForm();
}
- private saveNode(node: TodoItemFlatNode, itemValue: string) {
+ private createFolder(node: TodoItemFlatNode, itemValue: string) {
this.folderCreating = true;
const parent = this.getParentNode(node);
const flatParent = this.flatNodeMap.get(parent);
@@ -214,21 +213,24 @@ private addNewItem(node: TodoItemFlatNode, file, isFile) {
}
const path = `${ flatParent.object && flatObject !== '/' ? flatObject : ''}${itemValue}/`;
const bucket = flatParent.object ? flatParent.object.bucket : flatParent.item;
- const formData = new FormData();
- formData.append('file', '');
- formData.append('object', path);
- formData.append('bucket', bucket);
- formData.append('endpoint', this.endpoint);
+ // const formData = new FormData();
+ // formData.append('file', '');
+ // formData.append('object', path);
+ // formData.append('bucket', bucket);
+ // formData.append('endpoint', this.endpoint);
+
this.bucketDataService.emptyFolder = null;
- this.bucketBrowserService.uploadFile(formData)
- .subscribe((event) => {
- if (event instanceof HttpResponse) {
- this.bucketDataService.insertItem(flatParent, itemValue, false);
- // this.bucketDataService.refreshBucketdata(bucket, this.endpoint);
- this.toastr.success('Folder successfully created!', 'Success!');
- this.folderCreating = false;
- this.removeItem(node);
- }
+ this.bucketBrowserService.createFolder({
+ 'bucket': bucket,
+ 'folder': path,
+ 'endpoint': this.endpoint
+ })
+ .subscribe(_ => {
+ this.bucketDataService.insertItem(flatParent, itemValue, false);
+ // this.bucketDataService.refreshBucketdata(bucket, this.endpoint);
+ this.toastr.success('Folder successfully created!', 'Success!');
+ this.folderCreating = false;
+ this.removeItem(node);
}, error => {
this.folderCreating = false;
this.toastr.error(error.message || 'Folder creation error!', 'Oops!');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org