Skip to content

Bugfix/api list sorting #2069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mauriciovieira merged 3 commits into from
Feb 7, 2017
Merged

Bugfix/api list sorting #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a6f681
Delete useless variable
marla-singer Feb 6, 2017
a716cc1
Add sorting for result
marla-singer Feb 6, 2017
799f75d
Add sorting for proxybackends list
marla-singer Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dashboard/client/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 0 additions & 5 deletions organizations/client/profile/apis/connect_api/connect_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions organizations/server/methods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down