logster 2.11.3 → 2.12.1

data/client-app/app/routes/index.js

@@ -1,21 +1,26 @@
+import classic from "ember-classic-decorator";
+import { inject as service } from "@ember/service";
 import Route from "@ember/routing/route";
-import {
-  default as MessageCollection,
-  SEVERITIES
+import MessageCollection, {
+  SEVERITIES,
 } from "client-app/models/message-collection";
 import { isHidden } from "client-app/lib/utilities";
 
-export default Route.extend({
+@classic
+export default class IndexRoute extends Route {
+  @service events;
+
   model() {
     // TODO from preload json?
     return MessageCollection.create();
-  },
+  }
 
   setupController(controller, model) {
-    this._super(controller, model);
-    SEVERITIES.forEach(severity =>
-      model.set(`show${severity}`, controller[`show${severity}`])
-    );
+    super.setupController(controller, model);
+    for (const severity of SEVERITIES) {
+      model.set(`show${severity}`, controller[`show${severity}`]);
+    }
+
     model.reload();
 
     let times = 0;
@@ -25,6 +30,7 @@ export default Route.extend({
       if (model.loading) {
         return;
       }
+
       times += 1;
       const hidden = isHidden();
       let load = !hidden;
@@ -37,6 +43,7 @@ export default Route.extend({
           }
         }
       }
+
       // refresh a lot less aggressively in background
       if (load) {
         model.loadMore();
@@ -46,12 +53,12 @@ export default Route.extend({
       }
     }, 3000);
 
-    this.events.on("panelResized", amount => {
+    this.events.on("panelResized", (amount) => {
       controller.resizePanels(amount);
     });
-  },
+  }
 
   deactivate() {
     clearInterval(this.refreshInterval);
   }
-});
+}

data/client-app/app/routes/settings.js

@@ -1,30 +1,32 @@
+import classic from "ember-classic-decorator";
 import Route from "@ember/routing/route";
 import { ajax } from "client-app/lib/utilities";
 import Pattern from "client-app/models/pattern-item";
 
-export default Route.extend({
+@classic
+export default class SettingsRoute extends Route {
   model() {
     return ajax("/settings.json");
-  },
+  }
 
   setupController(controller, model) {
-    this._super(...arguments);
+    super.setupController(...arguments);
     const suppression = model.suppression;
     const codedSuppression = suppression
-      .filter(p => p.hard)
-      .map(hash => Pattern.create(hash));
+      .filter((p) => p.hard)
+      .map((hash) => Pattern.create(hash));
 
     const customSuppression = suppression
-      .reject(p => p.hard)
-      .map(hash => Pattern.create(hash));
+      .reject((p) => p.hard)
+      .map((hash) => Pattern.create(hash));
 
-    const grouping = model.grouping.map(hash => Pattern.create(hash));
+    const grouping = model.grouping.map((hash) => Pattern.create(hash));
     const showCodedSuppression = codedSuppression.length > 0;
     controller.setProperties({
       showCodedSuppression,
       codedSuppression,
       customSuppression,
-      grouping
+      grouping,
     });
   }
-});
+}

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

@@ -1,14 +1,16 @@
+import classic from "ember-classic-decorator";
 import Route from "@ember/routing/route";
 import Message from "client-app/models/message";
 import { preloadOrAjax } from "client-app/lib/utilities";
 
-export default Route.extend({
+@classic
+export default class ShowRoute extends Route {
   model(params) {
     return preloadOrAjax("/show/" + params.id + ".json");
-  },
+  }
 
   setupController(controller, model) {
-    this._super(...arguments);
+    super.setupController(...arguments);
     controller.set("model", Message.create(model));
   }
-});
+}

data/client-app/app/services/events.js

@@ -0,0 +1,4 @@
+import Service from "@ember/service";
+import Evented from "@ember/object/evented";
+
+export default class Events extends Service.extend(Evented) {}

data/client-app/app/styles/app.css

@@ -689,6 +689,8 @@ label span {
 .backtrace-line .line-link {
   color: #9e9e9e;
   margin-left: 3px;
+  text-decoration: none;
+  white-space: normal;
 }
 
 @media (prefers-color-scheme: dark) {

data/client-app/app/templates/application.hbs

@@ -1,2 +1 @@
-{{update-time}}
-{{outlet}}
+{{outlet}}

data/client-app/app/templates/components/actions-menu.hbs

@@ -1,16 +1,31 @@
-{{#if actionsInMenu}}
-  {{#if showMenu}}
+{{#if @actionsInMenu}}
+  {{#if this.showMenu}}
     <div class="actions-menu">
       {{yield}}
     </div>
   {{/if}}
-  <button {{action 'expandMenu'}} class="expand btn no-text">{{fa-icon 'ellipsis-h'}}</button>
-  {{#if showShare}}
-    <button {{action "share"}} class="share btn">{{fa-icon "share"}}<span>Share</span></button>
+
+  <button
+    class="expand btn no-text"
+    type="button"
+    {{on "click" this.expandMenu}}
+  >
+    <FaIcon @icon="ellipsis-h" />
+  </button>
+
+  {{#if @showShare}}
+    <button class="share btn" type="button" {{on "click" this.share}}>
+      <FaIcon @icon="share" />
+      <span>Share</span>
+    </button>
   {{/if}}
 {{else}}
   {{yield}}
-  {{#if showShare}}
-    <button {{action "share"}} class="share btn">{{fa-icon "share"}}<span>Share</span></button>
+
+  {{#if @showShare}}
+    <button class="share btn" type="button" {{on "click" this.share}}>
+      <FaIcon @icon="share" />
+      <span>Share</span>
+    </button>
   {{/if}}
-{{/if}}
+{{/if}}

data/client-app/app/templates/components/back-trace.hbs

@@ -1,8 +1,15 @@
-{{~#each lines as |line|~}}
+{{~#each this.lines as |line|~}}
   <div class="backtrace-line">
     {{~line.line~}}
     {{~#if line.url~}}
-      <a href="{{line.url}}" target="_blank" class="line-link">{{fa-icon "external-link-square-alt"}}</a>
+      <a
+        href={{line.url}}
+        target="_blank"
+        class="line-link"
+        rel="noopener noreferrer"
+      >
+        <FaIcon @icon="external-link-square-alt" />
+      </a>
     {{~/if~}}
   </div>
-{{~/each~}}
+{{~/each~}}

data/client-app/app/templates/components/env-tab.hbs

@@ -1,8 +1,10 @@
-{{#if isEnvArray}}
-  {{page-nav
-    list=message.env
-    position=currentEnvPosition
-    extraClasses="env-nav"
-    navigate=envChangedAction}}
+{{#if this.isEnvArray}}
+  <PageNav
+    @list={{@message.env}}
+    @position={{@currentEnvPosition}}
+    @extraClasses="env-nav"
+    @navigate={{@envChangedAction}}
+  />
 {{/if}}
-{{{html}}}
+
+{{this.html}}

data/client-app/app/templates/components/message-info.hbs

@@ -1,55 +1,86 @@
 <div class="message-info">
-  {{#tabbed-section onTabChange=(action "tabChanged")}}
-    {{#tab-contents name="info" hint="show info" currentMessage=currentMessage}}
-      {{#if showTitle}}
+  <TabbedSection @onTabChange={{this.tabChanged}} as |tabActions|>
+    <TabContents
+      @name="info"
+      @hint="show info"
+      @currentMessage={{@currentMessage}}
+      @tabActions={{tabActions}}
+    >
+      {{#if @showTitle}}
         <h3>Message
-          {{#if currentMessage.showCount}}
-            ({{currentMessage.count}} copies reported)
+          {{#if @currentMessage.showCount}}
+            ({{@currentMessage.count}}
+            copies reported)
           {{/if}}
         </h3>
       {{/if}}
-      <pre>{{currentMessage.message}}</pre>
-    {{/tab-contents}}
-    {{#tab-contents name="backtrace" defaultTab="true" hint="show backtrace" currentMessage=currentMessage}}
-      {{#if showTitle}}
+
+      <pre>{{@currentMessage.message}}</pre>
+    </TabContents>
+
+    <TabContents
+      @name="backtrace"
+      @defaultTab="true"
+      @hint="show backtrace"
+      @currentMessage={{@currentMessage}}
+      @tabActions={{tabActions}}
+    >
+      {{#if @showTitle}}
         <h3>Backtrace</h3>
       {{/if}}
-      <pre>
-        {{~back-trace
+
+      <pre><BackTrace
           class="backtrace"
-          backtrace=currentMessage.backtrace
-          env=currentMessage.env~}}
-      </pre>
-    {{/tab-contents}}
-    {{#tab-contents className="env" name="env" hint="show environment" currentMessage=currentMessage }}
-      {{#if currentMessage}}
-        {{#if currentMessage.env}}
-          {{#if showTitle}}
+          @backtrace={{@currentMessage.backtrace}}
+          @env={{@currentMessage.env}}
+        /></pre>
+    </TabContents>
+
+    <TabContents
+      @className="env"
+      @name="env"
+      @hint="show environment"
+      @currentMessage={{@currentMessage}}
+      @tabActions={{tabActions}}
+    >
+      {{#if @currentMessage}}
+        {{#if @currentMessage.env}}
+          {{#if @showTitle}}
             <h3>Env</h3>
           {{/if}}
-          {{env-tab 
-            message=currentMessage
-            currentEnvPosition=currentEnvPosition
-            envChangedAction=envChangedAction}}
-        {{else if loadingEnv}}
+
+          <EnvTab
+            @message={{@currentMessage}}
+            @currentEnvPosition={{@currentEnvPosition}}
+            @envChangedAction={{@envChangedAction}}
+          />
+        {{else if @loadingEnv}}
           Loading env...
         {{else}}
           No env for this message.
         {{/if}}
       {{/if}}
-    {{/tab-contents}}
-  {{/tabbed-section}}
+    </TabContents>
+  </TabbedSection>
 
-  {{#if currentMessage}}
-    <div class='message-actions'>
-      {{#actions-menu actionsInMenu=actionsInMenu showShare=showShare share=(action "share")}}
-        {{#each buttons as |btn|}}
-          <button {{action btn.action}} class="{{btn.klass}} btn {{if btn.danger 'danger' ''}}">
-            {{fa-icon btn.icon prefix=btn.prefix}}
+  {{#if @currentMessage}}
+    <div class="message-actions">
+      <ActionsMenu
+        @actionsInMenu={{@actionsInMenu}}
+        @showShare={{@showShare}}
+        @share={{this.share}}
+      >
+        {{#each this.buttons as |btn|}}
+          <button
+            class="{{btn.klass}} btn {{if btn.danger 'danger' ''}}"
+            type="button"
+            {{on "click" btn.action}}
+          >
+            <FaIcon @icon={{btn.icon}} @prefix={{btn.prefix}} />
             <span>{{btn.label}}</span>
           </button>
         {{/each}}
-      {{/actions-menu}}
+      </ActionsMenu>
     </div>
   {{/if}}
-</div>
+</div>

data/client-app/app/templates/components/message-row.hbs

@@ -1,15 +1,32 @@
 <div class="count">
-  {{#if model.showCount}}
-    {{model.count}}
+  {{#if @model.showCount}}
+    {{@model.count}}
   {{/if}}
 </div>
-<div class="severity">{{#if model.glyph}}{{fa-icon model.glyph class=model.klass prefix=model.prefix}}{{/if}}</div>
+
+<div class="severity">
+  {{#if @model.glyph}}
+    <FaIcon
+      @icon={{@model.glyph}}
+      @prefix={{@model.prefix}}
+      class={{@model.klass}}
+    />
+  {{/if}}
+</div>
+
 <div class="message-body">
-  {{model.displayMessage}}
+  {{@model.displayMessage}}
 </div>
-<div class='protected'>
-  {{#if model.protected}}
-    {{fa-icon "lock" title="message is protected, clearing will not remove it"}}
+
+<div class="protected">
+  {{#if @model.protected}}
+    <FaIcon
+      @icon="lock"
+      title="message is protected, clearing will not remove it"
+    />
   {{/if}}
 </div>
-<div class="time">{{time-formatter timestamp=model.timestamp}}</div>
+
+<div class="time">
+  <TimeFormatter @timestamp={{@model.timestamp}} />
+</div>

data/client-app/app/templates/components/page-nav.hbs

@@ -1,13 +1,37 @@
-<button disabled={{disableBackButtons}} {{action "bigJump" "back"}} class="btn nav-btn no-text">
-  {{fa-icon "fast-backward"}}
+<button
+  disabled={{this.disableBackButtons}}
+  class="btn nav-btn no-text"
+  type="button"
+  {{on "click" (fn this.bigJump "back")}}
+>
+  <FaIcon @icon="fast-backward" />
 </button>
-<button disabled={{disableBackButtons}} {{action "takeStep" "back"}} class="btn nav-btn no-text">
-  {{fa-icon "backward"}}
+
+<button
+  disabled={{this.disableBackButtons}}
+  class="btn nav-btn no-text"
+  type="button"
+  {{on "click" (fn this.takeStep "back")}}
+>
+  <FaIcon @icon="backward" />
 </button>
-<span class="current-number">{{displayNumber}}/{{list.length}}</span>
-<button disabled={{disableForwardButtons}} {{action "takeStep" "front"}} class="btn nav-btn no-text">
-  {{fa-icon "forward"}}
-</button>
-<button disabled={{disableForwardButtons}} {{action "bigJump" "front"}} class="btn nav-btn no-text">
-  {{fa-icon "fast-forward"}}
+
+<span class="current-number">{{this.displayNumber}}/{{@list.length}}</span>
+
+<button
+  disabled={{this.disableForwardButtons}}
+  class="btn nav-btn no-text"
+  type="button"
+  {{on "click" (fn this.takeStep "front")}}
+>
+  <FaIcon @icon="forward" />
 </button>
+
+<button
+  disabled={{this.disableForwardButtons}}
+  class="btn nav-btn no-text"
+  type="button"
+  {{on "click" (fn this.bigJump "front")}}
+>
+  <FaIcon @icon="fast-forward" />
+</button>

data/client-app/app/templates/components/panel-resizer.hbs

@@ -1,3 +1,3 @@
-<div class='line-1'></div>
-<div class='line-2'></div>
-<div class='line-3'></div>
+<div class="line-1"></div>
+<div class="line-2"></div>
+<div class="line-3"></div>

data/client-app/app/templates/components/patterns-list.hbs

@@ -1,44 +1,78 @@
-{{#if mutable}}
-  <button {{action "create"}} class="btn new-pattern">{{fa-icon "plus"}}<span>New</span></button>
+{{#if @mutable}}
+  <button class="btn new-pattern" type="button" {{on "click" this.create}}>
+    <FaIcon @icon="plus" />
+    <span>New</span>
+  </button>
 {{/if}}
-{{#each allPatterns as |pattern|}}
+
+{{#each this.allPatterns as |pattern|}}
   <div class="pattern-wrapper">
-    {{input
-      type="textfield"
+    <Input
+      @type="textfield"
+      @value={{pattern.valueBuffer}}
       class="pattern-input"
       placeholder="Enter regular expression…"
-      value=pattern.valueBuffer
-      disabled=(or immutable pattern.saving)
-    }}
-    {{#if mutable}}
+      disabled={{or this.immutable pattern.saving}}
+    />
+
+    {{#if @mutable}}
       {{#if pattern.hasBuffer}}
-        <button {{action "save" pattern}} disabled={{pattern.saving}} class="btn ok no-text save shrink">
-          {{fa-icon "check"}}
+        <button
+          disabled={{pattern.saving}}
+          class="btn ok no-text save shrink"
+          type="button"
+          {{on "click" (fn this.save pattern)}}
+        >
+          <FaIcon @icon="check" />
         </button>
       {{/if}}
-      <button {{action "trash" pattern}} disabled={{pattern.saving}} class="btn no-text trash shrink">
-        {{fa-icon "trash-alt"}}
+
+      <button
+        disabled={{pattern.saving}}
+        class="btn no-text trash shrink"
+        type="button"
+        {{on "click" (fn this.trash pattern)}}
+      >
+        <FaIcon @icon="trash-alt" />
       </button>
     {{/if}}
 
-    {{#if showCounter}}
-      <input disabled=true title="Number of logs that have been suppressed by this pattern" class="count shrink" value={{pattern.count}}>
-      <button {{action "resetCount" pattern}} class="btn no-text reset shrink" title="Reset count of suppressed logs" disabled={{pattern.zeroCount}}>
-        {{fa-icon "redo-alt"}}
+    {{#if this.showCounter}}
+      <input
+        disabled="true"
+        title="Number of logs that have been suppressed by this pattern"
+        class="count shrink"
+        value={{pattern.count}}
+      />
+      <button
+        class="btn no-text reset shrink"
+        title="Reset count of suppressed logs"
+        disabled={{pattern.zeroCount}}
+        type="button"
+        {{on "click" (fn this.resetCount pattern)}}
+      >
+        <FaIcon @icon="redo-alt" />
       </button>
     {{/if}}
   </div>
-  {{#if applyRetroactivelyCheckbox}}
+
+  {{#if @applyRetroactivelyCheckbox}}
     {{#if pattern.isNew}}
       <div class="retro-checkbox">
-        <input checked={{pattern.retroactive}} type="checkbox" class="checkbox" onclick={{action "checkboxChanged" pattern}}>
+        <input
+          checked={{pattern.retroactive}}
+          type="checkbox"
+          class="checkbox"
+          onclick={{fn this.checkboxChanged pattern}}
+        />
         Apply retroactively
       </div>
     {{/if}}
   {{/if}}
+
   {{~#if pattern.error~}}
     <pre class="api-error">
       {{~pattern.error~}}
     </pre>
   {{~/if~}}
-{{/each}}
+{{/each}}

data/client-app/app/templates/components/tabbed-section.hbs

@@ -1,10 +1,18 @@
-{{yield}}
+{{yield
+  (hash addTab=this.addTab removeTab=this.removeTab selectTab=this.selectTab)
+}}
+
 <ul class="tabs">
-  {{#each tabs as |tab|}}
+  {{#each this.tabs as |tab|}}
     <li>
-      <a title="{{unbound tab.hint}}" href="#" class="{{if tab.active 'active'}}" {{action selectTab tab}}>
+      <a
+        title={{unbound tab.hint}}
+        href="#"
+        class={{if tab.active "active"}}
+        {{on "click" (fn this.selectTab tab)}}
+      >
         {{unbound tab.name}}
       </a>
     </li>
   {{/each}}
-</ul>
+</ul>

data/client-app/app/templates/components/time-formatter.hbs

@@ -1 +1 @@
-{{time}}
+<span title={{this.title}}>{{this.time}}</span>