This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch DLAB-1806
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 7ae964adac361df52a3eac85e87d9692bddcef16
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Mon May 18 13:44:21 2020 +0300

    [DLAB-1806]: Implemented improvements, fixed bugs for bucket browser
---
 .../resources/webapp/src/app/core/util/patterns.ts |  2 +-
 .../bucket-browser/bucket-browser.component.html   |  4 ++--
 .../bucket-browser/bucket-browser.component.scss   | 10 +++++-----
 .../bucket-browser/bucket-browser.component.ts     | 14 ++++++++------
 .../folder-tree/folder-tree.component.html         |  2 ++
 .../folder-tree/folder-tree.component.ts           | 22 +++++++++++++++++-----
 .../resources-grid/resources-grid.component.ts     |  2 +-
 .../src/app/resources/resources.component.html     |  2 +-
 8 files changed, 37 insertions(+), 21 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts 
b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
index 2ec9c9d..8246bba 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
@@ -24,6 +24,6 @@ export const PATTERNS = {
   url: '[a-zA-Z0-9.://%#&\\.@:%-_\+~#=]*\.[^\s]*[a-zA-Z0-9]/+',
   nodeCountPattern: '^[1-9]\\d*$',
   integerRegex: '^[0-9]*$',
-  folderRegex: /[-A-Za-z0-9!@$%^&*|+=_'~{}<>`:;[(.,\])]+/g,
+  folderRegex: /^[a-zA-Z0-9!@$%^&*()_+\-=\[\]{};':|,.<>~` ]*$/,
   fullUrl: 
/^(http?|ftp|https):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+([.:])(\d{4}|com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*\/$/
 };
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 a994bf9..d8317fb 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
@@ -28,7 +28,7 @@
     <div class="submit m-bott-10 m-top-10">
       <div class="left-side-butts">
       <span [matTooltip]="'You have not permission to upload data'" 
matTooltipPosition="above" matTooltipDisabled="{{this.bucketStatus.upload}}">
-        <button mat-raised-button type="button" class="butt first-btn" 
[disabled]="!this.bucketStatus.upload || allDisable || isSelectionOpened || 
!path || isSelectionOpened" (click)="handleFileInput($event)">
+        <button mat-raised-button type="button" class="butt first-btn" 
[disabled]="!this.bucketStatus.upload || allDisable || isSelectionOpened || 
!path " (click)="handleFileInput($event)">
           <input [ngClass]="{'not-allowed': !this.bucketStatus.upload}" 
type="file" (change)="handleFileInput($event)" title="" multiple>
           Upload files
         </button>
@@ -237,7 +237,7 @@
             </span>
           </div>
           <div class="upload-path">
-            <span class="ellipsis" matTooltip="{{file.path}}" 
matTooltipPosition="above">{{file.path}}</span>
+            <span class="ellipsis" matTooltip="{{file.path}}" 
matTooltipPosition="above" 
[matTooltipClass]="'bucket-item-tooltip'">{{file.path}}</span>
           </div>
           <div class="size">{{file.size | convertFileSize}} </div>
           <div class="state">
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
index 76b5555..393f2a2 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
@@ -593,23 +593,23 @@ input[type='file'] {
       }
 
       .name{
-        flex:12;
+        width: 38%;
         padding-right: 5px;
         overflow: hidden;
         display: flex;
       }
 
       .upload-path{
-        flex:12;
+        width: 38%;
         padding-right: 5px;
         display: flex;
       }
 
       .size{
-        flex:2;
+        width: 7%;
       }
       .state{
-        flex:4;
+        width: 14%;
         display: flex;
         align-items: center;
         .mat-raised-button{
@@ -627,7 +627,7 @@ input[type='file'] {
       .remove{
         display: flex;
         align-items: center;
-        flex: 1;
+        width: 3%;
         position: relative;
         .close{
           color: #577289;
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 78acb30..d7a41f2 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
@@ -21,7 +21,7 @@ import { Component, OnInit, ViewChild, Inject } from 
'@angular/core';
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from 
'@angular/material/dialog';
 import { ToastrService } from 'ngx-toastr';
-import { ManageUngitService } from '../../core/services';
+import {ApplicationSecurityService, ManageUngitService} from 
'../../core/services';
 
 import {FolderTreeComponent} from './folder-tree/folder-tree.component';
 import {BucketBrowserService, TodoItemNode} from 
'../../core/services/bucket-browser.service';
@@ -71,6 +71,7 @@ export class BucketBrowserComponent implements OnInit {
     private _fb: FormBuilder,
     private bucketBrowserService: BucketBrowserService,
     private bucketDataService: BucketDataService,
+    private auth: ApplicationSecurityService
   ) {
 
   }
@@ -92,7 +93,7 @@ export class BucketBrowserComponent implements OnInit {
     if (event.target.files.length > 0) {
       let askForAll = true;
       let skipAll = false;
-
+      this.auth.refreshToken().subscribe();
       const folderFiles = this.folderItems.filter(v => !v.children).map(v => 
v.item);
       for (const file of  Object['values'](event.target.files)) {
       const existFile = folderFiles.filter(v => v === file['name'])[0];
@@ -101,9 +102,6 @@ export class BucketBrowserComponent implements OnInit {
           file: file,
           size: file.size,
           path: this.path,
-          isUploading: false,
-          uploaded: false,
-          errorUploading: false
         };
         if (existFile && askForAll) {
           const result = await this.openResolveDialog(existFile);
@@ -192,6 +190,8 @@ export class BucketBrowserComponent implements OnInit {
   }
 
   public deleteAddedFile(file) {
+    console.log(file);
+    file.request.unsubscribe();
     this.addedFiles.splice(this.addedFiles.indexOf(file), 1);
   }
 
@@ -211,7 +211,7 @@ export class BucketBrowserComponent implements OnInit {
   public sendFile(file) {
     const waitUploading = this.addedFiles.filter(v => v.status === 'waiting');
     const uploading = this.addedFiles.filter(v => v.status === 'uploading');
-    if (waitUploading.length && uploading.length < 11) {
+    if (waitUploading.length && uploading.length < 10) {
       file.status = 'uploading';
       file.request.subscribe((event: any) => {
           if (event.type === HttpEventType.UploadProgress) {
@@ -220,11 +220,13 @@ export class BucketBrowserComponent implements OnInit {
             this.bucketDataService.refreshBucketdata(this.bucketName, 
this.data.endpoint);
             file.status = 'uploaded';
             delete file.request;
+            console.log(file);
             this.sendFile(this.addedFiles.filter(v => v.status === 
'waiting')[0]);
           }
         }, error => {
           file.status = 'failed';
           delete file.request;
+          console.log(file);
           this.sendFile(this.addedFiles.filter(v => v.status === 
'waiting')[0]);
         }
       );
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 844ac2b..715d2d1 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
@@ -1,10 +1,12 @@
 <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
+
   <mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle 
matTreeNodePadding matTreeNodePaddingIndent="17" [ngStyle]="{'display': 
'none'}">
   <button mat-icon-button disabled></button>
   <!--    <mat-checkbox class="checklist-leaf-node"-->
   <!--                  [checked]="checklistSelection.isSelected(node)"-->
   <!--                  
(change)="todoLeafItemSelectionToggle(node)"></mat-checkbox>-->
   {{node.item}}
+
 </mat-tree-node>
 
   <mat-tree-node *matTreeNodeDef="let node; when: hasNoContent" 
matTreeNodePadding matTreeNodePaddingIndent="17" class="input-node">
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 5c4021d..2e1cc43 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
@@ -36,15 +36,14 @@ export class FolderTreeComponent implements OnInit, 
OnDestroy {
   private selectedFolder: TodoItemFlatNode;
   private flatNodeMap = new Map<TodoItemFlatNode, TodoItemNode>();
   private nestedNodeMap = new Map<TodoItemNode, TodoItemFlatNode>();
-  private selectedParent: TodoItemFlatNode | null = null;
+
   private folderCreating = false;
   private subscriptions: Subscription = new Subscription();
   public treeControl: FlatTreeControl<TodoItemFlatNode>;
   private treeFlattener: MatTreeFlattener<TodoItemNode, TodoItemFlatNode>;
   public dataSource: MatTreeFlatDataSource<TodoItemNode, TodoItemFlatNode>;
-
-
   private checklistSelection = new SelectionModel<TodoItemFlatNode>(true /* 
multiple */);
+  private folderCreationParent;
 
   constructor(
     public toastr: ToastrService,
@@ -65,6 +64,11 @@ export class FolderTreeComponent implements OnInit, 
OnDestroy {
           }
           this.expandAllParents(this.selectedFolder || subjectData[0]);
           this.showItem(this.selectedFolder || subjectData[0]);
+          if (this.folderCreationParent) {
+            this.folderCreationRefresh(this.folderCreationParent, '', false);
+          } else {
+            this.disableAll.emit(false);
+          }
         });
       }
     }));
@@ -99,6 +103,7 @@ export class FolderTreeComponent implements OnInit, 
OnDestroy {
 
   ngOnDestroy() {
     this.bucketDataService._bucketData.next([]);
+    this.subscriptions.unsubscribe();
   }
 
   folderFormControl = new FormControl('', [
@@ -230,8 +235,13 @@ export class FolderTreeComponent implements OnInit, 
OnDestroy {
   }
 
   private addNewItem(node: TodoItemFlatNode, file, isFile, path) {
-    const parentNode = this.flatNodeMap.get(node);
-    this.bucketDataService.insertItem(parentNode!, file, isFile);
+    this.folderCreationParent = node;
+    this.folderCreationRefresh(node, file, isFile);
+  }
+
+  private folderCreationRefresh(node: TodoItemFlatNode, file, isFile) {
+    const currNode = this.flatNodeMap.get(node);
+    this.bucketDataService.insertItem(currNode!, file, isFile);
     this.treeControl.expand(node);
     setTimeout(() => {
       const element = document.querySelector('#folder-form');
@@ -265,10 +275,12 @@ export class FolderTreeComponent implements OnInit, 
OnDestroy {
           this.folderFormControl.updateValueAndValidity();
           this.folderFormControl.markAsPristine();
           this.folderCreating = false;
+          this.folderCreationParent = null;
         }
         }, error => {
           this.toastr.error(error.message || 'Folder creation error!', 
'Oops!');
           this.folderCreating = false;
+          this.folderCreationParent = null;
         }
       );
   }
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index 95ca609..c1c623e 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -338,7 +338,7 @@ export class ResourcesGridComponent implements OnInit {
       return Object.keys(project.projectEndpoints).map(key => {
         const currEndpoint = project.projectEndpoints[key];
         const provider: string =  project.endpoints.filter(endpoint => 
endpoint['name'] === key)[0]['cloudProvider'];
-        const edgeItem = {name: `${project.project}(${key})`, children: []};
+        const edgeItem = {name: `${project.project} (${key})`, children: []};
         const projectBucket = 
currEndpoint[this.DICTIONARY[provider.toLowerCase()].bucket_name];
         const sharedBucket = 
currEndpoint[this.DICTIONARY[provider.toLowerCase()].shared_bucket_name];
         if (projectBucket && currEndpoint.status !== 'terminated' && 
currEndpoint.status !== 'terminating' && currEndpoint.status !== 'failed') {
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
index 2eda7db..1236d13 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
@@ -46,7 +46,7 @@
     </div>
 
     <div>
-      <span  matTooltip="{{!this.bucketStatus?.view ? 'You have not permission 
to open bucket browser' : 'You have not any buckets'}}"
+      <span  matTooltip="{{!this.bucketStatus?.view ? 'You have not permission 
to open bucket browser' : 'You have not any bucket'}}"
              matTooltipPosition="above"
              matTooltipDisabled="{{resourcesGrid.bucketsList?.length > 0 || 
!this.bucketStatus?.view}}"
              [matTooltipClass]="'bucket-item-tooltip'"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to