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 50423d1 [DLAB-1773]: Fixed bugs, added possibility save empty
folder, multi-… (#723)
50423d1 is described below
commit 50423d1e1949f352772f7892b6b426b28f43f75d
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Thu May 7 18:11:16 2020 +0300
[DLAB-1773]: Fixed bugs, added possibility save empty folder, multi-…
(#723)
[DLAB-1773]: Fixed bugs, added possibility save empty folder, multi-file
selecting/deleting/uploading,
confirmation windows
---
.../services/applicationServiceFacade.service.ts | 4 +-
.../app/core/services/bucket-browser.service.ts | 6 +-
.../bucket-browser/bucket-browser.component.html | 34 +++--
.../bucket-browser/bucket-browser.component.scss | 23 +++-
.../bucket-browser/bucket-browser.component.ts | 130 ++++++++++--------
.../bucket-confirmation-dialog.component.html | 87 +++++++++++++
.../bucket-confirmation-dialog.component.scss | 145 +++++++++++++++++++++
.../bucket-confirmation-dialog.component.ts | 58 +++++++++
.../bucket-browser/bucket-data.service.ts | 25 ++--
.../folder-tree/folder-tree.component.html | 16 ++-
.../folder-tree/folder-tree.component.ts | 36 ++++-
.../webapp/src/app/resources/resources.module.ts | 6 +-
.../multi-level-select-dropdown.component.ts | 2 +-
.../webapp/src/assets/styles/_dialogs.scss | 4 +
14 files changed, 479 insertions(+), 97 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 6ac4fc1..1fdd39d 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
@@ -275,8 +275,8 @@ export class ApplicationServiceFacade {
}
public buildDeleteFileFromBucket(data): Observable<any> {
- return this.buildRequest(HTTPMethod.DELETE,
- this.requestRegistry.Item(ApplicationServiceFacade.BUCKET),
+ return this.buildRequest(HTTPMethod.POST,
+ this.requestRegistry.Item(ApplicationServiceFacade.BUCKET) +
'/objects/delete',
data );
}
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 c251ed9..8b2c4f6 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
@@ -8,7 +8,7 @@ export class TodoItemNode {
children: TodoItemNode[];
item: string;
id: string;
- size: number;
+ object: any;
}
export class TodoItemFlatNode {
@@ -50,12 +50,10 @@ export class BucketBrowserService {
}
public deleteFile(data) {
- const url = JSON.stringify(data);
return this.applicationServiceFacade
- .buildDeleteFileFromBucket(url)
+ .buildDeleteFileFromBucket(data)
.pipe(
map(response => response),
catchError(ErrorUtils.handleServiceError));
}
-
}
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 841b7c6..760a02d 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
@@ -27,9 +27,9 @@
<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"
[disabled]="!this.bucketStatus.upload || allDisable">
+ <button mat-raised-button type="button" class="butt action first-btn"
[disabled]="!this.bucketStatus.upload || allDisable">
<input [ngClass]="{'not-allowed': !this.bucketStatus.upload}"
type="file" (change)="handleFileInput($event)" title="" multiple>
- Add file
+ Upload files
</button>
</span>
<span [matTooltip]="'You have not permission to create folder'"
matTooltipPosition="above" matTooltipDisabled="{{this.bucketStatus.upload}}">
@@ -60,14 +60,12 @@
type="button" class="butt"
mat-raised-button
(click)="fileAction('download')"
- [disabled]="!selected?.length || !this.bucketStatus.download ||
allDisable"
+ [disabled]=" !selected?.length || this.selectedItems?.length > 1 ||
!this.bucketStatus.download || allDisable"
>
Download
</button>
</span>
-
-<!-- <button type="button" class="butt" mat-raised-button
[disabled]="this.addedFiles.length === 0"
(click)="uploadNewFile()">Upload</button>-->
</div>
<p class="path"><span>Bucket path:</span><span class="url ellipsis">
{{path}}</span></p>
<div class="backet-wrapper" [ngClass]="{'added-upload':
addedFiles.length}" id="scrolling">
@@ -76,6 +74,7 @@
(showFolderContent)=onFolderClick($event)
(disableAll) = dissableAll($event)
[folders] = folders
+ [endpoint] = endpoint
> </dlab-folder-tree>
</div>
<div class="directory">
@@ -93,7 +92,15 @@
<span *ngIf="this.bucketStatus.delete" class="empty-checkbox"
[ngClass]="{'checked': file.isFolderSelected}"
(click)="toggleSelectedFile(file, 'folder');$event.stopPropagation()" >
<span class="checked-checkbox"
*ngIf="file.isFolderSelected"></span>
</span>
- <div class="name name-folder"><i class="material-icons
folder-icon" >folder</i><span class="name-wrap">{{file.item}}</span></div>
+ <div class="name name-folder">
+ <i class="material-icons folder-icon" >folder</i>
+ <span class="name-wrap"
+ matTooltip="{{file.item}}"
+ matTooltipPosition="above"
+ matTooltipShowDelay="1000"
+ [matTooltipClass]="'bucket-item-tooltip'"
+ >{{file.item}}</span>
+ </div>
<div class="size size-folder">-</div>
<div class="date" *ngIf="!file.isDownloading">-</div>
<!-- <div class="progress-wrapper">-->
@@ -106,10 +113,19 @@
<span class="checked-checkbox"
*ngIf="file.isSelected"></span>
</span>
- <span class="item-name name-wrap"
[ngClass]="{'removed-checkbox': !this.bucketStatus.download &&
!this.bucketStatus.delete}">{{file.item}}</span>
+ <span
+ class="item-name name-wrap"
+ [ngClass]="{'removed-checkbox': !this.bucketStatus.download
&& !this.bucketStatus.delete}"
+ matTooltip="{{file.item}}"
+ matTooltipPosition="above"
+ matTooltipShowDelay="1000"
+ [matTooltipClass]="'bucket-item-tooltip'"
+ >
+ {{file.item}}
+ </span>
</div>
- <div class="size">{{file.size?.size}}</div>
- <div class="date"
*ngIf="!file.isDownloading">{{file.size?.lastModifiedDate }}</div>
+ <div class="size">{{file.object?.size}}</div>
+ <div class="date"
*ngIf="!file.isDownloading">{{file.object?.lastModifiedDate }}</div>
<div class="progress-wrapper" *ngIf="file.isDownloading">
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
</div>
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 bb7029d..7fc77d6 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
@@ -16,10 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
+.dialog-header {
+ padding-left: 33px !important;
+}
.bucket-browser {
font-size: 14px;
font-weight: 400;
+
+
.loading-block{
width: 80%;
margin: 20% auto 0 auto;
@@ -37,8 +42,8 @@
}
.path{
- margin: 0 4px 20px 4px;
- padding: 4px 4px 4px 20px;
+ margin: 0 4px 20px 0;
+ padding: 4px 4px 4px 0;
color: rgba(0,0,0,.87);
overflow: hidden;
white-space: nowrap;
@@ -65,6 +70,9 @@
position: relative;
overflow: hidden;
margin: 10px;
+ &.first-btn{
+ margin-left: 0;
+ }
input[type="file"] {
position: absolute;
left: 0;
@@ -82,12 +90,14 @@
border: 2px solid rgba(0,0,0,.12);
border-radius: 5px;
display: flex;
+ width: 100%;
&.added-upload{
height: 37vh;
}
.navigation{
+ width: 33.3%;
flex: 1;
border-right: 2px solid rgba(0,0,0,.12);
height: 100%;
@@ -106,6 +116,7 @@
}
.directory{
+ width: 66.7%;
max-height: 100%;
flex: 2;
font-size: 14px;
@@ -272,6 +283,8 @@ input[type='file'] {
opacity:0
}
+
+
.empty-checkbox {
min-width: 16px;
width: 16px;
@@ -313,7 +326,7 @@ input[type='file'] {
background-color: white;
min-height: 100px;
color: black;
-
+
.upload-header{
padding-left: 8px;
background: #f6fafe;
@@ -331,7 +344,7 @@ input[type='file'] {
font-size: 14px;
background: #f6fafe;
}
-
+
.close{
position: absolute;
top: 0;
@@ -419,8 +432,6 @@ input[type='file'] {
}
}
-
-
@media only screen and (max-height: 840px) {
.backet-wrapper {
height: 45vh;
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 22f70c2..9e3cfe6 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
@@ -27,6 +27,8 @@ import {FolderTreeComponent} from
'./folder-tree/folder-tree.component';
import {BucketBrowserService, TodoItemNode} from
'../../core/services/bucket-browser.service';
import {FileUtils} from '../../core/util';
import {BucketDataService} from './bucket-data.service';
+import {BucketConfirmationDialogComponent} from
'./bucket-confirmation-dialog/bucket-confirmation-dialog.component';
+import {logger} from 'codelyzer/util/logger';
@Component({
selector: 'dlab-bucket-browser',
@@ -41,15 +43,16 @@ export class BucketBrowserComponent implements OnInit {
public bucketName = '';
public endpoint = '';
public isUploadWindowOpened = false;
-
- @ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent;
public selectedFolder: any;
public selectedFolderForAction: any;
public selected: any[];
- private uploadForm: FormGroup;
public bucketStatus;
public allDisable: boolean;
public folders: any[];
+ public selectedItems;
+
+ @ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent;
+
constructor(
@@ -61,7 +64,6 @@ export class BucketBrowserComponent implements OnInit {
private _fb: FormBuilder,
private bucketBrowserService: BucketBrowserService,
private bucketDataService: BucketDataService,
- private formBuilder: FormBuilder
) {
}
@@ -70,9 +72,6 @@ export class BucketBrowserComponent implements OnInit {
this.bucketDataService.refreshBucketdata(this.data.bucket,
this.data.endpoint);
this.endpoint = this.data.endpoint;
this.bucketStatus = this.data.bucketStatus;
- this.uploadForm = this.formBuilder.group({
- file: ['']
- });
}
public showItem(item) {
@@ -80,44 +79,58 @@ export class BucketBrowserComponent implements OnInit {
this.folderTreeComponent.showItem(flatItem);
}
- public handleFileInput(event) {
+ public async handleFileInput(event) {
if (event.target.files.length > 0) {
- const file = event.target.files[0];
- this.uploadForm.get('file').setValue(file);
- const newAddedFiles = Object['values'](event.target.files).map(v => (
- {name: v['name'], file: file, 'size': (v['size'] /
1048576).toFixed(2), path: this.path, isUploading: false, uploaded: false,
errorUploading: false}));
- this.addedFiles = [...this.addedFiles, ...newAddedFiles];
+ let askForAll = true;
+ let skipAll = false;
+ for (const file of Object['values'](event.target.files)) {
+ const folderFiles = this.folderItems.filter(v => !v.children).map(v =>
v.item);
+ const existFile = folderFiles.filter(v => v === file['name'])[0];
+ const uploadItem = {
+ name: file['name'],
+ file: file,
+ 'size': (file['size'] / 1048576).toFixed(2),
+ path: this.path,
+ isUploading: false,
+ uploaded: false,
+ errorUploading: false
+ };
+ if (existFile && askForAll) {
+ const result = await this.openResolveDialog(existFile);
+ askForAll = !result.forAll;
+ if (result.forAll && !result.replaceObject) {
+ skipAll = true;
+ }
+ if (result.replaceObject) {
+ this.addedFiles.push(uploadItem);
+ this.uploadNewFile(uploadItem);
+ }
+ } else if (!existFile || (existFile && !askForAll && !skipAll)) {
+ this.addedFiles.push(uploadItem);
+ this.uploadNewFile(uploadItem);
+ }
+ }
}
- // event.target.value = null;
+ event.target.value = '';
+ }
+
+ async openResolveDialog(existFile) {
+ const dialog = this.dialog.open(BucketConfirmationDialogComponent, {data:
{items: existFile, type: 'upload-dublicat'} , width: '550px'});
+ return dialog.afterClosed().toPromise().then(result => {
+ return Promise.resolve(result);
+ });
}
public closeUploadWindow() {
- // this.isUploadWindowOpened = false;
this.addedFiles = [];
-
}
public toggleSelectedFile(file, type) {
- // remove if when will be possible download several files
- if (!file.isSelected || !file.isFolderSelected) {
- this.folderItems.forEach(item => item.isSelected = false);
- this.folderItems.forEach(item => item.isFolderSelected = false);
- }
- if (type === 'file') {
- file.isSelected = !file.isSelected;
- this.selected = this.folderItems.filter(item => item.isSelected);
- this.selectedFolderForAction = this.folderItems.filter(item =>
item.isFolderSelected);
- }
-
- if (type === 'folder') {
- file.isFolderSelected = !file.isFolderSelected;
- this.selected = this.folderItems.filter(item => item.isSelected);
- this.selectedFolderForAction = this.folderItems.filter(item =>
item.isFolderSelected);
- }
-
- console.log(this.selectedFolderForAction, this.selected );
-
+ type === 'file' ? file.isSelected = !file.isSelected :
file.isFolderSelected = !file.isFolderSelected;
+ this.selected = this.folderItems.filter(item => item.isSelected);
+ this.selectedFolderForAction = this.folderItems.filter(item =>
item.isFolderSelected);
+ this.selectedItems = [...this.selected, ...this.selectedFolderForAction];
}
filesPicked(files) {
@@ -185,35 +198,46 @@ export class BucketBrowserComponent implements OnInit {
}
public fileAction(action) {
- // this.selected = this.folderItems.filter(item => item.isSelected);
- const selected = this.folderItems.filter(item => item.isSelected)[0];
- const folderSelected = this.folderItems.filter(item =>
item.isFolderSelected)[0];
- if (!selected) {
- this.toastr.error('Folder deleting not working yet!', 'Oops!');
- return;
- }
- const path =
encodeURIComponent(`${this.pathInsideBucket}${this.selected[0].item}`);
+ const selected = this.folderItems.filter(item => item.isSelected);
+ const folderSelected = this.folderItems.filter(item =>
item.isFolderSelected);
+
if (action === 'download') {
- selected['isDownloading'] = true;
+ const path =
encodeURIComponent(`${this.pathInsideBucket}${this.selected[0].item}`);
+ selected[0]['isDownloading'] = true;
this.bucketBrowserService.downloadFile(`/${this.bucketName}/object/${path}/endpoint/${this.endpoint}/download`)
.subscribe(data => {
- FileUtils.downloadBigFiles(data, selected.item);
- selected['isDownloading'] = false;
+ FileUtils.downloadBigFiles(data, selected[0].item);
+ selected[0]['isDownloading'] = false;
this.folderItems.forEach(item => item.isSelected = false);
}, error => {
this.toastr.error(error.message || 'File downloading error!',
'Oops!');
- selected['isDownloading'] = false;
+ selected[0]['isDownloading'] = false;
}
);
}
if (action === 'delete') {
-
this.bucketBrowserService.deleteFile(`/${this.bucketName}/object/${path}/endpoint/${this.endpoint}`).subscribe(()
=> {
- this.bucketDataService.refreshBucketdata(this.data.bucket,
this.data.endpoint);
- this.toastr.success('File successfully deleted!', 'Success!');
- this.folderItems.forEach(item => item.isSelected = false);
- }, error => this.toastr.error(error.message || 'File deleting error!',
'Oops!')
- );
+ const itemsForDeleting = [...folderSelected, ...selected];
+ const objects = itemsForDeleting.map(obj => obj.object.object);
+ const dataForServer = [];
+ objects.forEach(object => {
+ dataForServer.push(...this.bucketDataService.serverData.map(v =>
v.object).filter(v => v.indexOf(object) === 0));
+ });
+
+ this.dialog.open(BucketConfirmationDialogComponent, {data: {items:
itemsForDeleting, type: 'delete'} , width: '550px'})
+ .afterClosed().subscribe((res) => {
+ !res && this.clearSelection();
+ res && this.bucketBrowserService.deleteFile({bucket: this.bucketName,
endpoint: this.endpoint, 'objects': dataForServer}).subscribe(() => {
+ this.bucketDataService.refreshBucketdata(this.data.bucket,
this.data.endpoint);
+ this.toastr.success('Objects successfully deleted!', 'Success!');
+ this.clearSelection();
+ }, error => {
+ this.toastr.error(error.message || 'Objects deleting error!',
'Oops!');
+ this.clearSelection();
+ });
+ });
+
+
}
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.html
new file mode 100644
index 0000000..d09d9a8
--- /dev/null
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.html
@@ -0,0 +1,87 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<div id="dialog-box" class="confirmation-dialog">
+ <header class="dialog-header">
+ <h4 class="modal-title">
+ <span *ngIf="data.type === 'delete'">Delete objects</span>
+ <span *ngIf="data.type === 'upload-dublicat'">Resolve conflicts</span>
+ </h4>
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
+ </header>
+ <div class="dialog-content">
+ <div class="content-box">
+ <div *ngIf="data.type === 'delete'">
+ <mat-list class="resources">
+ <mat-list-item class="list-header">
+ <div class="object">Objects</div>
+ <div class="size">Size</div>
+ </mat-list-item>
+ <div class="scrolling-content" id="scrolling">
+ <mat-list-item *ngFor="let object of data.items">
+ <div class="object">
+ <span *ngIf="object['children']"><i class="material-icons
folder-icon" >folder</i></span>
+ <div class="ellipsis"
+ matTooltip="{{object['item']}}"
+ matTooltipPosition="above"
+ matTooltipShowDelay="1000"
+
[matTooltipClass]="'bucket-item-tooltip'">{{object['item']}}</div>
+ </div>
+ <div class="size">{{object['children'] ? '-' :
object['object'].size}}</div>
+ </mat-list-item>
+ </div>
+ </mat-list>
+ <div mat-dialog-content class="bottom-message" *ngIf="data.type ===
'delete'">
+ <span class="confirm-message" *ngIf="isFolders">All affected objects
will be deleted.</span>
+ <span class="confirm-message" *ngIf="!isFolders">These objects will be
deleted.</span>
+ </div>
+ <div class="text-center m-top-20">
+ <p class="strong">Do you want to proceed?</p>
+ </div>
+ </div>
+ <div *ngIf="data.type === 'upload-dublicat'">
+ <p><span class="strong">{{data.items}}</span> already exist in
selected folder. How would you like to resolve this conflict?</p>
+
+ <mat-radio-group
+ aria-labelledby="upload-radio-group-label"
+ class="upload-radio-group"
+ [(ngModel)]="fileAction">
+ <mat-radio-button class="upload-radio-button" *ngFor="let action of
uploadActions" [value]="action">
+ {{action}}
+ </mat-radio-button>
+ </mat-radio-group>
+ <div class="repeat-for-all" >
+ <div class="empty-checkbox" [ngClass]="{'checked': actionForAll}"
(click)="toggleActionForAll();$event.stopPropagation()" >
+ <span class="checked-checkbox" *ngIf="actionForAll"></span>
+ </div>
+ <span class="repeat-message"
(click)="toggleActionForAll();$event.stopPropagation()">Repeat for all
remaining conflicts</span>
+ </div>
+ </div>
+ <div class="text-center m-top-20" *ngIf="data.type === 'delete'">
+ <button mat-raised-button type="button" class="butt action"
(click)="dialogRef.close()">No</button>
+ <button mat-raised-button type="button" class="butt butt-success
action" (click)="dialogRef.close(true)">Yes</button>
+ </div>
+
+ <div class="text-center m-top-20" *ngIf="data.type ===
'upload-dublicat'">
+ <button mat-raised-button type="button" class="butt action"
(click)="dialogRef.close()">Cancel</button>
+ <button mat-raised-button type="button" class="butt butt-success
action" (click)="submitResolving()">Continue</button>
+ </div>
+ </div>
+ </div>
+</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.scss
new file mode 100644
index 0000000..f02c915
--- /dev/null
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.scss
@@ -0,0 +1,145 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.confirmation-dialog {
+
+ .folder-icon{
+ color: rgb(232, 232, 232);
+ margin-right: 5px;
+ }
+ h3{
+ margin-bottom: 20px;
+ }
+ color: #718ba6;
+ p {
+ font-size: 14px;
+ font-weight: 400;
+ margin: 0;
+ margin-bottom: 10px;
+ &.info {
+ font-weight: 500;
+ }
+ }
+ .resources {
+ .object {
+ width: 70%;
+ display: flex;
+ align-items: center;
+ }
+
+ .size {
+ width: 30%;
+ }
+ .scrolling-content {
+ max-height: 200px;
+ overflow-y: auto;
+ }
+ }
+ .empty-list {
+ display: flex;
+ width: 100%;
+ justify-content: center;
+ color: #35afd5;
+ padding: 15px;
+ }
+
+ .list-header {
+ border-top: 1px solid #edf1f5;
+ border-bottom: 1px solid #edf1f5;
+ color: #577289;
+ width: 100%;
+ }
+
+ .bottom-message{
+ padding-top: 15px;
+ text-align: center;
+ .confirm-message{
+ color: #ef5c4b;
+ font-size: 13px;
+ min-height: 18px;
+ text-align: center;
+ padding-top: 20px}
+ }
+.mat-radio-button{
+ font-family: inherit;
+ .mat-radio-ripple{
+ display: none;
+ }
+}
+ .upload-radio-group{
+ display: flex;
+ flex-direction: column;
+ .upload-radio-button {
+ padding: 10px 0;
+
+ .mat-radio-container {
+ width: 15px;
+ height: 15px;
+ .mat-radio-outer-circle, .mat-radio-inner-circle {
+ width: 15px;
+ height: 15px;
+ border-color: lightgrey;
+ }
+ }
+
+ &.mat-radio-checked {
+ .mat-radio-outer-circle {
+ border-color: #35afd5;
+ }
+
+ .mat-radio-inner-circle {
+ background-color: #35afd5;
+ }
+ }
+ }
+ }
+ .repeat-for-all{
+ display: flex;
+ margin-top: 15px;
+ margin-bottom: 40px;
+ .repeat-message{
+ padding-left: 5px;
+ cursor: pointer;
+ }
+ }
+ .empty-checkbox {
+ min-width: 16px;
+ width: 16px;
+ height: 16px;
+ border-radius: 2px;
+ border: 2px solid lightgrey;
+ margin-top: 2px;
+ position: relative;
+ cursor: pointer;
+ &.checked {
+ border-color: #35afd5;
+ background-color: #35afd5;
+ }
+ .checked-checkbox {
+ top: 0;
+ left: 4px;
+ width: 5px;
+ height: 10px;
+ border-bottom: 2px solid white;
+ border-right: 2px solid white;
+ position: absolute;
+ transform: rotate(45deg);
+ }
+ }
+}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.ts
new file mode 100644
index 0000000..2d75b20
--- /dev/null
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.ts
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Component, OnInit, Inject, Input, Output, EventEmitter,
ViewEncapsulation } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+@Component({
+ selector: 'bucket-confirmation-dialog',
+ templateUrl: 'bucket-confirmation-dialog.component.html',
+ styleUrls: ['./bucket-confirmation-dialog.component.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+
+export class BucketConfirmationDialogComponent implements OnInit {
+ isFolders: boolean = false;
+ uploadActions = ['Replace existing object', 'Skip uploading object'];
+ fileAction: string = this.uploadActions[1];
+ actionForAll: boolean = false;
+ constructor(
+ @Inject(MAT_DIALOG_DATA) public data: any,
+ public dialogRef: MatDialogRef<BucketConfirmationDialogComponent>,
+ public toastr: ToastrService
+ ) {
+
+ }
+
+ ngOnInit() {
+ if (this.data.type === 'delete') {
+ this.isFolders = !!this.data.items.filter(v => v.children).length;
+ }
+ }
+
+ toggleActionForAll() {
+ this.actionForAll = !this.actionForAll;
+ }
+
+ submitResolving() {
+ const submitObj = {replaceObject:
!this.uploadActions.indexOf(this.fileAction), forAll: this.actionForAll};
+ this.dialogRef.close(submitObj);
+ }
+}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
index a6c7efe..c52fe1c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
@@ -22,16 +22,16 @@ import { BehaviorSubject} from 'rxjs';
import {BucketBrowserService, TodoItemNode} from
'../../core/services/bucket-browser.service';
-const array = [{'bucket': 'ofuks-1304-prj1-local-bucket', 'object':
'folder11/dsafaraorueajkegrgavhsfnvgahsfgsdjfhagsdjfg497frgfhsdajfsgdafjs',
'size': '18 bytes', 'lastModifiedDate': '21-4-2020 11:36:36'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': '51.txt', 'size': '18 bytes',
'lastModifiedDate': '21-4-2020 11:56:46'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'Untitlsed', 'size': '5 bytes',
'lastModifiedDate': '13-4-2020 03:39:11'}, {'bucket': 'ofuks-1304-prj1-loc [...]
-{'bucket': 'ofuks-1304-prj1-local-bucket', 'object': 'objectName', 'size': '5
bytes', 'lastModifiedDate': '14-4-2020 09:36:16'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'sss.txt', 'size': '52 bytes',
'lastModifiedDate': '17-4-2020 12:13:26'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': '1test', 'size': '112 bytes',
'lastModifiedDate': '14-4-2020 04:55:02'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test.pem', 'size': '1 KB',
'lastModifiedDate': '14-4-202 [...]
-{'bucket': 'ofuks-1304-prj1-local-bucket', 'object': 'sss.txt', 'size': '52
bytes', 'lastModifiedDate': '17-4-2020 12:13:26'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test', 'size': '12 bytes',
'lastModifiedDate': '14-4-2020 04:55:02'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test.pem', 'size': '1 KB',
'lastModifiedDate': '14-4-2020 04:57:54'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test1', 'size': '52 bytes',
'lastModifiedDate': '17-4-2020 11:2 [...]
+const array = [{'bucket': 'ofuks-1304-prj1-local-bucket', 'object':
'folder11/', 'size': '18 bytes', 'lastModifiedDate': '21-4-2020 11:36:36'},
{'bucket': 'ofuks-1304-prj1-local-bucket', 'object':
'folder11/dsafaraorueajkegrgavhsfnvgahsfgsdjfhagsdjfg497frgfhsdajfsgdafjsxzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzdvcfdvbgffgsdfgdsafaraorueajkegrgavhsfnvgahsfgsdjfhagsdjfg497frgfhsdajfsgdafjsxzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzdvcfdvbgffgsdfgdsfgsdfgggggg',
' [...]
+{'bucket': 'ofuks-1304-prj1-local-bucket', 'object': '3.jpg', 'size': '5
bytes', 'lastModifiedDate': '14-4-2020 09:36:16'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': '2.jpg', 'size': '52 bytes',
'lastModifiedDate': '17-4-2020 12:13:26'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': '1test', 'size': '112 bytes',
'lastModifiedDate': '14-4-2020 04:55:02'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test.pem', 'size': '1 KB',
'lastModifiedDate': '14-4-2020 04:57 [...]
+{'bucket': 'ofuks-1304-prj1-local-bucket', 'object': '5.jpg', 'size': '52
bytes', 'lastModifiedDate': '17-4-2020 12:13:26'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test', 'size': '12 bytes',
'lastModifiedDate': '14-4-2020 04:55:02'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test.pem', 'size': '1 KB',
'lastModifiedDate': '14-4-2020 04:57:54'}, {'bucket':
'ofuks-1304-prj1-local-bucket', 'object': 'test1', 'size': '52 bytes',
'lastModifiedDate': '17-4-2020 11:22: [...]
// const array = [];
@Injectable()
export class BucketDataService {
public _bucketData = new BehaviorSubject<any>(null);
- private serverData: any = [];
+ public serverData: any = [];
get data(): TodoItemNode[] { return this._bucketData.value; }
constructor(
private bucketBrowserService: BucketBrowserService,
@@ -51,8 +51,8 @@ export class BucketDataService {
// backetData = this.convertToFolderTree(array);
// const data = this.buildFileTree({[bucket]: backetData}, 0);
// this._bucketData.next(data);
- // }
}
+
public buildFileTree(obj: {[key: string]: any}, level: number):
TodoItemNode[] {
return Object.keys(obj).reduce<TodoItemNode[]>((accumulator, key) => {
if (key === '') {
@@ -65,14 +65,16 @@ export class BucketDataService {
node.children = this.buildFileTree({}, level + 1);
return accumulator.concat(node);
}
- if (Object.keys(value).length) {
+ if (Object.keys(value).length && Object.keys(value).length > 1) {
if (typeof value === 'object') {
+ node.object = value.obj || {'bucket': node.item, 'object': '',
'size': '', 'lastModifiedDate': ''};
+ delete value.obj;
node.children = this.buildFileTree(value, level + 1);
} else {
node.item = value;
}
} else {
- node.size = this.serverData.filter(v => v.object.indexOf(node.item)
!== -1)[0];
+ node.object = value.obj;
}
return accumulator.concat(node);
}, []);
@@ -99,20 +101,25 @@ export class BucketDataService {
this._bucketData.next(this.data);
}
- public processFiles = (files, target) => {
+ public processFiles = (files, target, object) => {
let pointer = target;
files.forEach((file) => {
if (!pointer[file]) {
pointer[file] = {};
}
pointer = pointer[file];
+ if (!pointer.obj) {
+ pointer.obj = object;
+ }
+
});
}
public processFolderArray = (acc, curr) => {
// const files = curr.object.split('/').filter(x => x.length > 0);
const files = curr.object.split('/');
- this.processFiles(files, acc);
+ this.processFiles(files, acc, curr);
+
return acc;
}
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 7d79751..d635c7c 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,5 +1,5 @@
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
- <mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle
matTreeNodePadding [ngStyle]="{'display': 'none'}">
+ <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)"-->
@@ -7,7 +7,7 @@
{{node.item}}
</mat-tree-node>
- <mat-tree-node *matTreeNodeDef="let node; when: hasNoContent"
matTreeNodePadding class="input-node">
+ <mat-tree-node *matTreeNodeDef="let node; when: hasNoContent"
matTreeNodePadding matTreeNodePaddingIndent="17" class="input-node">
<form class="add-folder-form">
<mat-form-field>
<mat-label>New folder</mat-label>
@@ -23,12 +23,20 @@
</mat-error>
</mat-form-field>
- <button (click)="saveNode(node, itemValue.value)" [ngClass]="{'check':
folderFormControl.valid && folderFormControl.dirty}" mat-icon-button class="btn
action-btn" [disabled]="!folderFormControl.valid ||
!folderFormControl.dirty"><span><i class="material-icons
">check</i></span></button>
+ <button (click)="saveNode(node, itemValue.value)"
+ [ngClass]="{'check': folderFormControl.valid &&
folderFormControl.dirty && !folderCreating}"
+ mat-icon-button class="btn action-btn"
+ [disabled]="!folderFormControl.valid || !folderFormControl.dirty"
+ matTooltip="Please wait! Folder is creating."
+ [matTooltipDisabled]="!folderCreating"
+ matTooltipPosition="above"
+ >
+ <span><i class="material-icons ">check</i></span></button>
<button (click)="removeItem(node)" mat-icon-button class="btn close
action-btn"><span ><i class="material-icons ">close</i></span></button>
</form>
</mat-tree-node>
- <mat-tree-node *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding>
+ <mat-tree-node *matTreeNodeDef="let node; when: hasChild" matTreeNodePadding
matTreeNodePaddingIndent="17">
<button mat-icon-button matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.filename">
<mat-icon class="mat-icon-rtl-mirror" [ngClass]="{'active-item':
selectedFolder === 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 4aeab2b..ff1ae69 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,6 +8,7 @@ import {Subscription} from 'rxjs';
import {FormControl, FormGroupDirective, NgForm, Validators} from
'@angular/forms';
import {ErrorStateMatcher} from '@angular/material/core';
import {PATTERNS} from '../../../core/util';
+import {ToastrService} from 'ngx-toastr';
export class MyErrorStateMatcher implements ErrorStateMatcher {
isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm
| null): boolean {
@@ -27,6 +28,7 @@ export class FolderTreeComponent implements OnInit, OnDestroy
{
@Output() showFolderContent: EventEmitter<any> = new EventEmitter();
@Output() disableAll: EventEmitter<any> = new EventEmitter();
@Input() folders;
+ @Input() endpoint;
private folderTreeSubs;
private path = [];
@@ -34,7 +36,7 @@ export class FolderTreeComponent implements OnInit, OnDestroy
{
private flatNodeMap = new Map<TodoItemFlatNode, TodoItemNode>();
private nestedNodeMap = new Map<TodoItemNode, TodoItemFlatNode>();
private selectedParent: TodoItemFlatNode | null = null;
- private newItemName = '';
+ private folderCreating = false;
private subscriptions: Subscription = new Subscription();
public treeControl: FlatTreeControl<TodoItemFlatNode>;
private treeFlattener: MatTreeFlattener<TodoItemNode, TodoItemFlatNode>;
@@ -44,6 +46,7 @@ export class FolderTreeComponent implements OnInit, OnDestroy
{
private checklistSelection = new SelectionModel<TodoItemFlatNode>(true /*
multiple */);
constructor(
+ public toastr: ToastrService,
private bucketBrowserService: BucketBrowserService,
private bucketDataService: BucketDataService,
) {
@@ -226,6 +229,8 @@ export class FolderTreeComponent implements OnInit,
OnDestroy {
private addNewItem(node: TodoItemFlatNode, file, isFile, path) {
const parentNode = this.flatNodeMap.get(node);
+
+ console.log(parentNode);
this.bucketDataService.insertItem(parentNode!, file, isFile);
this.treeControl.expand(node);
}
@@ -237,14 +242,31 @@ export class FolderTreeComponent implements OnInit,
OnDestroy {
}
private saveNode(node: TodoItemFlatNode, itemValue: string) {
- const nestedNode = this.flatNodeMap.get(node);
- this.bucketDataService.updateItem(nestedNode!, itemValue);
- this.resetForm();
- this.folderFormControl.updateValueAndValidity();
- this.folderFormControl.markAsPristine();
+ this.folderCreating = true;
+ const parent = this.getParentNode(node);
+ const flatParent = this.flatNodeMap.get(parent);
+ const path = `${flatParent.object.object}${itemValue}/`;
+ const formData = new FormData();
+ formData.append('file', '');
+ formData.append('object', path);
+ formData.append('bucket', flatParent.object.bucket);
+ formData.append('endpoint', this.endpoint);
+ this.bucketBrowserService.uploadFile(formData)
+ .subscribe(() => {
+ this.bucketDataService.refreshBucketdata(flatParent.object.bucket,
this.endpoint);
+ this.toastr.success('Folder successfully created!', 'Success!');
+ this.resetForm();
+ this.folderFormControl.updateValueAndValidity();
+ this.folderFormControl.markAsPristine();
+ this.folderCreating = false;
+ }, error => {
+ this.toastr.error(error.message || 'Folder creation error!',
'Oops!');
+ this.folderCreating = false;
+ }
+ );
}
- private resetForm(){
+ private resetForm() {
this.folderFormControl.setValue('');
this.folderFormControl.updateValueAndValidity();
this.folderFormControl.markAsPristine();
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
index c87d12c..0da7bd4 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
@@ -31,6 +31,7 @@ import {BucketBrowserComponent} from
'./bucket-browser/bucket-browser.component'
import {FolderTreeComponent} from
'./bucket-browser/folder-tree/folder-tree.component';
import {MatTreeModule} from '@angular/material/tree';
import {BucketDataService} from './bucket-browser/bucket-data.service';
+import {BucketConfirmationDialogComponent} from
'./bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component';
@NgModule({
@@ -48,9 +49,10 @@ import {BucketDataService} from
'./bucket-browser/bucket-data.service';
ManageUngitComponent,
ConfirmDeleteAccountDialog,
BucketBrowserComponent,
- FolderTreeComponent
+ FolderTreeComponent,
+ BucketConfirmationDialogComponent
],
- entryComponents: [ManageUngitComponent, ConfirmDeleteAccountDialog,
BucketBrowserComponent, FolderTreeComponent],
+ entryComponents: [ManageUngitComponent, ConfirmDeleteAccountDialog,
BucketBrowserComponent, FolderTreeComponent, BucketConfirmationDialogComponent],
providers: [BucketDataService],
exports: [ResourcesComponent]
})
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
index e4cca34..3033acc 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
@@ -44,7 +44,7 @@ export class MultiLevelSelectDropdownComponent {
COMPUTATIONAL_SHAPE: 'Compute shapes',
NOTEBOOK_SHAPE: 'Notebook shapes',
COMPUTATIONAL: 'Compute',
- BUCKET_BROWSER: 'Bucket browser'
+ BUCKET_BROWSER: 'Bucket browser actions'
};
constructor() {
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 4fa2ae0..e900c5e 100644
---
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -349,6 +349,10 @@ mat-dialog-container {
}
}
+.bucket-item-tooltip{
+ max-width: 1100px !important;
+ white-space: pre-line;
+}
@media screen and (max-width: 1280px) {
.modal-fullscreen {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]