1 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/groups/stores/groups_store.js b/app/assets/javascripts/groups/stores/groups_store.js
index 6eab6083e8f..e790c420ee2 100644
--- a/app/assets/javascripts/groups/stores/groups_store.js
+++ b/app/assets/javascripts/groups/stores/groups_store.js
@@ -59,7 +59,7 @@ export default class GroupsStore {
         const findParentGroup = mappedGroups[`id${currentGroup.parentId}`];
         if (findParentGroup) {
           mappedGroups[`id${currentGroup.parentId}`].subGroups[`id${currentGroup.id}`] = currentGroup;
-          mappedGroups[`id${currentGroup.parentId}`].isOpen = true; // Expand group if it has subgroups
+          mappedGroups[`id${currentGroup.parentId}`].isOpen = false; // Keep group always collapsed
         } else if (parentGroup && parentGroup.id === currentGroup.parentId) {
           tree[`id${currentGroup.id}`] = currentGroup;
         } else {
@@ -93,7 +93,7 @@ export default class GroupsStore {
            currentOrphan.id !== group.id
            ) {
             group.subGroups[currentOrphan.id] = currentOrphan;
-            group.isOpen = true;
+            group.isOpen = false;
             currentOrphan.isOrphan = true;
             found = true;
 
@@ -120,7 +120,7 @@ export default class GroupsStore {
   }
 
   decorateGroups(rawGroups) {
-    this.groups = rawGroups.map(this.decorateGroup);
+    this.groups = rawGroups.map(this.decorateGroup.bind(this));
     return this.groups;
   }
 
@@ -132,7 +132,7 @@ export default class GroupsStore {
       fullPath: rawGroup.full_path,
       avatarUrl: rawGroup.avatar_url,
       name: rawGroup.name,
-      hasSubgroups: rawGroup.has_subgroups,
+      hasSubgroups: rawGroup.subgroup_count > 0,
       canEdit: rawGroup.can_edit,
       description: rawGroup.description,
       webUrl: rawGroup.web_url,
@@ -149,6 +149,9 @@ export default class GroupsStore {
         humanGroupAccess: rawGroup.permissions.human_group_access,
       },
       subGroups: {},
+      projectCount: rawGroup.project_count,
+      subGroupCount: rawGroup.subgroup_count,
+      projects: rawGroup.projects,
     };
   }