This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1773 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9ad92b7d4e43f0533c212d83fe6b5e069a46e8f6 Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Mon May 11 20:17:40 2020 +0300 [DLAB-1773]: Fixed uploading --- .../resources/bucket-browser/bucket-browser.component.html | 13 ++++++------- .../resources/bucket-browser/bucket-browser.component.scss | 12 +++++++----- .../resources/bucket-browser/bucket-browser.component.ts | 8 ++++++-- .../exploratory/detail-dialog/detail-dialog.component.html | 3 +-- 4 files changed, 20 insertions(+), 16 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 afd9a92..4db2021 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 @@ -17,17 +17,17 @@ ~ under the License. --> -<div class="bucket-browser" id="dialog-box" (click)="this.isActionsOpen = false"> +<div class="bucket-browser" id="dialog-box" (click)="closeActions()"> <header class="dialog-header"> <h4 class="modal-title">Bucket browser</h4> <button type="button" class="close" (click)="dialogRef.close()">×</button> </header> <!-- <div class="dialog-content tabs">--> - <div class="dialog-content tabs" [hidden]="!path" > + <div class="dialog-content tabs" [hidden]="!path"> <div class="submit m-bott-10 m-top-10"> <span [matTooltip]="'You have not permission to upload data'" matTooltipPosition="above" matTooltipDisabled="{{this.bucketStatus.upload}}"> - <button mat-raised-button type="button" class="butt action first-btn" [disabled]="!this.bucketStatus.upload || allDisable"> + <button mat-raised-button type="button" class="butt action first-btn" [disabled]="!this.bucketStatus.upload || allDisable" (click)="handleFileInput($event)"> <input [ngClass]="{'not-allowed': !this.bucketStatus.upload}" type="file" (change)="handleFileInput($event)" title="" multiple> Upload files </button> @@ -66,15 +66,15 @@ <!-- </button>--> <!-- </div>--> - <div class="action-wrapper" [matTooltip]="'You have not permission to download data'" matTooltipPosition="above" matTooltipDisabled="{{this.bucketStatus.download}}" clickOutside (clickOutside)="opened = !opened"> + <div class="action-wrapper" [matTooltip]="'You have not permission to download data'" matTooltipPosition="above" matTooltipDisabled="{{this.bucketStatus.download}}"> <span class="action-button-wrapper"> <button type="button" class="butt actions-btn" mat-raised-button - [disabled]=" !selected?.length || allDisable" + [disabled]=" selectedItems?.length !== 1 || allDisable" (click)="toogleActions();$event.stopPropagation()" > - Actions <i class="material-icons"> expand_more </i> + Actions <i class="material-icons" >{{ !isActionsOpen ? 'expand_more' : 'expand_less' }}</i> </button> </span> <div class="action-menu" *ngIf="isActionsOpen"> @@ -102,7 +102,6 @@ <span *ngFor="let folder of this.objectPath"> <span class="url-icon" *ngIf="this.objectPath.indexOf(folder) !== 0"> <i class="material-icons"> chevron_right - </i> </span> <span class="url-folder" (click)="folderTreeComponent.showItem(folder);">{{folder.item}}</span> </span> 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 ab36abf..348d70e 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 @@ -47,14 +47,17 @@ position: relative; width: 160px; } + .mat-raised-button.butt{ margin-bottom: 0; &.actions-btn{ + padding-right: 38px; .material-icons{ + transition: ease-in-out 1s; font-size: 25px; position: absolute; - top: 6px; - right: 6px; + top: 7px; + right: 30px; } } } @@ -64,6 +67,7 @@ text-align: center; //box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12); &-item.mat-raised-button.butt{ + z-index: 1; margin: 0; box-shadow: 0 2px 1px -1px rgba(0,0,0,.2), 0 0px 0px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12); width: 160px; @@ -346,11 +350,9 @@ } input[type='file'] { - opacity:0 + opacity:1 } - - .empty-checkbox { min-width: 16px; width: 16px; 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 3febed9..fd55f7c 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 @@ -85,7 +85,6 @@ export class BucketBrowserComponent implements OnInit { } public async handleFileInput(event) { - console.log('work'); if (event.target.files.length > 0) { let askForAll = true; let skipAll = false; @@ -137,6 +136,7 @@ export class BucketBrowserComponent implements OnInit { this.selected = this.folderItems.filter(item => item.isSelected); this.selectedFolderForAction = this.folderItems.filter(item => item.isFolderSelected); this.selectedItems = [...this.selected, ...this.selectedFolderForAction]; + this.isActionsOpen = false; } filesPicked(files) { @@ -258,7 +258,11 @@ export class BucketBrowserComponent implements OnInit { this.isActionsOpen = !this.isActionsOpen; } - copyPath() { + public closeActions() { + this.isActionsOpen = false; + } + + public copyPath() { const selBox = document.createElement('textarea'); const selected = this.folderItems.filter(item => item.isSelected || item.isFolderSelected)[0]; selBox.style.position = 'fixed'; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html index 574eb2c..4d77b72 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html @@ -60,8 +60,7 @@ class="strong">{{ notebook.password }}</span></p> <p class="m-top-30">{{ DICTIONARY[PROVIDER].personal_storage }}: </p> - -<!-- (click)="bucketBrowser(notebook.bucket_name, notebook.endpoint, this.bucketStatus.view)"--> + <!-- (click)="bucketBrowser(notebook.bucket_name, notebook.endpoint, this.bucketStatus.view)"--> <div class="links_block" (click)="bucketBrowser('ofuks-1304-pr2-local-bucket', notebook.endpoint, this.bucketStatus.view && this.isBucketAllowed)" > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
