diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts index 40797e9a47c..83b55ac476f 100644 --- a/public/app/core/components/grafana_app.ts +++ b/public/app/core/components/grafana_app.ts @@ -122,7 +122,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) { // handle in active view state class var lastActivity = new Date().getTime(); var activeUser = true; - var inActiveTimeLimit = 10 * 1000; + var inActiveTimeLimit = 60 * 1000; function checkForInActiveUser() { if (!activeUser) { diff --git a/public/app/features/dashboard/row/add_panel.html b/public/app/features/dashboard/row/add_panel.html index 7f79e697484..5a4ecc118cd 100644 --- a/public/app/features/dashboard/row/add_panel.html +++ b/public/app/features/dashboard/row/add_panel.html @@ -5,7 +5,7 @@
- +
diff --git a/public/app/features/dashboard/row/add_panel.ts b/public/app/features/dashboard/row/add_panel.ts index 3e2dc9e31d8..771f5e00b64 100644 --- a/public/app/features/dashboard/row/add_panel.ts +++ b/public/app/features/dashboard/row/add_panel.ts @@ -45,12 +45,6 @@ export class AddPanelCtrl { } } - panelSearchBlur() { - // this.$timeout(() => { - // this.rowCtrl.dropView = 0; - // }, 400); - } - moveSelection(direction) { var max = this.panelHits.length; var newIndex = this.activeIndex + direction; diff --git a/public/app/features/dashboard/row/row_ctrl.ts b/public/app/features/dashboard/row/row_ctrl.ts index f82f91e04af..5953889a9b1 100644 --- a/public/app/features/dashboard/row/row_ctrl.ts +++ b/public/app/features/dashboard/row/row_ctrl.ts @@ -19,7 +19,6 @@ export class DashRowCtrl { if (this.row.isNew) { this.dropView = 1; - delete this.row.isNew; } } @@ -36,7 +35,6 @@ export class DashRowCtrl { type: panelId, id: this.dashboard.getNextPanelId(), }, - isNew: true, }; } else { dragObject = this.dashboard.getPanelInfoById(panelId); diff --git a/public/app/features/dashboard/row/row_model.ts b/public/app/features/dashboard/row/row_model.ts index 0729d43bf0a..9e443feec10 100644 --- a/public/app/features/dashboard/row/row_model.ts +++ b/public/app/features/dashboard/row/row_model.ts @@ -34,6 +34,10 @@ export class DashboardRow { getSaveModel() { assignModelProperties(this.model, this, this.defaults); + + // remove properties that dont server persisted purpose + delete this.model.isNew; + return this.model; }