Update errorlogs.mako

pymedusa · Aug 22, 2018 · 13f5c18 · 13f5c18
1 parent 05ab1ae
commit 13f5c18
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 42 deletions.
diff --git a/themes-default/slim/views/errorlogs.mako b/themes-default/slim/views/errorlogs.mako
@@ -1,27 +1,28 @@
 <%inherit file="/layouts/main.mako"/>
 <%!
-    from medusa import logger
-    from medusa import classes
+    from medusa import classes, logger
 %>
 <%block name="scripts">
-
-<%
-    if logLevel == logger.WARNING:
-        page_header = 'Warning Logs'
-    else:
-        page_header = 'Error Logs'
-%>
 <script>
+const { mapState } = window.Vuex;
+
 window.app = {};
 window.app = new Vue({
     store,
     router,
     el: '#vue-wrap',
-    data() {
-        return {
-            header: '${page_header}'
-        };
-    }
+    // @TODO: Replace with Object destructuring (`...mapState`)
+    computed: Object.assign(mapState({
+        loggingLevels: state => state.config.logs.loggingLevels
+    }), {
+        header() {
+            const { loggingLevels, $route } = this;
+            if (Number($route.query.level) === loggingLevels.warning) {
+                return 'Warning Logs';
+            }
+            return 'Error Logs';
+        }
+    })
 });
 </script>
 </%block>

diff --git a/themes/dark/templates/errorlogs.mako b/themes/dark/templates/errorlogs.mako
@@ -1,27 +1,28 @@
 <%inherit file="/layouts/main.mako"/>
 <%!
-    from medusa import logger
-    from medusa import classes
+    from medusa import classes, logger
 %>
 <%block name="scripts">
-
-<%
-    if logLevel == logger.WARNING:
-        page_header = 'Warning Logs'
-    else:
-        page_header = 'Error Logs'
-%>
 <script>
+const { mapState } = window.Vuex;
+
 window.app = {};
 window.app = new Vue({
     store,
     router,
     el: '#vue-wrap',
-    data() {
-        return {
-            header: '${page_header}'
-        };
-    }
+    // @TODO: Replace with Object destructuring (`...mapState`)
+    computed: Object.assign(mapState({
+        loggingLevels: state => state.config.logs.loggingLevels
+    }), {
+        header() {
+            const { loggingLevels, $route } = this;
+            if (Number($route.query.level) === loggingLevels.warning) {
+                return 'Warning Logs';
+            }
+            return 'Error Logs';
+        }
+    })
 });
 </script>
 </%block>

diff --git a/themes/light/templates/errorlogs.mako b/themes/light/templates/errorlogs.mako
@@ -1,27 +1,28 @@
 <%inherit file="/layouts/main.mako"/>
 <%!
-    from medusa import logger
-    from medusa import classes
+    from medusa import classes, logger
 %>
 <%block name="scripts">
-
-<%
-    if logLevel == logger.WARNING:
-        page_header = 'Warning Logs'
-    else:
-        page_header = 'Error Logs'
-%>
 <script>
+const { mapState } = window.Vuex;
+
 window.app = {};
 window.app = new Vue({
     store,
     router,
     el: '#vue-wrap',
-    data() {
-        return {
-            header: '${page_header}'
-        };
-    }
+    // @TODO: Replace with Object destructuring (`...mapState`)
+    computed: Object.assign(mapState({
+        loggingLevels: state => state.config.logs.loggingLevels
+    }), {
+        header() {
+            const { loggingLevels, $route } = this;
+            if (Number($route.query.level) === loggingLevels.warning) {
+                return 'Warning Logs';
+            }
+            return 'Error Logs';
+        }
+    })
 });
 </script>
 </%block>