release 0.19.1

* show list of inherited attributes, fixes #136
* properly work with inheritance

.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+npm-debug.log
+dist
+.idea

.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="document.db">
-  <database-model serializer="dbm" rdbms="SQLITE" format-version="4.8">
+  <database-model serializer="dbm" rdbms="SQLITE" format-version="4.11">
     <root id="1">
       <ServerVersion>3.16.1</ServerVersion>
     </root>
@@ -12,10 +12,10 @@
     <collation id="4" parent="1" name="NOCASE"/>
     <collation id="5" parent="1" name="RTRIM"/>
     <table id="6" parent="2" name="api_tokens"/>
-    <table id="7" parent="2" name="branches"/>
+    <table id="7" parent="2" name="attributes"/>
-    <table id="8" parent="2" name="event_log"/>
+    <table id="8" parent="2" name="branches"/>
-    <table id="9" parent="2" name="images"/>
+    <table id="9" parent="2" name="event_log"/>
-    <table id="10" parent="2" name="labels"/>
+    <table id="10" parent="2" name="images"/>
     <table id="11" parent="2" name="note_images"/>
     <table id="12" parent="2" name="note_revisions"/>
     <table id="13" parent="2" name="notes"/>
@@ -50,546 +50,600 @@
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <index id="24" parent="6" name="sqlite_autoindex_api_tokens_1">
+    <column id="24" parent="6" name="hash">
+      <Position>5</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
+    </column>
+    <index id="25" parent="6" name="sqlite_autoindex_api_tokens_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>apiTokenId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="25" parent="6">
+    <key id="26" parent="6">
       <ColNames>apiTokenId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
     </key>
-    <column id="26" parent="7" name="branchId">
+    <column id="27" parent="7" name="attributeId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="27" parent="7" name="noteId">
+    <column id="28" parent="7" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="28" parent="7" name="parentNoteId">
+    <column id="29" parent="7" name="type">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="29" parent="7" name="notePosition">
+    <column id="30" parent="7" name="name">
+      <Position>4</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="31" parent="7" name="value">
+      <Position>5</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&apos;&apos;</DefaultExpression>
+    </column>
+    <column id="32" parent="7" name="position">
+      <Position>6</Position>
+      <DataType>INT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>0</DefaultExpression>
+    </column>
+    <column id="33" parent="7" name="dateCreated">
+      <Position>7</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="34" parent="7" name="dateModified">
+      <Position>8</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="35" parent="7" name="isDeleted">
+      <Position>9</Position>
+      <DataType>INT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="36" parent="7" name="hash">
+      <Position>10</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
+    </column>
+    <column id="37" parent="7" name="isInheritable">
+      <Position>11</Position>
+      <DataType>int|0s</DataType>
+      <DefaultExpression>0</DefaultExpression>
+    </column>
+    <index id="38" parent="7" name="sqlite_autoindex_attributes_1">
+      <NameSurrogate>1</NameSurrogate>
+      <ColNames>attributeId</ColNames>
+      <Unique>1</Unique>
+    </index>
+    <key id="39" parent="7">
+      <ColNames>attributeId</ColNames>
+      <Primary>1</Primary>
+      <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
+    </key>
+    <column id="40" parent="8" name="branchId">
+      <Position>1</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="41" parent="8" name="noteId">
+      <Position>2</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="42" parent="8" name="parentNoteId">
+      <Position>3</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="43" parent="8" name="notePosition">
       <Position>4</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="30" parent="7" name="prefix">
+    <column id="44" parent="8" name="prefix">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="31" parent="7" name="isExpanded">
+    <column id="45" parent="8" name="isExpanded">
       <Position>6</Position>
       <DataType>BOOLEAN|0s</DataType>
     </column>
-    <column id="32" parent="7" name="isDeleted">
+    <column id="46" parent="8" name="isDeleted">
       <Position>7</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="33" parent="7" name="dateModified">
+    <column id="47" parent="8" name="dateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="34" parent="7" name="sqlite_autoindex_branches_1">
+    <column id="48" parent="8" name="hash">
+      <Position>9</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
+    </column>
+    <column id="49" parent="8" name="dateCreated">
+      <Position>10</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&apos;1970-01-01T00:00:00.000Z&apos;</DefaultExpression>
+    </column>
+    <index id="50" parent="8" name="sqlite_autoindex_branches_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>branchId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="35" parent="7" name="IDX_branches_noteId_parentNoteId">
+    <index id="51" parent="8" name="IDX_branches_noteId_parentNoteId">
       <ColNames>noteId
 parentNoteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="36" parent="7" name="IDX_branches_noteId">
+    <index id="52" parent="8" name="IDX_branches_noteId">
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="37" parent="7">
+    <index id="53" parent="8" name="IDX_branches_parentNoteId">
+      <ColNames>parentNoteId</ColNames>
+    </index>
+    <key id="54" parent="8">
       <ColNames>branchId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
     </key>
-    <column id="38" parent="8" name="id">
+    <column id="55" parent="9" name="eventId">
       <Position>1</Position>
-      <DataType>INTEGER|0s</DataType>
+      <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
-      <SequenceIdentity>1</SequenceIdentity>
     </column>
-    <column id="39" parent="8" name="noteId">
+    <column id="56" parent="9" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="40" parent="8" name="comment">
+    <column id="57" parent="9" name="comment">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="41" parent="8" name="dateAdded">
+    <column id="58" parent="9" name="dateCreated">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="42" parent="8">
+    <index id="59" parent="9" name="sqlite_autoindex_event_log_1">
-      <ColNames>id</ColNames>
+      <NameSurrogate>1</NameSurrogate>
+      <ColNames>eventId</ColNames>
+      <Unique>1</Unique>
+    </index>
+    <key id="60" parent="9">
+      <ColNames>eventId</ColNames>
       <Primary>1</Primary>
+      <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
     </key>
-    <column id="43" parent="9" name="imageId">
+    <column id="61" parent="10" name="imageId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="44" parent="9" name="format">
+    <column id="62" parent="10" name="format">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="45" parent="9" name="checksum">
+    <column id="63" parent="10" name="checksum">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="46" parent="9" name="name">
+    <column id="64" parent="10" name="name">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="47" parent="9" name="data">
+    <column id="65" parent="10" name="data">
       <Position>5</Position>
       <DataType>BLOB|0s</DataType>
     </column>
-    <column id="48" parent="9" name="isDeleted">
+    <column id="66" parent="10" name="isDeleted">
       <Position>6</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="49" parent="9" name="dateModified">
+    <column id="67" parent="10" name="dateModified">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="50" parent="9" name="dateCreated">
+    <column id="68" parent="10" name="dateCreated">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="51" parent="9" name="sqlite_autoindex_images_1">
+    <column id="69" parent="10" name="hash">
+      <Position>9</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
+    </column>
+    <index id="70" parent="10" name="sqlite_autoindex_images_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>imageId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="52" parent="9">
+    <key id="71" parent="10">
       <ColNames>imageId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_images_1</UnderlyingIndexName>
     </key>
-    <column id="53" parent="10" name="labelId">
+    <column id="72" parent="11" name="noteImageId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="54" parent="10" name="noteId">
+    <column id="73" parent="11" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="55" parent="10" name="name">
+    <column id="74" parent="11" name="imageId">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="56" parent="10" name="value">
+    <column id="75" parent="11" name="isDeleted">
       <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="57" parent="10" name="position">
-      <Position>5</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="58" parent="10" name="dateCreated">
+    <column id="76" parent="11" name="dateModified">
+      <Position>5</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="77" parent="11" name="dateCreated">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="59" parent="10" name="dateModified">
+    <column id="78" parent="11" name="hash">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="60" parent="10" name="isDeleted">
+    <index id="79" parent="11" name="sqlite_autoindex_note_images_1">
-      <Position>8</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="61" parent="10" name="sqlite_autoindex_labels_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>labelId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <index id="62" parent="10" name="IDX_labels_noteId">
-      <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <index id="63" parent="10" name="IDX_labels_name_value">
-      <ColNames>name
-value</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <key id="64" parent="10">
-      <ColNames>labelId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_labels_1</UnderlyingIndexName>
-    </key>
-    <column id="65" parent="11" name="noteImageId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="66" parent="11" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="67" parent="11" name="imageId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="68" parent="11" name="isDeleted">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="69" parent="11" name="dateModified">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="70" parent="11" name="dateCreated">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="71" parent="11" name="sqlite_autoindex_note_images_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteImageId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="72" parent="11" name="IDX_note_images_noteId_imageId">
+    <index id="80" parent="11" name="IDX_note_images_noteId_imageId">
       <ColNames>noteId
 imageId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="73" parent="11" name="IDX_note_images_noteId">
+    <index id="81" parent="11" name="IDX_note_images_noteId">
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="74" parent="11" name="IDX_note_images_imageId">
+    <index id="82" parent="11" name="IDX_note_images_imageId">
       <ColNames>imageId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="75" parent="11">
+    <key id="83" parent="11">
       <ColNames>noteImageId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_images_1</UnderlyingIndexName>
     </key>
-    <column id="76" parent="12" name="noteRevisionId">
+    <column id="84" parent="12" name="noteRevisionId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="77" parent="12" name="noteId">
+    <column id="85" parent="12" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="78" parent="12" name="title">
+    <column id="86" parent="12" name="title">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="79" parent="12" name="content">
+    <column id="87" parent="12" name="content">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="80" parent="12" name="isProtected">
+    <column id="88" parent="12" name="isProtected">
       <Position>5</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="81" parent="12" name="dateModifiedFrom">
+    <column id="89" parent="12" name="dateModifiedFrom">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="82" parent="12" name="dateModifiedTo">
+    <column id="90" parent="12" name="dateModifiedTo">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="83" parent="12" name="type">
+    <column id="91" parent="12" name="type">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="84" parent="12" name="mime">
+    <column id="92" parent="12" name="mime">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <index id="85" parent="12" name="sqlite_autoindex_note_revisions_1">
+    <column id="93" parent="12" name="hash">
+      <Position>10</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
+    </column>
+    <index id="94" parent="12" name="sqlite_autoindex_note_revisions_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteRevisionId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="86" parent="12" name="IDX_note_revisions_noteId">
+    <index id="95" parent="12" name="IDX_note_revisions_noteId">
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="87" parent="12" name="IDX_note_revisions_dateModifiedFrom">
+    <index id="96" parent="12" name="IDX_note_revisions_dateModifiedFrom">
       <ColNames>dateModifiedFrom</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="88" parent="12" name="IDX_note_revisions_dateModifiedTo">
+    <index id="97" parent="12" name="IDX_note_revisions_dateModifiedTo">
       <ColNames>dateModifiedTo</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="89" parent="12">
+    <key id="98" parent="12">
       <ColNames>noteRevisionId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
     </key>
-    <column id="90" parent="13" name="noteId">
+    <column id="99" parent="13" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="91" parent="13" name="title">
+    <column id="100" parent="13" name="title">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;unnamed&quot;</DefaultExpression>
     </column>
-    <column id="92" parent="13" name="content">
+    <column id="101" parent="13" name="content">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="93" parent="13" name="isProtected">
+    <column id="102" parent="13" name="isProtected">
       <Position>4</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="94" parent="13" name="isDeleted">
+    <column id="103" parent="13" name="isDeleted">
       <Position>5</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="95" parent="13" name="dateCreated">
+    <column id="104" parent="13" name="dateCreated">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="96" parent="13" name="dateModified">
+    <column id="105" parent="13" name="dateModified">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="97" parent="13" name="type">
+    <column id="106" parent="13" name="type">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text&apos;</DefaultExpression>
     </column>
-    <column id="98" parent="13" name="mime">
+    <column id="107" parent="13" name="mime">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
     </column>
-    <index id="99" parent="13" name="sqlite_autoindex_notes_1">
+    <column id="108" parent="13" name="hash">
+      <Position>10</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
+    </column>
+    <index id="109" parent="13" name="sqlite_autoindex_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="100" parent="13" name="IDX_notes_isDeleted">
+    <index id="110" parent="13" name="IDX_notes_type">
-      <ColNames>isDeleted</ColNames>
+      <ColNames>type</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="101" parent="13">
+    <key id="111" parent="13">
       <ColNames>noteId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
     </key>
-    <column id="102" parent="14" name="name">
+    <column id="112" parent="14" name="name">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="103" parent="14" name="value">
+    <column id="113" parent="14" name="value">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="104" parent="14" name="dateModified">
+    <column id="114" parent="14" name="dateModified">
       <Position>3</Position>
       <DataType>INT|0s</DataType>
     </column>
-    <column id="105" parent="14" name="isSynced">
+    <column id="115" parent="14" name="isSynced">
       <Position>4</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <index id="106" parent="14" name="sqlite_autoindex_options_1">
+    <column id="116" parent="14" name="hash">
+      <Position>5</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
+    </column>
+    <column id="117" parent="14" name="dateCreated">
+      <Position>6</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&apos;1970-01-01T00:00:00.000Z&apos;</DefaultExpression>
+    </column>
+    <index id="118" parent="14" name="sqlite_autoindex_options_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>name</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="107" parent="14">
+    <key id="119" parent="14">
       <ColNames>name</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
     </key>
-    <column id="108" parent="15" name="branchId">
+    <column id="120" parent="15" name="branchId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="109" parent="15" name="notePath">
+    <column id="121" parent="15" name="notePath">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="110" parent="15" name="dateAccessed">
+    <column id="122" parent="15" name="hash">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
+      <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="111" parent="15" name="isDeleted">
+    <column id="123" parent="15" name="dateCreated">
       <Position>4</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="124" parent="15" name="isDeleted">
+      <Position>5</Position>
       <DataType>INT|0s</DataType>
     </column>
-    <index id="112" parent="15" name="sqlite_autoindex_recent_notes_1">
+    <index id="125" parent="15" name="sqlite_autoindex_recent_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>branchId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="113" parent="15">
+    <key id="126" parent="15">
       <ColNames>branchId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
     </key>
-    <column id="114" parent="16" name="sourceId">
+    <column id="127" parent="16" name="sourceId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="115" parent="16" name="dateCreated">
+    <column id="128" parent="16" name="dateCreated">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="116" parent="16" name="sqlite_autoindex_source_ids_1">
+    <index id="129" parent="16" name="sqlite_autoindex_source_ids_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>sourceId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="117" parent="16">
+    <key id="130" parent="16">
       <ColNames>sourceId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
     </key>
-    <column id="118" parent="17" name="type">
+    <column id="131" parent="17" name="type">
       <Position>1</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="119" parent="17" name="name">
+    <column id="132" parent="17" name="name">
       <Position>2</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="120" parent="17" name="tbl_name">
+    <column id="133" parent="17" name="tbl_name">
       <Position>3</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="121" parent="17" name="rootpage">
+    <column id="134" parent="17" name="rootpage">
       <Position>4</Position>
       <DataType>integer|0s</DataType>
     </column>
-    <column id="122" parent="17" name="sql">
+    <column id="135" parent="17" name="sql">
       <Position>5</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="123" parent="18" name="name">
+    <column id="136" parent="18" name="name">
       <Position>1</Position>
     </column>
-    <column id="124" parent="18" name="seq">
+    <column id="137" parent="18" name="seq">
       <Position>2</Position>
     </column>
-    <column id="125" parent="19" name="id">
+    <column id="138" parent="19" name="id">
       <Position>1</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <SequenceIdentity>1</SequenceIdentity>
     </column>
-    <column id="126" parent="19" name="entityName">
+    <column id="139" parent="19" name="entityName">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="127" parent="19" name="entityId">
+    <column id="140" parent="19" name="entityId">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="128" parent="19" name="sourceId">
+    <column id="141" parent="19" name="sourceId">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="129" parent="19" name="syncDate">
+    <column id="142" parent="19" name="syncDate">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="130" parent="19" name="IDX_sync_entityName_entityId">
+    <index id="143" parent="19" name="IDX_sync_entityName_entityId">
       <ColNames>entityName
 entityId</ColNames>
-      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="131" parent="19" name="IDX_sync_syncDate">
+    <index id="144" parent="19" name="IDX_sync_syncDate">
       <ColNames>syncDate</ColNames>
-      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="132" parent="19">
+    <key id="145" parent="19">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>

.idea/sqldialects.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SqlDialectMappings">
+    <file url="PROJECT" dialect="SQLite" />
+  </component>
+</project>

Dockerfile

@@ -0,0 +1,21 @@
+FROM node:8.11.2
+
+RUN apt-get update && apt-get install -y nasm
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+
+RUN npm install --production
+# If you are building your code for production
+# RUN npm install --only=production
+
+# Bundle app source
+COPY . .
+
+EXPOSE 8080
+CMD [ "node", "src/www" ]

bin/build-docker.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Missing argument of new version"
+    exit 1
+fi
+
+sudo docker build -t zadam/trilium:latest -t zadam/trilium:$1 .

bin/build-pkg.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Missing argument of new version"
+    exit 1
+fi
+
+VERSION=$1
+
+PKG_DIR=dist/trilium-linux-x64-server
+
+mkdir $PKG_DIR
+
+pkg . --targets node8-linux-x64 --output ${PKG_DIR}/trilium
+
+chmod +x ${PKG_DIR}/trilium
+
+cp node_modules/sqlite3/lib/binding/node-v57-linux-x64/node_sqlite3.node ${PKG_DIR}/
+cp node_modules/scrypt/build/Release/scrypt.node ${PKG_DIR}/
+
+cd dist
+
+7z a trilium-linux-x64-${VERSION}-server.7z trilium-linux-x64-server

bin/push-docker-image.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Missing argument of new version"
+    exit 1
+fi
+
+sudo docker push zadam/trilium:latest
+sudo docker push zadam/trilium:$1

bin/release.sh

@@ -47,6 +47,7 @@ bin/package.sh
 LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z
 LINUX_IA32_BUILD=trilium-linux-ia32-$VERSION.7z
 WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z
+SERVER_BUILD=trilium-linux-x64-server.7z
 
 echo "Creating release in GitHub"
 
@@ -75,4 +76,21 @@ github-release upload \
     --name "$WINDOWS_X64_BUILD" \
     --file "dist/$WINDOWS_X64_BUILD"
 
+echo "Packaging server version"
+
+bin/build-pkg.sh $VERSION
+
+github-release upload \
+    --tag $TAG \
+    --name "$SERVER_BUILD" \
+    --file "dist/$SERVER_BUILD"
+
+echo "Building docker image"
+
+bin/build-docker.sh $VERSION
+
+echo "Pushing docker image to dockerhub"
+
+bin/push-docker-image.sh $VERSION
+
 echo "Release finished!"

config-sample.ini

@@ -3,15 +3,10 @@
 instanceName=
 
 [Network]
+# port setting is relevant only for web deployments, desktop builds run on random free port
 port=8080
 # true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
 https=false
 # path to certificate (run "bash generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
 certPath=
 keyPath=
-
-[Sync]
-syncServerHost=
-syncServerTimeout=10000
-syncProxy=
-syncServerCertificate=

db/migrations/0094__unify_auditing_fields.sql

@@ -0,0 +1,30 @@
+ALTER TABLE branches ADD dateCreated TEXT NOT NULL DEFAULT '1970-01-01T00:00:00.000Z';
+
+CREATE TABLE `event_log_mig` (
+  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `noteId`	TEXT,
+  `comment`	TEXT,
+  `dateCreated`	TEXT NOT NULL
+);
+
+INSERT INTO event_log_mig (id, noteId, comment, dateCreated)
+SELECT id, noteId, comment, dateAdded FROM event_log;
+
+DROP TABLE event_log;
+ALTER TABLE event_log_mig RENAME TO event_log;
+
+ALTER TABLE options ADD dateCreated TEXT NOT NULL DEFAULT '1970-01-01T00:00:00.000Z';
+
+CREATE TABLE `recent_notes_mig` (
+  `branchId` TEXT NOT NULL PRIMARY KEY,
+  `notePath` TEXT NOT NULL,
+  hash TEXT DEFAULT "" NOT NULL,
+  `dateCreated` TEXT NOT NULL,
+  isDeleted INT
+);
+
+INSERT INTO recent_notes_mig (branchId, notePath, hash, dateCreated, isDeleted)
+SELECT branchId, notePath, hash, dateAccessed, isDeleted FROM recent_notes;
+
+DROP TABLE recent_notes;
+ALTER TABLE recent_notes_mig RENAME TO recent_notes;

db/migrations/0095__mime_type_for_render.sql

@@ -0,0 +1 @@
+UPDATE notes SET mime = 'text/html' WHERE type = 'render';

db/migrations/0096__unify_surrogate_keys.sql

@@ -0,0 +1,29 @@
+CREATE TABLE `event_log_mig` (
+  `eventId`	TEXT NOT NULL PRIMARY KEY,
+  `noteId`	TEXT,
+  `comment`	TEXT,
+  `dateCreated`	TEXT NOT NULL
+);
+
+INSERT INTO event_log_mig (eventId, noteId, comment, dateCreated)
+SELECT id, noteId, comment, dateCreated FROM event_log;
+
+DROP TABLE event_log;
+ALTER TABLE event_log_mig RENAME TO event_log;
+
+create table options_mig
+(
+  optionId TEXT NOT NULL PRIMARY KEY,
+  name TEXT not null,
+  value TEXT,
+  dateModified INT,
+  isSynced INTEGER default 0 not null,
+  hash TEXT default "" not null,
+  dateCreated TEXT default '1970-01-01T00:00:00.000Z' not null
+);
+
+INSERT INTO options_mig (optionId, name, value, dateModified, isSynced, hash, dateCreated)
+  SELECT name || "_key", name, value, dateModified, isSynced, hash, dateCreated FROM options;
+
+DROP TABLE options;
+ALTER TABLE options_mig RENAME TO options;

db/migrations/0097__add_zoomFactor.sql

@@ -0,0 +1,2 @@
+INSERT INTO options (optionId, name, value, dateCreated, dateModified, isSynced)
+VALUES ('zoomFactor_key', 'zoomFactor', '1.0', '2018-06-01T03:35:55.041Z', '2018-06-01T03:35:55.041Z', 0);

db/migrations/0098__rename_hideInAutocomplete.sql

@@ -0,0 +1 @@
+UPDATE labels SET name = 'archived' WHERE name = 'hideInAutocomplete'

db/migrations/0099__add_theme_option.sql

@@ -0,0 +1,2 @@
+INSERT INTO options (optionId, name, value, dateCreated, dateModified, isSynced)
+VALUES ('theme_key', 'theme', 'white', '2018-06-01T03:35:55.041Z', '2018-06-01T03:35:55.041Z', 0);

db/migrations/0100__remove_optionId.sql

@@ -0,0 +1,15 @@
+create table options_mig
+(
+  name TEXT not null PRIMARY KEY,
+  value TEXT,
+  dateModified INT,
+  isSynced INTEGER default 0 not null,
+  hash TEXT default "" not null,
+  dateCreated TEXT default '1970-01-01T00:00:00.000Z' not null
+);
+
+INSERT INTO options_mig (name, value, dateModified, isSynced, hash, dateCreated)
+SELECT name, value, dateModified, isSynced, hash, dateCreated FROM options;
+
+DROP TABLE options;
+ALTER TABLE options_mig RENAME TO options;

db/migrations/0101__add_sync_options.sql

@@ -0,0 +1,8 @@
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('syncServerHost', '', '2018-06-01T03:35:55.041Z', '2018-06-01T03:35:55.041Z', 0);
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('syncServerTimeout', '5000', '2018-06-01T03:35:55.041Z', '2018-06-01T03:35:55.041Z', 0);
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('syncProxy', '', '2018-06-01T03:35:55.041Z', '2018-06-01T03:35:55.041Z', 0);

db/migrations/0102__fix_sync_entityIds.sql

@@ -0,0 +1,2 @@
+DELETE FROM sync WHERE entityName = 'note_tree';
+DELETE FROM sync WHERE entityName = 'attributes';

db/migrations/0103__add_initialized_option.sql

@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('initialized', 'true', '2018-06-01T03:35:55.041Z', '2018-06-01T03:35:55.041Z', 0);

db/migrations/0104__fill_sync_rows_for_options.js

@@ -0,0 +1,4 @@
+const syncTableService = require('../../src/services/sync_table');
+
+// options has not been filled so far which caused problems with clean-slate sync.
+module.exports = async () => await syncTableService.fillAllSyncRows();

db/migrations/0105__delete_content_from_soft_deleted_notes.sql

@@ -0,0 +1,2 @@
+UPDATE notes SET content = '' WHERE isDeleted = 1;
+UPDATE note_revisions SET content = '' WHERE (SELECT isDeleted FROM notes WHERE noteId = note_revisions.noteId) = 1;

db/migrations/0106__add_relations_table.sql

@@ -0,0 +1,15 @@
+CREATE TABLE relations
+(
+    relationId  TEXT not null primary key,
+    sourceNoteId       TEXT not null,
+    name         TEXT not null,
+    targetNoteId        TEXT not null,
+    position     INT  default 0 not null,
+    dateCreated  TEXT not null,
+    dateModified TEXT not null,
+    isDeleted    INT  not null
+  , hash TEXT DEFAULT "" NOT NULL);
+CREATE INDEX IDX_relation_sourceNoteId
+  on relations (sourceNoteId);
+CREATE INDEX IDX_relation_targetNoteId
+  on relations (targetNoteId);

db/migrations/0107__add_inheritable_attribute_to_relations.sql

@@ -0,0 +1 @@
+ALTER TABLE relations ADD isInheritable int DEFAULT 0 NULL;

db/migrations/0108__new_backup_options.sql

@@ -0,0 +1,9 @@
+UPDATE options SET name = 'lastDailyBackupDate' WHERE name = 'lastBackupDate';
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('lastWeeklyBackupDate', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('lastMonthlyBackupDate', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+-- these options are not synced so no need to fix sync rows

db/migrations/0109__create_attributes.sql

@@ -0,0 +1,27 @@
+create table attributes
+(
+  attributeId      TEXT not null primary key,
+  noteId       TEXT not null,
+  type         TEXT not null,
+  name         TEXT not null,
+  value        TEXT default '' not null,
+  position     INT  default 0 not null,
+  dateCreated  TEXT not null,
+  dateModified TEXT not null,
+  isDeleted    INT  not null,
+  hash         TEXT default "" not null);
+
+create index IDX_attributes_name_value
+  on attributes (name, value);
+
+create index IDX_attributes_value
+  on attributes (value);
+
+create index IDX_attributes_noteId
+  on attributes (noteId);
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, dateCreated, dateModified, isDeleted, hash)
+SELECT labelId, noteId, 'label', name, value, position, dateCreated, dateModified, isDeleted, hash FROM labels;
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, dateCreated, dateModified, isDeleted, hash)
+SELECT relationId, sourceNoteId, 'relation', name, targetNoteId, position, dateCreated, dateModified, isDeleted, hash FROM relations;

db/migrations/0110__add_isInheritable_to_attributes.sql

@@ -0,0 +1 @@
+ALTER TABLE attributes ADD isInheritable int DEFAULT 0 NULL;

db/migrations/0111__cleanup_labels_and_relations.sql

@@ -0,0 +1,4 @@
+DROP TABLE relations;
+DROP TABLE labels;
+
+DELETE FROM sync WHERE entityName = 'relations' OR entityName = 'labels';

db/schema.sql

@@ -1,8 +1,3 @@
-CREATE TABLE IF NOT EXISTS "options" (
-    `name`	TEXT NOT NULL PRIMARY KEY,
-    `value`	TEXT,
-    `dateModified` INT,
-    isSynced INTEGER NOT NULL DEFAULT 0);
 CREATE TABLE IF NOT EXISTS "sync" (
   `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
   `entityName`	TEXT NOT NULL,
@@ -29,7 +24,7 @@ CREATE TABLE IF NOT EXISTS "note_revisions" (
   `isProtected`	INT NOT NULL DEFAULT 0,
   `dateModifiedFrom` TEXT NOT NULL,
   `dateModifiedTo` TEXT NOT NULL
-, type TEXT DEFAULT '' NOT NULL, mime TEXT DEFAULT '' NOT NULL);
+, type TEXT DEFAULT '' NOT NULL, mime TEXT DEFAULT '' NOT NULL, hash TEXT DEFAULT "" NOT NULL);
 CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (
   `noteId`
 );
@@ -49,7 +44,7 @@ CREATE TABLE IF NOT EXISTS "images"
   isDeleted INT NOT NULL DEFAULT 0,
   dateModified TEXT NOT NULL,
   dateCreated TEXT NOT NULL
-);
+, hash TEXT DEFAULT "" NOT NULL);
 CREATE TABLE note_images
 (
   noteImageId TEXT PRIMARY KEY NOT NULL,
@@ -58,7 +53,7 @@ CREATE TABLE note_images
   isDeleted INT NOT NULL DEFAULT 0,
   dateModified TEXT NOT NULL,
   dateCreated TEXT NOT NULL
-);
+, hash TEXT DEFAULT "" NOT NULL);
 CREATE INDEX IDX_note_images_noteId ON note_images (noteId);
 CREATE INDEX IDX_note_images_imageId ON note_images (imageId);
 CREATE INDEX IDX_note_images_noteId_imageId ON note_images (noteId, imageId);
@@ -68,7 +63,7 @@ CREATE TABLE IF NOT EXISTS "api_tokens"
   token TEXT NOT NULL,
   dateCreated TEXT NOT NULL,
   isDeleted INT NOT NULL DEFAULT 0
-);
+, hash TEXT DEFAULT "" NOT NULL);
 CREATE TABLE IF NOT EXISTS "branches" (
   `branchId`	TEXT NOT NULL,
   `noteId`	TEXT NOT NULL,
@@ -77,7 +72,7 @@ CREATE TABLE IF NOT EXISTS "branches" (
   `prefix`	TEXT,
   `isExpanded`	BOOLEAN,
   `isDeleted`	INTEGER NOT NULL DEFAULT 0,
-  `dateModified`	TEXT NOT NULL,
+  `dateModified`	TEXT NOT NULL, hash TEXT DEFAULT "" NOT NULL, dateCreated TEXT NOT NULL DEFAULT '1970-01-01T00:00:00.000Z',
   PRIMARY KEY(`branchId`)
 );
 CREATE INDEX `IDX_branches_noteId` ON `branches` (
@@ -87,34 +82,6 @@ CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (
   `noteId`,
   `parentNoteId`
 );
-CREATE TABLE IF NOT EXISTS "recent_notes" (
-  `branchId` TEXT NOT NULL PRIMARY KEY,
-  `notePath` TEXT NOT NULL,
-  `dateAccessed` TEXT NOT NULL,
-  isDeleted INT
-);
-CREATE TABLE labels
-(
-  labelId  TEXT not null primary key,
-  noteId       TEXT not null,
-  name         TEXT not null,
-  value        TEXT default '' not null,
-  position     INT  default 0 not null,
-  dateCreated  TEXT not null,
-  dateModified TEXT not null,
-  isDeleted    INT  not null
-);
-CREATE INDEX IDX_labels_name_value
-  on labels (name, value);
-CREATE INDEX IDX_labels_noteId
-  on labels (noteId);
-CREATE TABLE IF NOT EXISTS "event_log"
-(
-  id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-  noteId TEXT,
-  comment TEXT,
-  dateAdded TEXT NOT NULL
-);
 CREATE TABLE IF NOT EXISTS "notes" (
   `noteId`	TEXT NOT NULL,
   `title`	TEXT NOT NULL DEFAULT "unnamed",
@@ -124,9 +91,43 @@ CREATE TABLE IF NOT EXISTS "notes" (
   `dateCreated`	TEXT NOT NULL,
   `dateModified`	TEXT NOT NULL,
   type TEXT NOT NULL DEFAULT 'text',
-  mime TEXT NOT NULL DEFAULT 'text/html',
+  mime TEXT NOT NULL DEFAULT 'text/html', hash TEXT DEFAULT "" NOT NULL,
   PRIMARY KEY(`noteId`)
 );
-CREATE INDEX `IDX_notes_isDeleted` ON `notes` (
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
-  `isDeleted`
+CREATE INDEX IDX_notes_type
+  on notes (type);
+CREATE TABLE IF NOT EXISTS "recent_notes" (
+  `branchId` TEXT NOT NULL PRIMARY KEY,
+  `notePath` TEXT NOT NULL,
+  hash TEXT DEFAULT "" NOT NULL,
+  `dateCreated` TEXT NOT NULL,
+  isDeleted INT
 );
+CREATE TABLE IF NOT EXISTS "event_log" (
+  `eventId`	TEXT NOT NULL PRIMARY KEY,
+  `noteId`	TEXT,
+  `comment`	TEXT,
+  `dateCreated`	TEXT NOT NULL
+);
+CREATE TABLE IF NOT EXISTS "options"
+(
+  name TEXT not null PRIMARY KEY,
+  value TEXT,
+  dateModified INT,
+  isSynced INTEGER default 0 not null,
+  hash TEXT default "" not null,
+  dateCreated TEXT default '1970-01-01T00:00:00.000Z' not null
+);
+CREATE TABLE attributes
+(
+  attributeId      TEXT not null primary key,
+  noteId       TEXT not null,
+  type         TEXT not null,
+  name         TEXT not null,
+  value        TEXT default '' not null,
+  position     INT  default 0 not null,
+  dateCreated  TEXT not null,
+  dateModified TEXT not null,
+  isDeleted    INT  not null,
+  hash         TEXT default "" not null, isInheritable int DEFAULT 0 NULL);

electron.js

@@ -2,9 +2,9 @@
 
 const electron = require('electron');
 const path = require('path');
-const config = require('./src/services/config');
 const log = require('./src/services/log');
 const url = require("url");
+const port = require('./src/services/port');
 
 const app = electron.app;
 const globalShortcut = electron.globalShortcut;
@@ -23,7 +23,7 @@ function onClosed() {
     mainWindow = null;
 }
 
-function createMainWindow() {
+async function createMainWindow() {
     const win = new electron.BrowserWindow({
         width: 1200,
         height: 900,
@@ -31,10 +31,8 @@ function createMainWindow() {
         icon: path.join(__dirname, 'src/public/images/app-icons/png/256x256.png')
     });
 
-    const port = config['Network']['port'] || '3000';
-
     win.setMenu(null);
-    win.loadURL('http://localhost:' + port);
+    win.loadURL('http://localhost:' + await port);
     win.on('closed', onClosed);
 
     win.webContents.on('new-window', (e, url) => {

package.json

@@ -1,9 +1,12 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.13.0-beta",
+  "version": "0.19.1",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
+  "bin": {
+    "trilium": "./src/www"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/zadam/trilium.git"
@@ -28,23 +31,24 @@
     "debug": "~3.1.0",
     "devtron": "^1.4.0",
     "ejs": "~2.6.1",
-    "electron-debug": "^1.5.0",
+    "electron-debug": "^2.0.0",
     "electron-dl": "^1.12.0",
     "electron-in-page-search": "^1.3.2",
     "express": "~4.16.3",
     "express-session": "^1.15.6",
-    "fs-extra": "^6.0.1",
+    "fs-extra": "^7.0.0",
-    "helmet": "^3.12.1",
+    "get-port": "^4.0.0",
+    "helmet": "^3.13.0",
     "html": "^1.0.0",
     "image-type": "^3.0.0",
-    "imagemin": "^5.3.1",
+    "imagemin": "^6.0.0",
     "imagemin-giflossy": "^5.1.10",
     "imagemin-mozjpeg": "^7.0.0",
-    "imagemin-pngquant": "^5.1.0",
+    "imagemin-pngquant": "^6.0.0",
     "ini": "^1.3.5",
-    "jimp": "^0.2.28",
+    "jimp": "^0.3.0",
-    "moment": "^2.22.1",
+    "moment": "^2.22.2",
-    "multer": "^1.3.0",
+    "multer": "^1.3.1",
     "open": "0.0.5",
     "rand-token": "^0.4.0",
     "rcedit": "^1.1.0",
@@ -59,17 +63,19 @@
     "sqlite": "^2.9.2",
     "tar-stream": "^1.6.1",
     "unescape": "^1.0.1",
-    "ws": "^5.2.0"
+    "ws": "^6.0.0",
+    "xml2js": "^0.4.19"
   },
   "devDependencies": {
-    "electron": "^2.0.1",
+    "electron": "^2.0.6",
-    "electron-compile": "^6.4.2",
+    "electron-compile": "^6.4.3",
     "electron-packager": "^12.1.0",
-    "electron-prebuilt-compile": "2.0.0",
+    "electron-prebuilt-compile": "2.0.6",
-    "electron-rebuild": "^1.7.3",
+    "electron-rebuild": "^1.8.2",
-    "lorem-ipsum": "^1.0.4",
+    "lorem-ipsum": "^1.0.5",
-    "tape": "^4.9.0",
+    "tape": "^4.9.1",
-    "xo": "^0.21.1"
+    "xo": "^0.21.1",
+    "pkg": "^4.3.3"
   },
   "config": {
     "forge": {
@@ -108,5 +114,15 @@
       "node",
       "browser"
     ]
+  },
+  "pkg": {
+    "assets": [
+      "./db/**/*",
+      "./src/public/**/*",
+      "./src/views/**/*",
+      "./node_modules/mozjpeg/vendor/*",
+      "./node_modules/pngquant-bin/vendor/*",
+      "./node_modules/giflossy/vendor/*"
+    ]
   }
 }

src/app.js

@@ -11,6 +11,7 @@ const os = require('os');
 const sessionSecret = require('./services/session_secret');
 const cls = require('./services/cls');
 require('./entities/entity_constructor');
+require('./services/handlers');
 
 const app = express();
 
@@ -47,7 +48,7 @@ const sessionParser = session({
     cookie: {
         //    path: "/",
         httpOnly: true,
-        maxAge:  1800000
+        maxAge:  24 * 60 * 60 * 1000 // in milliseconds
     },
     store: new FileStore({
         ttl: 30 * 24 * 3600,

src/entities/api_token.js

@@ -9,8 +9,6 @@ class ApiToken extends Entity {
     static get hashedProperties() { return ["apiTokenId", "token", "dateCreated", "isDeleted"]; }
 
     beforeSaving() {
-        super.beforeSaving();
-
         if (!this.isDeleted) {
             this.isDeleted = false;
         }
@@ -18,6 +16,8 @@ class ApiToken extends Entity {
         if (!this.dateCreated) {
             this.dateCreated = dateUtils.nowDate();
         }
+
+        super.beforeSaving();
     }
 }
 

src/entities/attribute.js

@@ -0,0 +1,77 @@
+"use strict";
+
+const Entity = require('./entity');
+const repository = require('../services/repository');
+const dateUtils = require('../services/date_utils');
+const sql = require('../services/sql');
+
+class Attribute extends Entity {
+    static get tableName() { return "attributes"; }
+    static get primaryKeyName() { return "attributeId"; }
+    static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted", "dateCreated"]; }
+
+    constructor(row) {
+        super(row);
+
+        this.isInheritable = !!this.isInheritable;
+
+        if (this.isDefinition()) {
+            try {
+                this.value = JSON.parse(this.value);
+            }
+            catch (e) {
+            }
+        }
+    }
+
+    async getNote() {
+        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+    }
+
+    async getTargetNote() {
+        if (this.type !== 'relation') {
+            throw new Error(`Attribute ${this.attributeId} is not relation`);
+        }
+
+        if (!this.value) {
+            return null;
+        }
+
+        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.value]);
+    }
+
+    isDefinition() {
+        return this.type === 'label-definition' || this.type === 'relation-definition';
+    }
+
+    async beforeSaving() {
+        if (!this.value) {
+            // null value isn't allowed
+            this.value = "";
+        }
+
+        if (this.position === undefined) {
+            this.position = 1 + await sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM attributes WHERE noteId = ?`, [this.noteId]);
+        }
+
+        if (!this.isInheritable) {
+            this.isInheritable = false;
+        }
+
+        if (!this.isDeleted) {
+            this.isDeleted = false;
+        }
+
+        if (!this.dateCreated) {
+            this.dateCreated = dateUtils.nowDate();
+        }
+
+        super.beforeSaving();
+
+        if (this.isChanged) {
+            this.dateModified = dateUtils.nowDate();
+        }
+    }
+}
+
+module.exports = Attribute;

src/entities/branch.js

@@ -9,15 +9,13 @@ class Branch extends Entity {
     static get tableName() { return "branches"; }
     static get primaryKeyName() { return "branchId"; }
     // notePosition is not part of hash because it would produce a lot of updates in case of reordering
-    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "dateModified", "isDeleted", "prefix"]; }
+    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "prefix"]; }
 
     async getNote() {
         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
     }
 
     async beforeSaving() {
-        super.beforeSaving();
-
         if (this.notePosition === undefined) {
             const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
             this.notePosition = maxNotePos === null ? 0 : maxNotePos + 1;
@@ -27,7 +25,15 @@ class Branch extends Entity {
             this.isDeleted = false;
         }
 
-        this.dateModified = dateUtils.nowDate()
+        if (!this.dateCreated) {
+            this.dateCreated = dateUtils.nowDate();
+        }
+
+        super.beforeSaving();
+
+        if (this.isChanged) {
+            this.dateModified = dateUtils.nowDate();
+        }
     }
 }
 

src/entities/entity.js

@@ -1,13 +1,16 @@
 "use strict";
 
 const utils = require('../services/utils');
-const repository = require('../services/repository');
 
 class Entity {
     constructor(row = {}) {
         for (const key in row) {
             this[key] = row[key];
         }
+
+        if ('isDeleted' in this) {
+            this.isDeleted = !!this.isDeleted;
+        }
     }
 
     beforeSaving() {
@@ -15,20 +18,25 @@ class Entity {
             this[this.constructor.primaryKeyName] = utils.newEntityId();
         }
 
+        const origHash = this.hash;
+
+        this.hash = this.generateHash();
+
+        this.isChanged = origHash !== this.hash;
+    }
+
+    generateHash() {
         let contentToHash = "";
 
         for (const propertyName of this.constructor.hashedProperties) {
             contentToHash += "|" + this[propertyName];
         }
 
-        // this IF is to ease the migration from before hashed options, can be later removed
+        return utils.hash(contentToHash).substr(0, 10);
-        if (this.constructor.tableName !== 'options' || this.isSynced) {
-            this["hash"] = utils.hash(contentToHash).substr(0, 10);
-        }
     }
 
     async save() {
-        await repository.updateEntity(this);
+        await require('../services/repository').updateEntity(this);
 
         return this;
     }

src/entities/entity_constructor.js

@@ -3,17 +3,37 @@ const NoteRevision = require('../entities/note_revision');
 const Image = require('../entities/image');
 const NoteImage = require('../entities/note_image');
 const Branch = require('../entities/branch');
-const Label = require('../entities/label');
+const Attribute = require('../entities/attribute');
 const RecentNote = require('../entities/recent_note');
 const ApiToken = require('../entities/api_token');
 const Option = require('../entities/option');
 const repository = require('../services/repository');
 
+const TABLE_NAME_TO_ENTITY = {
+    "attributes": Attribute,
+    "images": Image,
+    "note_images": NoteImage,
+    "branches": Branch,
+    "notes": Note,
+    "note_revisions": NoteRevision,
+    "recent_notes": RecentNote,
+    "options": Option,
+    "api_tokens": ApiToken
+};
+
+function getEntityFromTableName(tableName) {
+    if (!(tableName in TABLE_NAME_TO_ENTITY)) {
+        throw new Error(`Entity for table ${tableName} not found!`);
+    }
+
+    return TABLE_NAME_TO_ENTITY[tableName];
+}
+
 function createEntityFromRow(row) {
     let entity;
 
-    if (row.labelId) {
+    if (row.attributeId) {
-        entity = new Label(row);
+        entity = new Attribute(row);
     }
     else if (row.noteRevisionId) {
         entity = new NoteRevision(row);
@@ -46,8 +66,9 @@ function createEntityFromRow(row) {
     return entity;
 }
 
-repository.setEntityConstructor(createEntityFromRow);
-
 module.exports = {
-    createEntityFromRow
+    createEntityFromRow,
+    getEntityFromTableName
 };
+
+repository.setEntityConstructor(module.exports);

src/entities/image.js

@@ -6,11 +6,9 @@ const dateUtils = require('../services/date_utils');
 class Image extends Entity {
     static get tableName() { return "images"; }
     static get primaryKeyName() { return "imageId"; }
-    static get hashedProperties() { return ["imageId", "format", "checksum", "name", "isDeleted", "dateModified", "dateCreated"]; }
+    static get hashedProperties() { return ["imageId", "format", "checksum", "name", "isDeleted", "dateCreated"]; }
 
     beforeSaving() {
-        super.beforeSaving();
-
         if (!this.isDeleted) {
             this.isDeleted = false;
         }
@@ -19,7 +17,11 @@ class Image extends Entity {
             this.dateCreated = dateUtils.nowDate();
         }
 
-        this.dateModified = dateUtils.nowDate();
+        super.beforeSaving();
+
+        if (this.isChanged) {
+            this.dateModified = dateUtils.nowDate();
+        }
     }
 }
 

src/entities/label.js

@@ -1,41 +0,0 @@
-"use strict";
-
-const Entity = require('./entity');
-const repository = require('../services/repository');
-const dateUtils = require('../services/date_utils');
-const sql = require('../services/sql');
-
-class Label extends Entity {
-    static get tableName() { return "labels"; }
-    static get primaryKeyName() { return "labelId"; }
-    static get hashedProperties() { return ["labelId", "noteId", "name", "value", "dateModified", "dateCreated"]; }
-
-    async getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
-    }
-
-    async beforeSaving() {
-        super.beforeSaving();
-
-        if (!this.value) {
-            // null value isn't allowed
-            this.value = "";
-        }
-
-        if (this.position === undefined) {
-            this.position = 1 + await sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM labels WHERE noteId = ?`, [this.noteId]);
-        }
-
-        if (!this.isDeleted) {
-            this.isDeleted = false;
-        }
-
-        if (!this.dateCreated) {
-            this.dateCreated = dateUtils.nowDate();
-        }
-
-        this.dateModified = dateUtils.nowDate();
-    }
-}
-
-module.exports = Label;

src/entities/note.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const Entity = require('./entity');
+const Attribute = require('./attribute');
 const protectedSessionService = require('../services/protected_session');
 const repository = require('../services/repository');
 const dateUtils = require('../services/date_utils');
@@ -8,11 +9,13 @@ const dateUtils = require('../services/date_utils');
 class Note extends Entity {
     static get tableName() { return "notes"; }
     static get primaryKeyName() { return "noteId"; }
-    static get hashedProperties() { return ["noteId", "title", "content", "type", "dateModified", "isProtected", "isDeleted"]; }
+    static get hashedProperties() { return ["noteId", "title", "content", "type", "isProtected", "isDeleted"]; }
 
     constructor(row) {
         super(row);
 
+        this.isProtected = !!this.isProtected;
+
         // check if there's noteId, otherwise this is a new entity which wasn't encrypted yet
         if (this.isProtected && this.noteId) {
             protectedSessionService.decryptNote(this);
@@ -30,6 +33,10 @@ class Note extends Entity {
         catch(e) {}
     }
 
+    isRoot() {
+        return this.noteId === 'root';
+    }
+
     isJson() {
         return this.mime === "application/json";
     }
@@ -40,7 +47,7 @@ class Note extends Entity {
     }
 
     isHtml() {
-        return (this.type === "code" || this.type === "file") && this.mime === "text/html";
+        return (this.type === "code" || this.type === "file" || this.type === "render") && this.mime === "text/html";
     }
 
     getScriptEnv() {
@@ -59,30 +66,140 @@ class Note extends Entity {
         return null;
     }
 
-    async getLabels() {
+    async getOwnedAttributes() {
-        return await repository.getEntities("SELECT * FROM labels WHERE noteId = ? AND isDeleted = 0", [this.noteId]);
+        return await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
     }
 
-    // WARNING: this doesn't take into account the possibility to have multi-valued labels!
+    async getAttributes() {
-    async getLabelMap() {
+        if (!this.__attributeCache) {
-        const map = {};
+            await this.loadAttributesToCache();
-
-        for (const label of await this.getLabels()) {
-            map[label.name] = label.value;
         }
 
-        return map;
+        return this.__attributeCache;
+    }
+
+    invalidateAttributeCache() {
+        this.__attributeCache = null;
+    }
+
+    async loadAttributesToCache() {
+        const attributes = await repository.getEntities(`
+            WITH RECURSIVE
+            tree(noteId, level) AS (
+                SELECT ?, 0
+                UNION
+                SELECT branches.parentNoteId, tree.level + 1 FROM branches
+                    JOIN tree ON branches.noteId = tree.noteId
+                    JOIN notes ON notes.noteId = branches.parentNoteId
+                WHERE notes.isDeleted = 0
+                  AND branches.isDeleted = 0
+            ),
+            treeWithAttrs(noteId, level) AS (
+                SELECT * FROM tree
+                UNION
+                SELECT attributes.value, treeWithAttrs.level + 1 FROM attributes
+                     JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId
+                WHERE attributes.isDeleted = 0
+                  AND attributes.type = 'relation'
+                  AND attributes.name = 'inheritAttributes'
+                  AND (attributes.noteId = ? OR attributes.isInheritable = 1)
+                )
+            SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId
+            WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR attributes.noteId = ?)
+            ORDER BY level, noteId, position`, [this.noteId, this.noteId, this.noteId]);
+        // attributes are ordered so that "closest" attributes are first
+        // we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.
+
+        const filteredAttributes = attributes.filter((attr, index) => {
+            if (attr.isDefinition()) {
+                const firstDefinitionIndex = attributes.findIndex(el => el.type === attr.type && el.name === attr.name);
+
+                // keep only if this element is the first definition for this type & name
+                return firstDefinitionIndex === index;
+            }
+            else {
+                const definitionAttr = attributes.find(el => el.type === attr.type + '-definition' && el.name === attr.name);
+
+                if (!definitionAttr) {
+                    return true;
+                }
+
+                const definition = definitionAttr.value;
+
+                if (definition.multiplicityType === 'multivalue') {
+                    return true;
+                }
+                else {
+                    const firstAttrIndex = attributes.findIndex(el => el.type === attr.type && el.name === attr.name);
+
+                    // in case of single-valued attribute we'll keep it only if it's first (closest)
+                    return firstAttrIndex === index;
+                }
+            }
+        });
+
+        for (const attr of filteredAttributes) {
+            attr.isOwned = attr.noteId === this.noteId;
+        }
+
+        this.__attributeCache = filteredAttributes;
     }
 
     async hasLabel(name) {
-        const map = await this.getLabelMap();
+        return !!await this.getLabel(name);
-
-        return map.hasOwnProperty(name);
     }
 
     // WARNING: this doesn't take into account the possibility to have multi-valued labels!
     async getLabel(name) {
-        return await repository.getEntity("SELECT * FROM labels WHERE noteId = ? AND name = ?", [this.noteId, name]);
+        const attributes = await this.getAttributes();
+
+        return attributes.find(attr => attr.type === 'label' && attr.name === name);
+    }
+
+    async getLabelValue(name) {
+        const label = await this.getLabel(name);
+
+        return label ? label.value : null;
+    }
+
+    async toggleLabel(enabled, name, value = "") {
+        if (enabled) {
+            await this.setLabel(name, value);
+        }
+        else {
+            await this.removeLabel(name, value);
+        }
+    }
+
+    async setLabel(name, value = "") {
+        const attributes = await this.getOwnedAttributes();
+        let label = attributes.find(attr => attr.type === 'label' && attr.value === value);
+
+        if (!label) {
+            label = new Attribute({
+                noteId: this.noteId,
+                type: 'label',
+                name: name,
+                value: value
+            });
+
+            await label.save();
+
+            this.invalidateAttributeCache();
+        }
+    }
+
+    async removeLabel(name, value = "") {
+        const attributes = await this.getOwnedAttributes();
+
+        for (const attribute of attributes) {
+            if (attribute.type === 'label' && (!value || value === attribute.value)) {
+                attribute.isDeleted = true;
+                await attribute.save();
+
+                this.invalidateAttributeCache();
+            }
+        }
     }
 
     async getRevisions() {
@@ -140,8 +257,6 @@ class Note extends Entity {
     }
 
     beforeSaving() {
-        super.beforeSaving();
-
         if (this.isJson() && this.jsonContent) {
             this.content = JSON.stringify(this.jsonContent, null, '\t');
         }
@@ -158,7 +273,11 @@ class Note extends Entity {
             this.dateCreated = dateUtils.nowDate();
         }
 
-        this.dateModified = dateUtils.nowDate();
+        super.beforeSaving();
+
+        if (this.isChanged) {
+            this.dateModified = dateUtils.nowDate();
+        }
     }
 }
 

src/entities/note_image.js

@@ -7,7 +7,7 @@ const dateUtils = require('../services/date_utils');
 class NoteImage extends Entity {
     static get tableName() { return "note_images"; }
     static get primaryKeyName() { return "noteImageId"; }
-    static get hashedProperties() { return ["noteImageId", "noteId", "imageId", "isDeleted", "dateModified", "dateCreated"]; }
+    static get hashedProperties() { return ["noteImageId", "noteId", "imageId", "isDeleted", "dateCreated"]; }
 
     async getNote() {
         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
@@ -18,8 +18,6 @@ class NoteImage extends Entity {
     }
 
     beforeSaving() {
-        super.beforeSaving();
-
         if (!this.isDeleted) {
             this.isDeleted = false;
         }
@@ -28,7 +26,11 @@ class NoteImage extends Entity {
             this.dateCreated = dateUtils.nowDate();
         }
 
-        this.dateModified = dateUtils.nowDate();
+        super.beforeSaving();
+
+        if (this.isChanged) {
+            this.dateModified = dateUtils.nowDate();
+        }
     }
 }
 

src/entities/note_revision.js

@@ -7,11 +7,13 @@ const repository = require('../services/repository');
 class NoteRevision extends Entity {
     static get tableName() { return "note_revisions"; }
     static get primaryKeyName() { return "noteRevisionId"; }
-    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "dateModifiedFrom", "dateModifiedTo"]; }
+    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "isProtected", "dateModifiedFrom", "dateModifiedTo"]; }
 
     constructor(row) {
         super(row);
 
+        this.isProtected = !!this.isProtected;
+
         if (this.isProtected) {
             protectedSessionService.decryptNoteRevision(this);
         }
@@ -22,11 +24,11 @@ class NoteRevision extends Entity {
     }
 
     beforeSaving() {
-        super.beforeSaving();
-
         if (this.isProtected) {
             protectedSessionService.encryptNoteRevision(this);
         }
+
+        super.beforeSaving();
     }
 }
 

src/entities/option.js

@@ -8,10 +8,18 @@ class Option extends Entity {
     static get primaryKeyName() { return "name"; }
     static get hashedProperties() { return ["name", "value"]; }
 
+    constructor(row) {
+        super(row);
+
+        this.isSynced = !!this.isSynced;
+    }
+
     beforeSaving() {
         super.beforeSaving();
 
-        this.dateModified = dateUtils.nowDate();
+        if (this.isChanged) {
+            this.dateModified = dateUtils.nowDate();
+        }
     }
 }
 

src/entities/recent_note.js

@@ -1,11 +1,24 @@
 "use strict";
 
 const Entity = require('./entity');
+const dateUtils = require('../services/date_utils');
 
 class RecentNote extends Entity {
     static get tableName() { return "recent_notes"; }
     static get primaryKeyName() { return "branchId"; }
-    static get hashedProperties() { return ["branchId", "notePath", "dateAccessed", "isDeleted"]; }
+    static get hashedProperties() { return ["branchId", "notePath", "dateCreated", "isDeleted"]; }
+
+    beforeSaving() {
+        if (!this.isDeleted) {
+            this.isDeleted = false;
+        }
+
+        if (!this.dateCreated) {
+            this.dateCreated = dateUtils.nowDate();
+        }
+
+        super.beforeSaving();
+    }
 }
 
 module.exports = RecentNote;

src/public/images/trilium.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve"><path d="M63.966,45.043c0.008-0.009,0.021-0.021,0.027-0.029c0.938-1.156-0.823-13.453-5.063-20.125  c-1.389-2.186-2.239-3.423-3.219-4.719c-3.907-5.166-6-6.125-6-6.125S35.732,24.78,36.149,44.315  c-1.754,0.065-11.218,7.528-14.826,14.388c-1.206,2.291-1.856,3.645-2.493,5.141c-2.539,5.957-2.33,8.25-2.33,8.25  s16.271,6.79,33.014-3.294c0.007,0.021,0.013,0.046,0.02,0.063c0.537,1.389,12.08,5.979,19.976,5.621  c2.587-0.116,4.084-0.238,5.696-0.444c6.424-0.818,8.298-2.157,8.298-2.157S81.144,54.396,63.966,45.043z M50.787,65.343  c1.059-1.183,4.648-5.853,0.995-11.315c-0.253-0.377-0.496-0.236-0.496-0.236s0.063,10.822-5.162,12.359  c-5.225,1.537-13.886,4.4-20.427,0.455C25,66.186,26.924,53.606,38.544,47.229c0.546,1.599,2.836,6.854,9.292,6.409  c0.453-0.031,0.453-0.313,0.453-0.313s-9.422-5.328-8.156-10.625s3.089-14.236,9.766-17.948c0.714-0.397,10.746,7.593,10.417,20.94  c-1.606-0.319-7.377-1.004-10.226,4.864c-0.198,0.409,0.046,0.549,0.046,0.549s9.31-5.521,13.275-1.789  c3.965,3.733,10.813,9.763,10.71,17.4C74.111,67.533,62.197,72.258,50.787,65.343z M35.613,35.145c0,0-0.991,3.241-0.603,7.524  l-13.393-7.524C21.618,35.145,27.838,30.931,35.613,35.145z M21.193,36.03l13.344,7.612c-3.872,1.872-6.142,4.388-6.142,4.388  C20.78,43.531,21.193,36.03,21.193,36.03z M72.287,49.064c0,0-2.321-2.471-6.23-4.263l13.187-7.881  C79.243,36.92,79.808,44.413,72.287,49.064z M78.687,36.113l-13.237,7.794c0.3-4.291-0.754-7.511-0.754-7.511  C72.383,32.025,78.687,36.113,78.687,36.113z M42.076,73.778c0,0,3.309-0.737,6.845-3.185l0.056,15.361  C48.977,85.955,42.244,82.621,42.076,73.778z M49.956,85.888L50,70.526c3.539,2.445,6.846,3.181,6.846,3.181  C56.686,82.551,49.956,85.888,49.956,85.888z"></path></svg>

src/public/javascripts/dialogs/add_link.js

@@ -2,7 +2,8 @@ import cloningService from '../services/cloning.js';
 import linkService from '../services/link.js';
 import noteDetailService from '../services/note_detail.js';
 import treeUtils from '../services/tree_utils.js';
-import autocompleteService from '../services/autocomplete.js';
+import server from "../services/server.js";
+import noteDetailText from "../services/note_detail_text.js";
 
 const $dialog = $("#add-link-dialog");
 const $form = $("#add-link-form");
@@ -11,8 +12,10 @@ const $linkTitle = $("#link-title");
 const $clonePrefix = $("#clone-prefix");
 const $linkTitleFormGroup = $("#add-link-title-form-group");
 const $prefixFormGroup = $("#add-link-prefix-form-group");
+const $linkTypeDiv = $("#add-link-type-div");
 const $linkTypes = $("input[name='add-link-type']");
 const $linkTypeHtml = $linkTypes.filter('input[value="html"]');
+const $showRecentNotesButton = $dialog.find(".show-recent-notes-button");
 
 function setLinkType(linkType) {
     $linkTypes.each(function () {
@@ -51,12 +54,33 @@ async function showDialog() {
         $linkTitle.val(noteTitle);
     }
 
-    $autoComplete.autocomplete({
+    await $autoComplete.autocomplete({
-        source: await autocompleteService.getAutocompleteItems(),
+        source: async function(request, response) {
+            const result = await server.get('autocomplete?query=' + encodeURIComponent(request.term));
+
+            if (result.length > 0) {
+                response(result.map(row => {
+                    return {
+                        label: row.label,
+                        value: row.label + ' (' + row.value + ')'
+                    }
+                }));
+            }
+            else {
+                response([{
+                    label: "No results",
+                    value: "No results"
+                }]);
+            }
+        },
         minLength: 0,
-        change: async () => {
+        change: async (event, ui) => {
-            const val = $autoComplete.val();
+            if (!ui.item) {
-            const notePath = linkService.getNodePathFromLabel(val);
+                return;
+            }
+
+            const notePath = linkService.getNotePathFromLabel(ui.item.value);
+
             if (!notePath) {
                 return;
             }
@@ -67,21 +91,30 @@ async function showDialog() {
                 await setDefaultLinkTitle(noteId);
             }
         },
+        select: function (event, ui) {
+            if (ui.item.value === 'No results') {
+                return false;
+            }
+        },
         // this is called when user goes through autocomplete list with keyboard
         // at this point the item isn't selected yet so we use supplied ui.item to see WHERE the cursor is
         focus: async (event, ui) => {
-            const notePath = linkService.getNodePathFromLabel(ui.item.value);
+            const notePath = linkService.getNotePathFromLabel(ui.item.value);
             const noteId = treeUtils.getNoteIdFromNotePath(notePath);
 
             await setDefaultLinkTitle(noteId);
+
+            event.preventDefault();
         }
     });
+
+    showRecentNotes();
 }
 
 $form.submit(() => {
     const value = $autoComplete.val();
 
-    const notePath = linkService.getNodePathFromLabel(value);
+    const notePath = linkService.getNotePathFromLabel(value);
     const noteId = treeUtils.getNoteIdFromNotePath(notePath);
 
     if (notePath) {
@@ -92,7 +125,16 @@ $form.submit(() => {
 
             $dialog.dialog("close");
 
-            linkService.addLinkToEditor(linkTitle, '#' + notePath);
+            const linkHref = '#' + notePath;
+
+            if (hasSelection()) {
+                const editor = noteDetailText.getEditor();
+
+                editor.execute('link', linkHref);
+            }
+            else {
+                linkService.addLinkToEditor(linkTitle, linkHref);
+            }
         }
         else if (linkType === 'selected-to-current') {
             const prefix = $clonePrefix.val();
@@ -113,21 +155,31 @@ $form.submit(() => {
     return false;
 });
 
+// returns true if user selected some text, false if there's no selection
+function hasSelection() {
+    const model = noteDetailText.getEditor().model;
+    const selection = model.document.selection;
+
+    return !selection.isCollapsed;
+}
+
 function linkTypeChanged() {
     const value = $linkTypes.filter(":checked").val();
 
-    if (value === 'html') {
+    $linkTitleFormGroup.toggle(!hasSelection() && value === 'html');
-        $linkTitleFormGroup.show();
+    $prefixFormGroup.toggle(!hasSelection() && value !== 'html');
-        $prefixFormGroup.hide();
+
-    }
+    $linkTypeDiv.toggle(!hasSelection());
-    else {
+}
-        $linkTitleFormGroup.hide();
+
-        $prefixFormGroup.show();
+function showRecentNotes() {
-    }
+    $autoComplete.autocomplete("search", "");
 }
 
 $linkTypes.change(linkTypeChanged);
 
+$showRecentNotesButton.click(showRecentNotes);
+
 export default {
     showDialog
 };

src/public/javascripts/dialogs/attributes.js

@@ -0,0 +1,318 @@
+import noteDetailService from '../services/note_detail.js';
+import server from '../services/server.js';
+import infoService from "../services/info.js";
+import treeUtils from "../services/tree_utils.js";
+import linkService from "../services/link.js";
+
+const $dialog = $("#attributes-dialog");
+const $saveAttributesButton = $("#save-attributes-button");
+const $ownedAttributesBody = $('#owned-attributes-table tbody');
+
+const attributesModel = new AttributesModel();
+
+function AttributesModel() {
+    const self = this;
+
+    this.ownedAttributes = ko.observableArray();
+    this.inheritedAttributes = ko.observableArray();
+
+    this.availableTypes = [
+        { text: "Label", value: "label" },
+        { text: "Label definition", value: "label-definition" },
+        { text: "Relation", value: "relation" },
+        { text: "Relation definition", value: "relation-definition" }
+    ];
+
+    this.availableLabelTypes = [
+        { text: "Text", value: "text" },
+        { text: "Number", value: "number" },
+        { text: "Boolean", value: "boolean" },
+        { text: "Date", value: "date" }
+    ];
+
+    this.multiplicityTypes = [
+        { text: "Single value", value: "singlevalue" },
+        { text: "Multi value", value: "multivalue" }
+    ];
+
+    this.typeChanged = function(data, event) {
+        self.getTargetAttribute(event.target).valueHasMutated();
+    };
+
+    this.labelTypeChanged = function(data, event) {
+        self.getTargetAttribute(event.target).valueHasMutated();
+    };
+
+    this.updateAttributePositions = function() {
+        let position = 0;
+
+        // we need to update positions by searching in the DOM, because order of the
+        // attributes in the viewmodel (self.ownedAttributes()) stays the same
+        $ownedAttributesBody.find('input[name="position"]').each(function() {
+            const attribute = self.getTargetAttribute(this);
+
+            attribute().position = position++;
+        });
+    };
+
+    async function showAttributes(attributes) {
+        const ownedAttributes = attributes.filter(attr => attr.isOwned);
+
+        for (const attr of ownedAttributes) {
+            attr.labelValue = attr.type === 'label' ? attr.value : '';
+            attr.relationValue = attr.type === 'relation' ? (await treeUtils.getNoteTitle(attr.value) + " (" + attr.value + ")") : '';
+            attr.labelDefinition = (attr.type === 'label-definition' && attr.value) ? attr.value : {
+                labelType: "text",
+                multiplicityType: "singlevalue",
+                isPromoted: true
+            };
+            attr.relationDefinition = attr.type === ('relation-definition' && attr.value) ? attr.value : {
+                multiplicityType: "singlevalue",
+                isPromoted: true
+            };
+
+            delete attr.value;
+        }
+
+        self.ownedAttributes(ownedAttributes.map(ko.observable));
+
+        addLastEmptyRow();
+
+        const inheritedAttributes = attributes.filter(attr => !attr.isOwned);
+
+        self.inheritedAttributes(inheritedAttributes);
+    }
+
+    this.loadAttributes = async function() {
+        const noteId = noteDetailService.getCurrentNoteId();
+
+        const attributes = await server.get('notes/' + noteId + '/attributes');
+
+        await showAttributes(attributes);
+
+        // attribute might not be rendered immediatelly so could not focus
+        setTimeout(() => $(".attribute-name:last").focus(), 100);
+
+        $ownedAttributesBody.sortable({
+            handle: '.handle',
+            containment: $ownedAttributesBody,
+            update: this.updateAttributePositions
+        });
+    };
+
+    this.deleteAttribute = function(data, event) {
+        const attribute = self.getTargetAttribute(event.target);
+        const attributeData = attribute();
+
+        if (attributeData) {
+            attributeData.isDeleted = true;
+
+            attribute(attributeData);
+
+            addLastEmptyRow();
+        }
+    };
+
+    function isValid() {
+        for (let attributes = self.ownedAttributes(), i = 0; i < attributes.length; i++) {
+            if (self.isEmptyName(i)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    this.save = async function() {
+        // we need to defocus from input (in case of enter-triggered save) because value is updated
+        // on blur event (because of conflict with jQuery UI Autocomplete). Without this, input would
+        // stay in focus, blur wouldn't be triggered and change wouldn't be updated in the viewmodel.
+        $saveAttributesButton.focus();
+
+        if (!isValid()) {
+            alert("Please fix all validation errors and try saving again.");
+            return;
+        }
+
+        self.updateAttributePositions();
+
+        const noteId = noteDetailService.getCurrentNoteId();
+
+        const attributesToSave = self.ownedAttributes()
+            .map(attribute => attribute())
+            .filter(attribute => attribute.attributeId !== "" || attribute.name !== "");
+
+        for (const attr of attributesToSave) {
+            if (attr.type === 'label') {
+                attr.value = attr.labelValue;
+            }
+            else if (attr.type === 'relation') {
+                attr.value = treeUtils.getNoteIdFromNotePath(linkService.getNotePathFromLabel(attr.relationValue));
+            }
+            else if (attr.type === 'label-definition') {
+                attr.value = attr.labelDefinition;
+            }
+            else if (attr.type === 'relation-definition') {
+                attr.value = attr.relationDefinition;
+            }
+
+            delete attr.labelValue;
+            delete attr.relationValue;
+            delete attr.labelDefinition;
+            delete attr.relationDefinition;
+        }
+
+        const attributes = await server.put('notes/' + noteId + '/attributes', attributesToSave);
+
+        await showAttributes(attributes);
+
+        infoService.showMessage("Attributes have been saved.");
+
+        noteDetailService.loadAttributes();
+    };
+
+    function addLastEmptyRow() {
+        const attributes = self.ownedAttributes().filter(attr => !attr().isDeleted);
+        const last = attributes.length === 0 ? null : attributes[attributes.length - 1]();
+
+        if (!last || last.name.trim() !== "") {
+            self.ownedAttributes.push(ko.observable({
+                attributeId: '',
+                type: 'label',
+                name: '',
+                labelValue: '',
+                relationValue: '',
+                isInheritable: false,
+                isDeleted: false,
+                position: 0,
+                labelDefinition: {
+                    labelType: "text",
+                    multiplicityType: "singlevalue",
+                    isPromoted: true
+                },
+                relationDefinition: {
+                    multiplicityType: "singlevalue",
+                    isPromoted: true
+                }
+            }));
+        }
+    }
+
+    this.attributeChanged = function (data, event) {
+        addLastEmptyRow();
+
+        const attribute = self.getTargetAttribute(event.target);
+
+        attribute.valueHasMutated();
+    };
+
+    this.isNotUnique = function(index) {
+        const cur = self.ownedAttributes()[index]();
+
+        if (cur.name.trim() === "") {
+            return false;
+        }
+
+        for (let attributes = self.ownedAttributes(), i = 0; i < attributes.length; i++) {
+            const attribute = attributes[i]();
+
+            if (index !== i && cur.name === attribute.name && cur.type === attribute.type) {
+                return true;
+            }
+        }
+
+        return false;
+    };
+
+    this.isEmptyName = function(index) {
+        const cur = self.ownedAttributes()[index]();
+
+        return cur.name.trim() === "" && !cur.isDeleted && (cur.attributeId !== "" || cur.labelValue !== "" || cur.relationValue);
+    };
+
+    this.getTargetAttribute = function(target) {
+        const context = ko.contextFor(target);
+        const index = context.$index();
+
+        return self.ownedAttributes()[index];
+    }
+}
+
+async function showDialog() {
+    glob.activeDialog = $dialog;
+
+    await attributesModel.loadAttributes();
+
+    $dialog.dialog({
+        modal: true,
+        width: 950,
+        height: 500
+    });
+}
+
+ko.applyBindings(attributesModel, $dialog[0]);
+
+$dialog.on('focus', '.attribute-name', function (e) {
+    if (!$(this).hasClass("ui-autocomplete-input")) {
+        $(this).autocomplete({
+            source: async (request, response) => {
+                const attribute = attributesModel.getTargetAttribute(this);
+                const type = (attribute().type === 'relation' || attribute().type === 'relation-definition') ? 'relation' : 'label';
+                const names = await server.get('attributes/names/?type=' + type + '&query=' + encodeURIComponent(request.term));
+                const result = names.map(name => {
+                    return {
+                        label: name,
+                        value: name
+                    }
+                });
+
+                if (result.length > 0) {
+                    response(result);
+                }
+                else {
+                    response([{
+                        label: "No results",
+                        value: "No results"
+                    }]);
+                }
+            },
+            minLength: 0
+        });
+    }
+
+    $(this).autocomplete("search", $(this).val());
+});
+
+$dialog.on('focus', '.label-value', async function (e) {
+    if (!$(this).hasClass("ui-autocomplete-input")) {
+        const attributeName = $(this).parent().parent().find('.attribute-name').val();
+
+        if (attributeName.trim() === "") {
+            return;
+        }
+
+        const attributeValues = await server.get('attributes/values/' + encodeURIComponent(attributeName));
+
+        if (attributeValues.length === 0) {
+            return;
+        }
+
+        $(this).autocomplete({
+            // shouldn't be required and autocomplete should just accept array of strings, but that fails
+            // because we have overriden filter() function in autocomplete.js
+            source: attributeValues.map(attribute => {
+                return {
+                    attribute: attribute,
+                    value: attribute
+                }
+            }),
+            minLength: 0
+        });
+    }
+
+    $(this).autocomplete("search", $(this).val());
+});
+
+export default {
+    showDialog
+};

src/public/javascripts/dialogs/event_log.js

@@ -19,7 +19,7 @@ async function showDialog() {
     $list.html('');
 
     for (const event of result) {
-        const dateTime = utils.formatDateTime(utils.parseDate(event.dateAdded));
+        const dateTime = utils.formatDateTime(utils.parseDate(event.dateCreated));
 
         if (event.noteId) {
             const noteLink = await linkService.createNoteLink(event.noteId).prop('outerHTML');

src/public/javascripts/dialogs/jump_to_note.js

@@ -1,10 +1,11 @@
 import treeService from '../services/tree.js';
-import linkService from '../services/link.js';
 import server from '../services/server.js';
+import searchNotesService from '../services/search_notes.js';
 
 const $dialog = $("#jump-to-note-dialog");
 const $autoComplete = $("#jump-to-note-autocomplete");
-const $form = $("#jump-to-note-form");
+const $showInFullTextButton = $("#show-in-full-text-button");
+const $showRecentNotesButton = $dialog.find(".show-recent-notes-button");
 
 async function showDialog() {
     glob.activeDialog = $dialog;
@@ -13,39 +14,66 @@ async function showDialog() {
 
     $dialog.dialog({
         modal: true,
-        width: 800
+        width: 800,
+        position: { my: "center top+100", at: "top", of: window }
     });
 
     await $autoComplete.autocomplete({
         source: async function(request, response) {
             const result = await server.get('autocomplete?query=' + encodeURIComponent(request.term));
 
-            response(result);
+            if (result.length > 0) {
+                response(result);
+            }
+            else {
+                response([{
+                    label: "No results",
+                    value: "No results"
+                }]);
+            }
         },
-        minLength: 2
+        focus: function(event, ui) {
+            event.preventDefault();
+        },
+        minLength: 0,
+        autoFocus: true,
+        select: function (event, ui) {
+            if (ui.item.value === 'No results') {
+                return false;
+            }
+
+            treeService.activateNode(ui.item.value);
+
+            $dialog.dialog('close');
+        }
     });
+
+    showRecentNotes();
 }
 
-function getSelectedNotePath() {
+function showInFullText(e) {
-    const val = $autoComplete.val();
+    // stop from propagating upwards (dangerous especially with ctrl+enter executable javascript notes)
-    return linkService.getNodePathFromLabel(val);
+    e.preventDefault();
+    e.stopPropagation();
+
+    const searchText = $autoComplete.val();
+
+    searchNotesService.resetSearch();
+    searchNotesService.showSearch();
+    searchNotesService.doSearch(searchText);
+
+    $dialog.dialog('close');
 }
 
-function goToNote() {
+function showRecentNotes() {
-    const notePath = getSelectedNotePath();
+    $autoComplete.autocomplete("search", "");
-
-    if (notePath) {
-        treeService.activateNode(notePath);
-
-        $dialog.dialog('close');
-    }
 }
 
-$form.submit(() => {
+$showInFullTextButton.click(showInFullText);
-    goToNote();
 
-    return false;
+$showRecentNotesButton.click(showRecentNotes);
-});
+
+$dialog.bind('keydown', 'ctrl+return', showInFullText);
 
 export default {
     showDialog

src/public/javascripts/dialogs/labels.js

@@ -1,223 +0,0 @@
-import noteDetailService from '../services/note_detail.js';
-import utils from '../services/utils.js';
-import server from '../services/server.js';
-import infoService from "../services/info.js";
-
-const $dialog = $("#labels-dialog");
-const $saveLabelsButton = $("#save-labels-button");
-const $labelsBody = $('#labels-table tbody');
-
-const labelsModel = new LabelsModel();
-let labelNames = [];
-
-function LabelsModel() {
-    const self = this;
-
-    this.labels = ko.observableArray();
-
-    this.updateLabelPositions = function() {
-        let position = 0;
-
-        // we need to update positions by searching in the DOM, because order of the
-        // labels in the viewmodel (self.labels()) stays the same
-        $labelsBody.find('input[name="position"]').each(function() {
-            const label = self.getTargetLabel(this);
-
-            label().position = position++;
-        });
-    };
-
-    this.loadLabels = async function() {
-        const noteId = noteDetailService.getCurrentNoteId();
-
-        const labels = await server.get('notes/' + noteId + '/labels');
-
-        self.labels(labels.map(ko.observable));
-
-        addLastEmptyRow();
-
-        labelNames = await server.get('labels/names');
-
-        // label might not be rendered immediatelly so could not focus
-        setTimeout(() => $(".label-name:last").focus(), 100);
-
-        $labelsBody.sortable({
-            handle: '.handle',
-            containment: $labelsBody,
-            update: this.updateLabelPositions
-        });
-    };
-
-    this.deleteLabel = function(data, event) {
-        const label = self.getTargetLabel(event.target);
-        const labelData = label();
-
-        if (labelData) {
-            labelData.isDeleted = 1;
-
-            label(labelData);
-
-            addLastEmptyRow();
-        }
-    };
-
-    function isValid() {
-        for (let labels = self.labels(), i = 0; i < labels.length; i++) {
-            if (self.isEmptyName(i)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    this.save = async function() {
-        // we need to defocus from input (in case of enter-triggered save) because value is updated
-        // on blur event (because of conflict with jQuery UI Autocomplete). Without this, input would
-        // stay in focus, blur wouldn't be triggered and change wouldn't be updated in the viewmodel.
-        $saveLabelsButton.focus();
-
-        if (!isValid()) {
-            alert("Please fix all validation errors and try saving again.");
-            return;
-        }
-
-        self.updateLabelPositions();
-
-        const noteId = noteDetailService.getCurrentNoteId();
-
-        const labelsToSave = self.labels()
-            .map(label => label())
-            .filter(label => label.labelId !== "" || label.name !== "");
-
-        const labels = await server.put('notes/' + noteId + '/labels', labelsToSave);
-
-        self.labels(labels.map(ko.observable));
-
-        addLastEmptyRow();
-
-        infoService.showMessage("Labels have been saved.");
-
-        noteDetailService.loadLabelList();
-    };
-
-    function addLastEmptyRow() {
-        const labels = self.labels().filter(attr => attr().isDeleted === 0);
-        const last = labels.length === 0 ? null : labels[labels.length - 1]();
-
-        if (!last || last.name.trim() !== "" || last.value !== "") {
-            self.labels.push(ko.observable({
-                labelId: '',
-                name: '',
-                value: '',
-                isDeleted: 0,
-                position: 0
-            }));
-        }
-    }
-
-    this.labelChanged = function (data, event) {
-        addLastEmptyRow();
-
-        const label = self.getTargetLabel(event.target);
-
-        label.valueHasMutated();
-    };
-
-    this.isNotUnique = function(index) {
-        const cur = self.labels()[index]();
-
-        if (cur.name.trim() === "") {
-            return false;
-        }
-
-        for (let labels = self.labels(), i = 0; i < labels.length; i++) {
-            const label = labels[i]();
-
-            if (index !== i && cur.name === label.name) {
-                return true;
-            }
-        }
-
-        return false;
-    };
-
-    this.isEmptyName = function(index) {
-        const cur = self.labels()[index]();
-
-        return cur.name.trim() === "" && (cur.labelId !== "" || cur.value !== "");
-    };
-
-    this.getTargetLabel = function(target) {
-        const context = ko.contextFor(target);
-        const index = context.$index();
-
-        return self.labels()[index];
-    }
-}
-
-async function showDialog() {
-    glob.activeDialog = $dialog;
-
-    await labelsModel.loadLabels();
-
-    $dialog.dialog({
-        modal: true,
-        width: 800,
-        height: 500
-    });
-}
-
-ko.applyBindings(labelsModel, document.getElementById('labels-dialog'));
-
-$(document).on('focus', '.label-name', function (e) {
-    if (!$(this).hasClass("ui-autocomplete-input")) {
-        $(this).autocomplete({
-            // shouldn't be required and autocomplete should just accept array of strings, but that fails
-            // because we have overriden filter() function in autocomplete.js
-            source: labelNames.map(label => {
-                return {
-                    label: label,
-                    value: label
-                }
-            }),
-            minLength: 0
-        });
-    }
-
-    $(this).autocomplete("search", $(this).val());
-});
-
-$(document).on('focus', '.label-value', async function (e) {
-    if (!$(this).hasClass("ui-autocomplete-input")) {
-        const labelName = $(this).parent().parent().find('.label-name').val();
-
-        if (labelName.trim() === "") {
-            return;
-        }
-
-        const labelValues = await server.get('labels/values/' + encodeURIComponent(labelName));
-
-        if (labelValues.length === 0) {
-            return;
-        }
-
-        $(this).autocomplete({
-            // shouldn't be required and autocomplete should just accept array of strings, but that fails
-            // because we have overriden filter() function in autocomplete.js
-            source: labelValues.map(label => {
-                return {
-                    label: label,
-                    value: label
-                }
-            }),
-            minLength: 0
-        });
-    }
-
-    $(this).autocomplete("search", $(this).val());
-});
-
-export default {
-    showDialog
-};

src/public/javascripts/dialogs/note_source.js

@@ -29,7 +29,7 @@ function formatNode(node, level) {
     const indentAfter  = new Array(level - 1).join('  ');
     let textNode;
 
-    for (const i = 0; i < node.children.length; i++) {
+    for (let i = 0; i < node.children.length; i++) {
         textNode = document.createTextNode('\n' + indentBefore);
         node.insertBefore(textNode, node.children[i]);
 

src/public/javascripts/dialogs/options.js

@@ -1,9 +1,10 @@
 "use strict";
 
 import protectedSessionHolder from '../services/protected_session_holder.js';
-import utils from '../services/utils.js';
 import server from '../services/server.js';
 import infoService from "../services/info.js";
+import zoomService from "../services/zoom.js";
+import utils from "../services/utils.js";
 
 const $dialog = $("#options-dialog");
 const $tabs = $("#options-tabs");
@@ -33,8 +34,8 @@ async function showDialog() {
     }
 }
 
-async function saveOptions(optionName, optionValue) {
+async function saveOptions(options) {
-    await server.put('options/' + encodeURIComponent(optionName) + '/' + encodeURIComponent(optionValue));
+    await server.put('options', options);
 
     infoService.showMessage("Options change have been saved.");
 }
@@ -44,6 +45,41 @@ export default {
     saveOptions
 };
 
+addTabHandler((function() {
+    const $themeSelect = $("#theme-select");
+    const $zoomFactorSelect = $("#zoom-factor-select");
+    const $html = $("html");
+
+    function optionsLoaded(options) {
+        $themeSelect.val(options.theme);
+
+        if (utils.isElectron()) {
+            $zoomFactorSelect.val(options.zoomFactor);
+        }
+        else {
+            $zoomFactorSelect.prop('disabled', true);
+        }
+    }
+
+    $themeSelect.change(function() {
+        const newTheme = $(this).val();
+
+        $html.attr("class", "theme-" + newTheme);
+
+        server.put('options/theme/' + newTheme);
+    });
+
+    $zoomFactorSelect.change(function() {
+        const newZoomFactor = $(this).val();
+
+        zoomService.setZoomFactorAndSave(newZoomFactor);
+    });
+
+    return {
+        optionsLoaded
+    };
+})());
+
 addTabHandler((function() {
     const $form = $("#change-password-form");
     const $oldPassword = $("#old-password");
@@ -93,16 +129,15 @@ addTabHandler((function() {
 addTabHandler((function() {
     const $form = $("#protected-session-timeout-form");
     const $protectedSessionTimeout = $("#protected-session-timeout-in-seconds");
-    const optionName = 'protectedSessionTimeout';
 
     function optionsLoaded(options) {
-        $protectedSessionTimeout.val(options[optionName]);
+        $protectedSessionTimeout.val(options['protectedSessionTimeout']);
     }
 
     $form.submit(() => {
         const protectedSessionTimeout = $protectedSessionTimeout.val();
 
-        saveOptions(optionName, protectedSessionTimeout).then(() => {
+        saveOptions({ 'protectedSessionTimeout': protectedSessionTimeout }).then(() => {
             protectedSessionHolder.setProtectedSessionTimeout(protectedSessionTimeout);
         });
 
@@ -117,14 +152,13 @@ addTabHandler((function() {
 addTabHandler((function () {
     const $form = $("#note-revision-snapshot-time-interval-form");
     const $timeInterval = $("#note-revision-snapshot-time-interval-in-seconds");
-    const optionName = 'noteRevisionSnapshotTimeInterval';
 
     function optionsLoaded(options) {
-        $timeInterval.val(options[optionName]);
+        $timeInterval.val(options['noteRevisionSnapshotTimeInterval']);
     }
 
     $form.submit(() => {
-        saveOptions(optionName, $timeInterval.val());
+        saveOptions({ 'noteRevisionSnapshotTimeInterval': $timeInterval.val() });
 
         return false;
     });
@@ -137,6 +171,7 @@ addTabHandler((function () {
 addTabHandler((async function () {
     const $appVersion = $("#app-version");
     const $dbVersion = $("#db-version");
+    const $syncVersion = $("#sync-version");
     const $buildDate = $("#build-date");
     const $buildRevision = $("#build-revision");
 
@@ -144,6 +179,7 @@ addTabHandler((async function () {
 
     $appVersion.html(appInfo.appVersion);
     $dbVersion.html(appInfo.dbVersion);
+    $syncVersion.html(appInfo.syncVersion);
     $buildDate.html(appInfo.buildDate);
     $buildRevision.html(appInfo.buildRevision);
     $buildRevision.attr('href', 'https://github.com/zadam/trilium/commit/' + appInfo.buildRevision);
@@ -151,6 +187,57 @@ addTabHandler((async function () {
     return {};
 })());
 
+addTabHandler((function() {
+    const $form = $("#sync-setup-form");
+    const $syncServerHost = $("#sync-server-host");
+    const $syncServerTimeout = $("#sync-server-timeout");
+    const $syncProxy = $("#sync-proxy");
+    const $testSyncButton = $("#test-sync-button");
+    const $syncToServerButton = $("#sync-to-server-button");
+
+    function optionsLoaded(options) {
+        $syncServerHost.val(options['syncServerHost']);
+        $syncServerTimeout.val(options['syncServerTimeout']);
+        $syncProxy.val(options['syncProxy']);
+    }
+
+    $form.submit(() => {
+        saveOptions({
+            'syncServerHost': $syncServerHost.val(),
+            'syncServerTimeout': $syncServerTimeout.val(),
+            'syncProxy': $syncProxy.val()
+        });
+
+        return false;
+    });
+
+    $testSyncButton.click(async () => {
+        const result = await server.post('sync/test');
+
+        if (result.connection === "Success") {
+            infoService.showMessage("Sync server handshake has been successful");
+        }
+        else {
+            infoService.showError("Sync server handshake failed, error: " + result.error);
+        }
+    });
+
+    $syncToServerButton.click(async () => {
+        const resp = await server.post("setup/sync-to-server");
+
+        if (resp.success) {
+            infoService.showMessage("Sync has been established to the server instance. It will take some time to finish.");
+        }
+        else {
+            infoService.showError('Sync setup failed: ' + resp.error);
+        }
+    });
+
+    return {
+        optionsLoaded
+    };
+})());
+
 addTabHandler((async function () {
     const $forceFullSyncButton = $("#force-full-sync-button");
     const $fillSyncRowsButton = $("#fill-sync-rows-button");

src/public/javascripts/dialogs/recent_notes.js

@@ -1,113 +0,0 @@
-import treeService from '../services/tree.js';
-import messagingService from '../services/messaging.js';
-import server from '../services/server.js';
-import utils from "../services/utils.js";
-import treeUtils from "../services/tree_utils.js";
-
-const $dialog = $("#recent-notes-dialog");
-const $searchInput = $('#recent-notes-search-input');
-
-// list of recent note paths
-let list = [];
-
-async function reload() {
-    const result = await server.get('recent-notes');
-
-    list = result.map(r => r.notePath);
-}
-
-function addRecentNote(branchId, notePath) {
-    setTimeout(async () => {
-        // we include the note into recent list only if the user stayed on the note at least 5 seconds
-        if (notePath && notePath === treeService.getCurrentNotePath()) {
-            const result = await server.put('recent-notes/' + branchId + '/' + encodeURIComponent(notePath));
-
-            list = result.map(r => r.notePath);
-        }
-    }, 1500);
-}
-
-async function getNoteTitle(notePath) {
-    let noteTitle;
-
-    try {
-        noteTitle = await treeUtils.getNotePathTitle(notePath);
-    }
-    catch (e) {
-        noteTitle = "[error - can't find note title]";
-
-        messagingService.logError("Could not find title for notePath=" + notePath + ", stack=" + e.stack);
-    }
-
-    return noteTitle;
-}
-
-async function showDialog() {
-    glob.activeDialog = $dialog;
-
-    $dialog.dialog({
-        modal: true,
-        width: 800,
-        height: 100,
-        position: { my: "center top+100", at: "top", of: window }
-    });
-
-    $searchInput.val('');
-
-    // remove the current note
-    const recNotes = list.filter(note => note !== treeService.getCurrentNotePath());
-    const items = [];
-
-    for (const notePath of recNotes) {
-        items.push({
-            label: await getNoteTitle(notePath),
-            value: notePath
-        });
-    }
-
-    $searchInput.autocomplete({
-        source: items,
-        minLength: 0,
-        autoFocus: true,
-        select: function (event, ui) {
-            treeService.activateNode(ui.item.value);
-
-            $searchInput.autocomplete('destroy');
-            $dialog.dialog('close');
-        },
-        focus: function (event, ui) {
-            event.preventDefault();
-        },
-        close: function (event, ui) {
-            if (event.keyCode === 27) { // escape closes dialog
-                $searchInput.autocomplete('destroy');
-                $dialog.dialog('close');
-            }
-            else {
-                // keep autocomplete open
-                // we're kind of abusing autocomplete to work in a way which it's not designed for
-                $searchInput.autocomplete("search", "");
-            }
-        },
-        create: () => $searchInput.autocomplete("search", ""),
-        classes: {
-            "ui-autocomplete": "recent-notes-autocomplete"
-        }
-    });
-}
-
-setTimeout(reload, 100);
-
-messagingService.subscribeToMessages(syncData => {
-    if (syncData.some(sync => sync.entityName === 'recent_notes')) {
-        console.log(utils.now(), "Reloading recent notes because of background changes");
-
-        reload();
-    }
-});
-
-export default {
-    showDialog,
-    addRecentNote,
-    reload
-};

src/public/javascripts/entities/note_short.js

@@ -6,7 +6,8 @@ class NoteShort {
         this.isProtected = row.isProtected;
         this.type = row.type;
         this.mime = row.mime;
-        this.hideInAutocomplete = row.hideInAutocomplete;
+        this.archived = row.archived;
+        this.cssClass = row.cssClass;
     }
 
     isJson() {
@@ -59,7 +60,7 @@ class NoteShort {
     get dto() {
         const dto = Object.assign({}, this);
         delete dto.treeCache;
-        delete dto.hideInAutocomplete;
+        delete dto.archived;
 
         return dto;
     }

src/public/javascripts/migration.js

@@ -1,46 +0,0 @@
-import server from './services/server.js';
-
-$(document).ready(async () => {
-    const {appDbVersion, dbVersion} = await server.get('migration');
-
-    console.log("HI", {appDbVersion, dbVersion});
-
-    if (appDbVersion === dbVersion) {
-        $("#up-to-date").show();
-    }
-    else {
-        $("#need-to-migrate").show();
-
-        $("#app-db-version").html(appDbVersion);
-        $("#db-version").html(dbVersion);
-    }
-});
-
-$("#run-migration").click(async () => {
-    $("#run-migration").prop("disabled", true);
-
-    $("#migration-result").show();
-
-    const result = await server.post('migration');
-
-    for (const migration of result.migrations) {
-        const row = $('<tr>')
-            .append($('<td>').html(migration.dbVersion))
-            .append($('<td>').html(migration.name))
-            .append($('<td>').html(migration.success ? 'Yes' : 'No'))
-            .append($('<td>').html(migration.success ? 'N/A' : migration.error));
-
-        if (!migration.success) {
-            row.addClass("danger");
-        }
-
-        $("#migration-table").append(row);
-    }
-});
-
-// copy of this shortcut to be able to debug migration problems
-$(document).bind('keydown', 'ctrl+shift+i', () => {
-    require('electron').remote.getCurrentWindow().toggleDevTools();
-
-    return false;
-});

src/public/javascripts/services/autocomplete.js

@@ -1,104 +0,0 @@
-import treeCache from "./tree_cache.js";
-import treeUtils from "./tree_utils.js";
-import protectedSessionHolder from './protected_session_holder.js';
-
-async function getAutocompleteItems(parentNoteId, notePath, titlePath) {
-    if (!parentNoteId) {
-        parentNoteId = 'root';
-    }
-
-    const parentNote = await treeCache.getNote(parentNoteId);
-    const childNotes = await parentNote.getChildNotes();
-
-    if (!childNotes.length) {
-        return [];
-    }
-
-    if (!notePath) {
-        notePath = '';
-    }
-
-    if (!titlePath) {
-        titlePath = '';
-    }
-
-    const autocompleteItems = [];
-
-    for (const childNote of childNotes) {
-        if (childNote.hideInAutocomplete) {
-            continue;
-        }
-
-        const childNotePath = (notePath ? (notePath + '/') : '') + childNote.noteId;
-        const childTitlePath = (titlePath ? (titlePath + ' / ') : '') + await treeUtils.getNoteTitle(childNote.noteId, parentNoteId);
-
-        if (!childNote.isProtected || protectedSessionHolder.isProtectedSessionAvailable()) {
-            autocompleteItems.push({
-                value: childTitlePath + ' (' + childNotePath + ')',
-                label: childTitlePath
-            });
-        }
-
-        const childItems = await getAutocompleteItems(childNote.noteId, childNotePath, childTitlePath);
-
-        for (const childItem of childItems) {
-            autocompleteItems.push(childItem);
-        }
-    }
-
-    if (parentNoteId === 'root') {
-        console.log(`Generated ${autocompleteItems.length} autocomplete items`);
-    }
-
-    return autocompleteItems;
-}
-
-// Overrides the default autocomplete filter function to search for matched on atleast 1 word in each of the input term's words
-$.ui.autocomplete.filter = (array, terms) => {
-    if (!terms) {
-        return array;
-    }
-
-    const startDate = new Date();
-
-    const results = [];
-    const tokens = terms.toLowerCase().split(" ");
-
-    for (const item of array) {
-        const lcLabel = item.label.toLowerCase();
-
-        const found = tokens.every(token => lcLabel.indexOf(token) !== -1);
-        if (!found) {
-            continue;
-        }
-
-        // this is not completely correct and might cause minor problems with note with names containing this " / "
-        const lastSegmentIndex = lcLabel.lastIndexOf(" / ");
-
-        if (lastSegmentIndex !== -1) {
-            const lastSegment = lcLabel.substr(lastSegmentIndex + 3);
-
-            // at least some token needs to be in the last segment (leaf note), otherwise this
-            // particular note is not that interesting (query is satisfied by parent note)
-            const foundInLastSegment = tokens.some(token => lastSegment.indexOf(token) !== -1);
-
-            if (!foundInLastSegment) {
-                continue;
-            }
-        }
-
-        results.push(item);
-
-        if (results.length > 100) {
-            break;
-        }
-    }
-
-    console.log("Search took " + (new Date().getTime() - startDate.getTime()) + "ms");
-
-    return results;
-};
-
-export default {
-    getAutocompleteItems
-};

src/public/javascripts/services/bootstrap.js

@@ -1,10 +1,9 @@
 import addLinkDialog from '../dialogs/add_link.js';
 import jumpToNoteDialog from '../dialogs/jump_to_note.js';
-import labelsDialog from '../dialogs/labels.js';
+import attributesDialog from '../dialogs/attributes.js';
 import noteRevisionsDialog from '../dialogs/note_revisions.js';
 import noteSourceDialog from '../dialogs/note_source.js';
 import recentChangesDialog from '../dialogs/recent_changes.js';
-import recentNotesDialog from '../dialogs/recent_notes.js';
 import optionsDialog from '../dialogs/options.js';
 import sqlConsoleDialog from '../dialogs/sql_console.js';
 
@@ -17,7 +16,7 @@ import messagingService from './messaging.js';
 import noteDetailService from './note_detail.js';
 import noteType from './note_type.js';
 import protected_session from './protected_session.js';
-import searchTreeService from './search_tree.js';
+import searchNotesService from './search_notes.js';
 import ScriptApi from './script_api.js';
 import ScriptContext from './script_context.js';
 import sync from './sync.js';
@@ -35,6 +34,9 @@ import libraryLoader from "./library_loader.js";
 // required for CKEditor image upload plugin
 window.glob.getCurrentNode = treeService.getCurrentNode;
 window.glob.getHeaders = server.getHeaders;
+window.glob.showAddLinkDialog = addLinkDialog.showDialog;
+// this is required by CKEditor when uploading images
+window.glob.noteChanged = noteDetailService.noteChanged;
 
 // required for ESLint plugin
 window.glob.getCurrentNote = noteDetailService.getCurrentNote;
@@ -46,7 +48,12 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
 
     let message = "Uncaught error: ";
 
-    if (string.indexOf("script error") > -1){
+    if (string.includes("Cannot read property 'defaultView' of undefined")) {
+        // ignore this specific error which is very common but we don't know where it comes from
+        // and it seems to be harmless
+        return true;
+    }
+    else if (string.includes("script error")) {
         message += 'No details available';
     }
     else {

src/public/javascripts/services/bundle.js

@@ -1,8 +1,14 @@
 import ScriptContext from "./script_context.js";
 import server from "./server.js";
 
-async function executeBundle(bundle) {
+async function getAndExecuteBundle(noteId, originEntity = null) {
-    const apiContext = ScriptContext(bundle.note, bundle.allNotes);
+    const bundle = await server.get('script/bundle/' + noteId);
+
+    await executeBundle(bundle, originEntity);
+}
+
+async function executeBundle(bundle, originEntity) {
+    const apiContext = ScriptContext(bundle.note, bundle.allNotes, originEntity);
 
     return await (function () {
         return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
@@ -17,7 +23,17 @@ async function executeStartupBundles() {
     }
 }
 
+async function executeRelationBundles(note, relationName) {
+    const bundlesToRun = await server.get("script/relation/" + note.noteId + "/" + relationName);
+
+    for (const bundle of bundlesToRun) {
+        await executeBundle(bundle, note);
+    }
+}
+
 export default {
     executeBundle,
-    executeStartupBundles
+    getAndExecuteBundle,
+    executeStartupBundles,
+    executeRelationBundles
 }

src/public/javascripts/services/context_menu.js

@@ -94,27 +94,34 @@ const contextMenuOptions = {
         {title: "Paste into <kbd>Ctrl+V</kbd>", cmd: "pasteInto", uiIcon: "ui-icon-clipboard"},
         {title: "Paste after", cmd: "pasteAfter", uiIcon: "ui-icon-clipboard"},
         {title: "----"},
-        {title: "Export branch", cmd: "exportBranch", uiIcon: " ui-icon-arrowthick-1-ne"},
+        {title: "Export branch", cmd: "exportBranch", uiIcon: " ui-icon-arrowthick-1-ne", children: [
-        {title: "Import into branch", cmd: "importBranch", uiIcon: "ui-icon-arrowthick-1-sw"},
+            {title: "Native&nbsp;Tar", cmd: "exportBranchToTar"},
+            {title: "OPML", cmd: "exportBranchToOpml"}
+        ]},
+        {title: "Import into branch (tar, opml)", cmd: "importBranch", uiIcon: "ui-icon-arrowthick-1-sw"},
         {title: "----"},
         {title: "Collapse branch <kbd>Alt+-</kbd>", cmd: "collapseBranch", uiIcon: "ui-icon-minus"},
         {title: "Force note sync", cmd: "forceNoteSync", uiIcon: "ui-icon-refresh"},
         {title: "Sort alphabetically <kbd>Alt+S</kbd>", cmd: "sortAlphabetically", uiIcon: " ui-icon-arrowthick-2-n-s"}
-
     ],
     beforeOpen: async (event, ui) => {
         const node = $.ui.fancytree.getNode(ui.target);
         const branch = await treeCache.getBranch(node.data.branchId);
         const note = await treeCache.getNote(node.data.noteId);
         const parentNote = await treeCache.getNote(branch.parentNoteId);
+        const isNotRoot = note.noteId !== 'root';
 
         // Modify menu entries depending on node status
-        $tree.contextmenu("enableEntry", "pasteAfter", clipboardIds.length > 0 && (!parentNote || parentNote.type !== 'search'));
+        $tree.contextmenu("enableEntry", "insertNoteHere", isNotRoot && parentNote.type !== 'search');
-        $tree.contextmenu("enableEntry", "pasteInto", clipboardIds.length > 0 && note.type !== 'search');
-        $tree.contextmenu("enableEntry", "insertNoteHere", !parentNote || parentNote.type !== 'search');
         $tree.contextmenu("enableEntry", "insertChildNote", note.type !== 'search');
+        $tree.contextmenu("enableEntry", "delete", isNotRoot && parentNote.type !== 'search');
+        $tree.contextmenu("enableEntry", "copy", isNotRoot);
+        $tree.contextmenu("enableEntry", "cut", isNotRoot);
+        $tree.contextmenu("enableEntry", "pasteAfter", clipboardIds.length > 0 && isNotRoot && parentNote.type !== 'search');
+        $tree.contextmenu("enableEntry", "pasteInto", clipboardIds.length > 0 && note.type !== 'search');
         $tree.contextmenu("enableEntry", "importBranch", note.type !== 'search');
         $tree.contextmenu("enableEntry", "exportBranch", note.type !== 'search');
+        $tree.contextmenu("enableEntry", "editBranchPrefix", isNotRoot && parentNote.type !== 'search');
 
         // Activate node on right-click
         node.setActive();
@@ -159,8 +166,11 @@ const contextMenuOptions = {
         else if (ui.cmd === "delete") {
             treeChangesService.deleteNodes(treeService.getSelectedNodes(true));
         }
-        else if (ui.cmd === "exportBranch") {
+        else if (ui.cmd === "exportBranchToTar") {
-            exportService.exportBranch(node.data.noteId);
+            exportService.exportBranch(node.data.noteId, 'tar');
+        }
+        else if (ui.cmd === "exportBranchToOpml") {
+            exportService.exportBranch(node.data.noteId, 'opml');
         }
         else if (ui.cmd === "importBranch") {
             exportService.importBranch(node.data.noteId);

src/public/javascripts/services/entrypoints.js

@@ -2,16 +2,17 @@ import utils from "./utils.js";
 import treeService from "./tree.js";
 import linkService from "./link.js";
 import fileService from "./file.js";
+import zoomService from "./zoom.js";
 import noteRevisionsDialog from "../dialogs/note_revisions.js";
 import optionsDialog from "../dialogs/options.js";
 import addLinkDialog from "../dialogs/add_link.js";
-import recentNotesDialog from "../dialogs/recent_notes.js";
 import jumpToNoteDialog from "../dialogs/jump_to_note.js";
 import noteSourceDialog from "../dialogs/note_source.js";
 import recentChangesDialog from "../dialogs/recent_changes.js";
 import sqlConsoleDialog from "../dialogs/sql_console.js";
-import searchTreeService from "./search_tree.js";
+import searchNotesService from "./search_notes.js";
-import labelsDialog from "../dialogs/labels.js";
+import attributesDialog from "../dialogs/attributes.js";
+import protectedSessionService from "./protected_session.js";
 
 function registerEntrypoints() {
     // hot keys are active also inside inputs and content editables
@@ -21,35 +22,44 @@ function registerEntrypoints() {
 
     utils.bindShortcut('ctrl+l', addLinkDialog.showDialog);
 
-    $("#jump-to-note-button").click(jumpToNoteDialog.showDialog);
+    $("#jump-to-note-dialog-button").click(jumpToNoteDialog.showDialog);
     utils.bindShortcut('ctrl+j', jumpToNoteDialog.showDialog);
 
     $("#show-note-revisions-button").click(noteRevisionsDialog.showCurrentNoteRevisions);
 
     $("#show-source-button").click(noteSourceDialog.showDialog);
-    utils.bindShortcut('ctrl+u', noteSourceDialog.showDialog);
 
     $("#recent-changes-button").click(recentChangesDialog.showDialog);
 
-    $("#recent-notes-button").click(recentNotesDialog.showDialog);
+    $("#protected-session-on").click(protectedSessionService.enterProtectedSession);
-    utils.bindShortcut('ctrl+e', recentNotesDialog.showDialog);
+    $("#protected-session-off").click(protectedSessionService.leaveProtectedSession);
 
-    $("#toggle-search-button").click(searchTreeService.toggleSearch);
+    $("#toggle-search-button").click(searchNotesService.toggleSearch);
-    utils.bindShortcut('ctrl+s', searchTreeService.toggleSearch);
+    utils.bindShortcut('ctrl+s', searchNotesService.toggleSearch);
 
-    $(".show-labels-button").click(labelsDialog.showDialog);
+    $(".show-attributes-button").click(attributesDialog.showDialog);
-    utils.bindShortcut('alt+l', labelsDialog.showDialog);
+    utils.bindShortcut('alt+a', attributesDialog.showDialog);
 
     $("#options-button").click(optionsDialog.showDialog);
 
     utils.bindShortcut('alt+o', sqlConsoleDialog.showDialog);
 
     if (utils.isElectron()) {
+        $("#history-navigation").show();
+        $("#history-back-button").click(window.history.back);
+        $("#history-forward-button").click(window.history.forward);
+
         utils.bindShortcut('alt+left', window.history.back);
         utils.bindShortcut('alt+right', window.history.forward);
     }
 
-    utils.bindShortcut('alt+m', e => $(".hide-toggle").toggleClass("suppressed"));
+    utils.bindShortcut('alt+m', e => {
+        $(".hide-toggle").toggle();
+
+        // when hiding switch display to block, otherwise grid still tries to display columns which shows
+        // left empty column
+        $("#container").css("display", $("#container").css("display") === "grid" ? "block" : "grid");
+    });
 
     // hide (toggle) everything except for the note content for distraction free writing
     utils.bindShortcut('alt+t', e => {
@@ -101,27 +111,10 @@ function registerEntrypoints() {
         $("#note-detail-text").focus();
     });
 
-    $(document).bind('keydown', 'ctrl+-', () => {
+    if (utils.isElectron()) {
-        if (utils.isElectron()) {
+        $(document).bind('keydown', 'ctrl+-', zoomService.decreaseZoomFactor);
-            const webFrame = require('electron').webFrame;
+        $(document).bind('keydown', 'ctrl+=', zoomService.increaseZoomFactor);
-
+    }
-            if (webFrame.getZoomFactor() > 0.2) {
-                webFrame.setZoomFactor(webFrame.getZoomFactor() - 0.1);
-            }
-
-            return false;
-        }
-    });
-
-    $(document).bind('keydown', 'ctrl+=', () => {
-        if (utils.isElectron()) {
-            const webFrame = require('electron').webFrame;
-
-            webFrame.setZoomFactor(webFrame.getZoomFactor() + 0.1);
-
-            return false;
-        }
-    });
 
     $("#note-title").bind('keydown', 'return', () => $("#note-detail-text").focus());
 

src/public/javascripts/services/export.js

@@ -3,9 +3,9 @@ import protectedSessionHolder from './protected_session_holder.js';
 import utils from './utils.js';
 import server from './server.js';
 
-function exportBranch(noteId) {
+function exportBranch(noteId, format) {
-    const url = utils.getHost() + "/api/notes/" + noteId + "/export?protectedSessionId="
+    const url = utils.getHost() + "/api/notes/" + noteId + "/export/" + format +
-        + encodeURIComponent(protectedSessionHolder.getProtectedSessionId());
+        "?protectedSessionId=" + encodeURIComponent(protectedSessionHolder.getProtectedSessionId());
 
     utils.download(url);
 }
@@ -29,7 +29,7 @@ $("#import-upload").change(async function() {
         type: 'POST',
         contentType: false, // NEEDED, DON'T OMIT THIS
         processData: false, // NEEDED, DON'T OMIT THIS
-    });
+    }).fail((xhr, status, error) => alert('Import error: ' + xhr.responseText));
 
     await treeService.reload();
 });

src/public/javascripts/services/link.js

@@ -3,7 +3,7 @@ import noteDetailText from './note_detail_text.js';
 import treeUtils from './tree_utils.js';
 
 function getNotePathFromLink(url) {
-    const notePathMatch = /#([A-Za-z0-9/]+)$/.exec(url);
+    const notePathMatch = /#root([A-Za-z0-9/]*)$/.exec(url);
 
     if (notePathMatch === null) {
         return null;
@@ -13,8 +13,8 @@ function getNotePathFromLink(url) {
     }
 }
 
-function getNodePathFromLabel(label) {
+function getNotePathFromLabel(label) {
-    const notePathMatch = / \(([A-Za-z0-9/]+)\)/.exec(label);
+    const notePathMatch = / \(([#A-Za-z0-9/]+)\)/.exec(label);
 
     if (notePathMatch !== null) {
         return notePathMatch[1];
@@ -23,7 +23,7 @@ function getNodePathFromLabel(label) {
     return null;
 }
 
-async function createNoteLink(notePath, noteTitle) {
+async function createNoteLink(notePath, noteTitle = null) {
     if (!noteTitle) {
         const noteId = treeUtils.getNoteIdFromNotePath(notePath);
 
@@ -90,6 +90,18 @@ function addTextToEditor(text) {
     doc.enqueueChanges(() => editor.data.insertText(text), doc.selection);
 }
 
+ko.bindingHandlers.noteLink = {
+    init: async function(element, valueAccessor, allBindings, viewModel, bindingContext) {
+        const noteId = ko.unwrap(valueAccessor());
+
+        if (noteId) {
+            const link = await createNoteLink(noteId);
+
+            $(element).append(link);
+        }
+    }
+};
+
 // when click on link popup, in case of internal link, just go the the referenced note instead of default behavior
 // of opening the link in new window/tab
 $(document).on('click', "a[action='note']", goToLink);
@@ -97,7 +109,7 @@ $(document).on('click', 'div.popover-content a, div.ui-tooltip-content a', goToL
 $(document).on('dblclick', '#note-detail-text a', goToLink);
 
 export default {
-    getNodePathFromLabel,
+    getNotePathFromLabel,
     getNotePathFromLink,
     createNoteLink,
     addLinkToEditor,

src/public/javascripts/services/messaging.js

@@ -1,8 +1,9 @@
 import utils from './utils.js';
 import infoService from "./info.js";
 
-const $changesToPushCount = $("#changes-to-push-count");
+const $outstandingSyncsCount = $("#outstanding-syncs-count");
 
+const syncMessageHandlers = [];
 const messageHandlers = [];
 
 let ws;
@@ -25,9 +26,17 @@ function subscribeToMessages(messageHandler) {
     messageHandlers.push(messageHandler);
 }
 
+function subscribeToSyncMessages(messageHandler) {
+    syncMessageHandlers.push(messageHandler);
+}
+
 function handleMessage(event) {
     const message = JSON.parse(event.data);
 
+    for (const messageHandler of messageHandlers) {
+        messageHandler(message);
+    }
+
     if (message.type === 'sync') {
         lastPingTs = new Date().getTime();
 
@@ -39,11 +48,11 @@ function handleMessage(event) {
 
         const syncData = message.data.filter(sync => sync.sourceId !== glob.sourceId);
 
-        for (const messageHandler of messageHandlers) {
+        for (const syncMessageHandler of syncMessageHandlers) {
-            messageHandler(syncData);
+            syncMessageHandler(syncData);
         }
 
-        $changesToPushCount.html(message.changesToPushCount);
+        $outstandingSyncsCount.html(message.outstandingSyncs);
     }
     else if (message.type === 'sync-hash-check-failed') {
         infoService.showError("Sync check failed!", 60000);
@@ -73,26 +82,10 @@ setTimeout(() => {
 
     lastSyncId = glob.maxSyncIdAtLoad;
     lastPingTs = new Date().getTime();
-    let connectionBrokenNotification = null;
 
     setInterval(async () => {
         if (new Date().getTime() - lastPingTs > 30000) {
-            if (!connectionBrokenNotification) {
+            console.log("Lost connection to server");
-                connectionBrokenNotification = $.notify({
-                    // options
-                    message: "Lost connection to server"
-                },{
-                    // options
-                    type: 'danger',
-                    delay: 100000000 // keep it until we explicitly close it
-                });
-            }
-        }
-        else if (connectionBrokenNotification) {
-            await connectionBrokenNotification.close();
-            connectionBrokenNotification = null;
-
-            infoService.showMessage("Re-connected to server");
         }
 
         ws.send(JSON.stringify({
@@ -104,5 +97,6 @@ setTimeout(() => {
 
 export default {
     logError,
-    subscribeToMessages
+    subscribeToMessages,
+    subscribeToSyncMessages
 };

src/public/javascripts/services/note_autocomplete.js

@@ -0,0 +1,54 @@
+import server from "./server.js";
+
+async function initNoteAutocomplete($el) {
+    if (!$el.hasClass("ui-autocomplete-input")) {
+        const $showRecentNotesButton = $("<span>")
+            .addClass("input-group-addon show-recent-notes-button")
+            .prop("title", "Show recent notes");
+
+        $el.after($showRecentNotesButton);
+
+        $showRecentNotesButton.click(() => $el.autocomplete("search", ""));
+
+        await $el.autocomplete({
+            appendTo: $el.parent().parent(),
+            source: async function (request, response) {
+                const result = await server.get('autocomplete?query=' + encodeURIComponent(request.term));
+
+                if (result.length > 0) {
+                    response(result.map(row => {
+                        return {
+                            label: row.label,
+                            value: row.label + ' (' + row.value + ')'
+                        }
+                    }));
+                }
+                else {
+                    response([{
+                        label: "No results",
+                        value: "No results"
+                    }]);
+                }
+            },
+            minLength: 0,
+            change: function (event, ui) {
+                $el.trigger("change");
+            },
+            select: function (event, ui) {
+                if (ui.item.value === 'No results') {
+                    return false;
+                }
+            }
+        });
+    }
+}
+
+ko.bindingHandlers.noteAutocomplete = {
+    init: function(element, valueAccessor, allBindings, viewModel, bindingContext) {
+        initNoteAutocomplete($(element));
+    }
+};
+
+export default {
+    initNoteAutocomplete
+}

src/public/javascripts/services/note_detail.js

@@ -7,6 +7,7 @@ import utils from './utils.js';
 import server from './server.js';
 import messagingService from "./messaging.js";
 import infoService from "./info.js";
+import linkService from "./link.js";
 import treeCache from "./tree_cache.js";
 import NoteFull from "../entities/note_full.js";
 import noteDetailCode from './note_detail_code.js';
@@ -14,6 +15,8 @@ import noteDetailText from './note_detail_text.js';
 import noteDetailFile from './note_detail_file.js';
 import noteDetailSearch from './note_detail_search.js';
 import noteDetailRender from './note_detail_render.js';
+import bundleService from "./bundle.js";
+import noteAutocompleteService from "./note_autocomplete.js";
 
 const $noteTitle = $("#note-title");
 
@@ -22,10 +25,13 @@ const $noteDetailComponents = $(".note-detail-component");
 const $protectButton = $("#protect-button");
 const $unprotectButton = $("#unprotect-button");
 const $noteDetailWrapper = $("#note-detail-wrapper");
+const $noteDetailComponentWrapper = $("#note-detail-component-wrapper");
 const $noteIdDisplay = $("#note-id-display");
-const $labelList = $("#label-list");
+const $attributeList = $("#attribute-list");
-const $labelListInner = $("#label-list-inner");
+const $attributeListInner = $("#attribute-list-inner");
 const $childrenOverview = $("#children-overview");
+const $scriptArea = $("#note-detail-script-area");
+const $promotedAttributesContainer = $("#note-detail-promoted-attributes");
 
 let currentNote = null;
 
@@ -116,9 +122,9 @@ async function saveNoteIfChanged() {
 function setNoteBackgroundIfProtected(note) {
     const isProtected = !!note.isProtected;
 
-    $noteDetailWrapper.toggleClass("protected", isProtected);
+    $noteDetailComponentWrapper.toggleClass("protected", isProtected);
-    $protectButton.toggle(!isProtected);
+    $protectButton.toggleClass("active", isProtected);
-    $unprotectButton.toggle(isProtected);
+    $unprotectButton.toggleClass("active", !isProtected);
 }
 
 let isNewNoteCreated = false;
@@ -150,6 +156,8 @@ async function loadNoteDetail(noteId) {
 
     $noteIdDisplay.html(noteId);
 
+    setNoteBackgroundIfProtected(currentNote);
+
     await handleProtectedSession();
 
     $noteDetailWrapper.show();
@@ -170,15 +178,18 @@ async function loadNoteDetail(noteId) {
         noteChangeDisabled = false;
     }
 
-    setNoteBackgroundIfProtected(currentNote);
     treeService.setBranchBackgroundBasedOnProtectedStatus(noteId);
 
     // after loading new note make sure editor is scrolled to the top
     $noteDetailWrapper.scrollTop(0);
 
-    const labels = await loadLabelList();
+    $scriptArea.html('');
 
-    const hideChildrenOverview = labels.some(label => label.name === 'hideChildrenOverview');
+    await bundleService.executeRelationBundles(getCurrentNote(), 'runOnNoteView');
+
+    const attributes = await loadAttributes();
+
+    const hideChildrenOverview = attributes.some(attr => attr.type === 'label' && attr.name === 'hideChildrenOverview');
     await showChildrenOverview(hideChildrenOverview);
 }
 
@@ -207,25 +218,207 @@ async function showChildrenOverview(hideChildrenOverview) {
     $childrenOverview.show();
 }
 
-async function loadLabelList() {
+async function loadAttributes() {
+    $promotedAttributesContainer.empty();
+    $attributeList.hide();
+
     const noteId = getCurrentNoteId();
 
-    const labels = await server.get('notes/' + noteId + '/labels');
+    const attributes = await server.get('notes/' + noteId + '/attributes');
 
-    $labelListInner.html('');
+    const promoted = attributes.filter(attr => (attr.type === 'label-definition' || attr.type === 'relation-definition') && attr.value.isPromoted);
 
-    if (labels.length > 0) {
+    let idx = 1;
-        for (const label of labels) {
+
-            $labelListInner.append(utils.formatLabel(label) + " ");
+    async function createRow(definitionAttr, valueAttr) {
+        const definition = definitionAttr.value;
+        const inputId = "promoted-input-" + idx;
+        const $tr = $("<tr>");
+        const $labelCell = $("<th>").append(valueAttr.name);
+        const $input = $("<input>")
+            .prop("id", inputId)
+            .prop("tabindex", definitionAttr.position)
+            .prop("attribute-id", valueAttr.isOwned ? valueAttr.attributeId : '') // if not owned, we'll force creation of a new attribute instead of updating the inherited one
+            .prop("attribute-type", valueAttr.type)
+            .prop("attribute-name", valueAttr.name)
+            .prop("value", valueAttr.value)
+            .addClass("form-control")
+            .addClass("promoted-attribute-input");
+
+        idx++;
+
+        const $inputCell = $("<td>").append($("<div>").addClass("input-group").append($input));
+
+        const $actionCell = $("<td>");
+        const $multiplicityCell = $("<td>");
+
+        $tr
+            .append($labelCell)
+            .append($inputCell)
+            .append($actionCell)
+            .append($multiplicityCell);
+
+        if (valueAttr.type === 'label') {
+            if (definition.labelType === 'text') {
+                $input.prop("type", "text");
+
+                // no need to await for this, can be done asynchronously
+                server.get('attributes/values/' + encodeURIComponent(valueAttr.name)).then(attributeValues => {
+                    if (attributeValues.length === 0) {
+                        return;
+                    }
+
+                    $input.autocomplete({
+                        // shouldn't be required and autocomplete should just accept array of strings, but that fails
+                        // because we have overriden filter() function in autocomplete.js
+                        source: attributeValues.map(attribute => {
+                            return {
+                                attribute: attribute,
+                                value: attribute
+                            }
+                        }),
+                        minLength: 0
+                    });
+
+                    $input.focus(() => $input.autocomplete("search", ""));
+                });
+            }
+            else if (definition.labelType === 'number') {
+                $input.prop("type", "number");
+            }
+            else if (definition.labelType === 'boolean') {
+                $input.prop("type", "checkbox");
+
+                if (valueAttr.value === "true") {
+                    $input.prop("checked", "checked");
+                }
+            }
+            else if (definition.labelType === 'date') {
+                $input.prop("type", "text");
+
+                $input.datepicker({
+                    changeMonth: true,
+                    changeYear: true,
+                    dateFormat: "yy-mm-dd"
+                });
+
+                const $todayButton = $("<button>").addClass("btn btn-small").text("Today").click(() => {
+                    $input.val(utils.formatDateISO(new Date()));
+                    $input.trigger("change");
+                });
+
+                $actionCell.append($todayButton);
+            }
+            else {
+                messagingService.logError("Unknown labelType=" + definitionAttr.labelType);
+            }
+        }
+        else if (valueAttr.type === 'relation') {
+            if (valueAttr.value) {
+                $input.val((await treeUtils.getNoteTitle(valueAttr.value) + " (" + valueAttr.value + ")"));
+            }
+
+            // no need to wait for this
+            noteAutocompleteService.initNoteAutocomplete($input);
+        }
+        else {
+            messagingService.logError("Unknown attribute type=" + valueAttr.type);
+            return;
         }
 
-        $labelList.show();
+        if (definition.multiplicityType === "multivalue") {
-    }
+            const addButton = $("<span>")
-    else {
+                .addClass("glyphicon glyphicon-plus pointer")
-        $labelList.hide();
+                .prop("title", "Add new attribute")
+                .click(async () => {
+                const $new = await createRow(definitionAttr, {
+                    attributeId: "",
+                    type: valueAttr.type,
+                    name: definitionAttr.name,
+                    value: ""
+                });
+
+                $tr.after($new);
+
+                $new.find('input').focus();
+            });
+
+            const removeButton = $("<span>")
+                .addClass("glyphicon glyphicon-trash pointer")
+                .prop("title", "Remove this attribute")
+                .click(async () => {
+                if (valueAttr.attributeId) {
+                    await server.remove("notes/" + noteId + "/attributes/" + valueAttr.attributeId);
+                }
+
+                $tr.remove();
+            });
+
+            $multiplicityCell.append(addButton).append(" &nbsp; ").append(removeButton);
+        }
+
+        return $tr;
     }
 
-    return labels;
+    if (promoted.length > 0) {
+        const $tbody = $("<tbody>");
+
+        for (const definitionAttr of promoted) {
+            const definitionType = definitionAttr.type;
+            const valueType = definitionType.substr(0, definitionType.length - 11);
+
+            let valueAttrs = attributes.filter(el => el.name === definitionAttr.name && el.type === valueType);
+
+            if (valueAttrs.length === 0) {
+                valueAttrs.push({
+                    attributeId: "",
+                    type: valueType,
+                    name: definitionAttr.name,
+                    value: ""
+                });
+            }
+
+            if (definitionAttr.value.multiplicityType === 'singlevalue') {
+                valueAttrs = valueAttrs.slice(0, 1);
+            }
+
+            for (const valueAttr of valueAttrs) {
+                const $tr = await createRow(definitionAttr, valueAttr);
+
+                $tbody.append($tr);
+            }
+        }
+
+        // we replace the whole content in one step so there can't be any race conditions
+        // (previously we saw promoted attributes doubling)
+        $promotedAttributesContainer.empty().append($tbody);
+    }
+    else {
+        $attributeListInner.html('');
+
+        if (attributes.length > 0) {
+            for (const attribute of attributes) {
+                if (attribute.type === 'label') {
+                    $attributeListInner.append(utils.formatLabel(attribute) + " ");
+                }
+                else if (attribute.type === 'relation') {
+                    $attributeListInner.append(attribute.name + "=");
+                    $attributeListInner.append(await linkService.createNoteLink(attribute.value));
+                    $attributeListInner.append(" ");
+                }
+                else if (attribute.type === 'label-definition' || attribute.type === 'relation-definition') {
+                    $attributeListInner.append(attribute.name + " definition ");
+                }
+                else {
+                    messagingService.logError("Unknown attr type: " + attribute.type);
+                }
+            }
+
+            $attributeList.show();
+        }
+    }
+
+    return attributes;
 }
 
 async function loadNote(noteId) {
@@ -240,7 +433,7 @@ function focus() {
     getComponent(note.type).focus();
 }
 
-messagingService.subscribeToMessages(syncData => {
+messagingService.subscribeToSyncMessages(syncData => {
     if (syncData.some(sync => sync.entityName === 'notes' && sync.entityId === getCurrentNoteId())) {
         infoService.showMessage('Reloading note because of background changes');
 
@@ -248,6 +441,35 @@ messagingService.subscribeToMessages(syncData => {
     }
 });
 
+$promotedAttributesContainer.on('change', '.promoted-attribute-input', async event => {
+    const $attr = $(event.target);
+
+    let value;
+
+    if ($attr.prop("type") === "checkbox") {
+        value = $attr.is(':checked') ? "true" : "false";
+    }
+    else if ($attr.prop("attribute-type") === "relation") {
+        if ($attr.val()) {
+            value = treeUtils.getNoteIdFromNotePath(linkService.getNotePathFromLabel($attr.val()));
+        }
+    }
+    else {
+        value = $attr.val();
+    }
+
+    const result = await server.put("notes/" + getCurrentNoteId() + "/attribute", {
+        attributeId: $attr.prop("attribute-id"),
+        type: $attr.prop("attribute-type"),
+        name: $attr.prop("attribute-name"),
+        value: value
+    });
+
+    $attr.prop("attribute-id", result.attributeId);
+
+    infoService.showMessage("Attribute has been saved.");
+});
+
 $(document).ready(() => {
     $noteTitle.on('input', () => {
         noteChanged();
@@ -276,7 +498,7 @@ export default {
     getCurrentNoteId,
     newNoteCreated,
     focus,
-    loadLabelList,
+    loadAttributes,
     saveNote,
     saveNoteIfChanged,
     noteChanged

src/public/javascripts/services/note_detail_code.js

@@ -32,7 +32,7 @@ async function show() {
             lint: true,
             gutters: ["CodeMirror-lint-markers"],
             lineNumbers: true,
-            tabindex: 2 // so that tab from title will lead to code editor focus
+            tabindex: 100
         });
 
         codeEditor.on('change', noteDetailService.noteChanged);
@@ -64,24 +64,25 @@ function focus() {
 }
 
 async function executeCurrentNote() {
-    if (noteDetailService.getCurrentNoteType() === 'code') {
+    // ctrl+enter is also used elsewhere so make sure we're running only when appropriate
-        // make sure note is saved so we load latest changes
+    if (noteDetailService.getCurrentNoteType() !== 'code') {
-        await noteDetailService.saveNoteIfChanged();
+        return;
-
-        const currentNote = noteDetailService.getCurrentNote();
-
-        if (currentNote.mime.endsWith("env=frontend")) {
-            const bundle = await server.get('script/bundle/' + noteDetailService.getCurrentNoteId());
-
-            bundleService.executeBundle(bundle);
-        }
-
-        if (currentNote.mime.endsWith("env=backend")) {
-            await server.post('script/run/' + noteDetailService.getCurrentNoteId());
-        }
-
-        infoService.showMessage("Note executed");
     }
+
+    // make sure note is saved so we load latest changes
+    await noteDetailService.saveNoteIfChanged();
+
+    const currentNote = noteDetailService.getCurrentNote();
+
+    if (currentNote.mime.endsWith("env=frontend")) {
+        await bundleService.getAndExecuteBundle(noteDetailService.getCurrentNoteId());
+    }
+
+    if (currentNote.mime.endsWith("env=backend")) {
+        await server.post('script/run/' + noteDetailService.getCurrentNoteId());
+    }
+
+    infoService.showMessage("Note executed");
 }
 
 $(document).bind('keydown', "ctrl+return", executeCurrentNote);

src/public/javascripts/services/note_detail_file.js

@@ -14,13 +14,13 @@ const $fileOpen = $("#file-open");
 async function show() {
     const currentNote = noteDetailService.getCurrentNote();
 
-    const labels = await server.get('notes/' + currentNote.noteId + '/labels');
+    const attributes = await server.get('notes/' + currentNote.noteId + '/attributes');
-    const labelMap = utils.toObject(labels, l => [l.name, l.value]);
+    const attributeMap = utils.toObject(attributes, l => [l.name, l.value]);
 
     $noteDetailFile.show();
 
-    $fileFileName.text(labelMap.original_file_name);
+    $fileFileName.text(attributeMap.original_file_name);
-    $fileFileSize.text(labelMap.file_size + " bytes");
+    $fileFileSize.text(attributeMap.file_size + " bytes");
     $fileFileType.text(currentNote.mime);
 }
 

src/public/javascripts/services/note_detail_render.js

@@ -1,21 +1,73 @@
 import bundleService from "./bundle.js";
 import server from "./server.js";
 import noteDetailService from "./note_detail.js";
+import noteDetailCodeService from "./note_detail_code.js";
 
+const $noteDetailCode = $('#note-detail-code');
 const $noteDetailRender = $('#note-detail-render');
+const $toggleEditButton = $('#toggle-edit-button');
+const $renderButton = $('#render-button');
+
+let codeEditorInitialized;
 
 async function show() {
+    codeEditorInitialized = false;
+
     $noteDetailRender.show();
 
+    await render();
+}
+
+async function toggleEdit() {
+    if ($noteDetailCode.is(":visible")) {
+        $noteDetailCode.hide();
+    }
+    else {
+        if (!codeEditorInitialized) {
+            await noteDetailCodeService.show();
+
+            // because we can't properly scroll only the editor without scrolling the rendering
+            // we limit its height
+            $noteDetailCode.find('.CodeMirror').css('height', '300');
+
+            codeEditorInitialized = true;
+        }
+        else {
+            $noteDetailCode.show();
+        }
+    }
+}
+
+$toggleEditButton.click(toggleEdit);
+
+$renderButton.click(render);
+
+async function render() {
+    // ctrl+enter is also used elsewhere so make sure we're running only when appropriate
+    if (noteDetailService.getCurrentNoteType() !== 'render') {
+        return;
+    }
+
+    if (codeEditorInitialized) {
+        await noteDetailService.saveNoteIfChanged();
+    }
+
     const bundle = await server.get('script/bundle/' + noteDetailService.getCurrentNoteId());
 
     $noteDetailRender.html(bundle.html);
 
+    // if the note is empty, it doesn't make sense to do render-only since nothing will be rendered
+    if (!bundle.html.trim()) {
+        toggleEdit();
+    }
+
     await bundleService.executeBundle(bundle);
 }
 
+$(document).bind('keydown', "ctrl+return", render);
+
 export default {
     show,
-    getContent: () => null,
+    getContent: noteDetailCodeService.getContent,
     focus: () => null
 }

src/public/javascripts/services/note_detail_text.js

@@ -11,7 +11,13 @@ async function show() {
 
         textEditor = await BalloonEditor.create($noteDetailText[0], {});
 
-        textEditor.model.document.on('change', noteDetailService.noteChanged);
+        textEditor.model.document.on('change', () => {
+                // change is triggered on just marker/selection changes which is not interesting for us
+                if (textEditor.model.document.differ.getChanges().length > 0) {
+                    noteDetailService.noteChanged();
+                }
+            }
+        );
     }
 
     textEditor.setData(noteDetailService.getCurrentNote().content);

src/public/javascripts/services/note_type.js

@@ -4,6 +4,9 @@ import server from './server.js';
 import infoService from "./info.js";
 
 const $executeScriptButton = $("#execute-script-button");
+const $toggleEditButton = $('#toggle-edit-button');
+const $renderButton = $('#render-button');
+
 const noteTypeModel = new NoteTypeModel();
 
 function NoteTypeModel() {
@@ -107,7 +110,7 @@ function NoteTypeModel() {
 
     this.selectRender = function() {
         self.type('render');
-        self.mime('');
+        self.mime('text/html');
 
         save();
     };
@@ -128,6 +131,9 @@ function NoteTypeModel() {
 
     this.updateExecuteScriptButtonVisibility = function() {
         $executeScriptButton.toggle(self.mime().startsWith('application/javascript'));
+
+        $toggleEditButton.toggle(self.type() === 'render');
+        $renderButton.toggle(self.type() === 'render');
     }
 }
 

src/public/javascripts/services/options_init.js

@@ -0,0 +1,9 @@
+import server from "./server.js";
+
+const optionsReady = new Promise((resolve, reject) => {
+    $(document).ready(() => server.get('options').then(resolve));
+});
+
+export default {
+    optionsReady
+}

src/public/javascripts/services/protected_session.js

@@ -11,9 +11,23 @@ const $password = $("#protected-session-password");
 const $noteDetailWrapper = $("#note-detail-wrapper");
 const $protectButton = $("#protect-button");
 const $unprotectButton = $("#unprotect-button");
+const $protectedSessionOnButton = $("#protected-session-on");
+const $protectedSessionOffButton = $("#protected-session-off");
 
 let protectedSessionDeferred = null;
 
+async function enterProtectedSession() {
+    if (!protectedSessionHolder.isProtectedSessionAvailable()) {
+        await ensureProtectedSession(true, true);
+    }
+}
+
+async function leaveProtectedSession() {
+    if (protectedSessionHolder.isProtectedSessionAvailable()) {
+        utils.reloadApp();
+    }
+}
+
 function ensureProtectedSession(requireProtectedSession, modal) {
     const dfd = $.Deferred();
 
@@ -25,7 +39,10 @@ function ensureProtectedSession(requireProtectedSession, modal) {
         }
 
         $dialog.dialog({
-            modal: modal,
+            // modal: modal,
+            // everything is now non-modal, because modal dialog caused weird high CPU usage on opening
+            // and tearing of text input
+            modal: false,
             width: 400,
             open: () => {
                 if (!modal) {
@@ -46,7 +63,7 @@ async function setupProtectedSession() {
     const password = $password.val();
     $password.val("");
 
-    const response = await enterProtectedSession(password);
+    const response = await enterProtectedSessionOnServer(password);
 
     if (!response.success) {
         infoService.showError("Wrong password.");
@@ -66,8 +83,10 @@ async function setupProtectedSession() {
         $noteDetailWrapper.show();
 
         protectedSessionDeferred.resolve();
-
         protectedSessionDeferred = null;
+
+        $protectedSessionOnButton.addClass('active');
+        $protectedSessionOffButton.removeClass('active');
     }
 }
 
@@ -81,13 +100,17 @@ function ensureDialogIsClosed() {
     $password.val('');
 }
 
-async function enterProtectedSession(password) {
+async function enterProtectedSessionOnServer(password) {
     return await server.post('login/protected', {
         password: password
     });
 }
 
 async function protectNoteAndSendToServer() {
+    if (noteDetailService.getCurrentNote().isProtected) {
+        return;
+    }
+
     await ensureProtectedSession(true, true);
 
     const note = noteDetailService.getCurrentNote();
@@ -101,6 +124,10 @@ async function protectNoteAndSendToServer() {
 }
 
 async function unprotectNoteAndSendToServer() {
+    if (!noteDetailService.getCurrentNote().isProtected) {
+        return;
+    }
+
     await ensureProtectedSession(true, true);
 
     const note = noteDetailService.getCurrentNote();
@@ -138,5 +165,7 @@ export default {
     protectNoteAndSendToServer,
     unprotectNoteAndSendToServer,
     protectBranch,
-    ensureDialogIsClosed
+    ensureDialogIsClosed,
+    enterProtectedSession,
+    leaveProtectedSession
 };

src/public/javascripts/services/protected_session_holder.js

@@ -1,13 +1,11 @@
 import utils from "./utils.js";
-import server from "./server.js";
+import optionsInitService from './options_init.js';
 
 let lastProtectedSessionOperationDate = null;
 let protectedSessionTimeout = null;
 let protectedSessionId = null;
 
-$(document).ready(() => {
+optionsInitService.optionsReady.then(options => protectedSessionTimeout = options.protectedSessionTimeout);
-    server.get('options').then(options => protectedSessionTimeout = options.protectedSessionTimeout);
-});
 
 setInterval(() => {
     if (lastProtectedSessionOperationDate !== null && new Date().getTime() - lastProtectedSessionOperationDate.getTime() > protectedSessionTimeout * 1000) {

src/public/javascripts/services/script_api.js

@@ -2,14 +2,21 @@ import treeService from './tree.js';
 import server from './server.js';
 import utils from './utils.js';
 import infoService from './info.js';
+import linkService from './link.js';
 
-function ScriptApi(startNote, currentNote) {
+function ScriptApi(startNote, currentNote, originEntity = null) {
     const $pluginButtons = $("#plugin-buttons");
 
     async function activateNote(notePath) {
         await treeService.activateNode(notePath);
     }
 
+    async function activateNewNote(notePath) {
+        await treeService.reload();
+
+        await treeService.activateNode(notePath, true);
+    }
+
     function addButtonToToolbar(buttonId, button) {
         $("#" + buttonId).remove();
 
@@ -42,7 +49,9 @@ function ScriptApi(startNote, currentNote) {
             script: script,
             params: prepareParams(params),
             startNoteId: startNote.noteId,
-            currentNoteId: currentNote.noteId
+            currentNoteId: currentNote.noteId,
+            originEntityName: originEntity ? originEntity.constructor.tableName : null,
+            originEntityId: originEntity ? originEntity.noteId : null
         });
 
         return ret.executionResult;
@@ -51,15 +60,19 @@ function ScriptApi(startNote, currentNote) {
     return {
         startNote: startNote,
         currentNote: currentNote,
+        originEntity: originEntity,
         addButtonToToolbar,
         activateNote,
+        activateNewNote,
         getInstanceName: () => window.glob.instanceName,
         runOnServer,
         formatDateISO: utils.formatDateISO,
         parseDate: utils.parseDate,
         showMessage: infoService.showMessage,
         showError: infoService.showError,
-        reloadTree: treeService.reload
+        reloadTree: treeService.reload, // deprecated
+        refreshTree: treeService.reload,
+        createNoteLink: linkService.createNoteLink
     }
 }
 

src/public/javascripts/services/script_context.js

@@ -1,13 +1,13 @@
 import ScriptApi from './script_api.js';
 import utils from './utils.js';
 
-function ScriptContext(startNote, allNotes) {
+function ScriptContext(startNote, allNotes, originEntity = null) {
     const modules = {};
 
     return {
         modules: modules,
         notes: utils.toObject(allNotes, note => [note.noteId, note]),
-        apis: utils.toObject(allNotes, note => [note.noteId, ScriptApi(startNote, note)]),
+        apis: utils.toObject(allNotes, note => [note.noteId, ScriptApi(startNote, note, originEntity)]),
         require: moduleNoteIds => {
             return moduleName => {
                 const candidates = allNotes.filter(note => moduleNoteIds.includes(note.noteId));

src/public/javascripts/services/search_notes.js

@@ -1,5 +1,6 @@
 import treeService from './tree.js';
 import server from './server.js';
+import treeUtils from "./tree_utils.js";
 
 const $tree = $("#tree");
 const $searchInput = $("input[name='search-text']");
@@ -7,40 +8,62 @@ const $resetSearchButton = $("#reset-search-button");
 const $doSearchButton = $("#do-search-button");
 const $saveSearchButton = $("#save-search-button");
 const $searchBox = $("#search-box");
+const $searchResults = $("#search-results");
+const $searchResultsInner = $("#search-results-inner");
+const $closeSearchButton = $("#close-search-button");
+
+function showSearch() {
+    $searchBox.show();
+    $searchInput.focus();
+}
+
+function hideSearch() {
+    resetSearch();
+
+    $searchResults.hide();
+    $searchBox.hide();
+}
 
 function toggleSearch() {
     if ($searchBox.is(":hidden")) {
-        $searchBox.show();
+        showSearch();
-        $searchInput.focus();
     }
     else {
-        resetSearch();
+        hideSearch();
-
-        $searchBox.hide();
     }
 }
 
 function resetSearch() {
     $searchInput.val("");
-
-    getTree().clearFilter();
 }
 
 function getTree() {
     return $tree.fancytree('getTree');
 }
 
-async function doSearch() {
+async function doSearch(searchText) {
-    const searchText = $searchInput.val();
+    if (searchText) {
-
+        $searchInput.val(searchText);
-    const noteIds = await server.get('search/' + encodeURIComponent(searchText));
+    }
-
+    else {
-    for (const noteId of noteIds) {
+        searchText = $searchInput.val();
-        await treeService.expandToNote(noteId, {noAnimation: true, noEvents: true});
     }
 
-    // Pass a string to perform case insensitive matching
+    const results = await server.get('search/' + encodeURIComponent(searchText));
-    getTree().filterBranches(node => noteIds.includes(node.data.noteId));
+
+    $searchResultsInner.empty();
+    $searchResults.show();
+
+    for (const result of results) {
+        const link = $('<a>', {
+            href: 'javascript:',
+            text: result.title
+        }).attr('action', 'note').attr('note-path', result.path);
+
+        const $result = $('<li>').append(link);
+
+        $searchResultsInner.append($result);
+    }
 }
 
 async function saveSearch() {
@@ -71,6 +94,11 @@ $resetSearchButton.click(resetSearch);
 
 $saveSearchButton.click(saveSearch);
 
+$closeSearchButton.click(hideSearch);
+
 export default {
-    toggleSearch
+    toggleSearch,
+    resetSearch,
+    showSearch,
+    doSearch
 };