IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Show organization popup in alphabetical order (#22259)

Browse Source 
* Show organization popup in alphabetical order
* GetUserOrgList: Sort organizations by name in API

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Vikky Omkar 2020-04-06 16:57:11 +05:30 committed by GitHub
parent f91c7a81ce
commit 97184c1750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/services/sqlstore/user.go
View File

@ -3,6 +3,7 @@ package sqlstore
import (
"context"
"fmt"
"sort"
"strconv"
"strings"
"time"
@ -311,6 +312,27 @@ func GetUserProfile(query *models.GetUserProfileQuery) error {
return err
}
type byOrgName []*models.UserOrgDTO
// Len returns the length of an array of organisations.
func (o byOrgName) Len() int {
return len(o)
}
// Swap swaps two indices of an array of organizations.
func (o byOrgName) Swap(i, j int) {
o[i], o[j] = o[j], o[i]
}
// Less returns whether element i of an array of organizations is less than element j.
func (o byOrgName) Less(i, j int) bool {
if strings.ToLower(o[i].Name) < strings.ToLower(o[j].Name) {
return true
}
return o[i].Name < o[j].Name
}
func GetUserOrgList(query *models.GetUserOrgListQuery) error {
query.Result = make([]*models.UserOrgDTO, 0)
sess := x.Table("org_user")
@ -319,6 +341,7 @@ func GetUserOrgList(query *models.GetUserOrgListQuery) error {
sess.Cols("org.name", "org_user.role", "org_user.org_id")
sess.OrderBy("org.name")
err := sess.Find(&query.Result)
sort.Sort(byOrgName(query.Result))
return err
}

4
public/app/core/components/OrgSwitcher.tsx
View File

@ -26,9 +26,7 @@ export class OrgSwitcher extends React.PureComponent<Props, State> {
getUserOrgs = async () => {
const orgs: UserOrgDTO[] = await getBackendSrv().get('/api/user/orgs');
this.setState({
orgs: orgs.sort((a, b) => a.orgId - b.orgId),
});
this.setState({ orgs });
};
setCurrentOrg = async (org: UserOrgDTO) => {