feat: add button to reload file in log viewer (#862j4vqdt)

levivoelz · Jan 26, 2023 · 92d6161 · 92d6161
1 parent 3a098ce
commit 92d6161
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json
@@ -1 +1 @@
-{"version":"0.41.1","build":16041}
+{"version":"0.41.1","build":16047}
diff --git a/app/back-end/events/app.js b/app/back-end/events/app.js
@@ -424,6 +424,17 @@ class AppEvents {
          * Load specific log file
          */
         ipcMain.on('app-log-file-load', function(event, filename) {
+            let logPath = appInstance.app.getPath('logs');
+            let logFiles = fs.readdirSync(logPath).filter(function(file) {
+                return file.substr(-4) === '.txt' || file.substr(-4) === '.log';
+            });
+
+            if (logFiles.indexOf(filename) === -1) {
+                event.sender.send('app-log-file-loaded', {
+                    fileContent: 'File not found!'
+                });
+            }
+
             let filePath = path.join(appInstance.app.getPath('logs'), filename);
             let fileContent = fs.readFileSync(filePath, 'utf8');
 

diff --git a/app/default-files/default-languages/en-gb/translations.json b/app/default-files/default-languages/en-gb/translations.json
@@ -1281,6 +1281,7 @@
         "publiiOnGithub": "View Publii on Github",
         "publishAndClose": "Publish and close",
         "publishPost": "Publish post",
+        "reloadFile": "Reload file",
         "renderFrontPageOnly": "Render front page only",
         "renderFullWebsite": "Render full website",
         "reportBugInSupportDesk": "Report a bug via our support desk",

diff --git a/app/default-files/default-languages/pl/translations.json b/app/default-files/default-languages/pl/translations.json
@@ -1281,6 +1281,7 @@
         "publiiOnGithub": "Zobacz Publii na Github",
         "publishAndClose": "Opublikuj i zamknij",
         "publishPost": "Opublikuj wpis",
+        "reloadFile": "Wczytaj ponownie plik",
         "renderFrontPageOnly": "Renderuj tylko stronę główną",
         "renderFullWebsite": "Renderuj całą stronę",
         "reportBugInSupportDesk": "Zgłoś błąd w naszym naszj pomocy technicznej",

diff --git a/app/src/components/LogViewer.vue b/app/src/components/LogViewer.vue
@@ -16,6 +16,12 @@
                 :items="files"
                 selected=""
                 :onChange="loadFile"></dropdown>
+
+            <p-button
+                :onClick="loadSelectedFile"
+                type="primary">
+                {{ $t('ui.reloadFile') }}
+            </p-button>
         </div>
 
         <codemirror-editor
@@ -34,16 +40,16 @@ export default {
     mixins: [
         BackToTools
     ],
-    data: function() {
+    data () {
         return {
             files: {}
         };
     },
-    mounted: function() {
+    mounted () {
         this.loadFilesList();
     },
     methods: {
-        loadFilesList: function() {
+        loadFilesList () {
             mainProcessAPI.send('app-log-files-load');
 
             mainProcessAPI.receiveOnce('app-log-files-loaded', (data) => {
@@ -59,7 +65,7 @@ export default {
                 this.files = items;
             });
         },
-        loadFile: function(filename) {
+        loadFile (filename) {
             if (filename === '') {
                 this.$refs.codemirror.editor.setValue('');
                 return;
@@ -78,11 +84,23 @@ export default {
 
                 this.$refs.codemirror.editor.refresh();
             });
+        },
+        loadSelectedFile () {
+            let filename = this.$refs['selectedFile'].selectedValue;
+            this.loadFile(filename);
         }
     }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../scss/variables.scss';
+
+.tools-log-viewer-selector {
+    display: flex;
+
+    .button {
+        margin-left: 1rem;
+    }
+}
 </style>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":"0.41.1","build":16041}
		{"version":"0.41.1","build":16047}