Merge pull request #3684 from uselagoon/usergroup-subgroups

fix: only set the subgroups of a parentgroup to the users group
uselagoon · Mar 25, 2024 · 9f0a171 · 9f0a171
2 parents db06e2c + 4833e6b
commit 9f0a171
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/services/api/src/models/user.ts b/services/api/src/models/user.ts
@@ -336,6 +336,8 @@ export const User = (clients: {
             continue
           }
         }
+        // only set the users role-group as the subgroup, this is because `loadGroupByName` retrieves all the subgroups not just the one the user is in
+        parentGroup.subGroups = [ug]
         userGroups.push(parentGroup);
       }
     }

diff --git a/services/api/src/resources/group/helpers.ts b/services/api/src/resources/group/helpers.ts
@@ -41,6 +41,9 @@ export const Helpers = (sqlClientPool: Pool) => {
                 for (const o in groups) {
                   projectGroups.push(await models.GroupModel.loadGroupById(groups[o]))
                 }
+                projectGroups.sort(function(a, b) {
+                    return a.name.localeCompare(b.name);
+                });
                 return projectGroups
             }
             return []
@@ -57,6 +60,9 @@ export const Helpers = (sqlClientPool: Pool) => {
                 for (const o in groups) {
                     orgGroups.push(await models.GroupModel.loadGroupById(groups[o]))
                 }
+                orgGroups.sort(function(a, b) {
+                    return a.name.localeCompare(b.name);
+                });
                 return orgGroups
             }
             return []