Fix: Change org ID to org slug

This commit is contained in:
Daniel Hougaard
2024-03-06 03:19:58 +01:00
parent f0383dd55c
commit aaca3ac229
2 changed files with 8 additions and 6 deletions

View File

@@ -226,7 +226,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
project: { id: newProjectId }
}
} = await createWs.mutateAsync({
organizationId: currentOrg.id,
organizationSlug: currentOrg.slug,
projectName: name
});

View File

@@ -44,6 +44,7 @@ import {
import {
OrgPermissionActions,
OrgPermissionSubjects,
useOrganization,
useSubscription,
useUser,
useWorkspace
@@ -468,8 +469,9 @@ const OrganizationPage = withPermission(
const router = useRouter();
const { workspaces, isLoading: isWorkspaceLoading } = useWorkspace();
const currentOrg = String(router.query.id);
const orgWorkspaces = workspaces?.filter((workspace) => workspace.orgId === currentOrg) || [];
const { currentOrg } = useOrganization();
const routerOrgId = String(router.query.id);
const orgWorkspaces = workspaces?.filter((workspace) => workspace.orgId === routerOrgId) || [];
const { createNotification } = useNotificationContext();
const addUsersToProject = useAddUserToWsNonE2EE();
@@ -505,12 +507,12 @@ const OrganizationPage = withPermission(
project: { id: newProjectId }
}
} = await createWs.mutateAsync({
organizationId: currentOrg,
organizationSlug: currentOrg.slug,
projectName: name
});
if (addMembers) {
const orgUsers = await fetchOrgUsers(currentOrg);
const orgUsers = await fetchOrgUsers(currentOrg.id);
await addUsersToProject.mutateAsync({
usernames: orgUsers
@@ -540,7 +542,7 @@ const OrganizationPage = withPermission(
useEffect(() => {
onboardingCheck({
orgId: currentOrg,
orgId: routerOrgId,
setHasUserClickedIntro,
setHasUserClickedSlack,
setHasUserPushedSecrets,