Begin marking endpoints for deprecation, clean unused frontend code

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

@@ -8,29 +8,26 @@ const queryKeys = {
   getBot: (workspaceId: string) => [{ workspaceId }, "bot"] as const
 };
 
-const fetchWorkspaceBot = async (workspaceId: string) => {
-  const { data } = await apiRequest.get<{ bot: TBot }>(`/api/v1/bot/${workspaceId}`);
-  return data.bot;
-};
-
 export const useGetWorkspaceBot = (workspaceId: string) =>
   useQuery({
     queryKey: queryKeys.getBot(workspaceId),
-    queryFn: () => fetchWorkspaceBot(workspaceId),
+    queryFn: async () => {
+      const { data: { bot } } = await apiRequest.get<{ bot: TBot }>(`/api/v1/bot/${workspaceId}`);
+      return bot;
+    },
     enabled: Boolean(workspaceId)
   });
 
-// mutation
-
 export const useUpdateBotActiveStatus = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, TSetBotActiveStatusDto>({
-    mutationFn: ({ botId, isActive, botKey }) =>
-      apiRequest.patch(`/api/v1/bot/${botId}/active`, {
+    mutationFn: ({ botId, isActive, botKey }) => {
+      return apiRequest.patch(`/api/v1/bot/${botId}/active`, {
         isActive,
         botKey
-      }),
+      });
+    },
     onSuccess: (_, { workspaceId }) => {
       queryClient.invalidateQueries(queryKeys.getBot(workspaceId));
     }

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

@@ -4,7 +4,7 @@ export {
     useCreateCustomerPortalSession,
     useDeleteOrgPmtMethod,
     useDeleteOrgTaxId,
-    useGetOrganization, 
+    useGetOrganizations, 
     useGetOrgBillingDetails,
     useGetOrgInvoices,
     useGetOrgLicenses,

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

@@ -12,10 +12,11 @@ import {
   PmtMethod,
   ProductsTable,
   RenameOrgDTO,
-  TaxID} from "./types";
+  TaxID
+} from "./types";
 
 const organizationKeys = {
-  getUserOrganization: ["organization"] as const,
+  getUserOrganizations: ["organization"] as const,
   getOrgPlanBillingInfo: (orgId: string) => [{ orgId }, "organization-plan-billing"] as const,
   getOrgPlanTable: (orgId: string) => [{ orgId }, "organization-plan-table"] as const,
   getOrgPlansTable: (orgId: string, billingCycle: "monthly" | "yearly") => [{ orgId, billingCycle }, "organization-plans-table"] as const,
@@ -26,13 +27,12 @@ const organizationKeys = {
   getOrgLicenses: (orgId: string) => [{ orgId }, "organization-licenses"] as const
 };
 
-export const useGetOrganization = () => {
+export const useGetOrganizations = () => {
   return useQuery({ 
-    queryKey: organizationKeys.getUserOrganization, 
+    queryKey: organizationKeys.getUserOrganizations, 
     queryFn: async () => {
-      const { data } = await apiRequest.get<{ organizations: Organization[] }>("/api/v1/organization");
-
-      return data.organizations;
+      const { data: { organizations } } = await apiRequest.get<{ organizations: Organization[] }>("/api/v1/organization");
+      return organizations;
     }
   });
 }
@@ -44,7 +44,7 @@ export const useRenameOrg = () => {
     mutationFn: ({ newOrgName, orgId }) =>
       apiRequest.patch(`/api/v1/organization/${orgId}/name`, { name: newOrgName }),
     onSuccess: () => {
-      queryClient.invalidateQueries(organizationKeys.getUserOrganization);
+      queryClient.invalidateQueries(organizationKeys.getUserOrganizations);
     }
   });
 };

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

@@ -11,13 +11,13 @@ import { apiRequest } from "@app/config/request";
 import { secretSnapshotKeys } from "../secretSnapshots/queries";
 import {
   BatchSecretDTO,
+  CreateSecretDTO,
   DecryptedSecret,
   EncryptedSecret,
   EncryptedSecretVersion,
   GetProjectSecretsDTO,
   GetSecretVersionsDTO,
-  TGetProjectSecretsAllEnvDTO
-} from "./types";
+  TGetProjectSecretsAllEnvDTO} from "./types";
 
 export const secretKeys = {
   // this is also used in secretSnapshot part
@@ -324,3 +324,24 @@ export const useBatchSecretsOp = () => {
     }
   });
 };
+
+export const createSecret = async (dto: CreateSecretDTO) => {
+  const { data } = await apiRequest.post(`/api/v3/secrets/${dto.secretKey}`, dto);
+  return data;
+}
+
+export const useCreateSecret = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<{}, {}, CreateSecretDTO>({
+    mutationFn: async (dto) => {
+      const data = createSecret(dto);
+      return data;
+    },
+    onSuccess: (_, dto) => {
+      queryClient.invalidateQueries(
+        secretKeys.getProjectSecret(dto.workspaceId, dto.environment)
+      );
+    }
+  });
+};

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

@@ -147,3 +147,22 @@ export type TDeleteSecretsV3DTO = {
   secretPath: string;
   secretName: string;
 };
+
+// --- v3
+
+export type CreateSecretDTO = {
+  workspaceId: string;
+  environment: string;
+  type: "shared" | "personal";
+  secretKey: string;
+  secretKeyCiphertext: string;
+  secretKeyIV: string;
+  secretKeyTag: string;
+  secretValueCiphertext: string;
+  secretValueIV: string;
+  secretValueTag: string;
+  secretCommentCiphertext: string;
+  secretCommentIV: string;
+  secretCommentTag: string;
+  secretPath: string;
+}

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

@@ -23,12 +23,13 @@ const fetchWorkspaceServiceTokens = async (workspaceID: string) => {
 
 type UseGetWorkspaceServiceTokensProps = { workspaceID: string };
 
-export const useGetUserWsServiceTokens = ({ workspaceID }: UseGetWorkspaceServiceTokensProps) =>
-  useQuery({
+export const useGetUserWsServiceTokens = ({ workspaceID }: UseGetWorkspaceServiceTokensProps) => {
+  return useQuery({
     queryKey: serviceTokenKeys.getAllWorkspaceServiceToken(workspaceID),
     queryFn: () => fetchWorkspaceServiceTokens(workspaceID),
     enabled: Boolean(workspaceID)
   });
+}
 
 // mutation
 export const useCreateServiceToken = () => {
@@ -36,6 +37,7 @@ export const useCreateServiceToken = () => {
 
   return useMutation<CreateServiceTokenRes, {}, CreateServiceTokenDTO>({
     mutationFn: async (body) => {
+      console.log("useCreateServiceToken");
       const { data } = await apiRequest.post("/api/v2/service-token/", body);
       data.serviceToken += `.${body.randomBytes}`;
       return data;
@@ -51,6 +53,7 @@ export const useDeleteServiceToken = () => {
 
   return useMutation<DeleteServiceTokenRes, {}, string>({
     mutationFn: async (serviceTokenId) => {
+      console.log("useDeleteServiceToken");
       const { data } = await apiRequest.delete(`/api/v2/service-token/${serviceTokenId}`);
       return data;
     },

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

@@ -166,13 +166,21 @@ export const useGetWorkspaceIntegrations = (workspaceId: string) =>
     enabled: Boolean(workspaceId)
   });
 
-// mutation
+export const createWorkspace = ({
+  organizationId,
+  workspaceName
+}: CreateWorkspaceDTO): Promise<{ data: { workspace: Workspace } }> => {
+  return apiRequest.post("/api/v1/workspace", { workspaceName, organizationId });
+}
+
 export const useCreateWorkspace = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{ data: { workspace: Workspace } }, {}, CreateWorkspaceDTO>({
-    mutationFn: async ({ organizationId, workspaceName }) =>
-      apiRequest.post("/api/v1/workspace", { workspaceName, organizationId }),
+    mutationFn: async ({ organizationId, workspaceName }) => createWorkspace({
+      organizationId,
+      workspaceName
+    }),
     onSuccess: () => {
       queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace);
     }
@@ -183,8 +191,9 @@ export const useRenameWorkspace = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, RenameWorkspaceDTO>({
-    mutationFn: ({ workspaceID, newWorkspaceName }) =>
-      apiRequest.post(`/api/v1/workspace/${workspaceID}/name`, { name: newWorkspaceName }),
+    mutationFn: ({ workspaceID, newWorkspaceName }) => {
+      return apiRequest.post(`/api/v1/workspace/${workspaceID}/name`, { name: newWorkspaceName });
+    },
     onSuccess: () => {
       queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace);
     }
@@ -220,11 +229,12 @@ export const useCreateWsEnvironment = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, CreateEnvironmentDTO>({
-    mutationFn: ({ workspaceID, environmentName, environmentSlug }) =>
-      apiRequest.post(`/api/v2/workspace/${workspaceID}/environments`, {
+    mutationFn: ({ workspaceID, environmentName, environmentSlug }) => {
+      return apiRequest.post(`/api/v2/workspace/${workspaceID}/environments`, {
         environmentName,
         environmentSlug
-      }),
+      });
+    },
     onSuccess: () => {
       queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace);
     }
@@ -235,12 +245,13 @@ export const useUpdateWsEnvironment = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, UpdateEnvironmentDTO>({
-    mutationFn: ({ workspaceID, environmentName, environmentSlug, oldEnvironmentSlug }) =>
-      apiRequest.put(`/api/v2/workspace/${workspaceID}/environments`, {
+    mutationFn: ({ workspaceID, environmentName, environmentSlug, oldEnvironmentSlug }) => {
+      return apiRequest.put(`/api/v2/workspace/${workspaceID}/environments`, {
         environmentName,
         environmentSlug,
         oldEnvironmentSlug
-      }),
+      });
+    },
     onSuccess: () => {
       queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace);
     }
@@ -251,10 +262,11 @@ export const useDeleteWsEnvironment = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, DeleteEnvironmentDTO>({
-    mutationFn: ({ workspaceID, environmentSlug }) =>
-      apiRequest.delete(`/api/v2/workspace/${workspaceID}/environments`, {
+    mutationFn: ({ workspaceID, environmentSlug }) => {
+      return apiRequest.delete(`/api/v2/workspace/${workspaceID}/environments`, {
         data: { environmentSlug }
-      }),
+      });
+    },
     onSuccess: () => {
       queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace);
     }