Features/storage context menu

src/main/components/App.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { inject, observer } from 'mobx-react'
 import SideNavigator from './SideNavigator'
-import NotePage from './NotePage'
+import Router from './Router'
 import AppStore from '../lib/AppStore'
 import GlobalStyle from './GlobalStyle'
 import { ThemeProvider } from 'emotion-theming'
@@ -32,7 +32,7 @@ class App extends React.Component<AppProps> {
           {app.dataIsInitialized ? (
             <>
               <SideNavigator />
-              <NotePage />
+              <Router />
             </>
           ) : (
             <div>Loading data</div>

src/main/components/NotePage/NoteDetail/NoteDetail.tsx

@@ -3,18 +3,18 @@ import { inject, observer } from 'mobx-react'
 import { Note } from '../../../types'
 
 type NoteDetailProps = {
-  storageName: string
+  storageId: string
   note: Note
   updateNote: (
-    storageName: string,
+    storageId: string,
     noteId: string,
     { content }: { content: string }
   ) => Promise<void>
-  removeNote: (storageName: string, noteId: string) => Promise<void>
+  removeNote: (storageId: string, noteId: string) => Promise<void>
 }
 
 type NoteDetailState = {
-  prevStorageName: string
+  prevStorageId: string
   prevNoteId: string
   content: string
 }
@@ -26,7 +26,7 @@ export default class NoteDetail extends React.Component<
   NoteDetailState
 > {
   state = {
-    prevStorageName: '',
+    prevStorageId: '',
     prevNoteId: '',
     content: ''
   }
@@ -36,13 +36,10 @@ export default class NoteDetail extends React.Component<
     props: NoteDetailProps,
     state: NoteDetailState
   ): NoteDetailState {
-    const { note, storageName } = props
-    if (
-      storageName !== state.prevStorageName ||
-      note._id !== state.prevNoteId
-    ) {
+    const { note, storageId } = props
+    if (storageId !== state.prevStorageId || note._id !== state.prevNoteId) {
       return {
-        prevStorageName: storageName,
+        prevStorageId: storageId,
         prevNoteId: note._id,
         content: note.content
       }
@@ -54,16 +51,16 @@ export default class NoteDetail extends React.Component<
     const { note } = this.props
     if (note._id !== prevState.prevNoteId && this.queued) {
       const { content } = prevState
-      this.saveNote(prevState.prevStorageName, prevState.prevNoteId, {
+      this.saveNote(prevState.prevStorageId, prevState.prevNoteId, {
         content
       })
     }
   }
 
   componentWillUnmount() {
     if (this.queued) {
-      const { content, prevStorageName, prevNoteId } = this.state
-      this.saveNote(prevStorageName, prevNoteId, {
+      const { content, prevStorageId, prevNoteId } = this.state
+      this.saveNote(prevStorageId, prevNoteId, {
         content
       })
     }
@@ -89,31 +86,31 @@ export default class NoteDetail extends React.Component<
       clearTimeout(this.timer)
     }
     this.timer = setTimeout(() => {
-      const { storageName, note } = this.props
+      const { storageId, note } = this.props
       const { content } = this.state
       const {} = this.state
-      this.saveNote(storageName, note._id, { content })
+      this.saveNote(storageId, note._id, { content })
     }, 3000)
   }
 
   async saveNote(
-    storageName: string,
+    storageId: string,
     noteId: string,
     { content }: { content: string }
   ) {
     clearTimeout(this.timer)
     this.queued = false
 
     const { updateNote } = this.props
-    await updateNote(storageName, noteId, {
+    await updateNote(storageId, noteId, {
       content
     })
   }
 
   removeNote = async () => {
-    const { storageName, note, removeNote } = this.props
+    const { storageId, note, removeNote } = this.props
 
-    await removeNote(storageName, note._id)
+    await removeNote(storageId, note._id)
   }
 
   render() {