diff --git a/db/migrations/0098__rename_hideInAutocomplete.sql b/db/migrations/0098__rename_hideInAutocomplete.sql new file mode 100644 index 000000000..a656e1f70 --- /dev/null +++ b/db/migrations/0098__rename_hideInAutocomplete.sql @@ -0,0 +1 @@ +UPDATE labels SET name = 'archived' WHERE name = 'hideInAutocomplete' \ No newline at end of file diff --git a/src/public/javascripts/entities/note_short.js b/src/public/javascripts/entities/note_short.js index c1a3f74c0..5167b3698 100644 --- a/src/public/javascripts/entities/note_short.js +++ b/src/public/javascripts/entities/note_short.js @@ -6,7 +6,7 @@ class NoteShort { this.isProtected = row.isProtected; this.type = row.type; this.mime = row.mime; - this.hideInAutocomplete = row.hideInAutocomplete; + this.archived = row.archived; } isJson() { @@ -59,7 +59,7 @@ class NoteShort { get dto() { const dto = Object.assign({}, this); delete dto.treeCache; - delete dto.hideInAutocomplete; + delete dto.archived; return dto; } diff --git a/src/scripts/Reddit Importer.tar b/src/scripts/Reddit Importer.tar index 80308b24c..08cbe2f26 100644 Binary files a/src/scripts/Reddit Importer.tar and b/src/scripts/Reddit Importer.tar differ diff --git a/src/services/app_info.js b/src/services/app_info.js index 33c07ef11..884724796 100644 --- a/src/services/app_info.js +++ b/src/services/app_info.js @@ -3,7 +3,7 @@ const build = require('./build'); const packageJson = require('../../package'); -const APP_DB_VERSION = 97; +const APP_DB_VERSION = 98; module.exports = { appVersion: packageJson.version, diff --git a/src/services/labels.js b/src/services/labels.js index 75ecd591a..f41444fae 100644 --- a/src/services/labels.js +++ b/src/services/labels.js @@ -6,7 +6,7 @@ const Label = require('../entities/label'); const BUILTIN_LABELS = [ 'disableVersioning', 'calendarRoot', - 'hideInAutocomplete', + 'archived', 'excludeFromExport', 'run', 'manualTransactionHandling', diff --git a/src/services/note_cache.js b/src/services/note_cache.js index 29e916a4f..9f4105e99 100644 --- a/src/services/note_cache.js +++ b/src/services/note_cache.js @@ -10,7 +10,7 @@ let protectedNoteTitles; let noteIds; let childParentToBranchId = {}; const childToParent = {}; -const hideInAutocomplete = {}; +const archived = {}; // key is 'childNoteId-parentNoteId' as a replacement for branchId which we don't use here let prefixes = {}; @@ -29,10 +29,10 @@ async function load() { childParentToBranchId[`${rel.noteId}-${rel.parentNoteId}`] = rel.branchId; } - const hiddenLabels = await sql.getColumn(`SELECT noteId FROM labels WHERE isDeleted = 0 AND name = 'hideInAutocomplete'`); + const hiddenLabels = await sql.getColumn(`SELECT noteId FROM labels WHERE isDeleted = 0 AND name = 'archived'`); for (const noteId of hiddenLabels) { - hideInAutocomplete[noteId] = true; + archived[noteId] = true; } } @@ -51,7 +51,7 @@ function findNotes(query) { } for (const noteId of noteIds) { - if (hideInAutocomplete[noteId]) { + if (archived[noteId]) { continue; } @@ -61,7 +61,7 @@ function findNotes(query) { } for (const parentNoteId of parents) { - if (hideInAutocomplete[parentNoteId]) { + if (archived[parentNoteId]) { continue; } @@ -117,7 +117,7 @@ function search(noteId, tokens, path, results) { return; } - if (parentNoteId === 'root' || hideInAutocomplete[parentNoteId]) { + if (parentNoteId === 'root' || archived[parentNoteId]) { continue; } @@ -195,7 +195,7 @@ function getSomePath(noteId, path) { } for (const parentNoteId of parents) { - if (hideInAutocomplete[parentNoteId]) { + if (archived[parentNoteId]) { continue; } @@ -261,16 +261,16 @@ eventService.subscribe(eventService.ENTITY_CHANGED, async ({entityName, entityId else if (entityName === 'labels') { const label = await repository.getLabel(entityId); - if (label.name === 'hideInAutocomplete') { - // we're not using label object directly, since there might be other non-deleted hideInAutocomplete label + if (label.name === 'archived') { + // we're not using label object directly, since there might be other non-deleted archived label const hideLabel = await repository.getEntity(`SELECT * FROM labels WHERE isDeleted = 0 - AND name = 'hideInAutocomplete' AND noteId = ?`, [label.noteId]); + AND name = 'archived' AND noteId = ?`, [label.noteId]); if (hideLabel) { - hideInAutocomplete[label.noteId] = true; + archived[label.noteId] = true; } else { - delete hideInAutocomplete[label.noteId]; + delete archived[label.noteId]; } } }