Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(web): isolate active workspace per tab via URL

Tin3b057b601408
diff --git a/apps/web/src/hooks/mutations/label/use-create-label.ts b/apps/web/src/hooks/mutations/label/use-create-label.ts
index 413561ecb..a43efca68 100644
--- a/apps/web/src/hooks/mutations/label/use-create-label.ts
+++ b/apps/web/src/hooks/mutations/label/use-create-label.ts
@@ -1,6 +1,6 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import createLabel from "@/fetchers/label/create-label";
import type { CreateLabelRequest } from "@/fetchers/label/create-label";
+import createLabel from "@/fetchers/label/create-label";
function useCreateLabel() {
const queryClient = useQueryClient();
diff --git a/apps/web/src/hooks/queries/workspace-users/use-active-workspace-user.ts b/apps/web/src/hooks/queries/workspace-users/use-active-workspace-user.ts
index 2dd33809e..4e7882760 100644
--- a/apps/web/src/hooks/queries/workspace-users/use-active-workspace-user.ts
+++ b/apps/web/src/hooks/queries/workspace-users/use-active-workspace-user.ts
@@ -1,17 +1,27 @@
import { useQuery } from "@tanstack/react-query";
+import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
+import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
import { authClient } from "@/lib/auth-client";
export const useGetActiveWorkspaceUser = () => {
+ const { user } = useAuth();
+ const { data: workspace } = useActiveWorkspace();
+
return useQuery({
- queryKey: ["workspace-user", "active"],
+ queryKey: ["workspace-user", "active", workspace?.id, user?.id],
+ enabled: !!workspace?.id && !!user?.id,
queryFn: async () => {
- const { data, error } = await authClient.organization.getActiveMember();
+ const { data, error } = await authClient.organization.listMembers({
+ query: {
+ organizationId: workspace?.id,
+ },
+ });
if (error) {
throw new Error(error.message || "Failed to get active workspace user");
}
- return data;
+ return data.members.find((member) => member.userId === user?.id) ?? null;
},
});
};
diff --git a/apps/web/src/hooks/queries/workspace/use-active-workspace.ts b/apps/web/src/hooks/queries/workspace/use-active-workspace.ts
index 5f045e505..7f8e95876 100644
--- a/apps/web/src/hooks/queries/workspace/use-active-workspace.ts
+++ b/apps/web/src/hooks/queries/workspace/use-active-workspace.ts
@@ -1,13 +1,33 @@
+import { useParams } from "@tanstack/react-router";
import { authClient } from "@/lib/auth-client";
function useActiveWorkspace() {
const { data: activeOrganization, error } =
authClient.useActiveOrganization();
+ const { data: organizations, isPending: isOrganizationsPending } =
+ authClient.useListOrganizations();
+ const { workspaceId } = useParams({
+ strict: false,
+ select: (params) => ({
+ workspaceId:
+ "workspaceId" in params && typeof params.workspaceId === "string"
+ ? params.workspaceId
+ : undefined,
+ }),
+ });
+
+ const workspaceFromRoute = workspaceId
+ ? organizations?.find((organization) => organization.id === workspaceId)
+ : undefined;
+ const workspace = workspaceFromRoute ?? activeOrganization;
+ const isLoading =
+ (!!workspaceId && isOrganizationsPending && !workspaceFromRoute) ||
+ (!workspace && !error);
return {
- data: activeOrganization,
+ data: workspace,
error,
- isLoading: !activeOrganization && !error,
+ isLoading,
isError: !!error,
};
}
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId.tsx
index 2611c3cf2..09c40c2dc 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId.tsx
@@ -1,6 +1,4 @@
-import { createFileRoute, Outlet, useNavigate } from "@tanstack/react-router";
-import { useEffect } from "react";
-import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
+import { createFileRoute, Outlet } from "@tanstack/react-router";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/workspace/$workspaceId",
@@ -9,26 +7,5 @@ export const Route = createFileRoute(
});
function RouteComponent() {
- const { workspaceId } = Route.useParams();
-
- const { data: activeWorkspace } = useActiveWorkspace();
- const navigate = useNavigate();
-
- useEffect(() => {
- // If we have an active workspace and it doesn't match the URL, redirect to the correct workspace
- if (activeWorkspace && activeWorkspace.id !== workspaceId) {
- navigate({
- to: "/dashboard/workspace/$workspaceId",
- params: { workspaceId: activeWorkspace.id },
- replace: true, // Replace current history entry to avoid back button issues
- });
- }
- }, [activeWorkspace, workspaceId, navigate]);
-
- // Don't render anything if we're redirecting
- if (activeWorkspace && activeWorkspace.id !== workspaceId) {
- return null;
- }
-
return <Outlet />;
}