Merge pull request #583 from HarperDB/fix-dedicated-references

Fix dedicated references

Author: dawsontoth

src/features/cluster/queries/getPlanTypesQuery.ts

@@ -2,17 +2,19 @@ import { apiClient } from '@/config/apiClient';
 import { queryKeys } from '@/react-query/constants';
 import { queryOptions } from '@tanstack/react-query';
 
-const getPlanTypes = async () => {
-	const { data } = await apiClient.get(`/Plan/`);
+async function getPlanTypes(organizationId: string) {
+	const { data } = await apiClient.get(`/Plan/`, {
+		params: {
+			organizationId,
+		},
+	});
 	return data;
-};
+}
 
-function getPlanTypesOptions() {
+export function getPlanTypesOptions(organizationId: string) {
 	return queryOptions({
-		queryKey: [queryKeys.cluster, 'instancePlan'],
-		queryFn: getPlanTypes,
+		queryKey: [queryKeys.organization, organizationId, 'instancePlan'],
+		queryFn: () => getPlanTypes(organizationId),
 		retry: false,
 	});
 }
-
-export { getPlanTypesOptions };

src/features/clusters/upsert/ClusterForm.tsx

@@ -134,8 +134,8 @@ export function ClusterForm({
 
 	useEffect(() => {
 		setLimitRegionParameters({
-			availableHosts: selectedDeployment !== 'Dedicated for Cluster' ? true : undefined,
-			organizationId: selectedDeployment === 'Dedicated for Organization' ? organizationId : undefined,
+			availableHosts: selectedDeployment !== 'Dedicated' ? true : undefined,
+			organizationId,
 		});
 	}, [organizationId, selectedDeployment, setLimitRegionParameters]);
 

src/features/clusters/upsert/index.tsx

@@ -30,7 +30,7 @@ export function UpsertCluster() {
 
 	const { data: cluster } = useQuery(getClusterInfoQueryOptions(clusterId));
 	const { data: organization } = useQuery(getOrganizationQueryOptions(organizationId));
-	const { data: planTypes } = useQuery(getPlanTypesOptions());
+	const { data: planTypes } = useQuery(getPlanTypesOptions(organizationId));
 	const { data: regionLocations } = useQuery(getRegionLocationsOptions(limitRegionParameters));
 
 	const deploymentToPerformanceToPlan = useMemo<Record<string, Record<string, SchemaPlan>>>(() =>