Skip to content

Remove the extra dollar from the code #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dawsontoth merged 4 commits into from
Aug 28, 2025
Merged

Remove the extra dollar from the code #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
448761c
Remove the extra dollar from the code
dawsontoth Aug 28, 2025
6f4c709
Fix dirty check on editing a non-self-managed cluster
dawsontoth Aug 28, 2025
c718557
Remove horizontal scroll on cluster upsert from usage block button
dawsontoth Aug 28, 2025
f0cf521
Remove unnecessary non-null assertion to appease Sonar
dawsontoth Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/features/clusters/upsert/ClusterBilling.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function ClusterBilling({
</li>
{clusterId && (
<li>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' : ''}.
</li>)}
{clusterId && (<li>If you remove a region, that usage block will not be used (because it is specific to that
region).</li>)}
Expand Down
10 changes: 5 additions & 5 deletions src/features/clusters/upsert/components/ResourcesPerInstance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,17 @@ export function ResourcesPerInstance({ planLimits, resourcesPerInstance }: {
].filter(excludeFalsy), [planLimits, resourcesPerInstance]);

return <FormItem className="col-span-3 md:col-span-6">
<FormLabel className="inline-flex">
<FormLabel>
Purchasing usage block for {humanNumber(planLimits.readsPerMinuteCount!)} reads/min
&amp; {humanNumber(planLimits.totalReadCount)} total reads per region,
{humanNumber(planLimits.writesPerMinuteCount!)} writes/min &amp; {humanNumber(planLimits.totalWriteCount)} total writes, for 3 months.
<Button
type="button"
variant="link"
className="text-white cursor-pointer"
onClick={onUsageLimitsClick}
>
Purchasing usage block for {humanNumber(planLimits.readsPerMinuteCount!)} reads/min
&amp; {humanNumber(planLimits.totalReadCount)} total reads per region,<br/>
{humanNumber(planLimits.writesPerMinuteCount!)} writes/min &amp; {humanNumber(planLimits.totalWriteCount!)} total writes, for 3 months, expand for more details:
{toggled ? <ArrowDownIcon /> : <ArrowRightIcon />}
Learn More {toggled ? <ArrowDownIcon /> : <ArrowRightIcon />}
</Button>
</FormLabel>
<FormControl>
Expand Down
4 changes: 3 additions & 1 deletion src/features/clusters/upsert/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export function UpsertCluster() {
const instances: z.infer<typeof UpsertClusterSchema.shape.instances> = [];
const defaults = calculateDefaultDeploymentPerformanceAndRegionPlans(planTypes, regionLocations);

let isSelfManaged = false;
if (planTypes && regionLocations) {
if (cluster) {
if (cluster.plans) {
Expand All @@ -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,
Expand All @@ -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,
};
Expand Down