From 9631cb1039f61be75d61a3a7759e2a686ddd86d6 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 27 Jul 2023 10:06:55 +0100 Subject: [PATCH] Merge pull request #14032 from overleaf/bg-managed-users-per-subscription-database-flag add per subscription database flag for managed users GitOrigin-RevId: 5e01a0bb74a167f1072a99a0b689d5856432863d --- .../app/src/Features/Subscription/SubscriptionController.js | 6 ++++-- services/web/app/src/models/Subscription.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index c5e013397a..8417c9f99c 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -285,8 +285,10 @@ async function userSubscriptionPage(req, res) { const groupPlansDataForDash = formatGroupPlansDataForDash() const groupSettingsEnabledFor = (managedGroupSubscriptions || []) - .map(sub => sub._id.toString()) - .filter(id => ManagedUsersManager.hasManagedUsersFeature(id)) + .filter(subscription => + ManagedUsersManager.hasManagedUsersFeature(subscription) + ) + .map(subscription => subscription._id.toString()) const data = { title: 'your_subscription', diff --git a/services/web/app/src/models/Subscription.js b/services/web/app/src/models/Subscription.js index 5e17f2f099..a4d0393f0b 100644 --- a/services/web/app/src/models/Subscription.js +++ b/services/web/app/src/models/Subscription.js @@ -31,6 +31,7 @@ const SubscriptionSchema = new Schema( groupPlan: { type: Boolean, default: false }, membersLimit: { type: Number, default: 0 }, customAccount: Boolean, + features: { managedUsers: { type: Boolean, default: false } }, overleaf: { id: { type: Number,