refactor: Parameterize instance uses

Author: dawsontoth

src/config/getInstanceClient.ts

@@ -12,8 +12,16 @@ interface InstanceClient {
 }
 
 export function getInstanceClient(
-	{ id = OverallAppSignIn, operationsUrl, port, secure, forceFabricConnect }: InstanceClient & {
+	{
+		id = OverallAppSignIn,
+		operationsUrl,
+		port,
+		secure,
+		forceFabricConnect,
+		disableFabricConnect,
+	}: InstanceClient & {
 		forceFabricConnect?: boolean;
+		disableFabricConnect?: boolean;
 	} = {},
 ) {
 	let baseURL = operationsUrl || authStore.getOperationsUrl(id);
@@ -30,7 +38,7 @@ export function getInstanceClient(
 		}
 	}
 
-	const fabricConnect = forceFabricConnect || authStore.checkForFabricConnect(id);
+	const fabricConnect = !disableFabricConnect && (forceFabricConnect || authStore.checkForFabricConnect(id));
 	if (fabricConnect) {
 		if (id.startsWith('clu-')) {
 			baseURL = apiClient.defaults.baseURL + `/Cluster/${id}/operation`;

src/config/useInstanceClient.tsx

@@ -5,37 +5,49 @@ import { OverallAppSignIn } from '@/features/auth/store/authStore';
 import { useParams } from '@tanstack/react-router';
 import { useMemo } from 'react';
 
-export function useInstanceClient(operationsUrl?: string | null, port?: number, secure?: boolean) {
+interface UseParams {
+	operationsUrl?: string | null;
+	port?: number;
+	secure?: boolean;
+	disableFabricConnect?: boolean;
+	instanceId?: string;
+	clusterId?: string;
+}
+
+export function useInstanceClient(
+	params: UseParams = {},
+) {
 	const { instanceId, clusterId }: { instanceId?: string; clusterId?: string } = useParams({ strict: false });
-	const id = isLocalStudio ? OverallAppSignIn : instanceId ?? clusterId;
-	return getInstanceClient({ id, operationsUrl, port, secure });
+	const id = isLocalStudio ? OverallAppSignIn : params.instanceId ?? instanceId ?? params.clusterId ?? clusterId;
+	return getInstanceClient({ id, ...params });
 }
 
 export function useInstanceClientParams(
-	operationsUrl?: string | null,
-	port?: number,
-	secure?: boolean,
+	params: UseParams = {},
 ): InstanceClientConfig & InstanceTypeConfig {
 	const { instanceId, clusterId }: { instanceId?: string; clusterId?: string } = useParams({ strict: false });
-	const id = isLocalStudio ? OverallAppSignIn : instanceId ?? clusterId;
+	const id = isLocalStudio ? OverallAppSignIn : params.instanceId ?? instanceId ?? params.clusterId ?? clusterId;
 	return {
-		instanceClient: getInstanceClient({ id, operationsUrl, port, secure }),
+		instanceClient: getInstanceClient({ id, ...params }),
 		entityType: (isLocalStudio || instanceId) ? 'instance' : 'cluster',
 	};
 }
 
 export function useInstanceClientIdParams(
-	operationsUrl?: string | null,
-	port?: number,
-	secure?: boolean,
+	params: UseParams = {},
 ): InstanceClientIdConfig & InstanceTypeConfig {
-	const params: { instanceId?: string; clusterId?: string } = useParams({ strict: false });
-	return useMemo(() => getInstanceClientIdFromParams({ ...params, operationsUrl, port, secure }), [
-		params,
-		operationsUrl,
-		port,
-		secure,
-	]);
+	const { instanceId, clusterId }: { instanceId?: string; clusterId?: string } = useParams({ strict: false });
+	return useMemo(
+		() => getInstanceClientIdFromParams({ instanceId, clusterId, ...params }),
+		[
+			params.instanceId ?? instanceId,
+			params.clusterId ?? clusterId,
+			params.operationsUrl,
+			params.port,
+			params.secure,
+			params.disableFabricConnect,
+		],
+	);
 }
 
 export function getInstanceClientIdFromParams({
@@ -44,19 +56,21 @@ export function getInstanceClientIdFromParams({
 	operationsUrl,
 	port,
 	secure,
+	disableFabricConnect,
 }: {
 	instanceId?: string;
 	clusterId?: string;
 	operationsUrl?: string | null;
 	port?: number;
 	secure?: boolean;
+	disableFabricConnect?: boolean;
 }): InstanceClientIdConfig & InstanceTypeConfig {
 	const id = isLocalStudio ? OverallAppSignIn : instanceId ?? clusterId;
 	if (!id) {
 		throw new Error('id could not be automatically calculated in useInstanceClientIdParams');
 	}
 	return {
-		instanceClient: getInstanceClient({ id, operationsUrl, port, secure }),
+		instanceClient: getInstanceClient({ id, operationsUrl, port, secure, disableFabricConnect }),
 		entityId: id,
 		entityType: (isLocalStudio || instanceId) ? 'instance' : 'cluster',
 	};

src/features/auth/ClusterInstanceSignIn.tsx

@@ -54,7 +54,7 @@ export function ClusterInstanceSignIn() {
 		return null;
 	}, [cluster, instance]);
 
-	const instanceParams = useInstanceClientIdParams(operationsUrl);
+	const instanceParams = useInstanceClientIdParams({ operationsUrl });
 	const warnAboutLocalDeviceAccess = useMemo(
 		() => operationsUrl?.includes('localhost') || operationsUrl?.includes('127.0.0.1'),
 		[operationsUrl],

src/features/cluster/FinishSetup.tsx

@@ -33,7 +33,7 @@ export function FinishSetup() {
 
 	const navigate = useNavigate();
 	const operationsUrl = useMemo(() => getOperationsUrlForCluster(cluster), [cluster]);
-	const instanceClient = useInstanceClient(operationsUrl);
+	const instanceClient = useInstanceClient({ operationsUrl });
 
 	const { redirect } = useSearch({ strict: false });
 	const router = useRouter();

src/features/cluster/InstanceLogInCell.tsx

@@ -16,7 +16,7 @@ export function InstanceLogInCell(
 ) {
 	const { user: instanceUser, isLoading: instanceAuthIsLoading } = useInstanceAuth(instance.id);
 	const operationsUrl = useMemo(() => getOperationsUrlForInstance(instance), [instance]);
-	const instanceClient = useInstanceClient(operationsUrl);
+	const instanceClient = useInstanceClient({ operationsUrl });
 	const { update } = useOrganizationClusterInstancePermissions();
 	const isFabricConnect = authStore.checkForFabricConnect(instance.id);
 

src/features/clusters/components/ClusterCard.tsx

@@ -48,7 +48,7 @@ export function ClusterCard({ cluster }: { cluster: Cluster }) {
 	const router = useRouter();
 	const queryClient = useQueryClient();
 	const operationsUrl = useMemo(() => getOperationsUrlForCluster(cluster), [cluster]);
-	const instanceClient = useInstanceClient(operationsUrl);
+	const instanceClient = useInstanceClient({ operationsUrl });
 	const auth = useInstanceAuth(cluster.id);
 	const [, setSavedClusterState] = useLocalStorage<unknown | null>(LocalStorageKeys.SavedClusterState, null);
 

src/lib/urls/getRestUrlForInstance.ts

@@ -0,0 +1,12 @@
+import { Instance } from '@/integrations/api/api.patch';
+
+export function getRestUrlForInstance(
+	instance: Pick<Instance, 'instanceFqdn'>,
+): string {
+	let fqdn = instance.instanceFqdn;
+	if (!fqdn.match(/^https?:\/\//i)) {
+		fqdn = `https://${fqdn}`;
+	}
+	const url = new URL(fqdn);
+	return url.toString();
+}