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/23 08:22:49 UTC
[incubator-dlab] 01/01: [DLAB-1638]: Done set of tasks after
improvement for roles
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1638
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c424dfc6245bac300d5cccc0e39cc8cd546a4791
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Mar 23 10:22:05 2020 +0200
[DLAB-1638]: Done set of tasks after improvement for roles
---
.../webapp/src/app/administration/roles/roles.component.ts | 9 +++++----
.../multi-level-select-dropdown.component.ts | 3 ++-
.../notification-dialog/notification-dialog.component.ts | 14 +++++++-------
3 files changed, 14 insertions(+), 12 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 d73ef57..11cd9ca 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
@@ -76,10 +76,10 @@ export class RolesComponent implements OnInit {
this.roles = roles;
this.rolesList = roles.map((role, index) => {
return {role: role.description, type: role.type};
- });
+ })
+ this.rolesList = this.rolesList.sort((a, b) => (a.type > b.type) ? 1 : ((b.type > a.type) ? -1 : 0));
+ this.updateGroupData(groups);
- this.updateGroupData(groups);
- this.getGroupsListCopy();
this.stepperView = false;
},
error => this.toastr.error(error.message, 'Oops!'));
@@ -150,7 +150,6 @@ export class RolesComponent implements OnInit {
users: item.users || []
}
});
- this.openManageRolesDialog();
}
deletedUsers = [];
});
@@ -172,6 +171,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.openManageRolesDialog();
}, () => this.toastr.error('Failed group data updating!', 'Oops!'));
break;
@@ -211,6 +211,7 @@ export class RolesComponent implements OnInit {
this.groupsData.forEach(item => {
item.selected_roles = item.roles.map(role => ({role: role.description, type: role.type}));
});
+ this.getGroupsListCopy();
}
private getGroupsListCopy() {
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
index fe8b36a..7d160fb 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
@@ -37,7 +37,8 @@ export class MultiLevelSelectDropdownComponent {
public labels = {
COMPUTATIONAL_SHAPE: 'Compute shapes',
- NOTEBOOK_SHAPE: 'Notebook shape'
+ NOTEBOOK_SHAPE: 'Notebook shapes',
+ COMPUTATIONAL: 'Compute'
};
toggleSelectedOptions($event, model, value) {
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 f0c7910..6b66ce4 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
@@ -80,12 +80,12 @@ import {Endpoint} from '../../../administration/project/project.component';
</div>
</div>
</div>
- <div class="confirm-resource-terminating">
- <label>
- <input class="checkbox" type="checkbox"
- (change)="terminateResource()"/>Do not terminate all related resources
- </label>
- </div>
+<!-- <div class="confirm-resource-terminating">-->
+<!-- <label>-->
+<!-- <input class="checkbox" type="checkbox"-->
+<!-- (change)="terminateResource()"/>Do not terminate all related resources-->
+<!-- </label>-->
+<!-- </div>-->
<p class="confirm-message">
<span *ngIf="!willNotTerminate">All connected computational resources will be terminated as well.</span>
</p>
@@ -137,7 +137,7 @@ import {Endpoint} from '../../../administration/project/project.component';
.resource-list-header{display: flex; font-weight: 600; font-size: 16px;height: 48px; border-top: 1px solid #edf1f5; border-bottom: 1px solid #edf1f5; padding: 0 20px;}
.resource-list-row{display: flex; border-bottom: 1px solid #edf1f5;padding: 0 20px;}
.confirm-resource-terminating{text-align: left; padding: 10px 20px;}
- .confirm-message{color: #ef5c4b;font-size: 13px;min-height: 18px; text-align: center;}
+ .confirm-message{color: #ef5c4b;font-size: 13px;min-height: 18px; text-align: center; padding-top: 20px}
.checkbox{margin-right: 5px;vertical-align: middle; margin-bottom: 3px;}
label{cursor: pointer}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org