From d72b95cfb7a538c9385f373747e3675de8acb980 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Fri, 13 Oct 2017 14:06:25 +0530
Subject: Add support for `archived` param

---
 app/assets/javascripts/groups/components/app.vue        | 9 ++++++---
 app/assets/javascripts/groups/components/groups.vue     | 3 ++-
 app/assets/javascripts/groups/service/groups_service.js | 6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'app/assets/javascripts/groups')

diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index fdec34f5dab..2c0b6ab4ea8 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -43,8 +43,8 @@ export default {
     },
   },
   methods: {
-    fetchGroups({ parentId, page, filterGroupsBy, sortBy, updatePagination }) {
-      return this.service.getGroups(parentId, page, filterGroupsBy, sortBy)
+    fetchGroups({ parentId, page, filterGroupsBy, sortBy, archived, updatePagination }) {
+      return this.service.getGroups(parentId, page, filterGroupsBy, sortBy, archived)
                 .then((res) => {
                   if (updatePagination) {
                     this.updatePagination(res.headers);
@@ -63,6 +63,7 @@ export default {
     fetchAllGroups() {
       const page = getParameterByName('page') || null;
       const sortBy = getParameterByName('sort') || null;
+      const archived = getParameterByName('archived') || null;
       const filterGroupsBy = getParameterByName('filter') || null;
 
       this.isLoading = true;
@@ -71,13 +72,14 @@ export default {
         page,
         filterGroupsBy,
         sortBy,
+        archived,
         updatePagination: true,
       }).then((res) => {
         this.isLoading = false;
         this.updateGroups(res, Boolean(filterGroupsBy));
       });
     },
-    fetchPage(page, filterGroupsBy, sortBy) {
+    fetchPage(page, filterGroupsBy, sortBy, archived) {
       this.isLoading = true;
 
       // eslint-disable-next-line promise/catch-or-return
@@ -85,6 +87,7 @@ export default {
         page,
         filterGroupsBy,
         sortBy,
+        archived,
         updatePagination: true,
       }).then((res) => {
         this.isLoading = false;
diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue
index d3482818183..75a2bf34887 100644
--- a/app/assets/javascripts/groups/components/groups.vue
+++ b/app/assets/javascripts/groups/components/groups.vue
@@ -29,7 +29,8 @@ export default {
     change(page) {
       const filterGroupsParam = getParameterByName('filter_groups');
       const sortParam = getParameterByName('sort');
-      eventHub.$emit('fetchPage', page, filterGroupsParam, sortParam);
+      const archivedParam = getParameterByName('archived');
+      eventHub.$emit('fetchPage', page, filterGroupsParam, sortParam, archivedParam);
     },
   },
 };
diff --git a/app/assets/javascripts/groups/service/groups_service.js b/app/assets/javascripts/groups/service/groups_service.js
index 1393c96aed6..639410384c2 100644
--- a/app/assets/javascripts/groups/service/groups_service.js
+++ b/app/assets/javascripts/groups/service/groups_service.js
@@ -8,7 +8,7 @@ export default class GroupsService {
     this.groups = Vue.resource(endpoint);
   }
 
-  getGroups(parentId, page, filterGroups, sort) {
+  getGroups(parentId, page, filterGroups, sort, archived) {
     const data = {};
 
     if (parentId) {
@@ -26,6 +26,10 @@ export default class GroupsService {
       if (sort) {
         data.sort = sort;
       }
+
+      if (archived) {
+        data.archived = archived;
+      }
     }
 
     return this.groups.get(data);
-- 
cgit v1.2.3