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/07/03 14:44:08 UTC
[incubator-dlab] 01/04: [DLAB-831]: prevent project edition for not
active projects
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 0224312dad8a87744e20eedc63fa70475be7519b
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jul 3 14:12:34 2019 +0300
[DLAB-831]: prevent project edition for not active projects
---
.../project/project-list/project-list.component.html | 7 +++++--
.../src/app/resources/resources-grid/resources-grid.component.css | 5 ++++-
services/self-service/src/main/resources/webapp/src/styles.scss | 5 +++--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
index d43d801..0423209 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
@@ -51,8 +51,11 @@
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef class="project-actions"></th>
<td mat-cell *matCellDef="let element" class="project-actions">
- <span (click)="editProject(element)">
- <mat-icon>mode_edit</mat-icon>
+ <span [ngClass]="{'not-active' : element.status.toLowerCase() !== 'active' }">
+ <a [ngClass]="{'not-allowed' : element.status.toLowerCase() !== 'active' }"
+ (click)="element.status.toLowerCase() === 'active' && editProject(element)">
+ <mat-icon>mode_edit</mat-icon>
+ </a>
</span>
<span (click)="deleteProject(element)">
<mat-icon>delete_forever</mat-icon>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
index 406e726..f013f2d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
@@ -149,6 +149,7 @@
.settings {
position: relative;
}
+
.settings .disabled {
opacity: 0.4;
cursor: not-allowed;
@@ -168,12 +169,13 @@
.data-grid .list-menu li {
font-size: 14px;
border-bottom: 1px solid #edf1f5;
- padding: 12px 15px;
+ padding: 8px 15px;
cursor: pointer;
margin: 5px -5px;
color: #577289;
transition: all 0.45s ease-in-out;
}
+
.data-grid .list-menu a.navigate {
text-decoration: none;
color: #577289;
@@ -207,6 +209,7 @@
.data-grid .message_block {
background: #edf6f9;
}
+
.message_block td {
text-align: left !important;
}
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss
index ed72357..5b72b0f 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -104,7 +104,8 @@ mat-chip.mat-chip strong {
.running,
.starting,
-.installed {
+.installed,
+.active {
color: #49af38;
}
@@ -141,7 +142,7 @@ mat-chip.mat-chip strong {
}
.not-active {
- cursor: not-allowed;
+ cursor: not-allowed !important;
opacity: .6;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org