Build tree object from endpoint response

1 files changed, 12 insertions, 7 deletions

diff --git a/app/assets/javascripts/groups/index.js b/app/assets/javascripts/groups/index.js
index d136e64850f..5b94f7b762d 100644
--- a/app/assets/javascripts/groups/index.js
+++ b/app/assets/javascripts/groups/index.js
@@ -31,19 +31,24 @@ $(() => {
       };
     },
     methods: {
-      fetchGroups() {
-        service.getGroups()
+      fetchGroups(parentGroup) {
+        let parentId = null;
+
+        if (parentGroup) {
+          parentId = parentGroup.id;
+        }
+
+        service.getGroups(parentId)
           .then((response) => {
-            store.setGroups(response.json());
+            store.setGroups(response.json(), parentGroup);
           })
           .catch(() => {
             // TODO: Handler error
           });
       },
-      toggleSubGroups(group) {
-        GroupsStore.toggleSubGroups(group);
-
-        this.fetchGroups();
+      toggleSubGroups(parentGroup = null) {
+        GroupsStore.toggleSubGroups(parentGroup);
+        this.fetchGroups(parentGroup);
       },
     },
     created() {