From 435458d2b14eadd1768b7b0a14f5966633f02f83 Mon Sep 17 00:00:00 2001
From: Sam Rose <sam@gitlab.com>
Date: Mon, 6 Mar 2017 00:03:21 -0500
Subject: [PATCH] Update API on frontend to use v4

Use options object to pass params for project endpoint
---
 app/assets/javascripts/api.js            | 10 +++++-----
 app/assets/javascripts/project_select.js |  4 ++--
 app/assets/javascripts/search.js         |  2 +-
 app/views/help/ui.html.haml              |  2 +-
 lib/gitlab/gon_helper.rb                 |  2 +-
 spec/javascripts/project_title_spec.js   |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index a0946eb392a..e5f36c84987 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -51,15 +51,15 @@ var Api = {
     });
   },
   // Return projects list. Filtered by query
-  projects: function(query, order, callback) {
+  projects: function(query, options, callback) {
     var url = Api.buildUrl(Api.projectsPath);
     return $.ajax({
       url: url,
-      data: {
+      data: $.extend({
         search: query,
-        order_by: order,
-        per_page: 20
-      },
+        per_page: 20,
+        membership: true
+      }, options),
       dataType: "json"
     }).done(function(projects) {
       return callback(projects);
diff --git a/app/assets/javascripts/project_select.js b/app/assets/javascripts/project_select.js
index f80e765ce30..3c1c1e7dceb 100644
--- a/app/assets/javascripts/project_select.js
+++ b/app/assets/javascripts/project_select.js
@@ -35,7 +35,7 @@
             if (this.groupId) {
               return Api.groupProjects(this.groupId, term, projectsCallback);
             } else {
-              return Api.projects(term, orderBy, projectsCallback);
+              return Api.projects(term, { order_by: orderBy }, projectsCallback);
             }
           },
           url: function(project) {
@@ -84,7 +84,7 @@
               if (_this.groupId) {
                 return Api.groupProjects(_this.groupId, query.term, projectsCallback);
               } else {
-                return Api.projects(query.term, _this.orderBy, projectsCallback);
+                return Api.projects(query.term, { order_by: _this.orderBy }, projectsCallback);
               }
             };
           })(this),
diff --git a/app/assets/javascripts/search.js b/app/assets/javascripts/search.js
index e66418beeab..15f5963353a 100644
--- a/app/assets/javascripts/search.js
+++ b/app/assets/javascripts/search.js
@@ -47,7 +47,7 @@
           fields: ['name']
         },
         data: function(term, callback) {
-          return Api.projects(term, 'id', function(data) {
+          return Api.projects(term, { order_by: 'id' }, function(data) {
             data.unshift({
               name_with_namespace: 'Any'
             });
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index 87f9b503989..1fb2c6271ad 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -410,7 +410,7 @@
     :javascript
       $('#js-project-dropdown').glDropdown({
         data: function (term, callback) {
-          Api.projects(term, "last_activity_at", function (data) {
+          Api.projects(term, { order_by: 'last_activity_at' }, function (data) {
             callback(data);
           });
         },
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 6c275a8d5de..5ab84266b7d 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -1,7 +1,7 @@
 module Gitlab
   module GonHelper
     def add_gon_variables
-      gon.api_version            = 'v3' # v4 Is not officially released yet, therefore can't be considered as "frozen"
+      gon.api_version            = 'v4'
       gon.default_avatar_url     = URI.join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
       gon.max_file_size          = current_application_settings.max_attachment_size
       gon.asset_host             = ActionController::Base.asset_host
diff --git a/spec/javascripts/project_title_spec.js b/spec/javascripts/project_title_spec.js
index 69d9587771f..3a1d4e2440f 100644
--- a/spec/javascripts/project_title_spec.js
+++ b/spec/javascripts/project_title_spec.js
@@ -26,7 +26,7 @@ require('~/project');
       var fakeAjaxResponse = function fakeAjaxResponse(req) {
         var d;
         expect(req.url).toBe('/api/v3/projects.json?simple=true');
-        expect(req.data).toEqual({ search: '', order_by: 'last_activity_at', per_page: 20 });
+        expect(req.data).toEqual({ search: '', order_by: 'last_activity_at', per_page: 20, membership: true });
         d = $.Deferred();
         d.resolve(this.projects_data);
         return d.promise();
-- 
GitLab