Merge pull request #589 from HarperDB/STUDIO-372_remove-auto-renew-checkbox

Author: dawsontoth

src/features/clusters/upsert/ClusterBilling.tsx

@@ -18,7 +18,6 @@ interface ClusterBillingProps {
 	readonly onSaveStateForBillingRedirect: (redirecting: boolean) => void;
 	readonly onSubmit?: () => void;
 	readonly organizationId: string;
-	readonly selectedAutoRenew: boolean;
 	readonly selectedPlan: SchemaPlan | undefined;
 }
 
@@ -29,7 +28,6 @@ export function ClusterBilling({
 	onSaveStateForBillingRedirect,
 	onSubmit,
 	organizationId,
-	selectedAutoRenew,
 	selectedPlan,
 }: ClusterBillingProps) {
 	const { data: organization } = useQuery(getOrganizationQueryOptions(organizationId));
@@ -83,21 +81,20 @@ export function ClusterBilling({
 		</>);
 	}
 
-	const andMightAutoRenew = selectedAutoRenew ? ', and your next auto renewal will be for all purchased blocks' : '';
 	const orPossiblyExpires = expirationMonths && `, or ${pluralize(expirationMonths, 'month', 'months')} elapse`;
-	const maybeNot = selectedAutoRenew ? ' NOT' : '';
 
 	return (<>
 		<ul className="list-disc ml-6 mb-6">
 			<li>You will be billed for this cluster today, and will receive a license for the block of usage you've
 				requested.
 			</li>
 			{clusterId && (
-				<li>If you scale up, you'll be charged for the additional blocks you've purchased now{andMightAutoRenew}.
+				<li>If you scale up, you'll be charged for the additional blocks you've purchased now, and your next
+					auto renewal will be for all purchased blocks.
 				</li>)}
 			{clusterId && (<li>If you remove a region, that region's usage block will not be used anymore (because it is
 				specific to that region).</li>)}
-			<li>When that block is used up{orPossiblyExpires}, you will{maybeNot} be automatically renewed.
+			<li>When that block is used up{orPossiblyExpires}, you will be automatically renewed.
 			</li>
 			<li>While refunds are not available, we’d be happy to assist you with... swag, depending on availability.
 			</li>

src/features/clusters/upsert/ClusterDetails.tsx

@@ -66,7 +66,7 @@ export function ClusterDetails({
 				control={form.control}
 				name="systemName"
 				render={({ field }) => (
-					<FormItem className="col-span-3">
+					<FormItem className="col-span-3 md:col-span-6">
 						<FormLabel className="pb-1">Harper System Name</FormLabel>
 						<FormControl>
 							<Input
@@ -81,26 +81,6 @@ export function ClusterDetails({
 				)}
 			/>
 
-			<FormField
-				control={form.control}
-				name="autoRenew"
-				render={({ field }) => (
-					<FormItem className="col-span-3">
-						<FormLabel className="pb-1">Auto Renew</FormLabel>
-						<FormControl>
-							<Input
-								{...field}
-								value={field.value as unknown as string}
-								checked={field.value === true}
-								type="checkbox"
-								disabled={!!clusterId}
-							/>
-						</FormControl>
-						<FormMessage />
-					</FormItem>
-				)}
-			/>
-
 			<FormField
 				control={form.control}
 				name="deploymentDescription"

src/features/clusters/upsert/ClusterForm.tsx

@@ -130,7 +130,6 @@ export function ClusterForm({
 	const selectedPerformance = form.watch('performanceDescription');
 	const selectedRegionPlans = form.watch('regionPlans');
 	const selectedInstances = form.watch('instances');
-	const selectedAutoRenew = form.watch('autoRenew');
 
 	useEffect(function syncRegionsWithSelectedDeploymentType() {
 		setLimitRegionParameters({
@@ -248,7 +247,7 @@ export function ClusterForm({
 		if (isSelfManaged) {
 			for (const instance of formData.instances) {
 				plans.push({
-					autoRenew: formData.autoRenew,
+					autoRenew: true,
 					instanceFqdn: instance.fqdn,
 					operationsApiPort: instance.port || defaultOperationsApiPort,
 					operationsApiSecure: instance.secure === 'true',
@@ -259,7 +258,7 @@ export function ClusterForm({
 			for (const regionPlan of formData.regionPlans) {
 				const region = regionNameToLatencyToRegion[regionPlan.regionName][regionPlan.latencyDescription];
 				plans.push({
-					autoRenew: formData.autoRenew,
+					autoRenew: true,
 					planId: plan.id,
 					regionId: region.id,
 				});
@@ -273,11 +272,11 @@ export function ClusterForm({
 			}, { onSuccess: onClusterEditedCallback });
 		} else {
 			submitNewClusterData({
-				organizationId,
-				name: formData.systemName,
 				abbreviatedName: isSelfManaged ? undefined : (formData.abbreviatedName || calculatedNames.suggestedAbbreviatedName),
+				autoRenew: true,
 				fqdn: isSelfManaged && formData.fqdn || undefined,
-				autoRenew: formData.autoRenew,
+				name: formData.systemName,
+				organizationId,
 				regionPlans: plans,
 			}, { onSuccess: onClusterCreatedCallback });
 		}
@@ -341,7 +340,6 @@ export function ClusterForm({
 						onSaveStateForBillingRedirect={onSaveStateForBillingRedirect}
 						onSubmit={submitCreateCluster}
 						organizationId={organizationId}
-						selectedAutoRenew={selectedAutoRenew}
 						selectedPlan={selectedPlan}
 					/>
 				</>)

src/features/clusters/upsert/upsertClusterSchema.tsx

@@ -6,7 +6,6 @@ export const UpsertClusterSchema = z.object({
 	systemName: z.string()
 		.min(1, 'Must be at least 1 character long.')
 		.max(255, 'Must be at most 255 characters long.'),
-	autoRenew: z.boolean(),
 	abbreviatedName: z
 		.string()
 		.max(10, 'Must be at most 10 characters long.')