github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Tidy up logic (a bit) around guest track changes

Browse source
This commit is contained in:
James Allen 2018-02-23 09:55:57 +00:00
parent 70da6ad89a
commit 1d3db923f0
1 changed files with 41 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
View file

@ -7,6 +7,24 @@ define [
App.controller "ReviewPanelController", ($scope, $element, ide, $timeout, $http, $modal, event_tracking, localStorage) -> App.controller "ReviewPanelController", ($scope, $element, ide, $timeout, $http, $modal, event_tracking, localStorage) ->
$reviewPanelEl = $element.find "#review-panel" $reviewPanelEl = $element.find "#review-panel"
UserTypes =
MEMBER: 'member' # Invited, listed in project.members
GUEST: 'guest' # Not invited, but logged in so has a user_id
ANONYMOUS: 'anonymous' # No user_id
currentUserType = () ->
if !ide.$scope.user?.id?
return UserTypes.ANONYMOUS
else
user_id = ide.$scope.user.id
project = ide.$scope.project
if project.owner?.id == user_id
return UserTypes.MEMBER
for member in project.members
if member._id == user_id
return UserTypes.MEMBER
return UserTypes.GUEST
$scope.SubViews = $scope.SubViews =
CUR_FILE : "cur_file" CUR_FILE : "cur_file"
OVERVIEW : "overview" OVERVIEW : "overview"
@ -19,7 +37,6 @@ define [
trackChangesState: {} trackChangesState: {}
trackChangesOnForEveryone: false trackChangesOnForEveryone: false
trackChangesOnForGuests: false trackChangesOnForGuests: false
trackChangesOnForThisGuestClient: false
trackChangesForGuestsAvailable: false trackChangesForGuestsAvailable: false
entries: {} entries: {}
resolvedComments: {} resolvedComments: {}
@ -79,13 +96,6 @@ define [
if member.privileges == "readAndWrite" if member.privileges == "readAndWrite"
$scope.reviewPanel.formattedProjectMembers[member._id] = formatUser(member) $scope.reviewPanel.formattedProjectMembers[member._id] = formatUser(member)
$scope.$watch 'project.publicAccesLevel', (level) ->
if level?
$scope.reviewPanel.trackChangesForGuestsAvailable = level == 'tokenBased'
if !$scope.reviewPanel.trackChangesForGuestsAvailable
$scope.trackChangesOnForThisGuestClient = false
$scope.toggleTrackChangesForGuests false
$scope.commentState = $scope.commentState =
adding: false adding: false
content: "" content: ""
@ -626,39 +636,20 @@ define [
_setUserTCState(project.owner._id, newValue, isLocal) _setUserTCState(project.owner._id, newValue, isLocal)
_setGuestsTCState = (newValue, isLocal = false) -> _setGuestsTCState = (newValue, isLocal = false) ->
if $scope.reviewPanel.trackChangesForGuestsAvailable $scope.reviewPanel.trackChangesOnForGuests = newValue
$scope.reviewPanel.trackChangesOnForGuests = newValue if currentUserType() == UserTypes.GUEST or currentUserType() == UserTypes.ANONYMOUS
if ( $scope.editor.wantTrackChanges = newValue
ide.$scope.project.publicAccesLevel == 'tokenBased' &&
ide.$scope.isTokenMember &&
ide.$scope?.user?.id?
)
$scope.trackChangesOnForThisGuestClient = newValue
_setUserTCState(ide.$scope.user.id, newValue, isLocal)
else
$scope.reviewPanel.trackChangesOnForGuests = false
if (
$scope.isTokenMember &&
$scope.user?.id? &&
!_.any($scope.project.members, (m) -> m._id == $scope.user.id)
)
$scope.trackChangesOnForThisGuestClient = false
_setUserTCState(ide.$scope.user.id, false, isLocal)
applyClientTrackChangesStateToServer = () -> applyClientTrackChangesStateToServer = () ->
data = {} data = {}
if $scope.reviewPanel.trackChangesOnForGuests
data.on_for_guests = true
if $scope.reviewPanel.trackChangesOnForEveryone if $scope.reviewPanel.trackChangesOnForEveryone
data.on = true data.on = true
else else
data.on_for = {} data.on_for = {}
for userId, userState of $scope.reviewPanel.trackChangesState for userId, userState of $scope.reviewPanel.trackChangesState
if !( data.on_for[userId] = userState.value
$scope.reviewPanel.trackChangesOnForGuests && if $scope.reviewPanel.trackChangesOnForGuests
$scope.reviewPanel.trackChangesOnForThisGuestClient data.on_for_guests = true
)
data.on_for[userId] = userState.value
data._csrf = window.csrfToken data._csrf = window.csrfToken
$http.post "/project/#{$scope.project_id}/track_changes", data $http.post "/project/#{$scope.project_id}/track_changes", data
@ -696,6 +687,22 @@ define [
return return
$scope.toggleTrackChangesForUser !$scope.reviewPanel.trackChangesState[ide.$scope.user.id].value, ide.$scope.user.id $scope.toggleTrackChangesForUser !$scope.reviewPanel.trackChangesState[ide.$scope.user.id].value, ide.$scope.user.id
setGuestFeatureBasedOnProjectAccessLevel = (projectPublicAccessLevel) ->
$scope.reviewPanel.trackChangesForGuestsAvailable = (projectPublicAccessLevel == 'tokenBased')
onToggleTrackChangesForGuestsAvailability = (available) ->
# If the feature is no longer available we need to turn off the guest flag
return if available
return if !$scope.reviewPanel.trackChangesOnForGuests # Already turned off
return if $scope.reviewPanel.trackChangesOnForEveryone # Overrides guest setting
$scope.toggleTrackChangesForGuests(false)
$scope.$watch 'project.publicAccesLevel', setGuestFeatureBasedOnProjectAccessLevel
$scope.$watch 'reviewPanel.trackChangesForGuestsAvailable', (available) ->
if available?
onToggleTrackChangesForGuestsAvailability(available)
_inited = false _inited = false
ide.$scope.$on "project:joined", () -> ide.$scope.$on "project:joined", () ->
return if _inited return if _inited
@ -705,6 +712,7 @@ define [
applyTrackChangesStateToClient(window.trackChangesState) applyTrackChangesStateToClient(window.trackChangesState)
else else
applyTrackChangesStateToClient(false) applyTrackChangesStateToClient(false)
setGuestFeatureBasedOnProjectAccessLevel(project.publicAccesLevel)
_inited = true _inited = true
_refreshingRangeUsers = false _refreshingRangeUsers = false