You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/12/02 14:25:31 UTC
[incubator-dlab] 02/02: [DLAB-1341]: changed endpoint actions
confirmation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1341
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 97c896c52b6cb3a945bb2dd2390069bc63e1c8bd
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Dec 2 16:25:13 2019 +0200
[DLAB-1341]: changed endpoint actions confirmation
---
.../project/project-list/project-list.component.ts | 4 +---
.../src/app/administration/project/project.component.ts | 1 +
.../computational-resources-list.component.scss | 1 +
.../notification-dialog/notification-dialog.component.ts | 12 ++++++++----
.../main/resources/webapp/src/assets/styles/_dialogs.scss | 9 +++------
.../main/resources/webapp/src/assets/styles/_variables.scss | 4 +++-
6 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
index f7235e6..ddc5acb 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
@@ -23,7 +23,6 @@ import { MatTableDataSource } from '@angular/material/table';
import { Subscription } from 'rxjs';
import { ProjectDataService } from '../project-data.service';
-import { ProjectService } from '../../../core/services';
import { Project, Endpoint } from '../project.component';
import { CheckUtils } from '../../../core/util';
@@ -46,8 +45,7 @@ export class ProjectListComponent implements OnInit, OnDestroy {
constructor(
public toastr: ToastrService,
- private projectDataService: ProjectDataService,
- private projectService: ProjectService
+ private projectDataService: ProjectDataService
) { }
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index 762a004..a14969d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -120,6 +120,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
this.dialog.open(NotificationDialogComponent, {
data: {
type: 'confirmation',
+ template: `Endpoint <b>${$event.endpoint.name}</b> will be ${$event.action === 'stop' ? 'stopped' : 'terminated'}`,
item: $event.endpoint, action: $event.action === 'stop' ? 'stopped' : 'terminated'
}, panelClass: 'modal-sm'
})
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 1fa5923..f80009f 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
@@ -67,6 +67,7 @@
.schedule {
cursor: pointer;
+ margin-top: 5px;
&.not-allowed {
pointer-events: none;
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index 8e673c1..c14dfed 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -49,10 +49,15 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
</div>
<div *ngIf="data.type === 'message'"><span [innerHTML]="data.template"></span></div>
<div *ngIf="data.type === 'confirmation'" class="confirm-dialog">
- <p>
- <span class="ellipsis label-name strong" matTooltip="{{ data.item.name }}" matTooltipPosition="above" [matTooltipDisabled]="data.item.name.length > 35">
- {{ data.item.name }}</span> will be {{ data.action || 'decommissioned' }}.
+ <p *ngIf="data.template; else label">
+ <span [innerHTML]="data.template"></span>
</p>
+ <ng-template #label>
+ <p>
+ <span class="ellipsis label-name strong" matTooltip="{{ data.item.name }}" matTooltipPosition="above" [matTooltipDisabled]="data.item.name.length > 35">
+ {{ data.item.name }}</span> will be {{ data.action || 'decommissioned' }}.
+ </p>
+ </ng-template>
<mat-list class="endpoints-list" *ngIf="data.item.endpoints?.length">
<mat-list-item class="list-header">
<div class="endpoint">Endpoint</div>
@@ -96,6 +101,5 @@ export class NotificationDialogComponent {
@Inject(MAT_DIALOG_DATA) public data: any
) {
console.log(data);
-
}
}
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 bf9eb33..4ba6167 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
@@ -320,14 +320,11 @@ mat-dialog-container {
}
}
-.strong{
+.strong {
font-weight: 600;
- color: #455c74;
+ color: $middle-grey-color;
}
-.flex{
+.flex {
display: flex;
}
-
-
-
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
index 538128b..b761c27 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
@@ -20,4 +20,6 @@
$modal-text-color: #718aa5;
$modal-header-color: #f6fafe;
-$brand-color: #4ab8dc;
\ No newline at end of file
+$brand-color: #4ab8dc;
+$middle-grey-color: #607d8b;
+$dark-grey-color: #455c74;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org