Merge remote-tracking branch 'origin/main' into feat/pki-ENG-3666

frontend/src/components/pki-syncs/forms/CreatePkiSyncForm.tsx

@@ -8,7 +8,7 @@ import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Switch } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
 import {
   PkiSync,
@@ -41,7 +41,7 @@ const FORM_TABS: { name: string; key: string; fields: (keyof TPkiSyncForm)[] }[]
 
 export const CreatePkiSyncForm = ({ destination, onComplete, onCancel }: Props) => {
   const createPkiSync = useCreatePkiSync();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { name: destinationName } = PKI_SYNC_MAP[destination];
 
   const [showConfirmation, setShowConfirmation] = useState(false);
@@ -68,7 +68,7 @@ export const CreatePkiSyncForm = ({ destination, onComplete, onCancel }: Props)
       const pkiSync = await createPkiSync.mutateAsync({
         ...formData,
         connectionId: connection.id,
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
         destinationConfig: {
           destination,
           config: destinationConfig

frontend/src/components/pki-syncs/forms/PkiSyncConnectionField.tsx

@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Link } from "@tanstack/react-router";
 
 import { FilterableSelect, FormControl } from "@app/components/v2";
-import { OrgPermissionSubjects, useOrgPermission } from "@app/context";
+import { OrgPermissionSubjects, useOrgPermission, useProject } from "@app/context";
 import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
 import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
 import { PKI_SYNC_CONNECTION_MAP } from "@app/helpers/pkiSyncs";
@@ -19,11 +19,15 @@ type Props = {
 export const PkiSyncConnectionField = ({ onChange: callback }: Props) => {
   const { permission } = useOrgPermission();
   const { control, watch } = useFormContext<TPkiSyncForm>();
+  const { currentProject } = useProject();
 
   const destination = watch("destination");
   const app = PKI_SYNC_CONNECTION_MAP[destination];
 
-  const { data: availableConnections, isPending } = useListAvailableAppConnections(app);
+  const { data: availableConnections, isPending } = useListAvailableAppConnections(
+    app,
+    currentProject.id
+  );
 
   const connectionName = APP_CONNECTION_MAP[app].name;
 

frontend/src/components/pki-syncs/forms/PkiSyncReviewFields.tsx

@@ -1,17 +1,17 @@
 import { useFormContext } from "react-hook-form";
 
 import { Badge, GenericFieldLabel } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
-import { useListWorkspacePkiSubscribers } from "@app/hooks/api/workspace";
+import { useListWorkspacePkiSubscribers } from "@app/hooks/api";
 
 import { TPkiSyncForm } from "./schemas";
 
 export const PkiSyncReviewFields = () => {
   const { watch } = useFormContext<TPkiSyncForm>();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
-  const { data: pkiSubscribers = [] } = useListWorkspacePkiSubscribers(currentWorkspace?.id || "");
+  const { data: pkiSubscribers = [] } = useListWorkspacePkiSubscribers(currentProject?.id || "");
 
   const getSubscriberName = (subscriberId?: string) => {
     const subscriber = pkiSubscribers.find((sub) => sub.id === subscriberId);

frontend/src/components/pki-syncs/forms/PkiSyncSourceFields.tsx

@@ -1,17 +1,17 @@
 import { Controller, useFormContext } from "react-hook-form";
 
 import { FilterableSelect, FormControl } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
-import { useListWorkspacePkiSubscribers } from "@app/hooks/api/workspace";
+import { useProject } from "@app/context";
+import { useListWorkspacePkiSubscribers } from "@app/hooks/api";
 
 import { TPkiSyncForm } from "./schemas";
 
 export const PkiSyncSourceFields = () => {
   const { control } = useFormContext<TPkiSyncForm>();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const { data: pkiSubscribers = [], isLoading } = useListWorkspacePkiSubscribers(
-    currentWorkspace?.id || ""
+    currentProject?.id || ""
   );
 
   return (