Invalidate Queries After Applying License & Editing Cluster

src/components/RestartButton.tsx

@@ -19,7 +19,7 @@ export function RestartButton({
 		onRestartClick: onRestartClusterClick,
 		isRestartPending: isRestartClusterPending,
 	} = useRestartClusterClick();
-	const { onRestartClick, isRestartPending } = useRestartInstanceClick({ targetNoun, operation, instanceClient });
+	const { onRestartClick, isRestartPending } = useRestartInstanceClick({ operation, instanceClient });
 	return (<Tooltip>
 		<TooltipTrigger asChild>
 			<Button

src/features/clusters/upsert/ClusterForm.tsx

@@ -19,7 +19,7 @@ import { toKebabCase } from '@/lib/string/to-kebab-case';
 import { queryKeys } from '@/react-query/constants';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useQueryClient } from '@tanstack/react-query';
-import { useNavigate } from '@tanstack/react-router';
+import { useNavigate, useRouter } from '@tanstack/react-router';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
@@ -55,6 +55,7 @@ export function ClusterForm({
 	startOffOnBilling,
 }: ClusterFormProps) {
 	const navigate = useNavigate();
+	const router = useRouter();
 
 	const queryClient = useQueryClient();
 	const { mutate: submitNewClusterData, isPending: isCreatePending } = useCreateNewClusterMutation();
@@ -266,6 +267,11 @@ export function ClusterForm({
 		toastId: string | number;
 	}) => {
 		void queryClient.invalidateQueries({ queryKey: [queryKeys.organization], refetchType: 'active' });
+		if (!creating) {
+			void queryClient.invalidateQueries({ queryKey: [queryKeys.cluster, clusterId], refetchType: 'active' });
+		}
+
+		void router.invalidate();
 		void navigate({ to: creating ? '../' : '../../' });
 		toast.success(creating ? 'Cluster Created' : 'Cluster Updated', {
 			id: toastId,
@@ -276,7 +282,7 @@ export function ClusterForm({
 					: 'The updates are being provisioned now.',
 			duration: 5_000,
 		});
-	}, [navigate, queryClient]);
+	}, [clusterId, navigate, queryClient, router]);
 
 	const submitCreateCluster = useCallback(async () => {
 		const formData = form.getValues();

src/features/instance/applications/modals/NewProjectModal.tsx

@@ -2,10 +2,8 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } f
 import { Button } from '@/components/ui/button';
 import { FolderPlus, Import } from 'lucide-react';
 import { useCallback} from 'react';
-import { useParams } from '@tanstack/react-router';
 import { useInstanceClientIdParams, useInstanceClientParams } from '@/config/useInstanceClient';
 import { useRestartInstanceClick } from '@/hooks/useRestartInstanceClick';
-import { isLocalStudio } from '@/config/constants';
 import { CreateNewProjectForm } from '@/features/instance/applications/new/CreateNewProjectForm';
 import { ImportProjectForm } from '@/features/instance/applications/new/ImportProjectForm';
 import { useQueryClient } from '@tanstack/react-query';
@@ -21,9 +19,7 @@ export function NewProjectModal({
 	readonly appType: string;
 	readonly setAppType: (value: 'create' | 'import') => void;
 }) {
-	const { instanceId }: { instanceId?: string; } = useParams({ strict: false });
 	const { instanceClient } = useInstanceClientParams();
-    const targetNoun = (instanceId || isLocalStudio) ? 'Instance' : 'Cluster';
     const queryClient = useQueryClient();
     const instanceParams = useInstanceClientIdParams();
 
@@ -33,7 +29,6 @@ export function NewProjectModal({
     }, [setIsModalOpen, instanceParams.entityId, queryClient]);
     const { onRestartClick, isRestartPending } = useRestartInstanceClick({
       operation: 'restart_service',
-      targetNoun,
       instanceClient,
       onRestartedSuccessfully,
     });

src/hooks/useApplyLicensesClick.tsx

@@ -1,9 +1,12 @@
 import { useInstanceClient } from '@/config/useInstanceClient';
 import { installUsageLicense } from '@/features/instance/operations/mutations/installUsageLicense';
 import { getInstanceUserInfo } from '@/features/instance/operations/queries/getInstanceUserInfo';
+import { useRestartInstanceClick } from '@/hooks/useRestartInstanceClick';
 import { SchemaLicense } from '@/lib/api.gen';
 import { excludeFalsy } from '@/lib/arrays/excludeFalsy';
 import { sleep } from '@/lib/sleep';
+import { useQueryClient } from '@tanstack/react-query';
+import { useParams } from '@tanstack/react-router';
 import { useCallback, useState } from 'react';
 import { toast } from 'sonner';
 
@@ -18,7 +21,15 @@ interface ApplyLicensesClickResponse {
 
 export function useApplyLicensesClick({ licenses }: ApplyLicensesClickParams): ApplyLicensesClickResponse {
 	const instanceClient = useInstanceClient();
+	const { instanceId }: { instanceId?: string; } = useParams({ strict: false });
+	const queryClient = useQueryClient();
+	const {isRestartPending, onRestartClick } = useRestartInstanceClick({
+		operation: 'restart_service',
+		instanceClient,
+	});
+
 	const [isApplyLicensesPending, setIsApplyLicensesPending] = useState(false);
+
 	const onApplyLicensesClick = useCallback(async () => {
 		setIsApplyLicensesPending(true);
 
@@ -77,6 +88,8 @@ export function useApplyLicensesClick({ licenses }: ApplyLicensesClickParams): A
 
 		setIsApplyLicensesPending(false);
 
+		void queryClient.invalidateQueries({ queryKey: [instanceId, 'get_configuration'], refetchType: 'active' });
+
 		const licenseWord = licenses.length === 1 ? 'License' : 'Licenses';
 		if (canceled) {
 			toast.error('Cancelled', {
@@ -92,10 +105,13 @@ export function useApplyLicensesClick({ licenses }: ApplyLicensesClickParams): A
 			toast.success('Success', {
 				id: toastId,
 				description: `${licenseWord} applied!\nPlease restart your instance.`,
-				duration: 10_000,
+				duration: 0,
 				action: {
-					label: 'Dismiss',
-					onClick: () => toast.dismiss(),
+					label: 'Restart',
+					onClick: () => {
+						toast.dismiss(toastId);
+						onRestartClick();
+					},
 				},
 			});
 		} else {
@@ -112,12 +128,12 @@ export function useApplyLicensesClick({ licenses }: ApplyLicensesClickParams): A
 				},
 			});
 		}
-	}, [instanceClient, licenses]);
+	}, [instanceClient, instanceId, licenses, onRestartClick, queryClient]);
 
 
 	return {
 		onApplyLicensesClick,
-		isApplyLicensesPending,
+		isApplyLicensesPending: isApplyLicensesPending || isRestartPending,
 	};
 }
 

src/hooks/useRestartInstanceClick.ts

@@ -1,10 +1,13 @@
+import { isLocalStudio } from '@/config/constants';
 import { InstanceClientConfig } from '@/config/instanceClientConfig';
 import { useRestartInstance } from '@/features/instance/operations/mutations/restartInstance';
+import { queryKeys } from '@/react-query/constants';
+import { useQueryClient } from '@tanstack/react-query';
+import { useParams } from '@tanstack/react-router';
 import { useCallback } from 'react';
 import { toast } from 'sonner';
 
 interface RestartInstanceClickParams extends InstanceClientConfig {
-	targetNoun: 'Instance' | 'Cluster';
 	operation: 'restart_service' | 'restart';
 	onRestartedSuccessfully?: () => void;
 }
@@ -15,12 +18,14 @@ interface RestartInstanceClickResponse {
 }
 
 export function useRestartInstanceClick({
-	targetNoun,
 	operation,
 	instanceClient,
 	onRestartedSuccessfully,
 }: RestartInstanceClickParams): RestartInstanceClickResponse {
+	const { clusterId, instanceId }: { clusterId?: string; instanceId?: string; } = useParams({ strict: false });
+	const targetNoun = (instanceId || isLocalStudio) ? 'Instance' : 'Cluster';
 	const { mutate: restartInstance, isPending: isRestartPending } = useRestartInstance();
+	const queryClient = useQueryClient();
 	const onRestartClick = useCallback(() => {
 		const toastId = toast.loading('Restarting', {
 			description: `Restarting ${targetNoun.toLowerCase()}. This may take up to 60 seconds.`,
@@ -36,6 +41,9 @@ export function useRestartInstanceClick({
 			instanceClient,
 		}, {
 			onSuccess: () => {
+				void queryClient.invalidateQueries({ queryKey: [queryKeys.cluster, clusterId, queryKeys.instance, instanceId], refetchType: 'active' });
+				void queryClient.invalidateQueries({ queryKey: [clusterId], refetchType: 'active' });
+				void queryClient.invalidateQueries({ queryKey: [instanceId], refetchType: 'active' });
 				toast.dismiss(toastId);
 				toast.success('Success', {
 					description: `${targetNoun} restarted!`,
@@ -57,7 +65,7 @@ export function useRestartInstanceClick({
 				});
 			},
 		});
-	}, [instanceClient, onRestartedSuccessfully, operation, restartInstance, targetNoun]);
+	}, [clusterId, instanceClient, instanceId, onRestartedSuccessfully, operation, queryClient, restartInstance, targetNoun]);
 
 	return {
 		onRestartClick,