From d52a4d86e9271ad4993920702c113e9f2e88c371 Mon Sep 17 00:00:00 2001
From: Amir Raminfar <findamir@gmail.com>
Date: Sat, 11 Apr 2020 19:39:00 -0700
Subject: [PATCH] Adds settings for timestamp. Fixes #360 (#370)

* Adds settings for timestamp. Fixes #360

* Fixes test

* Updates actions
---
 .github/workflows/push.yml               | 12 +++++++-----
 assets/components/LogEventSource.spec.js |  2 +-
 assets/components/LogViewer.vue          |  2 +-
 assets/pages/Settings.vue                |  8 +++++++-
 assets/store/settings.js                 |  1 +
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 204ae84e..bd1b1a6d 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,17 +2,19 @@ on: push
 name: Test
 jobs:
   npm-test:
-    name: npm test
+    name: JavaScript Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Install Node
         uses: actions/setup-node@v1
-      - name: Run NPM Tests
-        run: npm it
+      - name: Install depdencies
+        run: yarn
+      - name: Run Tests
+        run: yarn test
   go-test:
-    name: go test
+    name: Go Tests
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
@@ -21,7 +23,7 @@ jobs:
           go-version: 1.14.x
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Run Go Tests
+      - name: Run Go Tests with Coverage
         run: go test -cover ./...
   docker-build:
     name: Integration Tests
diff --git a/assets/components/LogEventSource.spec.js b/assets/components/LogEventSource.spec.js
index dc1a7062..06eb83ba 100644
--- a/assets/components/LogEventSource.spec.js
+++ b/assets/components/LogEventSource.spec.js
@@ -37,7 +37,7 @@ describe("<LogEventSource />", () => {
 
     localVue.component("log-viewer", LogViewer);
 
-    const state = { searchFilter, settings: { size: "medium" } };
+    const state = { searchFilter, settings: { size: "medium", showTimestamp: true } };
 
     const store = new Vuex.Store({
       state,
diff --git a/assets/components/LogViewer.vue b/assets/components/LogViewer.vue
index e2795ff6..7cf73908 100644
--- a/assets/components/LogViewer.vue
+++ b/assets/components/LogViewer.vue
@@ -1,7 +1,7 @@
 <template lang="html">
   <ul class="events" :class="settings.size">
     <li v-for="item in filtered" :key="item.key">
-      <span class="date">{{ item.date | relativeTime }}</span>
+      <span class="date" v-if="settings.showTimestamp">{{ item.date | relativeTime }}</span>
       <span class="text" v-html="colorize(item.message)"></span>
     </li>
   </ul>
diff --git a/assets/pages/Settings.vue b/assets/pages/Settings.vue
index a6169ced..831b8740 100644
--- a/assets/pages/Settings.vue
+++ b/assets/pages/Settings.vue
@@ -31,6 +31,12 @@
         </b-switch>
       </div>
 
+      <div class="item">
+        <b-switch v-model="showTimestamp">
+          Show timestamps
+        </b-switch>
+      </div>
+
       <div class="item">
         <h2 class="title is-6 is-marginless">Font size</h2>
         Modify the font size when viewing logs.
@@ -92,7 +98,7 @@ export default {
   },
   computed: {
     ...mapState(["settings"]),
-    ...["search", "size", "smallerScrollbars"].reduce((map, name) => {
+    ...["search", "size", "smallerScrollbars", "showTimestamp"].reduce((map, name) => {
       map[name] = {
         get() {
           return this.settings[name];
diff --git a/assets/store/settings.js b/assets/store/settings.js
index ec442c44..fdde6239 100644
--- a/assets/store/settings.js
+++ b/assets/store/settings.js
@@ -4,4 +4,5 @@ export const DEFAULT_SETTINGS = {
   size: "medium",
   menuWidth: 15,
   smallerScrollbars: false,
+  showTimestamp: true,
 };