From dbe46ae90ca5b2125664c104338799ea7acd21af Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 15 Jun 2017 15:38:22 -0500
Subject: Use groupPath on the client instead of webUrl

---
 app/assets/javascripts/groups/components/group_item.vue | 6 +++---
 app/assets/javascripts/groups/stores/groups_store.js    | 1 +
 spec/javascripts/groups/mock_data.js                    | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 32815b9f73e..b1db34b9c50 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -27,7 +27,7 @@ export default {
         if (this.group.hasSubgroups) {
           eventHub.$emit('toggleSubGroups', this.group);
         } else {
-          window.location.href = this.group.webUrl;
+          window.location.href = this.group.groupPath;
         }
       }
     },
@@ -192,7 +192,7 @@ export default {
       <div
         class="avatar-container s40 hidden-xs">
         <a
-          :href="group.webUrl">
+          :href="group.groupPath">
           <img
             class="avatar s40"
             :src="group.avatarUrl"
@@ -202,7 +202,7 @@ export default {
       <div
         class="title">
         <a
-          :href="group.webUrl">{{fullPath}}</a>
+          :href="group.groupPath">{{fullPath}}</a>
         <template v-if="group.permissions.humanGroupAccess">
         as
         <span class="access-type">{{group.permissions.humanGroupAccess}}</span>
diff --git a/app/assets/javascripts/groups/stores/groups_store.js b/app/assets/javascripts/groups/stores/groups_store.js
index 67ee7d140ce..f6dc4290fd5 100644
--- a/app/assets/javascripts/groups/stores/groups_store.js
+++ b/app/assets/javascripts/groups/stores/groups_store.js
@@ -122,6 +122,7 @@ export default class GroupsStore {
       canEdit: rawGroup.can_edit,
       description: rawGroup.description,
       webUrl: rawGroup.web_url,
+      groupPath: rawGroup.group_path,
       parentId: rawGroup.parent_id,
       visibility: rawGroup.visibility,
       leavePath: rawGroup.leave_path,
diff --git a/spec/javascripts/groups/mock_data.js b/spec/javascripts/groups/mock_data.js
index 1c0ec7a97d0..b3f5d791b89 100644
--- a/spec/javascripts/groups/mock_data.js
+++ b/spec/javascripts/groups/mock_data.js
@@ -6,6 +6,7 @@ const group1 = {
   visibility: 'public',
   avatar_url: null,
   web_url: 'http://localhost:3000/groups/level1',
+  group_path: '/level1',
   full_name: 'level1',
   full_path: 'level1',
   parent_id: null,
@@ -28,6 +29,7 @@ const group14 = {
   visibility: 'public',
   avatar_url: null,
   web_url: 'http://localhost:3000/groups/level1/level2/level3/level4',
+  group_path: '/level1/level2/level3/level4',
   full_name: 'level1 / level2 / level3 / level4',
   full_path: 'level1/level2/level3/level4',
   parent_id: 1127,
@@ -49,6 +51,7 @@ const group2 = {
   visibility: 'public',
   avatar_url: null,
   web_url: 'http://localhost:3000/groups/devops',
+  group_path: '/devops',
   full_name: 'devops',
   full_path: 'devops',
   parent_id: null,
@@ -70,6 +73,7 @@ const group21 = {
   visibility: 'public',
   avatar_url: null,
   web_url: 'http://localhost:3000/groups/devops/chef',
+  group_path: '/devops/chef',
   full_name: 'devops / chef',
   full_path: 'devops/chef',
   parent_id: 1119,
-- 
cgit v1.2.1