From 4d3c1c5a5c250f9ba6b866ef350d229d156118f3 Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:56:46 -0500 Subject: [PATCH] chore: remove AllowAdminAccessToAllCollectionItems ref along with feature service call, refs AC-2683 (#4535) --- .../AdminConsole/Controllers/ProvidersController.cs | 3 +-- .../AdminConsole/Models/OrganizationEditModel.cs | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Admin/AdminConsole/Controllers/ProvidersController.cs b/src/Admin/AdminConsole/Controllers/ProvidersController.cs index 9b0f34924c..cee87fbb71 100644 --- a/src/Admin/AdminConsole/Controllers/ProvidersController.cs +++ b/src/Admin/AdminConsole/Controllers/ProvidersController.cs @@ -310,8 +310,7 @@ public class ProvidersController : Controller return RedirectToAction("Index"); } - var flexibleCollectionsV1Enabled = _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsV1); - var organization = model.CreateOrganization(provider, flexibleCollectionsV1Enabled); + var organization = model.CreateOrganization(provider); await _organizationService.CreatePendingOrganization(organization, model.Owners, User, _userService, model.SalesAssistedTrialStarted); await _providerService.AddOrganization(providerId, organization.Id, null); diff --git a/src/Admin/AdminConsole/Models/OrganizationEditModel.cs b/src/Admin/AdminConsole/Models/OrganizationEditModel.cs index 56782e6950..40b319cdc1 100644 --- a/src/Admin/AdminConsole/Models/OrganizationEditModel.cs +++ b/src/Admin/AdminConsole/Models/OrganizationEditModel.cs @@ -244,17 +244,10 @@ public class OrganizationEditModel : OrganizationViewModel return plan; }); - public Organization CreateOrganization(Provider provider, bool flexibleCollectionsV1Enabled) + public Organization CreateOrganization(Provider provider) { BillingEmail = provider.BillingEmail; - - var newOrg = new Organization - { - // This is a transitional setting that defaults to ON until Flexible Collections v1 is released - // (to preserve existing behavior) and defaults to OFF after release (enabling new behavior) - AllowAdminAccessToAllCollectionItems = !flexibleCollectionsV1Enabled - }; - return ToOrganization(newOrg); + return ToOrganization(new Organization()); } public Organization ToOrganization(Organization existingOrganization)