shiyue/kan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prevent workspace.byId validation errors when publicId is empty

Browse Source
This commit is contained in:
Henry
2026-02-02 22:09:09 +00:00
parent 81c03b51e2
commit ec506fa33c
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/web/src/components/SideNavigation.tsx
View File

@@ -55,9 +55,10 @@ export default function SideNavigation({
const [isInitialised, setIsInitialised] = useState(false); const [isInitialised, setIsInitialised] = useState(false);
const { openModal } = useModal(); const { openModal } = useModal();
const { data: workspaceData } = api.workspace.byId.useQuery({ const { data: workspaceData } = api.workspace.byId.useQuery(
workspacePublicId: workspace.publicId, { workspacePublicId: workspace.publicId },
}); { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
);
const subscriptions = workspaceData?.subscriptions as const subscriptions = workspaceData?.subscriptions as
| Subscription[] | Subscription[]

10
apps/web/src/views/members/index.tsx
View File

@@ -37,7 +37,7 @@ export default function MembersPage() {
const { data, isLoading } = api.workspace.byId.useQuery( const { data, isLoading } = api.workspace.byId.useQuery(
{ workspacePublicId: workspace.publicId }, { workspacePublicId: workspace.publicId },
// { enabled: workspace?.publicId ? true : false }, { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
); );
const { data: session } = authClient.useSession(); const { data: session } = authClient.useSession();
@@ -48,9 +48,11 @@ export default function MembersPage() {
const updateRoleMutation = api.member.updateRole.useMutation({ const updateRoleMutation = api.member.updateRole.useMutation({
onSuccess: async () => { onSuccess: async () => {
await utils.workspace.byId.invalidate({ if (workspace.publicId && workspace.publicId.length >= 12) {
workspacePublicId: workspace.publicId, await utils.workspace.byId.invalidate({
}); workspacePublicId: workspace.publicId,
});
}
showPopup({ showPopup({
header: t`Role updated`, header: t`Role updated`,

8
apps/web/src/views/settings/PermissionsSettings.tsx
View File

@@ -28,9 +28,11 @@ export default function PermissionsSettings() {
}); });
// Refresh any relevant workspace data // Refresh any relevant workspace data
await utils.workspace.byId.invalidate({ if (workspace.publicId && workspace.publicId.length >= 12) {
workspacePublicId: workspace.publicId, await utils.workspace.byId.invalidate({
}); workspacePublicId: workspace.publicId,
});
}
}, },
onError: () => { onError: () => {
showPopup({ showPopup({

7
apps/web/src/views/settings/WorkspaceSettings.tsx
View File

@@ -31,9 +31,10 @@ export default function WorkspaceSettings() {
const { data } = api.user.getUser.useQuery(); const { data } = api.user.getUser.useQuery();
const [hasOpenedUpgradeModal, setHasOpenedUpgradeModal] = useState(false); const [hasOpenedUpgradeModal, setHasOpenedUpgradeModal] = useState(false);
const { data: workspaceData } = api.workspace.byId.useQuery({ const { data: workspaceData } = api.workspace.byId.useQuery(
workspacePublicId: workspace.publicId, { workspacePublicId: workspace.publicId },
}); { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
);
const subscriptions = workspaceData?.subscriptions as const subscriptions = workspaceData?.subscriptions as
| Subscription[] | Subscription[]

8
apps/web/src/views/settings/components/UpdateWorkspaceEmailVisibilityForm.tsx
View File

@@ -22,9 +22,11 @@ export default function UpdateWorkspaceEmailVisibilityForm({
const updateWorkspace = api.workspace.update.useMutation({ const updateWorkspace = api.workspace.update.useMutation({
onSuccess: () => { onSuccess: () => {
void utils.workspace.byId.invalidate({ if (workspacePublicId && workspacePublicId.length >= 12) {
workspacePublicId, void utils.workspace.byId.invalidate({
}); workspacePublicId,
});
}
}, },
}); });