github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-17 01:32:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[web] Remove module import from core

Browse source 
Replaces the imported function call with an inline check.

GitOrigin-RevId: 692af8353258b13b61104cbac775c75d3bda3528
This commit is contained in:
Miguel Serrano 2023-08-14 16:14:03 +02:00 committed by Copybot
parent 014d08e166
commit 1725415e31
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/app/src/Features/Subscription/SubscriptionController.js
View file

@ -22,7 +22,7 @@ const { expressify } = require('../../util/promises')
const OError = require('@overleaf/o-error')
const SplitTestHandler = require('../SplitTests/SplitTestHandler')
const SubscriptionHelper = require('./SubscriptionHelper')
const ManagedUsersManager = require('../../../../modules/managed-users/app/src/ManagedUsersManager')
const Features = require('../../infrastructure/Features')
const groupPlanModalOptions = Settings.groupPlanModalOptions
const validGroupPlanModalOptions = {
@ -268,7 +268,8 @@ async function userSubscriptionPage(req, res) {
const groupSettingsEnabledFor = (managedGroupSubscriptions || [])
.filter(
subscription =>
ManagedUsersManager.hasManagedUsersFeature(subscription) &&
Features.hasFeature('saas') &&
subscription?.features?.managedUsers &&
(subscription.admin_id._id || subscription.admin_id).toString() ===
user._id.toString()
)

8
services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
View file

@ -128,6 +128,9 @@ describe('SubscriptionController', function () {
this.SubscriptionHelper = {
generateInitialLocalizedGroupPrice: sinon.stub(),
}
this.Features = {
hasFeature: sinon.stub().returns(false),
}
this.SubscriptionController = SandboxedModule.require(modulePath, {
requires: {
'../SplitTests/SplitTestHandler': this.SplitTestV2Hander,
@ -158,10 +161,7 @@ describe('SubscriptionController', function () {
recordEventForSession: sinon.stub(),
setUserPropertyForUser: sinon.stub(),
}),
'../../../../modules/managed-users/app/src/ManagedUsersManager':
(this.ManagedUsersManager = {
hasManagedUsersFeature: sinon.stub(),
}),
'../../infrastructure/Features': this.Features,
},
})