This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch DLAB-384
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 4aa4e44370f1e8996e8cd00434b0892c8820b104
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Wed Mar 4 14:14:42 2020 +0200

    [DLAB-384]: Added grouped role list to group creation
---
 .../app/administration/roles/roles.component.html  | 59 +++++++++++++---------
 .../app/administration/roles/roles.component.scss  | 10 +++-
 .../resources/webapp/src/assets/styles/_theme.scss |  6 +++
 3 files changed, 48 insertions(+), 27 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
index 5015d7a..ac3f1d7 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
@@ -62,31 +62,40 @@
         <ng-template matStepLabel>Roles</ng-template>
         <div class="inner-step mat-reset roles">
           <div class="selector-wrapper">
-            <mat-form-field>
-              <mat-select
-                multiple [compareWith]="compareObjects"
-                name="roles"
-                [(value)]="setupRoles"
-                disableOptionCentering
-                placeholder="Select roles"
-                panelClass="select-role"
-              >
-                <mat-option class="multiple-select" disabled>
-                  <a class="select ani" (click)="selectAllOptions(setupRoles, 
rolesList)">
-                    <i class="material-icons">playlist_add_check</i>&nbsp;All
-                  </a>
-                  <a class="deselect ani" 
(click)="selectAllOptions(setupRoles)">
-                    <i class="material-icons">clear</i>&nbsp;None
-                  </a>
-                </mat-option>
-                <mat-option *ngFor="let role of rolesList" [value]="role">
-                  {{ role }}
-                </mat-option>
-              </mat-select>
-              <button class="caret">
-                <i class="material-icons">keyboard_arrow_down</i>
-              </button>
-            </mat-form-field>
+            <multi-level-select-dropdown
+              (selectionChange)="onUpdate($event)"
+              name="roles"
+              [items]="rolesList"
+              [model]="setupRoles"
+            >
+ <!--           [type]="element.group" -->
+            </multi-level-select-dropdown>
+<!--            <mat-form-field>-->
+
+<!--              <mat-select-->
+<!--                multiple [compareWith]="compareObjects"-->
+<!--                name="roles"-->
+<!--                -->
+<!--                disableOptionCentering-->
+<!--                placeholder="Select roles"-->
+<!--                panelClass="select-role"-->
+<!--              >-->
+<!--                <mat-option class="multiple-select" disabled>-->
+<!--                  <a class="select ani" 
(click)="selectAllOptions(setupRoles, rolesList)">-->
+<!--                    <i 
class="material-icons">playlist_add_check</i>&nbsp;All-->
+<!--                  </a>-->
+<!--                  <a class="deselect ani" 
(click)="selectAllOptions(setupRoles)">-->
+<!--                    <i class="material-icons">clear</i>&nbsp;None-->
+<!--                  </a>-->
+<!--                </mat-option>-->
+<!--                <mat-option *ngFor="let role of rolesList" 
[value]="role">-->
+<!--                  {{ role }}-->
+<!--                </mat-option>-->
+<!--              </mat-select>-->
+<!--              <button class="caret">-->
+<!--                <i class="material-icons">keyboard_arrow_down</i>-->
+<!--              </button>-->
+<!--            </mat-form-field>-->
           </div>
         </div>
         <div class="text-center m-bott-10">
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
 
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
index 254d8dd..f2c10d8 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.scss
@@ -88,17 +88,23 @@
   }
 }
 
+.mat-horizontal-content-container{
+  overflow: visible !important;
+}
+
 .selector-wrapper {
   display: flex;
   align-self: center;
   width: 490px;
   height: 36px;
-  padding-left: 10px;
+  padding-left: 0;
   font-family: 'Open Sans', sans-serif;
   font-size: 15px;
   font-weight: 300;
   box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 
0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
-
+  multi-level-select-dropdown{
+    width: 100%;
+  }
   mat-form-field {
     width: 100%;
 
diff --git 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 380aa75..292ba70 100644
--- 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -658,3 +658,9 @@ mat-progress-bar {
     background-color: #baf0f7;
   }
 }
+.manage-roles{
+  .mat-horizontal-content-container{
+    overflow: visible !important;
+  }
+}
+


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to