| author | salimr <riwad.salim@yahoo.fr> |
| Mon, 03 Sep 2018 20:02:14 +0200 | |
| changeset 154 | a28361bda28c |
| parent 151 | 57d63a248f0d |
| child 161 | a642639dbc07 |
| permissions | -rw-r--r-- |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
1 |
import React, { Component } from 'react'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
2 |
import { connect } from 'react-redux'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
3 |
import { bindActionCreators } from 'redux'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
4 |
import '../App.css'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
5 |
import Navbar from './Navbar'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
6 |
import NoteInput from './NoteInput'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
7 |
import NotesList from './NotesList'; |
|
46
4aa24724e5b3
Move session form to dedicated component.
Alexandre Segura <mex.zktk@gmail.com>
parents:
35
diff
changeset
|
8 |
import SessionForm from './SessionForm'; |
|
63
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
9 |
import SessionSummary from './SessionSummary'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
10 |
import * as sessionsActions from '../actions/sessionsActions'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
11 |
import * as notesActions from '../actions/notesActions'; |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
12 |
import * as userActions from '../actions/userActions'; |
|
137
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
13 |
import { getSession, getSessionNotes } from '../selectors/coreSelectors'; |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
14 |
import { getAutoSubmit } from '../selectors/authSelectors'; |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
15 |
import { extractAnnotationCategories, defaultAnnotationsCategories } from '../constants'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
16 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
17 |
class Session extends Component { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
18 |
render() { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
19 |
return ( |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
20 |
<div> |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
21 |
<Navbar history={this.props.history} /> |
|
35
97106bacb24e
Improve session page design.
Alexandre Segura <mex.zktk@gmail.com>
parents:
34
diff
changeset
|
22 |
<div className="session-container"> |
|
63
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
23 |
<div className="session-notes"> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
24 |
<div className="notes-affix"> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
25 |
<SessionSummary notes={this.props.notes} /> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
26 |
</div> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
27 |
<div className="notes-list"> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
28 |
<SessionForm session={this.props.currentSession} /> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
29 |
<hr /> |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
30 |
<NotesList |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
31 |
notes={this.props.notes} |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
32 |
deleteNote={this.props.notesActions.deleteNote} |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
33 |
updateNote={this.props.notesActions.updateNote} |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
34 |
annotationCategories={this.props.annotationCategories} |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
35 |
/> |
|
63
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
36 |
</div> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
37 |
</div> |
|
35
97106bacb24e
Improve session page design.
Alexandre Segura <mex.zktk@gmail.com>
parents:
34
diff
changeset
|
38 |
<section className="editor-fixed"> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
39 |
<div className="container-fluid"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
40 |
<div className="row"> |
| 151 | 41 |
<div className="col-lg-9 offset-md-3"> |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
42 |
<NoteInput |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
43 |
session={this.props.currentSession} |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
44 |
autoSubmit={this.props.autoSubmit} |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
45 |
addNote={this.props.notesActions.addNote} |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
46 |
setAutoSubmit={this.props.userActions.setAutoSubmit} |
|
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
47 |
annotationCategories={this.props.annotationCategories}/> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
48 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
49 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
50 |
</div> |
|
35
97106bacb24e
Improve session page design.
Alexandre Segura <mex.zktk@gmail.com>
parents:
34
diff
changeset
|
51 |
</section> |
|
97106bacb24e
Improve session page design.
Alexandre Segura <mex.zktk@gmail.com>
parents:
34
diff
changeset
|
52 |
</div> |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
53 |
</div> |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
54 |
); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
55 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
56 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
57 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
58 |
function mapStateToProps(state, props) { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
59 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
60 |
const sessionId = props.match.params.id; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
61 |
|
|
137
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
62 |
const autoSubmit = getAutoSubmit(state); |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
63 |
const currentSession = getSession(sessionId, state); |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
64 |
const currentNotes = getSessionNotes(sessionId, state); |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
65 |
const annotationCategories = currentSession?extractAnnotationCategories(currentSession.get('protocol')):defaultAnnotationsCategories; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
66 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
67 |
return { |
|
30
4d93f4ed95bc
Update session in PouchDB.
Alexandre Segura <mex.zktk@gmail.com>
parents:
29
diff
changeset
|
68 |
currentSession, |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
59
diff
changeset
|
69 |
notes: currentNotes, |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
70 |
autoSubmit, |
|
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
71 |
annotationCategories |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
72 |
}; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
73 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
74 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
75 |
function mapDispatchToProps(dispatch) { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
76 |
return { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
77 |
sessionsActions: bindActionCreators(sessionsActions, dispatch), |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
78 |
notesActions: bindActionCreators(notesActions, dispatch), |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
79 |
userActions: bindActionCreators(userActions, dispatch) |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
80 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
81 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
82 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
83 |
export default connect(mapStateToProps, mapDispatchToProps)(Session); |