From 448761cc64999248381b726d3639ef16d6b39a13 Mon Sep 17 00:00:00 2001 From: Dawson Toth Date: Thu, 28 Aug 2025 12:43:23 -0400 Subject: [PATCH 1/4] Remove the extra dollar from the code --- src/features/clusters/upsert/ClusterBilling.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/clusters/upsert/ClusterBilling.tsx b/src/features/clusters/upsert/ClusterBilling.tsx index 494b6fee9..de1d8699a 100644 --- a/src/features/clusters/upsert/ClusterBilling.tsx +++ b/src/features/clusters/upsert/ClusterBilling.tsx @@ -88,7 +88,7 @@ export function ClusterBilling({ {clusterId && (
  • If you scale up, you'll be charged for the additional blocks you've purchased - now${selectedAutoRenew ? ', and your next auto renewal will be for all purchased blocks' : ''}. + now{selectedAutoRenew ? ', and your next auto renewal will be for all purchased blocks' : ''}.
    • )} {clusterId && (
  • If you remove a region, that usage block will not be used (because it is specific to that region).
    • )} From 6f4c709a2563db5d6d061997134e6fa81ec5190a Mon Sep 17 00:00:00 2001 From: Dawson Toth Date: Thu, 28 Aug 2025 12:53:33 -0400 Subject: [PATCH 2/4] Fix dirty check on editing a non-self-managed cluster MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The fqdn shouldn’t be getting set for these. --- src/features/clusters/upsert/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/features/clusters/upsert/index.tsx b/src/features/clusters/upsert/index.tsx index 8da9b630b..5fa1a3524 100644 --- a/src/features/clusters/upsert/index.tsx +++ b/src/features/clusters/upsert/index.tsx @@ -52,6 +52,7 @@ export function UpsertCluster() { const instances: z.infer = []; const defaults = calculateDefaultDeploymentPerformanceAndRegionPlans(planTypes, regionLocations); + let isSelfManaged = false; if (planTypes && regionLocations) { if (cluster) { if (cluster.plans) { @@ -69,6 +70,7 @@ export function UpsertCluster() { } if (!regionPlans.length && cluster.instances) { for (const instance of cluster.instances) { + isSelfManaged = true; instances.push({ fqdn: instance.instanceFqdn, port: instance.operationsApiPort, @@ -87,7 +89,7 @@ export function UpsertCluster() { abbreviatedName: cluster?.abbreviatedName ?? '', deploymentDescription: selectedPlan?.deploymentDescription ?? defaults?.deploymentDescription ?? '', performanceDescription: selectedPlan?.performanceDescription ?? defaults?.performanceDescription ?? '', - fqdn: cluster?.fqdn ?? '', + fqdn: isSelfManaged ? cluster?.fqdn ?? '' : '', instances, regionPlans, }; From c7185575d747b292a7ff24f0699698238374ad00 Mon Sep 17 00:00:00 2001 From: Dawson Toth Date: Thu, 28 Aug 2025 13:08:19 -0400 Subject: [PATCH 3/4] Remove horizontal scroll on cluster upsert from usage block button --- .../upsert/components/ResourcesPerInstance.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/features/clusters/upsert/components/ResourcesPerInstance.tsx b/src/features/clusters/upsert/components/ResourcesPerInstance.tsx index e83c2a033..5d43aa2b3 100644 --- a/src/features/clusters/upsert/components/ResourcesPerInstance.tsx +++ b/src/features/clusters/upsert/components/ResourcesPerInstance.tsx @@ -88,17 +88,17 @@ export function ResourcesPerInstance({ planLimits, resourcesPerInstance }: { ].filter(excludeFalsy), [planLimits, resourcesPerInstance]); return - + + Purchasing usage block for {humanNumber(planLimits.readsPerMinuteCount!)} reads/min + & {humanNumber(planLimits.totalReadCount)} total reads per region, + {humanNumber(planLimits.writesPerMinuteCount!)} writes/min & {humanNumber(planLimits.totalWriteCount!)} total writes, for 3 months. From f0cf52168b599d3c842b382e4f0cc667fb53cc62 Mon Sep 17 00:00:00 2001 From: Dawson Toth Date: Thu, 28 Aug 2025 15:55:41 -0400 Subject: [PATCH 4/4] Remove unnecessary non-null assertion to appease Sonar --- .../clusters/upsert/components/ResourcesPerInstance.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/clusters/upsert/components/ResourcesPerInstance.tsx b/src/features/clusters/upsert/components/ResourcesPerInstance.tsx index 5d43aa2b3..8d4ce0e56 100644 --- a/src/features/clusters/upsert/components/ResourcesPerInstance.tsx +++ b/src/features/clusters/upsert/components/ResourcesPerInstance.tsx @@ -91,7 +91,7 @@ export function ResourcesPerInstance({ planLimits, resourcesPerInstance }: { Purchasing usage block for {humanNumber(planLimits.readsPerMinuteCount!)} reads/min & {humanNumber(planLimits.totalReadCount)} total reads per region, - {humanNumber(planLimits.writesPerMinuteCount!)} writes/min & {humanNumber(planLimits.totalWriteCount!)} total writes, for 3 months. + {humanNumber(planLimits.writesPerMinuteCount!)} writes/min & {humanNumber(planLimits.totalWriteCount)} total writes, for 3 months.