Merge pull request #6690 from ralphmensah/feature-6048

6048:should filter out removed users by default
finos · Aug 7, 2023 · 766e593 · 766e593
2 parents ea27b96 + 0adf57f
commit 766e593
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/waltz-ng/client/involvement/components/involved-people-section.html b/waltz-ng/client/involvement/components/involved-people-section.html
@@ -59,6 +59,14 @@
                     label-off="Showing all involvements (including inherited)">
                 </waltz-toggle>
             </div>
+            <div style="padding-top: 1em">
+                <waltz-toggle
+                    state="$ctrl.showRemovedPeople"
+                    on-toggle="$ctrl.onHiddenPeople()"
+                    label-on="Hide removed people"
+                    label-off="Show removed people">
+                </waltz-toggle>
+            </div>
         </div>
 
         <div ng-if="$ctrl.gridData.length > 0">

diff --git a/waltz-ng/client/involvement/components/involved-people-section.js b/waltz-ng/client/involvement/components/involved-people-section.js
@@ -76,7 +76,8 @@ const initialState = {
     showDirectOnly: true,
     visibility: {
         editor: false
-    }
+    },
+    showRemovedPeople: false
 };
 
 
@@ -145,7 +146,10 @@ function controller($q, displayNameService, descriptionService, serviceBroker, i
             ? vm.aggDirectInvolvements
             : vm.aggInvolvements;
 
-        vm.gridData = mkGridData(involvements, displayNameService, descriptionService);
+        const updatedGridData = mkGridData(involvements, displayNameService, descriptionService);
+        vm.gridData = vm.showRemovedPeople ?
+            updatedGridData:
+            updatedGridData.filter( d =>  d.person.isRemoved === vm.showRemovedPeople);
     }
 
     const refresh = () => {
@@ -226,6 +230,10 @@ function controller($q, displayNameService, descriptionService, serviceBroker, i
         vm.showDirectOnly = !vm.showDirectOnly;
         refreshGridData();
     }
+    vm.onHiddenPeople= ()=>{
+        vm.showRemovedPeople = !vm.showRemovedPeople;
+        refreshGridData();
+    }
 }