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/01 09:54:09 UTC
[incubator-dlab] branch DLAB-1845 created (now 19f5f09)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1845
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 19f5f09 [DLAB-1845]: Limitation for notebook popup
This branch includes the following new commits:
new 19f5f09 [DLAB-1845]: Limitation for notebook popup
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1845]: Limitation for notebook popup
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1845
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 19f5f094e6cbef834e5e2662d55471a8c0a7d609
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Jun 1 12:53:26 2020 +0300
[DLAB-1845]: Limitation for notebook popup
---
.../management/management-grid/management-grid.component.scss | 1 -
.../management/management-grid/management-grid.component.ts | 3 +++
.../src/app/resources/bucket-browser/bucket-browser.component.ts | 3 ++-
.../resources/exploratory/detail-dialog/detail-dialog.component.html | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
index 37f127d..5d40c3e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
@@ -42,7 +42,6 @@
.type {
width: 14%;
- padding-left: 20px;
}
.resources {
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index 8153f26..796859a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -231,6 +231,9 @@ export class ManagementGridComponent implements OnInit {
}
openNotebookDetails(data) {
+ if (!data.exploratory_urls || !data.exploratory_urls.length) {
+ return;
+ }
this.dialog.open(DetailDialogComponent, { data:
{notebook: data, bucketStatus: {view: true, upload: true, download: true, delete: true}, buckets: [], type: 'environment'},
panelClass: 'modal-lg'
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 a103212..b6dcf0d 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
@@ -292,7 +292,7 @@ export class BucketBrowserComponent implements OnInit {
const uploading = this.addedFiles.filter(v => v.status === 'uploading');
this.isQueueFull = !!waitUploading.length;
this.isFileUploading = !!this.addedFiles.filter(v => v.status === 'uploading').length;
- console.log((this.getTokenValidTime() / 1000 / 60 ).toFixed(0) + ' minutes');
+ // console.log((this.getTokenValidTime() / 1000 / 60 ).toFixed(0) + ' minutes');
if ((this.refreshTokenLimit > this.getTokenValidTime()) && !this.isTokenRefreshing) {
this.refreshToken();
}
@@ -301,6 +301,7 @@ export class BucketBrowserComponent implements OnInit {
file = waitUploading[0];
}
file.status = 'uploading';
+ this.isFileUploading = !!this.addedFiles.filter(v => v.status === 'uploading').length;
this.isQueueFull = !!this.addedFiles.filter(v => v.status === 'waiting').length;
file.subscr = file.request.subscribe((event: any) => {
if (event.type === HttpEventType.UploadProgress) {
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 6b67c40..b757c02 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
@@ -56,7 +56,7 @@
<p>Edge Node IP Address {{notebook.node_ip}}</p>
<p *ngIf="notebook.status === 'running'">Up time {{upTimeInHours}} hour(s) since
{{upTimeSince || "not specified."}}</p>
- <p>Open following URL(s) in your browser to access this box:</p>
+ <p *ngIf="notebook.url?.length">Open following URL(s) in your browser to access this box:</p>
<div class="links_block">
<p *ngFor="let item of notebook.url">
<span class="description">{{item.description}}: </span>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org