From ac3e175e540f90caa730cd966f72cfdd49cffb43 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 8 Nov 2018 00:46:13 +0100 Subject: [PATCH 01/32] fix switching from es raw document metric breaks query editor --- .../plugins/datasource/elasticsearch/metric_agg.ts | 6 ++++++ .../datasource/elasticsearch/query_builder.ts | 4 ++-- .../plugins/datasource/elasticsearch/query_ctrl.ts | 13 +++++++++++++ .../plugins/datasource/elasticsearch/query_def.ts | 8 ++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.ts b/public/app/plugins/datasource/elasticsearch/metric_agg.ts index 1dd0d892360..56f874d90b9 100644 --- a/public/app/plugins/datasource/elasticsearch/metric_agg.ts +++ b/public/app/plugins/datasource/elasticsearch/metric_agg.ts @@ -160,6 +160,12 @@ export class ElasticMetricAggCtrl { $scope.agg.settings = {}; $scope.agg.meta = {}; $scope.showOptions = false; + + // reset back to metric/group by query + if ($scope.target.bucketAggs.length === 0 && $scope.agg.type !== 'raw_document') { + $scope.target.bucketAggs = [queryDef.defaultBucketAgg()]; + } + $scope.updatePipelineAggOptions(); $scope.onChange(); }; diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.ts b/public/app/plugins/datasource/elasticsearch/query_builder.ts index 21af0ba9b80..efdeee68370 100644 --- a/public/app/plugins/datasource/elasticsearch/query_builder.ts +++ b/public/app/plugins/datasource/elasticsearch/query_builder.ts @@ -181,8 +181,8 @@ export class ElasticQueryBuilder { build(target, adhocFilters?, queryString?) { // make sure query has defaults; - target.metrics = target.metrics || [{ type: 'count', id: '1' }]; - target.bucketAggs = target.bucketAggs || [{ type: 'date_histogram', id: '2', settings: { interval: 'auto' } }]; + target.metrics = target.metrics || [queryDef.defaultMetricAgg()]; + target.bucketAggs = target.bucketAggs || [queryDef.defaultBucketAgg()]; target.timeField = this.timeField; let i, nestedAggs, metric; diff --git a/public/app/plugins/datasource/elasticsearch/query_ctrl.ts b/public/app/plugins/datasource/elasticsearch/query_ctrl.ts index 422d35dd277..81dbd5b8f8a 100644 --- a/public/app/plugins/datasource/elasticsearch/query_ctrl.ts +++ b/public/app/plugins/datasource/elasticsearch/query_ctrl.ts @@ -17,6 +17,19 @@ export class ElasticQueryCtrl extends QueryCtrl { super($scope, $injector); this.esVersion = this.datasource.esVersion; + + this.target = this.target || {}; + this.target.metrics = this.target.metrics || [queryDef.defaultMetricAgg()]; + this.target.bucketAggs = this.target.bucketAggs || [queryDef.defaultBucketAgg()]; + + if (this.target.bucketAggs.length === 0) { + const metric = this.target.metrics[0]; + if (!metric || metric.type !== 'raw_document') { + this.target.bucketAggs = [queryDef.defaultBucketAgg()]; + } + this.refresh(); + } + this.queryUpdated(); } diff --git a/public/app/plugins/datasource/elasticsearch/query_def.ts b/public/app/plugins/datasource/elasticsearch/query_def.ts index dd65a8b373e..3ea5945f54d 100644 --- a/public/app/plugins/datasource/elasticsearch/query_def.ts +++ b/public/app/plugins/datasource/elasticsearch/query_def.ts @@ -228,3 +228,11 @@ export function describeOrderBy(orderBy, target) { return 'metric not found'; } } + +export function defaultMetricAgg() { + return { type: 'count', id: '1' }; +} + +export function defaultBucketAgg() { + return { type: 'date_histogram', id: '2', settings: { interval: 'auto' } }; +} From b2e6b2485fe2c7084f516b64a9cb44a12eed04c7 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Mon, 12 Nov 2018 18:06:12 +0000 Subject: [PATCH 02/32] Explore: Dont set datasource in state if navigated away Datasource selection triggers a connection test, on success the DS is set in the Explore state. If the test takes long and user selects a different DS, and just after that the first test succeeds, then the first DS overwrites the state. * when test returns check if datasource is still the requested one --- public/app/features/explore/Explore.tsx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index 753f158fd9f..238c5c917b9 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -94,6 +94,10 @@ export class Explore extends React.PureComponent { * Not kept in component state to prevent edit-render roundtrips. */ queryExpressions: string[]; + /** + * Local ID cache to compare requested vs selected datasource + */ + requestedDatasourceId: string; constructor(props) { super(props); @@ -167,6 +171,9 @@ export class Explore extends React.PureComponent { const datasourceId = datasource.meta.id; let datasourceError = null; + // Keep ID to track selection + this.requestedDatasourceId = datasourceId; + try { const testResult = await datasource.testDatasource(); datasourceError = testResult.status === 'success' ? null : testResult.message; @@ -174,6 +181,11 @@ export class Explore extends React.PureComponent { datasourceError = (error && error.statusText) || 'Network error'; } + if (datasourceId !== this.requestedDatasourceId) { + // User already changed datasource again, discard results + return; + } + const historyKey = `grafana.explore.history.${datasourceId}`; const history = store.getObject(historyKey, []); From b00542e194803dbeacffca5b4b56fc9ecb458b1c Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 12 Nov 2018 20:01:53 +0100 Subject: [PATCH 03/32] 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 a251461c621f4ad016c435feeacf0b66b02aa931 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 12 Nov 2018 20:58:59 +0100 Subject: [PATCH 04/32] 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 a1fad2d8d49d8cac0265458972507ed2e3556dba Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Tue, 13 Nov 2018 11:00:32 +0000 Subject: [PATCH 05/32] Explore: Fix table pagination styles - get rid of drop shadow - get rid of top border - add min height for better no-data placement - add margins --- public/sass/pages/_explore.scss | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss index 4b07b04e330..58b4ca17840 100644 --- a/public/sass/pages/_explore.scss +++ b/public/sass/pages/_explore.scss @@ -320,8 +320,11 @@ .ReactTable { border: none; +} + +.ReactTable .rt-table { // Allow some space for the no-data text - min-height: 120px; + min-height: 90px; } .ReactTable .rt-thead.-header { @@ -350,6 +353,11 @@ .ReactTable .rt-tbody .rt-td:last-child { border-right: none; } +.ReactTable .-pagination { + border-top: none; + box-shadow: none; + margin-top: $panel-margin; +} .ReactTable .-pagination .-btn { color: $blue; background: $list-item-bg; @@ -371,6 +379,10 @@ .ReactTable .rt-tr .rt-td:last-child { text-align: right; } +.ReactTable .rt-noData { + top: 60px; + z-index: inherit; +} // React-component cascade fix: show "loading" even though item can expand From f6aab0fe4bca5721be590ebd43aeb881354e19ac Mon Sep 17 00:00:00 2001 From: Peter Holmberg Date: Tue, 13 Nov 2018 18:23:00 +0100 Subject: [PATCH 06/32] 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 7b6612012283a8fb135946dcfdcae25f54abba86 Mon Sep 17 00:00:00 2001 From: Peter Holmberg Date: Tue, 13 Nov 2018 18:23:35 +0100 Subject: [PATCH 07/32] 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 bb66661cc6141d409237e2ae4d55547891367177 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 14 Nov 2018 11:30:19 +0100 Subject: [PATCH 08/32] changelog: adds note about closing #14043 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index afde0874f87..f9b8e84200c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,10 @@ * Postgres/MySQL/MSSQL datasources now per default uses `max open connections` = `unlimited` (earlier 10), `max idle connections` = `2` (earlier 10) and `connection max lifetime` = `4` hours (earlier unlimited) +# 5.3.5 (unreleased) + +* **Security**: Upgrade macaron session package to fix security issue. [#14043](https://github.com/grafana/grafana/pull/14043) + # 5.3.4 (2018-11-13) * **Alerting**: Delete alerts when parent folder was deleted [#13322](https://github.com/grafana/grafana/issues/13322) From ec1930626025334c02ad1288be5a152517a44812 Mon Sep 17 00:00:00 2001 From: stop-cran Date: Wed, 14 Nov 2018 18:12:05 +0200 Subject: [PATCH 09/32] [elasticsearch] Do not set a placeholder to index name, if it's already specified. --- .../plugins/datasource/elasticsearch/config_ctrl.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/elasticsearch/config_ctrl.ts b/public/app/plugins/datasource/elasticsearch/config_ctrl.ts index 154ff9bcb91..fad3a6895ae 100644 --- a/public/app/plugins/datasource/elasticsearch/config_ctrl.ts +++ b/public/app/plugins/datasource/elasticsearch/config_ctrl.ts @@ -28,9 +28,13 @@ export class ElasticConfigCtrl { ]; indexPatternTypeChanged() { - const def = _.find(this.indexPatternTypes, { - value: this.current.jsonData.interval, - }); - this.current.database = def.example || 'es-index-name'; + if (!this.current.database || + this.current.database.length === 0 || + this.current.database.startsWith('[logstash-]')) { + const def = _.find(this.indexPatternTypes, { + value: this.current.jsonData.interval, + }); + this.current.database = def.example || 'es-index-name'; + } } } From db6af9eed133849415d95ee3eb75135d5f9a99d1 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 14 Nov 2018 17:59:32 +0100 Subject: [PATCH 10/32] 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 63e817e7c8922ef5e2e77937ae517a3d011ad051 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 14 Nov 2018 18:12:46 +0100 Subject: [PATCH 11/32] changelog: add notes about closing #6367 [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9b8e84200c..ae088da9740 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * **Cloudwatch**: Show all available CloudWatch regions [#12308](https://github.com/grafana/grafana/issues/12308), thx [@mtanda](https://github.com/mtanda) * **Cloudwatch**: AWS/Connect metrics and dimensions [#13970](https://github.com/grafana/grafana/pull/13970), thx [@zcoffy](https://github.com/zcoffy) * **Postgres**: Add delta window function to postgres query builder [#13925](https://github.com/grafana/grafana/issues/13925), thx [svenklemm](https://github.com/svenklemm) +* **Elasticsearch**: Fix switching to/from es raw document metric query [#6367](https://github.com/grafana/grafana/issues/6367) * **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg) * **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu) * **DingDing**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino) From 0652d8bbe2ea474981f0e65eaa96ac549689c9e0 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 14 Nov 2018 18:15:02 +0100 Subject: [PATCH 12/32] changelog: add notes about closing #11977 [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae088da9740..7390c4f1799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ * **Cloudwatch**: AWS/Connect metrics and dimensions [#13970](https://github.com/grafana/grafana/pull/13970), thx [@zcoffy](https://github.com/zcoffy) * **Postgres**: Add delta window function to postgres query builder [#13925](https://github.com/grafana/grafana/issues/13925), thx [svenklemm](https://github.com/svenklemm) * **Elasticsearch**: Fix switching to/from es raw document metric query [#6367](https://github.com/grafana/grafana/issues/6367) +* **Elasticsearch**: Fix deprecation warning about terms aggregation order key in Elasticsearch 6.x [#11977](https://github.com/grafana/grafana/issues/11977) * **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg) * **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu) * **DingDing**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino) From 2d92d217ebfe709b6a43edfa1c760ac8114e2e8b Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 14 Nov 2018 18:16:41 +0100 Subject: [PATCH 13/32] update changelog [skip ci] --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7390c4f1799..a3c0ce494f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,13 +16,13 @@ * **Postgres**: Add delta window function to postgres query builder [#13925](https://github.com/grafana/grafana/issues/13925), thx [svenklemm](https://github.com/svenklemm) * **Elasticsearch**: Fix switching to/from es raw document metric query [#6367](https://github.com/grafana/grafana/issues/6367) * **Elasticsearch**: Fix deprecation warning about terms aggregation order key in Elasticsearch 6.x [#11977](https://github.com/grafana/grafana/issues/11977) -* **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg) -* **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu) -* **DingDing**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino) -* **Internal metrics**: Renamed `grafana_info` to `grafana_build_info` and added branch, goversion and revision [#13876](https://github.com/grafana/grafana/pull/13876) -* **Alerting**: Increaste default duration for queries [#13945](https://github.com/grafana/grafana/pull/13945) * **Table**: Fix CSS alpha background-color applied twice in table cell with link [#13606](https://github.com/grafana/grafana/issues/13606), thx [@grisme](https://github.com/grisme) +* **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg) +* **Alerting**: Increaste default duration for queries [#13945](https://github.com/grafana/grafana/pull/13945) * **Alerting**: More options for the Slack Alert notifier [#13993](https://github.com/grafana/grafana/issues/13993), thx [@andreykaipov](https://github.com/andreykaipov) +* **Alerting**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino) +* **Internal metrics**: Renamed `grafana_info` to `grafana_build_info` and added branch, goversion and revision [#13876](https://github.com/grafana/grafana/pull/13876) +* **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu) ### Breaking changes From b97e2c7240328dccc48699b8bfc8a6aad344b12a Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Wed, 14 Nov 2018 08:07:16 +0100 Subject: [PATCH 14/32] panel-header: Display description in modal --- .../dashboard/dashgrid/PanelHeader/PanelHeader.tsx | 14 ++++++++------ public/app/features/dashboard/panel_model.ts | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx index 80def11b348..37d9d53cb5d 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx @@ -2,6 +2,7 @@ import React, { PureComponent } from 'react'; import classNames from 'classnames'; import { PanelHeaderMenu } from './PanelHeaderMenu'; +import Tooltip from 'app/core/components/Tooltip/Tooltip'; import { DashboardModel } from 'app/features/dashboard/dashboard_model'; import { PanelModel } from 'app/features/dashboard/panel_model'; @@ -41,14 +42,15 @@ export class PanelHeader extends PureComponent { const isLoading = false; const panelHeaderClass = classNames({ 'panel-header': true, 'grid-drag-handle': !isFullscreen }); const { panel, dashboard, timeInfo } = this.props; - + const cornerCssClass = panel.description ? 'panel-info-corner--info' : ''; return (
- - - - - + + + + + + {isLoading && ( diff --git a/public/app/features/dashboard/panel_model.ts b/public/app/features/dashboard/panel_model.ts index d89f810e95a..e9d7f17812e 100644 --- a/public/app/features/dashboard/panel_model.ts +++ b/public/app/features/dashboard/panel_model.ts @@ -49,6 +49,7 @@ export class PanelModel { maxDataPoints?: number; interval?: string; + description?: string; // non persisted fullscreen: boolean; From 1fa85937bb42e7653caa7e9bceda9801bfa9e7b9 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Wed, 14 Nov 2018 21:27:25 +0100 Subject: [PATCH 15/32] panel-header: Bump @types/react, @types/react-dom, react, react-dom, react-popper to latest versions --- package.json | 13 +++-- yarn.lock | 155 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 137 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 9a04bff77eb..452e4ecb742 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "@types/enzyme": "^3.1.13", "@types/jest": "^23.3.2", "@types/node": "^8.0.31", - "@types/react": "^16.4.14", + "@types/react": "^16.7.6", "@types/react-custom-scrollbars": "^4.0.5", - "@types/react-dom": "^16.0.7", + "@types/react-dom": "^16.0.9", "@types/react-select": "^2.0.4", "angular-mocks": "1.6.6", "autoprefixer": "^6.4.0", @@ -152,12 +152,12 @@ "prismjs": "^1.6.0", "prop-types": "^15.6.2", "rc-cascader": "^0.14.0", - "react": "^16.5.0", + "react": "^16.6.3", "react-custom-scrollbars": "^4.2.1", - "react-dom": "^16.5.0", + "react-dom": "^16.6.3", "react-grid-layout": "0.16.6", "react-highlight-words": "^0.10.0", - "react-popper": "^0.7.5", + "react-popper": "^1.3.0", "react-redux": "^5.0.7", "react-select": "2.1.0", "react-sizeme": "^2.3.6", @@ -180,6 +180,7 @@ "tslint-react": "^3.6.0" }, "resolutions": { - "caniuse-db": "1.0.30000772" + "caniuse-db": "1.0.30000772", + "**/@types/react": "16.7.6" } } diff --git a/yarn.lock b/yarn.lock index 400a432492c..a5d72d5d938 100644 --- a/yarn.lock +++ b/yarn.lock @@ -365,7 +365,7 @@ dependencies: "@types/react" "*" -"@types/react-dom@*", "@types/react-dom@^16.0.7": +"@types/react-dom@*": version "16.0.8" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.8.tgz#6e1366ed629cadf55860cbfcc25db533f5d2fa7d" integrity sha512-WF/KAOia7pskV+J8f+UlNuFeCRkJuJAkyyeYPPtNe6suw0y7cWyUP/DPdPXsGUwQEkv2qlLVSrgVaoCm/PmO0Q== @@ -373,6 +373,14 @@ "@types/node" "*" "@types/react" "*" +"@types/react-dom@^16.0.9": + version "16.0.9" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.9.tgz#73ceb7abe6703822eab6600e65c5c52efd07fb91" + integrity sha512-4Z0bW+75zeQgsEg7RaNuS1k9MKhci7oQqZXxrV5KUGIyXZHHAAL3KA4rjhdH8o6foZ5xsRMSqkoM5A3yRVPR5w== + dependencies: + "@types/node" "*" + "@types/react" "*" + "@types/react-select@^2.0.4": version "2.0.4" resolved "https://registry.yarnpkg.com/@types/react-select/-/react-select-2.0.4.tgz#232c735539412acdc163751157c0a1c7d8aca40b" @@ -389,7 +397,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.4.14": +"@types/react@*": version "16.4.16" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.16.tgz#99f91b1200ae8c2062030402006d3b3c3a177043" integrity sha512-lxyoipLWweAnLnSsV4Ho2NAZTKKmxeYgkTQ6PaDiPDU9JJBUY2zJVVGiK1smzYv8+ZgbqEmcm5xM74GCpunSEA== @@ -397,6 +405,14 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/react@^16.1.0", "@types/react@^16.7.6": + version "16.7.6" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.6.tgz#80e4bab0d0731ad3ae51f320c4b08bdca5f03040" + integrity sha512-QBUfzftr/8eg/q3ZRgf/GaDP6rTYc7ZNem+g4oZM38C9vXyV8AWRWaTQuW5yCoZTsfHrN7b3DeEiUnqH9SrnpA== + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + "@types/tapable@^0": version "0.2.5" resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-0.2.5.tgz#2443fc12da514c81346b1a665675559cee21fa75" @@ -1031,7 +1047,7 @@ arrify@^1.0.0, arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= -asap@^2.0.0: +asap@^2.0.0, asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -1854,7 +1870,7 @@ babel-register@^6.26.0, babel-register@^6.9.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@6.x, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: +babel-runtime@6.x, babel-runtime@6.x.x, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -3148,6 +3164,11 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= +core-js@^1.0.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" + integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= + core-js@^2.0.0, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: version "2.5.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" @@ -3243,6 +3264,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-react-context@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3" + integrity sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag== + dependencies: + fbjs "^0.8.0" + gud "^1.0.0" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -5090,6 +5119,19 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" +fbjs@^0.8.0: + version "0.8.17" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" + integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= + dependencies: + core-js "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + fd-slicer@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" @@ -6067,6 +6109,11 @@ grunt@1.0.1: path-is-absolute "~1.0.0" rimraf "~2.2.8" +gud@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" + integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw== + gzip-size@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-1.0.0.tgz#66cf8b101047227b95bace6ea1da0c177ed5c22f" @@ -7247,6 +7294,14 @@ isomorphic-base64@^1.0.2: resolved "https://registry.yarnpkg.com/isomorphic-base64/-/isomorphic-base64-1.0.2.tgz#f426aae82569ba8a4ec5ca73ad21a44ab1ee7803" integrity sha1-9Caq6CVpuopOxcpzrSGkSrHueAM= +isomorphic-fetch@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" + integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= + dependencies: + node-fetch "^1.0.1" + whatwg-fetch ">=0.10.0" + isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -9211,6 +9266,14 @@ node-fetch-npm@^2.0.2: json-parse-better-errors "^1.0.0" safe-buffer "^5.1.1" +node-fetch@^1.0.1: + version "1.7.3" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" + integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ== + dependencies: + encoding "^0.1.11" + is-stream "^1.0.1" + node-forge@0.7.5: version "0.7.5" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df" @@ -10383,10 +10446,10 @@ pn@^1.1.0: resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== -popper.js@^1.12.5: - version "1.14.4" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6" - integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY= +popper.js@^1.14.4: + version "1.14.5" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.5.tgz#98abcce7c7c34c4ee47fcbc6b3da8af2c0a127bc" + integrity sha512-fs4Sd8bZLgEzrk8aS7Em1qh+wcawtE87kRUJQhK6+LndyV1HerX7+LURzAylVaTyWIn5NTB/lyjnWqw/AZ6Yrw== portfinder@^1.0.9: version "1.0.17" @@ -10953,6 +11016,13 @@ promise-retry@^1.1.1: err-code "^1.0.0" retry "^0.10.0" +promise@^7.1.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== + dependencies: + asap "~2.0.3" + prompts@^0.1.9: version "0.1.14" resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2" @@ -11270,15 +11340,15 @@ react-custom-scrollbars@^4.2.1: prop-types "^15.5.10" raf "^3.1.0" -react-dom@^16.5.0: - version "16.5.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" - integrity sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA== +react-dom@^16.6.3: + version "16.6.3" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.6.3.tgz#8fa7ba6883c85211b8da2d0efeffc9d3825cccc0" + integrity sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - schedule "^0.5.0" + scheduler "^0.11.2" react-draggable@3.x, "react-draggable@^2.2.6 || ^3.0.3": version "3.0.5" @@ -11341,13 +11411,18 @@ react-lifecycles-compat@^3.0.4: resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-popper@^0.7.5: - version "0.7.5" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.7.5.tgz#71c25946f291db381231281f6b95729e8b801596" - integrity sha512-ya9dhhGCf74JTOB2uyksEHhIGw7w9tNZRUJF73lEq2h4H5JT6MBa4PdT4G+sx6fZwq+xKZAL/sVNAIuojPn7Dg== +react-popper@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.0.tgz#e769199bbe1273611957892f9950ef1d42c3f7ce" + integrity sha512-Dbn9kwgFzNFRi8yz/i4Qp7d1hkCYhWX6uJOFz0+PoNNm9uJMnFAqSPNgUUCV49L6p5zz5mKtMiudbgIqjAe1uw== dependencies: - popper.js "^1.12.5" - prop-types "^15.5.10" + "@types/react" "^16.1.0" + babel-runtime "6.x.x" + create-react-context "^0.2.1" + popper.js "^1.14.4" + prop-types "^15.6.1" + typed-styles "^0.0.5" + warning "^3.0.0" react-portal@^3.1.0: version "3.2.0" @@ -11439,15 +11514,15 @@ react-virtualized@^9.21.0: prop-types "^15.6.0" react-lifecycles-compat "^3.0.4" -react@^16.5.0: - version "16.5.2" - resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" - integrity sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw== +react@^16.6.3: + version "16.6.3" + resolved "https://registry.yarnpkg.com/react/-/react-16.6.3.tgz#25d77c91911d6bbdd23db41e70fb094cc1e0871c" + integrity sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - schedule "^0.5.0" + scheduler "^0.11.2" read-chunk@^2.1.0: version "2.1.0" @@ -12245,6 +12320,14 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" +scheduler@^0.11.2: + version "0.11.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.2.tgz#a8db5399d06eba5abac51b705b7151d2319d33d3" + integrity sha512-+WCP3s3wOaW4S7C1tl3TEXp4l9lJn0ZK8G3W3WKRWmw77Z2cIFUW2MiNTMHn5sCjxN+t7N43HAOOgMjyAg5hlg== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" @@ -12399,7 +12482,7 @@ set-value@^2.0.0: is-plain-object "^2.0.3" split-string "^3.0.1" -setimmediate@^1.0.4: +setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= @@ -13701,6 +13784,11 @@ type-of@^2.0.1: resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972" integrity sha1-5yoXQYllaOn2KDeNgW1pEvfyOXI= +typed-styles@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.5.tgz#a60df245d482a9b1adf9c06c078d0f06085ed1cf" + integrity sha512-ht+rEe5UsdEBAa3gr64+QjUOqjOLJfWLvl5HZR5Ev9uo/OnD3p43wPeFSB1hNFc13GXQF/JU1Bn0YHLUqBRIlw== + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -13711,6 +13799,11 @@ typescript@^3.0.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96" integrity sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ== +ua-parser-js@^0.7.18: + version "0.7.19" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b" + integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ== + uglify-es@^3.3.4: version "3.3.9" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" @@ -14125,6 +14218,13 @@ walker@~1.0.5: dependencies: makeerror "1.0.x" +warning@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" + integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w= + dependencies: + loose-envify "^1.0.0" + warning@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607" @@ -14359,6 +14459,11 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: dependencies: iconv-lite "0.4.24" +whatwg-fetch@>=0.10.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" + integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== + whatwg-mimetype@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz#a3d58ef10b76009b042d03e25591ece89b88d171" From 7d74ca4a8d5f5603ddd6a356c825c33d6529199e Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Wed, 14 Nov 2018 21:39:13 +0100 Subject: [PATCH 16/32] panel-header: Updates for the new react-popper api and make it possible to hover the tooltip popper without it closing --- .../app/core/components/Tooltip/Popover.tsx | 39 +++------ public/app/core/components/Tooltip/Popper.tsx | 42 ++++++++++ .../app/core/components/Tooltip/Tooltip.tsx | 37 ++------- .../__snapshots__/Popover.test.tsx.snap | 6 +- .../__snapshots__/Tooltip.test.tsx.snap | 8 +- .../core/components/Tooltip/withPopper.tsx | 83 +++++++++++++++++++ .../core/components/Tooltip/withTooltip.tsx | 58 ------------- public/sass/components/_popper.scss | 24 +++--- 8 files changed, 165 insertions(+), 132 deletions(-) create mode 100644 public/app/core/components/Tooltip/Popper.tsx create mode 100644 public/app/core/components/Tooltip/withPopper.tsx delete mode 100644 public/app/core/components/Tooltip/withTooltip.tsx diff --git a/public/app/core/components/Tooltip/Popover.tsx b/public/app/core/components/Tooltip/Popover.tsx index ee86d07fb53..136ff98ff9d 100644 --- a/public/app/core/components/Tooltip/Popover.tsx +++ b/public/app/core/components/Tooltip/Popover.tsx @@ -1,34 +1,19 @@ -import React from 'react'; -import withTooltip from './withTooltip'; -import { Target } from 'react-popper'; - -interface PopoverProps { - tooltipSetState: (prevState: object) => void; -} - -class Popover extends React.Component { - constructor(props) { - super(props); - this.toggleTooltip = this.toggleTooltip.bind(this); - } - - toggleTooltip() { - const { tooltipSetState } = this.props; - tooltipSetState(prevState => { - return { - ...prevState, - show: !prevState.show, - }; - }); - } +import React, { PureComponent } from 'react'; +import Popper from './Popper'; +import withPopper, { UsingPopperProps } from './withPopper'; +class Popover extends PureComponent { render() { + const { children, hidePopper, showPopper, className, ...restProps } = this.props; + + const togglePopper = restProps.show === true ? hidePopper : showPopper; + return ( - - {this.props.children} - +
+ {children} +
); } } -export default withTooltip(Popover); +export default withPopper(Popover); diff --git a/public/app/core/components/Tooltip/Popper.tsx b/public/app/core/components/Tooltip/Popper.tsx new file mode 100644 index 00000000000..164584ea746 --- /dev/null +++ b/public/app/core/components/Tooltip/Popper.tsx @@ -0,0 +1,42 @@ +import React, { PureComponent } from 'react'; +import { Manager, Popper as ReactPopper, Reference } from 'react-popper'; + +interface Props { + renderContent: (content: any) => any; + show: boolean; + placement?: any; + content: string | ((props: any) => JSX.Element); +} + +class Popper extends PureComponent { + render() { + const { children, renderContent, show, placement } = this.props; + const { content } = this.props; + const modifiers = { + flip: { enabled: false }, + preventOverflow: { enabled: false }, + hide: { enabled: false }, + }; + return ( + + {({ ref }) =>
{children}
} + {show && ( + + {({ ref, style, placement, arrowProps }) => { + return ( +
+
+ {renderContent(content)} +
+
+
+ ); + }} + + )} + + ); + } +} + +export default Popper; diff --git a/public/app/core/components/Tooltip/Tooltip.tsx b/public/app/core/components/Tooltip/Tooltip.tsx index 62be658f7cf..795da94a03c 100644 --- a/public/app/core/components/Tooltip/Tooltip.tsx +++ b/public/app/core/components/Tooltip/Tooltip.tsx @@ -1,36 +1,17 @@ import React, { PureComponent } from 'react'; -import withTooltip from './withTooltip'; -import { Target } from 'react-popper'; - -interface Props { - tooltipSetState: (prevState: object) => void; -} - -class Tooltip extends PureComponent { - showTooltip = () => { - const { tooltipSetState } = this.props; - - tooltipSetState(prevState => ({ - ...prevState, - show: true, - })); - }; - - hideTooltip = () => { - const { tooltipSetState } = this.props; - tooltipSetState(prevState => ({ - ...prevState, - show: false, - })); - }; +import Popper from './Popper'; +import withPopper, { UsingPopperProps } from './withPopper'; +class Tooltip extends PureComponent { render() { + const { children, hidePopper, showPopper, className, ...restProps } = this.props; + return ( - - {this.props.children} - +
+ {children} +
); } } -export default withTooltip(Tooltip); +export default withPopper(Tooltip); diff --git a/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap index 12ec960a017..5cc3881a607 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap @@ -3,11 +3,9 @@ exports[`Popover renders correctly 1`] = `
-
+
diff --git a/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap index 0ec9bdd86fe..d4c0c051435 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap @@ -3,12 +3,10 @@ exports[`Tooltip renders correctly 1`] = `
-
+
diff --git a/public/app/core/components/Tooltip/withPopper.tsx b/public/app/core/components/Tooltip/withPopper.tsx new file mode 100644 index 00000000000..247ad104186 --- /dev/null +++ b/public/app/core/components/Tooltip/withPopper.tsx @@ -0,0 +1,83 @@ +import React from 'react'; + +export interface UsingPopperProps { + showPopper: (prevState: object) => void; + hidePopper: (prevState: object) => void; + renderContent: (content: any) => any; + show: boolean; + placement?: string; + content: string | ((props: any) => JSX.Element); + className?: string; +} + +interface Props { + placement?: string; + className?: string; + content: string | ((props: any) => JSX.Element); +} + +interface State { + placement: string; + show: boolean; +} + +export default function withPopper(WrappedComponent) { + return class extends React.Component { + constructor(props) { + super(props); + this.setState = this.setState.bind(this); + this.state = { + placement: this.props.placement || 'auto', + show: false, + }; + } + + componentWillReceiveProps(nextProps) { + if (nextProps.placement && nextProps.placement !== this.state.placement) { + this.setState(prevState => { + return { + ...prevState, + placement: nextProps.placement, + }; + }); + } + } + + showPopper = () => { + this.setState(prevState => ({ + ...prevState, + show: true, + })); + }; + + hidePopper = () => { + this.setState(prevState => ({ + ...prevState, + show: false, + })); + }; + + renderContent(content) { + if (typeof content === 'function') { + // If it's a function we assume it's a React component + const ReactComponent = content; + return ; + } + return content; + } + + render() { + const { show, placement } = this.state; + return ( + + ); + } + }; +} diff --git a/public/app/core/components/Tooltip/withTooltip.tsx b/public/app/core/components/Tooltip/withTooltip.tsx deleted file mode 100644 index a09de67622e..00000000000 --- a/public/app/core/components/Tooltip/withTooltip.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import React from 'react'; -import { Manager, Popper, Arrow } from 'react-popper'; - -interface IwithTooltipProps { - placement?: string; - content: string | ((props: any) => JSX.Element); - className?: string; -} - -export default function withTooltip(WrappedComponent) { - return class extends React.Component { - constructor(props) { - super(props); - - this.setState = this.setState.bind(this); - this.state = { - placement: this.props.placement || 'auto', - show: false, - }; - } - - componentWillReceiveProps(nextProps) { - if (nextProps.placement && nextProps.placement !== this.state.placement) { - this.setState(prevState => { - return { - ...prevState, - placement: nextProps.placement, - }; - }); - } - } - - renderContent(content) { - if (typeof content === 'function') { - // If it's a function we assume it's a React component - const ReactComponent = content; - return ; - } - return content; - } - - render() { - const { content, className } = this.props; - - return ( - - - {this.state.show ? ( - - {this.renderContent(content)} - - - ) : null} - - ); - } - }; -} diff --git a/public/sass/components/_popper.scss b/public/sass/components/_popper.scss index 0b28d5b21f4..ae7cc46435e 100644 --- a/public/sass/components/_popper.scss +++ b/public/sass/components/_popper.scss @@ -1,12 +1,8 @@ .popper { position: absolute; z-index: $zindex-tooltip; - background: $tooltipBackground; color: $tooltipColor; max-width: 400px; - border-radius: 3px; - box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); - padding: 10px; text-align: center; } @@ -35,10 +31,18 @@ left: calc(50% - 5px); margin-top: 0; margin-bottom: 0; + padding-top: 5px; } .popper[data-placement^='bottom'] { - margin-top: 5px; + padding-top: 5px; +} + +.popper__background { + background: $tooltipBackground; + border-radius: 3px; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); + padding: 10px; } .popper[data-placement^='bottom'] .popper__arrow { @@ -46,21 +50,21 @@ border-left-color: transparent; border-right-color: transparent; border-top-color: transparent; - top: -5px; - left: calc(50% - 5px); + top: 0; + left: calc(50% - 8px); margin-top: 0; margin-bottom: 0; } .popper[data-placement^='right'] { - margin-left: 5px; + padding-left: 5px; } .popper[data-placement^='right'] .popper__arrow { border-width: 5px 5px 5px 0; border-left-color: transparent; border-top-color: transparent; border-bottom-color: transparent; - left: -5px; - top: calc(50% - 5px); + left: 0; + top: calc(50% - 8px); margin-left: 0; margin-right: 0; } From 48d1a574b99e0db3c91156f8619044854058901d Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Wed, 14 Nov 2018 22:02:50 +0100 Subject: [PATCH 17/32] panel-header: Avoid undefined classNames and use the real panel description --- public/app/core/components/Tooltip/withPopper.tsx | 3 +++ .../dashgrid/PanelHeader/PanelHeader.tsx | 15 ++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/public/app/core/components/Tooltip/withPopper.tsx b/public/app/core/components/Tooltip/withPopper.tsx index 247ad104186..b729c7cc3a4 100644 --- a/public/app/core/components/Tooltip/withPopper.tsx +++ b/public/app/core/components/Tooltip/withPopper.tsx @@ -68,6 +68,8 @@ export default function withPopper(WrappedComponent) { render() { const { show, placement } = this.state; + const className = this.props.className || ''; + return ( ); } diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx index 37d9d53cb5d..32f3041bba5 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx @@ -42,15 +42,16 @@ export class PanelHeader extends PureComponent { const isLoading = false; const panelHeaderClass = classNames({ 'panel-header': true, 'grid-drag-handle': !isFullscreen }); const { panel, dashboard, timeInfo } = this.props; - const cornerCssClass = panel.description ? 'panel-info-corner--info' : ''; return (
- - - - - - + {panel.description && ( + + + + + + + )} {isLoading && ( From e5ea176a9897537dfdd7bf3c306fc8c2f27e3975 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 15 Nov 2018 09:17:39 +0100 Subject: [PATCH 18/32] panel-header: Simplify condition --- public/app/core/components/Tooltip/Popover.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/core/components/Tooltip/Popover.tsx b/public/app/core/components/Tooltip/Popover.tsx index 136ff98ff9d..62397243c1c 100644 --- a/public/app/core/components/Tooltip/Popover.tsx +++ b/public/app/core/components/Tooltip/Popover.tsx @@ -6,7 +6,7 @@ class Popover extends PureComponent { render() { const { children, hidePopper, showPopper, className, ...restProps } = this.props; - const togglePopper = restProps.show === true ? hidePopper : showPopper; + const togglePopper = restProps.show ? hidePopper : showPopper; return (
From 1984f28f49fd08333b84d8a32c6c53dc3e853277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 15 Nov 2018 11:10:47 +0100 Subject: [PATCH 19/32] filter out alpha plugins in api call, fixes #14030 --- pkg/api/api.go | 2 +- pkg/api/dtos/plugins.go | 8 ++++---- pkg/api/frontendsettings.go | 2 +- pkg/api/plugins.go | 6 +++++- pkg/plugins/models.go | 9 ++++++++- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 7714834d0b9..c372debdb72 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -244,7 +244,7 @@ func (hs *HTTPServer) registerRoutes() { apiRoute.Get("/datasources/id/:name", Wrap(GetDataSourceIdByName), reqSignedIn) - apiRoute.Get("/plugins", Wrap(GetPluginList)) + apiRoute.Get("/plugins", Wrap(hs.GetPluginList)) apiRoute.Get("/plugins/:pluginId/settings", Wrap(GetPluginSettingByID)) apiRoute.Get("/plugins/:pluginId/markdown/:name", Wrap(GetPluginMarkdown)) diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go index 78a611c5eeb..edc9d96d1ac 100644 --- a/pkg/api/dtos/plugins.go +++ b/pkg/api/dtos/plugins.go @@ -19,9 +19,9 @@ type PluginSetting struct { JsonData map[string]interface{} `json:"jsonData"` DefaultNavUrl string `json:"defaultNavUrl"` - LatestVersion string `json:"latestVersion"` - HasUpdate bool `json:"hasUpdate"` - State string `json:"state"` + LatestVersion string `json:"latestVersion"` + HasUpdate bool `json:"hasUpdate"` + State plugins.PluginState `json:"state"` } type PluginListItem struct { @@ -34,7 +34,7 @@ type PluginListItem struct { LatestVersion string `json:"latestVersion"` HasUpdate bool `json:"hasUpdate"` DefaultNavUrl string `json:"defaultNavUrl"` - State string `json:"state"` + State plugins.PluginState `json:"state"` } type PluginList []PluginListItem diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 1de65c7b2ce..65affe83e98 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -133,7 +133,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf panels := map[string]interface{}{} for _, panel := range enabledPlugins.Panels { - if panel.State == "alpha" && !hs.Cfg.EnableAlphaPanels { + if panel.State == plugins.PluginStateAlpha && !hs.Cfg.EnableAlphaPanels { continue } diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go index 4b44009ab8c..455420e4688 100644 --- a/pkg/api/plugins.go +++ b/pkg/api/plugins.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/grafana/pkg/setting" ) -func GetPluginList(c *m.ReqContext) Response { +func (hs *HTTPServer) GetPluginList(c *m.ReqContext) Response { typeFilter := c.Query("type") enabledFilter := c.Query("enabled") embeddedFilter := c.Query("embedded") @@ -39,6 +39,10 @@ func GetPluginList(c *m.ReqContext) Response { continue } + if pluginDef.State == plugins.PluginStateAlpha && !hs.Cfg.EnableAlphaPanels { + continue + } + listItem := dtos.PluginListItem{ Id: pluginDef.Id, Name: pluginDef.Name, diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go index 9677c21ef04..5ac436205c1 100644 --- a/pkg/plugins/models.go +++ b/pkg/plugins/models.go @@ -17,6 +17,13 @@ var ( PluginTypeDashboard = "dashboard" ) +type PluginState string + +var ( + PluginStateAlpha PluginState = "alpha" + PluginStateBeta PluginState = "beta" +) + type PluginNotFoundError struct { PluginId string } @@ -39,7 +46,7 @@ type PluginBase struct { Module string `json:"module"` BaseUrl string `json:"baseUrl"` HideFromList bool `json:"hideFromList,omitempty"` - State string `json:"state,omitempty"` + State PluginState `json:"state,omitempty"` IncludedInAppId string `json:"-"` PluginDir string `json:"-"` From 42154833cc9b72dba85674941808ce8f743f751b Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 15 Nov 2018 12:47:32 +0100 Subject: [PATCH 20/32] panel-header: Make it possible to style the reference element and fix so panel description looks good --- public/app/core/components/Tooltip/Popper.tsx | 18 ++++++++++-------- .../app/core/components/Tooltip/withPopper.tsx | 2 ++ .../dashgrid/PanelHeader/PanelHeader.tsx | 12 +++++++----- public/sass/utils/_utils.scss | 4 ++++ 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/public/app/core/components/Tooltip/Popper.tsx b/public/app/core/components/Tooltip/Popper.tsx index 164584ea746..25a71c04500 100644 --- a/public/app/core/components/Tooltip/Popper.tsx +++ b/public/app/core/components/Tooltip/Popper.tsx @@ -6,22 +6,24 @@ interface Props { show: boolean; placement?: any; content: string | ((props: any) => JSX.Element); + refClassName?: string; } class Popper extends PureComponent { render() { - const { children, renderContent, show, placement } = this.props; + const { children, renderContent, show, placement, refClassName } = this.props; const { content } = this.props; - const modifiers = { - flip: { enabled: false }, - preventOverflow: { enabled: false }, - hide: { enabled: false }, - }; return ( - {({ ref }) =>
{children}
} + + {({ ref }) => ( +
+ {children} +
+ )} + {show && ( - + {({ ref, style, placement, arrowProps }) => { return (
diff --git a/public/app/core/components/Tooltip/withPopper.tsx b/public/app/core/components/Tooltip/withPopper.tsx index b729c7cc3a4..519b62344bb 100644 --- a/public/app/core/components/Tooltip/withPopper.tsx +++ b/public/app/core/components/Tooltip/withPopper.tsx @@ -8,11 +8,13 @@ export interface UsingPopperProps { placement?: string; content: string | ((props: any) => JSX.Element); className?: string; + refClassName?: string; } interface Props { placement?: string; className?: string; + refClassName?: string; content: string | ((props: any) => JSX.Element); } diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx index 32f3041bba5..48d1f1671cf 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx @@ -45,11 +45,13 @@ export class PanelHeader extends PureComponent { return (
{panel.description && ( - - - - - + + + )} {isLoading && ( diff --git a/public/sass/utils/_utils.scss b/public/sass/utils/_utils.scss index 3121a6f0c00..c8abd696f04 100644 --- a/public/sass/utils/_utils.scss +++ b/public/sass/utils/_utils.scss @@ -78,3 +78,7 @@ button.close { .d-inline-block { display: inline-block; } + +.absolute { + position: absolute; +} From 32d72f345f69ebdbc33b0f323eedeb71e9efffde 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 21/32] 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 49c74a7de28..bf19e52468b 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, PanelPlugin, PluginsState } from './plugins'; -import { Organization, OrganizationPreferences, OrganizationState } from './organization'; +import { Organization, OrganizationState } from './organization'; import { AppNotification, AppNotificationSeverity, @@ -83,7 +83,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 78e93a3a0fe6a7b2b722deb1ade83cfa424db681 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 15 Nov 2018 13:44:15 +0100 Subject: [PATCH 22/32] panel-header: Add fade in transition to tooltip --- public/app/core/components/Tooltip/Popper.tsx | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/public/app/core/components/Tooltip/Popper.tsx b/public/app/core/components/Tooltip/Popper.tsx index 25a71c04500..69bfe2f5ff9 100644 --- a/public/app/core/components/Tooltip/Popper.tsx +++ b/public/app/core/components/Tooltip/Popper.tsx @@ -1,5 +1,18 @@ import React, { PureComponent } from 'react'; import { Manager, Popper as ReactPopper, Reference } from 'react-popper'; +import Transition from 'react-transition-group/Transition'; + +const defaultTransitionStyles = { + transition: 'opacity 200ms linear', + opacity: 0, +}; + +const transitionStyles = { + exited: { opacity: 0 }, + entering: { opacity: 0 }, + entered: { opacity: 1 }, + exiting: { opacity: 0 }, +}; interface Props { renderContent: (content: any) => any; @@ -13,6 +26,7 @@ class Popper extends PureComponent { render() { const { children, renderContent, show, placement, refClassName } = this.props; const { content } = this.props; + return ( @@ -22,20 +36,31 @@ class Popper extends PureComponent {
)} - {show && ( - - {({ ref, style, placement, arrowProps }) => { - return ( -
-
- {renderContent(content)} -
+ + {transitionState => ( + + {({ ref, style, placement, arrowProps }) => { + return ( +
+
+ {renderContent(content)} +
+
-
- ); - }} - - )} + ); + }} + + )} + ); } From d6959c3b113040cf7a6ce1addb6eabecfa92af95 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 15 Nov 2018 13:49:48 +0100 Subject: [PATCH 23/32] panel-header: Updated snapshots for popper --- .../__snapshots__/Popover.test.tsx.snap | 26 ++++++++++++++++++- .../__snapshots__/Tooltip.test.tsx.snap | 26 ++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap index 5cc3881a607..dee689fb9ab 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap @@ -5,10 +5,34 @@ exports[`Popover renders correctly 1`] = ` className="popper__manager test-class" onClick={[Function]} > -
+
+
+
+ Popover text +
+
+
`; diff --git a/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap index d4c0c051435..6dacaa7247f 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap @@ -6,12 +6,36 @@ exports[`Tooltip renders correctly 1`] = ` onMouseEnter={[Function]} onMouseLeave={[Function]} > -
+ +
+
+ Tooltip text +
+
+
`; From 362ee8944943d4814db5e4727550107fd88d70c9 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 15 Nov 2018 14:16:17 +0100 Subject: [PATCH 24/32] 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 93586491f4f9bf5f555110987d85a4120c2ac3a8 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 15 Nov 2018 14:16:26 +0100 Subject: [PATCH 25/32] panel-header: Unmount popper when not needed. --- public/app/core/components/Tooltip/Popper.tsx | 2 +- .../__snapshots__/Popover.test.tsx.snap | 22 ------------------- .../__snapshots__/Tooltip.test.tsx.snap | 22 ------------------- 3 files changed, 1 insertion(+), 45 deletions(-) diff --git a/public/app/core/components/Tooltip/Popper.tsx b/public/app/core/components/Tooltip/Popper.tsx index 69bfe2f5ff9..343f7ff35d9 100644 --- a/public/app/core/components/Tooltip/Popper.tsx +++ b/public/app/core/components/Tooltip/Popper.tsx @@ -36,7 +36,7 @@ class Popper extends PureComponent {
)} - + {transitionState => ( {({ ref, style, placement, arrowProps }) => { diff --git a/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap index dee689fb9ab..b36a4fe9af9 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Popover.test.tsx.snap @@ -12,27 +12,5 @@ exports[`Popover renders correctly 1`] = ` Button with Popover
-
-
- Popover text -
-
-
`; diff --git a/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap index 6dacaa7247f..c7d680049f4 100644 --- a/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap +++ b/public/app/core/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap @@ -15,27 +15,5 @@ exports[`Tooltip renders correctly 1`] = ` Link with tooltip
-
-
- Tooltip text -
-
-
`; From 3f1388f214fe93b377ab6515228d01ae3fabe8d2 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 15 Nov 2018 14:29:14 +0100 Subject: [PATCH 26/32] 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 04571b8214baffdc444673f3d0b538bb0d9aff2f Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 15 Nov 2018 14:30:59 +0100 Subject: [PATCH 27/32] panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff --- .../dashgrid/PanelHeader/PanelHeader.tsx | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx index 48d1f1671cf..b07bc672265 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx @@ -43,7 +43,7 @@ export class PanelHeader extends PureComponent { const panelHeaderClass = classNames({ 'panel-header': true, 'grid-drag-handle': !isFullscreen }); const { panel, dashboard, timeInfo } = this.props; return ( -
+ <> {panel.description && ( { )} -
-
- - - {panel.title} - - - {this.state.panelMenuOpen && ( - - - - )} - - {timeInfo && ( - - {timeInfo} +
+
+
+ + + {panel.title} - )} + + {this.state.panelMenuOpen && ( + + + + )} + + {timeInfo && ( + + {timeInfo} + + )} +
-
+ ); } } From 38b44799a3ab10ff7d6569895551e101cf18c646 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 15 Nov 2018 14:43:50 +0100 Subject: [PATCH 28/32] 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, From 919b1cd36c0b4c0cc208a943645f46ada9c4291f Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 15 Nov 2018 16:38:11 +0100 Subject: [PATCH 29/32] changelog: add notes about closing #12550 [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3c0ce494f9..e5fceb28265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * **MySQL**: Support connecting thru Unix socket for MySQL datasource [#12342](https://github.com/grafana/grafana/issues/12342), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino) * **MSSQL**: Add encrypt setting to allow configuration of how data sent between client and server are encrypted [#13629](https://github.com/grafana/grafana/issues/13629), thx [@ramiro](https://github.com/ramiro) * **Stackdriver**: Not possible to authenticate using GCE metadata server [#13669](https://github.com/grafana/grafana/issues/13669) +* **Teams**: Team preferences (theme, home dashboard, timezone) support [#12550](https://github.com/grafana/grafana/issues/12550) ### Minor From 5069c7f6bb6ccad91ea723888cd56d04eb85063e Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Thu, 15 Nov 2018 16:52:39 +0100 Subject: [PATCH 30/32] panel-header: Move the corner information in the panel header to its own component --- .../dashgrid/PanelHeader/PanelHeader.tsx | 24 ++--- .../PanelHeader/PanelHeaderCorner.tsx | 94 +++++++++++++++++++ public/app/features/dashboard/panel_model.ts | 1 + 3 files changed, 102 insertions(+), 17 deletions(-) create mode 100644 public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx index b07bc672265..5e19f5c814a 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from 'react'; import classNames from 'classnames'; +import PanelHeaderCorner from './PanelHeaderCorner'; import { PanelHeaderMenu } from './PanelHeaderMenu'; -import Tooltip from 'app/core/components/Tooltip/Tooltip'; import { DashboardModel } from 'app/features/dashboard/dashboard_model'; import { PanelModel } from 'app/features/dashboard/panel_model'; @@ -44,23 +44,13 @@ export class PanelHeader extends PureComponent { const { panel, dashboard, timeInfo } = this.props; return ( <> - {panel.description && ( - - - - - )} - {isLoading && ( - - - - )} - +
+ {isLoading && ( + + + + )}
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx new file mode 100644 index 00000000000..18d874713a5 --- /dev/null +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx @@ -0,0 +1,94 @@ +import React, { PureComponent } from 'react'; +import { PanelModel } from 'app/features/dashboard/panel_model'; +import Tooltip from 'app/core/components/Tooltip/Tooltip'; +import templateSrv from 'app/features/templating/template_srv'; +import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv'; +import { getTimeSrv, TimeSrv } from 'app/features/dashboard/time_srv'; +import Remarkable from 'remarkable'; + +enum InfoModes { + Error = 'Error', + Info = 'Info', + Links = 'Links', +} + +interface Props { + panel: PanelModel; +} + +export class PanelHeaderCorner extends PureComponent { + timeSrv: TimeSrv = getTimeSrv(); + + getInfoMode = () => { + const { panel } = this.props; + // TODO + // if (error) { + // return InfoModes.Error; + // } + if (!!panel.description) { + return InfoModes.Info; + } + if (panel.links && panel.links.length) { + return InfoModes.Links; + } + + return undefined; + }; + + getInfoContent = () => { + const { panel } = this.props; + const markdown = panel.description; + const linkSrv = new LinkSrv(templateSrv, this.timeSrv); + const sanitize = str => str; // TODO + const interpolatedMarkdown = templateSrv.replace(markdown, panel.scopedVars); + const remarkableInterpolatedMarkdown = new Remarkable().render(interpolatedMarkdown); + + const html = ( +
+
+ {panel.links && + panel.links.length > 0 && ( +
    + {panel.links.map((link, idx) => { + const info = linkSrv.getPanelLinkAnchorInfo(link, panel.scopedVars); + return ( +
  • + + {info.title} + +
    • + ); + })} +
+ )} +
+ ); + return sanitize(html); + }; + + render() { + const infoMode: InfoModes | undefined = this.getInfoMode(); + + if (!infoMode) { + return null; + } + const infoContent = this.getInfoContent(); + + return ( + <> + {infoMode === InfoModes.Info || infoMode === InfoModes.Links ? ( + + + + + ) : null} + + ); + } +} + +export default PanelHeaderCorner; diff --git a/public/app/features/dashboard/panel_model.ts b/public/app/features/dashboard/panel_model.ts index e9d7f17812e..20388a0450c 100644 --- a/public/app/features/dashboard/panel_model.ts +++ b/public/app/features/dashboard/panel_model.ts @@ -50,6 +50,7 @@ export class PanelModel { maxDataPoints?: number; interval?: string; description?: string; + links?: []; // non persisted fullscreen: boolean; From 5d1c5502f1f47f86200e1ea4ffc2d1c2d1a53ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 16 Nov 2018 07:41:40 +0100 Subject: [PATCH 31/32] minor fixes --- public/app/core/components/Tooltip/withPopper.tsx | 3 ++- .../dashgrid/PanelHeader/PanelHeaderCorner.tsx | 15 +++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/public/app/core/components/Tooltip/withPopper.tsx b/public/app/core/components/Tooltip/withPopper.tsx index 519b62344bb..fc4c352d0f5 100644 --- a/public/app/core/components/Tooltip/withPopper.tsx +++ b/public/app/core/components/Tooltip/withPopper.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React from 'react'; export interface UsingPopperProps { showPopper: (prevState: object) => void; @@ -60,6 +60,7 @@ export default function withPopper(WrappedComponent) { }; renderContent(content) { + console.log('render content'); if (typeof content === 'function') { // If it's a function we assume it's a React component const ReactComponent = content; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx index 18d874713a5..7a9e0729c41 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx @@ -1,4 +1,4 @@ -import React, { PureComponent } from 'react'; +import React, { PureComponent } from 'react'; import { PanelModel } from 'app/features/dashboard/panel_model'; import Tooltip from 'app/core/components/Tooltip/Tooltip'; import templateSrv from 'app/features/templating/template_srv'; @@ -21,10 +21,6 @@ export class PanelHeaderCorner extends PureComponent { getInfoMode = () => { const { panel } = this.props; - // TODO - // if (error) { - // return InfoModes.Error; - // } if (!!panel.description) { return InfoModes.Info; } @@ -35,11 +31,10 @@ export class PanelHeaderCorner extends PureComponent { return undefined; }; - getInfoContent = () => { + getInfoContent = (): JSX.Element => { const { panel } = this.props; const markdown = panel.description; const linkSrv = new LinkSrv(templateSrv, this.timeSrv); - const sanitize = str => str; // TODO const interpolatedMarkdown = templateSrv.replace(markdown, panel.scopedVars); const remarkableInterpolatedMarkdown = new Remarkable().render(interpolatedMarkdown); @@ -63,7 +58,8 @@ export class PanelHeaderCorner extends PureComponent { )}
); - return sanitize(html); + + return html; }; render() { @@ -72,13 +68,12 @@ export class PanelHeaderCorner extends PureComponent { if (!infoMode) { return null; } - const infoContent = this.getInfoContent(); return ( <> {infoMode === InfoModes.Info || infoMode === InfoModes.Links ? ( From 295fefb2dc2884896d06406d50f62c054b48ba59 Mon Sep 17 00:00:00 2001 From: Johannes Schill Date: Mon, 19 Nov 2018 09:29:21 +0100 Subject: [PATCH 32/32] Tooltip should be able to take up space when used on an absolute positioned element --- .../dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx | 4 ++-- public/sass/components/_popper.scss | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx index 7a9e0729c41..60471cff19f 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx @@ -43,7 +43,7 @@ export class PanelHeaderCorner extends PureComponent {
{panel.links && panel.links.length > 0 && ( -
    +
      {panel.links.map((link, idx) => { const info = linkSrv.getPanelLinkAnchorInfo(link, panel.scopedVars); return ( @@ -74,7 +74,7 @@ export class PanelHeaderCorner extends PureComponent { {infoMode === InfoModes.Info || infoMode === InfoModes.Links ? ( diff --git a/public/sass/components/_popper.scss b/public/sass/components/_popper.scss index ae7cc46435e..79dc24f5e43 100644 --- a/public/sass/components/_popper.scss +++ b/public/sass/components/_popper.scss @@ -88,3 +88,7 @@ .popper__manager { display: inline-block; } + +.popper__manager--block { + display: block; +}