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

fixed mutability issue in dashboard dropdowns

Browse Source
This commit is contained in:
Peter Holmberg 2018-11-13 18:23:00 +01:00
parent 1194ff282e
commit 03cf238fa7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/org/OrgPreferences.tsx
View File

@ -42,7 +42,10 @@ export class OrgPreferences extends PureComponent<Props> {
setOrganizationTheme, setOrganizationTheme,
} = this.props; } = this.props;
starredDashboards.unshift({ id: 0, title: 'Default', tags: [], type: '', uid: '', uri: '', url: '' }); const dashboards: DashboardSearchHit[] = [
{ id: 0, title: 'Default', tags: [], type: '', uid: '', uri: '', url: '' },
...starredDashboards,
];
return ( return (
<form className="section gf-form-group" onSubmit={this.onSubmitForm}> <form className="section gf-form-group" onSubmit={this.onSubmitForm}>
@ -66,11 +69,11 @@ export class OrgPreferences extends PureComponent<Props> {
Home Dashboard Home Dashboard
</Label> </Label>
<SimplePicker <SimplePicker
defaultValue={starredDashboards.find(dashboard => dashboard.id === preferences.homeDashboardId)} defaultValue={dashboards.find(dashboard => dashboard.id === preferences.homeDashboardId)}
getOptionValue={i => i.id} getOptionValue={i => i.id}
getOptionLabel={i => i.title} getOptionLabel={i => i.title}
onSelected={(dashboard: DashboardSearchHit) => setOrganizationHomeDashboard(dashboard.id)} onSelected={(dashboard: DashboardSearchHit) => setOrganizationHomeDashboard(dashboard.id)}
options={starredDashboards} options={dashboards}
placeholder="Chose default dashboard" placeholder="Chose default dashboard"
width={20} width={20}
/> />

9
public/app/features/teams/TeamPreferences.tsx
View File

@ -31,7 +31,10 @@ export class TeamPreferences extends PureComponent<Props> {
render() { render() {
const { preferences, starredDashboards, setTeamHomeDashboard, setTeamTimezone, setTeamTheme } = this.props; const { preferences, starredDashboards, setTeamHomeDashboard, setTeamTimezone, setTeamTheme } = this.props;
starredDashboards.unshift({ id: 0, title: 'Default', tags: [], type: '', uid: '', uri: '', url: '' }); const dashboards: DashboardSearchHit[] = [
{ id: 0, title: 'Default', tags: [], type: '', uid: '', uri: '', url: '' },
...starredDashboards,
];
return ( return (
<form className="section gf-form-group" onSubmit={this.onSubmitForm}> <form className="section gf-form-group" onSubmit={this.onSubmitForm}>
@ -55,11 +58,11 @@ export class TeamPreferences extends PureComponent<Props> {
Home Dashboard Home Dashboard
</Label> </Label>
<SimplePicker <SimplePicker
defaultValue={starredDashboards.find(dashboard => dashboard.id === preferences.homeDashboardId)} defaultValue={dashboards.find(dashboard => dashboard.id === preferences.homeDashboardId)}
getOptionValue={i => i.id} getOptionValue={i => i.id}
getOptionLabel={i => i.title} getOptionLabel={i => i.title}
onSelected={(dashboard: DashboardSearchHit) => setTeamHomeDashboard(dashboard.id)} onSelected={(dashboard: DashboardSearchHit) => setTeamHomeDashboard(dashboard.id)}
options={starredDashboards} options={dashboards}
placeholder="Chose default dashboard" placeholder="Chose default dashboard"
width={20} width={20}
/> />