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/03/12 09:43:50 UTC
[incubator-dlab] branch DLAB-1618 updated (5f9db95 -> 3574656)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1618
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 5f9db95 [DLAB-1618]: Adjusted role page according to requirements
new 0d89077 [DLAB-1618]: Adjusted role page according to requirements
new 3574656 [DLAB-1618]: bugfix
The 2 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.
Summary of changes:
.../management-grid/management-grid.component.html | 3 ++-
.../app/administration/roles/roles.component.ts | 8 +++++--
.../computational-resources-list.component.scss | 25 +++++++++++-----------
3 files changed, 21 insertions(+), 15 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1618]: bugfix
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1618
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3574656a2dbfc4beec844390d894f7f85c4b914e
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Mar 12 11:42:45 2020 +0200
[DLAB-1618]: bugfix
---
.../resources/webapp/src/app/administration/roles/roles.component.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
index 00d24cf..d73ef57 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
@@ -130,7 +130,7 @@ export class RolesComponent implements OnInit {
} else if (action === 'update') {
const currGroupSource = this.startedGroups.filter(cur => cur.group === item.group)[0];
let deletedUsers = currGroupSource.users.filter(user => {
- if (item.users && item.users.includes(user)) {
+ if (item.users.includes(user)) {
return false;
}
return true;
@@ -172,7 +172,6 @@ export class RolesComponent implements OnInit {
case 'update':
this.rolesService.updateGroup($event.value).subscribe(res => {
this.toastr.success(`Group data is updated successfully!`, 'Success!');
- // this.getGroupsData();
}, () => this.toastr.error('Failed group data updating!', 'Oops!'));
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1618]: Adjusted role page according
to requirements
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1618
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0d89077b8d6e80b9ae310e99b1e27dcae035257e
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Mar 12 11:40:24 2020 +0200
[DLAB-1618]: Adjusted role page according to requirements
---
.../management-grid/management-grid.component.html | 3 ++-
.../app/administration/roles/roles.component.ts | 11 +++++++---
.../computational-resources-list.component.scss | 25 +++++++++++-----------
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 1f6c55e..631e7ae 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -77,7 +77,8 @@
<span [hidden]="filtering && filterForm.statuses.length > 0 && !collapsedFilterRow">more_vert</span>
</i>
</button> </th>
- <td mat-cell *matCellDef="let element" class="ani status" ngClass="{{element.status || ''}}">{{ element.status }}
+ <td mat-cell *matCellDef="let element" class="ani status" >
+ <span ngClass="{{element.status || ''}}">{{ element.status }}</span>
</td>
</ng-container>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
index dd584dd..00d24cf 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
@@ -130,7 +130,7 @@ export class RolesComponent implements OnInit {
} else if (action === 'update') {
const currGroupSource = this.startedGroups.filter(cur => cur.group === item.group)[0];
let deletedUsers = currGroupSource.users.filter(user => {
- if (item.users.includes(user)) {
+ if (item.users && item.users.includes(user)) {
return false;
}
return true;
@@ -172,7 +172,7 @@ export class RolesComponent implements OnInit {
case 'update':
this.rolesService.updateGroup($event.value).subscribe(res => {
this.toastr.success(`Group data is updated successfully!`, 'Success!');
- this.getGroupsData();
+ // this.getGroupsData();
}, () => this.toastr.error('Failed group data updating!', 'Oops!'));
break;
@@ -203,7 +203,12 @@ export class RolesComponent implements OnInit {
}
public updateGroupData(groups) {
- this.groupsData = groups.map(v => v).sort((a, b) => (a.group > b.group) ? 1 : ((b.group > a.group) ? -1 : 0));
+ this.groupsData = groups.map(v => {
+ if (!v.users) {
+ v.users = [];
+ }
+ return v;
+ }).sort((a, b) => (a.group > b.group) ? 1 : ((b.group > a.group) ? -1 : 0));
this.groupsData.forEach(item => {
item.selected_roles = item.roles.map(role => ({role: role.description, type: role.type}));
});
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..a4b825e 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,21 @@
}
}
@media screen and (max-width: 1520px) {
- .source {
-
- .resource-wrap {
-
- .resource-name {
- width: 45%;
- }
+ .resources,
+ managment {
+ .source {
+ .resource-wrap {
+ .resource-name {
+ width: 45%;
+ }
- .resource-status {
- width: 40%;
- }
+ .resource-status {
+ width: 40%;
+ }
- .resource-actions {
- width: 15%;
+ .resource-actions {
+ width: 15%;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org