diff --git a/app/router.cjsx b/app/router.cjsx
index d2aba75cfa..2348202e51 100644
--- a/app/router.cjsx
+++ b/app/router.cjsx
@@ -103,6 +103,7 @@ module.exports =
+
@@ -121,4 +122,3 @@ module.exports =
-
diff --git a/app/subjects/comment-form.cjsx b/app/subjects/comment-form.cjsx
new file mode 100644
index 0000000000..23aaabf0ee
--- /dev/null
+++ b/app/subjects/comment-form.cjsx
@@ -0,0 +1,98 @@
+React = require 'react'
+{Navigation, Link} = require '@edpaget/react-router'
+talkClient = require '../api/talk'
+NewDiscussionForm = require '../talk/discussion-new-form'
+QuickSubjectCommentForm= require '../talk/quick-subject-comment-form'
+PromiseRenderer = require '../components/promise-renderer'
+Loading = require '../components/loading-indicator'
+SignInPrompt = require '../partials/sign-in-prompt'
+alert = require '../lib/alert'
+
+module?.exports = React.createClass
+ displayName: 'SubjectCommentForm'
+ mixins: [Navigation]
+
+ componentWillMount: ->
+ Promise.all([@getBoards(), @getSubjectDefaultBoard()]).then =>
+ @setState loading: false
+
+ getInitialState: ->
+ loading: true
+ tab: 0
+
+ getBoards: ->
+ talkClient.type('boards').get(section: @props.section, subject_default: false).then (boards) =>
+ @setState {boards}
+
+ getSubjectDefaultBoard: ->
+ talkClient.type('boards').get(section: @props.section, subject_default: true).then ([subjectDefaultBoard]) =>
+ @setState {subjectDefaultBoard}
+
+ onCreateDiscussion: (createdDiscussion) ->
+ {owner, name} = @props.params
+ board = createdDiscussion.board_id
+ discussion = createdDiscussion.id
+ @transitionTo 'project-talk-discussion', {owner, name, board, discussion}
+
+ linkToClassifier: (text) ->
+ [owner, name] = @props.project.slug.split('/')
+
{text}
+
+ popup: ->
+ alert (resolve) ->
+
+ loginPrompt: ->
+
+ Please{' '}
+ {' '}
+ to contribute to subject discussions
+
+
+ notSetup: ->
+
There are no discussion boards setup for this project yet. Check back soon!
+
+ quickComment: ->
+ if @state.subjectDefaultBoard
+
+ else
+
+ There is no default board for subject comments setup yet, Please{' '}
+ {' '}
+ or {@linkToClassifier('return to classifying')}
+
+
+ startDiscussion: ->
+
+
+ renderTab: ->
+ switch @state.tab
+ when 0 then @quickComment()
+ when 1 then @startDiscussion()
+
+ render: ->
+ return
if @state.loading
+ return @notSetup() unless @state.boards
+ return @loginPrompt() unless @props.user
+
+
+
+
+
+
@setState({tab: 0})}>
+ Add a note about this subject
+
+
+
@setState({tab: 1})}>
+ Start a new discussion
+
+
+
+
+
+ {@renderTab()}
+
diff --git a/app/subjects/comment-list.cjsx b/app/subjects/comment-list.cjsx
new file mode 100644
index 0000000000..76113480b2
--- /dev/null
+++ b/app/subjects/comment-list.cjsx
@@ -0,0 +1,52 @@
+React = require 'react'
+talkClient = require '../api/talk'
+Comment = require '../talk/comment'
+Paginator = require '../talk/lib/paginator'
+Loading = require '../components/loading-indicator'
+
+module?.exports = React.createClass
+ displayName: 'SubjectCommentList'
+
+ componentWillMount: ->
+ @getComments()
+
+ componentWillReceiveProps: (nextProps) ->
+ if nextProps.query.page isnt @props.query.page
+ @getComments nextProps.query.page
+
+ getDefaultProps: ->
+ query: page: 1
+
+ getInitialState: ->
+ meta: { }
+
+ getComments: (page = @props.query.page) ->
+ query =
+ section: @props.section
+ focus_id: @props.subject.id
+ focus_type: 'Subject'
+ page: page or 1
+ sort: '-created_at'
+
+ talkClient.type('comments').get(query).then (comments) =>
+ meta = comments[0]?.getMeta() or { }
+ @setState {comments, meta}
+
+ render: ->
+ return
unless @state.comments
+
+ if @state.comments.length > 0
+
+
Comments:
+
+ {for comment in @state.comments
+ }
+
+
+ {if +@state.meta.page_count > 1
+
}
+
+ else
+
There are no comments yet
diff --git a/app/subjects/discussion-list.cjsx b/app/subjects/discussion-list.cjsx
new file mode 100644
index 0000000000..cac077f3b9
--- /dev/null
+++ b/app/subjects/discussion-list.cjsx
@@ -0,0 +1,42 @@
+React = require 'react'
+talkClient = require '../api/talk'
+DiscussionPreview = require '../talk/discussion-preview'
+Loading = require '../components/loading-indicator'
+
+module?.exports = React.createClass
+ displayName: 'SubjectDiscussionList'
+
+ componentWillMount: ->
+ @getDiscussions()
+
+ getInitialState: ->
+ discussions: null
+
+ getDiscussions: ->
+ query =
+ section: @props.section
+ focus_id: @props.subject.id
+ focus_type: 'Subject'
+ page_size: 20
+ sort: '-created_at'
+
+ talkClient.type('discussions').get(query).then (discussions) =>
+ @setState {discussions}
+
+ render: ->
+ return
unless @state.discussions
+
+ if @state.discussions.length > 0
+
+
Discussions:
+
+ {for discussion in @state.discussions
+ }
+
+
+ else
+
There are no discussions yet
diff --git a/app/subjects/index.cjsx b/app/subjects/index.cjsx
index aaefc2072b..4d8c27c26b 100644
--- a/app/subjects/index.cjsx
+++ b/app/subjects/index.cjsx
@@ -1,156 +1,52 @@
React = require 'react'
apiClient = require '../api/client'
talkClient = require '../api/talk'
-getSubjectLocation = require '../lib/get-subject-location'
-FavoritesButton = require '../collections/favorites-button'
-PromiseRenderer = require '../components/promise-renderer'
SubjectViewer = require '../components/subject-viewer'
-NewDiscussionForm = require '../talk/discussion-new-form'
-CommentLink = require '../talk/comment-link'
-projectSection = require '../talk/lib/project-section'
-parseSection = require '../talk/lib/parse-section'
-QuickSubjectCommentForm= require '../talk/quick-subject-comment-form'
-{Navigation, Link} = require '@edpaget/react-router'
-{Markdown} = require 'markdownz'
-alert = require '../lib/alert'
-SignInPrompt = require '../partials/sign-in-prompt'
-Comment = require '../talk/comment'
-Paginator = require '../talk/lib/paginator'
PopularTags = require '../talk/popular-tags'
ActiveUsers = require '../talk/active-users'
ProjectLinker = require '../talk/lib/project-linker'
-
-indexOf = (elem) ->
- (elem while elem = elem.previousSibling).length
-
-promptToSignIn = ->
- alert (resolve) ->
+SubjectCommentForm = require './comment-form'
+SubjectCommentList = require './comment-list'
+SubjectDiscussionList = require './discussion-list'
+SubjectMentionList = require './mention-list'
module?.exports = React.createClass
displayName: 'Subject'
- mixins: [Navigation]
getInitialState: ->
subject: null
- tab: 0
- comments: []
- commentsMeta: {}
-
- getDefaultProps: ->
- query: page: 1
componentWillMount: ->
- @setSubject().then(@setComments)
+ @setSubject()
componentWillReceiveProps: (nextProps) ->
- if nextProps.params?.id isnt @props.params?.id
- @setSubject().then(@setComments)
-
- if nextProps.query.page isnt @props.query.page
- @setComments(@state.subject, nextProps.query.page)
+ @setSubject() if nextProps.params?.id isnt @props.params?.id
setSubject: ->
- subjectId = @props.params?.id.toString()
- apiClient.type('subjects').get(subjectId)
- .then (subject) =>
- @setState {subject}
- subject
-
- setComments: (subject = @state.subject, page = @props.query.page ? 1) ->
- talkClient.type('comments')
- .get({focus_id: subject.id, focus_type: 'Subject', page, sort: '-created_at'})
- .then (comments) =>
- commentsMeta = comments[0]?.getMeta()
- @setState {comments, commentsMeta}
-
- comment: (comment, i) ->
-
-
- onCreateDiscussion: (discussion) ->
- projectId = parseSection(discussion.section)
- apiClient.type('projects').get(projectId).then (project) =>
- [owner, name] = project.slug.split('/')
- @transitionTo('project-talk-discussion', {owner: owner, name: name, board: discussion.board_id, discussion: discussion.id})
-
- linkToClassifier: (text) ->
- [owner, name] = @props.project.slug.split('/')
-
{text}
+ subjectId = @props.params.id.toString()
+ apiClient.type('subjects').get(subjectId).then (subject) =>
+ @setState {subject}
render: ->
- {subject, comments, commentsMeta} = @state
-
- {if subject
-
- Subject {subject.id}
-
-
-
- {if comments?.length
-
-
Comments mentioning this subject:
-
{comments.map(@comment)}
-
-
-
There are no comments focused on this subject
}
-
- {if @props.user
- {# TODO remove subject.get('project'), replace with params but browser freezes on get to projects with slug}
- project = subject.get('project')
- boards = project.then (project) -> talkClient.type('boards').get(section: projectSection(project), subject_default: false)
- subjectDefaultBoard = project.then (project) -> talkClient.type('boards').get(section: projectSection(project), subject_default: true)
-
- {([boards, subjectDefaultBoard]) =>
- defaultExists = subjectDefaultBoard.length
- if boards.length or defaultExists
-
-
-
-
-
@setState({tab: 0})}>
- Add a note about this subject
-
-
-
@setState({tab: 1})}>
- Start a new discussion
-
-
-
-
-
- {if @state.tab is 0
- if defaultExists
-
- else
-
- There is no default board for subject comments setup yet, Please{' '}
- {' '}
- or {@linkToClassifier('return to classifying')}
-
- else if @state.tab is 1
-
- }
-
-
There are no discussion boards setup for this project yet. Check back soon!
- }
- else
- Please to contribute to subject discussions
}
- }
+
+ {if @state.subject
+
+
Subject {@state.subject.id}
+
+
+
+
+
+
+
+ }
+
+ @getMentions()
+
+ getInitialState: ->
+ mentions: null
+
+ getMentions: ->
+ query =
+ section: @props.section
+ mentionable_id: @props.subject.id
+ mentionable_type: 'Subject'
+ sort: '-created_at'
+ page_size: 20
+ include: 'comment'
+
+ talkClient.type('mentions').get(query).then (mentions) =>
+ Promise.all mentions.map (mention) ->
+ mention.get('comment').then (comment) ->
+ mention.update {comment}
+ .then (mentions) =>
+ @setState {mentions}
+
+ render: ->
+ return unless @state.mentions
+
+ if @state.mentions.length > 0
+
+
Mentions:
+
+ {for mention in @state.mentions
+ }
+
+