Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

persist settings in query UI #1870

Merged
merged 1 commit into from
Jan 12, 2020
Merged

persist settings in query UI #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkg/ui/bindata.go
View file
Open in desktop

Large diffs are not rendered by default.

68 changes: 42 additions & 26 deletions pkg/ui/static/js/graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,46 +194,62 @@ Prometheus.Graph.prototype.initialize = function() {
self.updateGraph();
});

// Toggle functions.
self.toggleOn = function(targetEl, item) {
$(targetEl).addClass('glyphicon-check').removeClass('glyphicon-unchecked');
localStorage.setItem(item, '1');
};
self.toggleOff = function(targetEl, item) {
$(targetEl).addClass('glyphicon-unchecked').removeClass('glyphicon-check');
localStorage.setItem(item, '0');
};

// Deduplication.
let dedup_icon = self.dedupBtn.find('.glyphicon');
self.isDedupEnabled = function() {
return self.enableDedup.val() === '1';
};
var styleDedupBtn = function() {
var icon = self.dedupBtn.find('.glyphicon');
if (self.isDedupEnabled()) {
icon.addClass("glyphicon-check");
icon.removeClass("glyphicon-unchecked");
} else {
icon.addClass("glyphicon-unchecked");
icon.removeClass("glyphicon-check");
}
let v = localStorage.getItem('enable-dedup');

// If not set in localstorage, make it enabled.
return v === '1' || v === null;
};
styleDedupBtn();

if (self.isDedupEnabled()) {
self.toggleOn(dedup_icon, 'enable-dedup');
} else {
self.toggleOff(dedup_icon, 'enable-dedup');
}

self.dedupBtn.click(function() {
self.enableDedup.val(self.isDedupEnabled() ? '0' : '1');
styleDedupBtn();
if (dedup_icon.hasClass('glyphicon-unchecked')) {
self.toggleOn(dedup_icon, 'enable-dedup');
} else if (dedup_icon.hasClass('glyphicon-check')) {
self.toggleOff(dedup_icon, 'enable-dedup');
}
});

// Partial response.
let partial_response_icon = self.partialResponseBtn.find('.glyphicon');
self.isPartialResponseEnabled = function() {
return self.partialResponse.val() === '1';
};
var stylePartialResponseBtn = function() {
var icon = self.partialResponseBtn.find('.glyphicon');
if (self.isPartialResponseEnabled()) {
icon.addClass("glyphicon-check");
icon.removeClass("glyphicon-unchecked");
} else {
icon.addClass("glyphicon-unchecked");
icon.removeClass("glyphicon-check");
}
let v = localStorage.getItem('enable-partial-response');

// If not set in localstorage, make it enabled.
return v === '1' || v === null;
};
stylePartialResponseBtn();

if (self.isPartialResponseEnabled()) {
self.toggleOn(partial_response_icon, 'enable-partial-response');
} else {
self.toggleOff(partial_response_icon, 'enable-partial-response');
}

self.partialResponseBtn.click(function() {
self.partialResponse.val(self.isPartialResponseEnabled() ? '0' : '1');
stylePartialResponseBtn();
if (partial_response_icon.hasClass('glyphicon-unchecked')) {
self.toggleOn(partial_response_icon, 'enable-partial-response');
} else if (partial_response_icon.hasClass('glyphicon-check')) {
self.toggleOff(partial_response_icon, 'enable-partial-response');
}
});

self.maxSourceResolutionInput.val(self.options.max_source_resolution);
Expand Down
40 changes: 20 additions & 20 deletions pkg/ui/templates/query_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{{define "nav"}}
<nav class="navbar fixed-top navbar-expand-sm navbar-dark bg-dark">
<div class="container-fluid">
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#nav-content" aria-expanded="false" aria-controls="nav-content" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="{{ pathPrefix }}/">Thanos</a>
<div id="nav-content" class="navbar-collapse collapse">
<ul class="navbar-nav">
<li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/graph">Graph</a></li>
<li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/stores">Stores</a></li>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Status <span class="caret"></span></a>
<div class="dropdown-menu">
<a class="dropdown-item" href="{{ pathPrefix }}/status">Runtime &amp; Build Information</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="https://thanos.io/getting-started.md/" target="_blank">Help</a>
</li>
</ul>
<div class="container-fluid">
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#nav-content" aria-expanded="false" aria-controls="nav-content" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="{{ pathPrefix }}/">Thanos</a>
<div id="nav-content" class="navbar-collapse collapse">
<ul class="navbar-nav">
<li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/graph">Graph</a></li>
<li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/stores">Stores</a></li>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Status <span class="caret"></span></a>
<div class="dropdown-menu">
<a class="dropdown-item" href="{{ pathPrefix }}/status">Runtime &amp; Build Information</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="https://thanos.io/getting-started.md/" target="_blank">Help</a>
</li>
</ul>
</div>
</div>
</div>
</nav>
{{end}}