Skip to content

Commit 2f957ee

Browse files
committed
Improve logs manager
1 parent 0f7e815 commit 2f957ee

File tree

8 files changed

+32
-7
lines changed

8 files changed

+32
-7
lines changed

addons/monitor/addon-built.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

addons/monitor/models/log.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ define([], function() {
33

44
var Log = hr.Model.extend({
55
defaults: {
6+
'section': null,
67
'type': null,
78
'content': []
89
},

addons/monitor/stylesheets/tab.less

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.addon-monitor-tab {
2+
.filter-query {
3+
float: right;
4+
border: 1px solid #ccc;
5+
padding: 3px 6px;
6+
width: 200px;
7+
8+
&:hover, &:focus {
9+
outline: 0;
10+
}
11+
}
12+
}

addons/monitor/templates/tab.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<i class="fa fa-eraser"></i> Clear Logs
66
</a>
77
</div>
8+
<input type="text" class="filter-query" placeholder="Filter logs" />
89
</div>
910
<div class="tab-panel-inner with-toolbar monitor-logs"></div>
1011
</div>

addons/monitor/views/tab.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
define([
2-
"views/logs"
2+
"views/logs",
3+
"less!stylesheets/tab.less"
34
], function(LogsList) {
45
var _ = codebox.require("underscore");
56
var $ = codebox.require("jQuery");
@@ -12,7 +13,8 @@ define([
1213
template: "tab.html",
1314
className: Tab.prototype.className+ " addon-monitor-tab",
1415
events: {
15-
"click .action-monitor-clear": "clearLogs"
16+
"click .action-monitor-clear": "clearLogs",
17+
"keyup .filter-query": "filterLogs"
1618
},
1719

1820
initialize: function(options) {
@@ -47,6 +49,14 @@ define([
4749
clearLogs: function(e) {
4850
if (e) e.preventDefault();
4951
this.logs.collection.reset([]);
52+
},
53+
54+
// Filter logs
55+
filterLogs: function(e) {
56+
var q = this.$(".filter-query").val().toLowerCase();
57+
this.logs.filter(function(log) {
58+
return log.get("section", "").toLowerCase().search(q) >= 0;
59+
}, this)
5060
}
5161
});
5262

client/build.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var path = require("path");
2+
var pkg = require("../package.json");
23

34
exports.config = {
45
// Base directory for the application
@@ -64,7 +65,7 @@ exports.config = {
6465
exports: 'Mousetrap'
6566
}
6667
},
67-
'options': {
68-
68+
'args': {
69+
'version': pkg.version
6970
}
7071
};

client/resources/templates/lateralbar/main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="menu-section menu-bottom">
88
<ul class="menu-commands">
99
<li class="menu-item">
10-
<a href="https://www.codebox.io" target="_blank" title="codebox.io">
10+
<a href="https://www.codebox.io" target="_blank" title="Version <%- hr.configs.args.version %>">
1111
<i class="fa fa-cloud"></i>
1212
</a>
1313
</li>

core/cb.addons/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var exec = require('child_process').exec;
1212
var Addon = require("./addon");
1313

1414
function setup(options, imports, register, app) {
15-
var logger = imports.logger.namespace("addons");
15+
var logger = imports.logger.namespace("addons", true);
1616
var server = imports.server;
1717
var events = imports.events;
1818
var hooks = imports.hooks;

0 commit comments

Comments
 (0)