Skip to content

Commit a45fdfd

Browse files
committed
fix(dashboard): minor fixes, and restored in-activity timer to 1min
1 parent 42167a6 commit a45fdfd

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

public/app/core/components/grafana_app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
122122
// handle in active view state class
123123
var lastActivity = new Date().getTime();
124124
var activeUser = true;
125-
var inActiveTimeLimit = 10 * 1000;
125+
var inActiveTimeLimit = 60 * 1000;
126126

127127
function checkForInActiveUser() {
128128
if (!activeUser) {

public/app/features/dashboard/row/add_panel.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<div class="gf-form-inline dash-row-add-panel-form">
77
<div class="gf-form">
8-
<input type="text" class="gf-form-input max-width-14" ng-model='ctrl.panelSearch' give-focus='true' ng-keydown="ctrl.keyDown($event)" ng-change="ctrl.panelSearchChanged()" placeholder="panel search filter" ng-blur="ctrl.panelSearchBlur()"></input>
8+
<input type="text" class="gf-form-input max-width-14" ng-model='ctrl.panelSearch' give-focus='true' ng-keydown="ctrl.keyDown($event)" ng-change="ctrl.panelSearchChanged()" placeholder="panel search filter"></input>
99
</div>
1010
</div>
1111

public/app/features/dashboard/row/add_panel.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ export class AddPanelCtrl {
4545
}
4646
}
4747

48-
panelSearchBlur() {
49-
// this.$timeout(() => {
50-
// this.rowCtrl.dropView = 0;
51-
// }, 400);
52-
}
53-
5448
moveSelection(direction) {
5549
var max = this.panelHits.length;
5650
var newIndex = this.activeIndex + direction;

public/app/features/dashboard/row/row_ctrl.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export class DashRowCtrl {
1919

2020
if (this.row.isNew) {
2121
this.dropView = 1;
22-
delete this.row.isNew;
2322
}
2423
}
2524

@@ -36,7 +35,6 @@ export class DashRowCtrl {
3635
type: panelId,
3736
id: this.dashboard.getNextPanelId(),
3837
},
39-
isNew: true,
4038
};
4139
} else {
4240
dragObject = this.dashboard.getPanelInfoById(panelId);

public/app/features/dashboard/row/row_model.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ export class DashboardRow {
3434

3535
getSaveModel() {
3636
assignModelProperties(this.model, this, this.defaults);
37+
38+
// remove properties that dont server persisted purpose
39+
delete this.model.isNew;
40+
3741
return this.model;
3842
}
3943

0 commit comments

Comments
 (0)