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

Merge pull request #17817 from overleaf/jel-group-subscription-page

Browse source 
[web] Only send necesssary group subscription data to frontened

GitOrigin-RevId: bf49245e573bb9a1ec4bafc85cc6d0b7fd5f3e6f
This commit is contained in:
Jessica Lawshe 2024-04-11 08:26:30 -05:00 committed by Copybot
parent 510bb062ee
commit 751e079105
1 changed files with 50 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
View file

@ -154,10 +154,59 @@ async function buildUsersSubscriptionViewModel(user) {
if (memberGroupSubscriptions == null) {
memberGroupSubscriptions = []
} else {
memberGroupSubscriptions = memberGroupSubscriptions.map(group => {
const userIsGroupManager = group.manager_ids?.some(
id => id.toString() === user._id.toString()
)
const groupDataForView = {
_id: group._id,
planCode: group.planCode,
teamName: group.teamName,
admin_id: {
email: group.admin_id.email,
},
userIsGroupManager,
}
if (group.teamNotice) {
groupDataForView.teamNotice = sanitizeHtml(group.teamNotice)
}
buildGroupSubscriptionForView(groupDataForView)
return groupDataForView
})
}
if (managedGroupSubscriptions == null) {
managedGroupSubscriptions = []
} else {
managedGroupSubscriptions = managedGroupSubscriptions.map(group => {
const userIsGroupMember = group.member_ids?.some(
id => id.toString() === user._id.toString()
)
const groupDataForView = {
_id: group._id,
planCode: group.planCode,
groupPlan: group.groupPlan,
teamName: group.teamName,
admin_id: {
_id: group.admin_id._id,
email: group.admin_id.email,
},
features: group.features,
userIsGroupMember,
}
buildGroupSubscriptionForView(groupDataForView)
return groupDataForView
})
}
if (managedInstitutions == null) {
managedInstitutions = []
}
@ -166,12 +215,7 @@ async function buildUsersSubscriptionViewModel(user) {
}
personalSubscription = serializeMongooseObject(personalSubscription)
memberGroupSubscriptions = memberGroupSubscriptions.map(
serializeMongooseObject
)
managedGroupSubscriptions = managedGroupSubscriptions.map(
serializeMongooseObject
)
managedInstitutions = managedInstitutions.map(serializeMongooseObject)
await Promise.all(
managedInstitutions.map(InstitutionsManager.promises.fetchV1Data)
@ -296,33 +340,6 @@ async function buildUsersSubscriptionViewModel(user) {
}
}
for (const memberGroupSubscription of memberGroupSubscriptions) {
if (
memberGroupSubscription.manager_ids?.some(
id => id.toString() === user._id.toString()
)
) {
memberGroupSubscription.userIsGroupManager = true
}
if (memberGroupSubscription.teamNotice) {
memberGroupSubscription.teamNotice = sanitizeHtml(
memberGroupSubscription.teamNotice
)
}
buildGroupSubscriptionForView(memberGroupSubscription)
}
for (const managedGroupSubscription of managedGroupSubscriptions) {
if (
managedGroupSubscription.member_ids?.some(
id => id.toString() === user._id.toString()
)
) {
managedGroupSubscription.userIsGroupMember = true
}
buildGroupSubscriptionForView(managedGroupSubscription)
}
return {
personalSubscription,
managedGroupSubscriptions,