logster 2.1.0 → 2.1.1

data/client-app/app/lib/utilities.js

@@ -1,140 +1,140 @@
-import Preload from "client-app/lib/preload";
-
-const entityMap = {
-  "&": "&",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#39;",
-  "/": "&#x2F;"
-};
-
-export function escapeHtml(string) {
-  return String(string).replace(/[&<>"'/]/g, s => entityMap[s]);
-}
-
-export function ajax(url, settings) {
-  settings = settings || {};
-  settings.headers = settings.headers || {};
-  settings.headers["X-SILENCE-LOGGER"] = true;
-  return Em.$.ajax(Preload.get("rootPath") + url, settings);
-}
-
-export function preloadOrAjax(url, settings) {
-  const preloaded = Preload.get(`preload.${url.replace(".json", "")}`);
-  if (preloaded) {
-    return Em.RSVP.resolve(preloaded);
-  } else {
-    return ajax(url, settings);
-  }
-}
-
-let HIDDEN_PROPERTY;
-let TITLE;
-let TITLE_COUNT;
-
-export function updateHiddenProperty(property) {
-  HIDDEN_PROPERTY = property;
-}
-
-export function isHidden() {
-  if (HIDDEN_PROPERTY !== undefined) {
-    return document[HIDDEN_PROPERTY];
-  } else {
-    return !document.hasFocus;
-  }
-}
-
-export function increaseTitleCount(increment) {
-  if (!isHidden()) {
-    return;
-  }
-  TITLE = TITLE || document.title;
-  TITLE_COUNT = TITLE_COUNT || 0;
-  TITLE_COUNT += increment;
-  document.title = `${TITLE} (${TITLE_COUNT})`;
-}
-
-export function resetTitleCount() {
-  TITLE_COUNT = 0;
-  document.title = TITLE || document.title;
-}
-
-export function formatTime(timestamp) {
-  let formatted;
-  const time = moment(timestamp);
-  const now = moment();
-
-  if (time.diff(now.startOf("day")) > 0) {
-    formatted = time.format("h:mm a");
-  } else {
-    if (time.diff(now.startOf("week")) > 0) {
-      formatted = time.format("dd h:mm a");
-    } else {
-      if (time.diff(now.startOf("year")) > 0) {
-        formatted = time.format("D MMM h:mm a");
-      } else {
-        formatted = time.format("D MMM YY");
-      }
-    }
-  }
-
-  return formatted;
-}
-
-export function buildArrayString(array) {
-  const buffer = [];
-  array.forEach(v => {
-    if (v === null) {
-      buffer.push("null");
-    } else if (Object.prototype.toString.call(v) === "[object Array]") {
-      buffer.push(buildArrayString(v));
-    } else {
-      buffer.push(escapeHtml(v.toString()));
-    }
-  });
-  return "[" + buffer.join(", ") + "]";
-}
-
-export function buildHashString(hash, recurse) {
-  if (!hash) return "";
-
-  const buffer = [];
-  const hashes = [];
-  _.each(hash, (v, k) => {
-    if (v === null) {
-      buffer.push("null");
-    } else if (Object.prototype.toString.call(v) === "[object Array]") {
-      buffer.push(
-        "<tr><td>" +
-          escapeHtml(k) +
-          "</td><td>" +
-          buildArrayString(v) +
-          "</td></tr>"
-      );
-    } else if (typeof v === "object") {
-      hashes.push(k);
-    } else {
-      buffer.push(
-        "<tr><td>" + escapeHtml(k) + "</td><td>" + escapeHtml(v) + "</td></tr>"
-      );
-    }
-  });
-
-  if (_.size(hashes) > 0) {
-    _.each(hashes, function(k1) {
-      const v = hash[k1];
-      buffer.push("<tr><td></td><td><table>");
-      buffer.push(
-        "<td>" +
-          escapeHtml(k1) +
-          "</td><td>" +
-          buildHashString(v, true) +
-          "</td>"
-      );
-      buffer.push("</table></td></tr>");
-    });
-  }
-  const className = recurse ? "" : "env-table";
-  return "<table class='" + className + "'>" + buffer.join("\n") + "</table>";
-}
+import Preload from "client-app/lib/preload";
+
+const entityMap = {
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': "&quot;",
+  "'": "&#39;",
+  "/": "&#x2F;"
+};
+
+export function escapeHtml(string) {
+  return String(string).replace(/[&<>"'/]/g, s => entityMap[s]);
+}
+
+export function ajax(url, settings) {
+  settings = settings || {};
+  settings.headers = settings.headers || {};
+  settings.headers["X-SILENCE-LOGGER"] = true;
+  return Em.$.ajax(Preload.get("rootPath") + url, settings);
+}
+
+export function preloadOrAjax(url, settings) {
+  const preloaded = Preload.get(`preload.${url.replace(".json", "")}`);
+  if (preloaded) {
+    return Em.RSVP.resolve(preloaded);
+  } else {
+    return ajax(url, settings);
+  }
+}
+
+let HIDDEN_PROPERTY;
+let TITLE;
+let TITLE_COUNT;
+
+export function updateHiddenProperty(property) {
+  HIDDEN_PROPERTY = property;
+}
+
+export function isHidden() {
+  if (HIDDEN_PROPERTY !== undefined) {
+    return document[HIDDEN_PROPERTY];
+  } else {
+    return !document.hasFocus;
+  }
+}
+
+export function increaseTitleCount(increment) {
+  if (!isHidden()) {
+    return;
+  }
+  TITLE = TITLE || document.title;
+  TITLE_COUNT = TITLE_COUNT || 0;
+  TITLE_COUNT += increment;
+  document.title = `${TITLE} (${TITLE_COUNT})`;
+}
+
+export function resetTitleCount() {
+  TITLE_COUNT = 0;
+  document.title = TITLE || document.title;
+}
+
+export function formatTime(timestamp) {
+  let formatted;
+  const time = moment(timestamp);
+  const now = moment();
+
+  if (time.diff(now.startOf("day")) > 0) {
+    formatted = time.format("h:mm a");
+  } else {
+    if (time.diff(now.startOf("week")) > 0) {
+      formatted = time.format("dd h:mm a");
+    } else {
+      if (time.diff(now.startOf("year")) > 0) {
+        formatted = time.format("D MMM h:mm a");
+      } else {
+        formatted = time.format("D MMM YY");
+      }
+    }
+  }
+
+  return formatted;
+}
+
+export function buildArrayString(array) {
+  const buffer = [];
+  array.forEach(v => {
+    if (v === null) {
+      buffer.push("null");
+    } else if (Object.prototype.toString.call(v) === "[object Array]") {
+      buffer.push(buildArrayString(v));
+    } else {
+      buffer.push(escapeHtml(v.toString()));
+    }
+  });
+  return "[" + buffer.join(", ") + "]";
+}
+
+export function buildHashString(hash, recurse) {
+  if (!hash) return "";
+
+  const buffer = [];
+  const hashes = [];
+  _.each(hash, (v, k) => {
+    if (v === null) {
+      buffer.push("null");
+    } else if (Object.prototype.toString.call(v) === "[object Array]") {
+      buffer.push(
+        "<tr><td>" +
+          escapeHtml(k) +
+          "</td><td>" +
+          buildArrayString(v) +
+          "</td></tr>"
+      );
+    } else if (typeof v === "object") {
+      hashes.push(k);
+    } else {
+      buffer.push(
+        "<tr><td>" + escapeHtml(k) + "</td><td>" + escapeHtml(v) + "</td></tr>"
+      );
+    }
+  });
+
+  if (_.size(hashes) > 0) {
+    _.each(hashes, function(k1) {
+      const v = hash[k1];
+      buffer.push("<tr><td></td><td><table>");
+      buffer.push(
+        "<td>" +
+          escapeHtml(k1) +
+          "</td><td>" +
+          buildHashString(v, true) +
+          "</td>"
+      );
+      buffer.push("</table></td></tr>");
+    });
+  }
+  const className = recurse ? "" : "env-table";
+  return "<table class='" + className + "'>" + buffer.join("\n") + "</table>";
+}

data/client-app/app/models/message-collection.js

@@ -1,178 +1,178 @@
-import { ajax, increaseTitleCount } from "client-app/lib/utilities";
-import Message from "client-app/models/message";
-import { compare } from "@ember/utils";
-import { computed } from "@ember/object";
-
-const BATCH_SIZE = 50;
-
-export default Em.Object.extend({
-  messages: Em.A(),
-  currentMessage: null,
-  total: 0,
-
-  solve(message) {
-    message.solve().then(() => {
-      this.reload();
-    });
-  },
-
-  destroy(message) {
-    const messages = this.get("messages");
-    const idx = messages.indexOf(message);
-    message.destroy();
-    message.set("selected", false);
-    this.set("total", this.get("total") - 1);
-    this.get("messages").removeObject(message);
-
-    if (idx > 0) {
-      message = messages[idx - 1];
-      message.set("selected", true);
-      this.set("currentMessage", message);
-    } else {
-      if (this.get("total") > 0) {
-        message = messages[0];
-        message.set("selected", true);
-        this.set("currentMessage", message);
-      } else {
-        this.reload();
-      }
-    }
-  },
-
-  load(opts) {
-    opts = opts || {};
-
-    const data = {
-      filter: this.get("filter").join("_")
-    };
-
-    const search = this.get("search");
-    if (!_.isEmpty(search)) {
-      data.search = search;
-      const regexSearch = this.get("regexSearch");
-      if (regexSearch) {
-        data.regex_search = "true";
-      }
-    }
-
-    if (opts.before) {
-      data.before = opts.before;
-    }
-
-    if (opts.after) {
-      data.after = opts.after;
-    }
-
-    return ajax("/messages.json", {
-      data: data
-    }).then(data => {
-      // guard against race: ensure the results we're trying to apply
-      //                     match the current search terms
-      if (compare(data.filter, this.get("filter")) != 0) {
-        return;
-      }
-      if (compare(data.search, this.get("search")) != 0) {
-        return;
-      }
-
-      if (data.messages.length > 0) {
-        const newRows = this.toMessages(data.messages);
-        const messages = this.get("messages");
-        if (opts.before) {
-          messages.unshiftObjects(newRows);
-        } else {
-          newRows.forEach(nmsg => {
-            messages.forEach(emsg => {
-              if (emsg.key == nmsg.key) {
-                messages.removeObject(emsg);
-                if (this.get("currentMessage") === emsg) {
-                  // TODO would updateFromJson() work here?
-                  this.set("currentMessage", nmsg);
-                  nmsg.set("selected", emsg.get("selected"));
-                }
-              }
-            });
-          });
-          messages.addObjects(newRows);
-          if (newRows.length > 0) {
-            increaseTitleCount(newRows.length);
-          }
-        }
-      }
-      this.set("total", data.total);
-      return data;
-    });
-  },
-
-  reload() {
-    this.set("total", 0);
-    this.get("messages").clear();
-
-    return this.load().then(data => this.updateCanLoadMore(data));
-  },
-
-  updateCanLoadMore(data) {
-    if (!data) {
-      return;
-    }
-    if (data.messages.length < BATCH_SIZE) {
-      this.set("canLoadMore", false);
-    } else {
-      this.set("canLoadMore", true);
-    }
-  },
-
-  loadMore() {
-    const messages = this.get("messages");
-    if (messages.length === 0) {
-      this.load({});
-      return;
-    }
-
-    const lastKey = messages[messages.length - 1].get("key");
-    this.load({
-      after: lastKey
-    });
-  },
-
-  hideCountInLoadMore: computed("search", "filter", function() {
-    const search = this.get("search");
-    const filter = this.get("filter");
-    return (search && search.length > 0) || (filter && filter.length < 6);
-  }),
-
-  moreBefore: computed("messages.length", "canLoadMore", function() {
-    return this.get("messages.length") >= BATCH_SIZE && this.get("canLoadMore");
-  }),
-
-  totalBefore: computed("total", "messages.length", function() {
-    return this.get("total") - this.get("messages").length;
-  }),
-
-  showMoreBefore: function() {
-    const messages = this.get("messages");
-    const firstKey = messages[0].get("key");
-
-    this.load({
-      before: firstKey
-    }).then(data => this.updateCanLoadMore(data));
-  },
-
-  regexSearch: computed("search", function() {
-    const search = this.get("search");
-    if (search && search.length > 2 && search[0] === "/") {
-      const match = search.match(/\/(.*)\/(.*)/);
-      if (match && match.length === 3) {
-        try {
-          return new RegExp(match[1], match[2]);
-        } catch (err) {
-          // don't care
-        }
-      }
-    }
-  }),
-
-  toMessages(messages) {
-    return messages.map(m => Message.create(m));
-  }
-});
+import { ajax, increaseTitleCount } from "client-app/lib/utilities";
+import Message from "client-app/models/message";
+import { compare } from "@ember/utils";
+import { computed } from "@ember/object";
+
+const BATCH_SIZE = 50;
+
+export default Em.Object.extend({
+  messages: Em.A(),
+  currentMessage: null,
+  total: 0,
+
+  solve(message) {
+    message.solve().then(() => {
+      this.reload();
+    });
+  },
+
+  destroy(message) {
+    const messages = this.get("messages");
+    const idx = messages.indexOf(message);
+    message.destroy();
+    message.set("selected", false);
+    this.set("total", this.get("total") - 1);
+    this.get("messages").removeObject(message);
+
+    if (idx > 0) {
+      message = messages[idx - 1];
+      message.set("selected", true);
+      this.set("currentMessage", message);
+    } else {
+      if (this.get("total") > 0) {
+        message = messages[0];
+        message.set("selected", true);
+        this.set("currentMessage", message);
+      } else {
+        this.reload();
+      }
+    }
+  },
+
+  load(opts) {
+    opts = opts || {};
+
+    const data = {
+      filter: this.get("filter").join("_")
+    };
+
+    const search = this.get("search");
+    if (!_.isEmpty(search)) {
+      data.search = search;
+      const regexSearch = this.get("regexSearch");
+      if (regexSearch) {
+        data.regex_search = "true";
+      }
+    }
+
+    if (opts.before) {
+      data.before = opts.before;
+    }
+
+    if (opts.after) {
+      data.after = opts.after;
+    }
+
+    return ajax("/messages.json", {
+      data: data
+    }).then(data => {
+      // guard against race: ensure the results we're trying to apply
+      //                     match the current search terms
+      if (compare(data.filter, this.get("filter")) != 0) {
+        return;
+      }
+      if (compare(data.search, this.get("search")) != 0) {
+        return;
+      }
+
+      if (data.messages.length > 0) {
+        const newRows = this.toMessages(data.messages);
+        const messages = this.get("messages");
+        if (opts.before) {
+          messages.unshiftObjects(newRows);
+        } else {
+          newRows.forEach(nmsg => {
+            messages.forEach(emsg => {
+              if (emsg.key == nmsg.key) {
+                messages.removeObject(emsg);
+                if (this.get("currentMessage") === emsg) {
+                  // TODO would updateFromJson() work here?
+                  this.set("currentMessage", nmsg);
+                  nmsg.set("selected", emsg.get("selected"));
+                }
+              }
+            });
+          });
+          messages.addObjects(newRows);
+          if (newRows.length > 0) {
+            increaseTitleCount(newRows.length);
+          }
+        }
+      }
+      this.set("total", data.total);
+      return data;
+    });
+  },
+
+  reload() {
+    this.set("total", 0);
+    this.get("messages").clear();
+
+    return this.load().then(data => this.updateCanLoadMore(data));
+  },
+
+  updateCanLoadMore(data) {
+    if (!data) {
+      return;
+    }
+    if (data.messages.length < BATCH_SIZE) {
+      this.set("canLoadMore", false);
+    } else {
+      this.set("canLoadMore", true);
+    }
+  },
+
+  loadMore() {
+    const messages = this.get("messages");
+    if (messages.length === 0) {
+      this.load({});
+      return;
+    }
+
+    const lastKey = messages[messages.length - 1].get("key");
+    this.load({
+      after: lastKey
+    });
+  },
+
+  hideCountInLoadMore: computed("search", "filter", function() {
+    const search = this.get("search");
+    const filter = this.get("filter");
+    return (search && search.length > 0) || (filter && filter.length < 6);
+  }),
+
+  moreBefore: computed("messages.length", "canLoadMore", function() {
+    return this.get("messages.length") >= BATCH_SIZE && this.get("canLoadMore");
+  }),
+
+  totalBefore: computed("total", "messages.length", function() {
+    return this.get("total") - this.get("messages").length;
+  }),
+
+  showMoreBefore: function() {
+    const messages = this.get("messages");
+    const firstKey = messages[0].get("key");
+
+    this.load({
+      before: firstKey
+    }).then(data => this.updateCanLoadMore(data));
+  },
+
+  regexSearch: computed("search", function() {
+    const search = this.get("search");
+    if (search && search.length > 2 && search[0] === "/") {
+      const match = search.match(/\/(.*)\/(.*)/);
+      if (match && match.length === 3) {
+        try {
+          return new RegExp(match[1], match[2]);
+        } catch (err) {
+          // don't care
+        }
+      }
+    }
+  }),
+
+  toMessages(messages) {
+    return messages.map(m => Message.create(m));
+  }
+});