github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-03 13:53:37 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1996 from overleaf/spd-soft-deletion-admin-panel-improvements

Browse source 
Improve display of soft-deleted things in admin panel

GitOrigin-RevId: 8413103fb750749bb27c69ccb6ff34c4ef62d402
This commit is contained in:
Simon Detheridge 2019-07-26 15:26:39 +01:00 committed by sharelatex
parent d7bee9a7d8
commit 2243f42f9b
1 changed files with 70 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
View file

@ -43,50 +43,67 @@ module.exports = CollaboratorsHandler = {
tokenAccessReadAndWrite_refs: 1,
publicAccesLevel: 1
}
return ProjectGetter.getProject(project_id, projection, function(
error,
project
) {
let member_id
if (error != null) {
ProjectGetter.getProject(project_id, projection, (error, project) => {
if (error) {
return callback(error)
}
if (project == null) {
if (!project) {
return callback(
new Errors.NotFoundError(`no project found with id ${project_id}`)
)
}
callback(
null,
CollaboratorsHandler.getMemberIdsWithPrivilegeLevelsFromFields(
project.owner_ref,
project.collaberator_refs,
project.readOnly_refs,
project.tokenAccessReadAndWrite_refs,
project.tokenAccessReadOnly_refs,
project.publicAccesLevel
)
)
})
},
getMemberIdsWithPrivilegeLevelsFromFields(
ownerId,
collaboratorIds,
readOnlyIds,
tokenAccessIds,
tokenAccessReadOnlyIds,
publicAccessLevel
) {
let member_id
const members = []
members.push({
id: project.owner_ref.toString(),
id: ownerId.toString(),
privilegeLevel: PrivilegeLevels.OWNER,
source: Sources.OWNER
})
for (member_id of Array.from(project.collaberator_refs || [])) {
for (member_id of Array.from(collaboratorIds || [])) {
members.push({
id: member_id.toString(),
privilegeLevel: PrivilegeLevels.READ_AND_WRITE,
source: Sources.INVITE
})
}
for (member_id of Array.from(project.readOnly_refs || [])) {
for (member_id of Array.from(readOnlyIds || [])) {
members.push({
id: member_id.toString(),
privilegeLevel: PrivilegeLevels.READ_ONLY,
source: Sources.INVITE
})
}
if (project.publicAccesLevel === PublicAccessLevels.TOKEN_BASED) {
for (member_id of Array.from(
project.tokenAccessReadAndWrite_refs || []
)) {
if (publicAccessLevel === PublicAccessLevels.TOKEN_BASED) {
for (member_id of Array.from(tokenAccessIds || [])) {
members.push({
id: member_id.toString(),
privilegeLevel: PrivilegeLevels.READ_AND_WRITE,
source: Sources.TOKEN
})
}
for (member_id of Array.from(project.tokenAccessReadOnly_refs || [])) {
for (member_id of Array.from(tokenAccessReadOnlyIds || [])) {
members.push({
id: member_id.toString(),
privilegeLevel: PrivilegeLevels.READ_ONLY,
@ -94,8 +111,7 @@ module.exports = CollaboratorsHandler = {
})
}
}
return callback(null, members)
})
return members
},
getMemberIds(project_id, callback) {
@ -211,6 +227,25 @@ module.exports = CollaboratorsHandler = {
)
},
getInvitedMembersWithPrivilegeLevelsFromFields(
ownerId,
collaboratorIds,
readOnlyIds,
callback
) {
let members = CollaboratorsHandler.getMemberIdsWithPrivilegeLevelsFromFields(
ownerId,
collaboratorIds,
readOnlyIds,
[],
[],
null
)
return CollaboratorsHandler._loadMembers(members, (error, users) =>
callback(error, users)
)
},
getTokenMembersWithPrivilegeLevels(project_id, callback) {
if (callback == null) {
callback = function(error, members) {}