Skip to content

Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.

Route sidebar space mutations through teamSpaceActions and shared confirm dialog

Gabriel Stein22d9885b77e8
diff --git a/src/components/notes/CreateSpaceDialog.tsx b/src/components/notes/CreateSpaceDialog.tsx
index 22b811230..a587d14a9 100644
--- a/src/components/notes/CreateSpaceDialog.tsx
+++ b/src/components/notes/CreateSpaceDialog.tsx
@@ -1,19 +1,18 @@
-import { useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
-import { Check, Loader2, Search } from "lucide-react";
+import { Loader2 } from "lucide-react";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "../ui/dialog";
import { Button } from "../ui/button";
import { Input } from "../ui/input";
import { useToast } from "../ui/useToast";
-import { cn } from "../lib/utils";
import CreateWorkspaceDialog from "../CreateWorkspaceDialog";
-import { TeamsService } from "../../services/TeamsService";
-import { syncService } from "../../services/SyncService.js";
+import MemberPickList from "../MemberPickList";
+import { createTeamSpace } from "../../services/teamSpaceActions";
import { useWorkspace } from "../../hooks/useWorkspace";
import { useWorkspaceStore } from "../../stores/workspaceStore";
import { useAuth } from "../../hooks/useAuth";
import { useDelayedFlag } from "../../hooks/useDelayedFlag";
-import { loadSpaces, revealContainer, setActiveContext } from "../../stores/noteStore";
+import { revealContainer, setActiveContext } from "../../stores/noteStore";
import type { WorkspaceMember } from "../../types/electron";
interface CreateSpaceDialogProps {
@@ -25,13 +24,16 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
const { t } = useTranslation();
const { toast } = useToast();
const { user } = useAuth();
- const { workspaces, active, loaded } = useWorkspace();
+ const { workspaces, active, loaded, refresh } = useWorkspace();
+ const workspacesError = useWorkspaceStore((s) => s.error);
+ const workspacesLoading = useWorkspaceStore((s) => s.loading);
const roster = useWorkspaceStore((s) => s.members);
const refreshMembers = useWorkspaceStore((s) => s.refreshMembers);
const [name, setName] = useState("");
const [emoji, setEmoji] = useState("");
const [memberSearch, setMemberSearch] = useState("");
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
+ const [membersError, setMembersError] = useState(false);
const [isCreating, setIsCreating] = useState(false);
const showSpinner = useDelayedFlag(isCreating);
@@ -39,11 +41,25 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
// create spaces in (owner/admin) — kept deliberately simple for v1.
const workspace =
active ?? workspaces.find((w) => w.role === "owner" || w.role === "admin") ?? null;
- const needsWorkspace = open && loaded && !workspace;
+ // A failed workspace fetch gets a retry state, never the create funnel.
+ const needsWorkspace = open && loaded && !workspace && !workspacesError;
+ const workspacesFailed = loaded && !workspace && workspacesError;
+
+ const loadMembers = useCallback(
+ async (workspaceId: string) => {
+ setMembersError(false);
+ try {
+ await refreshMembers(workspaceId);
+ } catch {
+ setMembersError(true);
+ }
+ },
+ [refreshMembers]
+ );
useEffect(() => {
- if (open && workspace) void refreshMembers(workspace.id);
- }, [open, workspace, refreshMembers]);
+ if (open && workspace) void loadMembers(workspace.id);
+ }, [open, workspace, loadMembers]);
const candidates = useMemo(
() => roster.filter((m) => m.user_id !== user?.id),
@@ -91,34 +107,25 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
if (!trimmed || isCreating || !workspace) return;
setIsCreating(true);
try {
- const team = await TeamsService.create(workspace.id, {
- name: trimmed,
- emoji: emoji.trim() || null,
- });
- let added = 0;
- let memberError: string | null = null;
- for (const userId of selectedIds) {
- try {
- await TeamsService.addMember(team.id, userId);
- added += 1;
- } catch (err) {
- memberError = err instanceof Error ? err.message : t("common.unknownError");
- }
- }
- if (memberError) {
- toast({ title: t("common.error"), description: memberError, variant: "destructive" });
+ const memberIds = [...selectedIds];
+ const { space, failedMembers } = await createTeamSpace(
+ workspace.id,
+ { name: trimmed, emoji: emoji.trim() || null },
+ memberIds
+ );
+ if (failedMembers > 0) {
+ toast({
+ title: t("notes.spaces.members.addFailed", {
+ failed: failedMembers,
+ total: memberIds.length,
+ }),
+ variant: "destructive",
+ });
}
- const space = await window.electronAPI.upsertSpaceFromCloud?.({
- ...team,
- my_role: "admin",
- member_count: added,
- });
if (space) {
- await loadSpaces();
revealContainer(space.id, null);
setActiveContext(space.id, null);
}
- syncService.requestSyncAll("manual");
handleOpenChange(false);
} catch (err) {
toast({
@@ -141,97 +148,108 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
<DialogTitle>{t("notes.spaces.createTitle")}</DialogTitle>
</DialogHeader>
- <div className="flex gap-3">
- <div className="space-y-1.5 w-14 shrink-0">
- <label className="text-xs font-medium text-foreground/50">
- {t("notes.spaces.emojiLabel")}
- </label>
- <Input
- value={emoji}
- onChange={(e) => setEmoji(e.target.value)}
- maxLength={4}
- className="text-center"
- />
- </div>
- <div className="space-y-1.5 flex-1">
- <label className="text-xs font-medium text-foreground/50">
- {t("notes.spaces.nameLabel")}
- </label>
- <Input
- value={name}
- autoFocus
- maxLength={80}
- onChange={(e) => setName(e.target.value)}
- onKeyDown={(e) => {
- if (e.key === "Enter") handleCreate();
- }}
- />
+ {workspacesFailed ? (
+ <div className="rounded-lg border border-border/50 dark:border-border-subtle/70 bg-card/50 dark:bg-surface-2/50 px-4 py-6 flex items-center justify-between gap-3">
+ <div className="min-w-0">
+ <p className="text-xs font-medium text-foreground">
+ {t("settingsPage.workspace.loadError.title")}
+ </p>
+ <p className="text-xs text-muted-foreground mt-0.5">
+ {t("settingsPage.workspace.loadError.description")}
+ </p>
+ </div>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => void refresh()}
+ disabled={workspacesLoading}
+ className="shrink-0"
+ >
+ {workspacesLoading && <Loader2 className="mr-1.5 h-3 w-3 animate-spin" />}
+ {t("settingsPage.workspace.loadError.retry")}
+ </Button>
</div>
- </div>
-
- {candidates.length > 0 && (
- <div className="space-y-1.5">
- <label className="text-xs font-medium text-foreground/50">
- {t("notes.spaces.members.addPeople")}
- </label>
- <div className="rounded border border-border/70 dark:border-border-subtle/50 overflow-hidden">
- <div className="relative border-b border-border/40 dark:border-border-subtle/40">
- <Search
- size={11}
- className="absolute left-2.5 top-1/2 -translate-y-1/2 text-foreground/25 pointer-events-none"
+ ) : (
+ <>
+ <div className="flex gap-3">
+ <div className="space-y-1.5 w-14 shrink-0">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.emojiLabel")}
+ </label>
+ <Input
+ value={emoji}
+ onChange={(e) => setEmoji(e.target.value)}
+ maxLength={4}
+ className="text-center"
/>
- <input
- value={memberSearch}
- onChange={(e) => setMemberSearch(e.target.value)}
- placeholder={t("notes.spaces.members.searchPlaceholder")}
- className="w-full h-8 pl-7 pr-2 bg-transparent text-xs text-foreground placeholder:text-foreground/25 outline-none"
+ </div>
+ <div className="space-y-1.5 flex-1">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.nameLabel")}
+ </label>
+ <Input
+ value={name}
+ autoFocus
+ maxLength={80}
+ onChange={(e) => setName(e.target.value)}
+ onKeyDown={(e) => {
+ if (e.key === "Enter") handleCreate();
+ }}
/>
</div>
- <div className="max-h-36 overflow-y-auto p-1">
- {filteredCandidates.map((member) => {
- const isSelected = selectedIds.has(member.user_id);
- return (
- <button
- key={member.user_id}
- type="button"
- aria-pressed={isSelected}
- onClick={() => toggleMember(member)}
- className={cn(
- "flex items-center gap-2 w-full px-2 h-8 rounded-md text-left",
- "transition-colors duration-150 outline-none",
- "hover:bg-foreground/4 dark:hover:bg-white/4",
- "focus-visible:ring-1 focus-visible:ring-ring/30"
- )}
- >
- <span className="w-5 h-5 rounded-full bg-primary/10 text-primary text-[9px] font-semibold flex items-center justify-center shrink-0">
- {(member.name || member.email).slice(0, 2).toUpperCase()}
- </span>
- <span className="text-xs text-foreground truncate flex-1">
- {member.name || member.email}
- </span>
- {isSelected && <Check size={11} className="text-primary shrink-0" />}
- </button>
- );
- })}
- {filteredCandidates.length === 0 && (
- <p className="text-xs text-foreground/25 text-center py-2">
- {t("notes.context.noResults")}
+ </div>
+
+ {membersError && candidates.length === 0 ? (
+ <div className="space-y-1.5">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.members.addPeople")}
+ </label>
+ <div className="rounded border border-border/70 dark:border-border-subtle/50 px-3 py-2.5 flex items-center justify-between gap-2">
+ <p className="text-xs text-muted-foreground">
+ {t("settingsPage.workspace.members.loadError")}
</p>
- )}
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => {
+ if (workspace) void loadMembers(workspace.id);
+ }}
+ className="h-6 px-2 text-xs shrink-0"
+ >
+ {t("settingsPage.workspace.loadError.retry")}
+ </Button>
+ </div>
</div>
- </div>
- </div>
- )}
+ ) : candidates.length > 0 ? (
+ <div className="space-y-1.5">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.members.addPeople")}
+ </label>
+ <MemberPickList
+ members={filteredCandidates}
+ search={memberSearch}
+ onSearchChange={setMemberSearch}
+ onSelect={toggleMember}
+ selectedIds={selectedIds}
+ />
+ </div>
+ ) : null}
- <DialogFooter>
- <Button variant="ghost" onClick={() => handleOpenChange(false)} disabled={isCreating}>
- {t("notes.upload.cancel")}
- </Button>
- <Button onClick={handleCreate} disabled={!name.trim() || isCreating || !workspace}>
- {showSpinner && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
- {t("notes.spaces.create")}
- </Button>
- </DialogFooter>
+ <DialogFooter>
+ <Button
+ variant="ghost"
+ onClick={() => handleOpenChange(false)}
+ disabled={isCreating}
+ >
+ {t("notes.upload.cancel")}
+ </Button>
+ <Button onClick={handleCreate} disabled={!name.trim() || isCreating || !workspace}>
+ {showSpinner && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
+ {t("notes.spaces.create")}
+ </Button>
+ </DialogFooter>
+ </>
+ )}
</DialogContent>
</Dialog>
</>
diff --git a/src/components/notes/DeleteSpaceDialog.tsx b/src/components/notes/DeleteSpaceDialog.tsx
new file mode 100644
index 000000000..bfd40eebc
--- /dev/null
+++ b/src/components/notes/DeleteSpaceDialog.tsx
@@ -0,0 +1,68 @@
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { ConfirmDialog } from "../ui/dialog";
+import { Input } from "../ui/input";
+import type { SpaceItem } from "../../types/electron";
+
+interface DeleteSpaceDialogProps {
+ space: SpaceItem | null;
+ onClose: () => void;
+ onConfirm: (space: SpaceItem) => void;
+}
+
+/** Type-the-name destructive confirm for deleting a (team) space. */
+export default function DeleteSpaceDialog({ space, onClose, onConfirm }: DeleteSpaceDialogProps) {
+ const { t } = useTranslation();
+ const [nameInput, setNameInput] = useState("");
+ const [forSpaceId, setForSpaceId] = useState<number | null>(null);
+ if ((space?.id ?? null) !== forSpaceId) {
+ setForSpaceId(space?.id ?? null);
+ setNameInput("");
+ }
+ const confirmMatch = space != null && nameInput.trim() === space.name;
+
+ return (
+ <ConfirmDialog
+ open={space != null}
+ onOpenChange={(open) => !open && onClose()}
+ title={t("notes.spaces.deleteConfirmTitle")}
+ description={
+ space
+ ? t(
+ space.cloud_team_id
+ ? "notes.spaces.deleteConfirmTeamDescription"
+ : "notes.spaces.deleteConfirmDescription",
+ { space: space.name }
+ )
+ : undefined
+ }
+ confirmText={t("notes.spaces.deleteSpace")}
+ variant="destructive"
+ confirmDisabled={!confirmMatch}
+ onConfirm={() => {
+ if (space) onConfirm(space);
+ }}
+ >
+ {space && (
+ <div className="space-y-1.5">
+ <label htmlFor="delete-space-name" className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.deleteTypeName", { space: space.name })}
+ </label>
+ <Input
+ id="delete-space-name"
+ autoFocus
+ value={nameInput}
+ onChange={(e) => setNameInput(e.target.value)}
+ placeholder={space.name}
+ onKeyDown={(e) => {
+ if (e.key === "Enter" && confirmMatch) {
+ onConfirm(space);
+ onClose();
+ }
+ }}
+ />
+ </div>
+ )}
+ </ConfirmDialog>
+ );
+}
diff --git a/src/components/notes/SpaceMembersDialog.tsx b/src/components/notes/SpaceMembersDialog.tsx
index 1ccecc3e2..b9a03e9c6 100644
--- a/src/components/notes/SpaceMembersDialog.tsx
+++ b/src/components/notes/SpaceMembersDialog.tsx
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
-import { Loader2, LogOut, Mail, Search, X } from "lucide-react";
+import { Loader2, LogOut, Mail, X } from "lucide-react";
import { Dialog, DialogContent, DialogHeader, DialogTitle, ConfirmDialog } from "../ui/dialog";
import { Button } from "../ui/button";
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from "../ui/select";
@@ -10,10 +10,17 @@ import { useAuth } from "../../hooks/useAuth";
import { useDelayedFlag } from "../../hooks/useDelayedFlag";
import { cn } from "../lib/utils";
import InviteTeammateDialog from "../InviteTeammateDialog";
+import MemberAvatar from "../MemberAvatar";
+import MemberPickList from "../MemberPickList";
+import RoleBadge from "../RoleBadge";
import { TeamsService } from "../../services/TeamsService";
-import { markTeamSpacePurged } from "../../services/SyncService";
+import {
+ addMembers,
+ leaveTeamSpace,
+ removeMember,
+ setMemberRole,
+} from "../../services/teamSpaceActions";
import { useWorkspaceStore } from "../../stores/workspaceStore";
-import { loadSpaces, purgeSpace } from "../../stores/noteStore";
import { canManageSpace } from "../../lib/spacePermissions";
import type { SpaceItem, TeamMember, TeamRole } from "../../types/electron";
@@ -46,7 +53,7 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
// Workspace owners/admins access every team implicitly (no team_members
// row): the server's member DELETE no-ops (or leaves implicit access
// intact), so the space would resurrect on the next sync pass right after
- // a local purge — Leave is n/a for them (plan §4).
+ // a local purge — Leave is hidden for them (plan §4), same as in the tree.
const isImplicitAdmin = workspace?.role === "owner" || workspace?.role === "admin";
const isExplicitMember = members.some((m) => m.user_id === user?.id);
const canLeave = isExplicitMember && !isImplicitAdmin;
@@ -76,30 +83,11 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
if (space.workspace_id) void refreshMembers(space.workspace_id).catch(() => {});
}, [open, loadRoster, space.workspace_id, refreshMembers]);
- // Keep the tree's audience count honest after membership mutations.
- const refreshAfterMutation = useCallback(async () => {
- if (!teamId) return;
- const list = await TeamsService.listMembers(teamId);
- setMembers(list);
- await window.electronAPI.upsertSpaceFromCloud?.({
- id: teamId,
- workspace_id: space.workspace_id,
- name: space.name,
- emoji: space.emoji,
- my_role: space.my_role,
- member_count: list.length,
- created_at: space.created_at,
- updated_at: space.updated_at,
- });
- await loadSpaces();
- }, [teamId, space]);
-
const withRowBusy = useCallback(
- async (userId: string, action: () => Promise<void>) => {
+ async (userId: string, action: () => Promise<TeamMember[]>) => {
setBusyUserIds((prev) => new Set(prev).add(userId));
try {
- await action();
- await refreshAfterMutation();
+ setMembers(await action());
} catch (err) {
toast({
title: t("common.error"),
@@ -114,16 +102,15 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
});
}
},
- [refreshAfterMutation, toast, t]
+ [toast, t]
);
const handleRoleChange = (member: TeamMember, role: TeamRole) => {
- if (!teamId || role === member.role) return;
- void withRowBusy(member.user_id, () => TeamsService.addMember(teamId, member.user_id, role));
+ if (role === member.role) return;
+ void withRowBusy(member.user_id, () => setMemberRole(space, member.user_id, role));
};
const confirmRemove = (member: TeamMember) => {
- if (!teamId) return;
showConfirmDialog({
title: t("notes.spaces.members.removeConfirm", {
name: member.name || member.email,
@@ -133,31 +120,34 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
confirmText: t("notes.spaces.members.remove"),
variant: "destructive",
onConfirm: () =>
- void withRowBusy(member.user_id, () => TeamsService.removeMember(teamId, member.user_id)),
+ void withRowBusy(member.user_id, () => removeMember(space, member.user_id)),
});
};
const handleAdd = (userId: string) => {
- if (!teamId) return;
- void withRowBusy(userId, () => TeamsService.addMember(teamId, userId));
+ void withRowBusy(userId, async () => {
+ const { roster: fresh, failures } = await addMembers(space, [userId]);
+ if (failures.length > 0) throw failures[0];
+ return fresh;
+ });
};
const confirmLeave = () => {
- if (!canLeave) return;
+ if (!canLeave || !user?.id) return;
+ const userId = user.id;
showConfirmDialog({
title: t("notes.spaces.members.leaveConfirm", { space: space.name }),
description: t("notes.spaces.members.leaveConfirmDescription"),
confirmText: t("notes.spaces.members.leave"),
variant: "destructive",
onConfirm: async () => {
- if (!teamId || !user?.id) return;
setIsLeaving(true);
try {
- await TeamsService.removeMember(teamId, user.id);
- markTeamSpacePurged(teamId);
+ if ((await leaveTeamSpace(space, userId)) === "implicit") {
+ toast({ title: t("notes.spaces.members.implicitAdminCannotLeave") });
+ return;
+ }
onOpenChange(false);
- // Local cleanup rides on the space-purged broadcast.
- await purgeSpace(space.id);
} catch (err) {
// Server rejected the leave — surface its message.
toast({
@@ -198,7 +188,7 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
return (
<>
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="max-w-md p-6 gap-4">
+ <DialogContent className="max-w-md">
<DialogHeader>
<DialogTitle>{t("notes.spaces.members.title", { space: space.name })}</DialogTitle>
</DialogHeader>
@@ -221,17 +211,7 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
const isBusy = busyUserIds.has(member.user_id);
return (
<div key={member.user_id} className="flex items-center gap-3 px-4 h-14">
- {member.image ? (
- <img
- src={member.image}
- alt=""
- className="w-7 h-7 rounded-full object-cover shrink-0"
- />
- ) : (
- <span className="w-7 h-7 rounded-full bg-primary/10 text-primary text-[10px] font-semibold flex items-center justify-center shrink-0">
- {(member.name || member.email).slice(0, 2).toUpperCase()}
- </span>
- )}
+ <MemberAvatar name={member.name} email={member.email} image={member.image} />
<div className="flex-1 min-w-0">
<p className="text-xs font-medium text-foreground truncate">
{member.name || member.email}
@@ -240,12 +220,11 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
<p className="text-xs text-muted-foreground truncate">{member.email}</p>
)}
</div>
- {isBusy ? (
- <Loader2 className="w-3.5 h-3.5 animate-spin text-muted-foreground shrink-0" />
- ) : canManage && !isSelf ? (
+ {canManage && !isSelf ? (
<>
<Select
value={member.role}
+ disabled={isBusy}
onValueChange={(role) => handleRoleChange(member, role as TeamRole)}
>
<SelectTrigger className="h-7 w-25 px-2 text-xs rounded-md shrink-0">
@@ -263,18 +242,25 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
<button
type="button"
onClick={() => confirmRemove(member)}
+ disabled={isBusy}
aria-label={t("notes.spaces.members.remove")}
- className="p-1 rounded-md text-muted-foreground hover:text-destructive hover:bg-destructive/8 transition-colors outline-none focus-visible:ring-1 focus-visible:ring-primary/30"
+ className="p-1 rounded-md text-muted-foreground hover:text-destructive hover:bg-destructive/8 transition-colors outline-none focus-visible:ring-1 focus-visible:ring-primary/30 disabled:pointer-events-none"
>
- <X className="w-3.5 h-3.5" />
+ {isBusy ? (
+ <Loader2 className="w-3.5 h-3.5 animate-spin" />
+ ) : (
+ <X className="w-3.5 h-3.5" />
+ )}
</button>
</>
) : (
- <span className="text-[10px] font-medium px-2 py-0.5 rounded-md uppercase tracking-wide bg-foreground/6 text-foreground/65">
- {member.role === "admin"
- ? t("notes.spaces.members.roleAdmin")
- : t("notes.spaces.members.roleMember")}
- </span>
+ <RoleBadge
+ label={
+ member.role === "admin"
+ ? t("notes.spaces.members.roleAdmin")
+ : t("notes.spaces.members.roleMember")
+ }
+ />
)}
</div>
);
@@ -292,54 +278,15 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
<label className="text-xs font-medium text-foreground/50">
{t("notes.spaces.members.addPeople")}
</label>
- <div className="rounded border border-border/70 dark:border-border-subtle/50 overflow-hidden">
- <div className="relative border-b border-border/40 dark:border-border-subtle/40">
- <Search
- size={11}
- className="absolute left-2.5 top-1/2 -translate-y-1/2 text-foreground/25 pointer-events-none"
- />
- <input
- value={addSearch}
- onChange={(e) => setAddSearch(e.target.value)}
- placeholder={t("notes.spaces.members.searchPlaceholder")}
- className="w-full h-8 pl-7 pr-2 bg-transparent text-xs text-foreground placeholder:text-foreground/25 outline-none"
- />
- </div>
- <div className="max-h-32 overflow-y-auto p-1">
- {addCandidates.map((candidate) => {
- const isBusy = busyUserIds.has(candidate.user_id);
- return (
- <button
- key={candidate.user_id}
- type="button"
- disabled={isBusy}
- onClick={() => handleAdd(candidate.user_id)}
- className={cn(
- "flex items-center gap-2 w-full px-2 h-8 rounded-md text-left",
- "transition-colors duration-150 outline-none",
- "hover:bg-foreground/4 dark:hover:bg-white/4",
- "focus-visible:ring-1 focus-visible:ring-ring/30",
- "disabled:opacity-60"
- )}
- >
- <span className="w-5 h-5 rounded-full bg-primary/10 text-primary text-[9px] font-semibold flex items-center justify-center shrink-0">
- {(candidate.name || candidate.email).slice(0, 2).toUpperCase()}
- </span>
- <span className="text-xs text-foreground truncate flex-1">
- {candidate.name || candidate.email}
- </span>
- {isBusy && (
- <Loader2 className="w-3 h-3 animate-spin text-muted-foreground shrink-0" />
- )}
- </button>
- );
- })}
- {addCandidates.length === 0 && !showInviteFooter && (
- <p className="text-xs text-foreground/25 text-center py-2">
- {t("notes.context.noResults")}
- </p>
- )}
- {showInviteFooter && (
+ <MemberPickList
+ members={addCandidates}
+ search={addSearch}
+ onSearchChange={setAddSearch}
+ onSelect={(candidate) => handleAdd(candidate.user_id)}
+ busyIds={busyUserIds}
+ listClassName="max-h-32"
+ footer={
+ showInviteFooter ? (
<button
type="button"
onClick={() => setInviteOpen(true)}
@@ -355,34 +302,35 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
{t("notes.spaces.members.inviteFooter", { email: addSearch.trim() })}
</span>
</button>
- )}
- </div>
- </div>
+ ) : undefined
+ }
+ />
</div>
)}
- <button
- type="button"
- onClick={confirmLeave}
- disabled={isLeaving || !canLeave}
- title={!canLeave ? t("notes.spaces.members.implicitAdminCannotLeave") : undefined}
- className={cn(
- "flex items-center gap-2 w-full px-4 h-10 rounded-lg",
- "border border-border/50 dark:border-border-subtle/70",
- "text-xs font-medium text-destructive",
- "transition-colors duration-150 outline-none",
- "hover:bg-destructive/5 active:bg-destructive/8",
- "focus-visible:ring-1 focus-visible:ring-destructive/30",
- "disabled:opacity-60"
- )}
- >
- {showLeaveSpinner ? (
- <Loader2 className="w-3.5 h-3.5 animate-spin shrink-0" />
- ) : (
- <LogOut size={13} className="shrink-0" />
- )}
- {t("notes.spaces.members.leave")}
- </button>
+ {canLeave && (
+ <button
+ type="button"
+ onClick={confirmLeave}
+ disabled={isLeaving}
+ className={cn(
+ "flex items-center gap-2 w-full px-4 h-10 rounded-lg",
+ "border border-border/50 dark:border-border-subtle/70",
+ "text-xs font-medium text-destructive",
+ "transition-colors duration-150 outline-none",
+ "hover:bg-destructive/5 active:bg-destructive/8",
+ "focus-visible:ring-1 focus-visible:ring-destructive/30",
+ "disabled:opacity-60"
+ )}
+ >
+ {showLeaveSpinner ? (
+ <Loader2 className="w-3.5 h-3.5 animate-spin shrink-0" />
+ ) : (
+ <LogOut size={13} className="shrink-0" />
+ )}
+ {t("notes.spaces.members.leave")}
+ </button>
+ )}
</DialogContent>
</Dialog>
diff --git a/src/components/notes/SpacesTree.tsx b/src/components/notes/SpacesTree.tsx
index b9cf0c939..eb5706bdc 100644
--- a/src/components/notes/SpacesTree.tsx
+++ b/src/components/notes/SpacesTree.tsx
@@ -20,7 +20,6 @@ import {
Users,
} from "lucide-react";
import { Button } from "../ui/button";
-import { Input } from "../ui/input";
import {
DropdownMenu,
DropdownMenuTrigger,
@@ -43,13 +42,17 @@ import { useTeamSpacesCapability } from "../../hooks/useTeamSpacesCapability";
import { useAuth } from "../../hooks/useAuth";
import { useWorkspace } from "../../hooks/useWorkspace";
import { canManageSpace } from "../../lib/spacePermissions";
-import { TeamsService } from "../../services/TeamsService";
import { NoteSharingService } from "../../services/NoteSharingService";
-import { markTeamSpacePurged } from "../../services/SyncService";
+import {
+ deleteTeamSpace,
+ leaveTeamSpace,
+ renameTeamSpace,
+} from "../../services/teamSpaceActions";
import { useSettingsStore } from "../../stores/settingsStore";
import { cn } from "../lib/utils";
import { formatRelativeTime } from "../../utils/dateFormatting";
import CreateSpaceDialog from "./CreateSpaceDialog";
+import DeleteSpaceDialog from "./DeleteSpaceDialog";
import SpaceMembersDialog from "./SpaceMembersDialog";
import type { FolderItem, NoteItem, SpaceItem } from "../../types/electron";
import {
@@ -73,8 +76,6 @@ import {
renameFolder,
deleteFolder,
moveFolderToSpace,
- updateSpaceMeta,
- purgeSpace,
getNoteFromStore,
getFoldersValue,
getSpacesValue,
@@ -1039,7 +1040,7 @@ export default function SpacesTree({
const isTreeLoading = useIsTreeLoading();
const teamCapability = useTeamSpacesCapability();
const { isSignedIn, user } = useAuth();
- const { workspaces } = useWorkspace();
+ const { workspaces, loaded: workspacesLoaded } = useWorkspace();
const noteFilesEnabled = useSettingsStore((s) => s.noteFilesEnabled);
const [creatingFolderSpaceId, setCreatingFolderSpaceId] = useState<number | null>(null);
@@ -1052,8 +1053,8 @@ export default function SpacesTree({
const [spaceRenameFocus, setSpaceRenameFocus] = useState<"name" | "emoji">("name");
const [showCreateSpace, setShowCreateSpace] = useState(false);
const [membersSpaceId, setMembersSpaceId] = useState<number | null>(null);
+ const [membersOpen, setMembersOpen] = useState(false);
const [deleteSpaceTarget, setDeleteSpaceTarget] = useState<SpaceItem | null>(null);
- const [deleteNameInput, setDeleteNameInput] = useState("");
const [focusedKey, setFocusedKey] = useState<string | null>(null);
const rowRefs = useRef(new Map<string, HTMLDivElement>());
const undoToastIdRef = useRef<string | null>(null);
@@ -1064,6 +1065,14 @@ export default function SpacesTree({
const teamSpaces = useMemo(() => spaces.filter((s) => s.kind === "team"), [spaces]);
const visibleSpaces = teamCapability ? spaces : privateSpaces;
+ // Team creation needs workspace owner/admin (the server 403s members); a
+ // user with no workspace yet goes through the create-workspace funnel.
+ const canCreateTeamSpace =
+ isSignedIn &&
+ workspacesLoaded &&
+ (workspaces.length === 0 ||
+ workspaces.some((w) => w.role === "owner" || w.role === "admin"));
+
// Local-only spaces (no cloud team) stay fully manageable; cloud spaces
// follow space/workspace roles. Cosmetic — the server enforces.
const canManageTeamSpace = (space: SpaceItem): boolean =>
@@ -1378,36 +1387,15 @@ export default function SpacesTree({
};
const requestDeleteSpace = (space: SpaceItem) => {
- setDeleteNameInput("");
setDeleteSpaceTarget(space);
};
- const closeDeleteSpaceDialog = () => {
- setDeleteSpaceTarget(null);
- setDeleteNameInput("");
- };
-
const performDeleteSpace = async (space: SpaceItem) => {
- if (space.cloud_team_id) {
- try {
- // Server archives the team; teammates purge on their next spaces pass.
- await TeamsService.remove(space.cloud_team_id);
- } catch (err) {
- toast({
- title: t("notes.spaces.couldNotDelete"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
- variant: "destructive",
- });
- return;
- }
- // Park the team id so an in-flight pull can't resurrect purged rows.
- markTeamSpacePurged(space.cloud_team_id);
- }
- const result = await purgeSpace(space.id);
- if (!result.success && result.error) {
+ const result = await deleteTeamSpace(space);
+ if (!result.success) {
toast({
title: t("notes.spaces.couldNotDelete"),
- description: result.error,
+ description: result.error ?? t("common.unknownError"),
variant: "destructive",
});
return;
@@ -1417,7 +1405,6 @@ export default function SpacesTree({
const requestLeaveSpace = (space: SpaceItem) => {
if (!space.cloud_team_id || !user?.id) return;
- const teamId = space.cloud_team_id;
const userId = user.id;
showConfirmDialog({
title: t("notes.spaces.members.leaveConfirm", { space: space.name }),
@@ -1426,17 +1413,9 @@ export default function SpacesTree({
variant: "destructive",
onConfirm: async () => {
try {
- // The member DELETE succeeds even when no roster row exists, so an
- // implicit workspace owner/admin "leave" would purge locally only to
- // resurrect on the next pass — never purge for a server no-op.
- const roster = await TeamsService.listMembers(teamId);
- if (hasImplicitSpaceAccess(space) || !roster.some((m) => m.user_id === userId)) {
+ if ((await leaveTeamSpace(space, userId)) === "implicit") {
toast({ title: t("notes.spaces.members.implicitAdminCannotLeave") });
- return;
}
- await TeamsService.removeMember(teamId, userId);
- markTeamSpacePurged(teamId);
- await purgeSpace(space.id);
} catch (err) {
// Server rejected the leave — surface its message.
toast({
@@ -1586,26 +1565,11 @@ export default function SpacesTree({
setRenamingSpaceId(null);
if (!space || !name) return;
if (name === space.name && emoji === (space.emoji ?? null)) return;
- // Optimistic local rename; the server call below reverts it on rejection.
- const result = await updateSpaceMeta(spaceId, { name, emoji });
+ const result = await renameTeamSpace(space, { name, emoji });
if (!result.success) {
- if (result.error) {
- toast({
- title: t("notes.spaces.couldNotRename"),
- description: result.error,
- variant: "destructive",
- });
- }
- return;
- }
- if (!space.cloud_team_id) return;
- try {
- await TeamsService.update(space.cloud_team_id, { name, emoji });
- } catch (err) {
- await updateSpaceMeta(spaceId, { name: space.name, emoji: space.emoji ?? null });
toast({
title: t("notes.spaces.couldNotRename"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
+ description: result.error ?? t("common.unknownError"),
variant: "destructive",
});
}
@@ -1776,7 +1740,10 @@ export default function SpacesTree({
onActivate={() => activateRow({ type: "space", key: spaceKey, space })}
onToggle={() => toggleContainerExpanded(spaceKey)}
onNewFolder={() => startCreateFolder(space)}
- onMembers={() => setMembersSpaceId(space.id)}
+ onMembers={() => {
+ setMembersSpaceId(space.id);
+ setMembersOpen(true);
+ }}
onRename={(focus) => startRenameSpace(space, focus)}
onLeave={() => requestLeaveSpace(space)}
onDelete={() => requestDeleteSpace(space)}
@@ -1859,7 +1826,7 @@ export default function SpacesTree({
label={t("notes.spaces.teamSpaces")}
className="mt-3"
action={
- isSignedIn ? (
+ canCreateTeamSpace ? (
<Button
variant="ghost"
size="icon"
@@ -1877,6 +1844,24 @@ export default function SpacesTree({
}
/>
{teamSpaces.map(renderSpace)}
+ {teamSpaces.length === 0 &&
+ (canCreateTeamSpace ? (
+ <div className="pl-[18px] pr-2 py-1">
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => setShowCreateSpace(true)}
+ className="h-6 px-2 text-xs gap-1 text-primary/70 hover:text-primary hover:bg-primary/8"
+ >
+ <Plus size={11} />
+ {t("notes.spaces.newSpace")}
+ </Button>
+ </div>
+ ) : (
+ <p className="pl-[18px] pr-2 py-1 text-xs text-foreground/40 leading-relaxed">
+ {t("notes.spaces.emptyTeamHint")}
+ </p>
+ ))}
</div>
)}
</div>
@@ -1884,55 +1869,14 @@ export default function SpacesTree({
<CreateSpaceDialog open={showCreateSpace} onOpenChange={setShowCreateSpace} />
{membersSpace && (
- <SpaceMembersDialog
- space={membersSpace}
- open
- onOpenChange={(open) => !open && setMembersSpaceId(null)}
- />
+ <SpaceMembersDialog space={membersSpace} open={membersOpen} onOpenChange={setMembersOpen} />
)}
- <ConfirmDialog
- open={deleteSpaceTarget != null}
- onOpenChange={(open) => !open && closeDeleteSpaceDialog()}
- title={t("notes.spaces.deleteConfirmTitle")}
- description={
- deleteSpaceTarget
- ? t(
- deleteSpaceTarget.cloud_team_id
- ? "notes.spaces.deleteConfirmTeamDescription"
- : "notes.spaces.deleteConfirmDescription",
- { space: deleteSpaceTarget.name }
- )
- : undefined
- }
- confirmText={t("notes.spaces.deleteSpace")}
- variant="destructive"
- confirmDisabled={deleteNameInput.trim() !== deleteSpaceTarget?.name}
- onConfirm={() => {
- if (deleteSpaceTarget) void performDeleteSpace(deleteSpaceTarget);
- }}
- >
- {deleteSpaceTarget && (
- <div className="space-y-1.5">
- <label htmlFor="delete-space-name" className="text-xs font-medium text-foreground/50">
- {t("notes.spaces.deleteTypeName", { space: deleteSpaceTarget.name })}
- </label>
- <Input
- id="delete-space-name"
- autoFocus
- value={deleteNameInput}
- onChange={(e) => setDeleteNameInput(e.target.value)}
- placeholder={deleteSpaceTarget.name}
- onKeyDown={(e) => {
- if (e.key === "Enter" && deleteNameInput.trim() === deleteSpaceTarget.name) {
- void performDeleteSpace(deleteSpaceTarget);
- closeDeleteSpaceDialog();
- }
- }}
- />
- </div>
- )}
- </ConfirmDialog>
+ <DeleteSpaceDialog
+ space={deleteSpaceTarget}
+ onClose={() => setDeleteSpaceTarget(null)}
+ onConfirm={(space) => void performDeleteSpace(space)}
+ />
<ConfirmDialog
open={confirmDialog.open}
diff --git a/src/services/teamSpaceActions.ts b/src/services/teamSpaceActions.ts
index a4c1d8ffa..1dc2f1b36 100644
--- a/src/services/teamSpaceActions.ts
+++ b/src/services/teamSpaceActions.ts
@@ -17,11 +17,13 @@ function errorMessage(err: unknown): string | undefined {
return err instanceof Error ? err.message : undefined;
}
-async function addTeamMembers(teamId: string, userIds: string[]): Promise<number> {
+async function settleAddMembers(teamId: string, userIds: string[]): Promise<unknown[]> {
const results = await Promise.allSettled(
userIds.map((userId) => TeamsService.addMember(teamId, userId))
);
- return results.filter((r) => r.status === "rejected").length;
+ return results
+ .filter((r): r is PromiseRejectedResult => r.status === "rejected")
+ .map((r) => r.reason);
}
/** Refetch the roster and mirror its size into the local space row (narrow update). */
@@ -38,7 +40,7 @@ export async function createTeamSpace(
memberIds: string[] = []
): Promise<{ space: SpaceItem | null; failedMembers: number }> {
const team = await TeamsService.create(workspaceId, input);
- const failedMembers = memberIds.length > 0 ? await addTeamMembers(team.id, memberIds) : 0;
+ const failedMembers = (await settleAddMembers(team.id, memberIds)).length;
// The creator accesses the team implicitly; member_count mirrors the
// server's explicit-roster count.
const space =
@@ -124,11 +126,11 @@ export async function setMemberRole(
export async function addMembers(
space: SpaceItem,
userIds: string[]
-): Promise<{ roster: TeamMember[]; failed: number }> {
+): Promise<{ roster: TeamMember[]; failures: unknown[] }> {
const teamId = requireTeamId(space);
- const failed = await addTeamMembers(teamId, userIds);
+ const failures = await settleAddMembers(teamId, userIds);
const roster = await syncRoster(space, teamId);
- return { roster, failed };
+ return { roster, failures };
}
export async function removeMember(space: SpaceItem, userId: string): Promise<TeamMember[]> {