logster 2.11.3 → 2.12.1

data/client-app/app/controllers/show.js

@@ -1,19 +1,23 @@
+import classic from "ember-classic-decorator";
 import Controller from "@ember/controller";
+import { action } from "@ember/object";
 
-export default Controller.extend({
-  envPosition: 0,
+@classic
+export default class ShowController extends Controller {
+  envPosition = 0;
 
-  actions: {
-    protect() {
-      this.get("model").protect();
-    },
+  @action
+  protect() {
+    this.model.protect();
+  }
 
-    unprotect() {
-      this.get("model").unprotect();
-    },
+  @action
+  unprotect() {
+    this.model.unprotect();
+  }
 
-    envChanged(newPosition) {
-      this.set("envPosition", newPosition);
-    }
+  @action
+  envChanged(newPosition) {
+    this.set("envPosition", newPosition);
   }
-});
+}

data/client-app/app/helpers/or.js

@@ -1,7 +1,7 @@
 import { helper } from "@ember/component/helper";
 
 export function or(params) {
-  return params.some(p => p);
+  return params.some((p) => p);
 }
 
 export default helper(or);

data/client-app/app/initializers/app-init.js

@@ -1,28 +1,28 @@
 import {
-  updateHiddenProperty,
+  ajax,
   resetTitleCount,
-  ajax
+  updateHiddenProperty,
 } from "client-app/lib/utilities";
-import Evented from "@ember/object/evented";
-import EmberObject from "@ember/object";
 import { setRootPath } from "client-app/lib/preload";
 
-const TARGETS = ["component", "route"];
-
-export function initialize(app) {
+export async function initialize(app) {
   const config = app.resolveRegistration("config:environment");
   setRootPath(config.rootURL.replace(/\/$/, ""));
 
   if (config.environment === "development") {
     app.deferReadiness();
-    ajax("/development-preload.json")
-      .then(data => {
-        const elem = document.getElementById("preloaded-data");
-        elem.setAttribute("data-preloaded", JSON.stringify(data));
-      })
-      .catch(xhr => console.error("Fetching preload data failed.", xhr)) // eslint-disable-line no-console
-      .finally(() => app.advanceReadiness());
+
+    try {
+      const data = await ajax("/development-preload.json");
+      const elem = document.getElementById("preloaded-data");
+      elem.setAttribute("data-preloaded", JSON.stringify(data));
+    } catch (xhr) {
+      console.error("Fetching preload data failed.", xhr); // eslint-disable-line no-console
+    } finally {
+      app.advanceReadiness();
+    }
   }
+
   // config for moment.js
   moment.updateLocale("en", {
     relativeTime: {
@@ -38,45 +38,34 @@ export function initialize(app) {
       M: "a mth",
       MM: "%d mths",
       y: "a yr",
-      yy: "%d yrs"
-    }
+      yy: "%d yrs",
+    },
   });
 
   // setup event for updating document title and title count
   let hiddenProperty;
   let visibilitychange;
 
-  ["", "webkit", "ms", "moz", "ms"].forEach(prefix => {
+  for (const prefix of ["", "webkit", "ms", "moz", "ms"]) {
     const check = prefix + (prefix === "" ? "hidden" : "Hidden");
-    if (document[check] !== undefined && !hiddenProperty) {
+
+    if (document[check] !== undefined) {
       hiddenProperty = check;
       visibilitychange = prefix + "visibilitychange";
+      break;
     }
-  });
+  }
 
   updateHiddenProperty(hiddenProperty);
-  document.addEventListener(
-    visibilitychange,
-    () => {
-      resetTitleCount();
-    },
-    false
-  );
-
-  app.register("events:main", EmberObject.extend(Evented).create(), {
-    instantiate: false
-  });
-  TARGETS.forEach(t => app.inject(t, "events", "events:main"));
+  document.addEventListener(visibilitychange, resetTitleCount, false);
 
   const isMobile =
     /mobile/i.test(navigator.userAgent) && !/iPad/.test(navigator.userAgent);
   if (isMobile) {
     document.body.classList.add("mobile");
   }
-  app.register("site:main", { isMobile }, { instantiate: false });
-  app.inject("controller", "site", "site:main");
 }
 
 export default {
-  initialize
+  initialize,
 };

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

@@ -3,9 +3,11 @@ export function bound(target, key, desc) {
   const boundKey = `_${key}Bound`;
   return {
     get() {
-      if (this[boundKey]) return this[boundKey];
+      if (this[boundKey]) {
+        return this[boundKey];
+      }
       this.set(boundKey, orig.bind(this));
       return this[boundKey];
-    }
+    },
   };
 }

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

@@ -1,3 +1,5 @@
+import { set } from "@ember/object";
+
 let CONTAINER = {};
 let isInitialized = false;
 let rootPath;
@@ -13,7 +15,7 @@ export function getRootPath() {
 // exported so that it can be used in tests
 export function init() {
   const dataset = document.getElementById("preloaded-data").dataset;
-  CONTAINER = JSON.parse(dataset.preloaded);
+  CONTAINER = dataset.preloaded ? JSON.parse(dataset.preloaded) : {};
   CONTAINER.rootPath = rootPath;
   isInitialized = true;
 }
@@ -23,8 +25,8 @@ export default {
     if (!isInitialized) {
       init();
     }
-    return Em.get(CONTAINER, key);
-  }
+    return CONTAINER[key];
+  },
 };
 
 // used in tests
@@ -32,7 +34,8 @@ export function mutatePreload(key, value) {
   if (!isInitialized) {
     init();
   }
-  Em.set(CONTAINER, key, value);
+
+  set(CONTAINER, key, value);
 }
 
 export function uninitialize() {

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

@@ -1,5 +1,4 @@
-import { default as Preload, getRootPath } from "client-app/lib/preload";
-import { Promise, resolve } from "rsvp";
+import Preload, { getRootPath } from "client-app/lib/preload";
 
 const entityMap = {
   "&": "&",
@@ -7,32 +6,36 @@ const entityMap = {
   ">": ">",
   '"': """,
   "'": "'",
-  "/": "/"
+  "/": "/",
 };
 
 export function escapeHtml(string) {
-  return String(string).replace(/[&<>"'/]/g, s => entityMap[s]);
+  return String(string).replace(/[&<>"'/]/g, (s) => entityMap[s]);
 }
 
 export function ajax(url, settings) {
+  // eslint-disable-next-line no-restricted-globals
   return new Promise((resolve, reject) => {
-    settings = settings || {};
+    settings ||= {};
     const xhr = new XMLHttpRequest();
     url = getRootPath() + url;
+
     if (settings.data) {
-      for (let param in settings.data) {
-        const prefix = url.indexOf("?") === -1 ? "?" : "&";
-        url += prefix;
-        url += `${param}=${encodeURIComponent(settings.data[param])}`;
+      for (const [param, value] of Object.entries(settings.data)) {
+        url += url.includes("?") ? "&" : "?";
+        url += `${param}=${encodeURIComponent(value)}`;
       }
     }
+
     xhr.open(settings.method || settings.type || "GET", url);
     xhr.setRequestHeader("X-SILENCE-LOGGER", true);
+
     if (settings.headers) {
-      for (let header in settings.headers) {
-        xhr.setRequestHeader(header, settings.headers[header]);
+      for (const [header, value] of Object.entries(settings.headers)) {
+        xhr.setRequestHeader(header, value);
       }
     }
+
     xhr.onreadystatechange = () => {
       if (xhr.readyState === 4) {
         let status = xhr.status;
@@ -48,16 +51,17 @@ export function ajax(url, settings) {
         }
       }
     };
+
     xhr.send();
   });
 }
 
-export function preloadOrAjax(url, settings) {
+export async function preloadOrAjax(url, settings) {
   const preloaded = Preload.get(url.replace(".json", ""));
   if (preloaded) {
-    return resolve(preloaded);
+    return preloaded;
   } else {
-    return ajax(url, settings);
+    return await ajax(url, settings);
   }
 }
 
@@ -81,8 +85,9 @@ export function increaseTitleCount(increment) {
   if (!isHidden()) {
     return;
   }
-  TITLE = TITLE || document.title;
-  TITLE_COUNT = TITLE_COUNT || 0;
+
+  TITLE ||= document.title;
+  TITLE_COUNT ||= 0;
   TITLE_COUNT += increment;
   document.title = `${TITLE} (${TITLE_COUNT})`;
 }
@@ -93,57 +98,52 @@ export function resetTitleCount() {
 }
 
 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");
+    return time.format("h:mm a");
+  } else if (time.diff(now.startOf("week")) > 0) {
+    return time.format("dd h:mm a");
+  } else if (time.diff(now.startOf("year")) > 0) {
+    return time.format("D MMM 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 time.format("D MMM YY");
   }
-
-  return formatted;
 }
 
 export function buildArrayString(array) {
-  const buffer = [];
-  array.forEach(v => {
+  const buffer = array.map((v) => {
     if (v === null) {
-      buffer.push("null");
-    } else if (Object.prototype.toString.call(v) === "[object Array]") {
-      buffer.push(buildArrayString(v));
+      return "null";
+    } else if (Array.isArray(v)) {
+      return buildArrayString(v);
     } else {
-      buffer.push(escapeHtml(v.toString()));
+      return escapeHtml(v.toString());
     }
   });
+
   return "[" + buffer.join(", ") + "]";
 }
 
 export function buildHashString(hash, recurse, expanded = []) {
-  if (!hash) return "";
+  if (!hash) {
+    return "";
+  }
 
   const buffer = [];
   const hashes = [];
   const expandableKeys = Preload.get("env_expandable_keys") || [];
-  Object.keys(hash).forEach(k => {
-    const v = hash[k];
+
+  for (const [k, v] of Object.entries(hash)) {
     if (v === null) {
       buffer.push("null");
     } else if (Object.prototype.toString.call(v) === "[object Array]") {
       let valueHtml = "";
       if (
-        expandableKeys.indexOf(k) !== -1 &&
+        expandableKeys.includes(k) &&
         !recurse &&
-        expanded.indexOf(k) === -1 &&
+        !expanded.includes(k) &&
         v.length > 3
       ) {
         valueHtml = `${escapeHtml(
@@ -168,18 +168,17 @@ export function buildHashString(hash, recurse, expanded = []) {
         );
       }
     }
-  });
+  }
 
-  if (hashes.length > 0) {
-    hashes.forEach(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>");
-    });
+  for (const k1 of hashes) {
+    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>`;
 }
@@ -188,9 +187,9 @@ export function clone(object) {
   // simple function to clone an object
   // we don't need it fancier than this
   const copy = {};
-  Object.keys(object).forEach(k => {
-    copy[k] = object[k];
-  });
+  for (const [k, v] of Object.entries(object)) {
+    copy[k] = v;
+  }
   return copy;
 }
 
@@ -200,7 +199,9 @@ export function setLocalStorage(key, value) {
       key = "logster-" + key;
       window.localStorage.setItem(key, value);
     }
-  } catch { /* do nothing */ }
+  } catch {
+    /* do nothing */
+  }
 }
 
 export function getLocalStorage(key, fallback) {

data/client-app/app/models/group.js

@@ -1,29 +1,34 @@
-import Message from "client-app/models/message";
-import { default as EmberObject, computed } from "@ember/object";
+import classic from "ember-classic-decorator";
 import { reads } from "@ember/object/computed";
+import Message from "client-app/models/message";
+import EmberObject, { computed } from "@ember/object";
 import { ajax } from "client-app/lib/utilities";
 
-export default EmberObject.extend({
-  selected: false,
-  showCount: true,
-  key: reads("regex"),
-  displayMessage: reads("messages.firstObject.message"),
+@classic
+export default class Group extends EmberObject {
+  selected = false;
+  showCount = true;
+
+  @reads("regex") key;
+  @reads("messages.firstObject.message") displayMessage;
 
   init() {
-    this._super(...arguments);
-    const messages = this.messages.map(m => Message.create(m));
+    super.init(...arguments);
+    const messages = this.messages.map((m) => Message.create(m));
     this.set("messages", messages);
-  },
+  }
 
-  glyph: computed(function() {
+  @computed
+  get glyph() {
     return "clone";
-  }),
+  }
 
-  prefix: computed(function() {
+  @computed
+  get prefix() {
     return "far";
-  }),
+  }
 
   solveAll() {
     return ajax("/solve-group", { type: "POST", data: { regex: this.regex } });
   }
-});
+}