2016-10-12 12:27:20 -04:00
|
|
|
define [
|
|
|
|
"base",
|
|
|
|
"utils/EventEmitter"
|
2016-11-09 11:23:08 -05:00
|
|
|
"ide/colors/ColorManager"
|
2016-12-08 09:10:30 -05:00
|
|
|
"ide/review-panel/RangesTracker"
|
|
|
|
], (App, EventEmitter, ColorManager, RangesTracker) ->
|
2016-12-09 10:43:08 -05:00
|
|
|
App.controller "ReviewPanelController", ($scope, $element, ide, $timeout, $http) ->
|
2016-11-17 07:02:45 -05:00
|
|
|
$reviewPanelEl = $element.find "#review-panel"
|
|
|
|
|
2016-11-16 07:31:47 -05:00
|
|
|
$scope.SubViews =
|
|
|
|
CUR_FILE : "cur_file"
|
|
|
|
OVERVIEW : "overview"
|
|
|
|
|
2016-10-12 12:27:20 -04:00
|
|
|
$scope.reviewPanel =
|
|
|
|
entries: {}
|
2016-11-15 10:04:29 -05:00
|
|
|
hasEntries: false
|
2016-11-16 07:31:47 -05:00
|
|
|
subView: $scope.SubViews.CUR_FILE
|
2016-11-17 09:57:11 -05:00
|
|
|
openSubView: $scope.SubViews.CUR_FILE
|
2016-12-09 10:43:08 -05:00
|
|
|
overview:
|
|
|
|
loading: false
|
2016-12-16 11:42:41 -05:00
|
|
|
commentThreads: {}
|
2016-11-15 10:04:29 -05:00
|
|
|
|
2016-11-09 09:50:58 -05:00
|
|
|
$scope.commentState =
|
|
|
|
adding: false
|
|
|
|
content: ""
|
2016-11-15 10:48:12 -05:00
|
|
|
|
2016-11-17 05:40:08 -05:00
|
|
|
$scope.reviewPanelEventsBridge = new EventEmitter()
|
2016-12-16 11:42:41 -05:00
|
|
|
|
|
|
|
$http.get "/project/#{$scope.project_id}/threads"
|
|
|
|
.success (threads) ->
|
2017-01-04 10:26:02 -05:00
|
|
|
for thread_id, thread of threads
|
|
|
|
for comment in thread.messages
|
2016-12-16 11:42:41 -05:00
|
|
|
formatComment(comment)
|
2017-01-04 10:26:02 -05:00
|
|
|
if thread.resolved_by_user?
|
2017-01-05 04:55:16 -05:00
|
|
|
$scope.$broadcast "comment:resolve_thread", thread_id
|
2017-01-04 10:26:02 -05:00
|
|
|
formatUser(thread.resolved_by_user)
|
2016-12-16 11:42:41 -05:00
|
|
|
$scope.reviewPanel.commentThreads = threads
|
|
|
|
|
|
|
|
ide.socket.on "new-comment", (thread_id, comment) ->
|
2017-01-04 10:26:02 -05:00
|
|
|
$scope.reviewPanel.commentThreads[thread_id] ?= { messages: [] }
|
|
|
|
$scope.reviewPanel.commentThreads[thread_id].messages.push(formatComment(comment))
|
2016-12-16 11:42:41 -05:00
|
|
|
$scope.$apply()
|
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-11-17 05:40:08 -05:00
|
|
|
|
2016-12-08 09:10:30 -05:00
|
|
|
rangesTrackers = {}
|
2016-11-21 10:18:46 -05:00
|
|
|
|
2016-11-21 11:57:52 -05:00
|
|
|
getDocEntries = (doc_id) ->
|
|
|
|
$scope.reviewPanel.entries[doc_id] ?= {}
|
|
|
|
return $scope.reviewPanel.entries[doc_id]
|
|
|
|
|
|
|
|
getChangeTracker = (doc_id) ->
|
2016-12-08 09:10:30 -05:00
|
|
|
rangesTrackers[doc_id] ?= new RangesTracker()
|
|
|
|
return rangesTrackers[doc_id]
|
2016-11-21 11:57:52 -05:00
|
|
|
|
2016-11-17 09:29:35 -05:00
|
|
|
scrollbar = {}
|
2016-11-17 07:02:45 -05:00
|
|
|
$scope.reviewPanelEventsBridge.on "aceScrollbarVisibilityChanged", (isVisible, scrollbarWidth) ->
|
2016-11-17 09:29:35 -05:00
|
|
|
scrollbar = {isVisible, scrollbarWidth}
|
|
|
|
updateScrollbar()
|
|
|
|
|
|
|
|
updateScrollbar = () ->
|
|
|
|
if scrollbar.isVisible and $scope.reviewPanel.subView == $scope.SubViews.CUR_FILE
|
|
|
|
$reviewPanelEl.css "right", "#{ scrollbar.scrollbarWidth }px"
|
2016-11-17 07:02:45 -05:00
|
|
|
else
|
|
|
|
$reviewPanelEl.css "right", "0"
|
2016-11-17 09:29:35 -05:00
|
|
|
|
|
|
|
$scope.$watch "reviewPanel.subView", (subView) ->
|
|
|
|
return if !subView?
|
|
|
|
updateScrollbar()
|
2016-11-17 09:57:11 -05:00
|
|
|
|
|
|
|
$scope.$watch "ui.reviewPanelOpen", (open) ->
|
|
|
|
return if !open?
|
|
|
|
if !open
|
|
|
|
# Always show current file when not open, but save current state
|
|
|
|
$scope.reviewPanel.openSubView = $scope.reviewPanel.subView
|
|
|
|
$scope.reviewPanel.subView = $scope.SubViews.CUR_FILE
|
|
|
|
else
|
|
|
|
# Reset back to what we had when previously open
|
|
|
|
$scope.reviewPanel.subView = $scope.reviewPanel.openSubView
|
2016-12-09 10:43:08 -05:00
|
|
|
|
|
|
|
$scope.$watch "reviewPanel.subView", (view) ->
|
|
|
|
return if !view?
|
|
|
|
if view == $scope.SubViews.OVERVIEW
|
|
|
|
refreshOverviewPanel()
|
2016-11-15 10:48:12 -05:00
|
|
|
|
2016-12-13 12:34:29 -05:00
|
|
|
$scope.$watch "editor.sharejs_doc", (doc) ->
|
|
|
|
return if !doc?
|
|
|
|
# The open doc range tracker is kept up to date in real-time so
|
|
|
|
# replace any outdated info with this
|
|
|
|
rangesTrackers[doc.doc_id] = doc.ranges
|
|
|
|
$scope.reviewPanel.rangesTracker = rangesTrackers[doc.doc_id]
|
2016-11-15 10:48:12 -05:00
|
|
|
|
2016-11-16 12:17:50 -05:00
|
|
|
$scope.$watch (() ->
|
|
|
|
entries = $scope.reviewPanel.entries[$scope.editor.open_doc_id] or {}
|
|
|
|
Object.keys(entries).length
|
|
|
|
), (nEntries) ->
|
|
|
|
$scope.reviewPanel.hasEntries = nEntries > 0 and $scope.trackChangesFeatureFlag
|
2016-11-16 11:28:01 -05:00
|
|
|
|
|
|
|
$scope.$watch "ui.reviewPanelOpen", (reviewPanelOpen) ->
|
|
|
|
return if !reviewPanelOpen?
|
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:toggle"
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-11-09 09:50:58 -05:00
|
|
|
|
2016-12-09 10:43:08 -05:00
|
|
|
refreshOverviewPanel = () ->
|
|
|
|
$scope.reviewPanel.overview.loading = true
|
|
|
|
$http.get "/project/#{$scope.project_id}/ranges"
|
|
|
|
.success (docs) ->
|
|
|
|
for doc in docs
|
|
|
|
if doc.id != $scope.editor.open_doc_id # this is kept up to date in real-time, don't overwrite
|
|
|
|
rangesTrackers[doc.id] ?= new RangesTracker()
|
|
|
|
rangesTrackers[doc.id].comments = doc.ranges?.comments or []
|
|
|
|
rangesTrackers[doc.id].changes = doc.ranges?.changes or []
|
|
|
|
updateEntries(doc.id)
|
|
|
|
$scope.reviewPanel.overview.loading = false
|
|
|
|
.error (error) ->
|
|
|
|
console.log "loading ranges errored", error
|
|
|
|
$scope.reviewPanel.overview.loading = false
|
|
|
|
|
2016-11-21 11:57:52 -05:00
|
|
|
updateEntries = (doc_id) ->
|
2016-12-08 09:10:30 -05:00
|
|
|
rangesTracker = getChangeTracker(doc_id)
|
2016-11-21 11:57:52 -05:00
|
|
|
entries = getDocEntries(doc_id)
|
|
|
|
|
|
|
|
# Assume we'll delete everything until we see it, then we'll remove it from this object
|
|
|
|
delete_changes = {}
|
|
|
|
delete_changes[change_id] = true for change_id, change of entries
|
|
|
|
|
2016-12-08 09:10:30 -05:00
|
|
|
for change in rangesTracker.changes
|
2016-11-21 11:57:52 -05:00
|
|
|
delete delete_changes[change.id]
|
|
|
|
entries[change.id] ?= {}
|
|
|
|
|
|
|
|
# Update in place to avoid a full DOM redraw via angular
|
|
|
|
metadata = {}
|
|
|
|
metadata[key] = value for key, value of change.metadata
|
|
|
|
new_entry = {
|
|
|
|
type: if change.op.i then "insert" else "delete"
|
|
|
|
content: change.op.i or change.op.d
|
|
|
|
offset: change.op.p
|
|
|
|
metadata: change.metadata
|
|
|
|
}
|
|
|
|
for key, value of new_entry
|
|
|
|
entries[change.id][key] = value
|
|
|
|
|
2016-12-08 09:10:30 -05:00
|
|
|
for comment in rangesTracker.comments
|
2016-11-21 11:57:52 -05:00
|
|
|
delete delete_changes[comment.id]
|
|
|
|
entries[comment.id] ?= {}
|
|
|
|
new_entry = {
|
|
|
|
type: "comment"
|
2016-12-16 11:42:41 -05:00
|
|
|
thread_id: comment.op.t
|
2016-12-13 12:57:46 -05:00
|
|
|
content: comment.op.c
|
|
|
|
offset: comment.op.p
|
2016-11-21 11:57:52 -05:00
|
|
|
}
|
|
|
|
for key, value of new_entry
|
|
|
|
entries[comment.id][key] = value
|
|
|
|
|
|
|
|
for change_id, _ of delete_changes
|
|
|
|
delete entries[change_id]
|
|
|
|
|
|
|
|
$scope.$on "editor:track-changes:changed", () ->
|
|
|
|
doc_id = $scope.editor.open_doc_id
|
|
|
|
updateEntries(doc_id)
|
|
|
|
$scope.$broadcast "review-panel:recalculate-screen-positions"
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
|
|
|
|
|
|
|
$scope.$on "editor:focus:changed", (e, cursor_offset, selection) ->
|
|
|
|
doc_id = $scope.editor.open_doc_id
|
|
|
|
entries = getDocEntries(doc_id)
|
|
|
|
|
|
|
|
if !selection
|
|
|
|
delete entries["add-comment"]
|
|
|
|
else
|
|
|
|
entries["add-comment"] = {
|
|
|
|
type: "add-comment"
|
|
|
|
offset: cursor_offset
|
|
|
|
}
|
|
|
|
|
|
|
|
for id, entry of entries
|
|
|
|
if entry.type == "comment" and not entry.resolved
|
2016-12-16 11:42:41 -05:00
|
|
|
entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.content.length)
|
2016-11-21 11:57:52 -05:00
|
|
|
else if entry.type == "insert"
|
|
|
|
entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.content.length)
|
|
|
|
else if entry.type == "delete"
|
|
|
|
entry.focused = (entry.offset == cursor_offset)
|
|
|
|
else if entry.type == "add-comment" and selection
|
|
|
|
entry.focused = true
|
|
|
|
|
|
|
|
$scope.$broadcast "review-panel:recalculate-screen-positions"
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
|
|
|
|
2016-11-10 05:52:09 -05:00
|
|
|
$scope.acceptChange = (entry_id) ->
|
|
|
|
$scope.$broadcast "change:accept", entry_id
|
|
|
|
|
|
|
|
$scope.rejectChange = (entry_id) ->
|
|
|
|
$scope.$broadcast "change:reject", entry_id
|
|
|
|
|
2016-11-09 10:25:41 -05:00
|
|
|
$scope.startNewComment = () ->
|
2016-11-09 09:50:58 -05:00
|
|
|
$scope.$broadcast "comment:select_line"
|
2016-11-16 11:03:06 -05:00
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-11-09 09:50:58 -05:00
|
|
|
|
2016-11-16 10:47:05 -05:00
|
|
|
$scope.submitNewComment = (content) ->
|
2016-12-16 11:42:41 -05:00
|
|
|
thread_id = RangesTracker.newId()
|
|
|
|
$scope.$broadcast "comment:add", thread_id
|
|
|
|
$http.post("/project/#{$scope.project_id}/thread/#{thread_id}/messages", {content, _csrf: window.csrfToken})
|
|
|
|
.error (error) ->
|
|
|
|
ide.showGenericMessageModal("Error submitting comment", "Sorry, there was a problem submitting your comment")
|
2016-11-16 11:03:06 -05:00
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-11-09 10:25:41 -05:00
|
|
|
|
2016-11-09 10:51:40 -05:00
|
|
|
$scope.cancelNewComment = (entry) ->
|
2016-11-16 11:03:06 -05:00
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-11-09 10:51:40 -05:00
|
|
|
|
2016-11-09 10:25:41 -05:00
|
|
|
$scope.startReply = (entry) ->
|
|
|
|
entry.replying = true
|
2016-11-16 11:03:06 -05:00
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-11-11 05:51:32 -05:00
|
|
|
|
2016-11-17 13:06:08 -05:00
|
|
|
$scope.submitReply = (entry, entry_id) ->
|
2017-01-05 04:34:28 -05:00
|
|
|
$scope.unresolveComment(entry, entry_id)
|
2016-12-16 11:42:41 -05:00
|
|
|
thread_id = entry.thread_id
|
|
|
|
content = entry.replyContent
|
|
|
|
$http.post("/project/#{$scope.project_id}/thread/#{thread_id}/messages", {content, _csrf: window.csrfToken})
|
|
|
|
.error (error) ->
|
|
|
|
ide.showGenericMessageModal("Error submitting comment", "Sorry, there was a problem submitting your comment")
|
2016-11-11 11:10:26 -05:00
|
|
|
|
|
|
|
entry.replyContent = ""
|
|
|
|
entry.replying = false
|
2016-11-14 06:47:36 -05:00
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-12-16 11:42:41 -05:00
|
|
|
|
2016-11-09 10:51:40 -05:00
|
|
|
$scope.cancelReply = (entry) ->
|
|
|
|
entry.replying = false
|
|
|
|
entry.replyContent = ""
|
2016-11-09 11:23:08 -05:00
|
|
|
$scope.$broadcast "review-panel:layout"
|
2016-11-17 13:06:08 -05:00
|
|
|
|
|
|
|
$scope.resolveComment = (entry, entry_id) ->
|
|
|
|
entry.showWhenResolved = false
|
2016-11-21 06:16:23 -05:00
|
|
|
entry.focused = false
|
2017-01-04 10:26:02 -05:00
|
|
|
thread = $scope.reviewPanel.commentThreads[entry.thread_id]
|
|
|
|
thread.resolved = true
|
|
|
|
thread.resolved_by_user = $scope.users[window.user_id]
|
|
|
|
thread.resolved_at = new Date()
|
|
|
|
$http.post "/project/#{$scope.project_id}/thread/#{entry.thread_id}/resolve", {_csrf: window.csrfToken}
|
2017-01-05 04:55:16 -05:00
|
|
|
$scope.$broadcast "comment:resolve_thread", entry.thread_id
|
2016-11-17 13:06:08 -05:00
|
|
|
|
2017-01-04 10:26:02 -05:00
|
|
|
$scope.unresolveComment = (entry, entry_id) ->
|
|
|
|
thread = $scope.reviewPanel.commentThreads[entry.thread_id]
|
|
|
|
delete thread.resolved
|
|
|
|
delete thread.resolved_by_user
|
|
|
|
delete thread.resolved_at
|
|
|
|
$http.post "/project/#{$scope.project_id}/thread/#{entry.thread_id}/reopen", {_csrf: window.csrfToken}
|
2017-01-05 04:55:16 -05:00
|
|
|
$scope.$broadcast "comment:unresolve_thread", entry.thread_id
|
2016-11-09 11:23:08 -05:00
|
|
|
|
2016-11-17 13:06:08 -05:00
|
|
|
$scope.deleteComment = (entry_id) ->
|
|
|
|
$scope.$broadcast "comment:remove", entry_id
|
|
|
|
|
2016-11-21 06:16:23 -05:00
|
|
|
$scope.showThread = (entry) ->
|
|
|
|
entry.showWhenResolved = true
|
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
|
|
|
|
|
|
|
$scope.hideThread = (entry) ->
|
|
|
|
entry.showWhenResolved = false
|
|
|
|
$timeout () ->
|
|
|
|
$scope.$broadcast "review-panel:layout"
|
|
|
|
|
2016-11-16 07:31:47 -05:00
|
|
|
$scope.setSubView = (subView) ->
|
|
|
|
$scope.reviewPanel.subView = subView
|
2016-11-18 10:08:16 -05:00
|
|
|
|
2016-11-17 10:55:18 -05:00
|
|
|
$scope.gotoEntry = (doc_id, entry) ->
|
2016-11-22 11:34:39 -05:00
|
|
|
ide.editorManager.openDocId(doc_id, { gotoOffset: entry.offset })
|
2016-11-17 10:55:18 -05:00
|
|
|
|
2016-11-09 11:34:23 -05:00
|
|
|
# TODO: Eventually we need to get this from the server, and update it
|
|
|
|
# when we get an id we don't know. This'll do for client side testing
|
2016-11-09 11:23:08 -05:00
|
|
|
refreshUsers = () ->
|
|
|
|
$scope.users = {}
|
|
|
|
for member in $scope.project.members.concat($scope.project.owner)
|
2016-12-16 11:42:41 -05:00
|
|
|
$scope.users[member._id] = formatUser(member)
|
|
|
|
|
|
|
|
formatComment = (comment) ->
|
|
|
|
comment.user = formatUser(user)
|
|
|
|
comment.timestamp = new Date(comment.timestamp)
|
|
|
|
return comment
|
2016-11-11 11:10:26 -05:00
|
|
|
|
2016-12-16 11:42:41 -05:00
|
|
|
formatUser = (user) ->
|
|
|
|
if !user?
|
|
|
|
return {
|
|
|
|
email: null
|
|
|
|
name: "Anonymous"
|
|
|
|
isSelf: false
|
|
|
|
hue: ColorManager.ANONYMOUS_HUE
|
|
|
|
avatar_text: "A"
|
2016-11-09 11:23:08 -05:00
|
|
|
}
|
2016-12-16 11:42:41 -05:00
|
|
|
|
|
|
|
id = user._id or user.id
|
|
|
|
if id == window.user_id
|
|
|
|
name = "You"
|
|
|
|
isSelf = true
|
|
|
|
else
|
|
|
|
name = "#{user.first_name} #{user.last_name}"
|
|
|
|
isSelf = false
|
|
|
|
return {
|
|
|
|
id: id
|
|
|
|
email: user.email
|
|
|
|
name: name
|
|
|
|
isSelf: isSelf
|
|
|
|
hue: ColorManager.getHueForUserId(id)
|
|
|
|
avatar_text: [user.first_name, user.last_name].filter((n) -> n?).map((n) -> n[0]).join ""
|
|
|
|
}
|
2016-11-09 11:23:08 -05:00
|
|
|
|
|
|
|
$scope.$watch "project.members", (members) ->
|
|
|
|
return if !members?
|
|
|
|
refreshUsers()
|