From 3a83d48bef7ffcfa50889cd2e11b22bd0cc932b4 Mon Sep 17 00:00:00 2001 From: Ben0it-T Date: Sun, 12 Dec 2021 17:55:49 +0100 Subject: [PATCH 1/5] Admin Panel - sort Organizations and Teams by Display Name, sort People by username --- client/components/settings/peopleBody.js | 3 +++ models/org.js | 2 +- models/team.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index b06861d34..ca2f1a49b 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -144,6 +144,7 @@ BlazeComponent.extendComponent({ }, orgList() { const orgs = Org.find(this.findOrgsOptions.get(), { + sort: { orgDisplayName: 1 }, fields: { _id: true }, }); this.numberOrgs.set(orgs.count(false)); @@ -151,6 +152,7 @@ BlazeComponent.extendComponent({ }, teamList() { const teams = Team.find(this.findTeamsOptions.get(), { + sort: { teamDisplayName: 1 }, fields: { _id: true }, }); this.numberTeams.set(teams.count(false)); @@ -158,6 +160,7 @@ BlazeComponent.extendComponent({ }, peopleList() { const users = Users.find(this.findUsersOptions.get(), { + sort: { username: 1 }, fields: { _id: true }, }); this.numberPeople.set(users.count(false)); diff --git a/models/org.js b/models/org.js index 8efa9b64b..bba6a1e92 100644 --- a/models/org.js +++ b/models/org.js @@ -217,7 +217,7 @@ if (Meteor.isServer) { // Index for Organization name. Meteor.startup(() => { // Org._collection._ensureIndex({ name: -1 }); - Org._collection._ensureIndex({ orgDisplayName: -1 }); + Org._collection._ensureIndex({ orgDisplayName: 1 }); }); } diff --git a/models/team.js b/models/team.js index 39733dd39..4ebfed3e9 100644 --- a/models/team.js +++ b/models/team.js @@ -214,7 +214,7 @@ if (Meteor.isServer) { if (Meteor.isServer) { // Index for Team name. Meteor.startup(() => { - Team._collection._ensureIndex({ teamDisplayName: -1 }); + Team._collection._ensureIndex({ teamDisplayName: 1 }); }); } From eb9d44f5f0d2a6a91a9a83f43b88f47140c198b3 Mon Sep 17 00:00:00 2001 From: Ben0it-T Date: Sun, 12 Dec 2021 18:10:50 +0100 Subject: [PATCH 2/5] People view - sort Organizations and Teams by Display Name (editUserPopup, newUserPopup, modifyTeamsUsers) --- client/components/settings/peopleBody.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index ca2f1a49b..8327668ad 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -254,10 +254,10 @@ Template.editUserPopup.helpers({ return Template.instance().authenticationMethods.get(); }, orgsDatas() { - return Org.find({}, {sort: { createdAt: -1 }}); + return Org.find({}, {sort: { orgDisplayName: 1 }}); }, teamsDatas() { - return Team.find({}, {sort: { createdAt: -1 }}); + return Team.find({}, {sort: { teamDisplayName: 1 }}); }, isSelected(match) { const userId = Template.instance().data.userId; @@ -327,10 +327,10 @@ Template.newUserPopup.helpers({ return Template.instance().authenticationMethods.get(); }, orgsDatas() { - return Org.find({}, {sort: { createdAt: -1 }}); + return Org.find({}, {sort: { orgDisplayName: 1 }}); }, teamsDatas() { - return Team.find({}, {sort: { createdAt: -1 }}); + return Team.find({}, {sort: { teamDisplayName: 1 }}); }, isSelected(match) { const userId = Template.instance().data.userId; @@ -420,7 +420,7 @@ BlazeComponent.extendComponent({ BlazeComponent.extendComponent({ onCreated() {}, teamsDatas() { - return Team.find({}, {sort: { createdAt: -1 }}); + return Team.find({}, {sort: { teamDisplayName: 1 }}); }, events() { return [ From 8e6bd81abef7f8e6974890900367f1b337e876fa Mon Sep 17 00:00:00 2001 From: Ben0it-T Date: Sun, 12 Dec 2021 18:20:59 +0100 Subject: [PATCH 3/5] People view - sort Organizations and Teams cols --- models/users.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/users.js b/models/users.js index 2cefac993..2006d7756 100644 --- a/models/users.js +++ b/models/users.js @@ -521,7 +521,7 @@ Users.helpers({ }, orgsUserBelongs() { if (this.orgs) { - return this.orgs.map(function(org){return org.orgDisplayName}).join(','); + return this.orgs.map(function(org){return org.orgDisplayName}).sort().join(','); } return ''; }, @@ -533,7 +533,7 @@ Users.helpers({ }, teamsUserBelongs() { if (this.teams) { - return this.teams.map(function(team){ return team.teamDisplayName}).join(','); + return this.teams.map(function(team){ return team.teamDisplayName}).sort().join(','); } return ''; }, From cec05dae473103debe0f63cd64c44aac9a9eb1de Mon Sep 17 00:00:00 2001 From: Ben0it-T Date: Sun, 12 Dec 2021 18:55:49 +0100 Subject: [PATCH 4/5] All boards view (boardsList) - sort Organizations and Teams by Display Name --- client/components/boards/boardsList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 290b45c32..cdc2430ca 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -89,7 +89,7 @@ BlazeComponent.extendComponent({ }, teamsDatas() { if(Meteor.user().teams) - return Meteor.user().teams; + return Meteor.user().teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName)); else return []; }, @@ -101,7 +101,7 @@ BlazeComponent.extendComponent({ }, orgsDatas() { if(Meteor.user().orgs) - return Meteor.user().orgs; + return Meteor.user().orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName)); else return []; }, From 8d2c5a9bbb90ec8c7c6b822658127d30109b2a3d Mon Sep 17 00:00:00 2001 From: Ben0it-T Date: Sun, 12 Dec 2021 19:07:37 +0100 Subject: [PATCH 5/5] Board view (sidebar) - sort Organizations and Teams by Display Name (addBoardOrgPopup, addBoardTeamPopup) --- client/components/sidebar/sidebar.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index a295069e4..c60d906a7 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -1325,8 +1325,7 @@ BlazeComponent.extendComponent({ Template.addBoardOrgPopup.helpers({ orgsDatas() { - // return Org.find({}, {sort: { createdAt: -1 }}); - let orgs = Org.find({}, {sort: { createdAt: -1 }}); + let orgs = Org.find({}, {sort: { orgDisplayName: 1 }}); return orgs; }, }); @@ -1499,7 +1498,7 @@ BlazeComponent.extendComponent({ Template.addBoardTeamPopup.helpers({ teamsDatas() { - let teams = Team.find({}, {sort: { createdAt: -1 }}); + let teams = Team.find({}, {sort: { teamDisplayName: 1 }}); return teams; }, });