logster 2.1.2 → 2.2.0

data/client-app/package.json

@@ -1,56 +1,57 @@
-{
-  "name": "client-app",
-  "version": "0.0.0",
-  "private": true,
-  "description": "Logging framework and viewer",
-  "repository": "https://github.com/discourse/logster/",
-  "license": "MIT",
-  "author": "Sam Saffron",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
-  "scripts": {
-    "build": "ember build",
-    "lint:hbs": "ember-template-lint .",
-    "lint:js": "eslint .",
-    "start": "ember serve",
-    "test": "ember test"
-  },
-  "devDependencies": {
-    "@ember/jquery": "^0.5.2",
-    "@ember/optional-features": "^0.6.3",
-    "broccoli-asset-rev": "^2.7.0",
-    "ember-ajax": "^3.1.0",
-    "ember-cli": "~3.5.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^6.16.0",
-    "ember-cli-dependency-checker": "^3.0.0",
-    "ember-cli-eslint": "^4.2.3",
-    "ember-cli-htmlbars": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
-    "ember-cli-inject-live-reload": "^1.8.2",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-uglify": "^2.1.0",
-    "ember-data": "~3.5.0",
-    "ember-export-application-global": "^2.0.0",
-    "ember-font-awesome": "^4.0.0-rc.4",
-    "ember-load-initializers": "^1.1.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^3.4.1",
-    "ember-resolver": "^5.0.1",
-    "ember-source": "~3.5.0",
-    "ember-welcome-page": "^3.2.0",
-    "eslint-plugin-ember": "^5.2.0",
-    "loader.js": "^4.7.0",
-    "qunit-dom": "^0.8.0"
-  },
-  "engines": {
-    "node": "6.* || 8.* || >= 10.*"
-  },
-  "dependencies": {
-    "lodash": "~4.17.11",
-    "moment": "~2.22.2"
-  }
-}
+{
+  "name": "client-app",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Logging framework and viewer",
+  "repository": "https://github.com/discourse/logster/",
+  "license": "MIT",
+  "author": "Sam Saffron",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "scripts": {
+    "build": "ember build",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve",
+    "test": "ember test"
+  },
+  "devDependencies": {
+    "@ember/jquery": "^0.5.2",
+    "@ember/optional-features": "^0.6.3",
+    "broccoli-asset-rev": "^2.7.0",
+    "ember-ajax": "^3.1.0",
+    "ember-cli": "~3.5.0",
+    "ember-cli-app-version": "^3.2.0",
+    "ember-cli-babel": "^6.16.0",
+    "ember-cli-dependency-checker": "^3.0.0",
+    "ember-cli-eslint": "^4.2.3",
+    "ember-cli-htmlbars": "^3.0.0",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "ember-cli-inject-live-reload": "^1.8.2",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-template-lint": "^1.0.0-beta.1",
+    "ember-cli-uglify": "^2.1.0",
+    "ember-data": "~3.5.0",
+    "ember-export-application-global": "^2.0.0",
+    "ember-font-awesome": "^4.0.0-rc.4",
+    "ember-load-initializers": "^1.1.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^3.4.1",
+    "ember-resolver": "^5.0.1",
+    "ember-source": "~3.5.0",
+    "ember-welcome-page": "^3.2.0",
+    "eslint-plugin-ember": "^5.2.0",
+    "loader.js": "^4.7.0",
+    "prettier": "^1.16.4",
+    "qunit-dom": "^0.8.0"
+  },
+  "engines": {
+    "node": "6.* || 8.* || >= 10.*"
+  },
+  "dependencies": {
+    "lodash": "~4.17.11",
+    "moment": "~2.22.2"
+  }
+}

data/client-app/testem.js

@@ -1,25 +1,25 @@
-module.exports = {
-  test_page: 'tests/index.html?hidepassed',
-  disable_watching: true,
-  launch_in_ci: [
-    'Chrome'
-  ],
-  launch_in_dev: [
-    'Chrome'
-  ],
-  browser_args: {
-    Chrome: {
-      ci: [
-        // --no-sandbox is needed when running Chrome inside a container
-        process.env.CI ? '--no-sandbox' : null,
-        '--headless',
-        '--disable-gpu',
-        '--disable-dev-shm-usage',
-        '--disable-software-rasterizer',
-        '--mute-audio',
-        '--remote-debugging-port=0',
-        '--window-size=1440,900'
-      ].filter(Boolean)
-    }
-  }
-};
+module.exports = {
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'Chrome'
+  ],
+  launch_in_dev: [
+    'Chrome'
+  ],
+  browser_args: {
+    Chrome: {
+      ci: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.CI ? '--no-sandbox' : null,
+        '--headless',
+        '--disable-gpu',
+        '--disable-dev-shm-usage',
+        '--disable-software-rasterizer',
+        '--mute-audio',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ].filter(Boolean)
+    }
+  }
+};

data/client-app/tests/index.html

@@ -1,34 +1,34 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>ClientApp Tests</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta id="preloaded-data" data-root-path="/logs" data-preloaded="{&quot;env_expandable_keys&quot;:[]}">
-
-    {{content-for "head"}}
-    {{content-for "test-head"}}
-
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/client-app.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
-
-    {{content-for "head-footer"}}
-    {{content-for "test-head-footer"}}
-  </head>
-  <body>
-    {{content-for "body"}}
-    {{content-for "test-body"}}
-
-    <script src="/testem.js" integrity=""></script>
-    <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/test-support.js"></script>
-    <script src="{{rootURL}}assets/client-app.js"></script>
-    <script src="{{rootURL}}assets/tests.js"></script>
-
-    {{content-for "body-footer"}}
-    {{content-for "test-body-footer"}}
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>ClientApp Tests</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta id="preloaded-data" data-root-path="/logs" data-preloaded="{&quot;env_expandable_keys&quot;:[]}">
+
+    {{content-for "head"}}
+    {{content-for "test-head"}}
+
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/client-app.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
+
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+    {{content-for "test-body"}}
+
+    <script src="/testem.js" integrity=""></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/client-app.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
+
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
+  </body>
+</html>

data/client-app/tests/integration/components/env-tab-test.js

@@ -1,123 +1,134 @@
-import { module, test } from "qunit";
-import { setupRenderingTest } from "ember-qunit";
-import { render, find, findAll, click } from "@ember/test-helpers";
-import hbs from "htmlbars-inline-precompile";
-import Message from "client-app/models/message";
-import { init } from "client-app/lib/preload";
-
-const message = Message.create({
-  env: [{ a: "aa", b: "bb" }, { c: "cc", d: "dd" }]
-});
-
-const message2 = Message.create({
-  env: { e: "ee", f: "ff" }
-});
-
-const message3 = Message.create({
-  env: [
-    { env_key_2: "an_env_value", notExpanded: "dsdcz" },
-    { env_key_2: "anotherthing", notExpanded: "cxc" }
-  ]
-});
-
-function reduceToContent(node) {
-  return Array.from(node.childNodes).reduce(
-    (ac, cr) => `${ac.textContent}: ${cr.textContent}`
-  );
-}
-
-module("Integration | Component | env-tab", function(hooks) {
-  setupRenderingTest(hooks);
-
-  test("it renders", async function(assert) {
-    this.set("message", message);
-    await render(hbs`{{env-tab message=message}}`);
-
-    assert.equal(
-      find(".env-number").textContent,
-      "1/2",
-      "shows the current over the total number of env objects"
-    );
-    let trs = findAll("tr");
-    assert.equal(trs.length, 2);
-    assert.equal(reduceToContent(trs[0]), "a: aa", "has the right content");
-    assert.equal(reduceToContent(trs[1]), "b: bb", "has the right content");
-
-    const buttons = findAll("button.nav-btn");
-    // at first page, you can't go back
-    assert.ok(buttons[0].disabled, "back buttons are disabled");
-    assert.ok(buttons[1].disabled, "back buttons are disabled");
-
-    assert.notOk(buttons[2].disabled, "forward buttons are not disabled");
-    assert.notOk(buttons[3].disabled, "forward buttons are not disabled");
-
-    this.set("message", message2);
-    assert.dom("button").doesNotExist("doesn't show buttons for non-array env");
-
-    trs = findAll("tr");
-    assert.equal(trs.length, 2);
-    assert.equal(reduceToContent(trs[0]), "e: ee", "has the right content");
-    assert.equal(reduceToContent(trs[1]), "f: ff", "has the right content");
-  });
-
-  test("it works correctly", async function(assert) {
-    this.set("message", message);
-    await render(hbs`{{env-tab message=message}}`);
-
-    const buttons = findAll("button.nav-btn");
-    await click(buttons[2]);
-
-    assert.equal(
-      find(".env-number").textContent,
-      "2/2",
-      "shows the current over the total number of env objects"
-    );
-
-    const trs = findAll("tr");
-    assert.equal(trs.length, 2);
-    assert.equal(reduceToContent(trs[0]), "c: cc", "has the right content");
-    assert.equal(reduceToContent(trs[1]), "d: dd", "has the right content");
-
-    // at last page, you can't go forward but you can go back
-    assert.notOk(buttons[0].disabled, "back buttons are not disabled");
-    assert.notOk(buttons[1].disabled, "back buttons are not disabled");
-
-    assert.ok(buttons[2].disabled, "forward buttons are disabled");
-    assert.ok(buttons[3].disabled, "forward buttons are disabled");
-  });
-
-  test("expandable env keys", async function(assert) {
-    document.getElementById(
-      "preloaded-data"
-    ).dataset.preloaded = JSON.stringify({
-      env_expandable_keys: ["env_key_2"]
-    });
-    init();
-    this.set("message", message3);
-    await render(hbs`{{env-tab message=message}}`);
-
-    const expandable = find(".env-table tr");
-    assert.equal(
-      expandable.children[1].textContent.trim(),
-      "an_env_value, 1 more",
-      "expandable env keys shown correctly"
-    );
-
-    assert.equal(
-      findAll("a.expand-list").length,
-      1,
-      "only whitelisted env keys are expandable"
-    );
-
-    const expandBtn = find("a.expand-list");
-    assert.equal(expandBtn.textContent.trim(), "1 more");
-    await click(expandBtn);
-
-    const expanded = find(".env-table tr");
-    assert.equal(
-      expanded.children[1].textContent.trim(),
-      "[an_env_value, anotherthing]",
-      "expanded env keys shown correctly"
-    );
-  });
-});
+import { module, test } from "qunit";
+import { setupRenderingTest } from "ember-qunit";
+import { render, find, findAll, click } from "@ember/test-helpers";
+import hbs from "htmlbars-inline-precompile";
+import Message from "client-app/models/message";
+import { init } from "client-app/lib/preload";
+
+const message = Message.create({
+  env: [{ a: "aa", b: "bb" }, { c: "cc", d: "dd" }]
+});
+
+const message2 = Message.create({
+  env: { e: "ee", f: "ff" }
+});
+
+const message3 = Message.create({
+  env: [
+    { env_key_2: "value1", default_expanded: "vvv1", notExpanded: "dsdcz" },
+    { env_key_2: "value2", default_expanded: "vvv2", notExpanded: "uerue" },
+    { env_key_2: "value3", notExpanded: "weeww" },
+    { env_key_2: "value4", notExpanded: "cxc" }
+  ]
+});
+
+function reduceToContent(node) {
+  return Array.from(node.childNodes).reduce(
+    (ac, cr) => `${ac.textContent}: ${cr.textContent}`
+  );
+}
+
+module("Integration | Component | env-tab", function(hooks) {
+  setupRenderingTest(hooks);
+
+  test("it renders", async function(assert) {
+    this.set("message", message);
+    await render(hbs`{{env-tab message=message}}`);
+
+    assert.equal(
+      find(".env-number").textContent,
+      "1/2",
+      "shows the current over the total number of env objects"
+    );
+    let trs = findAll("tr");
+    assert.equal(trs.length, 2);
+    assert.equal(reduceToContent(trs[0]), "a: aa", "has the right content");
+    assert.equal(reduceToContent(trs[1]), "b: bb", "has the right content");
+
+    const buttons = findAll("button.nav-btn");
+    // at first page, you can't go back
+    assert.ok(buttons[0].disabled, "back buttons are disabled");
+    assert.ok(buttons[1].disabled, "back buttons are disabled");
+
+    assert.notOk(buttons[2].disabled, "forward buttons are not disabled");
+    assert.notOk(buttons[3].disabled, "forward buttons are not disabled");
+
+    this.set("message", message2);
+    assert.dom("button").doesNotExist("doesn't show buttons for non-array env");
+
+    trs = findAll("tr");
+    assert.equal(trs.length, 2);
+    assert.equal(reduceToContent(trs[0]), "e: ee", "has the right content");
+    assert.equal(reduceToContent(trs[1]), "f: ff", "has the right content");
+  });
+
+  test("it works correctly", async function(assert) {
+    this.set("message", message);
+    await render(hbs`{{env-tab message=message}}`);
+
+    const buttons = findAll("button.nav-btn");
+    await click(buttons[2]);
+
+    assert.equal(
+      find(".env-number").textContent,
+      "2/2",
+      "shows the current over the total number of env objects"
+    );
+
+    const trs = findAll("tr");
+    assert.equal(trs.length, 2);
+    assert.equal(reduceToContent(trs[0]), "c: cc", "has the right content");
+    assert.equal(reduceToContent(trs[1]), "d: dd", "has the right content");
+
+    // at last page, you can't go forward but you can go back
+    assert.notOk(buttons[0].disabled, "back buttons are not disabled");
+    assert.notOk(buttons[1].disabled, "back buttons are not disabled");
+
+    assert.ok(buttons[2].disabled, "forward buttons are disabled");
+    assert.ok(buttons[3].disabled, "forward buttons are disabled");
+  });
+
+  test("expandable env keys", async function(assert) {
+    document.getElementById(
+      "preloaded-data"
+    ).dataset.preloaded = JSON.stringify({
+      env_expandable_keys: ["env_key_2", "default_expanded"]
+    });
+    init();
+    this.set("message", message3);
+    await render(hbs`{{env-tab message=message}}`);
+
+    const trs = findAll(".env-table tr");
+    const expandable = trs[0];
+    const defaultExpanded = trs[1];
+
+    assert.equal(
+      expandable.children[1].textContent.trim(),
+      "value1, 3 more",
+      "expandable env keys shown correctly"
+    );
+
+    assert.equal(
+      defaultExpanded.children[1].textContent.trim(),
+      "[vvv1, vvv2]",
+      "list is expanded by default when its length is 3 or less"
+    );
+
+    assert.equal(
+      findAll("a.expand-list").length,
+      1,
+      "only whitelisted env keys are expandable"
+    );
+
+    const expandBtn = find("a.expand-list");
+    assert.equal(expandBtn.textContent.trim(), "3 more");
+    await click(expandBtn);
+
+    const expanded = find(".env-table tr");
+    assert.equal(
+      expanded.children[1].textContent.trim(),
+      "[value1, value2, value3, value4]",
+      "expanded env keys shown correctly"
+    );
+  });
+});