From 8a6f681b402e7a51d5a50c7f97b4e57a990c1759 Mon Sep 17 00:00:00 2001 From: Daria Voytova Date: Mon, 6 Feb 2017 15:09:42 +0000 Subject: [PATCH 1/3] Delete useless variable --- organizations/client/profile/apis/connect_api/connect_api.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/organizations/client/profile/apis/connect_api/connect_api.js b/organizations/client/profile/apis/connect_api/connect_api.js index 2325ebfba6..ed3abdd342 100644 --- a/organizations/client/profile/apis/connect_api/connect_api.js +++ b/organizations/client/profile/apis/connect_api/connect_api.js @@ -9,15 +9,10 @@ import OrganizationApis from '/organization_apis/collection'; Template.connectApiToOrganizationModal.onCreated(function () { const instance = this; - // Set status data is not ready - instance.dataIsReady = new ReactiveVar(false); instance.unlinkedApis = new ReactiveVar(); // Get data about apis without organization Meteor.call('getCurrentUserUnlinkedApis', (error, apis) => { - // Set status data is ready - instance.dataIsReady.set(true); - // Create array of unlinked API options for API select const unlinkedApiOptions = _.map(apis, (api) => { return { From a716cc1e782ef3d268301a68c2f8bb2ef30afc8e Mon Sep 17 00:00:00 2001 From: Daria Voytova Date: Mon, 6 Feb 2017 15:10:03 +0000 Subject: [PATCH 2/3] Add sorting for result --- organizations/server/methods.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/organizations/server/methods.js b/organizations/server/methods.js index 242ceb2788..2f8d7769c9 100644 --- a/organizations/server/methods.js +++ b/organizations/server/methods.js @@ -39,8 +39,8 @@ Meteor.methods({ queryParams.managerIds = userId; } - // Return cursor on unlinked apis - return Apis.find(queryParams).fetch(); + // Return sorted list of unlinked apis by name + return Apis.find(queryParams, { sort: { name: 1 } }).fetch(); } // Return undefined result for anonymous user From 799f75dc88405b7325922afb0075a62221b5684f Mon Sep 17 00:00:00 2001 From: Daria Voytova Date: Mon, 6 Feb 2017 15:30:26 +0000 Subject: [PATCH 3/3] Add sorting for proxybackends list --- dashboard/client/dashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dashboard/client/dashboard.js b/dashboard/client/dashboard.js index 64086f3f4e..a5e991183e 100644 --- a/dashboard/client/dashboard.js +++ b/dashboard/client/dashboard.js @@ -72,8 +72,8 @@ Template.dashboard.helpers({ return instance.chartData.get(); }, proxyBackends () { - // Fetch proxy backends - const proxyBackends = ProxyBackends.find().fetch(); + // Fetch proxy backends and sort them by name + const proxyBackends = ProxyBackends.find({}, { sort: { 'apiUmbrella.name': 1 } }).fetch(); // Get the current selected backend const backendParameter = FlowRouter.getQueryParam('backend');