From 1a3005b2ed33e7254e7778f8715c2e706fdbec56 Mon Sep 17 00:00:00 2001 From: Colton Hurst Date: Wed, 26 Jul 2023 18:24:09 -0400 Subject: [PATCH] SM-842: Add SecretsManagerBeta Flag to Admin Portal (#3094) * SM-802: Add SecretsManagerBetaColumn SQL migration and Org table update * SM-802: Run EF Migrations for SecretsManagerBeta * SM-802: Update the two Org procs and View, and move data migration to a separate file * SM-802: Add missing comma to Organization_Create * SM-802: Remove extra GO statement from data migration script * SM-802: Add SecretsManagerBeta to OrganizationResponseModel * SM-802: Move SecretsManagerBeta from OrganizationResponseModel to OrganizationSubscriptionResponseModel. Use sp_refreshview instead of sp_refreshsqlmodule in the migration script. * SM-802: Remove OrganizationUserOrganizationDetailsView.sql changes * SM-802: Remove SecretsManagerBetaColumn migration * SM-802: Add SecretsManagerBetaColumn migration * SM-802: Remove OrganizationUserOrganizationDetailsView update * SM-842: Add SecretsManagerBeta checkbox to Admin Portal * SM-842: Remove old migration files that were left when the base changed from sm/SM-802 to master * SM-842: Remove old migration files that were left when the base changed from sm/SM-802 to master - part 2 --- src/Admin/Controllers/OrganizationsController.cs | 1 + src/Admin/Models/OrganizationEditModel.cs | 4 ++++ src/Admin/Views/Shared/_OrganizationForm.cshtml | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs index 9a367d799..8fc74435a 100644 --- a/src/Admin/Controllers/OrganizationsController.cs +++ b/src/Admin/Controllers/OrganizationsController.cs @@ -287,6 +287,7 @@ public class OrganizationsController : Controller organization.UseTotp = model.UseTotp; organization.UsersGetPremium = model.UsersGetPremium; organization.UseSecretsManager = model.UseSecretsManager; + organization.SecretsManagerBeta = model.SecretsManagerBeta; //secrets organization.SmSeats = model.SmSeats; diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/Models/OrganizationEditModel.cs index 19a82bb31..93a52347d 100644 --- a/src/Admin/Models/OrganizationEditModel.cs +++ b/src/Admin/Models/OrganizationEditModel.cs @@ -67,6 +67,7 @@ public class OrganizationEditModel : OrganizationViewModel MaxAutoscaleSmSeats = org.MaxAutoscaleSmSeats; SmServiceAccounts = org.SmServiceAccounts; MaxAutoscaleSmServiceAccounts = org.MaxAutoscaleSmServiceAccounts; + SecretsManagerBeta = org.SecretsManagerBeta; } public BillingInfo BillingInfo { get; set; } @@ -146,6 +147,8 @@ public class OrganizationEditModel : OrganizationViewModel public int? SmServiceAccounts { get; set; } [Display(Name = "Max Autoscale Service Accounts")] public int? MaxAutoscaleSmServiceAccounts { get; set; } + [Display(Name = "Secrets Manager Beta")] + public bool SecretsManagerBeta { get; set; } public Organization CreateOrganization(Provider provider) { @@ -190,6 +193,7 @@ public class OrganizationEditModel : OrganizationViewModel existingOrganization.MaxAutoscaleSmSeats = MaxAutoscaleSmSeats; existingOrganization.SmServiceAccounts = SmServiceAccounts; existingOrganization.MaxAutoscaleSmServiceAccounts = MaxAutoscaleSmServiceAccounts; + existingOrganization.SecretsManagerBeta = SecretsManagerBeta; return existingOrganization; } } diff --git a/src/Admin/Views/Shared/_OrganizationForm.cshtml b/src/Admin/Views/Shared/_OrganizationForm.cshtml index ae5970603..3e816c9d7 100644 --- a/src/Admin/Views/Shared/_OrganizationForm.cshtml +++ b/src/Admin/Views/Shared/_OrganizationForm.cshtml @@ -158,7 +158,7 @@ -
+
@@ -169,6 +169,10 @@
+
+ + +
}