Change is-expandable to has-subgroups

2 files changed, 6 insertions, 5 deletions

diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index e7efad877fd..8b2b1c78a5c 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -14,7 +14,7 @@ export default {
   },
   methods: {
     toggleSubGroups(e) {
-      if (e.target.tagName === 'A' || !this.isExpandable) {
+      if (e.target.tagName === 'A' || !this.hasSubgroups ) {
         return false;
       }
 
@@ -29,12 +29,13 @@ export default {
       return {
         'group-row': true,
         'is-open': this.group.isOpen,
-        'is-expandable': this.isExpandable,
+        'has-subgroups': this.hasSubgroups,
         'no-description': !this.group.description,
       };
     },
-    isExpandable() {
-      return Object.keys(this.group.subGroups).length > 0;
+    hasSubgroups() {
+      // TODO: Server should send a flag to indicate group will have subgroups
+      return true;
     },
     fullPath() {
       let fullPath = '';
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 0b1e97f67a1..94d48469d2c 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -290,7 +290,7 @@ ul.indent-list {
     width: 20px;
   }
 
-  > .group-row:not(.is-expandable) {
+  > .group-row:not(.has-subgroups) {
     .folder-caret .fa {
       opacity: 0;
     }