feat: finalized integration selection in project settings

frontend/src/hooks/api/index.tsx

@@ -38,7 +38,6 @@ export * from "./secretSharing";
 export * from "./secretSnapshots";
 export * from "./serverDetails";
 export * from "./serviceTokens";
-export * from "./slack";
 export * from "./ssoConfig";
 export * from "./subscriptions";
 export * from "./tags";

frontend/src/hooks/api/slack/index.ts

@@ -1,2 +0,0 @@
-export { useDeleteSlackIntegration, useUpdateSlackIntegration } from "./mutation";
-export { useGetSlackIntegrationByProject } from "./queries";

frontend/src/hooks/api/slack/mutation.tsx

@@ -1,36 +0,0 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-
-import { apiRequest } from "@app/config/request";
-
-import { slackKeys } from "./queries";
-import { TDeleteSlackIntegrationDTO, TUpdateSlackIntegrationDTO } from "./types";
-
-export const useUpdateSlackIntegration = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation<{}, {}, TUpdateSlackIntegrationDTO>({
-    mutationFn: async (dto) => {
-      const { data } = await apiRequest.patch(`/api/v1/slack/${dto.id}`, dto);
-
-      return data;
-    },
-    onSuccess: (_, { workspaceId }) => {
-      queryClient.invalidateQueries(slackKeys.getSlackIntegrationByProject(workspaceId));
-    }
-  });
-};
-
-export const useDeleteSlackIntegration = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation<{}, {}, TDeleteSlackIntegrationDTO>({
-    mutationFn: async (dto) => {
-      const { data } = await apiRequest.delete(`/api/v1/slack/${dto.id}`);
-
-      return data;
-    },
-    onSuccess: (_, { workspaceId }) => {
-      queryClient.invalidateQueries(slackKeys.getSlackIntegrationByProject(workspaceId));
-    }
-  });
-};

frontend/src/hooks/api/slack/queries.tsx

@@ -1,29 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-
-import { apiRequest } from "@app/config/request";
-
-import { ProjectSlackIntegration } from "./types";
-
-export const slackKeys = {
-  getSlackIntegrationByProject: (workspaceId?: string) => [
-    { workspaceId },
-    "slack-integration-by-project"
-  ]
-};
-
-export const fetchSlackIntegrationByProject = async (workspaceId?: string) => {
-  const { data } = await apiRequest.get<ProjectSlackIntegration>("/api/v1/slack", {
-    params: {
-      projectId: workspaceId
-    }
-  });
-
-  return data;
-};
-
-export const useGetSlackIntegrationByProject = (workspaceId?: string) =>
-  useQuery({
-    queryKey: slackKeys.getSlackIntegrationByProject(workspaceId),
-    queryFn: () => fetchSlackIntegrationByProject(workspaceId),
-    enabled: Boolean(workspaceId)
-  });

frontend/src/hooks/api/slack/types.ts

@@ -1,22 +0,0 @@
-export type ProjectSlackIntegration = {
-  id: string;
-  teamName: string;
-  isAccessRequestNotificationEnabled: boolean;
-  accessRequestChannels: string;
-  isSecretRequestNotificationEnabled: boolean;
-  secretRequestChannels: string;
-};
-
-export type TUpdateSlackIntegrationDTO = {
-  id: string;
-  workspaceId: string;
-  isAccessRequestNotificationEnabled?: boolean;
-  accessRequestChannels?: string;
-  isSecretRequestNotificationEnabled?: boolean;
-  secretRequestChannels?: string;
-};
-
-export type TDeleteSlackIntegrationDTO = {
-  id: string;
-  workspaceId: string;
-};

frontend/src/hooks/api/workflowIntegrations/index.ts

@@ -1,4 +1,8 @@
-export { useDeleteSlackIntegration, useUpdateSlackIntegration } from "./mutation";
+export {
+  useDeleteSlackIntegration,
+  useUpdateProjectSlackConfig,
+  useUpdateSlackIntegration
+} from "./mutation";
 export {
   fetchSlackInstallUrl,
   useGetSlackIntegrationById,

frontend/src/hooks/api/workflowIntegrations/mutation.tsx

@@ -2,8 +2,13 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import { apiRequest } from "@app/config/request";
 
+import { workspaceKeys } from "../workspace/queries";
 import { workflowIntegrationKeys } from "./queries";
-import { TDeleteSlackIntegrationDTO, TUpdateSlackIntegrationDTO } from "./types";
+import {
+  TDeleteSlackIntegrationDTO,
+  TUpdateProjectSlackConfigDTO,
+  TUpdateSlackIntegrationDTO
+} from "./types";
 
 export const useUpdateSlackIntegration = () => {
   const queryClient = useQueryClient();
@@ -36,3 +41,20 @@ export const useDeleteSlackIntegration = () => {
     }
   });
 };
+
+export const useUpdateProjectSlackConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (dto: TUpdateProjectSlackConfigDTO) => {
+      const { data } = await apiRequest.put(
+        `/api/v1/workspace/${dto.workspaceId}/slack-config`,
+        dto
+      );
+
+      return data;
+    },
+    onSuccess: (_, { workspaceId }) => {
+      queryClient.invalidateQueries(workspaceKeys.getWorkspaceSlackConfig(workspaceId));
+    }
+  });
+};

frontend/src/hooks/api/workflowIntegrations/types.ts

@@ -20,3 +20,21 @@ export type TDeleteSlackIntegrationDTO = {
   id: string;
   orgId: string;
 };
+
+export type ProjectSlackConfig = {
+  id: string;
+  slackIntegrationId: string;
+  isAccessRequestNotificationEnabled: boolean;
+  accessRequestChannels: string;
+  isSecretRequestNotificationEnabled: boolean;
+  secretRequestChannels: string;
+};
+
+export type TUpdateProjectSlackConfigDTO = {
+  workspaceId: string;
+  slackIntegrationId: string;
+  isAccessRequestNotificationEnabled: boolean;
+  accessRequestChannels: string;
+  isSecretRequestNotificationEnabled: boolean;
+  secretRequestChannels: string;
+};

frontend/src/hooks/api/workspace/index.tsx

@@ -22,6 +22,7 @@ export {
   useGetWorkspaceIndexStatus,
   useGetWorkspaceIntegrations,
   useGetWorkspaceSecrets,
+  useGetWorkspaceSlackConfig,
   useGetWorkspaceUsers,
   useListWorkspaceCas,
   useListWorkspaceCertificates,

frontend/src/hooks/api/workspace/queries.tsx

@@ -16,6 +16,7 @@ import { TPkiCollection } from "../pkiCollections/types";
 import { EncryptedSecret } from "../secrets/types";
 import { userKeys } from "../users/queries";
 import { TWorkspaceUser } from "../users/types";
+import { ProjectSlackConfig } from "../workflowIntegrations/types";
 import {
   CreateEnvironmentDTO,
   CreateWorkspaceDTO,
@@ -71,7 +72,9 @@ export const workspaceKeys = {
   getWorkspacePkiCollections: (workspaceId: string) =>
     [{ workspaceId }, "workspace-pki-collections"] as const,
   getWorkspaceCertificateTemplates: (workspaceId: string) =>
-    [{ workspaceId }, "workspace-certificate-templates"] as const
+    [{ workspaceId }, "workspace-certificate-templates"] as const,
+  getWorkspaceSlackConfig: (workspaceId: string) =>
+    [{ workspaceId }, "workspace-slack-config"] as const
 };
 
 const fetchWorkspaceById = async (workspaceId: string) => {
@@ -667,3 +670,17 @@ export const useListWorkspaceCertificateTemplates = ({ workspaceId }: { workspac
     enabled: Boolean(workspaceId)
   });
 };
+
+export const useGetWorkspaceSlackConfig = ({ workspaceId }: { workspaceId: string }) => {
+  return useQuery({
+    queryKey: workspaceKeys.getWorkspaceSlackConfig(workspaceId),
+    queryFn: async () => {
+      const { data } = await apiRequest.get<ProjectSlackConfig>(
+        `/api/v1/workspace/${workspaceId}/slack-config`
+      );
+
+      return data;
+    },
+    enabled: Boolean(workspaceId)
+  });
+};