Merge branch 'zadam:master' into master

src/public/app/widgets/ribbon_widgets/edited_notes.js

@@ -2,6 +2,7 @@ import linkService from "../../services/link.js";
 import server from "../../services/server.js";
 import froca from "../../services/froca.js";
 import NoteContextAwareWidget from "../note_context_aware_widget.js";
+import options from "../../services/options.js";
 
 const TPL = `
 <div class="edited-notes-widget">
@@ -34,7 +35,9 @@ export default class EditedNotesWidget extends NoteContextAwareWidget {
         return {
             show: this.isEnabled(),
             // promoted attributes have priority over edited notes
-            activate: this.note.getPromotedDefinitionAttributes().length === 0,
+            activate:
+                (this.note.getPromotedDefinitionAttributes().length === 0 || !options.is('promotedAttributesOpenInRibbon'))
+                && options.is('editedNotesOpenInRibbon'),
             title: 'Edited Notes',
             icon: 'bx bx-calendar-edit'
         };

src/public/app/widgets/ribbon_widgets/promoted_attributes.js

@@ -4,6 +4,7 @@ import treeService from "../../services/tree.js";
 import noteAutocompleteService from "../../services/note_autocomplete.js";
 import NoteContextAwareWidget from "../note_context_aware_widget.js";
 import attributeService from "../../services/attributes.js";
+import options from "../../services/options.js";
 
 const TPL = `
 <div>
@@ -62,7 +63,7 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
 
         return {
             show: true,
-            activate: true,
+            activate: options.is('promotedAttributesOpenInRibbon'),
             title: "Promoted Attributes",
             icon: "bx bx-table"
         };

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

@@ -31,6 +31,7 @@ import VacuumDatabaseOptions from "./options/advanced/vacuum_database.js";
 import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization.js";
 import BackendLogWidget from "./content/backend_log.js";
 import AttachmentErasureTimeoutOptions from "./options/other/attachment_erasure_timeout.js";
+import RibbonOptions from "./options/appearance/ribbon.js";
 
 const TPL = `<div class="note-detail-content-widget note-detail-printable">
     <style>
@@ -57,7 +58,8 @@ const CONTENT_WIDGETS = {
         FontsOptions,
         ZoomFactorOptions,
         NativeTitleBarOptions,
-        MaxContentWidthOptions
+        MaxContentWidthOptions,
+        RibbonOptions
     ],
     _optionsShortcuts: [ KeyboardShortcutsOptions ],
     _optionsTextNotes: [

src/public/app/widgets/type_widgets/options/appearance/ribbon.js

@@ -0,0 +1,34 @@
+import OptionsWidget from "../options_widget.js";
+
+const TPL = `
+<div class="options-section">
+    <h4>Ribbon widgets</h4>
+    <label>
+        <input type="checkbox" class="promoted-attributes-open-in-ribbon">
+        Promoted Attributes ribbon tab will automatically open if promoted attributes are present on the note
+    </label>
+    
+    <label>
+        <input type="checkbox" class="edited-notes-open-in-ribbon">
+        Edited Notes ribbon tab will automatically open on day notes
+    </label>
+</div>`;
+
+export default class RibbonOptions extends OptionsWidget {
+    doRender() {
+        this.$widget = $(TPL);
+
+        this.$promotedAttributesOpenInRibbon = this.$widget.find(".promoted-attributes-open-in-ribbon");
+        this.$promotedAttributesOpenInRibbon.on('change', () =>
+            this.updateCheckboxOption('promotedAttributesOpenInRibbon', this.$promotedAttributesOpenInRibbon));
+
+        this.$editedNotesOpenInRibbon = this.$widget.find(".edited-notes-open-in-ribbon");
+        this.$editedNotesOpenInRibbon.on('change', () =>
+            this.updateCheckboxOption('editedNotesOpenInRibbon', this.$editedNotesOpenInRibbon));
+    }
+
+    async optionsLoaded(options) {
+        this.setCheckboxState(this.$promotedAttributesOpenInRibbon, options.promotedAttributesOpenInRibbon);
+        this.setCheckboxState(this.$editedNotesOpenInRibbon, options.editedNotesOpenInRibbon);
+    }
+}

src/routes/api/clipper.js

@@ -17,21 +17,20 @@ const jsdom = require("jsdom");
 const { JSDOM } = jsdom;
 
 function addClipping(req) {
-    // if a note under the clipperInbox as the same 'pageUrl' attribute,
+    // if a note under the clipperInbox has the same 'pageUrl' attribute,
     // add the content to that note and clone it under today's inbox
     // otherwise just create a new note under today's inbox
     let {title, content, pageUrl, images} = req.body;
     const clipType = 'clippings';
 
     const clipperInbox = getClipperInboxNote();
-    const dailyNote = dateNoteService.getDayNote(dateUtils.localNowDate());
 
     pageUrl = htmlSanitizer.sanitizeUrl(pageUrl);
     let clippingNote = findClippingNote(clipperInbox, pageUrl, clipType);
 
     if (!clippingNote) {
         clippingNote = noteService.createNewNote({
-            parentNoteId: dailyNote.noteId,
+            parentNoteId: clipperInbox.noteId,
             title: title,
             content: '',
             type: 'text'
@@ -48,8 +47,8 @@ function addClipping(req) {
 
     clippingNote.setContent(`${existingContent}${existingContent.trim() ? "<br>" : ""}${rewrittenContent}`);
 
-    if (clippingNote.parentNoteId !== dailyNote.noteId) {
-        cloneService.cloneNoteToParentNote(clippingNote.noteId, dailyNote.noteId);
+    if (clippingNote.parentNoteId !== clipperInbox.noteId) {
+        cloneService.cloneNoteToParentNote(clippingNote.noteId, clipperInbox.noteId);
     }
 
     return {
@@ -79,7 +78,7 @@ function getClipperInboxNote() {
     let clipperInbox = attributeService.getNoteWithLabel('clipperInbox');
 
     if (!clipperInbox) {
-        clipperInbox = dateNoteService.getRootCalendarNote();
+        clipperInbox = dateNoteService.getDayNote(dateUtils.localNowDate());
     }
 
     return clipperInbox;

src/routes/api/options.js

@@ -55,7 +55,9 @@ const ALLOWED_OPTIONS = new Set([
     'eraseUnusedAttachmentsAfterSeconds',
     'disableTray',
     'customSearchEngineName',
-    'customSearchEngineUrl'
+    'customSearchEngineUrl',
+    'promotedAttributesOpenInRibbon',
+    'editedNotesOpenInRibbon'
 ]);
 
 function getOptions() {

src/routes/api/revisions.js

@@ -21,8 +21,8 @@ function getRevisions(req) {
                LENGTH(blobs.content) AS contentLength
         FROM revisions
         JOIN blobs ON revisions.blobId = blobs.blobId 
-        WHERE noteId = ?
-        ORDER BY utcDateCreated DESC`, [req.params.noteId]);
+        WHERE revisions.noteId = ?
+        ORDER BY revisions.utcDateCreated DESC`, [req.params.noteId]);
 }
 
 function getRevision(req) {

src/services/builtin_attributes.js

@@ -65,6 +65,7 @@ module.exports = [
     { type: 'label', name: 'executeButton'},
     { type: 'label', name: 'executeDescription'},
     { type: 'label', name: 'newNotesOnTop'},
+    { type: 'label', name: 'clipperInbox'},
 
     // relation names
     { type: 'relation', name: 'internalLink' },

src/services/options_init.js

@@ -88,7 +88,9 @@ const defaultOptions = [
     { name: 'disableTray', value: 'false', isSynced: false },
     { name: 'eraseUnusedAttachmentsAfterSeconds', value: '2592000', isSynced: true },
     { name: 'customSearchEngineName', value: 'DuckDuckGo', isSynced: true },
-    { name: 'customSearchEngineUrl', value: 'https://duckduckgo.com/?q={keyword}', isSynced: true }
+    { name: 'customSearchEngineUrl', value: 'https://duckduckgo.com/?q={keyword}', isSynced: true },
+    { name: 'promotedAttributesOpenInRibbon', value: 'true', isSynced: true },
+    { name: 'editedNotesOpenInRibbon', value: 'true', isSynced: true }
 ];
 
 function initStartupOptions() {