diff --git a/docs/backend_api/AbstractBeccaEntity.html b/docs/backend_api/AbstractBeccaEntity.html
index e13c799bc9..328d08f0c2 100644
--- a/docs/backend_api/AbstractBeccaEntity.html
+++ b/docs/backend_api/AbstractBeccaEntity.html
@@ -991,7 +991,7 @@ This is a low level method, for notes and branches use `note.deleteNote()` and '
Source:
Source:
Source:
Source:
Source:
+ Gives all possible note paths leading to this note. Paths containing search note are ignored (could form cycles)
+
+
@@ -2597,7 +2601,7 @@ returned.
Source:
Source:
Source:
Source:
(hoistedNoteIdopt ) → {Array.<string>}
+ Returns note path considered to be the "best"
+
+
+
+
+
+
+
+
+
+
+ Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+ Attributes
+
+
+
+ Default
+
+
+ Description
+
+
+
+
+
+
+
+
+ hoistedNoteId
+
+
+string
+
+
+
+
+
+
+
+
+ <optional>
+
+
+
+
+
+ 'root'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+ array of noteIds constituting the particular note path
+
+
+
+
+
+
+ Type
+
+
+
+Array.<string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (hoistedNoteIdopt ) → {string}
+ Returns note path considered to be the "best"
+
+
+
+
+
+
+
+
+
+
+ Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+ Attributes
+
+
+
+ Default
+
+
+ Description
+
+
+
+
+
+
+
+
+ hoistedNoteId
+
+
+string
+
+
+
+
+
+
+
+
+ <optional>
+
+
+
+
+
+ 'root'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+ serialized note path (e.g. 'root/a1h315/js725h')
+
+
+
+
+
+
+ Type
+
+
+
+string
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
() → {Array.<BBranch >} Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
(hoistedNoteIdopt ) → {Array.<{isArchived: boolean, isInHoistedSubTree: boolean, notePath: Array.<string>, isHidden: boolean}>} Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+ Attributes
+
+
+
+ Default
+
+
+ Description
+
+
+
+
+
+
+
+
+ hoistedNoteId
+
+
+string
+
+
+
+
+
+
+
+
+ <optional>
+
+
+
+
+
+ 'root'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+
+
+
+ Type
+
+
+
+Array.<{isArchived: boolean, isInHoistedSubTree: boolean, notePath: Array.<string>, isHidden: boolean}>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
() → {Array.<BBranch >} Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
(name) → {boolean} Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+
+
+
+ Description
+
+
+
+
+
+
+
+
+ name
+
+
+string
+
+
+
+
+
+
+
+
+
+ label name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+ true if label exists (including inherited) and does not have "false" value.
+
+
+
+
+
+
+ Type
+
+
+
+boolean
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
() → {boolean} Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
(noteId, parentNoteId, prefix) → {void} (noteId, parentNoteId, prefix) → {Object}
- If there's no branch between note and parent note, create one. Otherwise, do nothing.
+ If there's no branch between note and parent note, create one. Otherwise, do nothing. Returns the new or existing branch.
@@ -3437,7 +3437,7 @@ JSON MIME type. See also createNewNote() for more options.
-void
+Object
@@ -7889,7 +7889,7 @@ exists, then we'll use that transaction.
() → {Array.<Array.<string>>}
+ Gives all possible note paths leading to this note. Paths containing search note are ignored (could form cycles)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+ - array of notePaths (each represented by array of noteIds constituting the particular note path)
+
+
+
+
+
+
+ Type
+
+
+
+Array.<Array.<string>>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
(type, name) → {FAttribute } Source:
Source:
Source:
(hoistedNoteIdopt ) → {Array.<string>}
+ Returns note path considered to be the "best"
+
+
+
+
+
+
+
+
+
+
+ Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+ Attributes
+
+
+
+ Default
+
+
+ Description
+
+
+
+
+
+
+
+
+ hoistedNoteId
+
+
+string
+
+
+
+
+
+
+
+
+ <optional>
+
+
+
+
+
+ 'root'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+ array of noteIds constituting the particular note path
+
+
+
+
+
+
+ Type
+
+
+
+Array.<string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (hoistedNoteIdopt ) → {string}
+ Returns note path considered to be the "best"
+
+
+
+
+
+
+
+
+
+
+ Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+ Attributes
+
+
+
+ Default
+
+
+ Description
+
+
+
+
+
+
+
+
+ hoistedNoteId
+
+
+string
+
+
+
+
+
+
+
+
+ <optional>
+
+
+
+
+
+ 'root'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+ serialized note path (e.g. 'root/a1h315/js725h')
+
+
+
+
+
+
+ Type
+
+
+
+string
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
() → {Array.<string>} Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
(hoistedNoteIdopt ) → {Array.<{isArchived: boolean, isInHoistedSubTree: boolean, notePath: Array.<string>, isHidden: boolean}>} Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+ Attributes
+
+
+
+ Default
+
+
+ Description
+
+
+
+
+
+
+
+
+ hoistedNoteId
+
+
+string
+
+
+
+
+
+
+
+
+ <optional>
+
+
+
+
+
+ 'root'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+
+
+
+ Type
+
+
+
+Array.<{isArchived: boolean, isInHoistedSubTree: boolean, notePath: Array.<string>, isHidden: boolean}>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
(async) getTargetRelationSourceNotes() → {Array.<FNote >} Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
(name) → {boolean} Parameters:
+
+
+
+
+
+
+ Name
+
+
+ Type
+
+
+
+
+
+ Description
+
+
+
+
+
+
+
+
+ name
+
+
+string
+
+
+
+
+
+
+
+
+
+ label name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Source:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Returns:
+
+
+
+ true if label exists (including inherited) and does not have "false" value.
+
+
+
+
+
+
+ Type
+
+
+
+boolean
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7357,7 +8151,7 @@
api.showMessage(api.s
Source:
Properties:
-
-
-
-
-
-
-
-
- Type
-
-
-
-
-
- Description
-
-
-
-
-
-
-
-
-
-
-
-
-RightPanelWidget
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Deprecated: use api.RightPanelWidget instead Source:
- api.showMessage(api.s
Source:
-
-
-
-
-
-
-
-
-Properties:
-
-
-
-
-
-
-
-
- Type
-
-
-
-
-
- Description
-
-
-
-
-
-
-
-
-
-
-
-
-NoteContextAwareWidget
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Deprecated: use NoteContextAwareWidget instead Source:
- api.showMessage(api.s
Source:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Properties:
-
-
-
-
-
-
-
-
- Type
-
-
-
-
-
- Description
-
-
-
-
-
-
-
-
-
-
-
-
-NoteContextAwareWidget
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Deprecated: use NoteContextAwareWidget instead Source:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Properties:
-
-
-
-
-
-
-
-
- Type
-
-
-
-
-
- Description
-
-
-
-
-
-
-
-
-
-
-
-
-NoteContextAwareWidget
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Deprecated: use NoteContextAwareWidget instead Source:
- api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
api.showMessage(api.s
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
Source:
, isHidden: boolean}>}
*/
getSortedNotePathRecords(hoistedNoteId = 'root') {
const isHoistedRoot = hoistedNoteId === 'root';
@@ -1548,7 +1530,7 @@ class BNote extends AbstractBeccaEntity {
if (this.isProtected && !this.isDecrypted && protectedSessionService.isProtectedSessionAvailable()) {
try {
this.title = protectedSessionService.decryptString(this.title);
- this.flatTextCache = null;
+ this.__flatTextCache = null;
this.isDecrypted = true;
}
diff --git a/src/etapi/attributes.js b/src/etapi/attributes.js
index 6886e08454..fb8b2ad999 100644
--- a/src/etapi/attributes.js
+++ b/src/etapi/attributes.js
@@ -40,19 +40,25 @@ function register(router) {
}
});
- const ALLOWED_PROPERTIES_FOR_PATCH = {
+ const ALLOWED_PROPERTIES_FOR_PATCH_LABEL = {
'value': [v.notNull, v.isString],
'position': [v.notNull, v.isInteger]
};
+ const ALLOWED_PROPERTIES_FOR_PATCH_RELATION = {
+ 'position': [v.notNull, v.isInteger]
+ };
+
eu.route(router, 'patch' ,'/etapi/attributes/:attributeId', (req, res, next) => {
const attribute = eu.getAndCheckAttribute(req.params.attributeId);
- if (attribute.type === 'relation') {
+ if (attribute.type === 'label') {
+ eu.validateAndPatch(attribute, req.body, ALLOWED_PROPERTIES_FOR_PATCH_LABEL);
+ } else if (attribute.type === 'relation') {
eu.getAndCheckNote(req.body.value);
- }
- eu.validateAndPatch(attribute, req.body, ALLOWED_PROPERTIES_FOR_PATCH);
+ eu.validateAndPatch(attribute, req.body, ALLOWED_PROPERTIES_FOR_PATCH_RELATION);
+ }
attribute.save();
diff --git a/src/etapi/etapi.openapi.yaml b/src/etapi/etapi.openapi.yaml
index 3c267b9a93..c5492c8e4e 100644
--- a/src/etapi/etapi.openapi.yaml
+++ b/src/etapi/etapi.openapi.yaml
@@ -374,7 +374,7 @@ paths:
schema:
$ref: '#/components/schemas/Error'
patch:
- description: patch a branch identified by the branchId with changes in the body
+ description: patch a branch identified by the branchId with changes in the body. Only prefix and notePosition can be updated. If you want to update other properties, you need to delete the old branch and create a new one.
operationId: patchBranchById
requestBody:
required: true
@@ -456,7 +456,7 @@ paths:
schema:
$ref: '#/components/schemas/Error'
patch:
- description: patch a attribute identified by the attributeId with changes in the body
+ description: patch a attribute identified by the attributeId with changes in the body. For labels, only value and position can be updated. For relations, only position can be updated. If you want to modify other properties, you need to delete the old attribute and create a new one.
operationId: patchAttributeById
requestBody:
required: true
diff --git a/src/etapi/mappers.js b/src/etapi/mappers.js
index 26f79da01e..44a5fa8f65 100644
--- a/src/etapi/mappers.js
+++ b/src/etapi/mappers.js
@@ -1,3 +1,4 @@
+/** @param {BNote} note */
function mapNoteToPojo(note) {
return {
noteId: note.noteId,
@@ -18,6 +19,7 @@ function mapNoteToPojo(note) {
};
}
+/** @param {BBranch} branch */
function mapBranchToPojo(branch) {
return {
branchId: branch.branchId,
@@ -30,6 +32,7 @@ function mapBranchToPojo(branch) {
};
}
+/** @param {BAttribute} attr */
function mapAttributeToPojo(attr) {
return {
attributeId: attr.attributeId,
diff --git a/src/public/app/components/note_context.js b/src/public/app/components/note_context.js
index 42b1608a77..9e0716cb34 100644
--- a/src/public/app/components/note_context.js
+++ b/src/public/app/components/note_context.js
@@ -171,9 +171,12 @@ class NoteContext extends Component {
}
getPojoState() {
- if (!this.notePath && this.hoistedNoteId === 'root') {
- // keeping empty hoisted tab is esp. important for mobile (e.g., opened launcher config)
- return null;
+ if (this.hoistedNoteId !== 'root') {
+ // keeping empty hoisted tab is esp. important for mobile (e.g. opened launcher config)
+
+ if (!this.notePath && this.getSubContexts().length === 0) {
+ return null;
+ }
}
return {
diff --git a/src/public/app/components/tab_manager.js b/src/public/app/components/tab_manager.js
index 2f461fec79..efbafc7403 100644
--- a/src/public/app/components/tab_manager.js
+++ b/src/public/app/components/tab_manager.js
@@ -477,16 +477,23 @@ export default class TabManager extends Component {
this.tabsUpdate.scheduleUpdate();
}
- noteContextReorderEvent({ntxIdsInOrder}) {
- const order = {};
- let i = 0;
-
- for (const ntxId of ntxIdsInOrder) {
- order[ntxId] = i++;
- }
+ noteContextReorderEvent({ntxIdsInOrder, oldMainNtxId, newMainNtxId}) {
+ const order = Object.fromEntries(ntxIdsInOrder.map((v, i) => [v, i]));
this.children.sort((a, b) => order[a.ntxId] < order[b.ntxId] ? -1 : 1);
+ if (oldMainNtxId && newMainNtxId) {
+ this.children.forEach(c => {
+ if (c.ntxId === newMainNtxId) {
+ // new main context has null mainNtxId
+ c.mainNtxId = null;
+ } else if (c.ntxId === oldMainNtxId || c.mainNtxId === oldMainNtxId) {
+ // old main context or subcontexts all have the new mainNtxId
+ c.mainNtxId = newMainNtxId;
+ }
+ });
+ }
+
this.tabsUpdate.scheduleUpdate();
}
diff --git a/src/public/app/entities/fnote.js b/src/public/app/entities/fnote.js
index 45263eaa77..4a6f0c8474 100644
--- a/src/public/app/entities/fnote.js
+++ b/src/public/app/entities/fnote.js
@@ -371,7 +371,7 @@ class FNote {
/**
* @param {string} [hoistedNoteId='root']
- * @return {{isArchived: boolean, isInHoistedSubTree: boolean, notePath: string[], isHidden: boolean}[]}
+ * @return {Array<{isArchived: boolean, isInHoistedSubTree: boolean, notePath: Array, isHidden: boolean}>}
*/
getSortedNotePathRecords(hoistedNoteId = 'root') {
const isHoistedRoot = hoistedNoteId === 'root';
@@ -431,7 +431,7 @@ class FNote {
for (const parentNote of this.getParentNotes()) {
if (parentNote.noteId === 'root') {
return false;
- } else if (parentNote.noteId === '_hidden') {
+ } else if (parentNote.noteId === '_hidden' || parentNote.type === 'search') {
continue;
}
diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js
index 927a83bd34..76a05b7e2d 100644
--- a/src/public/app/layouts/desktop_layout.js
+++ b/src/public/app/layouts/desktop_layout.js
@@ -44,6 +44,7 @@ import BacklinksWidget from "../widgets/floating_buttons/zpetne_odkazy.js";
import SharedInfoWidget from "../widgets/shared_info.js";
import FindWidget from "../widgets/find.js";
import TocWidget from "../widgets/toc.js";
+import HighlightsListWidget from "../widgets/highlights_list.js";
import BulkActionsDialog from "../widgets/dialogs/bulk_actions.js";
import AboutDialog from "../widgets/dialogs/about.js";
import HelpDialog from "../widgets/dialogs/help.js";
@@ -75,6 +76,7 @@ import CodeButtonsWidget from "../widgets/floating_buttons/code_buttons.js";
import ApiLogWidget from "../widgets/api_log.js";
import HideFloatingButtonsButton from "../widgets/floating_buttons/hide_floating_buttons_button.js";
import ScriptExecutorWidget from "../widgets/ribbon_widgets/script_executor.js";
+import MovePaneButton from "../widgets/buttons/move_pane_button.js";
import UploadAttachmentsDialog from "../widgets/dialogs/upload_attachments.js";
export default class DesktopLayout {
@@ -124,6 +126,8 @@ export default class DesktopLayout {
.child(new NoteIconWidget())
.child(new NoteTitleWidget())
.child(new SpacerWidget(0, 1))
+ .child(new MovePaneButton(true))
+ .child(new MovePaneButton(false))
.child(new ClosePaneButton())
.child(new CreatePaneButton())
)
@@ -182,6 +186,7 @@ export default class DesktopLayout {
)
.child(new RightPaneContainer()
.child(new TocWidget())
+ .child(new HighlightsListWidget())
.child(...this.customWidgets.get('right-pane'))
)
)
diff --git a/src/public/app/services/frontend_script_api.js b/src/public/app/services/frontend_script_api.js
index 9318dd8ab6..efcd3f6f7e 100644
--- a/src/public/app/services/frontend_script_api.js
+++ b/src/public/app/services/frontend_script_api.js
@@ -483,6 +483,13 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
*/
this.randomString = utils.randomString;
+ /**
+ * @method
+ * @param {int} size in bytes
+ * @return {string} formatted string
+ */
+ this.formatNoteSize = utils.formatNoteSize;
+
this.logMessages = {};
this.logSpacedUpdates = {};
diff --git a/src/public/app/services/note_content_renderer.js b/src/public/app/services/note_content_renderer.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/public/app/services/utils.js b/src/public/app/services/utils.js
index 5d66435073..ddf7e9fbb9 100644
--- a/src/public/app/services/utils.js
+++ b/src/public/app/services/utils.js
@@ -522,6 +522,17 @@ function copyHtmlToClipboard(content) {
navigator.clipboard.write([clipboardItem]);
}
+function formatNoteSize(size) {
+ size = Math.max(Math.round(size / 1024), 1);
+
+ if (size < 1024) {
+ return `${size} KiB`;
+ }
+ else {
+ return `${Math.round(size / 102.4) / 10} MiB`;
+ }
+}
+
export default {
reloadFrontendApp,
parseDate,
@@ -567,6 +578,8 @@ export default {
isValidAttributeName,
sleep,
escapeRegExp,
+ formatNoteSize,
+ escapeRegExp,
areObjectsEqual,
copyHtmlToClipboard
};
diff --git a/src/public/app/widgets/buttons/close_pane_button.js b/src/public/app/widgets/buttons/close_pane_button.js
index 690dcac6f9..220fd2cca2 100644
--- a/src/public/app/widgets/buttons/close_pane_button.js
+++ b/src/public/app/widgets/buttons/close_pane_button.js
@@ -7,6 +7,10 @@ export default class ClosePaneButton extends OnClickButtonWidget {
&& this.noteContext && !!this.noteContext.mainNtxId;
}
+ async noteContextReorderEvent({ntxIdsInOrder}) {
+ this.refresh();
+ }
+
constructor() {
super();
diff --git a/src/public/app/widgets/buttons/move_pane_button.js b/src/public/app/widgets/buttons/move_pane_button.js
new file mode 100644
index 0000000000..632651ca5f
--- /dev/null
+++ b/src/public/app/widgets/buttons/move_pane_button.js
@@ -0,0 +1,47 @@
+import OnClickButtonWidget from "./onclick_button.js";
+import appContext from "../../components/app_context.js";
+
+export default class MovePaneButton extends OnClickButtonWidget {
+ constructor(isMovingLeft) {
+ super();
+
+ this.isMovingLeft = isMovingLeft;
+
+ this.icon(isMovingLeft ? "bx-chevron-left" : "bx-chevron-right")
+ .title(isMovingLeft ? "Move left" : "Move right")
+ .titlePlacement("bottom")
+ .onClick(async (widget, e) => {
+ e.stopPropagation();
+ widget.triggerCommand("moveThisNoteSplit", {ntxId: widget.getClosestNtxId(), isMovingLeft: this.isMovingLeft});
+ })
+ .class("icon-action");
+ }
+
+ isEnabled() {
+ if (!super.isEnabled()) {
+ return false;
+ }
+
+ if (this.isMovingLeft) {
+ // movable if the current context is not a main context, i.e. non-null mainNtxId
+ return !!this.noteContext?.mainNtxId;
+ } else {
+ const currentIndex = appContext.tabManager.noteContexts.findIndex(c => c.ntxId === this.ntxId);
+ const nextContext = appContext.tabManager.noteContexts[currentIndex + 1];
+ // movable if the next context is not null and not a main context, i.e. non-null mainNtxId
+ return !!nextContext?.mainNtxId;
+ }
+ }
+
+ async noteContextRemovedEvent() {
+ this.refresh();
+ }
+
+ async newNoteContextCreatedEvent() {
+ this.refresh();
+ }
+
+ async noteContextReorderEvent() {
+ this.refresh();
+ }
+}
diff --git a/src/public/app/widgets/containers/split_note_container.js b/src/public/app/widgets/containers/split_note_container.js
index e706c64472..ed5af80224 100644
--- a/src/public/app/widgets/containers/split_note_container.js
+++ b/src/public/app/widgets/containers/split_note_container.js
@@ -74,6 +74,50 @@ export default class SplitNoteContainer extends FlexContainer {
appContext.tabManager.removeNoteContext(ntxId);
}
+ async moveThisNoteSplitCommand({ntxId, isMovingLeft}) {
+ if (!ntxId) {
+ logError("empty ntxId!");
+ return;
+ }
+
+ const contexts = appContext.tabManager.noteContexts;
+
+ const currentIndex = contexts.findIndex(c => c.ntxId === ntxId);
+ const leftIndex = isMovingLeft ? currentIndex - 1 : currentIndex;
+
+ if (currentIndex === -1 || leftIndex < 0 || leftIndex + 1 >= contexts.length) {
+ logError(`invalid context! currentIndex: ${currentIndex}, leftIndex: ${leftIndex}, contexts.length: ${contexts.length}`);
+ return;
+ }
+
+ if (contexts[leftIndex].isEmpty() && contexts[leftIndex + 1].isEmpty()) {
+ // no op
+ return;
+ }
+
+ const ntxIds = contexts.map(c => c.ntxId);
+ const newNtxIds = [
+ ...ntxIds.slice(0, leftIndex),
+ ntxIds[leftIndex + 1],
+ ntxIds[leftIndex],
+ ...ntxIds.slice(leftIndex + 2),
+ ];
+ const isChangingMainContext = !contexts[leftIndex].mainNtxId;
+
+ this.triggerCommand("noteContextReorder", {
+ ntxIdsInOrder: newNtxIds,
+ oldMainNtxId: isChangingMainContext ? ntxIds[leftIndex] : null,
+ newMainNtxId: isChangingMainContext ? ntxIds[leftIndex + 1]: null,
+ });
+
+ // reorder the note context widgets
+ this.$widget.find(`[data-ntx-id="${ntxIds[leftIndex]}"]`)
+ .insertAfter(this.$widget.find(`[data-ntx-id="${ntxIds[leftIndex + 1]}"]`));
+
+ // activate context that now contains the original note
+ await appContext.tabManager.activateNoteContext(isMovingLeft ? ntxIds[leftIndex + 1] : ntxIds[leftIndex]);
+ }
+
activeContextChangedEvent() {
this.refresh();
}
diff --git a/src/public/app/widgets/highlights_list.js b/src/public/app/widgets/highlights_list.js
new file mode 100644
index 0000000000..4e88e9e453
--- /dev/null
+++ b/src/public/app/widgets/highlights_list.js
@@ -0,0 +1,257 @@
+/**
+ * Widget: Show highlighted text in the right pane
+ *
+ * By design, there's no support for nonsensical or malformed constructs:
+ * - For example, if there is a formula in the middle of the highlighted text, the two ends of the formula will be regarded as two entries
+ */
+
+import attributeService from "../services/attributes.js";
+import RightPanelWidget from "./right_panel_widget.js";
+import options from "../services/options.js";
+import OnClickButtonWidget from "./buttons/onclick_button.js";
+
+const TPL = `
+
+
+
`;
+
+export default class HighlightsListWidget extends RightPanelWidget {
+ constructor() {
+ super();
+
+ this.closeHltButton = new CloseHltButton();
+ this.child(this.closeHltButton);
+ }
+
+ get widgetTitle() {
+ return "Highlighted Text";
+ }
+
+ isEnabled() {
+ return super.isEnabled()
+ && this.note.type === 'text'
+ && !this.noteContext.viewScope.highlightedTextTemporarilyHidden
+ && this.noteContext.viewScope.viewMode === 'default';
+ }
+
+ async doRenderBody() {
+ this.$body.empty().append($(TPL));
+ this.$highlightsList = this.$body.find('.highlists-list');
+ this.$body.find('.highlists-list-widget').append(this.closeHltButton.render());
+ }
+
+ async refreshWithNote(note) {
+ /* The reason for adding highlightedTextPreviousVisible is to record whether the previous state
+ of the highlightedText is hidden or displayed, and then let it be displayed/hidden at the initial time.
+ If there is no such value, when the right panel needs to display toc but not highlighttext,
+ every time the note content is changed, highlighttext Widget will appear and then close immediately,
+ because getHlt function will consume time */
+ if (this.noteContext.viewScope.highlightedTextPreviousVisible) {
+ this.toggleInt(true);
+ } else {
+ this.toggleInt(false);
+ }
+
+ const optionsHlt = JSON.parse(options.get('highlightedText'));
+
+ if (note.isLabelTruthy('hideHighlightWidget') || !optionsHlt) {
+ this.toggleInt(false);
+ this.triggerCommand("reEvaluateRightPaneVisibility");
+ return;
+ }
+
+ let $highlightsList = "", hltLiCount = -1;
+ // Check for type text unconditionally in case alwaysShowWidget is set
+ if (this.note.type === 'text') {
+ const {content} = await note.getNoteComplement();
+ ({$highlightsList, hltLiCount} = this.getHighlightList(content, optionsHlt));
+ }
+ this.$highlightsList.empty().append($highlightsList);
+ if (hltLiCount > 0) {
+ this.toggleInt(true);
+ this.noteContext.viewScope.highlightedTextPreviousVisible = true;
+ } else {
+ this.toggleInt(false);
+ this.noteContext.viewScope.highlightedTextPreviousVisible = false;
+ }
+
+ this.triggerCommand("reEvaluateRightPaneVisibility");
+ }
+
+ getHighlightList(content, optionsHlt) {
+ // matches a span containing background-color
+ const regex1 = /]*style\s*=\s*[^>]*background-color:[^>]*?>[\s\S]*?<\/span>/gi;
+ // matches a span containing color
+ const regex2 = /]*style\s*=\s*[^>]*[^-]color:[^>]*?>[\s\S]*?<\/span>/gi;
+ // match italics
+ const regex3 = /[\s\S]*?<\/i>/gi;
+ // match bold
+ const regex4 = /[\s\S]*?<\/strong>/gi;
+ // match underline
+ const regex5 = /[\s\S]*?<\/u>/g;
+ // Possible values in optionsHlt： '["bold","italic","underline","color","bgColor"]'
+ // element priority： span>i>strong>u
+ let findSubStr = "", combinedRegexStr = "";
+ if (optionsHlt.includes("bgColor")) {
+ findSubStr += `,span[style*="background-color"]`;
+ combinedRegexStr += `|${regex1.source}`;
+ }
+ if (optionsHlt.includes("color")) {
+ findSubStr += `,span[style*="color"]`;
+ combinedRegexStr += `|${regex2.source}`;
+ }
+ if (optionsHlt.includes("italic")) {
+ findSubStr += `,i`;
+ combinedRegexStr += `|${regex3.source}`;
+ }
+ if (optionsHlt.indexOf("bold")) {
+ findSubStr += `,strong`;
+ combinedRegexStr += `|${regex4.source}`;
+ }
+ if (optionsHlt.includes("underline")) {
+ findSubStr += `,u`;
+ combinedRegexStr += `|${regex5.source}`;
+ }
+
+ findSubStr = findSubStr.substring(1)
+ combinedRegexStr = `(` + combinedRegexStr.substring(1) + `)`;
+ const combinedRegex = new RegExp(combinedRegexStr, 'gi');
+ const $highlightsList = $("");
+ let prevEndIndex = -1, hltLiCount = 0;
+ for (let match = null, hltIndex = 0; ((match = combinedRegex.exec(content)) !== null); hltIndex++) {
+ const subHtml = match[0];
+ const startIndex = match.index;
+ const endIndex = combinedRegex.lastIndex;
+ if (prevEndIndex !== -1 && startIndex === prevEndIndex) {
+ // If the previous element is connected to this element in HTML, then concatenate them into one.
+ $highlightsList.children().last().append(subHtml);
+ } else {
+ // TODO: can't be done with $(subHtml).text()?
+ const hasText = [...subHtml.matchAll(/(?<=^|>)[^><]+?(?=<|$)/g)].map(matchTmp => matchTmp[0]).join('').trim();
+
+ if (hasText) {
+ $highlightsList.append(
+ $('')
+ .html(subHtml)
+ .on("click", () => this.jumpToHighlightedText(findSubStr, hltIndex))
+ );
+
+ hltLiCount++;
+ } else {
+ // hide li if its text content is empty
+ continue;
+ }
+ }
+ prevEndIndex = endIndex;
+ }
+ return {
+ $highlightsList,
+ hltLiCount
+ };
+ }
+
+ async jumpToHighlightedText(findSubStr, itemIndex) {
+ const isReadOnly = await this.noteContext.isReadOnly();
+ let targetElement;
+ if (isReadOnly) {
+ const $container = await this.noteContext.getContentElement();
+ targetElement = $container.find(findSubStr).filter(function () {
+ if (findSubStr.indexOf("color") >= 0 && findSubStr.indexOf("background-color") < 0) {
+ let color = this.style.color;
+ return !($(this).prop('tagName') === "SPAN" && color === "");
+ } else {
+ return true;
+ }
+ }).filter(function () {
+ return $(this).parent(findSubStr).length === 0
+ && $(this).parent().parent(findSubStr).length === 0
+ && $(this).parent().parent().parent(findSubStr).length === 0
+ && $(this).parent().parent().parent().parent(findSubStr).length === 0;
+ })
+ } else {
+ const textEditor = await this.noteContext.getTextEditor();
+ targetElement = $(textEditor.editing.view.domRoots.values().next().value).find(findSubStr).filter(function () {
+ // When finding span[style*="color"] but not looking for span[style*="background-color"],
+ // the background-color error will be regarded as color, so it needs to be filtered
+ if (findSubStr.indexOf("color") >= 0 && findSubStr.indexOf("background-color") < 0) {
+ let color = this.style.color;
+ return !($(this).prop('tagName') === "SPAN" && color === "");
+ } else {
+ return true;
+ }
+ }).filter(function () {
+ // Need to filter out the child elements of the element that has been found
+ return $(this).parent(findSubStr).length === 0
+ && $(this).parent().parent(findSubStr).length === 0
+ && $(this).parent().parent().parent(findSubStr).length === 0
+ && $(this).parent().parent().parent().parent(findSubStr).length === 0;
+ })
+ }
+ targetElement[itemIndex].scrollIntoView({
+ behavior: "smooth", block: "center"
+ });
+ }
+
+ async closeHltCommand() {
+ this.noteContext.viewScope.highlightedTextTemporarilyHidden = true;
+ await this.refresh();
+ this.triggerCommand('reEvaluateRightPaneVisibility');
+ }
+
+ async entitiesReloadedEvent({loadResults}) {
+ if (loadResults.isNoteContentReloaded(this.noteId)) {
+ await this.refresh();
+ } else if (loadResults.getAttributes().find(attr => attr.type === 'label'
+ && (attr.name.toLowerCase().includes('readonly') || attr.name === 'hideHighlightWidget')
+ && attributeService.isAffecting(attr, this.note))) {
+ await this.refresh();
+ }
+ }
+}
+
+class CloseHltButton extends OnClickButtonWidget {
+ constructor() {
+ super();
+
+ this.icon("bx-x")
+ .title("Close HighlightedTextWidget")
+ .titlePlacement("bottom")
+ .onClick((widget, e) => {
+ e.stopPropagation();
+
+ widget.triggerCommand("closeHlt");
+ })
+ .class("icon-action close-highlists-list");
+ }
+}
diff --git a/src/public/app/widgets/ribbon_widgets/file_properties.js b/src/public/app/widgets/ribbon_widgets/file_properties.js
index 2080e71a42..633a3a60d4 100644
--- a/src/public/app/widgets/ribbon_widgets/file_properties.js
+++ b/src/public/app/widgets/ribbon_widgets/file_properties.js
@@ -136,7 +136,7 @@ export default class FilePropertiesWidget extends NoteContextAwareWidget {
const blob = await this.note.getBlob();
- this.$fileSize.text(`${blob.contentLength} bytes`);
+ this.$fileSize.text(utils.formatNoteSize(blob.contentLength));
// open doesn't work for protected notes since it works through a browser which isn't in protected session
this.$openButton.toggle(!note.isProtected);
diff --git a/src/public/app/widgets/ribbon_widgets/note_info_widget.js b/src/public/app/widgets/ribbon_widgets/note_info_widget.js
index 2416ffe3d2..c6911150a4 100644
--- a/src/public/app/widgets/ribbon_widgets/note_info_widget.js
+++ b/src/public/app/widgets/ribbon_widgets/note_info_widget.js
@@ -106,12 +106,12 @@ export default class NoteInfoWidget extends NoteContextAwareWidget {
this.$subTreeSize.empty().append($('
@@ -47,10 +51,34 @@ export default class TitleBarButtonsWidget extends BasicWidget {
this.$widget = $(TPL);
this.contentSized();
+ const $topBtn = this.$widget.find(".top-btn");
const $minimizeBtn = this.$widget.find(".minimize-btn");
const $maximizeBtn = this.$widget.find(".maximize-btn");
const $closeBtn = this.$widget.find(".close-btn");
+ // When the window is restarted, the window will not be reset when it is set to the top,
+ // so get the window status and set the icon background
+ setTimeout(() => {
+ const remote = utils.dynamicRequire('@electron/remote');
+ if (remote.BrowserWindow.getFocusedWindow()?.isAlwaysOnTop()) {
+ $topBtn.addClass('active');
+ }
+ }, 1000);
+
+ $topBtn.on('click', () => {
+ $topBtn.trigger('blur');
+ const remote = utils.dynamicRequire('@electron/remote');
+ const focusedWindow = remote.BrowserWindow.getFocusedWindow();
+ const isAlwaysOnTop = focusedWindow.isAlwaysOnTop()
+ if (isAlwaysOnTop) {
+ focusedWindow.setAlwaysOnTop(false)
+ $topBtn.removeClass('active');
+ } else {
+ focusedWindow.setAlwaysOnTop(true);
+ $topBtn.addClass('active');
+ }
+ });
+
$minimizeBtn.on('click', () => {
$minimizeBtn.trigger('blur');
const remote = utils.dynamicRequire('@electron/remote');
diff --git a/src/public/app/widgets/toc.js b/src/public/app/widgets/toc.js
index 85d415be22..1c7418d05f 100644
--- a/src/public/app/widgets/toc.js
+++ b/src/public/app/widgets/toc.js
@@ -38,6 +38,10 @@ const TPL = `
+`;
+
+export default class HighlightedTextOptions extends OptionsWidget {
+ doRender() {
+ this.$widget = $(TPL);
+ this.$hlt = this.$widget.find("input.highlighted-text-check");
+ this.$hlt.on('change', () => {
+ const hltVals = this.$widget.find('input.highlighted-text-check[type="checkbox"]:checked').map(function () {
+ return this.value;
+ }).get();
+ this.updateOption('highlightedText', JSON.stringify(hltVals));
+ });
+ }
+
+ async optionsLoaded(options) {
+ const hltVals = JSON.parse(options.highlightedText);
+ this.$widget.find('input.highlighted-text-check[type="checkbox"]').each(function () {
+ if ($.inArray($(this).val(), hltVals) !== -1) {
+ $(this).prop("checked", true);
+ } else {
+ $(this).prop("checked", false);
+ }
+ });
+ }
+}
diff --git a/src/routes/api/options.js b/src/routes/api/options.js
index ae72275df6..ce40d6e3e5 100644
--- a/src/routes/api/options.js
+++ b/src/routes/api/options.js
@@ -60,6 +60,7 @@ const ALLOWED_OPTIONS = new Set([
'compressImages',
'downloadImagesAutomatically',
'minTocHeadings',
+ 'highlightedText',
'checkForUpdates',
'disableTray',
'eraseUnusedAttachmentsAfterSeconds',
diff --git a/src/services/notes.js b/src/services/notes.js
index 39c313399f..a4062ac5e9 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -60,11 +60,10 @@ function deriveMime(type, mime) {
* @param {BNote} childNote
*/
function copyChildAttributes(parentNote, childNote) {
- const hasAlreadyTemplate = childNote.hasRelation('template');
-
for (const attr of parentNote.getAttributes()) {
if (attr.name.startsWith("child:")) {
const name = attr.name.substr(6);
+ const hasAlreadyTemplate = childNote.hasRelation('template');
if (hasAlreadyTemplate && attr.type === 'relation' && name === 'template') {
// if the note already has a template, it means the template was chosen by the user explicitly
@@ -181,7 +180,7 @@ function createNewNote(params) {
// TODO: think about what can happen if the note already exists with the forced ID
// I guess on DB it's going to be fine, but becca references between entities
- // might get messed up (two Note instance for the same ID existing in the references)
+ // might get messed up (two note instances for the same ID existing in the references)
note = new BNote({
noteId: params.noteId, // optionally can force specific noteId
title: params.title,
@@ -202,7 +201,7 @@ function createNewNote(params) {
}
finally {
if (!isEntityEventsDisabled) {
- // re-enable entity events only if there were previously enabled
+ // re-enable entity events only if they were previously enabled
// (they can be disabled in case of import)
cls.enableEntityEvents();
}
@@ -222,22 +221,14 @@ function createNewNote(params) {
copyChildAttributes(parentNote, note);
+ eventService.emit(eventService.ENTITY_CREATED, { entityName: 'notes', entity: note });
+ eventService.emit(eventService.ENTITY_CHANGED, { entityName: 'notes', entity: note });
triggerNoteTitleChanged(note);
-
- eventService.emit(eventService.ENTITY_CREATED, {
- entityName: 'notes',
- entity: note
- });
-
- eventService.emit(eventService.ENTITY_CREATED, {
- entityName: 'branches',
- entity: branch
- });
-
- eventService.emit(eventService.CHILD_NOTE_CREATED, {
- childNote: note,
- parentNote: parentNote
- });
+ // blobs doesn't use "created" event
+ eventService.emit(eventService.ENTITY_CHANGED, { entityName: 'blobs', entity: note });
+ eventService.emit(eventService.ENTITY_CREATED, { entityName: 'branches', entity: branch });
+ eventService.emit(eventService.ENTITY_CHANGED, { entityName: 'branches', entity: branch });
+ eventService.emit(eventService.CHILD_NOTE_CREATED, { childNote: note, parentNote: parentNote });
log.info(`Created new note '${note.noteId}', branch '${branch.branchId}' of type '${note.type}', mime '${note.mime}'`);
diff --git a/src/services/options_init.js b/src/services/options_init.js
index 0ef3e2ff0e..c08ec59921 100644
--- a/src/services/options_init.js
+++ b/src/services/options_init.js
@@ -86,6 +86,7 @@ const defaultOptions = [
{ name: 'compressImages', value: 'true', isSynced: true },
{ name: 'downloadImagesAutomatically', value: 'true', isSynced: true },
{ name: 'minTocHeadings', value: '5', isSynced: true },
+ { name: 'highlightedText', value: '["bold","italic","underline","color","bgColor"]', isSynced: true },
{ name: 'checkForUpdates', value: 'true', isSynced: true },
{ name: 'disableTray', value: 'false', isSynced: false },
{ name: 'eraseUnusedAttachmentsAfterSeconds', value: '2592000', isSynced: true },
diff --git a/src/share/shaca/entities/snote.js b/src/share/shaca/entities/snote.js
index 257a1dd984..3d6cc4d964 100644
--- a/src/share/shaca/entities/snote.js
+++ b/src/share/shaca/entities/snote.js
@@ -42,7 +42,7 @@ class SNote extends AbstractShacaEntity {
/** @param {SAttribute[]|null} */
this.__attributeCache = null;
/** @param {SAttribute[]|null} */
- this.inheritableAttributeCache = null;
+ this.__inheritableAttributeCache = null;
/** @param {SAttribute[]} */
this.targetRelations = [];
@@ -192,11 +192,11 @@ class SNote extends AbstractShacaEntity {
}
}
- this.inheritableAttributeCache = [];
+ this.__inheritableAttributeCache = [];
for (const attr of this.__attributeCache) {
if (attr.isInheritable) {
- this.inheritableAttributeCache.push(attr);
+ this.__inheritableAttributeCache.push(attr);
}
}
}
@@ -210,11 +210,11 @@ class SNote extends AbstractShacaEntity {
return [];
}
- if (!this.inheritableAttributeCache) {
- this.__getAttributes(path); // will refresh also this.inheritableAttributeCache
+ if (!this.__inheritableAttributeCache) {
+ this.__getAttributes(path); // will refresh also this.__inheritableAttributeCache
}
- return this.inheritableAttributeCache;
+ return this.__inheritableAttributeCache;
}
/** @returns {boolean} */
diff --git a/test-etapi/get-inherited-attribute-cloned.http b/test-etapi/get-inherited-attribute-cloned.http
new file mode 100644
index 0000000000..06c1aa976d
--- /dev/null
+++ b/test-etapi/get-inherited-attribute-cloned.http
@@ -0,0 +1,116 @@
+POST {{triliumHost}}/etapi/create-note
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+ "parentNoteId": "root",
+ "title": "Hello parent",
+ "type": "text",
+ "content": "Hi there!"
+}
+
+> {%
+client.assert(response.status === 201);
+client.global.set("parentNoteId", response.body.note.noteId);
+client.global.set("parentBranchId", response.body.branch.branchId);
+%}
+
+### Create inheritable parent attribute
+
+POST {{triliumHost}}/etapi/attributes
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+ "noteId": "{{parentNoteId}}",
+ "type": "label",
+ "name": "mylabel",
+ "value": "",
+ "isInheritable": true,
+ "position": 10
+}
+
+> {%
+client.assert(response.status === 201);
+client.global.set("parentAttributeId", response.body.attributeId);
+%}
+
+### Create child note under root
+
+POST {{triliumHost}}/etapi/create-note
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+ "parentNoteId": "root",
+ "title": "Hello child",
+ "type": "text",
+ "content": "Hi there!"
+}
+
+> {%
+client.assert(response.status === 201);
+client.global.set("childNoteId", response.body.note.noteId);
+client.global.set("childBranchId", response.body.branch.branchId);
+%}
+
+### Create child attribute
+
+POST {{triliumHost}}/etapi/attributes
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+ "noteId": "{{childNoteId}}",
+ "type": "label",
+ "name": "mylabel",
+ "value": "val",
+ "isInheritable": false,
+ "position": 10
+}
+
+> {%
+client.assert(response.status === 201);
+client.global.set("childAttributeId", response.body.attributeId);
+%}
+
+### Clone child to parent
+
+POST {{triliumHost}}/etapi/branches
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+ "noteId": "{{childNoteId}}",
+ "parentNoteId": "{{parentNoteId}}"
+}
+
+> {%
+client.assert(response.status === 201);
+client.assert(response.body.parentNoteId == client.global.get("parentNoteId"));
+%}
+
+###
+
+GET {{triliumHost}}/etapi/notes/{{childNoteId}}
+Authorization: {{authToken}}
+
+> {%
+
+function hasAttribute(list, attributeId) {
+ for (let i = 0; i < list.length; i++) {
+ if (list[i]["attributeId"] === attributeId) {
+ return true;
+ }
+ }
+ return false;
+}
+
+client.assert(response.status === 200);
+client.assert(response.body.noteId == client.global.get("childNoteId"));
+client.assert(response.body.attributes.length == 2);
+client.assert(hasAttribute(response.body.attributes,
+ client.global.get("parentAttributeId")));
+client.assert(hasAttribute(response.body.attributes,
+ client.global.get("childAttributeId")));
+%}
diff --git a/test-etapi/get-inherited-attribute.http b/test-etapi/get-inherited-attribute.http
new file mode 100644
index 0000000000..d614f419e9
--- /dev/null
+++ b/test-etapi/get-inherited-attribute.http
@@ -0,0 +1,44 @@
+POST {{triliumHost}}/etapi/attributes
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+ "noteId": "root",
+ "type": "label",
+ "name": "mylabel",
+ "value": "val",
+ "isInheritable": true
+}
+
+> {% client.global.set("createdAttributeId", response.body.attributeId); %}
+
+###
+
+POST {{triliumHost}}/etapi/create-note
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+ "parentNoteId": "root",
+ "title": "Hello",
+ "type": "text",
+ "content": "Hi there!"
+}
+
+> {%
+client.global.set("createdNoteId", response.body.note.noteId);
+client.global.set("createdBranchId", response.body.branch.branchId);
+%}
+
+###
+
+GET {{triliumHost}}/etapi/notes/{{createdNoteId}}
+Authorization: {{authToken}}
+
+> {%
+client.assert(response.status === 200);
+client.assert(response.body.noteId == client.global.get("createdNoteId"));
+client.assert(response.body.attributes.length == 1);
+client.assert(response.body.attributes[0].attributeId ==
+ client.global.get("createdAttributeId"));
+%}