Decorate server response objects

Set property defaults and match JS variable naming conventions

2 files changed, 11 insertions, 6 deletions

diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 733cee153b5..2c0f9e73e34 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -10,7 +10,7 @@ export default {
   },
   methods: {
     toggleSubGroups() {
-      if (!this.group.subGroups || (this.group.subGroups && !this.group.subGroups.length)) {
+      if (!this.group.hasSubgroups) {
         return;
       }
 
@@ -22,7 +22,7 @@ export default {
 
 <template>
   <li @click="toggleSubGroups" class="list-group-item">
-    <span v-show="group.subGroups && group.subGroups.length">
+    <span v-show="group.hasSubgroups">
       <i
         v-show="group.isOpen"
         class="fa fa-caret-down"
@@ -33,7 +33,7 @@ export default {
         aria-hidden="true"/>
     </span>
 
-    <p><a :href="group.web_url">{{group.full_name}}</a></p>
+    <p><a :href="group.webUrl">{{group.fullName}}</a></p>
     <p>{{group.description}}</p>
 
     <group-folder v-if="group.subGroups && group.isOpen" :groups="group.subGroups" />
diff --git a/app/assets/javascripts/groups/stores/groups_store.js b/app/assets/javascripts/groups/stores/groups_store.js
index 2b74447c7f9..c0ef4f776e0 100644
--- a/app/assets/javascripts/groups/stores/groups_store.js
+++ b/app/assets/javascripts/groups/stores/groups_store.js
@@ -18,9 +18,14 @@ export default class GroupsStore {
   }
 
   static decorateGroup(rawGroup) {
-    const group = rawGroup;
-    group.isOpen = false;
-    return group;
+    return {
+      fullName: rawGroup.name,
+      description: rawGroup.description,
+      webUrl: rawGroup.web_url,
+      parentId: rawGroup.parentId,
+      hasSubgroups: !!rawGroup.parent_id,
+      isOpen: false,
+    };
   }
 
   static toggleSubGroups(toggleGroup) {