This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2d6e73dffc422ee05ce9574a5bb14a85c95450c2
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Mon Jun 24 13:52:53 2019 +0300
[DLAB-787]: added private notebook ip as terminal parameter
---
.../computational-resource-create-dialog.component.ts | 7 +++++--
.../exploratory/detail-dialog/detail-dialog.component.html | 4 ++--
.../src/app/resources/resources-grid/resources-grid.component.html | 2 +-
.../src/app/resources/resources-grid/resources-grid.model.ts | 4 +++-
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
index bb62ca2..761ca2e 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
@@ -78,6 +78,9 @@ export class ComputationalResourceCreateDialogComponent
implements OnInit {
public selectImage($event) {
this.selectedImage = $event;
this.getComputationalResourceLimits();
+
+ if ($event.templates)
+
this.resourceForm.controls['version'].setValue($event.templates[0].version)
}
public selectSpotInstances($event?): void {
@@ -238,10 +241,10 @@ export class ComputationalResourceCreateDialogComponent
implements OnInit {
if (this.selectedImage) {
this.getComputationalResourceLimits();
- this.filterShapes();
+ this.filterShapes();
this.resourceForm.get('template_name').setValue(this.selectedImage.template_name);
}
- }, error => {});
+ }, error => { });
}
private filterShapes(): void {
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 fce60ad..d514787 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
@@ -41,7 +41,7 @@
<div class="scroll-box" id="scrolling">
<div class="detail-info" *ngIf="!notebook.error_message">
- <p>Edge Node IP Address {{notebook.ip}}</p>
+ <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>
@@ -123,4 +123,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 6940685..840fcd6 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -152,7 +152,7 @@
<span>Manage libraries</span>
</li>
<li>
- <a target="_blank" [routerLink]="['/terminal', env.ip]"
class="navigate">
+ <a target="_blank" [attr.href]="'/#/terminal/' + env.private_ip"
class="navigate">
<i class="material-icons">laptop</i>
<span>Open terminal</span>
</a>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
index b60d13a..f1c83f3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
@@ -30,7 +30,8 @@ export class ExploratoryModel {
public resources: Array<any>,
public time: string,
public url: Array<any>,
- public ip: string,
+ public node_ip: string,
+ public private_ip: string,
public username: string,
public password: string,
public bucket_name: string,
@@ -62,6 +63,7 @@ export class ExploratoryModel {
value.up_time,
value.exploratory_url,
sharedDataList.edge_node_ip,
+ value.private_ip,
value.exploratory_user,
value.exploratory_pass,
sharedDataList[DICTIONARY.bucket_name],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
