From e03f1f2c610ca6af30c8cffcd1aa41d9c7249a2e Mon Sep 17 00:00:00 2001
From: Jason Boyer <JBoyer@equinoxOLI.org>
Date: Mon, 13 Feb 2023 17:08:03 -0500
Subject: [PATCH] LP 2007186: Display org unit type names for perm depths

Use the aout name value rather than the depth value for UI display in
the permission group editor.

Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
---
 .../admin/server/perm-group-map-dialog.component.html |  2 +-
 .../admin/server/perm-group-map-dialog.component.ts   |  1 +
 .../staff/admin/server/perm-group-tree.component.html | 19 ++++++++++---------
 .../staff/admin/server/perm-group-tree.component.ts   |  9 ++++++++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
index 1c2422f3e5..a9d0b4ecf3 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
@@ -24,7 +24,7 @@
       <div class="col-lg-5" i18n>Depth</div>
       <div class="col-lg-7">
         <select [(ngModel)]="depth" class="p-1">
-          <option *ngFor="let d of orgDepths" value="{{d}}">{{d}}</option>
+          <option *ngFor="let d of orgDepths" value="{{d}}">{{depthNames[d]}}</option>
         </select>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts
index 8095a65443..f72b6abe36 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts
@@ -26,6 +26,7 @@ export class PermGroupMapDialogComponent
     @Input() permMaps: IdlObject[];
 
     @Input() orgDepths: number[];
+    @Input() depthNames: string[];
 
     // Note we have all of the permissions on hand, but rendering the
     // full list of permissions can caus sluggishness.  Render async instead.
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
index 02d045f54a..bc6d20745c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
@@ -29,6 +29,7 @@
 <eg-perm-group-map-dialog #addMappingDialog 
   [permGroup]="selected ? selected.callerData : null"
   [orgDepths]="orgDepths"
+  [depthNames]="depthNames"
   [permMaps]="groupPermMaps()" [permissions]="permissions">
 </eg-perm-group-map-dialog>
 
@@ -150,16 +151,16 @@
             </div>
             
             <div class="row font-weight-bold">
-              <div class="col-lg-5" i18n>Permissions</div>
-              <div class="col-lg-4" i18n>Group</div>
-              <div class="col-lg-1" i18n>Depth</div>
+              <div class="col-lg-4" i18n>Permissions</div>
+              <div class="col-lg-3" i18n>Group</div>
+              <div class="col-lg-3" i18n>Depth</div>
               <div class="col-lg-1" i18n>Grantable?</div>
               <div class="col-lg-1" i18n>Delete?</div>
             </div>
 
             <div class="row" *ngFor="let map of groupPermMaps()"
                 [ngClass]="{'bg-warning': map.isdeleted()}">
-              <div class="col-lg-5">
+              <div class="col-lg-4">
                 <span class="label-with-material-icon">
                   <span i18n-title title="{{map.perm().description() || map.perm().code()}}">
                     {{map.perm().code()}}
@@ -171,13 +172,13 @@
                 </span>
               </div>
               <ng-container *ngIf="permIsInherited(map); else nativeMap">
-                <div class="col-lg-4">
+                <div class="col-lg-3">
                   <button class="btn btn-link m-0 p-0"
                     (click)="selectGroup(map.grp().id())">
                     {{map.grp().name()}}
                   </button>
                 </div>
-                <div class="col-lg-1 text-center">{{map.depth()}}</div>
+                <div class="col-lg-3">{{depthNames[map.depth()]}}</div>
                 <div class="col-lg-1 d-flex flex-column justify-content-center">
                   <div class="d-flex justify-content-center p-1 rounded">
                     <eg-bool [value]="map.grantable() === 't'"></eg-bool>
@@ -186,11 +187,11 @@
                 <div class="col-lg-1 font-italic" i18n>Inherited</div>
               </ng-container>
               <ng-template #nativeMap>
-                <div class="col-lg-4">{{map.grp().name()}}</div>
-                <div class="col-lg-1">
+                <div class="col-lg-3">{{map.grp().name()}}</div>
+                <div class="col-lg-3">
                   <select [ngModel]="map.depth()" class="p-1"
                     (ngModelChange)="map.depth($event); map.ischanged(true)">
-                    <option *ngFor="let d of orgDepths" value="{{d}}">{{d}}</option>
+                    <option *ngFor="let d of orgDepths" value="{{d}}">{{depthNames[d]}}</option>
                   </select>
                 </div>
                 <div class="col-lg-1 d-flex flex-column justify-content-center">
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts
index 9e6438cd2d..e4e40462e1 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts
@@ -29,6 +29,7 @@ export class PermGroupTreeComponent implements OnInit {
     permEntries: ComboboxEntry[];
     permMaps: IdlObject[];
     orgDepths: number[];
+    depthNames: string[]; 
     filterText: string;
 
     // Have to fetch quite a bit of data for this UI.
@@ -79,14 +80,20 @@ export class PermGroupTreeComponent implements OnInit {
     }
 
     setOrgDepths() {
-        const depths = this.org.typeList().map(t => Number(t.depth()));
+        const orgTypes = this.org.typeList();
+        const depths = orgTypes.map(t => Number(t.depth()));
         const depths2 = [];
+	const names = [];
         depths.forEach(d => {
             if (!depths2.includes(d)) {
                 depths2.push(d);
             }
         });
         this.orgDepths = depths2.sort();
+	this.orgDepths.forEach( i=> {
+            names.push(orgTypes.filter(t => t.depth() == i).map(t => t.name()).sort().join(","));
+        });
+	this.depthNames = names;
     }
 
     // Returns maps for this group and ancestors
-- 
2.11.0