release 0.49.1-beta

* Add PDF rendering

* Cleanup

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.49.0-beta",
+  "version": "0.49.1-beta",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {

src/public/app/widgets/backlinks.js

@@ -103,18 +103,20 @@ export default class BacklinksWidget extends NoteContextAwareWidget {
     async refreshWithNote(note) {
         this.clearItems();
 
-        const targetRelationCount = note.getTargetRelations().length;
-        if (targetRelationCount === 0) {
+        // can't use froca since that would count only relations from loaded notes
+        const resp = await server.get(`notes/${this.noteId}/backlink-count`);
+
+        if (!resp || !resp.count) {
             this.$ticker.hide();
+            return;
         }
-        else {
+
         this.$ticker.show();
         this.$count.text(
-                `${targetRelationCount} backlink`
-                + (targetRelationCount === 1 ? '' : 's')
+            `${resp.count} backlink`
+            + (resp.count === 1 ? '' : 's')
         );
     }
-    }
 
     clearItems() {
         this.$items.empty().hide();
@@ -136,18 +138,22 @@ export default class BacklinksWidget extends NoteContextAwareWidget {
         await froca.getNotes(backlinks.map(bl => bl.noteId)); // prefetch all
 
         for (const backlink of backlinks) {
-            this.$items.append(await linkService.createNoteLink(backlink.noteId, {
+            const $item = $("<div>");
+
+            $item.append(await linkService.createNoteLink(backlink.noteId, {
                 showNoteIcon: true,
                 showNotePath: true,
                 showTooltip: false
             }));
 
             if (backlink.relationName) {
-                this.$items.append($("<p>").text("relation: " + backlink.relationName));
+                $item.append($("<p>").text("relation: " + backlink.relationName));
             }
             else {
-                this.$items.append(...backlink.excerpts);
+                $item.append(...backlink.excerpts);
             }
+
+            this.$items.append($item);
         }
     }
 }

src/public/app/widgets/shared_info.js

@@ -18,7 +18,7 @@ const TPL = `
 
 export default class SharedInfoWidget extends NoteContextAwareWidget {
     isEnabled() {
-        return super.isEnabled() && this.note.hasAncestor('share');
+        return super.isEnabled() && this.noteId !== 'share' && this.note.hasAncestor('share');
     }
 
     doRender() {

src/public/app/widgets/shared_switch.js

@@ -4,6 +4,10 @@ import server from "../services/server.js";
 import utils from "../services/utils.js";
 
 export default class SharedSwitchWidget extends SwitchWidget {
+    isEnabled() {
+        return super.isEnabled() && this.noteId !== 'root' && this.noteId !== 'share';
+    }
+
     doRender() {
         super.doRender();
 

src/public/app/widgets/type_widgets/editable_code.js

@@ -14,21 +14,11 @@ const TPL = `
         position: relative;
     }
     
-    .trilium-api-docs-button {
-        /*display: none;*/
-        position: absolute;
-        top: 10px;
-        right: 10px;
-    }
-    
     .note-detail-code-editor {
         min-height: 50px;
     }
     </style>
 
-    <button class="btn bx bx-help-circle trilium-api-docs-button icon-button floating-button" 
-            title="Open Trilium API docs"></button>
-
     <div class="note-detail-code-editor"></div>
 
     <div style="display: flex; justify-content: space-evenly;">
@@ -37,6 +27,13 @@ const TPL = `
             Execute <kbd data-command="runActiveNote"></kbd>
         </button>
         
+        <button class="no-print trilium-api-docs-button btn btn-sm" 
+            title="Open Trilium API docs">
+            <span class="bx bx-help-circle"></span>
+            
+            API docs
+        </button>
+        
         <button class="no-print save-to-note-button btn btn-sm">
             
             <span class="bx bx-save"></span>

src/public/stylesheets/share.css

@@ -52,6 +52,11 @@ pre {
     word-wrap: anywhere;
 }
 
+iframe.pdf-view {
+    width: 100%;
+    height: 800px;
+}
+
 #menuButton {
     display: none;
     position: fixed;

src/routes/api/notes.js

@@ -302,6 +302,21 @@ function uploadModifiedFile(req) {
     note.setContent(fileContent);
 }
 
+function getBacklinkCount(req) {
+    const {noteId} = req.params;
+
+    const note = becca.getNote(noteId);
+
+    if (!note) {
+        return [404, "Not found"];
+    }
+    else {
+        return {
+            count: note.getTargetRelations().length
+        };
+    }
+}
+
 module.exports = {
     getNote,
     updateNote,
@@ -316,5 +331,6 @@ module.exports = {
     duplicateSubtree,
     eraseDeletedNotesNow,
     getDeleteNotesPreview,
-    uploadModifiedFile
+    uploadModifiedFile,
+    getBacklinkCount
 };

src/routes/routes.js

@@ -220,6 +220,7 @@ function register(app) {
     apiRoute(DELETE, '/api/notes/:noteId/revisions/:noteRevisionId', noteRevisionsApiRoute.eraseNoteRevision);
     route(GET, '/api/notes/:noteId/revisions/:noteRevisionId/download', [auth.checkApiAuthOrElectron], noteRevisionsApiRoute.downloadNoteRevision);
     apiRoute(PUT, '/api/notes/:noteId/restore-revision/:noteRevisionId', noteRevisionsApiRoute.restoreNoteRevision);
+    apiRoute(GET, '/api/notes/:noteId/backlink-count', notesApiRoute.getBacklinkCount);
     apiRoute(POST, '/api/notes/relation-map', notesApiRoute.getRelationMap);
     apiRoute(POST, '/api/notes/erase-deleted-notes-now', notesApiRoute.eraseDeletedNotesNow);
     apiRoute(PUT, '/api/notes/:noteId/change-title', notesApiRoute.changeTitle);

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2021-12-23T23:03:21+01:00", buildRevision: "f0217cae5eb4bdac12efe1d15bf26dc128e7f854" };
+module.exports = { buildDate:"2021-12-24T23:05:10+01:00", buildRevision: "0217b1c85de9a2824e7f07d07a357064c5803383" };

src/services/window.js

@@ -59,6 +59,7 @@ async function createMainWindow() {
         height: mainWindowState.height,
         title: 'Trilium Notes',
         webPreferences: {
+            enableRemoteModule: true,
             nodeIntegration: true,
             contextIsolation: false,
             spellcheck: spellcheckEnabled

src/share/content_renderer.js

@@ -76,8 +76,13 @@ function getContent(note) {
         content = `<img src="api/images/${note.noteId}/${note.title}?${note.utcDateModified}">`;
     }
     else if (note.type === 'file') {
+        if (note.mime === 'application/pdf') {
+            content = `<iframe class="pdf-view" src="api/notes/${note.noteId}/view"></iframe>`
+        }
+        else {
             content = `<button type="button" onclick="location.href='api/notes/${note.noteId}/download'">Download file</button>`;
         }
+    }
     else if (note.type === 'book') {
         content = getChildrenList(note);
     }

src/share/routes.js

@@ -78,6 +78,26 @@ function register(router) {
 
         res.send(note.getContent());
     });
+    
+    router.get('/share/api/notes/:noteId/view', (req, res, next) => {
+        const {noteId} = req.params;
+        const note = shaca.getNote(noteId);
+
+        if (!note) {
+            return res.status(404).send(`Not found`);
+        }
+
+        const utils = require("../services/utils");
+
+        const filename = utils.formatDownloadTitle(note.title, note.type, note.mime);
+
+        // res.setHeader('Content-Disposition', utils.getContentDisposition(filename));
+
+        res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+        res.setHeader('Content-Type', note.mime);
+
+        res.send(note.getContent());
+    });
 }
 
 module.exports = {

src/views/desktop.ejs

@@ -41,6 +41,8 @@
 <%- include('dialogs/delete_notes.ejs') %>
 
 <script type="text/javascript">
+    global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+
     window.baseApiUrl = 'api/';
     window.device = "desktop";
     window.glob = {

src/views/mobile.ejs

@@ -105,6 +105,8 @@
 <%- include('dialogs/confirm.ejs') %>
 
 <script type="text/javascript">
+    global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+
     window.baseApiUrl = 'api/';
     window.device = "mobile";
     window.glob = {

src/views/setup.ejs

@@ -189,6 +189,8 @@
 </div>
 
 <script type="text/javascript">
+    global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+
     window.glob = {
         sourceId: ''
     };

webpack-desktop.config.js

@@ -11,5 +11,5 @@ module.exports = {
         filename: 'desktop.js'
     },
     devtool: 'source-map',
-    target: 'electron-main'
+    target: 'electron-renderer'
 };

webpack-mobile.config.js

@@ -11,5 +11,5 @@ module.exports = {
         filename: 'mobile.js'
     },
     devtool: 'source-map',
-    target: 'electron-main'
+    target: 'electron-renderer'
 };

webpack-setup.config.js

@@ -11,5 +11,5 @@ module.exports = {
         filename: 'setup.js'
     },
     devtool: 'source-map',
-    target: 'electron-main'
+    target: 'electron-renderer'
 };