logster 1.2.11 → 1.3.pre
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +18 -17
- data/.travis.yml +15 -16
- data/CHANGELOG.md +130 -130
- data/Gemfile +4 -4
- data/Guardfile +8 -8
- data/LICENSE.txt +22 -22
- data/README.md +99 -96
- data/Rakefile +24 -23
- data/assets/fonts/FontAwesome.otf +0 -0
- data/assets/fonts/fontawesome-webfont.eot +0 -0
- data/assets/fonts/fontawesome-webfont.svg +639 -639
- data/assets/fonts/fontawesome-webfont.ttf +0 -0
- data/assets/fonts/fontawesome-webfont.woff +0 -0
- data/assets/fonts/fontawesome-webfont.woff2 +0 -0
- data/assets/images/Icon-144_rounded.png +0 -0
- data/assets/images/Icon-144_square.png +0 -0
- data/assets/images/icon_144x144.png +0 -0
- data/assets/images/icon_64x64.png +0 -0
- data/assets/javascript/client-app.js +81 -0
- data/assets/javascript/vendor.js +5302 -0
- data/assets/stylesheets/client-app.css +1 -0
- data/assets/stylesheets/vendor.css +4 -0
- data/build_client_app.sh +12 -0
- data/client-app/.editorconfig +20 -0
- data/client-app/.ember-cli +9 -0
- data/client-app/.eslintignore +19 -0
- data/client-app/.eslintrc.js +46 -0
- data/client-app/.gitignore +23 -0
- data/client-app/.travis.yml +27 -0
- data/client-app/.watchmanconfig +3 -0
- data/client-app/README.md +57 -0
- data/client-app/app/app.js +14 -0
- data/client-app/app/components/message-info.js +18 -0
- data/client-app/app/components/message-row.js +45 -0
- data/client-app/app/components/panel-resizer.js +75 -0
- data/client-app/app/components/tab-contents.js +27 -0
- data/client-app/app/components/tab-link.js +5 -0
- data/client-app/app/components/tabbed-section.js +32 -0
- data/client-app/app/components/time-formatter.js +25 -0
- data/client-app/app/components/update-time.js +21 -0
- data/client-app/app/controllers/index.js +83 -0
- data/client-app/app/controllers/show.js +13 -0
- data/client-app/app/index.html +29 -0
- data/client-app/app/initializers/app-init.js +55 -0
- data/client-app/app/lib/preload.js +14 -0
- data/client-app/app/lib/utilities.js +140 -0
- data/client-app/app/models/message-collection.js +158 -0
- data/client-app/app/models/message.js +99 -0
- data/client-app/app/resolver.js +3 -0
- data/client-app/app/router.js +14 -0
- data/client-app/app/routes/index.js +53 -0
- data/client-app/app/routes/show.js +14 -0
- data/{assets/stylesheets → client-app/app/styles}/app.css +387 -390
- data/{assets/javascript → client-app/app}/templates/application.hbs +2 -2
- data/client-app/app/templates/components/message-info.hbs +44 -0
- data/{assets/javascript → client-app/app/templates}/components/message-row.hbs +17 -17
- data/client-app/app/templates/components/tabbed-section.hbs +10 -0
- data/client-app/app/templates/components/time-formatter.hbs +1 -0
- data/{assets/javascript → client-app/app}/templates/index.hbs +57 -57
- data/{assets/javascript → client-app/app}/templates/show.hbs +4 -4
- data/client-app/config/environment.js +51 -0
- data/client-app/config/optional-features.json +3 -0
- data/client-app/config/targets.js +18 -0
- data/client-app/ember-cli-build.js +29 -0
- data/client-app/package-lock.json +11365 -0
- data/client-app/package.json +56 -0
- data/client-app/testem.js +25 -0
- data/client-app/tests/index.html +34 -0
- data/client-app/tests/integration/components/message-info-test.js +26 -0
- data/client-app/tests/integration/components/message-row-test.js +26 -0
- data/client-app/tests/integration/components/panel-resizer-test.js +26 -0
- data/client-app/tests/integration/components/tab-contents-test.js +26 -0
- data/client-app/tests/integration/components/tab-link-test.js +26 -0
- data/client-app/tests/integration/components/tabbed-section-test.js +26 -0
- data/client-app/tests/integration/components/time-formatter-test.js +26 -0
- data/client-app/tests/integration/components/update-time-test.js +26 -0
- data/client-app/tests/test-helper.js +8 -0
- data/client-app/tests/unit/controllers/index-test.js +12 -0
- data/client-app/tests/unit/controllers/show-test.js +12 -0
- data/client-app/tests/unit/initializers/app-init-test.js +31 -0
- data/client-app/tests/unit/routes/index-test.js +11 -0
- data/client-app/tests/unit/routes/show-test.js +11 -0
- data/lib/examples/sidekiq_logster_reporter.rb +21 -21
- data/lib/logster.rb +54 -54
- data/lib/logster/base_store.rb +130 -130
- data/lib/logster/configuration.rb +25 -25
- data/lib/logster/ignore_pattern.rb +65 -65
- data/lib/logster/logger.rb +102 -101
- data/lib/logster/message.rb +227 -226
- data/lib/logster/middleware/debug_exceptions.rb +26 -26
- data/lib/logster/middleware/reporter.rb +56 -54
- data/lib/logster/middleware/viewer.rb +220 -251
- data/lib/logster/rails/railtie.rb +58 -58
- data/lib/logster/redis_store.rb +481 -477
- data/lib/logster/version.rb +3 -3
- data/lib/logster/web.rb +14 -14
- data/logster.gemspec +34 -33
- data/test/examples/test_sidekiq_reporter_example.rb +46 -46
- data/test/fake_data/Gemfile +4 -4
- data/test/fake_data/generate.rb +10 -10
- data/test/logster/middleware/test_reporter.rb +21 -21
- data/test/logster/middleware/test_viewer.rb +96 -70
- data/test/logster/test_base_store.rb +147 -147
- data/test/logster/test_ignore_pattern.rb +41 -41
- data/test/logster/test_logger.rb +74 -74
- data/test/logster/test_message.rb +34 -34
- data/test/logster/test_redis_rate_limiter.rb +230 -230
- data/test/logster/test_redis_store.rb +427 -414
- data/test/test_helper.rb +38 -37
- data/vendor/assets/javascripts/logster.js.erb +39 -39
- metadata +83 -24
- data/assets/javascript/app.js +0 -817
- data/assets/javascript/components/message-info.hbs +0 -47
- data/assets/javascript/components/panel-resizer.hbs +0 -0
- data/assets/javascript/components/tab-contents.hbs +0 -1
- data/assets/javascript/components/tab-link.hbs +0 -1
- data/assets/javascript/components/tabbed-section.hbs +0 -6
- data/assets/javascript/external/ember-template-compiler.js +0 -22346
- data/assets/javascript/external/ember.js +0 -58500
- data/assets/javascript/external/ember.min.js +0 -17
- data/assets/javascript/external/jquery.min.js +0 -5
- data/assets/javascript/external/lodash.min.js +0 -87
- data/assets/javascript/external/moment.min.js +0 -6
- data/assets/stylesheets/font-awesome.min.css +0 -4
- data/bower.json +0 -25
@@ -0,0 +1,25 @@
|
|
1
|
+
import Component from "@ember/component";
|
2
|
+
import { formatTime } from "client-app/lib/utilities";
|
3
|
+
import { computed } from "@ember/object";
|
4
|
+
|
5
|
+
export default Component.extend({
|
6
|
+
tagName: "span",
|
7
|
+
classNames: "auto-update-time",
|
8
|
+
attributeBindings: ["dataTimestamp:data-timestamp", "title"],
|
9
|
+
|
10
|
+
title: computed(function() {
|
11
|
+
return this.get("moment").format();
|
12
|
+
}),
|
13
|
+
|
14
|
+
dataTimestamp: computed(function() {
|
15
|
+
return this.get("timestamp");
|
16
|
+
}),
|
17
|
+
|
18
|
+
moment: computed(function() {
|
19
|
+
return moment(this.get("timestamp"));
|
20
|
+
}),
|
21
|
+
|
22
|
+
time: computed("timestamp", function() {
|
23
|
+
return formatTime(this.get("timestamp"));
|
24
|
+
})
|
25
|
+
});
|
@@ -0,0 +1,21 @@
|
|
1
|
+
import Component from "@ember/component";
|
2
|
+
import { formatTime } from "client-app/lib/utilities";
|
3
|
+
|
4
|
+
export default Component.extend({
|
5
|
+
didInsertElement() {
|
6
|
+
const updateTimes = () => {
|
7
|
+
Em.$(".auto-update-time").each(function() {
|
8
|
+
const timestamp = parseInt(this.getAttribute("data-timestamp"), 10);
|
9
|
+
const elem = this;
|
10
|
+
const text = formatTime(timestamp);
|
11
|
+
|
12
|
+
if (text !== elem.innerText) {
|
13
|
+
elem.innerText = text;
|
14
|
+
}
|
15
|
+
});
|
16
|
+
Em.run.later(updateTimes, 60000);
|
17
|
+
};
|
18
|
+
|
19
|
+
Em.run.later(updateTimes, 60000);
|
20
|
+
}
|
21
|
+
});
|
@@ -0,0 +1,83 @@
|
|
1
|
+
import Controller from "@ember/controller";
|
2
|
+
import { ajax } from "client-app/lib/utilities";
|
3
|
+
import { observer } from "@ember/object";
|
4
|
+
|
5
|
+
export default Controller.extend({
|
6
|
+
currentMessage: Em.computed.alias("model.currentMessage"),
|
7
|
+
|
8
|
+
actions: {
|
9
|
+
expandMessage(message) {
|
10
|
+
message.expand();
|
11
|
+
},
|
12
|
+
|
13
|
+
selectMessage(message) {
|
14
|
+
const old = this.get("currentMessage");
|
15
|
+
if (old) {
|
16
|
+
old.set("selected", false);
|
17
|
+
}
|
18
|
+
|
19
|
+
message.set("selected", true);
|
20
|
+
this.set("currentMessage", message);
|
21
|
+
},
|
22
|
+
|
23
|
+
showMoreBefore() {
|
24
|
+
this.get("model").showMoreBefore();
|
25
|
+
},
|
26
|
+
|
27
|
+
loadMore() {
|
28
|
+
return this.get("model").loadMore();
|
29
|
+
},
|
30
|
+
|
31
|
+
clear() {
|
32
|
+
if (confirm("Clear the logs?\n\nCancel = No, OK = Clear")) {
|
33
|
+
ajax("/clear", { type: "POST" }).then(() => {
|
34
|
+
this.get("model").reload();
|
35
|
+
});
|
36
|
+
}
|
37
|
+
},
|
38
|
+
|
39
|
+
removeMessage(msg) {
|
40
|
+
const messages = this.get("model");
|
41
|
+
messages.destroy(msg);
|
42
|
+
},
|
43
|
+
|
44
|
+
solveMessage(msg) {
|
45
|
+
const messages = this.get("model");
|
46
|
+
messages.solve(msg);
|
47
|
+
}
|
48
|
+
},
|
49
|
+
|
50
|
+
filterChanged: observer(
|
51
|
+
"showDebug",
|
52
|
+
"showInfo",
|
53
|
+
"showWarn",
|
54
|
+
"showErr",
|
55
|
+
"showFatal",
|
56
|
+
function() {
|
57
|
+
const filter = [];
|
58
|
+
["Debug", "Info", "Warn", "Err", "Fatal"].forEach((severity, index) => {
|
59
|
+
if (this.get(`show${severity}`)) {
|
60
|
+
filter.push(index);
|
61
|
+
}
|
62
|
+
});
|
63
|
+
|
64
|
+
// always show unknown, rare
|
65
|
+
filter.push(5);
|
66
|
+
const model = this.get("model");
|
67
|
+
model.set("filter", filter);
|
68
|
+
if (this.get("initialized")) {
|
69
|
+
model.reload();
|
70
|
+
}
|
71
|
+
}
|
72
|
+
),
|
73
|
+
|
74
|
+
searchChanged: observer("search", function() {
|
75
|
+
const search = this.get("search");
|
76
|
+
const model = this.get("model");
|
77
|
+
model.set("search", search);
|
78
|
+
|
79
|
+
if (this.get("initialized")) {
|
80
|
+
model.reload();
|
81
|
+
}
|
82
|
+
})
|
83
|
+
});
|
@@ -0,0 +1,29 @@
|
|
1
|
+
<!DOCTYPE html>
|
2
|
+
<html>
|
3
|
+
<head>
|
4
|
+
<meta charset="utf-8">
|
5
|
+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
6
|
+
<title>ClientApp</title>
|
7
|
+
<meta name="description" content="">
|
8
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
9
|
+
<meta id="preloaded-data" data-root-path="/logs" data-preloaded="{}">
|
10
|
+
|
11
|
+
{{content-for "head"}}
|
12
|
+
|
13
|
+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
|
14
|
+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/client-app.css">
|
15
|
+
|
16
|
+
<link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
|
17
|
+
<link href='//fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
|
18
|
+
|
19
|
+
{{content-for "head-footer"}}
|
20
|
+
</head>
|
21
|
+
<body>
|
22
|
+
{{content-for "body"}}
|
23
|
+
|
24
|
+
<script src="{{rootURL}}assets/vendor.js"></script>
|
25
|
+
<script src="{{rootURL}}assets/client-app.js"></script>
|
26
|
+
|
27
|
+
{{content-for "body-footer"}}
|
28
|
+
</body>
|
29
|
+
</html>
|
@@ -0,0 +1,55 @@
|
|
1
|
+
import {
|
2
|
+
updateHiddenProperty,
|
3
|
+
resetTitleCount
|
4
|
+
} from "client-app/lib/utilities";
|
5
|
+
import { init } from "client-app/lib/preload";
|
6
|
+
|
7
|
+
export function initialize() {
|
8
|
+
// config for moment.js
|
9
|
+
moment.updateLocale("en", {
|
10
|
+
relativeTime: {
|
11
|
+
future: "in %s",
|
12
|
+
past: "%s ago",
|
13
|
+
s: "secs",
|
14
|
+
m: "a min",
|
15
|
+
mm: "%d mins",
|
16
|
+
h: "an hr",
|
17
|
+
hh: "%d hrs",
|
18
|
+
d: "a day",
|
19
|
+
dd: "%d days",
|
20
|
+
M: "a mth",
|
21
|
+
MM: "%d mths",
|
22
|
+
y: "a yr",
|
23
|
+
yy: "%d yrs"
|
24
|
+
}
|
25
|
+
});
|
26
|
+
|
27
|
+
// parse preloaded json
|
28
|
+
const dataset = document.getElementById("preloaded-data").dataset;
|
29
|
+
init(dataset);
|
30
|
+
|
31
|
+
// setup event for updating document title and title count
|
32
|
+
let hiddenProperty;
|
33
|
+
let visibilitychange;
|
34
|
+
|
35
|
+
["", "webkit", "ms", "moz", "ms"].forEach(prefix => {
|
36
|
+
const check = prefix + (prefix === "" ? "hidden" : "Hidden");
|
37
|
+
if (document[check] !== undefined && !hiddenProperty) {
|
38
|
+
hiddenProperty = check;
|
39
|
+
visibilitychange = prefix + "visibilitychange";
|
40
|
+
}
|
41
|
+
});
|
42
|
+
|
43
|
+
updateHiddenProperty(hiddenProperty);
|
44
|
+
document.addEventListener(
|
45
|
+
visibilitychange,
|
46
|
+
() => {
|
47
|
+
resetTitleCount();
|
48
|
+
},
|
49
|
+
false
|
50
|
+
);
|
51
|
+
}
|
52
|
+
|
53
|
+
export default {
|
54
|
+
initialize
|
55
|
+
};
|
@@ -0,0 +1,140 @@
|
|
1
|
+
import Preload from "client-app/lib/preload";
|
2
|
+
|
3
|
+
const entityMap = {
|
4
|
+
"&": "&",
|
5
|
+
"<": "<",
|
6
|
+
">": ">",
|
7
|
+
'"': """,
|
8
|
+
"'": "'",
|
9
|
+
"/": "/"
|
10
|
+
};
|
11
|
+
|
12
|
+
export function escapeHtml(string) {
|
13
|
+
return String(string).replace(/[&<>"'/]/g, s => entityMap[s]);
|
14
|
+
}
|
15
|
+
|
16
|
+
export function ajax(url, settings) {
|
17
|
+
settings = settings || {};
|
18
|
+
settings.headers = settings.headers || {};
|
19
|
+
settings.headers["X-SILENCE-LOGGER"] = true;
|
20
|
+
return Em.$.ajax(Preload.get("rootPath") + url, settings);
|
21
|
+
}
|
22
|
+
|
23
|
+
export function preloadOrAjax(url, settings) {
|
24
|
+
const preloaded = Preload.get(`preload.${url.replace(".json", "")}`);
|
25
|
+
if (preloaded) {
|
26
|
+
return Em.RSVP.resolve(preloaded);
|
27
|
+
} else {
|
28
|
+
return ajax(url, settings);
|
29
|
+
}
|
30
|
+
}
|
31
|
+
|
32
|
+
let HIDDEN_PROPERTY;
|
33
|
+
let TITLE;
|
34
|
+
let TITLE_COUNT;
|
35
|
+
|
36
|
+
export function updateHiddenProperty(property) {
|
37
|
+
HIDDEN_PROPERTY = property;
|
38
|
+
}
|
39
|
+
|
40
|
+
export function isHidden() {
|
41
|
+
if (HIDDEN_PROPERTY !== undefined) {
|
42
|
+
return document[HIDDEN_PROPERTY];
|
43
|
+
} else {
|
44
|
+
return !document.hasFocus;
|
45
|
+
}
|
46
|
+
}
|
47
|
+
|
48
|
+
export function increaseTitleCount(increment) {
|
49
|
+
if (!isHidden()) {
|
50
|
+
return;
|
51
|
+
}
|
52
|
+
TITLE = TITLE || document.title;
|
53
|
+
TITLE_COUNT = TITLE_COUNT || 0;
|
54
|
+
TITLE_COUNT += increment;
|
55
|
+
document.title = `${TITLE} (${TITLE_COUNT})`;
|
56
|
+
}
|
57
|
+
|
58
|
+
export function resetTitleCount() {
|
59
|
+
TITLE_COUNT = 0;
|
60
|
+
document.title = TITLE || document.title;
|
61
|
+
}
|
62
|
+
|
63
|
+
export function formatTime(timestamp) {
|
64
|
+
let formatted;
|
65
|
+
const time = moment(timestamp);
|
66
|
+
const now = moment();
|
67
|
+
|
68
|
+
if (time.diff(now.startOf("day")) > 0) {
|
69
|
+
formatted = time.format("h:mm a");
|
70
|
+
} else {
|
71
|
+
if (time.diff(now.startOf("week")) > 0) {
|
72
|
+
formatted = time.format("dd h:mm a");
|
73
|
+
} else {
|
74
|
+
if (time.diff(now.startOf("year")) > 0) {
|
75
|
+
formatted = time.format("D MMM h:mm a");
|
76
|
+
} else {
|
77
|
+
formatted = time.format("D MMM YY");
|
78
|
+
}
|
79
|
+
}
|
80
|
+
}
|
81
|
+
|
82
|
+
return formatted;
|
83
|
+
}
|
84
|
+
|
85
|
+
export function buildArrayString(array) {
|
86
|
+
const buffer = [];
|
87
|
+
array.forEach(v => {
|
88
|
+
if (v === null) {
|
89
|
+
buffer.push("null");
|
90
|
+
} else if (Object.prototype.toString.call(v) === "[object Array]") {
|
91
|
+
buffer.push(buildArrayString(v));
|
92
|
+
} else {
|
93
|
+
buffer.push(escapeHtml(v.toString()));
|
94
|
+
}
|
95
|
+
});
|
96
|
+
return "[" + buffer.join(", ") + "]";
|
97
|
+
}
|
98
|
+
|
99
|
+
export function buildHashString(hash, recurse) {
|
100
|
+
if (!hash) return "";
|
101
|
+
|
102
|
+
const buffer = [];
|
103
|
+
const hashes = [];
|
104
|
+
_.each(hash, (v, k) => {
|
105
|
+
if (v === null) {
|
106
|
+
buffer.push("null");
|
107
|
+
} else if (Object.prototype.toString.call(v) === "[object Array]") {
|
108
|
+
buffer.push(
|
109
|
+
"<tr><td>" +
|
110
|
+
escapeHtml(k) +
|
111
|
+
"</td><td>" +
|
112
|
+
buildArrayString(v) +
|
113
|
+
"</td></tr>"
|
114
|
+
);
|
115
|
+
} else if (typeof v === "object") {
|
116
|
+
hashes.push(k);
|
117
|
+
} else {
|
118
|
+
buffer.push(
|
119
|
+
"<tr><td>" + escapeHtml(k) + "</td><td>" + escapeHtml(v) + "</td></tr>"
|
120
|
+
);
|
121
|
+
}
|
122
|
+
});
|
123
|
+
|
124
|
+
if (_.size(hashes) > 0) {
|
125
|
+
_.each(hashes, function(k1) {
|
126
|
+
const v = hash[k1];
|
127
|
+
buffer.push("<tr><td></td><td><table>");
|
128
|
+
buffer.push(
|
129
|
+
"<td>" +
|
130
|
+
escapeHtml(k1) +
|
131
|
+
"</td><td>" +
|
132
|
+
buildHashString(v, true) +
|
133
|
+
"</td>"
|
134
|
+
);
|
135
|
+
buffer.push("</table></td></tr>");
|
136
|
+
});
|
137
|
+
}
|
138
|
+
const className = recurse ? "" : "env-table";
|
139
|
+
return "<table class='" + className + "'>" + buffer.join("\n") + "</table>";
|
140
|
+
}
|
@@ -0,0 +1,158 @@
|
|
1
|
+
import { ajax, increaseTitleCount } from "client-app/lib/utilities";
|
2
|
+
import Message from "client-app/models/message";
|
3
|
+
import { compare } from "@ember/utils";
|
4
|
+
import { computed } from "@ember/object";
|
5
|
+
|
6
|
+
export default Em.Object.extend({
|
7
|
+
messages: Em.A(),
|
8
|
+
currentMessage: null,
|
9
|
+
total: 0,
|
10
|
+
|
11
|
+
solve(message) {
|
12
|
+
message.solve().then(() => {
|
13
|
+
this.reload();
|
14
|
+
});
|
15
|
+
},
|
16
|
+
|
17
|
+
destroy(message) {
|
18
|
+
const messages = this.get("messages");
|
19
|
+
const idx = messages.indexOf(message);
|
20
|
+
message.destroy();
|
21
|
+
message.set("selected", false);
|
22
|
+
this.set("total", this.get("total") - 1);
|
23
|
+
this.get("messages").removeObject(message);
|
24
|
+
|
25
|
+
if (idx > 0) {
|
26
|
+
message = messages[idx - 1];
|
27
|
+
message.set("selected", true);
|
28
|
+
this.set("currentMessage", message);
|
29
|
+
} else {
|
30
|
+
if (this.get("total") > 0) {
|
31
|
+
message = messages[0];
|
32
|
+
message.set("selected", true);
|
33
|
+
this.set("currentMessage", message);
|
34
|
+
} else {
|
35
|
+
this.reload();
|
36
|
+
}
|
37
|
+
}
|
38
|
+
},
|
39
|
+
|
40
|
+
load(opts) {
|
41
|
+
opts = opts || {};
|
42
|
+
|
43
|
+
const data = {
|
44
|
+
filter: this.get("filter").join("_")
|
45
|
+
};
|
46
|
+
|
47
|
+
const search = this.get("search");
|
48
|
+
if (!_.isEmpty(search)) {
|
49
|
+
data.search = search;
|
50
|
+
const regexSearch = this.get("regexSearch");
|
51
|
+
if (regexSearch) {
|
52
|
+
data.regex_search = "true";
|
53
|
+
}
|
54
|
+
}
|
55
|
+
|
56
|
+
if (opts.before) {
|
57
|
+
data.before = opts.before;
|
58
|
+
}
|
59
|
+
|
60
|
+
if (opts.after) {
|
61
|
+
data.after = opts.after;
|
62
|
+
}
|
63
|
+
|
64
|
+
ajax("/messages.json", {
|
65
|
+
data: data
|
66
|
+
}).then(data => {
|
67
|
+
// guard against race: ensure the results we're trying to apply
|
68
|
+
// match the current search terms
|
69
|
+
if (compare(data.filter, this.get("filter")) != 0) {
|
70
|
+
return;
|
71
|
+
}
|
72
|
+
if (compare(data.search, this.get("search")) != 0) {
|
73
|
+
return;
|
74
|
+
}
|
75
|
+
|
76
|
+
if (data.messages.length > 0) {
|
77
|
+
const newRows = this.toMessages(data.messages);
|
78
|
+
const messages = this.get("messages");
|
79
|
+
if (opts.before) {
|
80
|
+
messages.unshiftObjects(newRows);
|
81
|
+
} else {
|
82
|
+
newRows.forEach(nmsg => {
|
83
|
+
messages.forEach(emsg => {
|
84
|
+
if (emsg.key == nmsg.key) {
|
85
|
+
messages.removeObject(emsg);
|
86
|
+
if (this.get("currentMessage") === emsg) {
|
87
|
+
// TODO would updateFromJson() work here?
|
88
|
+
this.set("currentMessage", nmsg);
|
89
|
+
nmsg.set("selected", emsg.get("selected"));
|
90
|
+
}
|
91
|
+
}
|
92
|
+
});
|
93
|
+
});
|
94
|
+
messages.addObjects(newRows);
|
95
|
+
if (newRows.length > 0) {
|
96
|
+
increaseTitleCount(newRows.length);
|
97
|
+
}
|
98
|
+
}
|
99
|
+
}
|
100
|
+
this.set("total", data.total);
|
101
|
+
});
|
102
|
+
},
|
103
|
+
|
104
|
+
reload() {
|
105
|
+
this.set("total", 0);
|
106
|
+
this.get("messages").clear();
|
107
|
+
|
108
|
+
this.load();
|
109
|
+
},
|
110
|
+
|
111
|
+
loadMore() {
|
112
|
+
const messages = this.get("messages");
|
113
|
+
if (messages.length === 0) {
|
114
|
+
this.load({});
|
115
|
+
return;
|
116
|
+
}
|
117
|
+
|
118
|
+
const lastKey = messages[messages.length - 1].get("key");
|
119
|
+
this.load({
|
120
|
+
after: lastKey
|
121
|
+
});
|
122
|
+
},
|
123
|
+
|
124
|
+
moreBefore: computed("totalBefore", function() {
|
125
|
+
return this.get("totalBefore") > 0;
|
126
|
+
}),
|
127
|
+
|
128
|
+
totalBefore: computed("total", "messages.length", function() {
|
129
|
+
return this.get("total") - this.get("messages").length;
|
130
|
+
}),
|
131
|
+
|
132
|
+
showMoreBefore: function() {
|
133
|
+
const messages = this.get("messages");
|
134
|
+
const firstKey = messages[0].get("key");
|
135
|
+
|
136
|
+
this.load({
|
137
|
+
before: firstKey
|
138
|
+
});
|
139
|
+
},
|
140
|
+
|
141
|
+
regexSearch: computed("search", function() {
|
142
|
+
const search = this.get("search");
|
143
|
+
if (search && search.length > 2 && search[0] === "/") {
|
144
|
+
const match = search.match(/\/(.*)\/(.*)/);
|
145
|
+
if (match && match.length === 3) {
|
146
|
+
try {
|
147
|
+
return new RegExp(match[1], match[2]);
|
148
|
+
} catch (err) {
|
149
|
+
// don't care
|
150
|
+
}
|
151
|
+
}
|
152
|
+
}
|
153
|
+
}),
|
154
|
+
|
155
|
+
toMessages(messages) {
|
156
|
+
return messages.map(m => Message.create(m));
|
157
|
+
}
|
158
|
+
});
|