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/02/27 11:19:37 UTC
[incubator-dlab] branch odahu-integration updated: Small fixes
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 032c5ca Small fixes
new a4d320a Merge remote-tracking branch 'origin/odahu-integration' into odahu-integration
032c5ca is described below
commit 032c5caf87eb92aebc6ba236191de9eab681abdb
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Feb 27 13:16:29 2020 +0200
Small fixes
---
.../resources/webapp/src/app/app.routing.module.ts | 2 +-
.../computational-resources-list.component.scss | 24 +++++++++++-----------
.../detail-dialog/detail-dialog.component.html | 4 ++--
.../detail-dialog/detail-dialog.component.ts | 12 +++++------
.../resources-grid/resources-grid.component.ts | 1 -
.../resources-grid/resources-grid.model.ts | 7 ++++++-
.../src/app/shared/navbar/navbar.component.html | 2 +-
7 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
index 912f4dc..9afd6a5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
@@ -62,7 +62,7 @@ const routes: Routes = [{
canActivate: [AuthorizationGuard, AdminGuard],
},
{
- path: 'legion-deployment',
+ path: 'odahu',
component: LegionDeploymentComponent,
canActivate: [AuthorizationGuard,],
}, {
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
index 9314137..e55ab94 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
@@ -110,20 +110,20 @@
}
}
@media screen and (max-width: 1520px) {
- .source {
-
- .resource-wrap {
-
- .resource-name {
- width: 45%;
- }
+ resources-grid {
+ .source {
+ .resource-wrap {
+ .resource-name {
+ width: 45%;
+ }
- .resource-status {
- width: 40%;
- }
+ .resource-status {
+ width: 40%;
+ }
- .resource-actions {
- width: 15%;
+ .resource-actions {
+ width: 15%;
+ }
}
}
}
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 f1e814e..86ab42a 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
@@ -133,10 +133,10 @@
<div class="legion-info" *ngIf="data.legion">
<div class="content-box">
<div class="detail-info" *ngIf="!legion.error_message">
- <div class="links_block">
+ <div class="links_block">
<p *ngFor="let url of legion.url">
<span class="description">{{url.description}}: </span>
- <a class="ellipsis" matTooltip=" http://172.31.48.131:8080/" matTooltipPosition="above" href=" http://172.31.48.131:8080/"
+ <a class="ellipsis" matTooltip="{{ url.url}}" matTooltipPosition="above" href="{{ url.url}}"
target="_blank">{{ url.url}}
</a>
</p>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
index bb37f7b..c827bd7 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
@@ -35,7 +35,7 @@ import { CLUSTER_CONFIGURATION } from '../../computational/computational-resourc
export class DetailDialogComponent implements OnInit {
readonly DICTIONARY = DICTIONARY;
- readonly PROVIDER = this.data.cloud_provider;
+ public PROVIDER: string;
notebook: any;
upTimeInHours: number;
upTimeSince: string = '';
@@ -54,19 +54,19 @@ export class DetailDialogComponent implements OnInit {
public dialogRef: MatDialogRef<DetailDialogComponent>,
public toastr: ToastrService
) {
- if(data.notebook){
+ if(data.notebook) {
this.notebook = data.notebook;
+ this.PROVIDER = this.data.notebook.cloud_provider;
}
- if(data.legion){
+ if(data.legion) {
this.legion = data.legion;
+ this.PROVIDER = this.data.legion.cloud_provider || 'azure';
}
}
ngOnInit() {
- this.notebook;
-
- if (this.notebook) {
+ if (this.notebook) {
this.tooltip = false;
this.upTimeInHours = (this.notebook.time) ? DateUtils.diffBetweenDatesInHours(this.notebook.time) : 0;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index 4850f99..ce14e87 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -106,7 +106,6 @@ export class ResourcesGridComponent implements OnInit {
this.userResourceService.getUserProvisionedResources()
.subscribe((result: any) => {
this.environments = ExploratoryModel.loadEnvironments(result);
- console.log("env " + JSON.stringify(this.environments));
this.getDefaultFilterConfiguration();
(this.environments.length) ? this.getUserPreferences() : this.filteredEnvironments = [];
this.healthStatus && !this.healthStatus.billingEnabled && this.modifyGrid();
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 dfd35f6..74fb326 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
@@ -93,7 +93,12 @@ export class ExploratoryModel {
});
const odahu = value.odahu.map(el => {
- let provider = "azure";
+ let provider;
+ if (el.cloud_provider) {
+ provider = el.cloud_provider.toLowerCase();
+ } else {
+ provider = 'azure';
+ }
return new ExploratoryModel(
provider,
el.name,
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index cb0c935..1b6dc05 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -88,7 +88,7 @@
<span *ngIf="isExpanded; else projects">Projects</span>
<ng-template #projects><i class="material-icons">dns</i></ng-template>
</a>
- <a class="sub-nav-item" [style.margin-left.px]="isExpanded ? '30' : '0'" [routerLink]="['/legion-deployment']"
+ <a class="sub-nav-item" [style.margin-left.px]="isExpanded ? '30' : '0'" [routerLink]="['/odahu']"
[routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
<span *ngIf="isExpanded; else legion">Odahu deployment</span>
<ng-template #legion><i class="material-icons">get_app</i></ng-template>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org