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/08/10 14:19:13 UTC
[incubator-dlab] 02/02: [DLAB-1976]: Small fixes
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1976
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d73b86f5ccd6259f5c9a1e142cabf4ee40915f84
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Aug 10 17:18:28 2020 +0300
[DLAB-1976]: Small fixes
---
.../bucket-browser/bucket-data.service.ts | 33 +++++++++++-----------
.../detail-dialog/detail-dialog.component.html | 2 +-
.../webapp/src/assets/styles/_dialogs.scss | 2 +-
3 files changed, 18 insertions(+), 19 deletions(-)
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 700005f..96f8e2d 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
@@ -44,25 +44,24 @@ export class BucketDataService {
public refreshBucketdata(bucket, endpoint) {
let backetData = [];
-
- // this.bucketBrowserService.getBucketData(bucket, endpoint).subscribe(v => {
- // const copiedData = JSON.parse(JSON.stringify(v));
- // this.serverData = v;
- // if (this.emptyFolder) {
- // copiedData.unshift(this.emptyFolder);
- // }
- //
- // backetData = this.convertToFolderTree(copiedData);
- // const data = this.buildFileTree({[bucket]: backetData}, 0);
- // this._bucketData.next(data);
- // });
+ this.bucketBrowserService.getBucketData(bucket, endpoint).subscribe(v => {
+ const copiedData = JSON.parse(JSON.stringify(v));
+ this.serverData = v;
if (this.emptyFolder) {
- array.unshift(this.emptyFolder);
+ copiedData.unshift(this.emptyFolder);
}
- this.serverData = array;
- backetData = this.convertToFolderTree(array);
+
+ backetData = this.convertToFolderTree(copiedData);
const data = this.buildFileTree({[bucket]: backetData}, 0);
this._bucketData.next(data);
+ });
+ // if (this.emptyFolder) {
+ // array.unshift(this.emptyFolder);
+ // }
+ // this.serverData = array;
+ // backetData = this.convertToFolderTree(array);
+ // const data = this.buildFileTree({[bucket]: backetData}, 0);
+ // this._bucketData.next(data);
}
public buildFileTree(obj: {[key: string]: any}, level: number): TodoItemNode[] {
@@ -132,14 +131,14 @@ export class BucketDataService {
}
});
- };
+ }
public processFolderArray = (acc, curr) => {
const files = curr.object.split('/');
this.processFiles(files, acc, curr);
return acc;
- };
+ }
public convertToFolderTree = (data) => {
const finalData = data.reduce(this.processFolderArray, {});
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 541c8a1..61e3ab2 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,7 +60,7 @@
<p *ngIf="notebook.url?.length">Open following URL(s) in your browser to access this box:</p>
<div class="links_block">
<ng-container *ngFor="let item of notebook.url">
- <span class="d-none" *ngIf="item.description === 'Ungit' && notebook.template_name.toLowerCase().indexOf('deep learning') !== -1; else ungit">
+ <span class="d-none" *ngIf="item.description.toLowerCase() === 'ungit' && notebook.template_name.toLowerCase().indexOf('zeppelin ') !== -1; else ungit">
</span>
<ng-template #ungit>
<p (mouseleave)="hideCopyIcon()">
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 e4d0418..2692c3c 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
@@ -362,7 +362,7 @@ mat-dialog-container {
.bucket-browser{
.mat-form-field-appearance-legacy .mat-form-field-subscript-wrapper {
- width: calc(100% + 77px);
+ width: calc(100% + 85px);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org