From 3e977ba00df5957d7c6a2fbdd6d54a2e02a5a94f Mon Sep 17 00:00:00 2001 From: miloschwartz Date: Thu, 11 Jun 2026 12:37:54 -0700 Subject: [PATCH 1/4] make paid alert position more consistent on resource --- messages/en-US.json | 2 +- .../public/[niceId]/maintenance/page.tsx | 129 +++++++----------- 2 files changed, 54 insertions(+), 77 deletions(-) diff --git a/messages/en-US.json b/messages/en-US.json index f033e96f4..5937595b5 100644 --- a/messages/en-US.json +++ b/messages/en-US.json @@ -984,7 +984,7 @@ "sharedPolicy": "Shared Policy", "sharedPolicyNoneDescription": "This resource has its own policy.", "resourceSharedPolicyOwnDescription": "This resource has its own authentication and access rules controls.", - "resourceSharedPolicyInheritedDescription": "This resource inherits authentication and access rules controls from {policyName}.", + "resourceSharedPolicyInheritedDescription": "This resource inherits from {policyName}.", "resourceSharedPolicyAuthenticationNotice": "This resource is using a shared policy. Some authentication settings can be edited on this resource to add to the policy. To change the underlying policy, you must edit to {policyName}.", "resourceSharedPolicyRulesNotice": "This resource is using a shared policy. Some access rules can be edited on this resource. To change the underlying policy, you must edit {policyName}.", "resourceUsersRoles": "Access Controls", diff --git a/src/app/[orgId]/settings/resources/public/[niceId]/maintenance/page.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/maintenance/page.tsx index bb3dd7186..10bea4ffe 100644 --- a/src/app/[orgId]/settings/resources/public/[niceId]/maintenance/page.tsx +++ b/src/app/[orgId]/settings/resources/public/[niceId]/maintenance/page.tsx @@ -169,20 +169,27 @@ export default function ResourceMaintenancePage() { { id: "automatic", title: `${t("automatic")} (${t("recommended")})`, - description: t("automaticModeDescription"), - disabled: isMaintenanceDisabled + description: t("automaticModeDescription") }, { id: "forced", title: t("forced"), - description: t("forcedModeDescription"), - disabled: isMaintenanceDisabled + description: t("forcedModeDescription") } ]; return ( - - + <> + +
+ + {t("maintenanceMode")} @@ -193,7 +200,6 @@ export default function ResourceMaintenancePage() { -
{ - const isDisabled = !isPaidUser( - tierMatrix.maintencePage - ); - - return ( - - - ( + + + { + maintenanceForm.setValue( + "maintenanceModeEnabled", val - ) => { - if ( - !isDisabled - ) { - maintenanceForm.setValue( - "maintenanceModeEnabled", - val - ); - } - }} - /> - - - - ); - }} + ); + }} + /> + + + + )} /> @@ -329,11 +322,6 @@ export default function ResourceMaintenancePage() { @@ -365,11 +353,6 @@ export default function ResourceMaintenancePage() {