diff --git a/frontend/src/helpers/project.ts b/frontend/src/helpers/project.ts index 8379b0fa59..ff8e700a4e 100644 --- a/frontend/src/helpers/project.ts +++ b/frontend/src/helpers/project.ts @@ -77,18 +77,11 @@ const secretsToBeAdded = [ * @param {String} obj.projectName - name of new project * @returns {Project} project - new project */ -const initProjectHelper = async ({ - organizationSlug, - projectName -}: { - organizationSlug: string; - projectName: string; -}) => { +const initProjectHelper = async ({ projectName }: { projectName: string }) => { // create new project const { data: { project } } = await createWorkspace({ - organizationSlug, projectName }); diff --git a/frontend/src/hooks/api/workspace/queries.tsx b/frontend/src/hooks/api/workspace/queries.tsx index 24a7e57946..001454233d 100644 --- a/frontend/src/hooks/api/workspace/queries.tsx +++ b/frontend/src/hooks/api/workspace/queries.tsx @@ -199,19 +199,17 @@ export const useGetWorkspaceIntegrations = (workspaceId: string) => }); export const createWorkspace = ({ - organizationSlug, projectName }: CreateWorkspaceDTO): Promise<{ data: { project: Workspace } }> => { - return apiRequest.post("/api/v2/workspace", { projectName, organizationSlug }); + return apiRequest.post("/api/v2/workspace", { projectName }); }; export const useCreateWorkspace = () => { const queryClient = useQueryClient(); return useMutation<{ data: { project: Workspace } }, {}, CreateWorkspaceDTO>({ - mutationFn: async ({ organizationSlug, projectName }) => + mutationFn: async ({ projectName }) => createWorkspace({ - organizationSlug, projectName }), onSuccess: () => { @@ -325,7 +323,13 @@ export const useDeleteUserFromWorkspace = () => { const queryClient = useQueryClient(); return useMutation({ - mutationFn: async ({ usernames, workspaceId }: { workspaceId: string; usernames: string[] }) => { + mutationFn: async ({ + usernames, + workspaceId + }: { + workspaceId: string; + usernames: string[]; + }) => { const { data: { deletedMembership } } = await apiRequest.delete(`/api/v2/workspace/${workspaceId}/memberships`, { @@ -391,11 +395,7 @@ export const useAddIdentityToWorkspace = () => { export const useUpdateIdentityWorkspaceRole = () => { const queryClient = useQueryClient(); return useMutation({ - mutationFn: async ({ - identityId, - workspaceId, - roles - }:TUpdateWorkspaceIdentityRoleDTO)=> { + mutationFn: async ({ identityId, workspaceId, roles }: TUpdateWorkspaceIdentityRoleDTO) => { const { data: { identityMembership } } = await apiRequest.patch( diff --git a/frontend/src/hooks/api/workspace/types.ts b/frontend/src/hooks/api/workspace/types.ts index 657b076939..f0cee77415 100644 --- a/frontend/src/hooks/api/workspace/types.ts +++ b/frontend/src/hooks/api/workspace/types.ts @@ -45,7 +45,6 @@ export type TGetUpgradeProjectStatusDTO = { // mutation dto export type CreateWorkspaceDTO = { projectName: string; - organizationSlug: string; }; export type RenameWorkspaceDTO = { workspaceID: string; newWorkspaceName: string }; @@ -82,16 +81,16 @@ export type TUpdateWorkspaceUserRoleDTO = { workspaceId: string; roles: ( | { - role: string; - isTemporary?: false; - } + role: string; + isTemporary?: false; + } | { - role: string; - isTemporary: true; - temporaryMode: ProjectUserMembershipTemporaryMode; - temporaryRange: string; - temporaryAccessStartTime: string; - } + role: string; + isTemporary: true; + temporaryMode: ProjectUserMembershipTemporaryMode; + temporaryRange: string; + temporaryAccessStartTime: string; + } )[]; }; @@ -100,15 +99,15 @@ export type TUpdateWorkspaceIdentityRoleDTO = { workspaceId: string; roles: ( | { - role: string; - isTemporary?: false; - } + role: string; + isTemporary?: false; + } | { - role: string; - isTemporary: true; - temporaryMode: ProjectUserMembershipTemporaryMode; - temporaryRange: string; - temporaryAccessStartTime: string; - } + role: string; + isTemporary: true; + temporaryMode: ProjectUserMembershipTemporaryMode; + temporaryRange: string; + temporaryAccessStartTime: string; + } )[]; }; diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx index e78913f6ec..70a6b4326b 100644 --- a/frontend/src/layouts/AppLayout/AppLayout.tsx +++ b/frontend/src/layouts/AppLayout/AppLayout.tsx @@ -236,7 +236,6 @@ export const AppLayout = ({ children }: LayoutProps) => { project: { id: newProjectId } } } = await createWs.mutateAsync({ - organizationSlug: currentOrg.slug, projectName: name }); diff --git a/frontend/src/pages/org/[id]/overview/index.tsx b/frontend/src/pages/org/[id]/overview/index.tsx index 57b4674cf8..38be2f4b79 100644 --- a/frontend/src/pages/org/[id]/overview/index.tsx +++ b/frontend/src/pages/org/[id]/overview/index.tsx @@ -512,7 +512,6 @@ const OrganizationPage = withPermission( project: { id: newProjectId } } } = await createWs.mutateAsync({ - organizationSlug: currentOrg.slug, projectName: name }); diff --git a/frontend/src/services/ProjectService.ts b/frontend/src/services/ProjectService.ts index e1d0e3fe80..afdc7c9f95 100644 --- a/frontend/src/services/ProjectService.ts +++ b/frontend/src/services/ProjectService.ts @@ -9,15 +9,8 @@ class ProjectService { * @param {String} obj.projectName - name of new project * @returns {Project} project - new project */ - static async initProject({ - organizationSlug, - projectName - }: { - organizationSlug: string; - projectName: string; - }) { + static async initProject({ projectName }: { projectName: string }) { return initProjectHelper({ - organizationSlug, projectName }); }