diff --git a/docs/backend_api/AbstractBeccaEntity.html b/docs/backend_api/AbstractBeccaEntity.html
index e13c799bc..328d08f0c 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';
@@ -1491,7 +1476,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 6886e0845..fb8b2ad99 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/backup.js b/src/etapi/backup.js
new file mode 100644
index 000000000..8dc7f8ed1
--- /dev/null
+++ b/src/etapi/backup.js
@@ -0,0 +1,14 @@
+const eu = require("./etapi_utils");
+const backupService = require("../services/backup");
+
+function register(router) {
+ eu.route(router, 'put', '/etapi/backup/:backupName', async (req, res, next) => {
+ await backupService.backupNow(req.params.backupName);
+
+ res.sendStatus(204);
+ });
+}
+
+module.exports = {
+ register
+};
diff --git a/src/etapi/etapi.openapi.yaml b/src/etapi/etapi.openapi.yaml
index 974acbdfe..754fb05b3 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
@@ -700,7 +700,26 @@ paths:
application/json; charset=utf-8:
schema:
$ref: '#/components/schemas/Error'
-
+ /backup/{backupName}:
+ parameters:
+ - name: backupName
+ in: path
+ required: true
+ description: If the backupName is e.g. "now", then the backup will be written to "backup-now.db" file
+ schema:
+ $ref: '#/components/schemas/StringId'
+ put:
+ description: Create a database backup under a given name
+ operationId: createBackup
+ responses:
+ '204':
+ description: backup has been created
+ default:
+ description: unexpected error
+ content:
+ application/json; charset=utf-8:
+ schema:
+ $ref: '#/components/schemas/Error'
components:
securitySchemes:
EtapiTokenAuth:
@@ -880,6 +899,10 @@ components:
type: string
pattern: '[a-zA-Z0-9_]{4,32}'
example: evnnmvHTCgIn
+ StringId:
+ type: string
+ pattern: '[a-zA-Z0-9_]{1,32}'
+ example: my_ID
EntityIdList:
type: array
items:
diff --git a/src/etapi/mappers.js b/src/etapi/mappers.js
index ad959f36a..86fea9c3d 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,
@@ -17,6 +18,7 @@ function mapNoteToPojo(note) {
};
}
+/** @param {BBranch} branch */
function mapBranchToPojo(branch) {
return {
branchId: branch.branchId,
@@ -29,6 +31,7 @@ function mapBranchToPojo(branch) {
};
}
+/** @param {BAttribute} attr */
function mapAttributeToPojo(attr) {
return {
attributeId: attr.attributeId,
@@ -46,4 +49,4 @@ module.exports = {
mapNoteToPojo,
mapBranchToPojo,
mapAttributeToPojo
-};
\ No newline at end of file
+};
diff --git a/src/public/app/components/entrypoints.js b/src/public/app/components/entrypoints.js
index 68117280e..b2c4d306c 100644
--- a/src/public/app/components/entrypoints.js
+++ b/src/public/app/components/entrypoints.js
@@ -173,7 +173,7 @@ export default class Entrypoints extends Component {
const resp = await server.post(`sql/execute/${note.noteId}`);
if (!resp.success) {
- toastService.showError(`Error occurred while executing SQL query: ${resp.message}`);
+ toastService.showError(`Error occurred while executing SQL query: ${resp.error}`);
}
await appContext.triggerEvent('sqlQueryResults', {ntxId: ntxId, results: resp.results});
diff --git a/src/public/app/components/note_context.js b/src/public/app/components/note_context.js
index 3df6b206e..c22a87ac6 100644
--- a/src/public/app/components/note_context.js
+++ b/src/public/app/components/note_context.js
@@ -176,9 +176,12 @@ class NoteContext extends Component {
}
getTabState() {
- if (!this.notePath && this.hoistedNoteId === 'root') {
+ if (this.hoistedNoteId !== 'root') {
// keeping empty hoisted tab is esp. important for mobile (e.g. opened launcher config)
- return null;
+
+ 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 b8296e7ef..580651c12 100644
--- a/src/public/app/components/tab_manager.js
+++ b/src/public/app/components/tab_manager.js
@@ -460,16 +460,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 6af816a44..d73f14de2 100644
--- a/src/public/app/entities/fnote.js
+++ b/src/public/app/entities/fnote.js
@@ -332,7 +332,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';
@@ -392,7 +392,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 17dcc99a7..cd5bb1912 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";
export default class DesktopLayout {
constructor(customWidgets) {
@@ -123,6 +125,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())
)
@@ -181,6 +185,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 98d4e8460..a7b2b1467 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
index 2fb805799..6bb47d9f3 100644
--- a/src/public/app/services/note_content_renderer.js
+++ b/src/public/app/services/note_content_renderer.js
@@ -157,9 +157,6 @@ async function getRenderedContent(note, options = {}) {
$renderedContent.append($("").text("Error parsing content. Please check console.error() for more details."));
}
}
- else if (type === 'book') {
- // nothing, book doesn't have its own content
- }
else if (!options.tooltip && type === 'protectedSession') {
const $button = $(`
`)
.on('click', protectedSessionService.enterProtectedSession);
@@ -172,7 +169,12 @@ async function getRenderedContent(note, options = {}) {
);
}
else {
- $renderedContent.append($("
Content of this note cannot be displayed in the book format
"));
+ $renderedContent.append(
+ $("
")
+ .css("text-align", "center")
+ .css("font-size", "500%")
+ .append($("
").addClass(note.getIcon()))
+ );
}
$renderedContent.addClass(note.getCssClass());
diff --git a/src/public/app/services/utils.js b/src/public/app/services/utils.js
index e0ef2d767..bf468c578 100644
--- a/src/public/app/services/utils.js
+++ b/src/public/app/services/utils.js
@@ -354,6 +354,17 @@ function escapeRegExp(str) {
return str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
}
+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,
@@ -396,5 +407,6 @@ export default {
filterAttributeName,
isValidAttributeName,
sleep,
- escapeRegExp
+ escapeRegExp,
+ formatNoteSize
};
diff --git a/src/public/app/widgets/buttons/close_pane_button.js b/src/public/app/widgets/buttons/close_pane_button.js
index 690dcac6f..220fd2cca 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 000000000..632651ca5
--- /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 66356164d..0188add6d 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 000000000..4e88e9e45
--- /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/note_tree.js b/src/public/app/widgets/note_tree.js
index b2f30f8a3..e11746eca 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -148,6 +148,9 @@ const TPL = `
const MAX_SEARCH_RESULTS_IN_TREE = 100;
+// this has to be hanged on the actual elements to effectively intercept and stop click event
+const cancelClickPropagation = e => e.stopPropagation();
+
export default class NoteTreeWidget extends NoteContextAwareWidget {
constructor() {
super();
@@ -570,7 +573,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
const isHoistedNote = activeNoteContext && activeNoteContext.hoistedNoteId === note.noteId && note.noteId !== 'root';
if (isHoistedNote) {
- const $unhoistButton = $('
@@ -105,12 +106,12 @@ export default class NoteInfoWidget extends NoteContextAwareWidget {
this.$subTreeSize.empty().append($('
'));
const noteSizeResp = await server.get(`stats/note-size/${this.noteId}`);
- this.$noteSize.text(this.formatSize(noteSizeResp.noteSize));
+ this.$noteSize.text(utils.formatNoteSize(noteSizeResp.noteSize));
const subTreeResp = await server.get(`stats/subtree-size/${this.noteId}`);
if (subTreeResp.subTreeNoteCount > 1) {
- this.$subTreeSize.text(`(subtree size: ${this.formatSize(subTreeResp.subTreeSize)} in ${subTreeResp.subTreeNoteCount} notes)`);
+ this.$subTreeSize.text(`(subtree size: ${utils.formatNoteSize(subTreeResp.subTreeSize)} in ${subTreeResp.subTreeNoteCount} notes)`);
}
else {
this.$subTreeSize.text("");
@@ -142,18 +143,7 @@ export default class NoteInfoWidget extends NoteContextAwareWidget {
this.$calculateButton.show();
this.$noteSizesWrapper.hide();
}
-
- formatSize(size) {
- size = Math.max(Math.round(size / 1024), 1);
-
- if (size < 1024) {
- return `${size} KiB`;
- }
- else {
- return `${Math.round(size / 102.4) / 10} MiB`;
- }
- }
-
+
entitiesReloadedEvent({loadResults}) {
if (loadResults.isNoteReloaded(this.noteId) || loadResults.isNoteContentReloaded(this.noteId)) {
this.refresh();
diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index 55a5da24c..9081ed9e1 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -609,6 +609,17 @@ export default class TabRowWidget extends BasicWidget {
this.updateTabById(noteContext.mainNtxId || noteContext.ntxId);
}
+ noteContextReorderEvent({oldMainNtxId, newMainNtxId}) {
+ if (!oldMainNtxId || !newMainNtxId) {
+ // no need to update tab row
+ return;
+ }
+
+ // update tab id for the new main context
+ this.getTabById(oldMainNtxId).attr("data-ntx-id", newMainNtxId);
+ this.updateTabById(newMainNtxId);
+ }
+
updateTabById(ntxId) {
const $tab = this.getTabById(ntxId);
diff --git a/src/public/app/widgets/title_bar_buttons.js b/src/public/app/widgets/title_bar_buttons.js
index e125e555b..89dd43601 100644
--- a/src/public/app/widgets/title_bar_buttons.js
+++ b/src/public/app/widgets/title_bar_buttons.js
@@ -30,9 +30,13 @@ const TPL = `
height: 40px;
width: 40px;
}
+ .title-bar-buttons .top-btn.active{
+ background-color:var(--accented-background-color);
+ }
+
@@ -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 5bdd4358c..8d66b3294 100644
--- a/src/public/app/widgets/toc.js
+++ b/src/public/app/widgets/toc.js
@@ -38,6 +38,10 @@ const TPL = `
+