From 5f9fecd2543467c27a0abd292832d2604a316bc0 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 12 Nov 2018 20:01:53 +0100 Subject: [PATCH 1/9] feat: team preferences --- pkg/api/api.go | 2 + pkg/api/dashboard.go | 2 +- pkg/api/index.go | 2 +- pkg/api/preferences.go | 15 +-- pkg/api/team.go | 10 ++ pkg/models/preferences.go | 7 +- .../sqlstore/migrations/preferences_mig.go | 9 ++ pkg/services/sqlstore/preferences.go | 26 ++++-- pkg/services/sqlstore/preferences_test.go | 91 +++++++++++++++++++ 9 files changed, 145 insertions(+), 19 deletions(-) create mode 100644 pkg/services/sqlstore/preferences_test.go diff --git a/pkg/api/api.go b/pkg/api/api.go index f1fe940e416..7714834d0b9 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -155,6 +155,8 @@ func (hs *HTTPServer) registerRoutes() { teamsRoute.Get("/:teamId/members", Wrap(GetTeamMembers)) teamsRoute.Post("/:teamId/members", bind(m.AddTeamMemberCommand{}), Wrap(AddTeamMember)) teamsRoute.Delete("/:teamId/members/:userId", Wrap(RemoveTeamMember)) + teamsRoute.Get("/:teamId/preferences", Wrap(GetTeamPreferences)) + teamsRoute.Put("/:teamId/preferences", bind(dtos.UpdatePrefsCmd{}), Wrap(UpdateTeamPreferences)) }, reqOrgAdmin) // team without requirement of user to be org admin diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 02248334b9c..6abb72f1559 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -293,7 +293,7 @@ func PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand) Response { } func GetHomeDashboard(c *m.ReqContext) Response { - prefsQuery := m.GetPreferencesWithDefaultsQuery{OrgId: c.OrgId, UserId: c.UserId} + prefsQuery := m.GetPreferencesWithDefaultsQuery{User: c.SignedInUser} if err := bus.Dispatch(&prefsQuery); err != nil { return Error(500, "Failed to get preferences", err) } diff --git a/pkg/api/index.go b/pkg/api/index.go index fe7c9e79a17..253fa9c17af 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -23,7 +23,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er return nil, err } - prefsQuery := m.GetPreferencesWithDefaultsQuery{OrgId: c.OrgId, UserId: c.UserId} + prefsQuery := m.GetPreferencesWithDefaultsQuery{User: c.SignedInUser} if err := bus.Dispatch(&prefsQuery); err != nil { return nil, err } diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go index 26695130975..9b451aa2a6e 100644 --- a/pkg/api/preferences.go +++ b/pkg/api/preferences.go @@ -21,11 +21,11 @@ func SetHomeDashboard(c *m.ReqContext, cmd m.SavePreferencesCommand) Response { // GET /api/user/preferences func GetUserPreferences(c *m.ReqContext) Response { - return getPreferencesFor(c.OrgId, c.UserId) + return getPreferencesFor(c.OrgId, c.UserId, 0) } -func getPreferencesFor(orgID int64, userID int64) Response { - prefsQuery := m.GetPreferencesQuery{UserId: userID, OrgId: orgID} +func getPreferencesFor(orgID, userID, teamID int64) Response { + prefsQuery := m.GetPreferencesQuery{UserId: userID, OrgId: orgID, TeamId: teamID} if err := bus.Dispatch(&prefsQuery); err != nil { return Error(500, "Failed to get preferences", err) @@ -42,13 +42,14 @@ func getPreferencesFor(orgID int64, userID int64) Response { // PUT /api/user/preferences func UpdateUserPreferences(c *m.ReqContext, dtoCmd dtos.UpdatePrefsCmd) Response { - return updatePreferencesFor(c.OrgId, c.UserId, &dtoCmd) + return updatePreferencesFor(c.OrgId, c.UserId, 0, &dtoCmd) } -func updatePreferencesFor(orgID int64, userID int64, dtoCmd *dtos.UpdatePrefsCmd) Response { +func updatePreferencesFor(orgID, userID, teamId int64, dtoCmd *dtos.UpdatePrefsCmd) Response { saveCmd := m.SavePreferencesCommand{ UserId: userID, OrgId: orgID, + TeamId: teamId, Theme: dtoCmd.Theme, Timezone: dtoCmd.Timezone, HomeDashboardId: dtoCmd.HomeDashboardID, @@ -63,10 +64,10 @@ func updatePreferencesFor(orgID int64, userID int64, dtoCmd *dtos.UpdatePrefsCmd // GET /api/org/preferences func GetOrgPreferences(c *m.ReqContext) Response { - return getPreferencesFor(c.OrgId, 0) + return getPreferencesFor(c.OrgId, 0, 0) } // PUT /api/org/preferences func UpdateOrgPreferences(c *m.ReqContext, dtoCmd dtos.UpdatePrefsCmd) Response { - return updatePreferencesFor(c.OrgId, 0, &dtoCmd) + return updatePreferencesFor(c.OrgId, 0, 0, &dtoCmd) } diff --git a/pkg/api/team.go b/pkg/api/team.go index ebb426c4c82..32265e5d018 100644 --- a/pkg/api/team.go +++ b/pkg/api/team.go @@ -96,3 +96,13 @@ func GetTeamByID(c *m.ReqContext) Response { query.Result.AvatarUrl = dtos.GetGravatarUrlWithDefault(query.Result.Email, query.Result.Name) return JSON(200, &query.Result) } + +// GET /api/teams/:teamId/preferences +func GetTeamPreferences(c *m.ReqContext) Response { + return getPreferencesFor(c.OrgId, 0, c.ParamsInt64(":teamId")) +} + +// PUT /api/teams/:teamId/preferences +func UpdateTeamPreferences(c *m.ReqContext, dtoCmd dtos.UpdatePrefsCmd) Response { + return updatePreferencesFor(c.OrgId, 0, c.ParamsInt64(":teamId"), &dtoCmd) +} diff --git a/pkg/models/preferences.go b/pkg/models/preferences.go index 4c77bc96d4d..c73e0be4949 100644 --- a/pkg/models/preferences.go +++ b/pkg/models/preferences.go @@ -14,6 +14,7 @@ type Preferences struct { Id int64 OrgId int64 UserId int64 + TeamId int64 Version int HomeDashboardId int64 Timezone string @@ -29,14 +30,13 @@ type GetPreferencesQuery struct { Id int64 OrgId int64 UserId int64 + TeamId int64 Result *Preferences } type GetPreferencesWithDefaultsQuery struct { - Id int64 - OrgId int64 - UserId int64 + User *SignedInUser Result *Preferences } @@ -46,6 +46,7 @@ type GetPreferencesWithDefaultsQuery struct { type SavePreferencesCommand struct { UserId int64 OrgId int64 + TeamId int64 HomeDashboardId int64 `json:"homeDashboardId"` Timezone string `json:"timezone"` diff --git a/pkg/services/sqlstore/migrations/preferences_mig.go b/pkg/services/sqlstore/migrations/preferences_mig.go index b3822fe5239..d8134f11f79 100644 --- a/pkg/services/sqlstore/migrations/preferences_mig.go +++ b/pkg/services/sqlstore/migrations/preferences_mig.go @@ -34,4 +34,13 @@ func addPreferencesMigrations(mg *Migrator) { {Name: "timezone", Type: DB_NVarchar, Length: 50, Nullable: false}, {Name: "theme", Type: DB_NVarchar, Length: 20, Nullable: false}, })) + + mg.AddMigration("Add column team_id in preferences", NewAddColumnMigration(preferencesV2, &Column{ + Name: "team_id", Type: DB_BigInt, Nullable: true, + })) + + mg.AddMigration("Update team_id column values in preferences", NewRawSqlMigration(""). + Sqlite("UPDATE preferences SET team_id=0 WHERE team_id IS NULL;"). + Postgres("UPDATE preferences SET team_id=0 WHERE team_id IS NULL;"). + Mysql("UPDATE preferences SET team_id=0 WHERE team_id IS NULL;")) } diff --git a/pkg/services/sqlstore/preferences.go b/pkg/services/sqlstore/preferences.go index 04e787971d9..858a2c77075 100644 --- a/pkg/services/sqlstore/preferences.go +++ b/pkg/services/sqlstore/preferences.go @@ -1,6 +1,7 @@ package sqlstore import ( + "strings" "time" "github.com/grafana/grafana/pkg/bus" @@ -16,11 +17,22 @@ func init() { } func GetPreferencesWithDefaults(query *m.GetPreferencesWithDefaultsQuery) error { - + params := make([]interface{}, 0) + filter := "" + if len(query.User.Teams) > 0 { + filter = "(org_id=? AND team_id IN (?" + strings.Repeat(",?", len(query.User.Teams)-1) + ")) OR " + params = append(params, query.User.OrgId) + for _, v := range query.User.Teams { + params = append(params, v) + } + } + filter += "(org_id=? AND user_id=? AND team_id=0) OR (org_id=? AND team_id=0 AND user_id=0)" + params = append(params, query.User.OrgId) + params = append(params, query.User.UserId) + params = append(params, query.User.OrgId) prefs := make([]*m.Preferences, 0) - filter := "(org_id=? AND user_id=?) OR (org_id=? AND user_id=0)" - err := x.Where(filter, query.OrgId, query.UserId, query.OrgId). - OrderBy("user_id ASC"). + err := x.Where(filter, params...). + OrderBy("user_id ASC, team_id ASC"). Find(&prefs) if err != nil { @@ -50,9 +62,8 @@ func GetPreferencesWithDefaults(query *m.GetPreferencesWithDefaultsQuery) error } func GetPreferences(query *m.GetPreferencesQuery) error { - var prefs m.Preferences - exists, err := x.Where("org_id=? AND user_id=?", query.OrgId, query.UserId).Get(&prefs) + exists, err := x.Where("org_id=? AND user_id=? AND team_id=?", query.OrgId, query.UserId, query.TeamId).Get(&prefs) if err != nil { return err @@ -71,7 +82,7 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error { return inTransaction(func(sess *DBSession) error { var prefs m.Preferences - exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&prefs) + exists, err := sess.Where("org_id=? AND user_id=? AND team_id=?", cmd.OrgId, cmd.UserId, cmd.TeamId).Get(&prefs) if err != nil { return err } @@ -80,6 +91,7 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error { prefs = m.Preferences{ UserId: cmd.UserId, OrgId: cmd.OrgId, + TeamId: cmd.TeamId, HomeDashboardId: cmd.HomeDashboardId, Timezone: cmd.Timezone, Theme: cmd.Theme, diff --git a/pkg/services/sqlstore/preferences_test.go b/pkg/services/sqlstore/preferences_test.go new file mode 100644 index 00000000000..f9a839bf5a7 --- /dev/null +++ b/pkg/services/sqlstore/preferences_test.go @@ -0,0 +1,91 @@ +package sqlstore + +import ( + "testing" + + . "github.com/smartystreets/goconvey/convey" + + "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" +) + +func TestPreferencesDataAccess(t *testing.T) { + Convey("Testing preferences data access", t, func() { + InitTestDB(t) + + Convey("GetPreferencesWithDefaults with no saved preferences should return defaults", func() { + query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{}} + err := GetPreferencesWithDefaults(query) + So(err, ShouldBeNil) + So(query.Result.Theme, ShouldEqual, setting.DefaultTheme) + So(query.Result.Timezone, ShouldEqual, "browser") + So(query.Result.HomeDashboardId, ShouldEqual, 0) + }) + + Convey("GetPreferencesWithDefaults with saved org and user home dashboard should return user home dashboard", func() { + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) + + query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 1}} + err := GetPreferencesWithDefaults(query) + So(err, ShouldBeNil) + So(query.Result.HomeDashboardId, ShouldEqual, 4) + }) + + Convey("GetPreferencesWithDefaults with saved org and other user home dashboard should return org home dashboard", func() { + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) + + query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 2}} + err := GetPreferencesWithDefaults(query) + So(err, ShouldBeNil) + So(query.Result.HomeDashboardId, ShouldEqual, 1) + }) + + Convey("GetPreferencesWithDefaults with saved org and teams home dashboard should return last team home dashboard", func() { + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) + + query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, Teams: []int64{2, 3}}} + err := GetPreferencesWithDefaults(query) + So(err, ShouldBeNil) + So(query.Result.HomeDashboardId, ShouldEqual, 3) + }) + + Convey("GetPreferencesWithDefaults with saved org and other teams home dashboard should return org home dashboard", func() { + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) + + query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1}} + err := GetPreferencesWithDefaults(query) + So(err, ShouldBeNil) + So(query.Result.HomeDashboardId, ShouldEqual, 1) + }) + + Convey("GetPreferencesWithDefaults with saved org, teams and user home dashboard should return user home dashboard", func() { + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) + + query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 1, Teams: []int64{2, 3}}} + err := GetPreferencesWithDefaults(query) + So(err, ShouldBeNil) + So(query.Result.HomeDashboardId, ShouldEqual, 4) + }) + + Convey("GetPreferencesWithDefaults with saved org, other teams and user home dashboard should return org home dashboard", func() { + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3}) + SavePreferences(&models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4}) + + query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 2}} + err := GetPreferencesWithDefaults(query) + So(err, ShouldBeNil) + So(query.Result.HomeDashboardId, ShouldEqual, 1) + }) + }) +} From 1194ff282e7d3aacc6ef93efcee32702e65aff9d Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 12 Nov 2018 20:58:59 +0100 Subject: [PATCH 2/9] team preferences ui --- public/app/features/teams/TeamPages.test.tsx | 12 +- public/app/features/teams/TeamPages.tsx | 27 +++- .../features/teams/TeamPreferences.test.tsx | 28 ++++ public/app/features/teams/TeamPreferences.tsx | 102 +++++++++++++ .../app/features/teams/__mocks__/teamMocks.ts | 10 +- .../__snapshots__/TeamPages.test.tsx.snap | 7 +- .../TeamPreferences.test.tsx.snap | 136 ++++++++++++++++++ public/app/features/teams/state/actions.ts | 70 ++++++++- .../app/features/teams/state/reducers.test.ts | 15 +- public/app/features/teams/state/reducers.ts | 15 +- .../features/teams/state/selectors.test.ts | 11 +- public/app/types/teams.ts | 3 + 12 files changed, 419 insertions(+), 17 deletions(-) create mode 100644 public/app/features/teams/TeamPreferences.test.tsx create mode 100644 public/app/features/teams/TeamPreferences.tsx create mode 100644 public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx index 65084d0dc47..0070f8dee6c 100644 --- a/public/app/features/teams/TeamPages.test.tsx +++ b/public/app/features/teams/TeamPages.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { TeamPages, Props } from './TeamPages'; -import { NavModel, Team } from '../../types'; +import { NavModel, Team, OrganizationPreferences } from '../../types'; import { getMockTeam } from './__mocks__/teamMocks'; jest.mock('app/core/config', () => ({ @@ -15,6 +15,9 @@ const setup = (propOverrides?: object) => { loadTeam: jest.fn(), pageName: 'members', team: {} as Team, + loadStarredDashboards: jest.fn(), + loadTeamPreferences: jest.fn(), + preferences: {} as OrganizationPreferences, }; Object.assign(props, propOverrides); @@ -43,10 +46,15 @@ describe('Render', () => { expect(wrapper).toMatchSnapshot(); }); - it('should render settings page', () => { + it('should render settings and preferences page', () => { const { wrapper } = setup({ team: getMockTeam(), pageName: 'settings', + preferences: { + homeDashboardId: 1, + theme: 'Default', + timezone: 'Default', + }, }); expect(wrapper).toMatchSnapshot(); diff --git a/public/app/features/teams/TeamPages.tsx b/public/app/features/teams/TeamPages.tsx index 3dc5a9f6f15..0e39eab7260 100644 --- a/public/app/features/teams/TeamPages.tsx +++ b/public/app/features/teams/TeamPages.tsx @@ -7,12 +7,14 @@ import PageHeader from 'app/core/components/PageHeader/PageHeader'; import TeamMembers from './TeamMembers'; import TeamSettings from './TeamSettings'; import TeamGroupSync from './TeamGroupSync'; -import { NavModel, Team } from 'app/types'; -import { loadTeam } from './state/actions'; +import TeamPreferences from './TeamPreferences'; +import { NavModel, Team, OrganizationPreferences } from 'app/types'; +import { loadTeam, loadTeamPreferences } from './state/actions'; import { getTeam } from './state/selectors'; import { getTeamLoadingNav } from './state/navModel'; import { getNavModel } from 'app/core/selectors/navModel'; import { getRouteParamsId, getRouteParamsPage } from '../../core/selectors/location'; +import { loadStarredDashboards } from '../../core/actions/user'; export interface Props { team: Team; @@ -20,6 +22,9 @@ export interface Props { teamId: number; pageName: string; navModel: NavModel; + preferences: OrganizationPreferences; + loadStarredDashboards: typeof loadStarredDashboards; + loadTeamPreferences: typeof loadTeamPreferences; } interface State { @@ -41,14 +46,16 @@ export class TeamPages extends PureComponent { }; } - componentDidMount() { - this.fetchTeam(); + async componentDidMount() { + await this.props.loadStarredDashboards(); + await this.fetchTeam(); + await this.props.loadTeamPreferences(); } async fetchTeam() { const { loadTeam, teamId } = this.props; - await loadTeam(teamId); + return await loadTeam(teamId); } getCurrentPage() { @@ -66,7 +73,12 @@ export class TeamPages extends PureComponent { return ; case PageTypes.Settings: - return ; + return ( +
+ + +
+ ); case PageTypes.GroupSync: return isSyncEnabled && ; @@ -97,11 +109,14 @@ function mapStateToProps(state) { teamId: teamId, pageName: pageName, team: getTeam(state.team, teamId), + preferences: state.preferences, }; } const mapDispatchToProps = { loadTeam, + loadStarredDashboards, + loadTeamPreferences, }; export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(TeamPages)); diff --git a/public/app/features/teams/TeamPreferences.test.tsx b/public/app/features/teams/TeamPreferences.test.tsx new file mode 100644 index 00000000000..2da8b2b1cfb --- /dev/null +++ b/public/app/features/teams/TeamPreferences.test.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { shallow } from 'enzyme'; +import { TeamPreferences, Props } from './TeamPreferences'; + +const setup = () => { + const props: Props = { + preferences: { + homeDashboardId: 1, + timezone: 'UTC', + theme: 'Default', + }, + starredDashboards: [{ id: 1, title: 'Standard dashboard', url: '', uri: '', uid: '', type: '', tags: [] }], + setTeamTimezone: jest.fn(), + setTeamTheme: jest.fn(), + setTeamHomeDashboard: jest.fn(), + updateTeamPreferences: jest.fn(), + }; + + return shallow(); +}; + +describe('Render', () => { + it('should render component', () => { + const wrapper = setup(); + + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/public/app/features/teams/TeamPreferences.tsx b/public/app/features/teams/TeamPreferences.tsx new file mode 100644 index 00000000000..e9b6af3dc72 --- /dev/null +++ b/public/app/features/teams/TeamPreferences.tsx @@ -0,0 +1,102 @@ +import React, { PureComponent } from 'react'; +import { connect } from 'react-redux'; +import { Label } from '../../core/components/Label/Label'; +import SimplePicker from '../../core/components/Picker/SimplePicker'; +import { DashboardSearchHit, OrganizationPreferences } from 'app/types'; +import { setTeamHomeDashboard, setTeamTheme, setTeamTimezone, updateTeamPreferences } from './state/actions'; + +export interface Props { + preferences: OrganizationPreferences; + starredDashboards: DashboardSearchHit[]; + setTeamHomeDashboard: typeof setTeamHomeDashboard; + setTeamTheme: typeof setTeamTheme; + setTeamTimezone: typeof setTeamTimezone; + updateTeamPreferences: typeof updateTeamPreferences; +} + +const themes = [{ value: '', text: 'Default' }, { value: 'dark', text: 'Dark' }, { value: 'light', text: 'Light' }]; + +const timezones = [ + { value: '', text: 'Default' }, + { value: 'browser', text: 'Local browser time' }, + { value: 'utc', text: 'UTC' }, +]; + +export class TeamPreferences extends PureComponent { + onSubmitForm = event => { + event.preventDefault(); + this.props.updateTeamPreferences(); + }; + + render() { + const { preferences, starredDashboards, setTeamHomeDashboard, setTeamTimezone, setTeamTheme } = this.props; + + starredDashboards.unshift({ id: 0, title: 'Default', tags: [], type: '', uid: '', uri: '', url: '' }); + + return ( +
+

Preferences

+
+ UI Theme + theme.value === preferences.theme)} + options={themes} + getOptionValue={i => i.value} + getOptionLabel={i => i.text} + onSelected={theme => setTeamTheme(theme.value)} + width={20} + /> +
+
+ + dashboard.id === preferences.homeDashboardId)} + getOptionValue={i => i.id} + getOptionLabel={i => i.title} + onSelected={(dashboard: DashboardSearchHit) => setTeamHomeDashboard(dashboard.id)} + options={starredDashboards} + placeholder="Chose default dashboard" + width={20} + /> +
+
+ + timezone.value === preferences.timezone)} + getOptionValue={i => i.value} + getOptionLabel={i => i.text} + onSelected={timezone => setTeamTimezone(timezone.value)} + options={timezones} + width={20} + /> +
+
+ +
+
+ ); + } +} + +function mapStateToProps(state) { + return { + preferences: state.team.preferences, + starredDashboards: state.user.starredDashboards, + }; +} + +const mapDispatchToProps = { + setTeamHomeDashboard, + setTeamTimezone, + setTeamTheme, + updateTeamPreferences, +}; + +export default connect(mapStateToProps, mapDispatchToProps)(TeamPreferences); diff --git a/public/app/features/teams/__mocks__/teamMocks.ts b/public/app/features/teams/__mocks__/teamMocks.ts index 339f227c081..c3ab2cdfbea 100644 --- a/public/app/features/teams/__mocks__/teamMocks.ts +++ b/public/app/features/teams/__mocks__/teamMocks.ts @@ -1,4 +1,4 @@ -import { Team, TeamGroup, TeamMember } from 'app/types'; +import { Team, TeamGroup, TeamMember, OrganizationPreferences } from 'app/types'; export const getMultipleMockTeams = (numberOfTeams: number): Team[] => { const teams: Team[] = []; @@ -65,3 +65,11 @@ export const getMockTeamGroups = (amount: number): TeamGroup[] => { return groups; }; + +export const getMockTeamPreferences = (): OrganizationPreferences => { + return { + theme: 'dark', + timezone: 'browser', + homeDashboardId: 1, + }; +}; diff --git a/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap index f32b8211d2c..7c5853b107f 100644 --- a/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap @@ -36,7 +36,7 @@ exports[`Render should render member page if team not empty 1`] = ` `; -exports[`Render should render settings page 1`] = ` +exports[`Render should render settings and preferences page 1`] = `
- +
+ + +
`; diff --git a/public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap new file mode 100644 index 00000000000..06bf464a4a0 --- /dev/null +++ b/public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap @@ -0,0 +1,136 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Render should render component 1`] = ` +
+

+ Preferences +

+
+ + UI Theme + + +
+
+ + Home Dashboard + + +
+
+ + +
+
+ +
+
+`; diff --git a/public/app/features/teams/state/actions.ts b/public/app/features/teams/state/actions.ts index d948dc1c5a3..f22b2f98d9f 100644 --- a/public/app/features/teams/state/actions.ts +++ b/public/app/features/teams/state/actions.ts @@ -1,16 +1,20 @@ import { ThunkAction } from 'redux-thunk'; import { getBackendSrv } from 'app/core/services/backend_srv'; -import { StoreState, Team, TeamGroup, TeamMember } from 'app/types'; +import { StoreState, Team, TeamGroup, TeamMember, OrganizationPreferences } from 'app/types'; import { updateNavIndex, UpdateNavIndexAction } from 'app/core/actions'; import { buildNavModel } from './navModel'; export enum ActionTypes { LoadTeams = 'LOAD_TEAMS', LoadTeam = 'LOAD_TEAM', + LoadTeamPreferences = 'LOAD_TEAM_PREFERENCES', SetSearchQuery = 'SET_TEAM_SEARCH_QUERY', SetSearchMemberQuery = 'SET_TEAM_MEMBER_SEARCH_QUERY', LoadTeamMembers = 'TEAM_MEMBERS_LOADED', LoadTeamGroups = 'TEAM_GROUPS_LOADED', + SetTeamTheme = 'SET_TEAM_THEME', + SetTeamHomeDashboard = 'SET_TEAM_HOME_DASHBOARD', + SetTeamTimezone = 'SET_TEAM_TIMEZONE', } export interface LoadTeamsAction { @@ -23,6 +27,11 @@ export interface LoadTeamAction { payload: Team; } +export interface LoadTeamPreferencesAction { + type: ActionTypes.LoadTeamPreferences; + payload: OrganizationPreferences; +} + export interface LoadTeamMembersAction { type: ActionTypes.LoadTeamMembers; payload: TeamMember[]; @@ -43,13 +52,32 @@ export interface SetSearchMemberQueryAction { payload: string; } +export interface SetTeamThemeAction { + type: ActionTypes.SetTeamTheme; + payload: string; +} + +export interface SetTeamHomeDashboardAction { + type: ActionTypes.SetTeamHomeDashboard; + payload: number; +} + +export interface SetTeamTimezoneAction { + type: ActionTypes.SetTeamTimezone; + payload: string; +} + export type Action = | LoadTeamsAction | SetSearchQueryAction | LoadTeamAction + | LoadTeamPreferencesAction | LoadTeamMembersAction | SetSearchMemberQueryAction - | LoadTeamGroupsAction; + | LoadTeamGroupsAction + | SetTeamThemeAction + | SetTeamHomeDashboardAction + | SetTeamTimezoneAction; type ThunkResult = ThunkAction; @@ -73,6 +101,11 @@ const teamGroupsLoaded = (teamGroups: TeamGroup[]): LoadTeamGroupsAction => ({ payload: teamGroups, }); +const teamPreferencesLoaded = (preferences: OrganizationPreferences): LoadTeamPreferencesAction => ({ + type: ActionTypes.LoadTeamPreferences, + payload: preferences, +}); + export const setSearchMemberQuery = (searchQuery: string): SetSearchMemberQueryAction => ({ type: ActionTypes.SetSearchMemberQuery, payload: searchQuery, @@ -83,6 +116,21 @@ export const setSearchQuery = (searchQuery: string): SetSearchQueryAction => ({ payload: searchQuery, }); +export const setTeamTheme = (theme: string) => ({ + type: ActionTypes.SetTeamTheme, + payload: theme, +}); + +export const setTeamHomeDashboard = (id: number) => ({ + type: ActionTypes.SetTeamHomeDashboard, + payload: id, +}); + +export const setTeamTimezone = (timezone: string) => ({ + type: ActionTypes.SetTeamTimezone, + payload: timezone, +}); + export function loadTeams(): ThunkResult { return async dispatch => { const response = await getBackendSrv().get('/api/teams/search', { perpage: 1000, page: 1 }); @@ -160,3 +208,21 @@ export function deleteTeam(id: number): ThunkResult { dispatch(loadTeams()); }; } + +export function loadTeamPreferences(): ThunkResult { + return async (dispatch, getStore) => { + const team = getStore().team.team; + const response = await getBackendSrv().get(`/api/teams/${team.id}/preferences`); + dispatch(teamPreferencesLoaded(response)); + }; +} + +export function updateTeamPreferences() { + return async (dispatch, getStore) => { + const team = getStore().team.team; + const preferences = getStore().team.preferences; + + await getBackendSrv().put(`/api/teams/${team.id}/preferences`, preferences); + window.location.reload(); + }; +} diff --git a/public/app/features/teams/state/reducers.test.ts b/public/app/features/teams/state/reducers.test.ts index 7f7a33d60ac..892895d4184 100644 --- a/public/app/features/teams/state/reducers.test.ts +++ b/public/app/features/teams/state/reducers.test.ts @@ -1,6 +1,6 @@ import { Action, ActionTypes } from './actions'; import { initialTeamsState, initialTeamState, teamReducer, teamsReducer } from './reducers'; -import { getMockTeam, getMockTeamMember } from '../__mocks__/teamMocks'; +import { getMockTeam, getMockTeamMember, getMockTeamPreferences } from '../__mocks__/teamMocks'; describe('teams reducer', () => { it('should set teams', () => { @@ -69,4 +69,17 @@ describe('team reducer', () => { expect(result.searchMemberQuery).toEqual('member'); }); + + it('should set team preferences', () => { + const mockTeamPrefs = getMockTeamPreferences(); + + const action: Action = { + type: ActionTypes.LoadTeamPreferences, + payload: mockTeamPrefs, + }; + + const result = teamReducer(initialTeamState, action); + + expect(result.preferences).toEqual(mockTeamPrefs); + }); }); diff --git a/public/app/features/teams/state/reducers.ts b/public/app/features/teams/state/reducers.ts index 2e72dce0afb..0ef358e19d7 100644 --- a/public/app/features/teams/state/reducers.ts +++ b/public/app/features/teams/state/reducers.ts @@ -1,4 +1,4 @@ -import { Team, TeamGroup, TeamMember, TeamsState, TeamState } from 'app/types'; +import { Team, TeamGroup, TeamMember, TeamsState, TeamState, OrganizationPreferences } from 'app/types'; import { Action, ActionTypes } from './actions'; export const initialTeamsState: TeamsState = { teams: [], searchQuery: '', hasFetched: false }; @@ -7,6 +7,7 @@ export const initialTeamState: TeamState = { members: [] as TeamMember[], groups: [] as TeamGroup[], searchMemberQuery: '', + preferences: {} as OrganizationPreferences, }; export const teamsReducer = (state = initialTeamsState, action: Action): TeamsState => { @@ -33,6 +34,18 @@ export const teamReducer = (state = initialTeamState, action: Action): TeamState case ActionTypes.LoadTeamGroups: return { ...state, groups: action.payload }; + + case ActionTypes.LoadTeamPreferences: + return { ...state, preferences: action.payload }; + + case ActionTypes.SetTeamTheme: + return { ...state, preferences: { ...state.preferences, theme: action.payload } }; + + case ActionTypes.SetTeamHomeDashboard: + return { ...state, preferences: { ...state.preferences, homeDashboardId: action.payload } }; + + case ActionTypes.SetTeamTimezone: + return { ...state, preferences: { ...state.preferences, timezone: action.payload } }; } return state; diff --git a/public/app/features/teams/state/selectors.test.ts b/public/app/features/teams/state/selectors.test.ts index 3764a9355c6..3aab99da1c2 100644 --- a/public/app/features/teams/state/selectors.test.ts +++ b/public/app/features/teams/state/selectors.test.ts @@ -1,6 +1,6 @@ import { getTeam, getTeamMembers, getTeams } from './selectors'; import { getMockTeam, getMockTeamMembers, getMultipleMockTeams } from '../__mocks__/teamMocks'; -import { Team, TeamGroup, TeamsState, TeamState } from '../../../types'; +import { Team, TeamGroup, TeamsState, TeamState, OrganizationPreferences } from '../../../types'; describe('Teams selectors', () => { describe('Get teams', () => { @@ -29,7 +29,13 @@ describe('Team selectors', () => { const mockTeam = getMockTeam(); it('should return team if matching with location team', () => { - const mockState: TeamState = { team: mockTeam, searchMemberQuery: '', members: [], groups: [] }; + const mockState: TeamState = { + team: mockTeam, + searchMemberQuery: '', + members: [], + groups: [], + preferences: {} as OrganizationPreferences, + }; const team = getTeam(mockState, '1'); @@ -46,6 +52,7 @@ describe('Team selectors', () => { searchMemberQuery: '', members: mockTeamMembers, groups: [] as TeamGroup[], + preferences: {} as OrganizationPreferences, }; const members = getTeamMembers(mockState); diff --git a/public/app/types/teams.ts b/public/app/types/teams.ts index a524f0dcf87..b0480f875d6 100644 --- a/public/app/types/teams.ts +++ b/public/app/types/teams.ts @@ -1,3 +1,5 @@ +import { OrganizationPreferences } from './organization'; + export interface Team { id: number; name: string; @@ -31,4 +33,5 @@ export interface TeamState { members: TeamMember[]; groups: TeamGroup[]; searchMemberQuery: string; + preferences: OrganizationPreferences; } From 03cf238fa78d73e77deaa43ba7cf5d0b3eaf5efc Mon Sep 17 00:00:00 2001 From: Peter Holmberg Date: Tue, 13 Nov 2018 18:23:00 +0100 Subject: [PATCH 3/9] fixed mutability issue in dashboard dropdowns --- public/app/features/org/OrgPreferences.tsx | 9 ++++++--- public/app/features/teams/TeamPreferences.tsx | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/public/app/features/org/OrgPreferences.tsx b/public/app/features/org/OrgPreferences.tsx index a8133ba4a1c..f4ab06ac080 100644 --- a/public/app/features/org/OrgPreferences.tsx +++ b/public/app/features/org/OrgPreferences.tsx @@ -42,7 +42,10 @@ export class OrgPreferences extends PureComponent { setOrganizationTheme, } = 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 (
@@ -66,11 +69,11 @@ export class OrgPreferences extends PureComponent { Home Dashboard dashboard.id === preferences.homeDashboardId)} + defaultValue={dashboards.find(dashboard => dashboard.id === preferences.homeDashboardId)} getOptionValue={i => i.id} getOptionLabel={i => i.title} onSelected={(dashboard: DashboardSearchHit) => setOrganizationHomeDashboard(dashboard.id)} - options={starredDashboards} + options={dashboards} placeholder="Chose default dashboard" width={20} /> diff --git a/public/app/features/teams/TeamPreferences.tsx b/public/app/features/teams/TeamPreferences.tsx index e9b6af3dc72..a6b8547c4db 100644 --- a/public/app/features/teams/TeamPreferences.tsx +++ b/public/app/features/teams/TeamPreferences.tsx @@ -31,7 +31,10 @@ export class TeamPreferences extends PureComponent { render() { 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 ( @@ -55,11 +58,11 @@ export class TeamPreferences extends PureComponent { Home Dashboard dashboard.id === preferences.homeDashboardId)} + defaultValue={dashboards.find(dashboard => dashboard.id === preferences.homeDashboardId)} getOptionValue={i => i.id} getOptionLabel={i => i.title} onSelected={(dashboard: DashboardSearchHit) => setTeamHomeDashboard(dashboard.id)} - options={starredDashboards} + options={dashboards} placeholder="Chose default dashboard" width={20} /> From 655f4d0a8d295cfa30667db7e433d4082e8f2991 Mon Sep 17 00:00:00 2001 From: Peter Holmberg Date: Tue, 13 Nov 2018 18:23:35 +0100 Subject: [PATCH 4/9] fixed issue with save. --- public/app/features/teams/state/actions.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/app/features/teams/state/actions.ts b/public/app/features/teams/state/actions.ts index f22b2f98d9f..d8bdfb88f47 100644 --- a/public/app/features/teams/state/actions.ts +++ b/public/app/features/teams/state/actions.ts @@ -223,6 +223,7 @@ export function updateTeamPreferences() { const preferences = getStore().team.preferences; await getBackendSrv().put(`/api/teams/${team.id}/preferences`, preferences); - window.location.reload(); + + dispatch(loadTeamPreferences()); }; } From 33469ecfaba75888ce7b5aba8bb851218bbceaa3 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 14 Nov 2018 17:59:32 +0100 Subject: [PATCH 5/9] docs: team http api update --- docs/sources/http_api/team.md | 66 ++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/docs/sources/http_api/team.md b/docs/sources/http_api/team.md index 94ea4108481..5024ec69522 100644 --- a/docs/sources/http_api/team.md +++ b/docs/sources/http_api/team.md @@ -30,7 +30,7 @@ Authorization: Basic YWRtaW46YWRtaW4= ### Using the query parameter -Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. +Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. The `totalCount` field in the response can be used for pagination of the teams list E.g. if `totalCount` is equal to 100 teams and the `perpage` parameter is set to 10 then there are 10 pages of teams. @@ -314,3 +314,67 @@ Status Codes: - **401** - Unauthorized - **403** - Permission denied - **404** - Team not found/Team member not found + +## Get Team Preferences + +`GET /api/teams/:teamId/preferences` + +**Example Request**: + +```http +GET /api/teams/2/preferences HTTP/1.1 +Accept: application/json +Content-Type: application/json +Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk +``` + +**Example Response**: + +```http +HTTP/1.1 200 +Content-Type: application/json + +{ + "theme": "", + "homeDashboardId": 0, + "timezone": "" +} +``` + +## Update Team Preferences + +`PUT /api/teams/:teamId/preferences` + +**Example Request**: + +```http +PUT /api/teams/2/preferences HTTP/1.1 +Accept: application/json +Content-Type: application/json +Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + +{ + "theme": "dark", + "homeDashboardId": 39, + "timezone": "utc" +} +``` + +JSON Body Schema: + +- **theme** - One of: ``light``, ``dark``, or an empty string for the default theme +- **homeDashboardId** - The numerical ``:id`` of a dashboard, default: ``0`` +- **timezone** - One of: ``utc``, ``browser``, or an empty string for the default + +Omitting a key will cause the current value to be replaced with the system default value. + +**Example Response**: + +```http +HTTP/1.1 200 +Content-Type: text/plain; charset=utf-8 + +{ + "message":"Preferences updated" +} +``` From cf0db51659b97d8d8a46f8a082c2ec9f5260a913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 15 Nov 2018 13:37:29 +0100 Subject: [PATCH 6/9] Trying to reduce the amount of duplication with preferences --- public/app/core/actions/user.ts | 28 ---- .../core/components/Picker/SimplePicker.tsx | 5 +- .../SharedPreferences/SharedPreferences.tsx | 134 ++++++++++++++++++ public/app/core/reducers/index.ts | 2 - public/app/core/reducers/user.ts | 15 -- .../app/features/org/OrgDetailsPage.test.tsx | 5 +- public/app/features/org/OrgDetailsPage.tsx | 30 ++-- .../app/features/org/OrgPreferences.test.tsx | 28 ---- public/app/features/org/OrgPreferences.tsx | 116 --------------- public/app/features/org/state/actions.ts | 73 +--------- public/app/features/org/state/reducers.ts | 15 +- .../app/features/profile/PrefControlCtrl.ts | 94 +----------- .../features/profile/partials/profile.html | 2 +- public/app/features/teams/TeamPages.test.tsx | 5 +- public/app/features/teams/TeamPages.tsx | 22 +-- .../features/teams/TeamPreferences.test.tsx | 28 ---- public/app/features/teams/TeamPreferences.tsx | 105 -------------- public/app/features/teams/TeamSettings.tsx | 8 +- .../app/features/teams/__mocks__/teamMocks.ts | 10 +- public/app/features/teams/state/actions.ts | 71 +--------- .../app/features/teams/state/reducers.test.ts | 15 +- public/app/features/teams/state/reducers.ts | 15 +- .../features/teams/state/selectors.test.ts | 8 +- public/app/types/index.ts | 3 +- public/app/types/organization.ts | 7 - public/app/types/teams.ts | 3 - 26 files changed, 172 insertions(+), 675 deletions(-) delete mode 100644 public/app/core/actions/user.ts create mode 100644 public/app/core/components/SharedPreferences/SharedPreferences.tsx delete mode 100644 public/app/core/reducers/user.ts delete mode 100644 public/app/features/org/OrgPreferences.test.tsx delete mode 100644 public/app/features/org/OrgPreferences.tsx delete mode 100644 public/app/features/teams/TeamPreferences.test.tsx delete mode 100644 public/app/features/teams/TeamPreferences.tsx diff --git a/public/app/core/actions/user.ts b/public/app/core/actions/user.ts deleted file mode 100644 index dba0588c058..00000000000 --- a/public/app/core/actions/user.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ThunkAction } from 'redux-thunk'; -import { getBackendSrv } from '../services/backend_srv'; -import { DashboardAcl, DashboardSearchHit, StoreState } from '../../types'; - -type ThunkResult = ThunkAction; - -export type Action = LoadStarredDashboardsAction; - -export enum ActionTypes { - LoadStarredDashboards = 'LOAD_STARRED_DASHBOARDS', -} - -interface LoadStarredDashboardsAction { - type: ActionTypes.LoadStarredDashboards; - payload: DashboardSearchHit[]; -} - -const starredDashboardsLoaded = (dashboards: DashboardAcl[]) => ({ - type: ActionTypes.LoadStarredDashboards, - payload: dashboards, -}); - -export function loadStarredDashboards(): ThunkResult { - return async dispatch => { - const starredDashboards = await getBackendSrv().search({ starred: true }); - dispatch(starredDashboardsLoaded(starredDashboards)); - }; -} diff --git a/public/app/core/components/Picker/SimplePicker.tsx b/public/app/core/components/Picker/SimplePicker.tsx index 6c9e8aca199..817cd14150f 100644 --- a/public/app/core/components/Picker/SimplePicker.tsx +++ b/public/app/core/components/Picker/SimplePicker.tsx @@ -5,13 +5,14 @@ import ResetStyles from './ResetStyles'; interface Props { className?: string; - defaultValue: any; + defaultValue?: any; getOptionLabel: (item: any) => string; getOptionValue: (item: any) => string; onSelected: (item: any) => {} | void; options: any[]; placeholder?: string; width: number; + value: any; } const SimplePicker: SFC = ({ @@ -23,6 +24,7 @@ const SimplePicker: SFC = ({ options, placeholder, width, + value, }) => { return ( - - - -
- - Home Dashboard - - Not finding dashboard you want? Star it first, then it should appear in this select box. - - - - -
- -
- -
- -
-
- -
- -
- -`; - -export function prefsControlDirective() { - return { - restrict: 'E', - controller: PrefsControlCtrl, - bindToController: true, - controllerAs: 'ctrl', - template: template, - scope: { - mode: '@', - }, - }; -} - -coreModule.directive('prefsControl', prefsControlDirective); +react2AngularDirective('prefsControl', SharedPreferences, ['resourceUri']); diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html index 7858e00c683..543b0e2e39a 100644 --- a/public/app/features/profile/partials/profile.html +++ b/public/app/features/profile/partials/profile.html @@ -24,7 +24,7 @@ - +

Teams

diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx index 0070f8dee6c..5d751f46989 100644 --- a/public/app/features/teams/TeamPages.test.tsx +++ b/public/app/features/teams/TeamPages.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { TeamPages, Props } from './TeamPages'; -import { NavModel, Team, OrganizationPreferences } from '../../types'; +import { NavModel, Team } from '../../types'; import { getMockTeam } from './__mocks__/teamMocks'; jest.mock('app/core/config', () => ({ @@ -15,9 +15,6 @@ const setup = (propOverrides?: object) => { loadTeam: jest.fn(), pageName: 'members', team: {} as Team, - loadStarredDashboards: jest.fn(), - loadTeamPreferences: jest.fn(), - preferences: {} as OrganizationPreferences, }; Object.assign(props, propOverrides); diff --git a/public/app/features/teams/TeamPages.tsx b/public/app/features/teams/TeamPages.tsx index 0e39eab7260..38ba23262ba 100644 --- a/public/app/features/teams/TeamPages.tsx +++ b/public/app/features/teams/TeamPages.tsx @@ -7,14 +7,12 @@ import PageHeader from 'app/core/components/PageHeader/PageHeader'; import TeamMembers from './TeamMembers'; import TeamSettings from './TeamSettings'; import TeamGroupSync from './TeamGroupSync'; -import TeamPreferences from './TeamPreferences'; -import { NavModel, Team, OrganizationPreferences } from 'app/types'; -import { loadTeam, loadTeamPreferences } from './state/actions'; +import { NavModel, Team } from 'app/types'; +import { loadTeam } from './state/actions'; import { getTeam } from './state/selectors'; import { getTeamLoadingNav } from './state/navModel'; import { getNavModel } from 'app/core/selectors/navModel'; import { getRouteParamsId, getRouteParamsPage } from '../../core/selectors/location'; -import { loadStarredDashboards } from '../../core/actions/user'; export interface Props { team: Team; @@ -22,9 +20,6 @@ export interface Props { teamId: number; pageName: string; navModel: NavModel; - preferences: OrganizationPreferences; - loadStarredDashboards: typeof loadStarredDashboards; - loadTeamPreferences: typeof loadTeamPreferences; } interface State { @@ -47,9 +42,7 @@ export class TeamPages extends PureComponent { } async componentDidMount() { - await this.props.loadStarredDashboards(); await this.fetchTeam(); - await this.props.loadTeamPreferences(); } async fetchTeam() { @@ -73,13 +66,7 @@ export class TeamPages extends PureComponent { return ; case PageTypes.Settings: - return ( -
- - -
- ); - + return ; case PageTypes.GroupSync: return isSyncEnabled && ; } @@ -109,14 +96,11 @@ function mapStateToProps(state) { teamId: teamId, pageName: pageName, team: getTeam(state.team, teamId), - preferences: state.preferences, }; } const mapDispatchToProps = { loadTeam, - loadStarredDashboards, - loadTeamPreferences, }; export default hot(module)(connect(mapStateToProps, mapDispatchToProps)(TeamPages)); diff --git a/public/app/features/teams/TeamPreferences.test.tsx b/public/app/features/teams/TeamPreferences.test.tsx deleted file mode 100644 index 2da8b2b1cfb..00000000000 --- a/public/app/features/teams/TeamPreferences.test.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import React from 'react'; -import { shallow } from 'enzyme'; -import { TeamPreferences, Props } from './TeamPreferences'; - -const setup = () => { - const props: Props = { - preferences: { - homeDashboardId: 1, - timezone: 'UTC', - theme: 'Default', - }, - starredDashboards: [{ id: 1, title: 'Standard dashboard', url: '', uri: '', uid: '', type: '', tags: [] }], - setTeamTimezone: jest.fn(), - setTeamTheme: jest.fn(), - setTeamHomeDashboard: jest.fn(), - updateTeamPreferences: jest.fn(), - }; - - return shallow(); -}; - -describe('Render', () => { - it('should render component', () => { - const wrapper = setup(); - - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/public/app/features/teams/TeamPreferences.tsx b/public/app/features/teams/TeamPreferences.tsx deleted file mode 100644 index a6b8547c4db..00000000000 --- a/public/app/features/teams/TeamPreferences.tsx +++ /dev/null @@ -1,105 +0,0 @@ -import React, { PureComponent } from 'react'; -import { connect } from 'react-redux'; -import { Label } from '../../core/components/Label/Label'; -import SimplePicker from '../../core/components/Picker/SimplePicker'; -import { DashboardSearchHit, OrganizationPreferences } from 'app/types'; -import { setTeamHomeDashboard, setTeamTheme, setTeamTimezone, updateTeamPreferences } from './state/actions'; - -export interface Props { - preferences: OrganizationPreferences; - starredDashboards: DashboardSearchHit[]; - setTeamHomeDashboard: typeof setTeamHomeDashboard; - setTeamTheme: typeof setTeamTheme; - setTeamTimezone: typeof setTeamTimezone; - updateTeamPreferences: typeof updateTeamPreferences; -} - -const themes = [{ value: '', text: 'Default' }, { value: 'dark', text: 'Dark' }, { value: 'light', text: 'Light' }]; - -const timezones = [ - { value: '', text: 'Default' }, - { value: 'browser', text: 'Local browser time' }, - { value: 'utc', text: 'UTC' }, -]; - -export class TeamPreferences extends PureComponent { - onSubmitForm = event => { - event.preventDefault(); - this.props.updateTeamPreferences(); - }; - - render() { - const { preferences, starredDashboards, setTeamHomeDashboard, setTeamTimezone, setTeamTheme } = this.props; - - const dashboards: DashboardSearchHit[] = [ - { id: 0, title: 'Default', tags: [], type: '', uid: '', uri: '', url: '' }, - ...starredDashboards, - ]; - - return ( -
-

Preferences

-
- UI Theme - theme.value === preferences.theme)} - options={themes} - getOptionValue={i => i.value} - getOptionLabel={i => i.text} - onSelected={theme => setTeamTheme(theme.value)} - width={20} - /> -
-
- - dashboard.id === preferences.homeDashboardId)} - getOptionValue={i => i.id} - getOptionLabel={i => i.title} - onSelected={(dashboard: DashboardSearchHit) => setTeamHomeDashboard(dashboard.id)} - options={dashboards} - placeholder="Chose default dashboard" - width={20} - /> -
-
- - timezone.value === preferences.timezone)} - getOptionValue={i => i.value} - getOptionLabel={i => i.text} - onSelected={timezone => setTeamTimezone(timezone.value)} - options={timezones} - width={20} - /> -
-
- -
-
- ); - } -} - -function mapStateToProps(state) { - return { - preferences: state.team.preferences, - starredDashboards: state.user.starredDashboards, - }; -} - -const mapDispatchToProps = { - setTeamHomeDashboard, - setTeamTimezone, - setTeamTheme, - updateTeamPreferences, -}; - -export default connect(mapStateToProps, mapDispatchToProps)(TeamPreferences); diff --git a/public/app/features/teams/TeamSettings.tsx b/public/app/features/teams/TeamSettings.tsx index 45977de95bf..35c306d664e 100644 --- a/public/app/features/teams/TeamSettings.tsx +++ b/public/app/features/teams/TeamSettings.tsx @@ -1,10 +1,12 @@ import React from 'react'; import { connect } from 'react-redux'; + import { Label } from 'app/core/components/Label/Label'; -import { Team } from '../../types'; +import { SharedPreferences } from 'app/core/components/SharedPreferences/SharedPreferences'; import { updateTeam } from './state/actions'; -import { getRouteParamsId } from '../../core/selectors/location'; +import { getRouteParamsId } from 'app/core/selectors/location'; import { getTeam } from './state/selectors'; +import { Team } from 'app/types'; export interface Props { team: Team; @@ -41,6 +43,7 @@ export class TeamSettings extends React.Component { }; render() { + const { team } = this.props; const { name, email } = this.state; return ( @@ -76,6 +79,7 @@ export class TeamSettings extends React.Component {
+ ); } diff --git a/public/app/features/teams/__mocks__/teamMocks.ts b/public/app/features/teams/__mocks__/teamMocks.ts index c3ab2cdfbea..339f227c081 100644 --- a/public/app/features/teams/__mocks__/teamMocks.ts +++ b/public/app/features/teams/__mocks__/teamMocks.ts @@ -1,4 +1,4 @@ -import { Team, TeamGroup, TeamMember, OrganizationPreferences } from 'app/types'; +import { Team, TeamGroup, TeamMember } from 'app/types'; export const getMultipleMockTeams = (numberOfTeams: number): Team[] => { const teams: Team[] = []; @@ -65,11 +65,3 @@ export const getMockTeamGroups = (amount: number): TeamGroup[] => { return groups; }; - -export const getMockTeamPreferences = (): OrganizationPreferences => { - return { - theme: 'dark', - timezone: 'browser', - homeDashboardId: 1, - }; -}; diff --git a/public/app/features/teams/state/actions.ts b/public/app/features/teams/state/actions.ts index d8bdfb88f47..d948dc1c5a3 100644 --- a/public/app/features/teams/state/actions.ts +++ b/public/app/features/teams/state/actions.ts @@ -1,20 +1,16 @@ import { ThunkAction } from 'redux-thunk'; import { getBackendSrv } from 'app/core/services/backend_srv'; -import { StoreState, Team, TeamGroup, TeamMember, OrganizationPreferences } from 'app/types'; +import { StoreState, Team, TeamGroup, TeamMember } from 'app/types'; import { updateNavIndex, UpdateNavIndexAction } from 'app/core/actions'; import { buildNavModel } from './navModel'; export enum ActionTypes { LoadTeams = 'LOAD_TEAMS', LoadTeam = 'LOAD_TEAM', - LoadTeamPreferences = 'LOAD_TEAM_PREFERENCES', SetSearchQuery = 'SET_TEAM_SEARCH_QUERY', SetSearchMemberQuery = 'SET_TEAM_MEMBER_SEARCH_QUERY', LoadTeamMembers = 'TEAM_MEMBERS_LOADED', LoadTeamGroups = 'TEAM_GROUPS_LOADED', - SetTeamTheme = 'SET_TEAM_THEME', - SetTeamHomeDashboard = 'SET_TEAM_HOME_DASHBOARD', - SetTeamTimezone = 'SET_TEAM_TIMEZONE', } export interface LoadTeamsAction { @@ -27,11 +23,6 @@ export interface LoadTeamAction { payload: Team; } -export interface LoadTeamPreferencesAction { - type: ActionTypes.LoadTeamPreferences; - payload: OrganizationPreferences; -} - export interface LoadTeamMembersAction { type: ActionTypes.LoadTeamMembers; payload: TeamMember[]; @@ -52,32 +43,13 @@ export interface SetSearchMemberQueryAction { payload: string; } -export interface SetTeamThemeAction { - type: ActionTypes.SetTeamTheme; - payload: string; -} - -export interface SetTeamHomeDashboardAction { - type: ActionTypes.SetTeamHomeDashboard; - payload: number; -} - -export interface SetTeamTimezoneAction { - type: ActionTypes.SetTeamTimezone; - payload: string; -} - export type Action = | LoadTeamsAction | SetSearchQueryAction | LoadTeamAction - | LoadTeamPreferencesAction | LoadTeamMembersAction | SetSearchMemberQueryAction - | LoadTeamGroupsAction - | SetTeamThemeAction - | SetTeamHomeDashboardAction - | SetTeamTimezoneAction; + | LoadTeamGroupsAction; type ThunkResult = ThunkAction; @@ -101,11 +73,6 @@ const teamGroupsLoaded = (teamGroups: TeamGroup[]): LoadTeamGroupsAction => ({ payload: teamGroups, }); -const teamPreferencesLoaded = (preferences: OrganizationPreferences): LoadTeamPreferencesAction => ({ - type: ActionTypes.LoadTeamPreferences, - payload: preferences, -}); - export const setSearchMemberQuery = (searchQuery: string): SetSearchMemberQueryAction => ({ type: ActionTypes.SetSearchMemberQuery, payload: searchQuery, @@ -116,21 +83,6 @@ export const setSearchQuery = (searchQuery: string): SetSearchQueryAction => ({ payload: searchQuery, }); -export const setTeamTheme = (theme: string) => ({ - type: ActionTypes.SetTeamTheme, - payload: theme, -}); - -export const setTeamHomeDashboard = (id: number) => ({ - type: ActionTypes.SetTeamHomeDashboard, - payload: id, -}); - -export const setTeamTimezone = (timezone: string) => ({ - type: ActionTypes.SetTeamTimezone, - payload: timezone, -}); - export function loadTeams(): ThunkResult { return async dispatch => { const response = await getBackendSrv().get('/api/teams/search', { perpage: 1000, page: 1 }); @@ -208,22 +160,3 @@ export function deleteTeam(id: number): ThunkResult { dispatch(loadTeams()); }; } - -export function loadTeamPreferences(): ThunkResult { - return async (dispatch, getStore) => { - const team = getStore().team.team; - const response = await getBackendSrv().get(`/api/teams/${team.id}/preferences`); - dispatch(teamPreferencesLoaded(response)); - }; -} - -export function updateTeamPreferences() { - return async (dispatch, getStore) => { - const team = getStore().team.team; - const preferences = getStore().team.preferences; - - await getBackendSrv().put(`/api/teams/${team.id}/preferences`, preferences); - - dispatch(loadTeamPreferences()); - }; -} diff --git a/public/app/features/teams/state/reducers.test.ts b/public/app/features/teams/state/reducers.test.ts index 892895d4184..7f7a33d60ac 100644 --- a/public/app/features/teams/state/reducers.test.ts +++ b/public/app/features/teams/state/reducers.test.ts @@ -1,6 +1,6 @@ import { Action, ActionTypes } from './actions'; import { initialTeamsState, initialTeamState, teamReducer, teamsReducer } from './reducers'; -import { getMockTeam, getMockTeamMember, getMockTeamPreferences } from '../__mocks__/teamMocks'; +import { getMockTeam, getMockTeamMember } from '../__mocks__/teamMocks'; describe('teams reducer', () => { it('should set teams', () => { @@ -69,17 +69,4 @@ describe('team reducer', () => { expect(result.searchMemberQuery).toEqual('member'); }); - - it('should set team preferences', () => { - const mockTeamPrefs = getMockTeamPreferences(); - - const action: Action = { - type: ActionTypes.LoadTeamPreferences, - payload: mockTeamPrefs, - }; - - const result = teamReducer(initialTeamState, action); - - expect(result.preferences).toEqual(mockTeamPrefs); - }); }); diff --git a/public/app/features/teams/state/reducers.ts b/public/app/features/teams/state/reducers.ts index 0ef358e19d7..2e72dce0afb 100644 --- a/public/app/features/teams/state/reducers.ts +++ b/public/app/features/teams/state/reducers.ts @@ -1,4 +1,4 @@ -import { Team, TeamGroup, TeamMember, TeamsState, TeamState, OrganizationPreferences } from 'app/types'; +import { Team, TeamGroup, TeamMember, TeamsState, TeamState } from 'app/types'; import { Action, ActionTypes } from './actions'; export const initialTeamsState: TeamsState = { teams: [], searchQuery: '', hasFetched: false }; @@ -7,7 +7,6 @@ export const initialTeamState: TeamState = { members: [] as TeamMember[], groups: [] as TeamGroup[], searchMemberQuery: '', - preferences: {} as OrganizationPreferences, }; export const teamsReducer = (state = initialTeamsState, action: Action): TeamsState => { @@ -34,18 +33,6 @@ export const teamReducer = (state = initialTeamState, action: Action): TeamState case ActionTypes.LoadTeamGroups: return { ...state, groups: action.payload }; - - case ActionTypes.LoadTeamPreferences: - return { ...state, preferences: action.payload }; - - case ActionTypes.SetTeamTheme: - return { ...state, preferences: { ...state.preferences, theme: action.payload } }; - - case ActionTypes.SetTeamHomeDashboard: - return { ...state, preferences: { ...state.preferences, homeDashboardId: action.payload } }; - - case ActionTypes.SetTeamTimezone: - return { ...state, preferences: { ...state.preferences, timezone: action.payload } }; } return state; diff --git a/public/app/features/teams/state/selectors.test.ts b/public/app/features/teams/state/selectors.test.ts index 3aab99da1c2..e88fbdfd4b1 100644 --- a/public/app/features/teams/state/selectors.test.ts +++ b/public/app/features/teams/state/selectors.test.ts @@ -1,6 +1,6 @@ import { getTeam, getTeamMembers, getTeams } from './selectors'; import { getMockTeam, getMockTeamMembers, getMultipleMockTeams } from '../__mocks__/teamMocks'; -import { Team, TeamGroup, TeamsState, TeamState, OrganizationPreferences } from '../../../types'; +import { Team, TeamGroup, TeamsState, TeamState } from '../../../types'; describe('Teams selectors', () => { describe('Get teams', () => { @@ -10,7 +10,6 @@ describe('Teams selectors', () => { const mockState: TeamsState = { teams: mockTeams, searchQuery: '', hasFetched: false }; const teams = getTeams(mockState); - expect(teams).toEqual(mockTeams); }); @@ -18,7 +17,6 @@ describe('Teams selectors', () => { const mockState: TeamsState = { teams: mockTeams, searchQuery: '5', hasFetched: false }; const teams = getTeams(mockState); - expect(teams.length).toEqual(1); }); }); @@ -34,11 +32,9 @@ describe('Team selectors', () => { searchMemberQuery: '', members: [], groups: [], - preferences: {} as OrganizationPreferences, }; const team = getTeam(mockState, '1'); - expect(team).toEqual(mockTeam); }); }); @@ -52,11 +48,9 @@ describe('Team selectors', () => { searchMemberQuery: '', members: mockTeamMembers, groups: [] as TeamGroup[], - preferences: {} as OrganizationPreferences, }; const members = getTeamMembers(mockState); - expect(members).toEqual(mockTeamMembers); }); }); diff --git a/public/app/types/index.ts b/public/app/types/index.ts index fc176fed7e2..3bf6b4c9803 100644 --- a/public/app/types/index.ts +++ b/public/app/types/index.ts @@ -22,7 +22,7 @@ import { } from './series'; import { PanelProps, PanelOptionsProps } from './panel'; import { PluginDashboard, PluginMeta, Plugin, PluginsState } from './plugins'; -import { Organization, OrganizationPreferences, OrganizationState } from './organization'; +import { Organization, OrganizationState } from './organization'; import { AppNotification, AppNotificationSeverity, @@ -81,7 +81,6 @@ export { PluginDashboard, Organization, OrganizationState, - OrganizationPreferences, AppNotification, AppNotificationsState, AppNotificationSeverity, diff --git a/public/app/types/organization.ts b/public/app/types/organization.ts index 52cb130e082..da67ead34ae 100644 --- a/public/app/types/organization.ts +++ b/public/app/types/organization.ts @@ -3,13 +3,6 @@ export interface Organization { id: number; } -export interface OrganizationPreferences { - homeDashboardId: number; - theme: string; - timezone: string; -} - export interface OrganizationState { organization: Organization; - preferences: OrganizationPreferences; } diff --git a/public/app/types/teams.ts b/public/app/types/teams.ts index b0480f875d6..a524f0dcf87 100644 --- a/public/app/types/teams.ts +++ b/public/app/types/teams.ts @@ -1,5 +1,3 @@ -import { OrganizationPreferences } from './organization'; - export interface Team { id: number; name: string; @@ -33,5 +31,4 @@ export interface TeamState { members: TeamMember[]; groups: TeamGroup[]; searchMemberQuery: string; - preferences: OrganizationPreferences; } From b8539570d0ae6fe84d1e5e7f802f488749d51f77 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 15 Nov 2018 14:16:17 +0100 Subject: [PATCH 7/9] fix snapshot tests --- .../OrgDetailsPage.test.tsx.snap | 4 +- .../OrgPreferences.test.tsx.snap | 136 ------------------ .../__snapshots__/TeamPages.test.tsx.snap | 5 +- .../TeamPreferences.test.tsx.snap | 136 ------------------ .../__snapshots__/TeamSettings.test.tsx.snap | 3 + 5 files changed, 7 insertions(+), 277 deletions(-) delete mode 100644 public/app/features/org/__snapshots__/OrgPreferences.test.tsx.snap delete mode 100644 public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap diff --git a/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap b/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap index 28806d2bf1d..582d626d315 100644 --- a/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap +++ b/public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap @@ -29,7 +29,9 @@ exports[`Render should render organization and preferences 1`] = ` onSubmit={[Function]} orgName="Cool org" /> - + diff --git a/public/app/features/org/__snapshots__/OrgPreferences.test.tsx.snap b/public/app/features/org/__snapshots__/OrgPreferences.test.tsx.snap deleted file mode 100644 index 06bf464a4a0..00000000000 --- a/public/app/features/org/__snapshots__/OrgPreferences.test.tsx.snap +++ /dev/null @@ -1,136 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Render should render component 1`] = ` -
-

- Preferences -

-
- - UI Theme - - -
-
- - Home Dashboard - - -
-
- - -
-
- -
-
-`; diff --git a/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap index 7c5853b107f..f966c52983d 100644 --- a/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap @@ -44,10 +44,7 @@ exports[`Render should render settings and preferences page 1`] = `
-
- - -
+
`; diff --git a/public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap deleted file mode 100644 index 06bf464a4a0..00000000000 --- a/public/app/features/teams/__snapshots__/TeamPreferences.test.tsx.snap +++ /dev/null @@ -1,136 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Render should render component 1`] = ` -
-

- Preferences -

-
- - UI Theme - - -
-
- - Home Dashboard - - -
-
- - -
-
- -
-
-`; diff --git a/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap index 0f6573ccf90..49c44d3291f 100644 --- a/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamSettings.test.tsx.snap @@ -53,5 +53,8 @@ exports[`Render should render component 1`] = ` + `; From 9606491f6c7af70a262be225e514c97f614dd942 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 15 Nov 2018 14:29:14 +0100 Subject: [PATCH 8/9] reload browser after preferences been updated --- .../app/core/components/SharedPreferences/SharedPreferences.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx index 8600c51e3a1..9222e715202 100644 --- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx +++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx @@ -62,6 +62,7 @@ export class SharedPreferences extends PureComponent { theme, timezone, }); + window.location.reload(); }; onThemeChanged = (theme: string) => { From 52a71596eb94fb31b3959a82e4dbecb41fefecce Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 15 Nov 2018 14:43:50 +0100 Subject: [PATCH 9/9] fix selected home dashboard should show as selected even though its not starred --- .../components/SharedPreferences/SharedPreferences.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx index 9222e715202..098cbe16ab8 100644 --- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx +++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx @@ -30,7 +30,6 @@ export class SharedPreferences extends PureComponent { constructor(props) { super(props); - console.log('props', props); this.state = { homeDashboardId: 0, @@ -44,6 +43,13 @@ export class SharedPreferences extends PureComponent { const prefs = await this.backendSrv.get(`/api/${this.props.resourceUri}/preferences`); const dashboards = await this.backendSrv.search({ starred: true }); + if (prefs.homeDashboardId > 0 && !dashboards.find(d => d.id === prefs.homeDashboardId)) { + const missing = await this.backendSrv.search({ dashboardIds: [prefs.homeDashboardId] }); + if (missing && missing.length > 0) { + dashboards.push(missing[0]); + } + } + this.setState({ homeDashboardId: prefs.homeDashboardId, theme: prefs.theme,