public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00
Code Issues Releases Wiki Activity

When storage or folder is removed, Detail components should render without error (#3168)

Browse Source 
* optimize: when storage or folder is removed, Detail components should render without error, fix #2876

* optimize: Handle some scenarios where storage is not found, should not break the renderer

* optimize: NoteList should work without error when storage is not found
This commit is contained in:
hikerpig
2020-04-06 17:02:52 +08:00
committed by GitHub
parent 0d797ce8a8
commit 6ee92588b1
7 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
browser/main/NoteList/index.js
View File

@@ -1107,10 +1107,10 @@ class NoteList extends React.Component {
getNoteFolder(note) {
// note.folder = folder key
return _.find(
this.getNoteStorage(note).folders,
({ key }) => key === note.folder
)
const storage = this.getNoteStorage(note)
return storage
? _.find(storage.folders, ({ key }) => key === note.folder)
: []
}
getViewType() {
@@ -1145,9 +1145,14 @@ class NoteList extends React.Component {
? this.getNotes().sort(sortFunc)
: this.sortByPin(this.getNotes().sort(sortFunc))
this.notes = notes = sortedNotes.filter(note => {
// this is for the trash box
if (note.isTrashed !== true || location.pathname === '/trashed')
if (
// has matching storage
!!this.getNoteStorage(note) &&
// this is for the trash box
(note.isTrashed !== true || location.pathname === '/trashed')
) {
return true
}
})
if (sortDir === 'DESCENDING') this.notes.reverse()
@@ -1193,6 +1198,8 @@ class NoteList extends React.Component {
sortBy === 'CREATED_AT' ? note.createdAt : note.updatedAt
).fromNow('D')
const storage = this.getNoteStorage(note)
if (isDefault) {
return (
<NoteItem
@@ -1205,7 +1212,7 @@ class NoteList extends React.Component {
handleDragStart={this.handleDragStart.bind(this)}
pathname={location.pathname}
folderName={this.getNoteFolder(note).name}
storageName={this.getNoteStorage(note).name}
storageName={storage.name}
viewType={viewType}
showTagsAlphabetically={config.ui.showTagsAlphabetically}
coloredTags={config.coloredTags}
@@ -1223,7 +1230,7 @@ class NoteList extends React.Component {
handleDragStart={this.handleDragStart.bind(this)}
pathname={location.pathname}
folderName={this.getNoteFolder(note).name}
storageName={this.getNoteStorage(note).name}
storageName={storage.name}
viewType={viewType}
/>
)