From 7a41cdf51b52b3c4c88690cb6f7882d8295ccb64 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Mon, 9 Sep 2024 15:30:23 +0400 Subject: [PATCH] Fix: type errors --- backend/src/server/routes/index.ts | 4 +--- frontend/src/hooks/api/apiKeys/queries.tsx | 2 +- frontend/src/hooks/api/auditLogs/queries.tsx | 10 ++++------ frontend/src/hooks/api/auth/queries.tsx | 2 +- frontend/src/hooks/api/ca/mutations.tsx | 2 +- .../src/hooks/api/certificateTemplates/mutations.tsx | 6 ++++-- frontend/src/hooks/api/certificates/mutations.tsx | 2 +- frontend/src/hooks/api/integrationAuth/queries.tsx | 2 +- frontend/src/hooks/api/integrations/queries.tsx | 2 +- frontend/src/hooks/api/pkiAlerts/mutations.tsx | 2 +- frontend/src/hooks/api/pkiCollections/mutations.tsx | 5 +++-- frontend/src/views/Login/Login.utils.tsx | 2 +- .../MembersTab/components/AddMemberModal.tsx | 3 ++- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts index 9c211e3ad..f0675dff5 100644 --- a/backend/src/server/routes/index.ts +++ b/backend/src/server/routes/index.ts @@ -507,8 +507,7 @@ export const registerRoutes = async ( smtpService, userDAL, groupDAL, - orgBotDAL, - projectRoleDAL + orgBotDAL }); const signupService = authSignupServiceFactory({ tokenService, @@ -518,7 +517,6 @@ export const registerRoutes = async ( userGroupMembershipDAL, projectKeyDAL, projectDAL, - projectRoleDAL, projectBotDAL, groupProjectDAL, projectMembershipDAL, diff --git a/frontend/src/hooks/api/apiKeys/queries.tsx b/frontend/src/hooks/api/apiKeys/queries.tsx index d37917435..c1a2e4355 100644 --- a/frontend/src/hooks/api/apiKeys/queries.tsx +++ b/frontend/src/hooks/api/apiKeys/queries.tsx @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { apiRequest } from "@app/config/request"; -import { userKeys } from "../users/queries"; +import { userKeys } from "../users"; import { APIKeyDataV2, CreateAPIKeyDataV2DTO, diff --git a/frontend/src/hooks/api/auditLogs/queries.tsx b/frontend/src/hooks/api/auditLogs/queries.tsx index 68fd3890c..1788b8f08 100644 --- a/frontend/src/hooks/api/auditLogs/queries.tsx +++ b/frontend/src/hooks/api/auditLogs/queries.tsx @@ -4,8 +4,8 @@ import { apiRequest } from "@app/config/request"; import { Actor, AuditLog, AuditLogFilters } from "./types"; -export const workspaceKeys = { - getAuditLogs: (filters: AuditLogFilters, workspaceId: string | null) => +export const auditLogKeys = { + getAuditLogs: (workspaceId: string | null, filters: AuditLogFilters) => [{ workspaceId, filters }, "audit-logs"] as const, getAuditLogActorFilterOpts: (workspaceId: string) => [{ workspaceId }, "audit-log-actor-filters"] as const @@ -13,9 +13,7 @@ export const workspaceKeys = { export const useGetAuditLogs = (filters: AuditLogFilters, workspaceId: string | null) => { return useInfiniteQuery({ - queryKey: workspaceKeys.getAuditLogs(filters, workspaceId), - enabled: workspaceId !== "", - + queryKey: auditLogKeys.getAuditLogs(workspaceId, filters), queryFn: async ({ pageParam }) => { const auditLogEndpoint = workspaceId ? `/api/v1/workspace/${workspaceId}/audit-logs` @@ -37,7 +35,7 @@ export const useGetAuditLogs = (filters: AuditLogFilters, workspaceId: string | export const useGetAuditLogActorFilterOpts = (workspaceId: string) => { return useQuery({ - queryKey: workspaceKeys.getAuditLogActorFilterOpts(workspaceId), + queryKey: auditLogKeys.getAuditLogActorFilterOpts(workspaceId), queryFn: async () => { const { data } = await apiRequest.get<{ actors: Actor[] }>( `/api/v1/workspace/${workspaceId}/audit-logs/filters/actors` diff --git a/frontend/src/hooks/api/auth/queries.tsx b/frontend/src/hooks/api/auth/queries.tsx index 27c7c87d2..28d5f3941 100644 --- a/frontend/src/hooks/api/auth/queries.tsx +++ b/frontend/src/hooks/api/auth/queries.tsx @@ -5,7 +5,7 @@ import { apiRequest } from "@app/config/request"; import { setAuthToken } from "@app/reactQuery"; import { organizationKeys } from "../organization/queries"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { ChangePasswordDTO, CompleteAccountDTO, diff --git a/frontend/src/hooks/api/ca/mutations.tsx b/frontend/src/hooks/api/ca/mutations.tsx index 5e668ecef..0bbec617b 100644 --- a/frontend/src/hooks/api/ca/mutations.tsx +++ b/frontend/src/hooks/api/ca/mutations.tsx @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { apiRequest } from "@app/config/request"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { caKeys } from "./queries"; import { TCertificateAuthority, diff --git a/frontend/src/hooks/api/certificateTemplates/mutations.tsx b/frontend/src/hooks/api/certificateTemplates/mutations.tsx index f633c0332..8545cf70c 100644 --- a/frontend/src/hooks/api/certificateTemplates/mutations.tsx +++ b/frontend/src/hooks/api/certificateTemplates/mutations.tsx @@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { apiRequest } from "@app/config/request"; import { caKeys } from "../ca/queries"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { certTemplateKeys } from "./queries"; import { TCertificateTemplate, @@ -54,7 +54,9 @@ export const useDeleteCertTemplate = () => { const queryClient = useQueryClient(); return useMutation({ mutationFn: async (data) => { - const { data: certificateTemplate } = await apiRequest.delete(`/api/v1/pki/certificate-templates/${data.id}`); + const { data: certificateTemplate } = await apiRequest.delete( + `/api/v1/pki/certificate-templates/${data.id}` + ); return certificateTemplate; }, onSuccess: ({ caId }, { projectId, id }) => { diff --git a/frontend/src/hooks/api/certificates/mutations.tsx b/frontend/src/hooks/api/certificates/mutations.tsx index 4c0f92339..d73a0cd15 100644 --- a/frontend/src/hooks/api/certificates/mutations.tsx +++ b/frontend/src/hooks/api/certificates/mutations.tsx @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { apiRequest } from "@app/config/request"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { TCertificate, TDeleteCertDTO, TRevokeCertDTO } from "./types"; export const useDeleteCert = () => { diff --git a/frontend/src/hooks/api/integrationAuth/queries.tsx b/frontend/src/hooks/api/integrationAuth/queries.tsx index efb5ad7fb..914c3a71c 100644 --- a/frontend/src/hooks/api/integrationAuth/queries.tsx +++ b/frontend/src/hooks/api/integrationAuth/queries.tsx @@ -2,7 +2,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import { apiRequest } from "@app/config/request"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { App, BitBucketWorkspace, diff --git a/frontend/src/hooks/api/integrations/queries.tsx b/frontend/src/hooks/api/integrations/queries.tsx index ebb0e8b1e..f07e33e60 100644 --- a/frontend/src/hooks/api/integrations/queries.tsx +++ b/frontend/src/hooks/api/integrations/queries.tsx @@ -3,7 +3,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import { createNotification } from "@app/components/notifications"; import { apiRequest } from "@app/config/request"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { TCloudIntegration } from "./types"; export const integrationQueryKeys = { diff --git a/frontend/src/hooks/api/pkiAlerts/mutations.tsx b/frontend/src/hooks/api/pkiAlerts/mutations.tsx index b8406e95d..54aa8eeff 100644 --- a/frontend/src/hooks/api/pkiAlerts/mutations.tsx +++ b/frontend/src/hooks/api/pkiAlerts/mutations.tsx @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { apiRequest } from "@app/config/request"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { pkiAlertKeys } from "./queries"; import { TCreatePkiAlertDTO, TDeletePkiAlertDTO, TPkiAlert, TUpdatePkiAlertDTO } from "./types"; diff --git a/frontend/src/hooks/api/pkiCollections/mutations.tsx b/frontend/src/hooks/api/pkiCollections/mutations.tsx index df66dd8e2..496a17051 100644 --- a/frontend/src/hooks/api/pkiCollections/mutations.tsx +++ b/frontend/src/hooks/api/pkiCollections/mutations.tsx @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { apiRequest } from "@app/config/request"; -import { workspaceKeys } from "../workspace/queries"; +import { workspaceKeys } from "../workspace"; import { pkiCollectionKeys } from "./queries"; import { TAddItemToPkiCollectionDTO, @@ -11,7 +11,8 @@ import { TPkiCollection, TPkiCollectionItem, TRemoveItemFromPkiCollectionDTO, - TUpdatePkiCollectionTO} from "./types"; + TUpdatePkiCollectionTO +} from "./types"; export const useCreatePkiCollection = () => { const queryClient = useQueryClient(); diff --git a/frontend/src/views/Login/Login.utils.tsx b/frontend/src/views/Login/Login.utils.tsx index 04cc494a2..45bac2283 100644 --- a/frontend/src/views/Login/Login.utils.tsx +++ b/frontend/src/views/Login/Login.utils.tsx @@ -3,7 +3,7 @@ import { NextRouter, useRouter } from "next/router"; import { useServerConfig } from "@app/context"; import { useSelectOrganization } from "@app/hooks/api"; import { fetchOrganizations } from "@app/hooks/api/organization/queries"; -import { userKeys } from "@app/hooks/api/users/queries"; +import { userKeys } from "@app/hooks/api/users"; import { queryClient } from "@app/reactQuery"; export const navigateUserToOrg = async (router: NextRouter, organizationId?: string) => { diff --git a/frontend/src/views/Project/MembersPage/components/MembersTab/components/AddMemberModal.tsx b/frontend/src/views/Project/MembersPage/components/MembersTab/components/AddMemberModal.tsx index b8f044617..af1797ccf 100644 --- a/frontend/src/views/Project/MembersPage/components/MembersTab/components/AddMemberModal.tsx +++ b/frontend/src/views/Project/MembersPage/components/MembersTab/components/AddMemberModal.tsx @@ -91,7 +91,8 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => { organizationRoleSlug: ProjectMembershipRole.Member, // ? This doesn't apply in this case, because we know the users being added are already part of the organization projects: [ { - id: workspaceId, + slug: currentWorkspace.slug, + id: currentWorkspace.id, projectRoleSlug: projectRoleSlugs } ]