From 933ad269a56e97531478fe4bf26022cd9bed71fd Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Mon, 15 May 2017 19:46:34 +0000
Subject: [PATCH] Create note under folder

---
 .../src/components/folder-list.js             | 37 +++++++++++++++
 ReactNativeClient/src/components/item-list.js |  7 ++-
 ReactNativeClient/src/components/note-list.js | 23 +++++-----
 .../src/components/screens/folders.js         | 39 ++++++++++++++++
 .../src/components/screens/note.js            |  3 +-
 ReactNativeClient/src/database.js             |  2 +-
 ReactNativeClient/src/models/note.js          | 11 +++--
 ReactNativeClient/src/root.js                 | 46 ++++++++++++++-----
 8 files changed, 139 insertions(+), 29 deletions(-)
 create mode 100644 ReactNativeClient/src/components/folder-list.js
 create mode 100644 ReactNativeClient/src/components/screens/folders.js

diff --git a/ReactNativeClient/src/components/folder-list.js b/ReactNativeClient/src/components/folder-list.js
new file mode 100644
index 000000000..11cdb403d
--- /dev/null
+++ b/ReactNativeClient/src/components/folder-list.js
@@ -0,0 +1,37 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux'
+import { ListView, Text, TouchableHighlight } from 'react-native';
+import { Log } from 'src/log.js';
+import { ItemListComponent } from 'src/components/item-list.js';
+import { Note } from 'src/models/note.js';
+import { _ } from 'src/locale.js';
+
+class FolderListComponent extends ItemListComponent {
+
+	listView_itemClick = (folderId) => {
+
+		Note.previews(folderId).then((notes) => {
+			this.props.dispatch({
+				type: 'NOTES_UPDATE_ALL',
+				notes: notes,
+			});
+
+			this.props.dispatch({
+				type: 'Navigation/NAVIGATE',
+				routeName: 'Notes',
+				folderId: folderId,
+			});
+		}).catch((error) => {
+			Log.warn('Cannot load notes', error);
+		});
+	}
+
+}
+
+const FolderList = connect(
+	(state) => {
+		return { items: state.folders };
+	}
+)(FolderListComponent)
+
+export { FolderList };
\ No newline at end of file
diff --git a/ReactNativeClient/src/components/item-list.js b/ReactNativeClient/src/components/item-list.js
index 1c732e054..4d247f7ea 100644
--- a/ReactNativeClient/src/components/item-list.js
+++ b/ReactNativeClient/src/components/item-list.js
@@ -22,10 +22,15 @@ class ItemListComponent extends Component {
 		this.setState({ dataSource: this.state.dataSource.cloneWithRows(newProps.items) });
 	}
 
+	listView_itemClick = (itemId) => {
+
+	}
+
 	render() {
 		let renderRow = (rowData) => {
 			let onPress = () => {
-				this.props.onItemClick(rowData.id)
+				this.listView_itemClick(rowData.id);
+				//this.props.onItemClick(rowData.id)
 			}
 			return (
 				<TouchableHighlight onPress={onPress}>
diff --git a/ReactNativeClient/src/components/note-list.js b/ReactNativeClient/src/components/note-list.js
index b491878bf..39cadea3d 100644
--- a/ReactNativeClient/src/components/note-list.js
+++ b/ReactNativeClient/src/components/note-list.js
@@ -5,22 +5,21 @@ import { Log } from 'src/log.js';
 import { ItemListComponent } from 'src/components/item-list.js';
 import { _ } from 'src/locale.js';
 
-class NoteListComponent extends ItemListComponent {}
+class NoteListComponent extends ItemListComponent {
+
+	listView_itemClick = (noteId) => {
+		this.props.dispatch({
+			type: 'Navigation/NAVIGATE',
+			routeName: 'Note',
+			noteId: noteId,
+		});
+	}
+
+}
 
 const NoteList = connect(
 	(state) => {
 		return { items: state.notes };
-	},
-	(dispatch) => {
-		return {
-			onItemClick: (noteId) => {
-				dispatch({
-					type: 'Navigation/NAVIGATE',
-					routeName: 'Note',
-					noteId: noteId,
-				});
-			}
-		}
 	}
 )(NoteListComponent)
 
diff --git a/ReactNativeClient/src/components/screens/folders.js b/ReactNativeClient/src/components/screens/folders.js
new file mode 100644
index 000000000..f3b5a418f
--- /dev/null
+++ b/ReactNativeClient/src/components/screens/folders.js
@@ -0,0 +1,39 @@
+import React, { Component } from 'react';
+import { View, Button, Picker } from 'react-native';
+import { connect } from 'react-redux'
+import { Log } from 'src/log.js'
+import { FolderList } from 'src/components/folder-list.js'
+
+class FoldersScreenComponent extends React.Component {
+	
+	static navigationOptions = {
+		title: 'Folders',
+	};
+
+	createFolderButton_press = () => {
+		this.props.dispatch({
+			type: 'Navigation/NAVIGATE',
+			routeName: 'Folder',
+		});
+	}
+
+	render() {
+		const { navigate } = this.props.navigation;
+		return (
+			<View style={{flex: 1}}>
+				<FolderList style={{flex: 1}}/>
+				<Button title="Create folder" onPress={this.createFolderButton_press} />
+			</View>
+		);
+	}
+}
+
+const FoldersScreen = connect(
+	(state) => {
+		return {
+			folders: state.folders
+		};
+	}
+)(FoldersScreenComponent)
+
+export { FoldersScreen };
\ No newline at end of file
diff --git a/ReactNativeClient/src/components/screens/note.js b/ReactNativeClient/src/components/screens/note.js
index 5632d9128..e1909056a 100644
--- a/ReactNativeClient/src/components/screens/note.js
+++ b/ReactNativeClient/src/components/screens/note.js
@@ -49,6 +49,7 @@ class NoteScreenComponent extends React.Component {
 	render() {
 		return (
 			<View style={{flex: 1}}>
+				<TextInput value={this.state.note.parent_id} />
 				<TextInput value={this.state.note.title} onChangeText={this.title_changeText} />
 				<TextInput style={{flex: 1, textAlignVertical: 'top'}} multiline={true} value={this.state.note.body} onChangeText={this.body_changeText} />
 				<Button title="Save note" onPress={this.saveNoteButton_press} />
@@ -61,7 +62,7 @@ class NoteScreenComponent extends React.Component {
 const NoteScreen = connect(
 	(state) => {
 		return {
-			note: state.selectedNoteId ? Note.byId(state.notes, state.selectedNoteId) : Note.newNote(),
+			note: state.selectedNoteId ? Note.byId(state.notes, state.selectedNoteId) : Note.newNote(state.selectedFolderId),
 		};
 	}
 )(NoteScreenComponent)
diff --git a/ReactNativeClient/src/database.js b/ReactNativeClient/src/database.js
index 392612467..27f8d77b8 100644
--- a/ReactNativeClient/src/database.js
+++ b/ReactNativeClient/src/database.js
@@ -102,7 +102,7 @@ class Database {
 	}
 
 	open() {
-		this.db_ = SQLite.openDatabase({ name: '/storage/emulated/0/Download/joplin-5.sqlite' }, (db) => {
+		this.db_ = SQLite.openDatabase({ name: '/storage/emulated/0/Download/joplin-6.sqlite' }, (db) => {
 			Log.info('Database was open successfully');
 		}, (error) => {
 			Log.error('Cannot open database: ', error);
diff --git a/ReactNativeClient/src/models/note.js b/ReactNativeClient/src/models/note.js
index 02f694a27..a54d36d89 100644
--- a/ReactNativeClient/src/models/note.js
+++ b/ReactNativeClient/src/models/note.js
@@ -11,16 +11,17 @@ class Note extends BaseModel {
 		return true;
 	}
 
-	static newNote() {
+	static newNote(parentId = null) {
 		return {
 			id: null,
 			title: '',
 			body: '',
+			parent_id: parentId,
 		}
 	}
 
-	static previews() {
-		return this.db().selectAll('SELECT id, title, body, updated_time FROM notes').then((r) => {
+	static previews(parentId) {
+		return this.db().selectAll('SELECT id, title, body, parent_id, updated_time FROM notes WHERE parent_id = ?', [parentId]).then((r) => {
 			let output = [];
 			for (let i = 0; i < r.rows.length; i++) {
 				output.push(r.rows.item(i));
@@ -29,6 +30,10 @@ class Note extends BaseModel {
 		});
 	}
 
+	static byFolderId() {
+
+	}
+
 }
 
 export { Note };
\ No newline at end of file
diff --git a/ReactNativeClient/src/root.js b/ReactNativeClient/src/root.js
index 1a43eb128..1119e6363 100644
--- a/ReactNativeClient/src/root.js
+++ b/ReactNativeClient/src/root.js
@@ -8,12 +8,14 @@ import { StackNavigator } from 'react-navigation';
 import { addNavigationHelpers } from 'react-navigation';
 import { Log } from 'src/log.js'
 import { Note } from 'src/models/note.js'
+import { Folder } from 'src/models/folder.js'
 import { Database } from 'src/database.js'
 import { Registry } from 'src/registry.js'
 import { ItemList } from 'src/components/item-list.js'
 import { NotesScreen } from 'src/components/screens/notes.js'
 import { NoteScreen } from 'src/components/screens/note.js'
 import { FolderScreen } from 'src/components/screens/folder.js'
+import { FoldersScreen } from 'src/components/screens/folders.js'
 import { LoginScreen } from 'src/components/screens/login.js'
 import { Setting } from 'src/models/setting.js'
 
@@ -21,10 +23,10 @@ let defaultState = {
 	defaultText: 'bla',
 	notes: [],
 	folders: [
-		{ id: 'abcdabcdabcdabcdabcdabcdabcdab01', title: "un" },
-		{ id: 'abcdabcdabcdabcdabcdabcdabcdab02', title: "deux" },
-		{ id: 'abcdabcdabcdabcdabcdabcdabcdab03', title: "trois" },
-		{ id: 'abcdabcdabcdabcdabcdabcdabcdab04', title: "quatre" },
+		// { id: 'abcdabcdabcdabcdabcdabcdabcdab01', title: "un" },
+		// { id: 'abcdabcdabcdabcdabcdabcdabcdab02', title: "deux" },
+		// { id: 'abcdabcdabcdabcdabcdabcdabcdab03', title: "trois" },
+		// { id: 'abcdabcdabcdabcdabcdabcdabcdab04', title: "quatre" },
 	],
 	selectedNoteId: null,
 	selectedFolderId: null,
@@ -53,7 +55,11 @@ const reducer = (state = defaultState, action) => {
 			}
 
 			if (action.noteId) {
-				newState.selectedNoteId = action.noteId;				
+				newState.selectedNoteId = action.noteId;
+			}
+
+			if (action.folderId) {
+				newState.selectedFolderId = action.folderId;
 			}
 
 			break;
@@ -86,6 +92,12 @@ const reducer = (state = defaultState, action) => {
 			newState.notes = newNotes;
 			break;
 
+		case 'FOLDERS_UPDATE_ALL':
+
+			newState = Object.assign({}, state);
+			newState.folders = action.folders;
+			break;
+
 		case 'FOLDERS_UPDATE_ONE':
 
 			let newFolders = state.folders.splice(0);
@@ -116,6 +128,7 @@ const AppNavigator = StackNavigator({
 	Notes: {screen: NotesScreen},
 	Note: {screen: NoteScreen},
 	Folder: {screen: FolderScreen},
+	Folders: {screen: FoldersScreen},
 	Login: {screen: LoginScreen},
 });
 
@@ -133,15 +146,26 @@ class AppComponent extends React.Component {
 			return Setting.load();
 		}).then(() => {
 			Log.info('Client ID', Setting.value('clientId'));
-			Log.info('Loading notes...');
-			Note.previews().then((notes) => {
+			Log.info('Loading folders...');
+
+			Folder.all().then((folders) => {
 				this.props.dispatch({
-					type: 'NOTES_UPDATE_ALL',
-					notes: notes,
+					type: 'FOLDERS_UPDATE_ALL',
+					folders: folders,
 				});
 			}).catch((error) => {
-				Log.warn('Cannot load notes', error);
+				Log.warn('Cannot load folders', error);
 			});
+		// }).then(() => {
+		// 	Log.info('Loading notes...');
+		// 	Note.previews().then((notes) => {
+		// 		this.props.dispatch({
+		// 			type: 'NOTES_UPDATE_ALL',
+		// 			notes: notes,
+		// 		});
+		// 	}).catch((error) => {
+		// 		Log.warn('Cannot load notes', error);
+		// 	});
 		}).catch((error) => {
 			Log.error('Cannot initialize database:', error);
 		});
@@ -157,7 +181,7 @@ class AppComponent extends React.Component {
 	}
 }
 
-defaultState.nav = AppNavigator.router.getStateForAction(AppNavigator.router.getActionForPathAndParams('Notes'));
+defaultState.nav = AppNavigator.router.getStateForAction(AppNavigator.router.getActionForPathAndParams('Folders'));
 
 const mapStateToProps = (state) => {
 	return {