From e0a4bf1d65efca8c874c3e7fd79cba372ef2d997 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 23 Aug 2023 12:21:29 +0200 Subject: [PATCH] Merge pull request #14432 from overleaf/msm-repurpose-managed-users-flag [web] Repurpose `managedUsers.enabled` flag GitOrigin-RevId: b968048a51feba887aaed798908779612e8c8c96 --- .../Features/UserMembership/UserMembershipController.js | 8 +------- .../src/UserMembership/UserMembershipControllerTests.js | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/services/web/app/src/Features/UserMembership/UserMembershipController.js b/services/web/app/src/Features/UserMembership/UserMembershipController.js index a75ae2c371..f34599bf69 100644 --- a/services/web/app/src/Features/UserMembership/UserMembershipController.js +++ b/services/web/app/src/Features/UserMembership/UserMembershipController.js @@ -17,15 +17,9 @@ const EmailHelper = require('../Helpers/EmailHelper') const { csvAttachment } = require('../../infrastructure/Response') const { UserIsManagerError } = require('./UserMembershipErrors') const CSVParser = require('json2csv').Parser -const Settings = require('@overleaf/settings') - -function isManagedUsersActiveOnGroup(entity) { - return !!(Settings.managedUsers?.enabled && entity.groupPolicy) -} async function manageGroupMembers(req, res, next) { const { entity, entityConfig } = req - const managedUsersActive = isManagedUsersActiveOnGroup(entity) return entity.fetchV1Data(function (error, entity) { if (error != null) { return next(error) @@ -48,7 +42,7 @@ async function manageGroupMembers(req, res, next) { groupId: entityPrimaryKey, users, groupSize: entity.membersLimit, - managedUsersActive, + managedUsersActive: entity.groupPolicy != null, }) } ) diff --git a/services/web/test/unit/src/UserMembership/UserMembershipControllerTests.js b/services/web/test/unit/src/UserMembership/UserMembershipControllerTests.js index 7916dd7c1f..bcbeeb28b5 100644 --- a/services/web/test/unit/src/UserMembership/UserMembershipControllerTests.js +++ b/services/web/test/unit/src/UserMembership/UserMembershipControllerTests.js @@ -127,7 +127,6 @@ describe('UserMembershipController', function () { it('render group view with managed users', async function () { this.req.entity.groupPolicy = { somePolicy: true } - this.Settings.managedUsers.enabled = true return await this.UserMembershipController.manageGroupMembers(this.req, { render: (viewPath, viewParams) => { expect(viewPath).to.equal('user_membership/group-members-react')