Skip to content

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

feat(spaces): Make spaces first-class entities decoupled from teams

Chadpihab6dc83ccd233
diff --git a/preload.js b/preload.js
index d6e655303..c069ba847 100644
--- a/preload.js
+++ b/preload.js
@@ -145,11 +145,9 @@ contextBridge.exposeInMainWorld("electronAPI", {
createSpace: (space) => ipcRenderer.invoke("db-create-space", space),
updateSpace: (id, updates) => ipcRenderer.invoke("db-update-space", id, updates),
purgeSpace: (id) => ipcRenderer.invoke("db-purge-space", id),
- getSpaceByCloudTeamId: (cloudTeamId) =>
- ipcRenderer.invoke("db-get-space-by-cloud-team-id", cloudTeamId),
- upsertSpaceFromCloud: (team) => ipcRenderer.invoke("db-upsert-space-from-cloud", team),
- updateSpaceMemberCount: (id, count) =>
- ipcRenderer.invoke("db-update-space-member-count", id, count),
+ getSpaceByCloudSpaceId: (cloudSpaceId) =>
+ ipcRenderer.invoke("db-get-space-by-cloud-space-id", cloudSpaceId),
+ upsertSpaceFromCloud: (space) => ipcRenderer.invoke("db-upsert-space-from-cloud", space),
setSpaceSyncStatus: (id, status) => ipcRenderer.invoke("db-set-space-sync-status", id, status),
onSpacePurged: (callback) => {
const listener = (_event, payload) => callback?.(payload);
diff --git a/src/components/TeamRosterSection.tsx b/src/components/TeamRosterSection.tsx
new file mode 100644
index 000000000..f3a6e4570
--- /dev/null
+++ b/src/components/TeamRosterSection.tsx
@@ -0,0 +1,246 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Loader2, Mail, X } from "lucide-react";
+import { Button } from "./ui/button";
+import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from "./ui/select";
+import { useToast } from "./ui/useToast";
+import { cn } from "./lib/utils";
+import MemberAvatar from "./MemberAvatar";
+import MemberPickList from "./MemberPickList";
+import RoleBadge from "./RoleBadge";
+import { TeamsService } from "../services/TeamsService";
+import { addTeamMembers, removeTeamMember, setTeamMemberRole } from "../services/spaceActions";
+import type { TeamMember, TeamRole, WorkspaceMember } from "../types/electron";
+
+interface TeamRosterSectionProps {
+ teamId: string;
+ canManage: boolean;
+ /** Workspace roster: the add-people candidate pool. */
+ workspaceMembers: WorkspaceMember[];
+ currentUserId?: string;
+ /** Shown when typing an unknown email in the add search (invite affordance). */
+ onInvite?: (email: string) => void;
+ /** Called with the fresh roster after every load/mutation. */
+ onRosterChange?: (members: TeamMember[]) => void;
+ removeConfirm: (member: TeamMember, onConfirm: () => void) => void;
+}
+
+export default function TeamRosterSection({
+ teamId,
+ canManage,
+ workspaceMembers,
+ currentUserId,
+ onInvite,
+ onRosterChange,
+ removeConfirm,
+}: TeamRosterSectionProps) {
+ const { t } = useTranslation();
+ const { toast } = useToast();
+ const [members, setMembers] = useState<TeamMember[]>([]);
+ const [loading, setLoading] = useState(false);
+ const [loadFailed, setLoadFailed] = useState(false);
+ const [busyUserIds, setBusyUserIds] = useState<Set<string>>(new Set());
+ const [addSearch, setAddSearch] = useState("");
+
+ const loadRoster = useCallback(async () => {
+ setLoading(true);
+ setLoadFailed(false);
+ try {
+ const list = await TeamsService.listMembers(teamId);
+ setMembers(list);
+ onRosterChange?.(list);
+ } catch {
+ setLoadFailed(true);
+ } finally {
+ setLoading(false);
+ }
+ }, [teamId, onRosterChange]);
+
+ useEffect(() => {
+ void loadRoster();
+ }, [loadRoster]);
+
+ const withRowBusy = useCallback(
+ async (userId: string, action: () => Promise<void>) => {
+ setBusyUserIds((prev) => new Set(prev).add(userId));
+ try {
+ await action();
+ await loadRoster();
+ } catch (err) {
+ toast({
+ title: t("common.error"),
+ description: err instanceof Error ? err.message : t("common.unknownError"),
+ variant: "destructive",
+ });
+ } finally {
+ setBusyUserIds((prev) => {
+ const next = new Set(prev);
+ next.delete(userId);
+ return next;
+ });
+ }
+ },
+ [toast, t, loadRoster]
+ );
+
+ const handleRoleChange = (member: TeamMember, role: TeamRole) => {
+ if (role === member.role) return;
+ void withRowBusy(member.user_id, () => setTeamMemberRole(teamId, member.user_id, role));
+ };
+
+ const handleAdd = (userId: string) => {
+ void withRowBusy(userId, async () => {
+ const { failures } = await addTeamMembers(teamId, [userId]);
+ if (failures.length > 0) throw failures[0];
+ });
+ };
+
+ const memberIds = useMemo(() => new Set(members.map((m) => m.user_id)), [members]);
+ const addCandidates = useMemo(() => {
+ const query = addSearch.trim().toLowerCase();
+ return workspaceMembers.filter(
+ (m) =>
+ m.user_id !== currentUserId &&
+ !memberIds.has(m.user_id) &&
+ (!query ||
+ (m.name ?? "").toLowerCase().includes(query) ||
+ m.email.toLowerCase().includes(query))
+ );
+ }, [workspaceMembers, memberIds, addSearch, currentUserId]);
+
+ const searchEmail = addSearch.trim().toLowerCase();
+ const showInviteFooter =
+ !!onInvite &&
+ searchEmail.includes("@") &&
+ addCandidates.length === 0 &&
+ !members.some((m) => m.email.toLowerCase() === searchEmail) &&
+ !workspaceMembers.some((m) => m.email.toLowerCase() === searchEmail);
+
+ return (
+ <div className="space-y-2">
+ {loading && members.length === 0 ? (
+ <div className="h-24 rounded-lg bg-foreground/5 dark:bg-white/5 animate-pulse" />
+ ) : loadFailed && members.length === 0 ? (
+ <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-2">
+ <p className="text-xs text-muted-foreground">
+ {t("settingsPage.workspace.members.loadError")}
+ </p>
+ <Button variant="outline" size="sm" onClick={() => void loadRoster()}>
+ {t("settingsPage.workspace.loadError.retry")}
+ </Button>
+ </div>
+ ) : (
+ <div className="rounded-lg border border-border/50 dark:border-border-subtle/70 divide-y divide-border/30 dark:divide-border-subtle/50 bg-card/50 dark:bg-surface-2/50 max-h-64 overflow-y-auto">
+ {members.map((member) => {
+ const isSelf = member.user_id === currentUserId;
+ const isBusy = busyUserIds.has(member.user_id);
+ return (
+ <div key={member.user_id} className="flex items-center gap-3 px-4 h-14">
+ <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}
+ </p>
+ {member.name && (
+ <p className="text-xs text-muted-foreground truncate">{member.email}</p>
+ )}
+ </div>
+ {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">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="admin" className="text-xs">
+ {t("notes.spaces.members.roleAdmin")}
+ </SelectItem>
+ <SelectItem value="member" className="text-xs">
+ {t("notes.spaces.members.roleMember")}
+ </SelectItem>
+ </SelectContent>
+ </Select>
+ <button
+ type="button"
+ onClick={() =>
+ removeConfirm(member, () =>
+ void withRowBusy(member.user_id, () =>
+ removeTeamMember(teamId, member.user_id)
+ )
+ )
+ }
+ 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 disabled:pointer-events-none"
+ >
+ {isBusy ? (
+ <Loader2 className="w-3.5 h-3.5 animate-spin" />
+ ) : (
+ <X className="w-3.5 h-3.5" />
+ )}
+ </button>
+ </>
+ ) : (
+ <RoleBadge
+ label={
+ member.role === "admin"
+ ? t("notes.spaces.members.roleAdmin")
+ : t("notes.spaces.members.roleMember")
+ }
+ />
+ )}
+ </div>
+ );
+ })}
+ {members.length === 0 && (
+ <div className="py-8 text-center text-xs text-muted-foreground">
+ {t("notes.spaces.members.empty")}
+ </div>
+ )}
+ </div>
+ )}
+
+ {canManage && (
+ <div className="space-y-1.5">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.members.addPeople")}
+ </label>
+ <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={() => {
+ onInvite?.(addSearch.trim());
+ setAddSearch("");
+ }}
+ className={cn(
+ "flex items-center gap-2 w-full px-2 h-8 rounded-md text-left",
+ "transition-colors duration-150 outline-none",
+ "text-primary/80 hover:text-primary hover:bg-primary/8",
+ "focus-visible:ring-1 focus-visible:ring-ring/30"
+ )}
+ >
+ <Mail size={12} className="shrink-0" />
+ <span className="text-xs truncate">
+ {t("notes.spaces.members.inviteFooter", { email: addSearch.trim() })}
+ </span>
+ </button>
+ ) : undefined
+ }
+ />
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/src/components/notes/CreateSpaceDialog.tsx b/src/components/notes/CreateSpaceDialog.tsx
index c0416801b..14707b72a 100644
--- a/src/components/notes/CreateSpaceDialog.tsx
+++ b/src/components/notes/CreateSpaceDialog.tsx
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
import { useTranslation } from "react-i18next";
-import { Loader2 } from "lucide-react";
+import { Check, Loader2, Plus } from "lucide-react";
import {
Dialog,
DialogContent,
@@ -17,7 +17,8 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from ".
import { useToast } from "../ui/useToast";
import CreateWorkspaceDialog from "../CreateWorkspaceDialog";
import MemberPickList from "../MemberPickList";
-import { createTeamSpace } from "../../services/teamSpaceActions";
+import { createSpace } from "../../services/spaceActions";
+import { TeamsService } from "../../services/TeamsService";
import { CloudApiError } from "../../services/cloudApi";
import { useWorkspace } from "../../hooks/useWorkspace";
import { useWorkspaceStore } from "../../stores/workspaceStore";
@@ -30,7 +31,7 @@ import {
} from "../../lib/workspaceSelection";
import { revealContainer, setActiveContext } from "../../stores/noteStore";
import { cn } from "../lib/utils";
-import type { WorkspaceMember } from "../../types/electron";
+import type { Team, WorkspaceMember } from "../../types/electron";
const EMOJI_CHOICES = [
"📝",
@@ -90,6 +91,12 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
const [membersError, setMembersError] = useState(false);
const [rosterWorkspaceId, setRosterWorkspaceId] = useState<string | null>(null);
+ const [teams, setTeams] = useState<Team[]>([]);
+ const [teamsError, setTeamsError] = useState(false);
+ const [teamsWorkspaceId, setTeamsWorkspaceId] = useState<string | null>(null);
+ const [selectedTeamIds, setSelectedTeamIds] = useState<Set<string>>(new Set());
+ const [newTeamOpen, setNewTeamOpen] = useState(false);
+ const [newTeamName, setNewTeamName] = useState("");
const [isCreating, setIsCreating] = useState(false);
const [selectedWorkspaceId, setSelectedWorkspaceId] = useState<string | null>(null);
const showSpinner = useDelayedFlag(isCreating);
@@ -119,9 +126,27 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
[refreshMembers]
);
+ const loadTeams = useCallback(async (workspaceId: string) => {
+ setTeamsError(false);
+ setTeamsWorkspaceId(null);
+ try {
+ const list = await TeamsService.list(workspaceId);
+ setTeams(list);
+ setTeamsWorkspaceId(workspaceId);
+ // A workspace with no teams yet keeps the one-shot flow: the new-team
+ // section opens straight away, prefilled from the space name at submit.
+ if (list.length === 0) setNewTeamOpen(true);
+ } catch {
+ setTeamsError(true);
+ }
+ }, []);
+
useEffect(() => {
- if (open && workspace) void loadMembers(workspace.id);
- }, [open, workspace, loadMembers]);
+ if (open && workspace) {
+ void loadMembers(workspace.id);
+ void loadTeams(workspace.id);
+ }
+ }, [open, workspace, loadMembers, loadTeams]);
useEffect(() => {
if (!open) return;
@@ -152,6 +177,11 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
setMemberSearch("");
setSelectedIds(new Set());
setRosterWorkspaceId(null);
+ setTeams([]);
+ setTeamsWorkspaceId(null);
+ setSelectedTeamIds(new Set());
+ setNewTeamOpen(false);
+ setNewTeamName("");
setSelectedWorkspaceId(null);
}
};
@@ -175,6 +205,14 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
});
};
+ const toggleTeam = (teamId: string) => {
+ setSelectedTeamIds((prev) => {
+ const next = new Set(prev);
+ if (!next.delete(teamId)) next.add(teamId);
+ return next;
+ });
+ };
+
// Linux has no OS emoji panel; the in-app grid is the fallback.
const openEmojiPicker = async (): Promise<void> => {
const nativeShown = await window.electronAPI?.showEmojiPanel?.().catch(() => false);
@@ -186,18 +224,30 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
setSelectedIds(new Set());
setMemberSearch("");
setMembersError(false);
+ setSelectedTeamIds(new Set());
+ setNewTeamOpen(false);
+ setNewTeamName("");
};
+ // A space needs at least one team (existing or new) unless team loading
+ // failed — then the server-side zero-team create still lets admins proceed.
+ const hasTeamSelection = selectedTeamIds.size > 0 || newTeamOpen || teamsError;
+
const handleCreate = async () => {
const trimmed = name.trim();
- if (!trimmed || isCreating || !workspace) return;
+ if (!trimmed || isCreating || !workspace || !hasTeamSelection) return;
setIsCreating(true);
try {
const memberIds = [...selectedIds];
- const { space, failedMembers } = await createTeamSpace(
+ const { space, failedMembers } = await createSpace(
workspace.id,
{ name: trimmed, emoji: emoji.trim() || null },
- memberIds
+ {
+ existingTeamIds: [...selectedTeamIds],
+ newTeam: newTeamOpen
+ ? { name: newTeamName.trim() || trimmed, memberIds }
+ : undefined,
+ }
);
if (failedMembers > 0) {
toast({
@@ -345,41 +395,126 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
</div>
</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="space-y-1.5">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.teams.assignLabel")}
+ </label>
+ {teamsError && teams.length === 0 ? (
<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")}
+ {t("notes.spaces.teams.loadError")}
</p>
<Button
variant="ghost"
size="sm"
onClick={() => {
- if (workspace) void loadMembers(workspace.id);
+ if (workspace) void loadTeams(workspace.id);
}}
className="h-6 px-2 text-xs shrink-0"
>
{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>
- <MemberPickList
- members={filteredCandidates}
- search={memberSearch}
- onSearchChange={setMemberSearch}
- onSelect={toggleMember}
- selectedIds={selectedIds}
- />
- </div>
- ) : null}
+ ) : (
+ <>
+ {teams.length > 0 && (
+ <div className="rounded border border-border/70 dark:border-border-subtle/50 overflow-y-auto max-h-36 p-1">
+ {teams.map((team) => {
+ const isSelected = selectedTeamIds.has(team.id);
+ return (
+ <button
+ key={team.id}
+ type="button"
+ aria-pressed={isSelected}
+ onClick={() => toggleTeam(team.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"
+ )}
+ >
+ <span className="text-xs text-foreground truncate flex-1">
+ {team.name}
+ </span>
+ <span className="text-[10px] text-foreground/40 shrink-0">
+ {t("settingsPage.workspace.teams.memberCount", {
+ count: team.member_count ?? 0,
+ })}
+ </span>
+ {isSelected && <Check size={11} className="text-primary shrink-0" />}
+ </button>
+ );
+ })}
+ </div>
+ )}
+ {newTeamOpen ? (
+ <div className="rounded border border-border/70 dark:border-border-subtle/50 p-2.5 space-y-2">
+ <div className="space-y-1.5">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.teams.newTeamNameLabel")}
+ </label>
+ <Input
+ value={newTeamName}
+ maxLength={80}
+ placeholder={name.trim() || undefined}
+ onChange={(e) => setNewTeamName(e.target.value)}
+ />
+ </div>
+ {membersError && candidates.length === 0 ? (
+ <div className="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>
+ ) : candidates.length > 0 ? (
+ <MemberPickList
+ members={filteredCandidates}
+ search={memberSearch}
+ onSearchChange={setMemberSearch}
+ onSelect={toggleMember}
+ selectedIds={selectedIds}
+ />
+ ) : null}
+ {teams.length > 0 && (
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => {
+ setNewTeamOpen(false);
+ setNewTeamName("");
+ setSelectedIds(new Set());
+ }}
+ className="h-6 px-2 text-xs"
+ >
+ {t("notes.upload.cancel")}
+ </Button>
+ )}
+ </div>
+ ) : (
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => setNewTeamOpen(true)}
+ className="h-7 px-2 text-xs text-foreground/60"
+ >
+ <Plus size={12} className="mr-1" />
+ {t("notes.spaces.teams.newTeam")}
+ </Button>
+ )}
+ </>
+ )}
+ </div>
<DialogFooter>
<Button
@@ -389,7 +524,10 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia
>
{t("notes.upload.cancel")}
</Button>
- <Button onClick={handleCreate} disabled={!name.trim() || isCreating || !workspace}>
+ <Button
+ onClick={handleCreate}
+ disabled={!name.trim() || isCreating || !workspace || !hasTeamSelection}
+ >
{showSpinner && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
{t("notes.spaces.create")}
</Button>
diff --git a/src/components/notes/DeleteSpaceDialog.tsx b/src/components/notes/DeleteSpaceDialog.tsx
index bfd40eebc..94b2ec6aa 100644
--- a/src/components/notes/DeleteSpaceDialog.tsx
+++ b/src/components/notes/DeleteSpaceDialog.tsx
@@ -29,7 +29,7 @@ export default function DeleteSpaceDialog({ space, onClose, onConfirm }: DeleteS
description={
space
? t(
- space.cloud_team_id
+ space.cloud_space_id
? "notes.spaces.deleteConfirmTeamDescription"
: "notes.spaces.deleteConfirmDescription",
{ space: space.name }
diff --git a/src/components/notes/NoteEditor.tsx b/src/components/notes/NoteEditor.tsx
index 55c0c457c..37e55edd0 100644
--- a/src/components/notes/NoteEditor.tsx
+++ b/src/components/notes/NoteEditor.tsx
@@ -35,7 +35,7 @@ import {
navigateToContainer,
updateNoteInStore,
} from "../../stores/noteStore";
-import { fetchTeamRoster } from "../../hooks/useTeamRoster";
+import { fetchSpaceRoster } from "../../hooks/useTeamRoster";
import { readIsSubscribed, subscribeIsSubscribed } from "../../lib/subscriptionFlag";
import { useAuth } from "../../hooks/useAuth";
import { RichTextEditor } from "../ui/RichTextEditor";
@@ -269,14 +269,14 @@ export default function NoteEditor({
conflict?.updated_by_user_id && user?.id && conflict.updated_by_user_id !== user.id
? conflict.updated_by_user_id
: null;
- const conflictTeamId = space?.cloud_team_id ?? null;
+ const conflictSpaceId = space?.cloud_space_id ?? null;
useEffect(() => {
- if (!conflictEditorId || !conflictTeamId) {
+ if (!conflictEditorId || !conflictSpaceId) {
setConflictEditorName(null);
return;
}
let cancelled = false;
- fetchTeamRoster(conflictTeamId)
+ fetchSpaceRoster(conflictSpaceId)
.then((roster) => {
if (cancelled) return;
const member = roster.find((m) => m.user_id === conflictEditorId);
@@ -288,7 +288,7 @@ export default function NoteEditor({
return () => {
cancelled = true;
};
- }, [conflictEditorId, conflictTeamId]);
+ }, [conflictEditorId, conflictSpaceId]);
const [diarizedSegments, setDiarizedSegments] = useState<TranscriptSegment[] | null>(null);
const [speakerMappings, setSpeakerMappings] = useState<Record<string, string>>({});
const [speakerProfiles, setSpeakerProfiles] = useState<
@@ -881,11 +881,11 @@ export default function NoteEditor({
</DropdownMenuContent>
</DropdownMenu>
)}
- {isTeamNote && space?.cloud_team_id && (
+ {isTeamNote && space?.cloud_space_id && (
<button
type="button"
onClick={() => setMembersDialogOpen(true)}
- aria-label={t("notes.spaces.members.title", { space: space.name })}
+ aria-label={t("notes.spaces.teamsMembers.title", { space: space.name })}
className={CHIP_BUTTON_CLASS}
>
<Users size={11} className="shrink-0" />
@@ -1215,7 +1215,7 @@ export default function NoteEditor({
{canShare && (
<ShareNoteDialog open={shareDialogOpen} onOpenChange={setShareDialogOpen} note={note} />
)}
- {isTeamNote && space?.cloud_team_id && (
+ {isTeamNote && space?.cloud_space_id && (
<SpaceMembersDialog
space={space}
open={membersDialogOpen}
diff --git a/src/components/notes/PersonalNotesView.tsx b/src/components/notes/PersonalNotesView.tsx
index 193998f71..dda8e6dbe 100644
--- a/src/components/notes/PersonalNotesView.tsx
+++ b/src/components/notes/PersonalNotesView.tsx
@@ -199,8 +199,8 @@ export default function PersonalNotesView({
}, [invitationEntry, isSidePanelLayout]);
// The acceptance modal starts a sync before navigating here. Once the first
- // invited cloud team appears in the local spaces mirror, take the user to it
- // instead of leaving the newly shared content hidden behind Personal.
+ // space backed by an invited team appears in the local mirror, take the user
+ // to it instead of leaving the newly shared content hidden behind Personal.
useEffect(() => {
if (!invitationEntry) return;
const invitedTeamIds = new Set(invitationEntry.teamIds);
@@ -208,11 +208,11 @@ export default function PersonalNotesView({
(space) =>
space.kind === "team" &&
space.workspace_id === invitationEntry.workspaceId &&
- space.cloud_team_id != null &&
+ space.cloud_space_id != null &&
// Workspace owners/admins receive implicit access, so their invitation
// may not enumerate team ids. In that case, open the first accessible
// team space belonging to the accepted workspace.
- (invitedTeamIds.size === 0 || invitedTeamIds.has(space.cloud_team_id))
+ (invitedTeamIds.size === 0 || space.teams.some((team) => invitedTeamIds.has(team.id)))
);
if (!invitedSpace) return;
diff --git a/src/components/notes/ShareNoteDialog.tsx b/src/components/notes/ShareNoteDialog.tsx
index ad8a39486..954fed443 100644
--- a/src/components/notes/ShareNoteDialog.tsx
+++ b/src/components/notes/ShareNoteDialog.tsx
@@ -768,7 +768,7 @@ export default function ShareNoteDialog({ open, onOpenChange, note }: ShareNoteD
space &&
!(access?.grants ?? []).some(
(grant) =>
- grant.principal.type === "team" && grant.principal.id === space.cloud_team_id
+ grant.principal.type === "team" && space.teams.some((team) => team.id === grant.principal.id)
) && (
<MemberRow
leading={<AudienceIcon />}
diff --git a/src/components/notes/SpaceMembersDialog.tsx b/src/components/notes/SpaceMembersDialog.tsx
index 7d0feabf3..cef1264a2 100644
--- a/src/components/notes/SpaceMembersDialog.tsx
+++ b/src/components/notes/SpaceMembersDialog.tsx
@@ -1,29 +1,20 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { useShallow } from "zustand/react/shallow";
import { useTranslation } from "react-i18next";
-import { Loader2, LogOut, Mail, X } from "lucide-react";
+import { Info, Plus, 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";
-import { useToast } from "../ui/useToast";
+import { Select, SelectTrigger, SelectContent, SelectItem } from "../ui/select";
import { useDialogs } from "../../hooks/useDialogs";
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 TeamRosterSection from "../TeamRosterSection";
import { TeamsService } from "../../services/TeamsService";
-import {
- addMembers,
- leaveTeamSpace,
- removeMember,
- setMemberRole,
-} from "../../services/teamSpaceActions";
+import { assignTeamToSpace, unassignTeamFromSpace } from "../../services/spaceActions";
+import { useToast } from "../ui/useToast";
import { useWorkspaceStore } from "../../stores/workspaceStore";
-import { canManageSpace } from "../../lib/spacePermissions";
-import type { SpaceItem, TeamMember, TeamRole } from "../../types/electron";
+import { useSpaces } from "../../stores/noteStore";
+import { canManageSpace, canManageTeamRoster } from "../../lib/spacePermissions";
+import type { SpaceItem, Team, TeamMember } from "../../types/electron";
interface SpaceMembersDialogProps {
space: SpaceItem;
@@ -36,6 +27,7 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
const { toast } = useToast();
const { user } = useAuth();
const { confirmDialog, showConfirmDialog, hideConfirmDialog } = useDialogs();
+ const spaces = useSpaces();
const {
workspace,
members: roster,
@@ -47,307 +39,193 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM
refreshMembers: s.refreshMembers,
}))
);
- const [members, setMembers] = useState<TeamMember[]>([]);
- const [loading, setLoading] = useState(false);
- const [loadFailed, setLoadFailed] = useState(false);
- const [busyUserIds, setBusyUserIds] = useState<Set<string>>(new Set());
- const [isLeaving, setIsLeaving] = useState(false);
- const [addSearch, setAddSearch] = useState("");
+ const [workspaceTeams, setWorkspaceTeams] = useState<Team[]>([]);
const [inviteOpen, setInviteOpen] = useState(false);
- const showLeaveSpinner = useDelayedFlag(isLeaving);
+ const [inviteEmail, setInviteEmail] = useState<string | undefined>(undefined);
+ const [inviteTeamId, setInviteTeamId] = useState<string | null>(null);
- const teamId = space.cloud_team_id;
const canManage = canManageSpace(space, workspace?.role ?? null);
const canInviteToWorkspace = workspace?.role === "owner" || workspace?.role === "admin";
- // Leave is a server no-op for implicit workspace owners/admins — hidden, 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;
-
- const loadRoster = useCallback(async () => {
- if (!teamId) return;
- setLoading(true);
- setLoadFailed(false);
- try {
- const list = await TeamsService.listMembers(teamId);
- setMembers(list);
- } catch {
- setLoadFailed(true);
- } finally {
- setLoading(false);
- }
- }, [teamId]);
useEffect(() => {
if (!open) {
- setMembers([]);
- setAddSearch("");
- setBusyUserIds(new Set());
+ setInviteEmail(undefined);
+ setInviteTeamId(null);
return;
}
- void loadRoster();
- if (space.workspace_id) void refreshMembers(space.workspace_id).catch(() => {});
- }, [open, loadRoster, space.workspace_id, refreshMembers]);
-
- const withRowBusy = useCallback(
- async (userId: string, action: () => Promise<TeamMember[]>) => {
- setBusyUserIds((prev) => new Set(prev).add(userId));
- try {
- setMembers(await action());
- } catch (err) {
- toast({
- title: t("common.error"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
- variant: "destructive",
- });
- } finally {
- setBusyUserIds((prev) => {
- const next = new Set(prev);
- next.delete(userId);
- return next;
- });
+ if (space.workspace_id) {
+ void refreshMembers(space.workspace_id).catch(() => {});
+ if (canManage) {
+ void TeamsService.list(space.workspace_id)
+ .then(setWorkspaceTeams)
+ .catch(() => setWorkspaceTeams([]));
}
- },
- [toast, t]
+ }
+ }, [open, space.workspace_id, refreshMembers, canManage]);
+
+ // How many OTHER spaces each assigned team backs — roster edits ripple there.
+ const otherSpacesByTeam = useMemo(() => {
+ const counts = new Map<string, number>();
+ for (const teamRef of space.teams) {
+ counts.set(
+ teamRef.id,
+ spaces.filter((s) => s.id !== space.id && s.teams.some((t) => t.id === teamRef.id)).length
+ );
+ }
+ return counts;
+ }, [spaces, space]);
+
+ const unassignedTeams = useMemo(
+ () => workspaceTeams.filter((team) => !space.teams.some((t) => t.id === team.id)),
+ [workspaceTeams, space.teams]
);
- const handleRoleChange = (member: TeamMember, role: TeamRole) => {
- if (role === member.role) return;
- void withRowBusy(member.user_id, () => setMemberRole(space, member.user_id, role));
- };
+ const confirmRemoveMember = useCallback(
+ (member: TeamMember, onConfirm: () => void) => {
+ showConfirmDialog({
+ title: t("notes.spaces.members.removeConfirm", {
+ name: member.name || member.email,
+ space: space.name,
+ }),
+ description: t("notes.spaces.members.removeConfirmDescription"),
+ confirmText: t("notes.spaces.members.remove"),
+ variant: "destructive",
+ onConfirm,
+ });
+ },
+ [showConfirmDialog, t, space.name]
+ );
- const confirmRemove = (member: TeamMember) => {
+ const confirmUnassignTeam = (teamId: string, teamName: string) => {
+ const isLastTeam = space.teams.length === 1;
showConfirmDialog({
- title: t("notes.spaces.members.removeConfirm", {
- name: member.name || member.email,
+ title: t("notes.spaces.teamsMembers.removeTeamConfirm", {
+ team: teamName,
space: space.name,
}),
- description: t("notes.spaces.members.removeConfirmDescription"),
- confirmText: t("notes.spaces.members.remove"),
- variant: "destructive",
- onConfirm: () => void withRowBusy(member.user_id, () => removeMember(space, member.user_id)),
- });
- };
-
- const handleAdd = (userId: string) => {
- 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 || !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"),
+ description: isLastTeam
+ ? t("notes.spaces.teamsMembers.lastTeamWarning")
+ : t("notes.spaces.teamsMembers.removeTeamConfirmDescription"),
+ confirmText: t("notes.spaces.teamsMembers.removeTeamFromSpace"),
variant: "destructive",
onConfirm: async () => {
- setIsLeaving(true);
try {
- if ((await leaveTeamSpace(space, userId)) === "implicit") {
- toast({ title: t("notes.spaces.members.implicitAdminCannotLeave") });
- return;
- }
- onOpenChange(false);
+ await unassignTeamFromSpace(space, teamId);
} catch (err) {
- // Server rejected the leave — surface its message.
toast({
title: t("common.error"),
description: err instanceof Error ? err.message : t("common.unknownError"),
variant: "destructive",
});
- } finally {
- setIsLeaving(false);
}
},
});
};
- const memberIds = useMemo(() => new Set(members.map((m) => m.user_id)), [members]);
- const addCandidates = useMemo(() => {
- const query = addSearch.trim().toLowerCase();
- return roster.filter(
- (m) =>
- m.user_id !== user?.id &&
- !memberIds.has(m.user_id) &&
- (!query ||
- (m.name ?? "").toLowerCase().includes(query) ||
- m.email.toLowerCase().includes(query))
- );
- }, [roster, memberIds, addSearch, user?.id]);
-
- const searchEmail = addSearch.trim().toLowerCase();
- const showInviteFooter =
- canInviteToWorkspace &&
- searchEmail.includes("@") &&
- addCandidates.length === 0 &&
- !members.some((m) => m.email.toLowerCase() === searchEmail) &&
- !roster.some((m) => m.email.toLowerCase() === searchEmail);
+ const handleAssignTeam = async (teamId: string) => {
+ try {
+ await assignTeamToSpace(space, teamId);
+ } catch (err) {
+ toast({
+ title: t("common.error"),
+ description: err instanceof Error ? err.message : t("common.unknownError"),
+ variant: "destructive",
+ });
+ }
+ };
- if (!teamId) return null;
+ if (!space.cloud_space_id) return null;
return (
<>
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="max-w-md">
+ <DialogContent className="max-w-md max-h-[80vh] overflow-y-auto">
<DialogHeader>
- <DialogTitle>{t("notes.spaces.members.title", { space: space.name })}</DialogTitle>
+ <DialogTitle>{t("notes.spaces.teamsMembers.title", { space: space.name })}</DialogTitle>
</DialogHeader>
- {loading && members.length === 0 ? (
- <div className="h-24 rounded-lg bg-foreground/5 dark:bg-white/5 animate-pulse" />
- ) : loadFailed && members.length === 0 ? (
- <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-2">
- <p className="text-xs text-muted-foreground">
- {t("settingsPage.workspace.members.loadError")}
- </p>
- <Button variant="outline" size="sm" onClick={() => void loadRoster()}>
- {t("settingsPage.workspace.loadError.retry")}
- </Button>
- </div>
- ) : (
- <div className="rounded-lg border border-border/50 dark:border-border-subtle/70 divide-y divide-border/30 dark:divide-border-subtle/50 bg-card/50 dark:bg-surface-2/50 max-h-64 overflow-y-auto">
- {members.map((member) => {
- const isSelf = member.user_id === user?.id;
- const isBusy = busyUserIds.has(member.user_id);
- return (
- <div key={member.user_id} className="flex items-center gap-3 px-4 h-14">
- <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}
- </p>
- {member.name && (
- <p className="text-xs text-muted-foreground truncate">{member.email}</p>
- )}
- </div>
- {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">
- <SelectValue />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="admin" className="text-xs">
- {t("notes.spaces.members.roleAdmin")}
- </SelectItem>
- <SelectItem value="member" className="text-xs">
- {t("notes.spaces.members.roleMember")}
- </SelectItem>
- </SelectContent>
- </Select>
- <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 disabled:pointer-events-none"
- >
- {isBusy ? (
- <Loader2 className="w-3.5 h-3.5 animate-spin" />
- ) : (
- <X className="w-3.5 h-3.5" />
- )}
- </button>
- </>
- ) : (
- <RoleBadge
- label={
- member.role === "admin"
- ? t("notes.spaces.members.roleAdmin")
- : t("notes.spaces.members.roleMember")
- }
- />
- )}
- </div>
- );
- })}
- {members.length === 0 && (
- <div className="py-8 text-center text-xs text-muted-foreground">
- {t("notes.spaces.members.empty")}
- </div>
- )}
- </div>
+ {space.teams.length === 0 && (
+ <p className="text-xs text-muted-foreground">
+ {t("notes.spaces.teamsMembers.noTeams")}
+ </p>
)}
- {canManage && (
- <div className="space-y-1.5">
- <label className="text-xs font-medium text-foreground/50">
- {t("notes.spaces.members.addPeople")}
- </label>
- <MemberPickList
- members={addCandidates}
- search={addSearch}
- onSearchChange={setAddSearch}
- onSelect={(candidate) => handleAdd(candidate.user_id)}
- busyIds={busyUserIds}
- listClassName="max-h-32"
- footer={
- showInviteFooter ? (
+ {space.teams.map((teamRef) => {
+ const otherSpaces = otherSpacesByTeam.get(teamRef.id) ?? 0;
+ return (
+ <div key={teamRef.id} className="space-y-2">
+ <div className="flex items-center gap-2">
+ <h3 className="text-xs font-semibold text-foreground flex-1 truncate">
+ {teamRef.name}
+ </h3>
+ {canManage && (
<button
type="button"
- onClick={() => setInviteOpen(true)}
- className={cn(
- "flex items-center gap-2 w-full px-2 h-8 rounded-md text-left",
- "transition-colors duration-150 outline-none",
- "text-primary/80 hover:text-primary hover:bg-primary/8",
- "focus-visible:ring-1 focus-visible:ring-ring/30"
- )}
+ onClick={() => confirmUnassignTeam(teamRef.id, teamRef.name)}
+ aria-label={t("notes.spaces.teamsMembers.removeTeamFromSpace")}
+ 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"
>
- <Mail size={12} className="shrink-0" />
- <span className="text-xs truncate">
- {t("notes.spaces.members.inviteFooter", { email: addSearch.trim() })}
- </span>
+ <X className="w-3.5 h-3.5" />
</button>
- ) : undefined
- }
- />
- </div>
- )}
-
- {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>
+ )}
+ </div>
+ {otherSpaces > 0 && (
+ <p className="flex items-start gap-1.5 text-[11px] text-muted-foreground">
+ <Info size={12} className="shrink-0 mt-px" />
+ {t("notes.spaces.teamsMembers.affectsOtherSpaces", {
+ count: otherSpaces,
+ team: teamRef.name,
+ })}
+ </p>
+ )}
+ <TeamRosterSection
+ teamId={teamRef.id}
+ canManage={canManageTeamRoster(teamRef.my_role, workspace?.role ?? null)}
+ workspaceMembers={roster}
+ currentUserId={user?.id}
+ onInvite={
+ canInviteToWorkspace
+ ? (email) => {
+ setInviteEmail(email);
+ setInviteTeamId(teamRef.id);
+ setInviteOpen(true);
+ }
+ : undefined
+ }
+ removeConfirm={confirmRemoveMember}
+ />
+ </div>
+ );
+ })}
+
+ {canManage && unassignedTeams.length > 0 && (
+ <Select value="" onValueChange={(teamId) => void handleAssignTeam(teamId)}>
+ <SelectTrigger className="h-8 text-xs">
+ <span className="flex items-center gap-1.5 text-foreground/60">
+ <Plus size={12} />
+ {t("notes.spaces.teamsMembers.addTeam")}
+ </span>
+ </SelectTrigger>
+ <SelectContent>
+ {unassignedTeams.map((team) => (
+ <SelectItem key={team.id} value={team.id} className="text-xs">
+ {team.name}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
)}
</DialogContent>
</Dialog>
- {workspace && (
+ {workspace && inviteTeamId && (
<InviteTeammateDialog
open={inviteOpen}
onOpenChange={setInviteOpen}
workspaceId={workspace.id}
workspaceName={workspace.name}
- teamIds={[teamId]}
- initialEmail={searchEmail.includes("@") ? addSearch.trim() : undefined}
- onInvited={() => setAddSearch("")}
+ teamIds={[inviteTeamId]}
+ initialEmail={inviteEmail}
/>
)}
diff --git a/src/components/notes/SpacesTree.tsx b/src/components/notes/SpacesTree.tsx
index 2c773725f..dadf9e0f6 100644
--- a/src/components/notes/SpacesTree.tsx
+++ b/src/components/notes/SpacesTree.tsx
@@ -45,7 +45,7 @@ import { useWorkspace } from "../../hooks/useWorkspace";
import { clampEmojiInput } from "../../lib/emojiInput";
import { canManageSpace } from "../../lib/spacePermissions";
import { readIsSubscribed, subscribeIsSubscribed } from "../../lib/subscriptionFlag";
-import { deleteTeamSpace, leaveTeamSpace, renameTeamSpace } from "../../services/teamSpaceActions";
+import { deleteSpace, renameSpace } from "../../services/spaceActions";
import { useSettingsStore } from "../../stores/settingsStore";
import { cn } from "../lib/utils";
import { formatRelativeTime } from "../../utils/dateFormatting";
@@ -284,13 +284,11 @@ function SpaceRow({
isDropSuccess,
dropHandlers,
canManage,
- canLeave,
onActivate,
onToggle,
onNewFolder,
onMembers,
onRename,
- onLeave,
onDelete,
a11y,
t,
@@ -304,13 +302,11 @@ function SpaceRow({
isDropSuccess: boolean;
dropHandlers: DropHandlers;
canManage: boolean;
- canLeave: boolean;
onActivate: () => void;
onToggle: () => void;
onNewFolder: () => void;
onMembers: () => void;
onRename: (focus: "name" | "emoji") => void;
- onLeave: () => void;
onDelete: () => void;
a11y: RowA11yProps;
t: TFn;
@@ -421,7 +417,7 @@ function SpaceRow({
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" sideOffset={4} className="min-w-36">
- {space.cloud_team_id && (
+ {space.cloud_space_id && (
<DropdownMenuItem
onClick={(e) => {
e.stopPropagation();
@@ -430,7 +426,7 @@ function SpaceRow({
className={MENU_ITEM_CLASS}
>
<Users size={11} className="text-muted-foreground/60" />
- {t("notes.spaces.members.menu")}
+ {t("notes.spaces.teamsMembers.menu")}
</DropdownMenuItem>
)}
{canManage && (
@@ -457,18 +453,6 @@ function SpaceRow({
</DropdownMenuItem>
</>
)}
- {space.cloud_team_id && canLeave && (
- <DropdownMenuItem
- onClick={(e) => {
- e.stopPropagation();
- onLeave();
- }}
- className={MENU_ITEM_CLASS}
- >
- <LogOut size={11} className="text-muted-foreground/60" />
- {t("notes.spaces.members.leave")}
- </DropdownMenuItem>
- )}
{canManage && (
<>
<DropdownMenuSeparator />
@@ -1161,20 +1145,12 @@ export default function SpacesTree({
workspacesLoaded &&
(workspaces.length === 0 || workspaces.some((w) => w.role === "owner" || w.role === "admin"));
- // Local-only spaces (no cloud team) stay fully manageable; cloud spaces
+ // Local-only spaces (no cloud id) stay fully manageable; cloud spaces
// follow space/workspace roles. Cosmetic — the server enforces.
const canManageTeamSpace = (space: SpaceItem): boolean =>
- !space.cloud_team_id ||
+ !space.cloud_space_id ||
canManageSpace(space, workspaces.find((w) => w.id === space.workspace_id)?.role ?? null);
- // Workspace owners/admins access every team implicitly (no team_members
- // row), so a "leave" is a server no-op and the space would resurrect on the
- // next sync pass — Leave is n/a for them (plan §4).
- const hasImplicitSpaceAccess = (space: SpaceItem): boolean => {
- const role = workspaces.find((w) => w.id === space.workspace_id)?.role;
- return role === "owner" || role === "admin";
- };
-
const targetLabel = (target: NoteMoveTarget): string => {
if (target.folderId != null) {
return folders.find((f) => f.id === target.folderId)?.name ?? "";
@@ -1465,7 +1441,7 @@ export default function SpacesTree({
};
const performDeleteSpace = async (space: SpaceItem) => {
- const result = await deleteTeamSpace(space);
+ const result = await deleteSpace(space);
if (!result.success) {
toast({
title: t("notes.spaces.couldNotDelete"),
@@ -1477,31 +1453,6 @@ export default function SpacesTree({
toast({ title: t("notes.spaces.deleted", { space: space.name }) });
};
- const requestLeaveSpace = (space: SpaceItem) => {
- if (!space.cloud_team_id || !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 () => {
- try {
- if ((await leaveTeamSpace(space, userId)) === "implicit") {
- toast({ title: t("notes.spaces.members.implicitAdminCannotLeave") });
- }
- } catch (err) {
- // Server rejected the leave — surface its message.
- toast({
- title: t("common.error"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
- variant: "destructive",
- });
- }
- },
- });
- };
-
const handleRowKeyDown = (e: React.KeyboardEvent<HTMLDivElement>, row: TreeRow) => {
if (e.target !== e.currentTarget) return;
const idx = visibleRows.findIndex((r) => r.key === row.key);
@@ -1639,7 +1590,7 @@ export default function SpacesTree({
setRenamingSpaceId(null);
if (!space || !name) return;
if (name === space.name && emoji === (space.emoji ?? null)) return;
- const result = await renameTeamSpace(space, { name, emoji });
+ const result = await renameSpace(space, { name, emoji });
if (!result.success) {
toast({
title: t("notes.spaces.couldNotRename"),
@@ -1875,7 +1826,6 @@ export default function SpacesTree({
isDropSuccess={dragState.dropSuccessKey === spaceKey}
dropHandlers={dropTargetHandlers({ spaceId: space.id, folderId: null })}
canManage={canManageTeamSpace(space)}
- canLeave={!hasImplicitSpaceAccess(space)}
onActivate={() => activateRow({ type: "space", key: spaceKey, space })}
onToggle={() => toggleContainerExpanded(spaceKey)}
onNewFolder={() => startCreateFolder(space)}
@@ -1884,7 +1834,6 @@ export default function SpacesTree({
setMembersOpen(true);
}}
onRename={(focus) => startRenameSpace(space, focus)}
- onLeave={() => requestLeaveSpace(space)}
onDelete={() => requestDeleteSpace(space)}
a11y={a11yFor(spaceKey)}
t={t}
diff --git a/src/components/notes/overview/ContainerOverview.tsx b/src/components/notes/overview/ContainerOverview.tsx
index 65aee20c8..d81e77eef 100644
--- a/src/components/notes/overview/ContainerOverview.tsx
+++ b/src/components/notes/overview/ContainerOverview.tsx
@@ -73,7 +73,7 @@ export function ContainerOverview({
: undefined;
const canInvite =
space.kind === "team" &&
- !!space.cloud_team_id &&
+ !!space.cloud_space_id &&
!!workspace &&
canManageSpace(space, workspace.role ?? null);
@@ -150,13 +150,13 @@ export function ContainerOverview({
</div>
</div>
- {canInvite && workspace && space.cloud_team_id && (
+ {canInvite && workspace && space.cloud_space_id && (
<InviteTeammateDialog
open={showInviteDialog}
onOpenChange={setShowInviteDialog}
workspaceId={workspace.id}
workspaceName={workspace.name}
- teamIds={[space.cloud_team_id]}
+ teamIds={space.teams.map((team) => team.id)}
/>
)}
</div>
diff --git a/src/components/notes/overview/OverviewNoteList.tsx b/src/components/notes/overview/OverviewNoteList.tsx
index 39f7a923f..5822e6fb4 100644
--- a/src/components/notes/overview/OverviewNoteList.tsx
+++ b/src/components/notes/overview/OverviewNoteList.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
import MemberAvatar from "../../MemberAvatar";
import { groupItemsByDate } from "../../../utils/dateGrouping";
import { formatRelativeTime } from "../../../utils/dateFormatting";
-import { useTeamRoster } from "../../../hooks/useTeamRoster";
+import { useSpaceRoster } from "../../../hooks/useTeamRoster";
import { useAuth } from "../../../hooks/useAuth";
import type { NoteItem, SpaceItem } from "../../../types/electron";
@@ -26,7 +26,7 @@ export function OverviewNoteList({
const { t } = useTranslation();
const { user } = useAuth();
const isTeamSpace = space.kind === "team";
- const roster = useTeamRoster(isTeamSpace ? space.cloud_team_id : null);
+ const roster = useSpaceRoster(isTeamSpace ? space.cloud_space_id : null);
const groups = useMemo(() => groupItemsByDate(notes, (n) => n.updated_at, t), [notes, t]);
diff --git a/src/components/settings/TeamMembersDialog.tsx b/src/components/settings/TeamMembersDialog.tsx
new file mode 100644
index 000000000..7643b5198
--- /dev/null
+++ b/src/components/settings/TeamMembersDialog.tsx
@@ -0,0 +1,170 @@
+import { useCallback, useEffect, useState } from "react";
+import { useShallow } from "zustand/react/shallow";
+import { useTranslation } from "react-i18next";
+import { Loader2, LogOut } from "lucide-react";
+import { Dialog, DialogContent, DialogHeader, DialogTitle, ConfirmDialog } from "../ui/dialog";
+import { useToast } from "../ui/useToast";
+import { useDialogs } from "../../hooks/useDialogs";
+import { useAuth } from "../../hooks/useAuth";
+import { useDelayedFlag } from "../../hooks/useDelayedFlag";
+import { cn } from "../lib/utils";
+import InviteTeammateDialog from "../InviteTeammateDialog";
+import TeamRosterSection from "../TeamRosterSection";
+import { leaveTeam } from "../../services/spaceActions";
+import { useWorkspaceStore } from "../../stores/workspaceStore";
+import { canManageTeamRoster } from "../../lib/spacePermissions";
+import type { Team, TeamMember, Workspace } from "../../types/electron";
+
+interface TeamMembersDialogProps {
+ team: Team;
+ workspace: Workspace;
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+}
+
+export default function TeamMembersDialog({
+ team,
+ workspace,
+ open,
+ onOpenChange,
+}: TeamMembersDialogProps) {
+ const { t } = useTranslation();
+ const { toast } = useToast();
+ const { user } = useAuth();
+ const { confirmDialog, showConfirmDialog, hideConfirmDialog } = useDialogs();
+ const { members: roster, refreshMembers } = useWorkspaceStore(
+ useShallow((s) => ({ members: s.members, refreshMembers: s.refreshMembers }))
+ );
+ const [teamMembers, setTeamMembers] = useState<TeamMember[]>([]);
+ const [isLeaving, setIsLeaving] = useState(false);
+ const [inviteOpen, setInviteOpen] = useState(false);
+ const [inviteEmail, setInviteEmail] = useState<string | undefined>(undefined);
+ const showLeaveSpinner = useDelayedFlag(isLeaving);
+
+ const isWorkspaceAdmin = workspace.role === "owner" || workspace.role === "admin";
+ const myTeamRole = teamMembers.find((m) => m.user_id === user?.id)?.role ?? null;
+ const canManage = canManageTeamRoster(myTeamRole, workspace.role);
+ // Explicit members can leave; implicit workspace admins have no row to drop.
+ const canLeave = myTeamRole !== null && !isWorkspaceAdmin;
+
+ useEffect(() => {
+ if (open) void refreshMembers(workspace.id).catch(() => {});
+ }, [open, workspace.id, refreshMembers]);
+
+ const confirmRemoveMember = useCallback(
+ (member: TeamMember, onConfirm: () => void) => {
+ showConfirmDialog({
+ title: t("settingsPage.workspace.teams.members.removeConfirm", {
+ name: member.name || member.email,
+ team: team.name,
+ }),
+ description: t("notes.spaces.members.removeConfirmDescription"),
+ confirmText: t("notes.spaces.members.remove"),
+ variant: "destructive",
+ onConfirm,
+ });
+ },
+ [showConfirmDialog, t, team.name]
+ );
+
+ const confirmLeave = () => {
+ if (!canLeave || !user?.id) return;
+ const userId = user.id;
+ showConfirmDialog({
+ title: t("settingsPage.workspace.teams.members.leaveConfirm", { team: team.name }),
+ description: t("settingsPage.workspace.teams.members.leaveConfirmDescription"),
+ confirmText: t("settingsPage.workspace.teams.members.leave"),
+ variant: "destructive",
+ onConfirm: async () => {
+ setIsLeaving(true);
+ try {
+ await leaveTeam(team.id, userId);
+ onOpenChange(false);
+ } catch (err) {
+ toast({
+ title: t("common.error"),
+ description: err instanceof Error ? err.message : t("common.unknownError"),
+ variant: "destructive",
+ });
+ } finally {
+ setIsLeaving(false);
+ }
+ },
+ });
+ };
+
+ return (
+ <>
+ <Dialog open={open} onOpenChange={onOpenChange}>
+ <DialogContent className="max-w-md">
+ <DialogHeader>
+ <DialogTitle>
+ {t("settingsPage.workspace.teams.members.title", { team: team.name })}
+ </DialogTitle>
+ </DialogHeader>
+
+ <TeamRosterSection
+ teamId={team.id}
+ canManage={canManage}
+ workspaceMembers={roster}
+ currentUserId={user?.id}
+ onInvite={
+ isWorkspaceAdmin
+ ? (email) => {
+ setInviteEmail(email);
+ setInviteOpen(true);
+ }
+ : undefined
+ }
+ onRosterChange={setTeamMembers}
+ removeConfirm={confirmRemoveMember}
+ />
+
+ {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("settingsPage.workspace.teams.members.leave")}
+ </button>
+ )}
+ </DialogContent>
+ </Dialog>
+
+ <InviteTeammateDialog
+ open={inviteOpen}
+ onOpenChange={setInviteOpen}
+ workspaceId={workspace.id}
+ workspaceName={workspace.name}
+ teamIds={[team.id]}
+ initialEmail={inviteEmail}
+ />
+
+ <ConfirmDialog
+ open={confirmDialog.open}
+ onOpenChange={(o) => !o && hideConfirmDialog()}
+ title={confirmDialog.title}
+ description={confirmDialog.description}
+ confirmText={confirmDialog.confirmText}
+ cancelText={confirmDialog.cancelText}
+ onConfirm={confirmDialog.onConfirm}
+ variant={confirmDialog.variant}
+ />
+ </>
+ );
+}
diff --git a/src/components/settings/WorkspaceTeamsTab.tsx b/src/components/settings/WorkspaceTeamsTab.tsx
index 4759a9956..1eddb4be6 100644
--- a/src/components/settings/WorkspaceTeamsTab.tsx
+++ b/src/components/settings/WorkspaceTeamsTab.tsx
@@ -1,16 +1,25 @@
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { Plus, Users, Trash2, Loader2 } from "lucide-react";
-import { createTeamSpace, deleteTeamSpace } from "../../services/teamSpaceActions";
+import { deleteTeam } from "../../services/spaceActions";
+import { TeamsService } from "../../services/TeamsService";
import { loadSpaces, useSpaces } from "../../stores/noteStore";
import { useDelayedFlag } from "../../hooks/useDelayedFlag";
+import { useDialogs } from "../../hooks/useDialogs";
import { Button } from "../ui/button";
import { Input } from "../ui/input";
import { Label } from "../ui/label";
import { useToast } from "../ui/useToast";
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "../ui/dialog";
-import DeleteSpaceDialog from "../notes/DeleteSpaceDialog";
-import type { SpaceItem, Workspace } from "../../types/electron";
+import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogFooter,
+ ConfirmDialog,
+} from "../ui/dialog";
+import TeamMembersDialog from "./TeamMembersDialog";
+import type { Team, Workspace } from "../../types/electron";
interface Props {
workspace: Workspace;
@@ -19,24 +28,47 @@ interface Props {
export default function WorkspaceTeamsTab({ workspace }: Props) {
const { t } = useTranslation();
const { toast } = useToast();
+ const { confirmDialog, showConfirmDialog, hideConfirmDialog } = useDialogs();
const spaces = useSpaces();
- const teams = useMemo(
- () => spaces.filter((s) => s.kind === "team" && s.workspace_id === workspace.id),
- [spaces, workspace.id]
- );
- const [spacesLoaded, setSpacesLoaded] = useState(false);
+ const [teams, setTeams] = useState<Team[]>([]);
+ const [teamsLoaded, setTeamsLoaded] = useState(false);
+ const [loadFailed, setLoadFailed] = useState(false);
const [createOpen, setCreateOpen] = useState(false);
const [name, setName] = useState("");
const [submitting, setSubmitting] = useState(false);
const showCreateSpinner = useDelayedFlag(submitting);
- const [deleteTarget, setDeleteTarget] = useState<SpaceItem | null>(null);
- const [deletingId, setDeletingId] = useState<number | null>(null);
+ const [membersTeam, setMembersTeam] = useState<Team | null>(null);
+ const [deletingId, setDeletingId] = useState<string | null>(null);
const canManage = workspace.role === "owner" || workspace.role === "admin";
- // The settings surface can open before the notes tree ever loads spaces.
+ const loadTeams = useCallback(async () => {
+ setLoadFailed(false);
+ try {
+ setTeams(await TeamsService.list(workspace.id));
+ } catch {
+ setLoadFailed(true);
+ } finally {
+ setTeamsLoaded(true);
+ }
+ }, [workspace.id]);
+
+ // Spaces feed the "backs N spaces" column; the settings surface can open
+ // before the notes tree ever loads them.
useEffect(() => {
- void loadSpaces().finally(() => setSpacesLoaded(true));
- }, []);
+ void loadTeams();
+ void loadSpaces();
+ }, [loadTeams]);
+
+ const backedSpacesByTeam = useMemo(() => {
+ const counts = new Map<string, number>();
+ for (const space of spaces) {
+ if (space.kind !== "team") continue;
+ for (const teamRef of space.teams) {
+ counts.set(teamRef.id, (counts.get(teamRef.id) ?? 0) + 1);
+ }
+ }
+ return counts;
+ }, [spaces]);
async function handleCreate(e: React.FormEvent) {
e.preventDefault();
@@ -44,12 +76,13 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {
if (!trimmed || submitting) return;
setSubmitting(true);
try {
- await createTeamSpace(workspace.id, { name: trimmed });
+ await TeamsService.create(workspace.id, { name: trimmed });
+ await loadTeams();
setName("");
setCreateOpen(false);
} catch (error) {
toast({
- title: t("notes.spaces.couldNotCreate"),
+ title: t("settingsPage.workspace.teams.couldNotCreate"),
description: error instanceof Error ? error.message : t("common.unknownError"),
variant: "destructive",
});
@@ -58,22 +91,32 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {
}
}
- async function performDelete(space: SpaceItem) {
- setDeletingId(space.id);
- try {
- const result = await deleteTeamSpace(space);
- if (!result.success) {
- toast({
- title: t("notes.spaces.couldNotDelete"),
- description: result.error ?? t("common.unknownError"),
- variant: "destructive",
- });
- return;
- }
- toast({ title: t("notes.spaces.deleted", { space: space.name }) });
- } finally {
- setDeletingId(null);
- }
+ function confirmDelete(team: Team) {
+ const backedSpaces = backedSpacesByTeam.get(team.id) ?? 0;
+ showConfirmDialog({
+ title: t("settingsPage.workspace.teams.deleteConfirmTitle", { team: team.name }),
+ description:
+ backedSpaces > 0
+ ? t("settingsPage.workspace.teams.deleteConfirmBacksSpaces", { count: backedSpaces })
+ : t("settingsPage.workspace.teams.deleteConfirmDescription"),
+ confirmText: t("common.delete"),
+ variant: "destructive",
+ onConfirm: async () => {
+ setDeletingId(team.id);
+ try {
+ await deleteTeam(team.id);
+ await loadTeams();
+ } catch (error) {
+ toast({
+ title: t("common.error"),
+ description: error instanceof Error ? error.message : t("common.unknownError"),
+ variant: "destructive",
+ });
+ } finally {
+ setDeletingId(null);
+ }
+ },
+ });
}
return (
@@ -95,8 +138,17 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {
)}
</div>
- {!spacesLoaded && teams.length === 0 ? (
+ {!teamsLoaded ? (
<div className="h-24 rounded-lg bg-foreground/5 dark:bg-white/5 animate-pulse" />
+ ) : loadFailed && teams.length === 0 ? (
+ <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-2">
+ <p className="text-xs text-muted-foreground">
+ {t("settingsPage.workspace.loadError.description")}
+ </p>
+ <Button variant="outline" size="sm" onClick={() => void loadTeams()}>
+ {t("settingsPage.workspace.loadError.retry")}
+ </Button>
+ </div>
) : (
<div className="rounded-lg border border-border/50 dark:border-border-subtle/70 divide-y divide-border/30 dark:divide-border-subtle/50 bg-card/50 dark:bg-surface-2/50">
{teams.length === 0 && (
@@ -114,27 +166,37 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {
)}
{teams.map((team) => {
const isDeleting = deletingId === team.id;
+ const backedSpaces = backedSpacesByTeam.get(team.id) ?? 0;
return (
<div key={team.id} className="flex items-center gap-3 px-4 h-14">
- {team.emoji && (
- <span className="text-[13px] leading-none shrink-0" aria-hidden="true">
- {team.emoji}
- </span>
- )}
- <p className="flex-1 min-w-0 text-xs font-medium text-foreground truncate">
- {team.name}
- </p>
+ <div className="flex-1 min-w-0">
+ <p className="text-xs font-medium text-foreground truncate">{team.name}</p>
+ {backedSpaces > 0 && (
+ <p className="text-xs text-muted-foreground/80 truncate">
+ {t("settingsPage.workspace.teams.backsSpaces", { count: backedSpaces })}
+ </p>
+ )}
+ </div>
<span className="text-xs text-muted-foreground">
{t("settingsPage.workspace.teams.memberCount", {
count: team.member_count ?? 0,
})}
</span>
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => setMembersTeam(team)}
+ className="h-7 px-2 text-xs"
+ >
+ <Users className="mr-1 h-3 w-3" />
+ {t("settingsPage.workspace.teams.membersButton")}
+ </Button>
{canManage && (
<button
type="button"
- onClick={() => setDeleteTarget(team)}
+ onClick={() => confirmDelete(team)}
disabled={isDeleting}
- aria-label={t("notes.spaces.deleteSpace")}
+ aria-label={t("common.delete")}
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"
>
{isDeleting ? (
@@ -187,10 +249,29 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {
</DialogContent>
</Dialog>
- <DeleteSpaceDialog
- space={deleteTarget}
- onClose={() => setDeleteTarget(null)}
- onConfirm={(space) => void performDelete(space)}
+ {membersTeam && (
+ <TeamMembersDialog
+ team={membersTeam}
+ workspace={workspace}
+ open={!!membersTeam}
+ onOpenChange={(open) => {
+ if (!open) {
+ setMembersTeam(null);
+ void loadTeams();
+ }
+ }}
+ />
+ )}
+
+ <ConfirmDialog
+ open={confirmDialog.open}
+ onOpenChange={(o) => !o && hideConfirmDialog()}
+ title={confirmDialog.title}
+ description={confirmDialog.description}
+ confirmText={confirmDialog.confirmText}
+ cancelText={confirmDialog.cancelText}
+ onConfirm={confirmDialog.onConfirm}
+ variant={confirmDialog.variant}
/>
</div>
);
diff --git a/src/helpers/database.js b/src/helpers/database.js
index 2178c86ad..ea7769518 100644
--- a/src/helpers/database.js
+++ b/src/helpers/database.js
@@ -706,6 +706,24 @@ class DatabaseManager {
"CREATE UNIQUE INDEX IF NOT EXISTS idx_spaces_cloud_team_id ON spaces(cloud_team_id) WHERE cloud_team_id IS NOT NULL"
);
+ // First-class spaces: a space mirrors a cloud space backed by one or more
+ // teams. cloud_team_id survives only so pre-spaces rows can be adopted by
+ // upsertSpaceFromCloud (matched via the space's single backfilled team).
+ try {
+ this.db.exec("ALTER TABLE spaces ADD COLUMN cloud_space_id TEXT");
+ } catch (err) {
+ if (!err.message.includes("duplicate column")) throw err;
+ }
+ try {
+ // JSON array of { id, name, my_role } mirrored from GET /api/me/spaces.
+ this.db.exec("ALTER TABLE spaces ADD COLUMN teams TEXT");
+ } catch (err) {
+ if (!err.message.includes("duplicate column")) throw err;
+ }
+ this.db.exec(
+ "CREATE UNIQUE INDEX IF NOT EXISTS idx_spaces_cloud_space_id ON spaces(cloud_space_id) WHERE cloud_space_id IS NOT NULL"
+ );
+
const privateSpaceCount = this.db
.prepare("SELECT COUNT(*) as count FROM spaces WHERE kind = 'private'")
.get();
@@ -1963,6 +1981,20 @@ class DatabaseManager {
}
}
+ // Parses the teams JSON mirror so renderer consumers only ever see an array.
+ _spaceRow(row) {
+ if (!row) return row;
+ let teams = [];
+ if (row.teams) {
+ try {
+ teams = JSON.parse(row.teams);
+ } catch {
+ teams = [];
+ }
+ }
+ return { ...row, teams };
+ }
+
getSpaces() {
try {
if (!this.db) throw new Error("Database not initialized");
@@ -1970,7 +2002,8 @@ class DatabaseManager {
.prepare(
"SELECT * FROM spaces WHERE deleted_at IS NULL ORDER BY CASE WHEN kind = 'private' THEN 0 ELSE 1 END, sort_order ASC, name ASC"
)
- .all();
+ .all()
+ .map((row) => this._spaceRow(row));
} catch (error) {
debugLogger.error("Error getting spaces", { error: error.message }, "spaces");
throw error;
@@ -1994,9 +2027,9 @@ class DatabaseManager {
"INSERT INTO spaces (client_space_id, kind, name, emoji, sort_order) VALUES (?, ?, ?, ?, ?)"
)
.run(randomUUID(), kind, trimmed, emoji, sortOrder);
- const space = this.db
- .prepare("SELECT * FROM spaces WHERE id = ?")
- .get(result.lastInsertRowid);
+ const space = this._spaceRow(
+ this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(result.lastInsertRowid)
+ );
return { success: true, space };
} catch (error) {
debugLogger.error("Error creating space", { error: error.message }, "spaces");
@@ -2028,7 +2061,7 @@ class DatabaseManager {
fields.push("sync_status = 'pending'", "updated_at = datetime('now')");
values.push(id);
this.db.prepare(`UPDATE spaces SET ${fields.join(", ")} WHERE id = ?`).run(...values);
- const updated = this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(id);
+ const updated = this._spaceRow(this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(id));
return { success: true, space: updated };
} catch (error) {
debugLogger.error("Error updating space", { error: error.message }, "spaces");
@@ -2040,21 +2073,6 @@ class DatabaseManager {
return this.updateSpace(id, { name });
}
- // Touches ONLY member_count — never clobbers a concurrent rename or backfill flag.
- updateSpaceMemberCount(id, count) {
- try {
- if (!this.db) throw new Error("Database not initialized");
- const result = this.db
- .prepare("UPDATE spaces SET member_count = ? WHERE id = ?")
- .run(count, id);
- if (result.changes === 0) return { success: false, error: "Space not found" };
- return { success: true, space: this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(id) };
- } catch (error) {
- debugLogger.error("Error updating space member count", { error: error.message }, "spaces");
- throw error;
- }
- }
-
setSpaceSyncStatus(id, status) {
try {
if (!this.db) throw new Error("Database not initialized");
@@ -2068,39 +2086,58 @@ class DatabaseManager {
}
}
- getSpaceByCloudTeamId(cloudTeamId) {
+ getSpaceByCloudSpaceId(cloudSpaceId) {
try {
if (!this.db) throw new Error("Database not initialized");
- return (
- this.db.prepare("SELECT * FROM spaces WHERE cloud_team_id = ?").get(cloudTeamId) || null
- );
+ const row = this.db
+ .prepare("SELECT * FROM spaces WHERE cloud_space_id = ?")
+ .get(cloudSpaceId);
+ return row ? this._spaceRow(row) : null;
} catch (error) {
- debugLogger.error("Error getting space by cloud team id", { error: error.message }, "spaces");
+ debugLogger.error(
+ "Error getting space by cloud space id",
+ { error: error.message },
+ "spaces"
+ );
throw error;
}
}
- upsertSpaceFromCloud(team) {
+ upsertSpaceFromCloud(space) {
try {
if (!this.db) throw new Error("Database not initialized");
- const updatedAt = team.updated_at || team.created_at || new Date().toISOString();
- const existing = this.db.prepare("SELECT * FROM spaces WHERE cloud_team_id = ?").get(team.id);
+ const updatedAt = space.updated_at || space.created_at || new Date().toISOString();
+ const teams = Array.isArray(space.teams) ? space.teams : [];
+ const teamsJson = JSON.stringify(teams);
+ let existing = this.db
+ .prepare("SELECT * FROM spaces WHERE cloud_space_id = ?")
+ .get(space.id);
+ if (!existing && teams.length === 1) {
+ // Adopt a pre-spaces row: the server backfilled one space per legacy
+ // team, so a single-team space claims the local row that mirrored that
+ // team. Keeps local ids alive for chats, vector payloads and tree state.
+ existing = this.db
+ .prepare("SELECT * FROM spaces WHERE cloud_space_id IS NULL AND cloud_team_id = ?")
+ .get(teams[0].id);
+ }
if (existing) {
this.db
.prepare(
- `UPDATE spaces SET workspace_id = ?, name = ?, emoji = ?, my_role = ?, member_count = ?,
- deleted_at = NULL, updated_at = ? WHERE id = ?`
+ `UPDATE spaces SET cloud_space_id = ?, workspace_id = ?, name = ?, emoji = ?, my_role = ?,
+ member_count = ?, teams = ?, deleted_at = NULL, updated_at = ? WHERE id = ?`
)
.run(
- team.workspace_id ?? null,
- team.name,
- team.emoji ?? null,
- team.my_role ?? null,
- team.member_count ?? null,
+ space.id,
+ space.workspace_id ?? null,
+ space.name,
+ space.emoji ?? null,
+ space.my_role ?? null,
+ space.member_count ?? null,
+ teamsJson,
updatedAt,
existing.id
);
- return this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(existing.id);
+ return this._spaceRow(this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(existing.id));
}
const maxOrder = this.db.prepare("SELECT MAX(sort_order) as max_order FROM spaces").get();
// New spaces insert as 'pending' (skeletons until the content backfill
@@ -2108,23 +2145,26 @@ class DatabaseManager {
// backfill's 'pending' survives the next mirror pass and re-runs.
const result = this.db
.prepare(
- `INSERT INTO spaces (client_space_id, cloud_team_id, workspace_id, kind, name, emoji,
- sort_order, my_role, member_count, sync_status, created_at, updated_at)
- VALUES (?, ?, ?, 'team', ?, ?, ?, ?, ?, 'pending', ?, ?)`
+ `INSERT INTO spaces (client_space_id, cloud_space_id, workspace_id, kind, name, emoji,
+ sort_order, my_role, member_count, teams, sync_status, created_at, updated_at)
+ VALUES (?, ?, ?, 'team', ?, ?, ?, ?, ?, ?, 'pending', ?, ?)`
)
.run(
randomUUID(),
- team.id,
- team.workspace_id ?? null,
- team.name,
- team.emoji ?? null,
+ space.id,
+ space.workspace_id ?? null,
+ space.name,
+ space.emoji ?? null,
(maxOrder?.max_order ?? 0) + 1,
- team.my_role ?? null,
- team.member_count ?? null,
- team.created_at || updatedAt,
+ space.my_role ?? null,
+ space.member_count ?? null,
+ teamsJson,
+ space.created_at || updatedAt,
updatedAt
);
- return this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(result.lastInsertRowid);
+ return this._spaceRow(
+ this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(result.lastInsertRowid)
+ );
} catch (error) {
debugLogger.error("Error upserting space from cloud", { error: error.message }, "spaces");
throw error;
diff --git a/src/helpers/ipcHandlers.js b/src/helpers/ipcHandlers.js
index a6bea5661..503ee764b 100644
--- a/src/helpers/ipcHandlers.js
+++ b/src/helpers/ipcHandlers.js
@@ -1694,27 +1694,21 @@ class IPCHandlers {
});
// Spaces sync
- ipcMain.handle("db-get-space-by-cloud-team-id", (_, cloudTeamId) =>
- this.databaseManager.getSpaceByCloudTeamId(cloudTeamId)
+ ipcMain.handle("db-get-space-by-cloud-space-id", (_, cloudSpaceId) =>
+ this.databaseManager.getSpaceByCloudSpaceId(cloudSpaceId)
);
- ipcMain.handle("db-upsert-space-from-cloud", (_, team) => {
- const space = this.databaseManager.upsertSpaceFromCloud(team);
+ ipcMain.handle("db-upsert-space-from-cloud", (_, cloudSpace) => {
+ const space = this.databaseManager.upsertSpaceFromCloud(cloudSpace);
if (space) setImmediate(() => this.broadcastToWindows("space-synced", space));
return space;
});
- ipcMain.handle("db-update-space-member-count", (_, id, count) => {
- const result = this.databaseManager.updateSpaceMemberCount(id, count);
- if (result?.space) {
- const space = result.space;
- setImmediate(() => this.broadcastToWindows("space-synced", space));
- }
- return result;
- });
ipcMain.handle("db-set-space-sync-status", (_, id, status) => {
const result = this.databaseManager.setSpaceSyncStatus(id, status);
if (result?.success) {
// Live skeleton toggling: the tree keys pending/synced off this flag.
- const space = this.databaseManager.db.prepare("SELECT * FROM spaces WHERE id = ?").get(id);
+ const space = this.databaseManager._spaceRow(
+ this.databaseManager.db.prepare("SELECT * FROM spaces WHERE id = ?").get(id)
+ );
if (space) setImmediate(() => this.broadcastToWindows("space-synced", space));
}
return result;
diff --git a/src/hooks/useTeamRoster.ts b/src/hooks/useTeamRoster.ts
index c035e0bf8..51bee418c 100644
--- a/src/hooks/useTeamRoster.ts
+++ b/src/hooks/useTeamRoster.ts
@@ -1,31 +1,31 @@
import { useEffect, useState } from "react";
-import { TeamsService } from "../services/TeamsService";
+import { SpacesService } from "../services/SpacesService";
import type { TeamMember } from "../types/electron";
-// Rosters cached per team so repeated lookups (conflict attribution, note
-// authorship) don't refetch.
+// Union rosters cached per cloud space so repeated lookups (conflict
+// attribution, note authorship) don't refetch.
const rosterCache = new Map<string, Promise<TeamMember[]>>();
-export function fetchTeamRoster(teamId: string): Promise<TeamMember[]> {
- let roster = rosterCache.get(teamId);
+export function fetchSpaceRoster(cloudSpaceId: string): Promise<TeamMember[]> {
+ let roster = rosterCache.get(cloudSpaceId);
if (!roster) {
- roster = TeamsService.listMembers(teamId);
- roster.catch(() => rosterCache.delete(teamId));
- rosterCache.set(teamId, roster);
+ roster = SpacesService.listMembers(cloudSpaceId);
+ roster.catch(() => rosterCache.delete(cloudSpaceId));
+ rosterCache.set(cloudSpaceId, roster);
}
return roster;
}
-export function useTeamRoster(teamId: string | null): Map<string, TeamMember> | null {
+export function useSpaceRoster(cloudSpaceId: string | null): Map<string, TeamMember> | null {
const [membersById, setMembersById] = useState<Map<string, TeamMember> | null>(null);
useEffect(() => {
- if (!teamId) {
+ if (!cloudSpaceId) {
setMembersById(null);
return;
}
let stale = false;
- fetchTeamRoster(teamId)
+ fetchSpaceRoster(cloudSpaceId)
.then((members) => {
if (!stale) setMembersById(new Map(members.map((m) => [m.user_id, m])));
})
@@ -35,7 +35,7 @@ export function useTeamRoster(teamId: string | null): Map<string, TeamMember> |
return () => {
stale = true;
};
- }, [teamId]);
+ }, [cloudSpaceId]);
return membersById;
}
diff --git a/src/lib/spacePermissions.ts b/src/lib/spacePermissions.ts
index 8f5fa1140..035c2b5b7 100644
--- a/src/lib/spacePermissions.ts
+++ b/src/lib/spacePermissions.ts
@@ -1,10 +1,22 @@
-import type { SpaceItem, WorkspaceRole } from "../types/electron";
+import type { SpaceItem, TeamRole, WorkspaceRole } from "../types/electron";
/**
- * Whether the current user can manage a team space (rename, delete, edit
- * membership): an explicit space admin, or an implicit one via workspace
- * owner/admin. Client checks are cosmetic — the server enforces.
+ * Whether the current user can manage a team space (rename, delete, assign
+ * teams): an explicit space admin (best role across the space's assigned
+ * teams, server-computed) or an implicit one via workspace owner/admin.
+ * Client checks are cosmetic — the server enforces.
*/
export function canManageSpace(space: SpaceItem, workspaceRole: WorkspaceRole | null): boolean {
return space.my_role === "admin" || workspaceRole === "owner" || workspaceRole === "admin";
}
+
+/**
+ * Whether the current user can edit a specific team's roster: an explicit
+ * admin of that team, or an implicit one via workspace owner/admin.
+ */
+export function canManageTeamRoster(
+ teamMyRole: TeamRole | null | undefined,
+ workspaceRole: WorkspaceRole | null
+): boolean {
+ return teamMyRole === "admin" || workspaceRole === "owner" || workspaceRole === "admin";
+}
diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json
index 5df00d8ca..1f07f35ac 100644
--- a/src/locales/de/translation.json
+++ b/src/locales/de/translation.json
@@ -1258,15 +1258,30 @@
}
},
"teams": {
- "title": "Team-Bereiche",
- "description": "Organisieren Sie gemeinsame Ordner und Notizen für ausgewählte Workspace-Mitglieder.",
- "new": "Neuer Team-Bereich",
- "empty": "Noch keine Team-Bereiche.",
- "createFirst": "Erstellen Sie Ihren ersten Team-Bereich",
- "createTitle": "Team-Bereich erstellen",
- "nameLabel": "Name des Team-Bereichs",
+ "title": "Teams",
+ "description": "Gruppen von Workspace-Mitgliedern, die Zugriff auf Team-Spaces gewähren.",
+ "new": "Neues Team",
+ "empty": "Noch keine Teams.",
+ "createFirst": "Erstelle dein erstes Team",
+ "createTitle": "Team erstellen",
+ "nameLabel": "Teamname",
"memberCount_one": "{{count}} Mitglied",
- "memberCount_other": "{{count}} Mitglieder"
+ "memberCount_other": "{{count}} Mitglieder",
+ "membersButton": "Mitglieder",
+ "backsSpaces_one": "Trägt {{count}} Space",
+ "backsSpaces_other": "Trägt {{count}} Spaces",
+ "couldNotCreate": "Team konnte nicht erstellt werden",
+ "deleteConfirmTitle": "{{team}} löschen?",
+ "deleteConfirmDescription": "Das Team wird archiviert. Seine Mitglieder verlieren den dadurch gewährten Zugriff.",
+ "deleteConfirmBacksSpaces_one": "Dieses Team trägt {{count}} Space. Seine Mitglieder verlieren den darüber gewährten Zugriff.",
+ "deleteConfirmBacksSpaces_other": "Dieses Team trägt {{count}} Spaces. Seine Mitglieder verlieren den darüber gewährten Zugriff.",
+ "members": {
+ "title": "Mitglieder von {{team}}",
+ "removeConfirm": "{{name}} aus {{team}} entfernen?",
+ "leave": "Team verlassen",
+ "leaveConfirm": "{{team}} verlassen?",
+ "leaveConfirmDescription": "Du verlierst den Zugriff auf Spaces dieses Teams, sofern dich kein anderes Team einschließt."
+ }
},
"invites": {
"title": "Ausstehende Einladungen",
@@ -2392,7 +2407,7 @@
"privateTooltip": "Nur du kannst deinen persönlichen Bereich sehen",
"newSpace": "Neuer Team-Bereich",
"createTitle": "Team-Bereich erstellen",
- "createDescription": "Ein gemeinsamer Bereich in einem Workspace für ausgewählte Teammitglieder.",
+ "createDescription": "Ein gemeinsamer Bereich in einem Workspace, getragen von einem oder mehreren Teams.",
"nameLabel": "Name",
"emojiLabel": "Emoji",
"create": "Erstellen",
@@ -2403,7 +2418,7 @@
"deleteSpace": "Bereich löschen",
"deleteConfirmTitle": "Bereich löschen?",
"deleteConfirmDescription": "Dadurch werden {{space}} und alle zugehörigen Ordner und Notizen auf diesem Gerät endgültig gelöscht.",
- "deleteConfirmTeamDescription": "Dadurch wird {{space}} für alle gelöscht. Mitglieder verlieren den Zugriff auf alle zugehörigen Ordner und Notizen.",
+ "deleteConfirmTeamDescription": "Dies löscht {{space}} für alle. Die Teams bleiben bestehen, aber Mitglieder verlieren den Zugriff auf alle Ordner und Notizen.",
"deleteTypeName": "Geben Sie {{space}} zur Bestätigung ein",
"couldNotDelete": "Bereich konnte nicht gelöscht werden",
"deleted": "{{space}} gelöscht",
@@ -2437,8 +2452,6 @@
"conflictKeep": "Weiter bearbeiten",
"editedBy": "Bearbeitet von {{name}} · {{time}}",
"members": {
- "menu": "Mitglieder…",
- "title": "Mitglieder von {{space}}",
"addPeople": "Personen hinzufügen",
"addFailed": "{{failed}} von {{total}} Personen konnten nicht hinzugefügt werden",
"searchPlaceholder": "Personen suchen…",
@@ -2447,15 +2460,29 @@
"remove": "Entfernen",
"removeConfirm": "{{name}} aus {{space}} entfernen?",
"removeConfirmDescription": "Diese Person verliert den Zugriff auf alle Notizen in diesem Bereich.",
- "leave": "Bereich verlassen",
- "leaveConfirm": "{{space}} verlassen?",
- "leaveConfirmDescription": "Sie verlieren den Zugriff auf alle Notizen in diesem Bereich.",
- "implicitAdminCannotLeave": "Workspace-Inhaber und -Administratoren haben Zugriff auf alle Team-Bereiche und können sie nicht verlassen.",
"inviteFooter": "{{email}} in den Workspace einladen…",
"empty": "Noch niemand hinzugefügt"
},
"invitedTo_one": "Sie treten {{count}} Team-Bereich bei",
- "invitedTo_other": "Sie treten {{count}} Team-Bereichen bei"
+ "invitedTo_other": "Sie treten {{count}} Team-Bereichen bei",
+ "teamsMembers": {
+ "menu": "Teams & Mitglieder…",
+ "title": "Teams & Mitglieder von {{space}}",
+ "noTeams": "Diesem Space sind noch keine Teams zugewiesen. Nur Workspace-Admins können ihn sehen.",
+ "addTeam": "Team hinzufügen…",
+ "removeTeamFromSpace": "Aus dem Space entfernen",
+ "removeTeamConfirm": "{{team}} aus {{space}} entfernen?",
+ "removeTeamConfirmDescription": "Seine Mitglieder verlieren den Zugriff auf diesen Space, sofern kein anderes zugewiesenes Team sie einschließt.",
+ "lastTeamWarning": "Dies ist das einzige Team dieses Space. Danach behalten nur Workspace-Admins Zugriff.",
+ "affectsOtherSpaces_one": "Änderungen an {{team}} gelten auch für {{count}} weiteren Space.",
+ "affectsOtherSpaces_other": "Änderungen an {{team}} gelten auch für {{count}} weitere Spaces."
+ },
+ "teams": {
+ "assignLabel": "Teams",
+ "newTeam": "Neues Team",
+ "newTeamNameLabel": "Teamname",
+ "loadError": "Teams konnten nicht geladen werden."
+ }
},
"structureIntro": {
"title": "Wo Ihre Notizen gespeichert sind",
@@ -2470,7 +2497,7 @@
},
"teamSpace": {
"title": "Team-Bereich",
- "description": "Ein gemeinsamer Bereich in einem Workspace für ausgewählte Teammitglieder."
+ "description": "Ein gemeinsamer Bereich in einem Workspace. Ein oder mehrere Teams gewähren Zugriff."
},
"contents": "Jeder Bereich kann Ordner und Notizen enthalten.",
"done": "Verstanden",
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 792f9ffa5..b4a463252 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -1258,15 +1258,30 @@
}
},
"teams": {
- "title": "Team spaces",
- "description": "Organize shared folders and notes for selected workspace members.",
- "new": "New team space",
- "empty": "No team spaces yet.",
- "createFirst": "Create your first team space",
- "createTitle": "Create team space",
- "nameLabel": "Team space name",
+ "title": "Teams",
+ "description": "Groups of workspace members that grant access to team spaces.",
+ "new": "New team",
+ "empty": "No teams yet.",
+ "createFirst": "Create your first team",
+ "createTitle": "Create team",
+ "nameLabel": "Team name",
"memberCount_one": "{{count}} member",
- "memberCount_other": "{{count}} members"
+ "memberCount_other": "{{count}} members",
+ "membersButton": "Members",
+ "backsSpaces_one": "Backs {{count}} space",
+ "backsSpaces_other": "Backs {{count}} spaces",
+ "couldNotCreate": "Couldn't create team",
+ "deleteConfirmTitle": "Delete {{team}}?",
+ "deleteConfirmDescription": "This archives the team. Its members lose any access it granted.",
+ "deleteConfirmBacksSpaces_one": "This team backs {{count}} space. Its members will lose access granted through it.",
+ "deleteConfirmBacksSpaces_other": "This team backs {{count}} spaces. Its members will lose access granted through it.",
+ "members": {
+ "title": "Members of {{team}}",
+ "removeConfirm": "Remove {{name}} from {{team}}?",
+ "leave": "Leave team",
+ "leaveConfirm": "Leave {{team}}?",
+ "leaveConfirmDescription": "You'll lose access to spaces this team backs unless another team includes you."
+ }
},
"invites": {
"title": "Pending invitations",
@@ -2392,7 +2407,7 @@
"privateTooltip": "Only you can see your Personal space",
"newSpace": "New team space",
"createTitle": "Create team space",
- "createDescription": "A shared area inside a workspace for selected teammates.",
+ "createDescription": "A shared area inside a workspace, backed by one or more teams.",
"nameLabel": "Name",
"emojiLabel": "Emoji",
"create": "Create",
@@ -2403,7 +2418,7 @@
"deleteSpace": "Delete space",
"deleteConfirmTitle": "Delete space?",
"deleteConfirmDescription": "This permanently deletes {{space}} with all of its folders and notes on this device.",
- "deleteConfirmTeamDescription": "This deletes {{space}} for everyone. Members will lose access to all of its folders and notes.",
+ "deleteConfirmTeamDescription": "This deletes {{space}} for everyone. Its teams remain, but members lose access to all of its folders and notes.",
"deleteTypeName": "Type {{space}} to confirm",
"couldNotDelete": "Couldn't delete space",
"deleted": "Deleted {{space}}",
@@ -2437,8 +2452,6 @@
"conflictKeep": "Keep editing",
"editedBy": "Edited by {{name}} · {{time}}",
"members": {
- "menu": "Members…",
- "title": "Members of {{space}}",
"addPeople": "Add people",
"addFailed": "{{failed}} of {{total}} people couldn't be added",
"searchPlaceholder": "Search people…",
@@ -2447,15 +2460,29 @@
"remove": "Remove",
"removeConfirm": "Remove {{name}} from {{space}}?",
"removeConfirmDescription": "They'll lose access to all notes in this space.",
- "leave": "Leave space",
- "leaveConfirm": "Leave {{space}}?",
- "leaveConfirmDescription": "You'll lose access to all notes in this space.",
- "implicitAdminCannotLeave": "Workspace owners and admins have access to every team space and can't leave it.",
"inviteFooter": "Invite {{email}} to workspace…",
"empty": "No one has been added yet"
},
"invitedTo_one": "You'll join {{count}} team space",
- "invitedTo_other": "You'll join {{count}} team spaces"
+ "invitedTo_other": "You'll join {{count}} team spaces",
+ "teamsMembers": {
+ "menu": "Teams & members…",
+ "title": "Teams & members of {{space}}",
+ "noTeams": "No teams back this space yet. Only workspace admins can see it.",
+ "addTeam": "Add team…",
+ "removeTeamFromSpace": "Remove from space",
+ "removeTeamConfirm": "Remove {{team}} from {{space}}?",
+ "removeTeamConfirmDescription": "Its members will lose access to this space unless another assigned team includes them.",
+ "lastTeamWarning": "This is the only team backing this space. After removing it, only workspace admins keep access.",
+ "affectsOtherSpaces_one": "Changes to {{team}} also apply to {{count}} other space it backs.",
+ "affectsOtherSpaces_other": "Changes to {{team}} also apply to {{count}} other spaces it backs."
+ },
+ "teams": {
+ "assignLabel": "Teams",
+ "newTeam": "New team",
+ "newTeamNameLabel": "Team name",
+ "loadError": "Couldn't load teams."
+ }
},
"structureIntro": {
"title": "Where your notes live",
@@ -2470,7 +2497,7 @@
},
"teamSpace": {
"title": "Team space",
- "description": "A shared area inside a workspace for selected teammates."
+ "description": "A shared area inside a workspace. One or more teams grant access to it."
},
"contents": "Each space can contain folders and notes.",
"done": "Got it",
diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json
index 721af5d2a..0da903dac 100644
--- a/src/locales/es/translation.json
+++ b/src/locales/es/translation.json
@@ -1920,15 +1920,30 @@
}
},
"teams": {
- "title": "Espacios de equipo",
- "description": "Organiza carpetas y notas compartidas para miembros seleccionados del espacio de trabajo.",
- "new": "Nuevo espacio de equipo",
- "empty": "Aún no hay espacios de equipo.",
- "createFirst": "Crea tu primer espacio de equipo",
- "createTitle": "Crear espacio de equipo",
- "nameLabel": "Nombre del espacio de equipo",
+ "title": "Equipos",
+ "description": "Grupos de miembros del workspace que conceden acceso a espacios de equipo.",
+ "new": "Nuevo equipo",
+ "empty": "Aún no hay equipos.",
+ "createFirst": "Crea tu primer equipo",
+ "createTitle": "Crear equipo",
+ "nameLabel": "Nombre del equipo",
"memberCount_one": "{{count}} miembro",
- "memberCount_other": "{{count}} miembros"
+ "memberCount_other": "{{count}} miembros",
+ "membersButton": "Miembros",
+ "backsSpaces_one": "Respalda {{count}} espacio",
+ "backsSpaces_other": "Respalda {{count}} espacios",
+ "couldNotCreate": "No se pudo crear el equipo",
+ "deleteConfirmTitle": "¿Eliminar {{team}}?",
+ "deleteConfirmDescription": "Esto archiva el equipo. Sus miembros pierden el acceso que concedía.",
+ "deleteConfirmBacksSpaces_one": "Este equipo respalda {{count}} espacio. Sus miembros perderán el acceso concedido a través de él.",
+ "deleteConfirmBacksSpaces_other": "Este equipo respalda {{count}} espacios. Sus miembros perderán el acceso concedido a través de él.",
+ "members": {
+ "title": "Miembros de {{team}}",
+ "removeConfirm": "¿Quitar a {{name}} de {{team}}?",
+ "leave": "Salir del equipo",
+ "leaveConfirm": "¿Salir de {{team}}?",
+ "leaveConfirmDescription": "Perderás el acceso a los espacios que respalda este equipo salvo que otro equipo te incluya."
+ }
},
"invites": {
"title": "Invitaciones pendientes",
@@ -2232,7 +2247,7 @@
"privateTooltip": "Solo tú puedes ver tu espacio personal",
"newSpace": "Nuevo espacio de equipo",
"createTitle": "Crear espacio de equipo",
- "createDescription": "Un área compartida dentro de un espacio de trabajo para compañeros seleccionados.",
+ "createDescription": "Un área compartida dentro de un workspace, respaldada por uno o más equipos.",
"nameLabel": "Nombre",
"emojiLabel": "Emoji",
"create": "Crear",
@@ -2243,7 +2258,7 @@
"deleteSpace": "Eliminar espacio",
"deleteConfirmTitle": "¿Eliminar espacio?",
"deleteConfirmDescription": "Esto elimina permanentemente {{space}} con todas sus carpetas y notas en este dispositivo.",
- "deleteConfirmTeamDescription": "Esto elimina {{space}} para todos. Los miembros perderán el acceso a todas sus carpetas y notas.",
+ "deleteConfirmTeamDescription": "Esto elimina {{space}} para todos. Sus equipos permanecen, pero los miembros pierden el acceso a todas sus carpetas y notas.",
"deleteTypeName": "Escribe {{space}} para confirmar",
"couldNotDelete": "No se pudo eliminar el espacio",
"deleted": "{{space}} eliminado",
@@ -2277,8 +2292,6 @@
"conflictKeep": "Seguir editando",
"editedBy": "Editado por {{name}} · {{time}}",
"members": {
- "menu": "Miembros…",
- "title": "Miembros de {{space}}",
"addPeople": "Añadir personas",
"addFailed": "No se pudo añadir a {{failed}} de {{total}} personas",
"searchPlaceholder": "Buscar personas…",
@@ -2287,15 +2300,29 @@
"remove": "Quitar",
"removeConfirm": "¿Quitar a {{name}} de {{space}}?",
"removeConfirmDescription": "Perderá el acceso a todas las notas de este espacio.",
- "leave": "Salir del espacio",
- "leaveConfirm": "¿Salir de {{space}}?",
- "leaveConfirmDescription": "Perderás el acceso a todas las notas de este espacio.",
- "implicitAdminCannotLeave": "Los propietarios y administradores del espacio de trabajo tienen acceso a todos los espacios de equipo y no pueden salir de ellos.",
"inviteFooter": "Invitar a {{email}} al espacio de trabajo…",
"empty": "Aún no se ha añadido a nadie"
},
"invitedTo_one": "Te unirás a {{count}} espacio de equipo",
- "invitedTo_other": "Te unirás a {{count}} espacios de equipo"
+ "invitedTo_other": "Te unirás a {{count}} espacios de equipo",
+ "teamsMembers": {
+ "menu": "Equipos y miembros…",
+ "title": "Equipos y miembros de {{space}}",
+ "noTeams": "Ningún equipo respalda este espacio todavía. Solo los administradores del workspace pueden verlo.",
+ "addTeam": "Añadir equipo…",
+ "removeTeamFromSpace": "Quitar del espacio",
+ "removeTeamConfirm": "¿Quitar {{team}} de {{space}}?",
+ "removeTeamConfirmDescription": "Sus miembros perderán el acceso a este espacio salvo que otro equipo asignado los incluya.",
+ "lastTeamWarning": "Es el único equipo que respalda este espacio. Tras quitarlo, solo los administradores del workspace mantendrán el acceso.",
+ "affectsOtherSpaces_one": "Los cambios en {{team}} también se aplican a {{count}} otro espacio que respalda.",
+ "affectsOtherSpaces_other": "Los cambios en {{team}} también se aplican a {{count}} otros espacios que respalda."
+ },
+ "teams": {
+ "assignLabel": "Equipos",
+ "newTeam": "Nuevo equipo",
+ "newTeamNameLabel": "Nombre del equipo",
+ "loadError": "No se pudieron cargar los equipos."
+ }
},
"structureIntro": {
"title": "Dónde están tus notas",
@@ -2310,7 +2337,7 @@
},
"teamSpace": {
"title": "Espacio de equipo",
- "description": "Un área compartida dentro de un espacio de trabajo para compañeros seleccionados."
+ "description": "Un área compartida dentro de un workspace. Uno o más equipos conceden acceso a ella."
},
"contents": "Cada espacio puede contener carpetas y notas.",
"done": "Entendido",
diff --git a/src/locales/fr/translation.json b/src/locales/fr/translation.json
index 6fb7ab5eb..624d1c87f 100644
--- a/src/locales/fr/translation.json
+++ b/src/locales/fr/translation.json
@@ -1258,15 +1258,30 @@
}
},
"teams": {
- "title": "Espaces d'équipe",
- "description": "Organisez des dossiers et notes partagés pour certains membres de l'espace de travail.",
- "new": "Nouvel espace d'équipe",
- "empty": "Aucun espace d'équipe.",
- "createFirst": "Créez votre premier espace d'équipe",
- "createTitle": "Créer un espace d'équipe",
- "nameLabel": "Nom de l'espace d'équipe",
+ "title": "Équipes",
+ "description": "Groupes de membres du workspace qui donnent accès aux espaces d'équipe.",
+ "new": "Nouvelle équipe",
+ "empty": "Pas encore d'équipes.",
+ "createFirst": "Créez votre première équipe",
+ "createTitle": "Créer une équipe",
+ "nameLabel": "Nom de l'équipe",
"memberCount_one": "{{count}} membre",
- "memberCount_other": "{{count}} membres"
+ "memberCount_other": "{{count}} membres",
+ "membersButton": "Membres",
+ "backsSpaces_one": "Porte {{count}} espace",
+ "backsSpaces_other": "Porte {{count}} espaces",
+ "couldNotCreate": "Impossible de créer l'équipe",
+ "deleteConfirmTitle": "Supprimer {{team}} ?",
+ "deleteConfirmDescription": "Cela archive l'équipe. Ses membres perdent l'accès qu'elle accordait.",
+ "deleteConfirmBacksSpaces_one": "Cette équipe porte {{count}} espace. Ses membres perdront l'accès accordé par son intermédiaire.",
+ "deleteConfirmBacksSpaces_other": "Cette équipe porte {{count}} espaces. Ses membres perdront l'accès accordé par son intermédiaire.",
+ "members": {
+ "title": "Membres de {{team}}",
+ "removeConfirm": "Retirer {{name}} de {{team}} ?",
+ "leave": "Quitter l'équipe",
+ "leaveConfirm": "Quitter {{team}} ?",
+ "leaveConfirmDescription": "Vous perdrez l'accès aux espaces portés par cette équipe, sauf si une autre équipe vous inclut."
+ }
},
"invites": {
"title": "Invitations en attente",
@@ -2392,7 +2407,7 @@
"privateTooltip": "Vous seul pouvez voir votre espace personnel",
"newSpace": "Nouvel espace d'équipe",
"createTitle": "Créer un espace d'équipe",
- "createDescription": "Un espace partagé au sein d'un espace de travail pour certains coéquipiers.",
+ "createDescription": "Un espace partagé au sein d'un workspace, porté par une ou plusieurs équipes.",
"nameLabel": "Nom",
"emojiLabel": "Émoji",
"create": "Créer",
@@ -2403,7 +2418,7 @@
"deleteSpace": "Supprimer l'espace",
"deleteConfirmTitle": "Supprimer l'espace ?",
"deleteConfirmDescription": "Cela supprime définitivement {{space}} ainsi que tous ses dossiers et notes sur cet appareil.",
- "deleteConfirmTeamDescription": "Cela supprime {{space}} pour tout le monde. Les membres perdront l'accès à tous ses dossiers et notes.",
+ "deleteConfirmTeamDescription": "Cela supprime {{space}} pour tout le monde. Ses équipes subsistent, mais les membres perdent l'accès à tous ses dossiers et notes.",
"deleteTypeName": "Saisissez {{space}} pour confirmer",
"couldNotDelete": "Impossible de supprimer l'espace",
"deleted": "{{space}} supprimé",
@@ -2437,8 +2452,6 @@
"conflictKeep": "Continuer à modifier",
"editedBy": "Modifié par {{name}} · {{time}}",
"members": {
- "menu": "Membres…",
- "title": "Membres de {{space}}",
"addPeople": "Ajouter des personnes",
"addFailed": "Impossible d'ajouter {{failed}} personnes sur {{total}}",
"searchPlaceholder": "Rechercher des personnes…",
@@ -2447,15 +2460,29 @@
"remove": "Retirer",
"removeConfirm": "Retirer {{name}} de {{space}} ?",
"removeConfirmDescription": "Cette personne perdra l'accès à toutes les notes de cet espace.",
- "leave": "Quitter l'espace",
- "leaveConfirm": "Quitter {{space}} ?",
- "leaveConfirmDescription": "Vous perdrez l'accès à toutes les notes de cet espace.",
- "implicitAdminCannotLeave": "Les propriétaires et administrateurs de l'espace de travail ont accès à tous les espaces d'équipe et ne peuvent pas les quitter.",
"inviteFooter": "Inviter {{email}} dans l'espace de travail…",
"empty": "Personne n'a encore été ajouté"
},
"invitedTo_one": "Vous rejoindrez {{count}} espace d'équipe",
- "invitedTo_other": "Vous rejoindrez {{count}} espaces d'équipe"
+ "invitedTo_other": "Vous rejoindrez {{count}} espaces d'équipe",
+ "teamsMembers": {
+ "menu": "Équipes et membres…",
+ "title": "Équipes et membres de {{space}}",
+ "noTeams": "Aucune équipe n'est encore rattachée à cet espace. Seuls les administrateurs du workspace peuvent le voir.",
+ "addTeam": "Ajouter une équipe…",
+ "removeTeamFromSpace": "Retirer de l'espace",
+ "removeTeamConfirm": "Retirer {{team}} de {{space}} ?",
+ "removeTeamConfirmDescription": "Ses membres perdront l'accès à cet espace, sauf si une autre équipe rattachée les inclut.",
+ "lastTeamWarning": "C'est la seule équipe rattachée à cet espace. Après son retrait, seuls les administrateurs du workspace garderont l'accès.",
+ "affectsOtherSpaces_one": "Les modifications de {{team}} s'appliquent aussi à {{count}} autre espace qu'elle porte.",
+ "affectsOtherSpaces_other": "Les modifications de {{team}} s'appliquent aussi à {{count}} autres espaces qu'elle porte."
+ },
+ "teams": {
+ "assignLabel": "Équipes",
+ "newTeam": "Nouvelle équipe",
+ "newTeamNameLabel": "Nom de l'équipe",
+ "loadError": "Impossible de charger les équipes."
+ }
},
"structureIntro": {
"title": "Où se trouvent vos notes",
@@ -2470,7 +2497,7 @@
},
"teamSpace": {
"title": "Espace d'équipe",
- "description": "Un espace partagé au sein d'un espace de travail pour certains coéquipiers."
+ "description": "Un espace partagé au sein d'un workspace. Une ou plusieurs équipes y donnent accès."
},
"contents": "Chaque espace peut contenir des dossiers et des notes.",
"done": "Compris",
diff --git a/src/locales/it/translation.json b/src/locales/it/translation.json
index 115eee815..941bb7d08 100644
--- a/src/locales/it/translation.json
+++ b/src/locales/it/translation.json
@@ -1872,15 +1872,30 @@
}
},
"teams": {
- "title": "Spazi del team",
- "description": "Organizza cartelle e note condivise per membri selezionati dell'area di lavoro.",
- "new": "Nuovo spazio del team",
- "empty": "Ancora nessuno spazio del team.",
- "createFirst": "Crea il tuo primo spazio del team",
- "createTitle": "Crea spazio del team",
- "nameLabel": "Nome dello spazio del team",
+ "title": "Team",
+ "description": "Gruppi di membri del workspace che concedono l'accesso agli spazi di team.",
+ "new": "Nuovo team",
+ "empty": "Ancora nessun team.",
+ "createFirst": "Crea il tuo primo team",
+ "createTitle": "Crea team",
+ "nameLabel": "Nome del team",
"memberCount_one": "{{count}} membro",
- "memberCount_other": "{{count}} membri"
+ "memberCount_other": "{{count}} membri",
+ "membersButton": "Membri",
+ "backsSpaces_one": "Supporta {{count}} spazio",
+ "backsSpaces_other": "Supporta {{count}} spazi",
+ "couldNotCreate": "Impossibile creare il team",
+ "deleteConfirmTitle": "Eliminare {{team}}?",
+ "deleteConfirmDescription": "Questo archivia il team. I suoi membri perdono l'accesso che concedeva.",
+ "deleteConfirmBacksSpaces_one": "Questo team supporta {{count}} spazio. I suoi membri perderanno l'accesso concesso tramite esso.",
+ "deleteConfirmBacksSpaces_other": "Questo team supporta {{count}} spazi. I suoi membri perderanno l'accesso concesso tramite esso.",
+ "members": {
+ "title": "Membri di {{team}}",
+ "removeConfirm": "Rimuovere {{name}} da {{team}}?",
+ "leave": "Lascia il team",
+ "leaveConfirm": "Lasciare {{team}}?",
+ "leaveConfirmDescription": "Perderai l'accesso agli spazi supportati da questo team, a meno che un altro team non ti includa."
+ }
},
"invites": {
"title": "Inviti in sospeso",
@@ -2184,7 +2199,7 @@
"privateTooltip": "Solo tu puoi vedere il tuo spazio personale",
"newSpace": "Nuovo spazio del team",
"createTitle": "Crea spazio del team",
- "createDescription": "Un'area condivisa in un'area di lavoro per i membri selezionati del team.",
+ "createDescription": "Un'area condivisa all'interno di un workspace, supportata da uno o più team.",
"nameLabel": "Nome",
"emojiLabel": "Emoji",
"create": "Crea",
@@ -2195,7 +2210,7 @@
"deleteSpace": "Elimina spazio",
"deleteConfirmTitle": "Eliminare lo spazio?",
"deleteConfirmDescription": "Questo elimina definitivamente {{space}} con tutte le sue cartelle e note su questo dispositivo.",
- "deleteConfirmTeamDescription": "Questo elimina {{space}} per tutti. I membri perderanno l'accesso a tutte le sue cartelle e note.",
+ "deleteConfirmTeamDescription": "Questo elimina {{space}} per tutti. I suoi team restano, ma i membri perdono l'accesso a tutte le cartelle e note.",
"deleteTypeName": "Digita {{space}} per confermare",
"couldNotDelete": "Impossibile eliminare lo spazio",
"deleted": "{{space}} eliminato",
@@ -2229,8 +2244,6 @@
"conflictKeep": "Continua a modificare",
"editedBy": "Modificato da {{name}} · {{time}}",
"members": {
- "menu": "Membri…",
- "title": "Membri di {{space}}",
"addPeople": "Aggiungi persone",
"addFailed": "Impossibile aggiungere {{failed}} persone su {{total}}",
"searchPlaceholder": "Cerca persone…",
@@ -2239,15 +2252,29 @@
"remove": "Rimuovi",
"removeConfirm": "Rimuovere {{name}} da {{space}}?",
"removeConfirmDescription": "Questa persona perderà l'accesso a tutte le note di questo spazio.",
- "leave": "Abbandona lo spazio",
- "leaveConfirm": "Abbandonare {{space}}?",
- "leaveConfirmDescription": "Perderai l'accesso a tutte le note di questo spazio.",
- "implicitAdminCannotLeave": "I proprietari e gli amministratori dell'area di lavoro hanno accesso a tutti gli spazi del team e non possono abbandonarli.",
"inviteFooter": "Invita {{email}} nell'area di lavoro…",
"empty": "Nessuno è stato ancora aggiunto"
},
"invitedTo_one": "Entrerai in {{count}} spazio del team",
- "invitedTo_other": "Entrerai in {{count}} spazi del team"
+ "invitedTo_other": "Entrerai in {{count}} spazi del team",
+ "teamsMembers": {
+ "menu": "Team e membri…",
+ "title": "Team e membri di {{space}}",
+ "noTeams": "Nessun team supporta ancora questo spazio. Solo gli amministratori del workspace possono vederlo.",
+ "addTeam": "Aggiungi team…",
+ "removeTeamFromSpace": "Rimuovi dallo spazio",
+ "removeTeamConfirm": "Rimuovere {{team}} da {{space}}?",
+ "removeTeamConfirmDescription": "I suoi membri perderanno l'accesso a questo spazio, a meno che un altro team assegnato non li includa.",
+ "lastTeamWarning": "È l'unico team che supporta questo spazio. Dopo la rimozione, solo gli amministratori del workspace manterranno l'accesso.",
+ "affectsOtherSpaces_one": "Le modifiche a {{team}} si applicano anche a {{count}} altro spazio che supporta.",
+ "affectsOtherSpaces_other": "Le modifiche a {{team}} si applicano anche ad altri {{count}} spazi che supporta."
+ },
+ "teams": {
+ "assignLabel": "Team",
+ "newTeam": "Nuovo team",
+ "newTeamNameLabel": "Nome del team",
+ "loadError": "Impossibile caricare i team."
+ }
},
"structureIntro": {
"title": "Dove si trovano le tue note",
@@ -2262,7 +2289,7 @@
},
"teamSpace": {
"title": "Spazio del team",
- "description": "Un'area condivisa in un'area di lavoro per i membri selezionati del team."
+ "description": "Un'area condivisa all'interno di un workspace. Uno o più team ne concedono l'accesso."
},
"contents": "Ogni spazio può contenere cartelle e note.",
"done": "Ho capito",
diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.json
index a86cecab3..8d7ac10b1 100644
--- a/src/locales/ja/translation.json
+++ b/src/locales/ja/translation.json
@@ -1872,15 +1872,30 @@
}
},
"teams": {
- "title": "チームスペース",
- "description": "ワークスペース内の選択したメンバーと共有するフォルダーやノートを整理します。",
- "new": "新しいチームスペース",
- "empty": "チームスペースはまだありません。",
- "createFirst": "最初のチームスペースを作成",
- "createTitle": "チームスペースを作成",
- "nameLabel": "チームスペース名",
+ "title": "チーム",
+ "description": "チームスペースへのアクセスを付与するワークスペースメンバーのグループ。",
+ "new": "新しいチーム",
+ "empty": "チームはまだありません。",
+ "createFirst": "最初のチームを作成",
+ "createTitle": "チームを作成",
+ "nameLabel": "チーム名",
"memberCount_one": "{{count}}人のメンバー",
- "memberCount_other": "{{count}}人のメンバー"
+ "memberCount_other": "{{count}}人のメンバー",
+ "membersButton": "メンバー",
+ "backsSpaces_one": "{{count}} 件のスペースを支えています",
+ "backsSpaces_other": "{{count}} 件のスペースを支えています",
+ "couldNotCreate": "チームを作成できませんでした",
+ "deleteConfirmTitle": "{{team}} を削除しますか?",
+ "deleteConfirmDescription": "チームをアーカイブします。このチームが付与していたアクセスは失われます。",
+ "deleteConfirmBacksSpaces_one": "このチームは {{count}} 件のスペースを支えています。メンバーはこのチーム経由のアクセスを失います。",
+ "deleteConfirmBacksSpaces_other": "このチームは {{count}} 件のスペースを支えています。メンバーはこのチーム経由のアクセスを失います。",
+ "members": {
+ "title": "{{team}} のメンバー",
+ "removeConfirm": "{{name}} を {{team}} から外しますか?",
+ "leave": "チームから退出",
+ "leaveConfirm": "{{team}} から退出しますか?",
+ "leaveConfirmDescription": "他のチームに含まれていない限り、このチームが支えるスペースへのアクセスを失います。"
+ }
},
"invites": {
"title": "保留中の招待",
@@ -2112,7 +2127,7 @@
"privateTooltip": "パーソナルスペースはあなただけが見られます",
"newSpace": "新しいチームスペース",
"createTitle": "チームスペースを作成",
- "createDescription": "選択したチームメンバーのための、ワークスペース内の共有エリアです。",
+ "createDescription": "ワークスペース内の共有エリアで、1つ以上のチームによって支えられます。",
"nameLabel": "名前",
"emojiLabel": "絵文字",
"create": "作成",
@@ -2123,7 +2138,7 @@
"deleteSpace": "スペースを削除",
"deleteConfirmTitle": "スペースを削除しますか?",
"deleteConfirmDescription": "{{space}}とそのすべてのフォルダとノートがこのデバイスから完全に削除されます。",
- "deleteConfirmTeamDescription": "{{space}} が全員に対して削除されます。メンバーはそのすべてのフォルダとノートにアクセスできなくなります。",
+ "deleteConfirmTeamDescription": "{{space}} を全員に対して削除します。チームは残りますが、メンバーはすべてのフォルダーとノートへのアクセスを失います。",
"deleteTypeName": "確認のため {{space}} と入力してください",
"couldNotDelete": "スペースを削除できませんでした",
"deleted": "{{space}} を削除しました",
@@ -2157,8 +2172,6 @@
"conflictKeep": "編集を続ける",
"editedBy": "{{name}} が編集 · {{time}}",
"members": {
- "menu": "メンバー…",
- "title": "{{space}} のメンバー",
"addPeople": "メンバーを追加",
"addFailed": "{{total}}人中{{failed}}人を追加できませんでした",
"searchPlaceholder": "メンバーを検索…",
@@ -2167,15 +2180,29 @@
"remove": "削除",
"removeConfirm": "{{name}} を {{space}} から削除しますか?",
"removeConfirmDescription": "このスペースのすべてのノートにアクセスできなくなります。",
- "leave": "スペースから退出",
- "leaveConfirm": "{{space}} から退出しますか?",
- "leaveConfirmDescription": "このスペースのすべてのノートにアクセスできなくなります。",
- "implicitAdminCannotLeave": "ワークスペースのオーナーと管理者はすべてのチームスペースにアクセスできるため、退出できません。",
"inviteFooter": "{{email}} をワークスペースに招待…",
"empty": "まだ誰も追加されていません"
},
"invitedTo_one": "{{count}} 件のチームスペースに参加します",
- "invitedTo_other": "{{count}} 件のチームスペースに参加します"
+ "invitedTo_other": "{{count}} 件のチームスペースに参加します",
+ "teamsMembers": {
+ "menu": "チームとメンバー…",
+ "title": "{{space}} のチームとメンバー",
+ "noTeams": "このスペースを支えるチームはまだありません。ワークスペース管理者のみが閲覧できます。",
+ "addTeam": "チームを追加…",
+ "removeTeamFromSpace": "スペースから外す",
+ "removeTeamConfirm": "{{team}} を {{space}} から外しますか?",
+ "removeTeamConfirmDescription": "他の割り当て済みチームに含まれていない限り、そのメンバーはこのスペースへのアクセスを失います。",
+ "lastTeamWarning": "このスペースを支える唯一のチームです。外すと、ワークスペース管理者のみがアクセスを保持します。",
+ "affectsOtherSpaces_one": "{{team}} への変更は、このチームが支える他 {{count}} 件のスペースにも適用されます。",
+ "affectsOtherSpaces_other": "{{team}} への変更は、このチームが支える他 {{count}} 件のスペースにも適用されます。"
+ },
+ "teams": {
+ "assignLabel": "チーム",
+ "newTeam": "新しいチーム",
+ "newTeamNameLabel": "チーム名",
+ "loadError": "チームを読み込めませんでした。"
+ }
},
"structureIntro": {
"title": "ノートの保存場所",
@@ -2190,7 +2217,7 @@
},
"teamSpace": {
"title": "チームスペース",
- "description": "選択したチームメンバーのための、ワークスペース内の共有エリアです。"
+ "description": "ワークスペース内の共有エリア。1つ以上のチームがアクセスを付与します。"
},
"contents": "各スペースにはフォルダーとノートを作成できます。",
"done": "了解",
diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
index fa29bb0e5..0db604a10 100644
--- a/src/locales/pt/translation.json
+++ b/src/locales/pt/translation.json
@@ -1851,15 +1851,30 @@
}
},
"teams": {
- "title": "Espaços de equipe",
- "description": "Organize pastas e notas compartilhadas para membros selecionados do espaço de trabalho.",
- "new": "Novo espaço de equipe",
- "empty": "Ainda não há espaços de equipe.",
- "createFirst": "Crie seu primeiro espaço de equipe",
- "createTitle": "Criar espaço de equipe",
- "nameLabel": "Nome do espaço de equipe",
+ "title": "Equipes",
+ "description": "Grupos de membros do workspace que concedem acesso a espaços de equipe.",
+ "new": "Nova equipe",
+ "empty": "Nenhuma equipe ainda.",
+ "createFirst": "Crie sua primeira equipe",
+ "createTitle": "Criar equipe",
+ "nameLabel": "Nome da equipe",
"memberCount_one": "{{count}} membro",
- "memberCount_other": "{{count}} membros"
+ "memberCount_other": "{{count}} membros",
+ "membersButton": "Membros",
+ "backsSpaces_one": "Sustenta {{count}} espaço",
+ "backsSpaces_other": "Sustenta {{count}} espaços",
+ "couldNotCreate": "Não foi possível criar a equipe",
+ "deleteConfirmTitle": "Excluir {{team}}?",
+ "deleteConfirmDescription": "Isso arquiva a equipe. Seus membros perdem o acesso que ela concedia.",
+ "deleteConfirmBacksSpaces_one": "Esta equipe sustenta {{count}} espaço. Seus membros perderão o acesso concedido por meio dela.",
+ "deleteConfirmBacksSpaces_other": "Esta equipe sustenta {{count}} espaços. Seus membros perderão o acesso concedido por meio dela.",
+ "members": {
+ "title": "Membros de {{team}}",
+ "removeConfirm": "Remover {{name}} de {{team}}?",
+ "leave": "Sair da equipe",
+ "leaveConfirm": "Sair de {{team}}?",
+ "leaveConfirmDescription": "Você perderá o acesso aos espaços que esta equipe sustenta, a menos que outra equipe o inclua."
+ }
},
"invites": {
"title": "Convites pendentes",
@@ -2184,7 +2199,7 @@
"privateTooltip": "Somente você pode ver seu espaço pessoal",
"newSpace": "Novo espaço de equipe",
"createTitle": "Criar espaço de equipe",
- "createDescription": "Uma área compartilhada dentro de um espaço de trabalho para colegas selecionados.",
+ "createDescription": "Uma área compartilhada dentro de um workspace, sustentada por uma ou mais equipes.",
"nameLabel": "Nome",
"emojiLabel": "Emoji",
"create": "Criar",
@@ -2195,7 +2210,7 @@
"deleteSpace": "Excluir espaço",
"deleteConfirmTitle": "Excluir espaço?",
"deleteConfirmDescription": "Isso exclui permanentemente {{space}} com todas as suas pastas e notas neste dispositivo.",
- "deleteConfirmTeamDescription": "Isso exclui {{space}} para todos. Os membros perderão o acesso a todas as suas pastas e notas.",
+ "deleteConfirmTeamDescription": "Isso exclui {{space}} para todos. Suas equipes permanecem, mas os membros perdem o acesso a todas as pastas e notas.",
"deleteTypeName": "Digite {{space}} para confirmar",
"couldNotDelete": "Não foi possível excluir o espaço",
"deleted": "{{space}} excluído",
@@ -2229,8 +2244,6 @@
"conflictKeep": "Continuar editando",
"editedBy": "Editado por {{name}} · {{time}}",
"members": {
- "menu": "Membros…",
- "title": "Membros de {{space}}",
"addPeople": "Adicionar pessoas",
"addFailed": "Não foi possível adicionar {{failed}} de {{total}} pessoas",
"searchPlaceholder": "Pesquisar pessoas…",
@@ -2239,15 +2252,29 @@
"remove": "Remover",
"removeConfirm": "Remover {{name}} de {{space}}?",
"removeConfirmDescription": "A pessoa perderá o acesso a todas as notas deste espaço.",
- "leave": "Sair do espaço",
- "leaveConfirm": "Sair de {{space}}?",
- "leaveConfirmDescription": "Você perderá o acesso a todas as notas deste espaço.",
- "implicitAdminCannotLeave": "Proprietários e administradores do espaço de trabalho têm acesso a todos os espaços de equipe e não podem sair deles.",
"inviteFooter": "Convidar {{email}} para o espaço de trabalho…",
"empty": "Ninguém foi adicionado ainda"
},
"invitedTo_one": "Você entrará em {{count}} espaço de equipe",
- "invitedTo_other": "Você entrará em {{count}} espaços de equipe"
+ "invitedTo_other": "Você entrará em {{count}} espaços de equipe",
+ "teamsMembers": {
+ "menu": "Equipes e membros…",
+ "title": "Equipes e membros de {{space}}",
+ "noTeams": "Nenhuma equipe sustenta este espaço ainda. Apenas administradores do workspace podem vê-lo.",
+ "addTeam": "Adicionar equipe…",
+ "removeTeamFromSpace": "Remover do espaço",
+ "removeTeamConfirm": "Remover {{team}} de {{space}}?",
+ "removeTeamConfirmDescription": "Seus membros perderão o acesso a este espaço, a menos que outra equipe atribuída os inclua.",
+ "lastTeamWarning": "Esta é a única equipe que sustenta este espaço. Após removê-la, apenas administradores do workspace mantêm o acesso.",
+ "affectsOtherSpaces_one": "Alterações em {{team}} também se aplicam a {{count}} outro espaço que ela sustenta.",
+ "affectsOtherSpaces_other": "Alterações em {{team}} também se aplicam a {{count}} outros espaços que ela sustenta."
+ },
+ "teams": {
+ "assignLabel": "Equipes",
+ "newTeam": "Nova equipe",
+ "newTeamNameLabel": "Nome da equipe",
+ "loadError": "Não foi possível carregar as equipes."
+ }
},
"structureIntro": {
"title": "Onde ficam suas notas",
@@ -2262,7 +2289,7 @@
},
"teamSpace": {
"title": "Espaço de equipe",
- "description": "Uma área compartilhada dentro de um espaço de trabalho para colegas selecionados."
+ "description": "Uma área compartilhada dentro de um workspace. Uma ou mais equipes concedem acesso a ela."
},
"contents": "Cada espaço pode conter pastas e notas.",
"done": "Entendi",
diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.json
index be7726628..ce1f239dd 100644
--- a/src/locales/ru/translation.json
+++ b/src/locales/ru/translation.json
@@ -1872,17 +1872,36 @@
}
},
"teams": {
- "title": "Командные пространства",
- "description": "Организуйте общие папки и заметки для выбранных участников рабочего пространства.",
- "new": "Новое командное пространство",
- "empty": "Командных пространств пока нет.",
- "createFirst": "Создайте первое командное пространство",
- "createTitle": "Создать командное пространство",
- "nameLabel": "Название командного пространства",
+ "title": "Команды",
+ "description": "Группы участников рабочего пространства, дающие доступ к командным пространствам.",
+ "new": "Новая команда",
+ "empty": "Команд пока нет.",
+ "createFirst": "Создайте первую команду",
+ "createTitle": "Создать команду",
+ "nameLabel": "Название команды",
"memberCount_one": "{{count}} участник",
"memberCount_few": "{{count}} участника",
"memberCount_many": "{{count}} участников",
- "memberCount_other": "{{count}} участника"
+ "memberCount_other": "{{count}} участника",
+ "membersButton": "Участники",
+ "backsSpaces_one": "Поддерживает {{count}} пространство",
+ "backsSpaces_few": "Поддерживает {{count}} пространства",
+ "backsSpaces_many": "Поддерживает {{count}} пространств",
+ "backsSpaces_other": "Поддерживает {{count}} пространства",
+ "couldNotCreate": "Не удалось создать команду",
+ "deleteConfirmTitle": "Удалить {{team}}?",
+ "deleteConfirmDescription": "Команда будет архивирована. Её участники потеряют предоставленный ею доступ.",
+ "deleteConfirmBacksSpaces_one": "Эта команда поддерживает {{count}} пространство. Её участники потеряют доступ, предоставленный через неё.",
+ "deleteConfirmBacksSpaces_few": "Эта команда поддерживает {{count}} пространства. Её участники потеряют доступ, предоставленный через неё.",
+ "deleteConfirmBacksSpaces_many": "Эта команда поддерживает {{count}} пространств. Её участники потеряют доступ, предоставленный через неё.",
+ "deleteConfirmBacksSpaces_other": "Эта команда поддерживает {{count}} пространства. Её участники потеряют доступ, предоставленный через неё.",
+ "members": {
+ "title": "Участники {{team}}",
+ "removeConfirm": "Убрать {{name}} из {{team}}?",
+ "leave": "Покинуть команду",
+ "leaveConfirm": "Покинуть {{team}}?",
+ "leaveConfirmDescription": "Вы потеряете доступ к пространствам этой команды, если вас не включает другая команда."
+ }
},
"invites": {
"title": "Ожидающие приглашения",
@@ -2188,7 +2207,7 @@
"privateTooltip": "Только вы видите своё личное пространство",
"newSpace": "Новое командное пространство",
"createTitle": "Создать командное пространство",
- "createDescription": "Общая область внутри рабочего пространства для выбранных коллег.",
+ "createDescription": "Общая область внутри рабочего пространства, поддерживаемая одной или несколькими командами.",
"nameLabel": "Название",
"emojiLabel": "Эмодзи",
"create": "Создать",
@@ -2199,7 +2218,7 @@
"deleteSpace": "Удалить пространство",
"deleteConfirmTitle": "Удалить пространство?",
"deleteConfirmDescription": "Пространство {{space}} со всеми его папками и заметками будет безвозвратно удалено с этого устройства.",
- "deleteConfirmTeamDescription": "Это удалит {{space}} для всех. Участники потеряют доступ ко всем его папкам и заметкам.",
+ "deleteConfirmTeamDescription": "Это удалит {{space}} для всех. Команды сохранятся, но участники потеряют доступ ко всем папкам и заметкам.",
"deleteTypeName": "Введите {{space}} для подтверждения",
"couldNotDelete": "Не удалось удалить пространство",
"deleted": "{{space}} удалено",
@@ -2235,8 +2254,6 @@
"conflictKeep": "Продолжить редактирование",
"editedBy": "Изменено: {{name}} · {{time}}",
"members": {
- "menu": "Участники…",
- "title": "Участники {{space}}",
"addPeople": "Добавить людей",
"addFailed": "Не удалось добавить {{failed}} из {{total}} участников",
"searchPlaceholder": "Поиск людей…",
@@ -2245,17 +2262,33 @@
"remove": "Удалить",
"removeConfirm": "Удалить {{name}} из {{space}}?",
"removeConfirmDescription": "Этот участник потеряет доступ ко всем заметкам этого пространства.",
- "leave": "Покинуть пространство",
- "leaveConfirm": "Покинуть {{space}}?",
- "leaveConfirmDescription": "Вы потеряете доступ ко всем заметкам этого пространства.",
- "implicitAdminCannotLeave": "Владельцы и администраторы рабочего пространства имеют доступ ко всем командным пространствам и не могут их покинуть.",
"inviteFooter": "Пригласить {{email}} в рабочее пространство…",
"empty": "Пока никто не добавлен"
},
"invitedTo_one": "Вы присоединитесь к {{count}} командному пространству",
"invitedTo_few": "Вы присоединитесь к {{count}} командным пространствам",
"invitedTo_many": "Вы присоединитесь к {{count}} командным пространствам",
- "invitedTo_other": "Вы присоединитесь к {{count}} командным пространствам"
+ "invitedTo_other": "Вы присоединитесь к {{count}} командным пространствам",
+ "teamsMembers": {
+ "menu": "Команды и участники…",
+ "title": "Команды и участники {{space}}",
+ "noTeams": "К этому пространству пока не привязана ни одна команда. Его видят только администраторы рабочего пространства.",
+ "addTeam": "Добавить команду…",
+ "removeTeamFromSpace": "Убрать из пространства",
+ "removeTeamConfirm": "Убрать {{team}} из {{space}}?",
+ "removeTeamConfirmDescription": "Её участники потеряют доступ к этому пространству, если их не включает другая привязанная команда.",
+ "lastTeamWarning": "Это единственная команда этого пространства. После удаления доступ сохранят только администраторы рабочего пространства.",
+ "affectsOtherSpaces_one": "Изменения в {{team}} также применяются к {{count}} другому пространству, которое она поддерживает.",
+ "affectsOtherSpaces_few": "Изменения в {{team}} также применяются к {{count}} другим пространствам, которые она поддерживает.",
+ "affectsOtherSpaces_many": "Изменения в {{team}} также применяются к {{count}} другим пространствам, которые она поддерживает.",
+ "affectsOtherSpaces_other": "Изменения в {{team}} также применяются к {{count}} другим пространствам, которые она поддерживает."
+ },
+ "teams": {
+ "assignLabel": "Команды",
+ "newTeam": "Новая команда",
+ "newTeamNameLabel": "Название команды",
+ "loadError": "Не удалось загрузить команды."
+ }
},
"structureIntro": {
"title": "Где находятся ваши заметки",
@@ -2270,7 +2303,7 @@
},
"teamSpace": {
"title": "Командное пространство",
- "description": "Общая область внутри рабочего пространства для выбранных коллег."
+ "description": "Общая область внутри рабочего пространства. Доступ к ней предоставляют одна или несколько команд."
},
"contents": "В каждом пространстве могут быть папки и заметки.",
"done": "Понятно",
diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.json
index 6413d0096..297ab585a 100644
--- a/src/locales/zh-CN/translation.json
+++ b/src/locales/zh-CN/translation.json
@@ -1872,15 +1872,30 @@
}
},
"teams": {
- "title": "团队空间",
- "description": "为工作区中的指定成员整理共享文件夹和笔记。",
- "new": "新建团队空间",
- "empty": "暂无团队空间。",
- "createFirst": "创建您的第一个团队空间",
- "createTitle": "创建团队空间",
- "nameLabel": "团队空间名称",
+ "title": "团队",
+ "description": "授予团队空间访问权限的工作区成员分组。",
+ "new": "新建团队",
+ "empty": "还没有团队。",
+ "createFirst": "创建你的第一个团队",
+ "createTitle": "创建团队",
+ "nameLabel": "团队名称",
"memberCount_one": "{{count}} 名成员",
- "memberCount_other": "{{count}} 名成员"
+ "memberCount_other": "{{count}} 名成员",
+ "membersButton": "成员",
+ "backsSpaces_one": "支持 {{count}} 个空间",
+ "backsSpaces_other": "支持 {{count}} 个空间",
+ "couldNotCreate": "无法创建团队",
+ "deleteConfirmTitle": "删除 {{team}}?",
+ "deleteConfirmDescription": "这将归档该团队。其成员将失去它授予的访问权限。",
+ "deleteConfirmBacksSpaces_one": "该团队支持 {{count}} 个空间。其成员将失去通过它获得的访问权限。",
+ "deleteConfirmBacksSpaces_other": "该团队支持 {{count}} 个空间。其成员将失去通过它获得的访问权限。",
+ "members": {
+ "title": "{{team}} 的成员",
+ "removeConfirm": "将 {{name}} 从 {{team}} 移除?",
+ "leave": "退出团队",
+ "leaveConfirm": "退出 {{team}}?",
+ "leaveConfirmDescription": "除非其他团队包含你,否则你将失去对该团队支持的空间的访问权限。"
+ }
},
"invites": {
"title": "待处理的邀请",
@@ -2184,7 +2199,7 @@
"privateTooltip": "只有你可以看到你的个人空间",
"newSpace": "新建团队空间",
"createTitle": "创建团队空间",
- "createDescription": "工作区内供指定团队成员使用的共享区域。",
+ "createDescription": "工作区内的共享区域,由一个或多个团队支持。",
"nameLabel": "名称",
"emojiLabel": "表情符号",
"create": "创建",
@@ -2195,7 +2210,7 @@
"deleteSpace": "删除空间",
"deleteConfirmTitle": "删除空间?",
"deleteConfirmDescription": "这将从此设备永久删除 {{space}} 及其所有文件夹和笔记。",
- "deleteConfirmTeamDescription": "这将为所有人删除 {{space}}。成员将无法再访问其所有文件夹和笔记。",
+ "deleteConfirmTeamDescription": "这将为所有人删除 {{space}}。团队会保留,但成员将失去对其所有文件夹和笔记的访问权限。",
"deleteTypeName": "输入 {{space}} 以确认",
"couldNotDelete": "无法删除空间",
"deleted": "已删除 {{space}}",
@@ -2229,8 +2244,6 @@
"conflictKeep": "继续编辑",
"editedBy": "由 {{name}} 编辑 · {{time}}",
"members": {
- "menu": "成员…",
- "title": "{{space}} 的成员",
"addPeople": "添加成员",
"addFailed": "{{total}} 人中有 {{failed}} 人无法添加",
"searchPlaceholder": "搜索成员…",
@@ -2239,15 +2252,29 @@
"remove": "移除",
"removeConfirm": "将 {{name}} 从 {{space}} 中移除?",
"removeConfirmDescription": "对方将无法再访问此空间的所有笔记。",
- "leave": "退出空间",
- "leaveConfirm": "退出 {{space}}?",
- "leaveConfirmDescription": "你将无法再访问此空间的所有笔记。",
- "implicitAdminCannotLeave": "工作区所有者和管理员可以访问所有团队空间,无法退出。",
"inviteFooter": "邀请 {{email}} 加入工作区…",
"empty": "尚未添加任何成员"
},
"invitedTo_one": "你将加入 {{count}} 个团队空间",
- "invitedTo_other": "你将加入 {{count}} 个团队空间"
+ "invitedTo_other": "你将加入 {{count}} 个团队空间",
+ "teamsMembers": {
+ "menu": "团队与成员…",
+ "title": "{{space}} 的团队与成员",
+ "noTeams": "此空间尚无团队支持。只有工作区管理员可以看到它。",
+ "addTeam": "添加团队…",
+ "removeTeamFromSpace": "从空间移除",
+ "removeTeamConfirm": "将 {{team}} 从 {{space}} 移除?",
+ "removeTeamConfirmDescription": "除非其他已分配的团队包含这些成员,否则他们将失去对此空间的访问权限。",
+ "lastTeamWarning": "这是支持此空间的唯一团队。移除后,只有工作区管理员保留访问权限。",
+ "affectsOtherSpaces_one": "对 {{team}} 的更改也会应用到它支持的另外 {{count}} 个空间。",
+ "affectsOtherSpaces_other": "对 {{team}} 的更改也会应用到它支持的另外 {{count}} 个空间。"
+ },
+ "teams": {
+ "assignLabel": "团队",
+ "newTeam": "新建团队",
+ "newTeamNameLabel": "团队名称",
+ "loadError": "无法加载团队。"
+ }
},
"structureIntro": {
"title": "笔记存放在哪里",
@@ -2262,7 +2289,7 @@
},
"teamSpace": {
"title": "团队空间",
- "description": "工作区内供指定团队成员使用的共享区域。"
+ "description": "工作区内的共享区域。由一个或多个团队授予访问权限。"
},
"contents": "每个空间都可以包含文件夹和笔记。",
"done": "知道了",
diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.json
index d0f76fd74..52f0624bc 100644
--- a/src/locales/zh-TW/translation.json
+++ b/src/locales/zh-TW/translation.json
@@ -1872,15 +1872,30 @@
}
},
"teams": {
- "title": "團隊空間",
- "description": "為工作區中的指定成員整理共享資料夾和筆記。",
- "new": "新增團隊空間",
- "empty": "尚無團隊空間。",
- "createFirst": "建立您的第一個團隊空間",
- "createTitle": "建立團隊空間",
- "nameLabel": "團隊空間名稱",
+ "title": "團隊",
+ "description": "授予團隊空間存取權的工作區成員群組。",
+ "new": "新增團隊",
+ "empty": "還沒有團隊。",
+ "createFirst": "建立你的第一個團隊",
+ "createTitle": "建立團隊",
+ "nameLabel": "團隊名稱",
"memberCount_one": "{{count}} 位成員",
- "memberCount_other": "{{count}} 位成員"
+ "memberCount_other": "{{count}} 位成員",
+ "membersButton": "成員",
+ "backsSpaces_one": "支持 {{count}} 個空間",
+ "backsSpaces_other": "支持 {{count}} 個空間",
+ "couldNotCreate": "無法建立團隊",
+ "deleteConfirmTitle": "刪除 {{team}}?",
+ "deleteConfirmDescription": "這將封存該團隊。其成員將失去它授予的存取權。",
+ "deleteConfirmBacksSpaces_one": "該團隊支持 {{count}} 個空間。其成員將失去透過它取得的存取權。",
+ "deleteConfirmBacksSpaces_other": "該團隊支持 {{count}} 個空間。其成員將失去透過它取得的存取權。",
+ "members": {
+ "title": "{{team}} 的成員",
+ "removeConfirm": "將 {{name}} 從 {{team}} 移除?",
+ "leave": "退出團隊",
+ "leaveConfirm": "退出 {{team}}?",
+ "leaveConfirmDescription": "除非其他團隊包含你,否則你將失去該團隊支持空間的存取權。"
+ }
},
"invites": {
"title": "待處理的邀請",
@@ -2184,7 +2199,7 @@
"privateTooltip": "只有你可以看到你的個人空間",
"newSpace": "新增團隊空間",
"createTitle": "建立團隊空間",
- "createDescription": "工作區內供指定團隊成員使用的共享區域。",
+ "createDescription": "工作區內的共享區域,由一個或多個團隊支持。",
"nameLabel": "名稱",
"emojiLabel": "表情符號",
"create": "建立",
@@ -2195,7 +2210,7 @@
"deleteSpace": "刪除空間",
"deleteConfirmTitle": "刪除空間?",
"deleteConfirmDescription": "這會從此裝置永久刪除 {{space}} 及其所有資料夾和筆記。",
- "deleteConfirmTeamDescription": "這會為所有人刪除 {{space}}。成員將無法再存取其所有資料夾和筆記。",
+ "deleteConfirmTeamDescription": "這將為所有人刪除 {{space}}。團隊會保留,但成員將失去其所有資料夾與筆記的存取權。",
"deleteTypeName": "輸入 {{space}} 以確認",
"couldNotDelete": "無法刪除空間",
"deleted": "已刪除 {{space}}",
@@ -2229,8 +2244,6 @@
"conflictKeep": "繼續編輯",
"editedBy": "由 {{name}} 編輯 · {{time}}",
"members": {
- "menu": "成員…",
- "title": "{{space}} 的成員",
"addPeople": "新增成員",
"addFailed": "{{total}} 人中有 {{failed}} 人無法加入",
"searchPlaceholder": "搜尋成員…",
@@ -2239,15 +2252,29 @@
"remove": "移除",
"removeConfirm": "要將 {{name}} 從 {{space}} 移除嗎?",
"removeConfirmDescription": "對方將無法再存取此空間的所有筆記。",
- "leave": "退出空間",
- "leaveConfirm": "要退出 {{space}} 嗎?",
- "leaveConfirmDescription": "你將無法再存取此空間的所有筆記。",
- "implicitAdminCannotLeave": "工作區擁有者和管理員可以存取所有團隊空間,無法退出。",
"inviteFooter": "邀請 {{email}} 加入工作區…",
"empty": "尚未新增任何成員"
},
"invitedTo_one": "你將加入 {{count}} 個團隊空間",
- "invitedTo_other": "你將加入 {{count}} 個團隊空間"
+ "invitedTo_other": "你將加入 {{count}} 個團隊空間",
+ "teamsMembers": {
+ "menu": "團隊與成員…",
+ "title": "{{space}} 的團隊與成員",
+ "noTeams": "此空間尚無團隊支持。只有工作區管理員可以看到它。",
+ "addTeam": "新增團隊…",
+ "removeTeamFromSpace": "從空間移除",
+ "removeTeamConfirm": "將 {{team}} 從 {{space}} 移除?",
+ "removeTeamConfirmDescription": "除非其他已指派的團隊包含這些成員,否則他們將失去此空間的存取權。",
+ "lastTeamWarning": "這是支持此空間的唯一團隊。移除後,只有工作區管理員保留存取權。",
+ "affectsOtherSpaces_one": "對 {{team}} 的變更也會套用到它支持的另外 {{count}} 個空間。",
+ "affectsOtherSpaces_other": "對 {{team}} 的變更也會套用到它支持的另外 {{count}} 個空間。"
+ },
+ "teams": {
+ "assignLabel": "團隊",
+ "newTeam": "新增團隊",
+ "newTeamNameLabel": "團隊名稱",
+ "loadError": "無法載入團隊。"
+ }
},
"structureIntro": {
"title": "筆記存放在哪裡",
@@ -2262,7 +2289,7 @@
},
"teamSpace": {
"title": "團隊空間",
- "description": "工作區內供指定團隊成員使用的共享區域。"
+ "description": "工作區內的共享區域。由一個或多個團隊授予存取權。"
},
"contents": "每個空間都可以包含資料夾和筆記。",
"done": "知道了",
diff --git a/src/services/FoldersService.ts b/src/services/FoldersService.ts
index 6ccdd3041..5732003f8 100644
--- a/src/services/FoldersService.ts
+++ b/src/services/FoldersService.ts
@@ -6,7 +6,7 @@ interface FolderInput {
is_default?: boolean;
sort_order?: number;
workspace_id?: string | null;
- team_id?: string | null;
+ space_id?: string | null;
}
interface CloudFolder {
@@ -16,9 +16,9 @@ interface CloudFolder {
is_default: boolean;
sort_order: number;
workspace_id: string | null;
- team_id: string | null;
- previous_team_id?: string | null;
- // Redacted stub for a row that moved out of one of the caller's teams —
+ space_id: string | null;
+ previous_space_id?: string | null;
+ // Redacted stub for a row that moved out of one of the caller's spaces —
// only id/client_folder_id/scope/updated_at are present.
access_removed?: boolean;
deleted_at: string | null;
diff --git a/src/services/NotesService.ts b/src/services/NotesService.ts
index 5d85709f5..a763f6271 100644
--- a/src/services/NotesService.ts
+++ b/src/services/NotesService.ts
@@ -4,7 +4,7 @@ import { buildNotesListPath } from "./noteListQuery";
interface NoteInput {
client_note_id?: string;
workspace_id?: string | null;
- team_id?: string | null;
+ space_id?: string | null;
title?: string | null;
content?: string;
enhanced_content?: string | null;
@@ -41,10 +41,10 @@ export interface CloudNote {
diarization_enabled: number | null;
expected_speaker_count: number | null;
workspace_id: string | null;
- team_id: string | null;
+ space_id: string | null;
updated_by_user_id: string | null;
- previous_team_id?: string | null;
- // Redacted stub for a row that moved out of one of the caller's teams —
+ previous_space_id?: string | null;
+ // Redacted stub for a row that moved out of one of the caller's spaces —
// only id/client_note_id/scope/updated_at are present.
access_removed?: boolean;
deleted_at: string | null;
@@ -103,19 +103,19 @@ async function deleteAll(): Promise<{ deleted: number; errors: number }> {
return { deleted: results.length - errors, errors };
}
-// scope "all" opts into team results (legacy clients stay personal-only);
-// team_id narrows to a single team and takes precedence over scope.
+// scope "all" opts into space results (legacy clients stay personal-only);
+// space_id narrows to a single space and takes precedence over scope.
async function search(
query: string,
limit?: number,
scope?: "all",
- teamId?: string
+ spaceId?: string
): Promise<{ notes: SearchResult[] }> {
return cloudPost<{ notes: SearchResult[] }>("/api/notes/search", {
query,
...(limit !== undefined ? { limit } : {}),
...(scope !== undefined ? { scope } : {}),
- ...(teamId !== undefined ? { team_id: teamId } : {}),
+ ...(spaceId !== undefined ? { space_id: spaceId } : {}),
});
}
diff --git a/src/services/SpacesService.ts b/src/services/SpacesService.ts
new file mode 100644
index 000000000..6fb7623f1
--- /dev/null
+++ b/src/services/SpacesService.ts
@@ -0,0 +1,77 @@
+import { cloudGet, cloudPost, cloudPatch, cloudDelete } from "./cloudApi.js";
+import type { SpaceTeamRef, TeamMember } from "../types/electron";
+
+interface DataWrap<T> {
+ data: T;
+}
+
+export interface MySpace {
+ id: string;
+ workspace_id: string;
+ name: string;
+ slug: string;
+ description: string | null;
+ emoji: string | null;
+ my_role: "admin" | "member";
+ member_count: number;
+ teams: SpaceTeamRef[];
+ created_at: string;
+ updated_at: string;
+}
+
+// Union roster entry: one row per user across all assigned teams, with
+// attribution of which team(s) grant the access.
+export interface SpaceMemberEntry extends TeamMember {
+ via_teams: { team_id: string; name: string; role: "admin" | "member" }[];
+}
+
+// Every space the caller can access across all their workspaces (member of any
+// assigned live team, or implicit workspace owner/admin). Drives the spaces
+// sync pass.
+async function mySpaces(): Promise<MySpace[]> {
+ const res = await cloudGet<DataWrap<MySpace[]>>("/api/me/spaces");
+ return res.data;
+}
+
+async function create(
+ workspaceId: string,
+ input: { name: string; emoji?: string | null; description?: string; team_ids: string[] }
+): Promise<MySpace> {
+ const res = await cloudPost<DataWrap<MySpace>>(`/api/workspaces/${workspaceId}/spaces`, input);
+ return res.data;
+}
+
+async function update(
+ spaceId: string,
+ patch: { name?: string; description?: string; emoji?: string | null }
+): Promise<MySpace> {
+ const res = await cloudPatch<DataWrap<MySpace>>(`/api/spaces/${spaceId}`, patch);
+ return res.data;
+}
+
+async function remove(spaceId: string): Promise<void> {
+ await cloudDelete(`/api/spaces/${spaceId}`);
+}
+
+async function assignTeam(spaceId: string, teamId: string): Promise<void> {
+ await cloudPost(`/api/spaces/${spaceId}/teams`, { team_id: teamId });
+}
+
+async function unassignTeam(spaceId: string, teamId: string): Promise<void> {
+ await cloudDelete(`/api/spaces/${spaceId}/teams/${teamId}`);
+}
+
+async function listMembers(spaceId: string): Promise<SpaceMemberEntry[]> {
+ const res = await cloudGet<DataWrap<SpaceMemberEntry[]>>(`/api/spaces/${spaceId}/members`);
+ return res.data;
+}
+
+export const SpacesService = {
+ mySpaces,
+ create,
+ update,
+ remove,
+ assignTeam,
+ unassignTeam,
+ listMembers,
+};
diff --git a/src/services/SyncService.ts b/src/services/SyncService.ts
index 9300c599b..579d747dc 100644
--- a/src/services/SyncService.ts
+++ b/src/services/SyncService.ts
@@ -8,7 +8,7 @@ import type {
import { NotesService, type CloudNote } from "./NotesService.js";
import { ConversationsService } from "./ConversationsService.js";
import { FoldersService } from "./FoldersService.js";
-import { TeamsService, type MyTeam } from "./TeamsService.js";
+import { SpacesService, type MySpace } from "./SpacesService.js";
import { TranscriptionsService } from "./TranscriptionsService.js";
import { DictionaryService } from "./DictionaryService.js";
import { SnippetService, type CloudSnippetEntry } from "./SnippetService.js";
@@ -39,13 +39,13 @@ function isFolderNameTakenError(err: unknown): boolean {
}
// Extra fields pushed with note/folder payloads so the server files rows into
-// the right team scope; `null` scope means the row must not push at all.
-type PushScopeFields = { workspace_id?: string | null; team_id?: string | null };
+// the right space scope; `null` scope means the row must not push at all.
+type PushScopeFields = { workspace_id?: string | null; space_id?: string | null };
-// Per-pull-pass mapping of cloud teams to local spaces.
+// Per-pull-pass mapping of cloud spaces to local spaces.
interface SpaceSyncContext {
byId: Map<number, SpaceItem>;
- byCloudTeamId: Map<string, SpaceItem>;
+ byCloudSpaceId: Map<string, SpaceItem>;
privateSpace: SpaceItem | null;
// Guard: at most one mid-pass spaces re-pull per pass.
refreshedSpaces: boolean;
@@ -81,25 +81,26 @@ function normalizeTimestamp(value: string | null | undefined): string {
}
// Cross-window guard against a space purge racing an in-flight pull: every
-// purge initiator records the cloud team id here, and pull/upsert paths park
-// rows for recently purged teams instead of resurrecting them as orphaned
+// purge initiator records the cloud space id here, and pull/upsert paths park
+// rows for recently purged spaces instead of resurrecting them as orphaned
// local rows nothing can ever clean up. Entries are pruned once a spaces pass
-// confirms the team is gone from /api/me/teams, or after a TTL so a failed
-// leave cannot hide a still-live team forever.
-const PURGED_TEAM_GUARD_KEY = "purgedTeamIds";
-const PURGED_TEAM_GUARD_TTL_MS = 15 * 60 * 1000;
+// confirms the space is gone from /api/me/spaces, or after a TTL so a failed
+// delete cannot hide a still-live space forever. Never marked on TEAM delete:
+// a space backed by other teams survives the team's archival.
+const PURGED_SPACE_GUARD_KEY = "purgedSpaceIds";
+const PURGED_SPACE_GUARD_TTL_MS = 15 * 60 * 1000;
// Serializes the guard's read-modify-write across windows: a prune inside a
-// sync pass racing a leave/delete in another window must not drop the
-// just-written entry.
-const PURGED_TEAM_GUARD_LOCK = "openwhispr-purged-teams";
+// sync pass racing a delete in another window must not drop the just-written
+// entry.
+const PURGED_SPACE_GUARD_LOCK = "openwhispr-purged-spaces";
-function readPurgedTeamIds(): Record<string, number> {
+export function readPurgedSpaceIds(): Record<string, number> {
try {
- const raw = localStorage.getItem(PURGED_TEAM_GUARD_KEY);
+ const raw = localStorage.getItem(PURGED_SPACE_GUARD_KEY);
const parsed = raw ? (JSON.parse(raw) as Record<string, number>) : {};
const now = Date.now();
return Object.fromEntries(
- Object.entries(parsed).filter(([, at]) => now - at < PURGED_TEAM_GUARD_TTL_MS)
+ Object.entries(parsed).filter(([, at]) => now - at < PURGED_SPACE_GUARD_TTL_MS)
);
} catch {
return {};
@@ -107,22 +108,22 @@ function readPurgedTeamIds(): Record<string, number> {
}
// Call BEFORE purgeSpace, from every purge path (sync revocation, sign-out,
-// and the UI's leave/delete-space flows).
-export async function markTeamSpacePurged(cloudTeamId: string): Promise<void> {
- await navigator.locks.request(PURGED_TEAM_GUARD_LOCK, () => {
+// and the UI's delete-space flow).
+export async function markSpacePurged(cloudSpaceId: string): Promise<void> {
+ await navigator.locks.request(PURGED_SPACE_GUARD_LOCK, () => {
localStorage.setItem(
- PURGED_TEAM_GUARD_KEY,
- JSON.stringify({ ...readPurgedTeamIds(), [cloudTeamId]: Date.now() })
+ PURGED_SPACE_GUARD_KEY,
+ JSON.stringify({ ...readPurgedSpaceIds(), [cloudSpaceId]: Date.now() })
);
});
}
-async function prunePurgedTeamIds(liveCloudTeamIds: Set<string>): Promise<void> {
- await navigator.locks.request(PURGED_TEAM_GUARD_LOCK, () => {
+async function prunePurgedSpaceIds(liveCloudSpaceIds: Set<string>): Promise<void> {
+ await navigator.locks.request(PURGED_SPACE_GUARD_LOCK, () => {
const kept = Object.fromEntries(
- Object.entries(readPurgedTeamIds()).filter(([id]) => liveCloudTeamIds.has(id))
+ Object.entries(readPurgedSpaceIds()).filter(([id]) => liveCloudSpaceIds.has(id))
);
- localStorage.setItem(PURGED_TEAM_GUARD_KEY, JSON.stringify(kept));
+ localStorage.setItem(PURGED_SPACE_GUARD_KEY, JSON.stringify(kept));
});
}
@@ -196,7 +197,7 @@ class SyncService {
for (const space of spaces) {
if (space.kind !== "team") continue;
try {
- if (space.cloud_team_id) await markTeamSpacePurged(space.cloud_team_id);
+ if (space.cloud_space_id) await markSpacePurged(space.cloud_space_id);
await window.electronAPI.purgeSpace?.(space.id);
} catch (err) {
console.error(`Purging space ${space.id} on sign-out failed:`, err);
@@ -211,8 +212,10 @@ class SyncService {
localStorage.removeItem("lastSyncedAt.notes.team");
localStorage.removeItem("lastSyncedAt.folders.team");
// The guard protected any pass still in flight during the purge; drop it
- // so the next account (possibly a member of the same teams) starts clean.
- localStorage.removeItem(PURGED_TEAM_GUARD_KEY);
+ // so the next account (possibly a member of the same spaces) starts clean.
+ localStorage.removeItem(PURGED_SPACE_GUARD_KEY);
+ // Pre-spaces guard key; stale entries are meaningless now.
+ localStorage.removeItem("purgedTeamIds");
// Both hold account-scoped/local numeric ids that collide across accounts.
localStorage.removeItem("activeWorkspaceId");
localStorage.removeItem("notesTree.expanded");
@@ -576,7 +579,7 @@ class SyncService {
}
// A push into a team must reach teammates fast; a pull may also carry
// their concurrent edits back (throttled like other ambient triggers).
- if (scope.team_id) this.requestSyncAll("team-push");
+ if (scope.space_id) this.requestSyncAll("team-push");
}
// Sharing requires a cloud copy. Deliberate single-note push that does not
@@ -634,14 +637,15 @@ class SyncService {
await window.electronAPI.markTranscriptionSynced?.(t.id, cloud.id);
}
- // Runs first in every pass: probes team-spaces availability, mirrors the
- // caller's teams into local spaces, purges spaces whose teams vanished
- // (deleted, archived, or membership revoked) and backfills new ones.
+ // Runs first in every pass: probes spaces availability, mirrors the caller's
+ // cloud spaces into local rows, purges spaces that vanished (deleted,
+ // archived, or every backing team's membership revoked) and backfills new
+ // ones.
private async syncSpaces(): Promise<boolean> {
if (!this.canSyncTeamSpaces()) return true;
- let teams: MyTeam[];
+ let cloudSpaces: MySpace[];
try {
- teams = await TeamsService.myTeams();
+ cloudSpaces = await SpacesService.mySpaces();
} catch (err) {
// 404 = endpoint not deployed yet (rollout probe): remember and skip
// silently so pulls and pushes stay personal-only until a probe succeeds.
@@ -649,24 +653,24 @@ class SyncService {
this.cacheTeamSpacesCapability(false);
return true;
}
- console.error("Teams fetch failed:", err);
+ console.error("Spaces fetch failed:", err);
return false;
}
this.cacheTeamSpacesCapability(true);
- const cloudIds = new Set(teams.map((t) => t.id));
- // Teams confirmed gone can no longer resurrect through pulls — their
+ const cloudIds = new Set(cloudSpaces.map((s) => s.id));
+ // Spaces confirmed gone can no longer resurrect through pulls — their
// purge-race guard entries are done.
- await prunePurgedTeamIds(cloudIds);
+ await prunePurgedSpaceIds(cloudIds);
const prior = (await window.electronAPI.getSpaces?.()) ?? [];
- const backfillIds = await this.upsertTeamSpaces(teams);
+ const backfillIds = await this.upsertCloudSpaces(cloudSpaces);
for (const space of prior) {
- if (space.kind !== "team" || !space.cloud_team_id || cloudIds.has(space.cloud_team_id)) {
+ if (space.kind !== "team" || !space.cloud_space_id || cloudIds.has(space.cloud_space_id)) {
continue;
}
- await markTeamSpacePurged(space.cloud_team_id);
+ await markSpacePurged(space.cloud_space_id);
const purged = await window.electronAPI.purgeSpace?.(space.id);
this.dispatchSpaceRevoked(space.name);
// Never-synced notes survive the purge in Personal (plan §10.6) —
@@ -677,7 +681,7 @@ class SyncService {
}
if (backfillIds.length > 0) {
- // scope=all returns pre-existing team rows only when `since` is unset,
+ // scope=all returns pre-existing space rows only when `since` is unset,
// so a full snapshot pull is the simplest correct backfill for a space
// that just appeared (v1). Spaces stay 'pending' until it completes so
// the tree shows skeletons — and so an interrupted backfill re-runs.
@@ -695,18 +699,18 @@ class SyncService {
return true;
}
- // Upserts cloud teams into local spaces. Returns local ids of spaces that
+ // Upserts cloud spaces into local rows. Returns local ids of spaces that
// still need a content backfill: brand new, or left 'pending' by a backfill
// that never finished.
- private async upsertTeamSpaces(teams: MyTeam[]): Promise<number[]> {
- const purged = readPurgedTeamIds();
+ private async upsertCloudSpaces(cloudSpaces: MySpace[]): Promise<number[]> {
+ const purged = readPurgedSpaceIds();
const backfillIds: number[] = [];
- for (const team of teams) {
- // A purge racing this pass (leave/delete just clicked, or the server
- // hasn't processed it yet) must not resurrect the space.
- if (purged[team.id]) continue;
+ for (const cloudSpace of cloudSpaces) {
+ // A purge racing this pass (delete just clicked, or the server hasn't
+ // processed it yet) must not resurrect the space.
+ if (purged[cloudSpace.id]) continue;
const space = await window.electronAPI.upsertSpaceFromCloud?.(
- team as unknown as Record<string, unknown>
+ cloudSpace as unknown as Record<string, unknown>
);
// New spaces insert as 'pending' and stay that way until their content
// backfill completes, so an interruption anywhere re-runs it.
@@ -721,57 +725,58 @@ class SyncService {
const spaces = (await window.electronAPI.getSpaces?.()) ?? [];
return {
byId: new Map(spaces.map((s) => [s.id, s])),
- byCloudTeamId: new Map(
- spaces.filter((s) => s.cloud_team_id).map((s) => [s.cloud_team_id!, s])
+ byCloudSpaceId: new Map(
+ spaces.filter((s) => s.cloud_space_id).map((s) => [s.cloud_space_id!, s])
),
privateSpace: spaces.find((s) => s.kind === "private") ?? null,
refreshedSpaces: false,
};
}
- // Maps a cloud row's team to its local space (team_id null → private space).
- // An unknown team means we were added to it mid-pass: re-pull spaces once,
- // then park still-unmapped rows — team content never files into Personal.
+ // Maps a cloud row's space to its local row (space_id null → private space).
+ // An unknown space means we gained access to it mid-pass: re-pull spaces
+ // once, then park still-unmapped rows — space content never files into
+ // Personal.
private async resolveSpaceForCloudRow(
- teamId: string | null | undefined,
+ cloudSpaceId: string | null | undefined,
ctx: SpaceSyncContext
): Promise<SpaceItem | null> {
- if (!teamId) return ctx.privateSpace;
+ if (!cloudSpaceId) return ctx.privateSpace;
// Live read on every row: a purge can land mid-pass (this ctx would still
// hold the deleted space), and writing the row would orphan it forever.
- if (readPurgedTeamIds()[teamId]) return null;
- const known = ctx.byCloudTeamId.get(teamId);
+ if (readPurgedSpaceIds()[cloudSpaceId]) return null;
+ const known = ctx.byCloudSpaceId.get(cloudSpaceId);
if (known) return known;
if (ctx.refreshedSpaces) return null;
ctx.refreshedSpaces = true;
try {
- const teams = await TeamsService.myTeams();
+ const cloudSpaces = await SpacesService.mySpaces();
// New spaces stay 'pending' so the next spaces pass backfills their
// pre-existing content (this delta pull only sees rows past the cursor).
- await this.upsertTeamSpaces(teams);
+ await this.upsertCloudSpaces(cloudSpaces);
} catch (err) {
console.error("Mid-pass spaces refresh failed:", err);
return null;
}
const fresh = await this.buildSpaceContext();
ctx.byId = fresh.byId;
- ctx.byCloudTeamId = fresh.byCloudTeamId;
+ ctx.byCloudSpaceId = fresh.byCloudSpaceId;
ctx.privateSpace = fresh.privateSpace;
- return ctx.byCloudTeamId.get(teamId) ?? null;
+ return ctx.byCloudSpaceId.get(cloudSpaceId) ?? null;
}
- // Scope fields for push payloads. Team rows carry their team identity; when
- // the server supports team scope, personal rows send explicit nulls so local
- // moves out of a team propagate (the server treats an absent team_id as
- // "keep the current scope"). Returns null for team rows that must not push:
- // spaces with no cloud team yet (local-only dev spaces), or a server that
- // no longer understands team scope and would file the row as personal.
+ // Scope fields for push payloads. Space rows carry their space identity;
+ // when the server supports space scope, personal rows send explicit nulls so
+ // local moves out of a space propagate (the server treats an absent space_id
+ // as "keep the current scope"). Returns null for space rows that must not
+ // push: spaces with no cloud id yet (local-only dev spaces), or a server
+ // that doesn't understand space scope and would file the row as personal.
private pushScopeFields(space: SpaceItem | undefined): PushScopeFields | null {
if (space?.kind === "team") {
- if (!space.cloud_team_id || !this.hasTeamSpacesCapability()) return null;
- return { workspace_id: space.workspace_id, team_id: space.cloud_team_id };
+ if (!space.cloud_space_id || !this.hasTeamSpacesCapability()) return null;
+ return { workspace_id: space.workspace_id, space_id: space.cloud_space_id };
}
- return this.hasTeamSpacesCapability() ? { workspace_id: null, team_id: null } : {};
+ return this.hasTeamSpacesCapability() ? { workspace_id: null, space_id: null } : {};
}
// A push was rejected because the note's team is gone or access was revoked
@@ -1025,12 +1030,12 @@ class SyncService {
preserveFolder
);
if (result?.success) {
- const teamName = ctx.byCloudTeamId.get(cloudFolder.previous_team_id ?? "")?.name;
+ const spaceName = ctx.byCloudSpaceId.get(cloudFolder.previous_space_id ?? "")?.name;
if (result.folder) {
- this.dispatchNoteRelocated(result.folder.name, teamName);
+ this.dispatchNoteRelocated(result.folder.name, spaceName);
} else {
for (const note of result.relocatedNotes ?? []) {
- this.dispatchNoteRelocated(note.title, teamName);
+ this.dispatchNoteRelocated(note.title, spaceName);
}
}
} else {
@@ -1043,7 +1048,7 @@ class SyncService {
continue;
}
- if (teamOnly && !cloudFolder.team_id) {
+ if (teamOnly && !cloudFolder.space_id) {
// A personal row whose local copy still sits in a team space
// announces a team→personal transition — apply it, or a later
// edit's push would re-team the privatized folder.
@@ -1074,10 +1079,10 @@ class SyncService {
continue;
}
- const space = await this.resolveSpaceForCloudRow(cloudFolder.team_id, ctx);
+ const space = await this.resolveSpaceForCloudRow(cloudFolder.space_id, ctx);
if (!space) {
dirtyRows++;
- console.warn(`Parking folder ${cloudFolder.id}: unknown team ${cloudFolder.team_id}`);
+ console.warn(`Parking folder ${cloudFolder.id}: unknown space ${cloudFolder.space_id}`);
continue;
}
@@ -1090,7 +1095,7 @@ class SyncService {
// fixed-name defaults so distinct user folders like "work"/"Work"
// never merge. Team rows skip this — upsertFolderFromCloud's
// collision convergence owns those.
- if (!local && !cloudFolder.team_id) {
+ if (!local && !cloudFolder.space_id) {
const allFolders = (await window.electronAPI.getFolderIdMap?.()) ?? [];
const adoptable = allFolders.filter(
(f) => f.space_id === space.id && (!f.cloud_id || f.cloud_id === cloudFolder.id)
@@ -1345,7 +1350,7 @@ class SyncService {
if (!alreadyPrivate) {
this.dispatchNoteRelocated(
local.title,
- ctx.byCloudTeamId.get(cloudNote.previous_team_id ?? "")?.name
+ ctx.byCloudSpaceId.get(cloudNote.previous_space_id ?? "")?.name
);
}
} else {
@@ -1354,7 +1359,7 @@ class SyncService {
continue;
}
- if (teamOnly && !cloudNote.team_id) {
+ if (teamOnly && !cloudNote.space_id) {
// A personal row whose local copy still sits in a team space
// announces a team→personal transition — apply it, or a later
// edit's push would re-team the privatized note.
@@ -1396,10 +1401,10 @@ class SyncService {
continue;
}
- const space = await this.resolveSpaceForCloudRow(cloudNote.team_id, ctx);
+ const space = await this.resolveSpaceForCloudRow(cloudNote.space_id, ctx);
if (!space) {
dirtyRows++;
- console.warn(`Parking note ${cloudNote.id}: unknown team ${cloudNote.team_id}`);
+ console.warn(`Parking note ${cloudNote.id}: unknown space ${cloudNote.space_id}`);
continue;
}
@@ -1418,7 +1423,7 @@ class SyncService {
// The note's folder isn't known locally yet (created moments
// ago, or its pull failed). Filing it to the fallback would
// stick — the advanced cursor never re-pulls the row — so park
- // it like an unknown team until the folder arrives.
+ // it like an unknown space until the folder arrives.
dirtyRows++;
console.warn(`Parking note ${cloudNote.id}: unknown folder ${cloudNote.folder_id}`);
continue;
@@ -2096,7 +2101,7 @@ class SyncService {
cloudToLocal: Map<string, { id: number; space_id: number }>,
defaultFolderId: number | null
): number | null {
- const fallback = cloudNote.team_id ? null : defaultFolderId;
+ const fallback = cloudNote.space_id ? null : defaultFolderId;
const mapped = cloudNote.folder_id ? cloudToLocal.get(cloudNote.folder_id) : undefined;
return mapped && mapped.space_id === space.id ? mapped.id : fallback;
}
diff --git a/src/services/TeamsService.ts b/src/services/TeamsService.ts
index a25b0de93..8fd23ac3d 100644
--- a/src/services/TeamsService.ts
+++ b/src/services/TeamsService.ts
@@ -5,26 +5,6 @@ interface DataWrap<T> {
data: T;
}
-export interface MyTeam {
- id: string;
- workspace_id: string;
- name: string;
- slug: string;
- description: string | null;
- emoji: string | null;
- my_role: "admin" | "member";
- member_count: number;
- created_at: string;
- updated_at: string;
-}
-
-// Every team the caller can access across all their workspaces (explicit
-// membership or implicit workspace owner/admin). Drives the spaces sync pass.
-async function myTeams(): Promise<MyTeam[]> {
- const res = await cloudGet<DataWrap<MyTeam[]>>("/api/me/teams");
- return res.data;
-}
-
async function list(workspaceId: string): Promise<Team[]> {
const res = await cloudGet<DataWrap<Team[]>>(`/api/workspaces/${workspaceId}/teams`);
return res.data;
@@ -68,7 +48,6 @@ async function removeMember(teamId: string, userId: string): Promise<void> {
}
export const TeamsService = {
- myTeams,
list,
create,
update,
diff --git a/src/services/spaceActions.ts b/src/services/spaceActions.ts
new file mode 100644
index 000000000..787224b2e
--- /dev/null
+++ b/src/services/spaceActions.ts
@@ -0,0 +1,164 @@
+import { TeamsService } from "./TeamsService";
+import { SpacesService } from "./SpacesService";
+import { markSpacePurged, readPurgedSpaceIds, syncService } from "./SyncService";
+import { loadSpaces, purgeSpace, updateSpaceMeta } from "../stores/noteStore";
+import type { SpaceItem, TeamRole } from "../types/electron";
+
+// Single mutation path for spaces and their backing teams: server call → local
+// SQLite mirror → store refresh. Roster and team mutations are space-agnostic
+// (a team can back many spaces), so they re-mirror every cloud space rather
+// than patching one row — my_role, member_count (deduped union) and the teams
+// list are always server-computed.
+
+function requireCloudSpaceId(space: SpaceItem): string {
+ if (!space.cloud_space_id) throw new Error("Not a cloud space");
+ return space.cloud_space_id;
+}
+
+function errorMessage(err: unknown): string | undefined {
+ return err instanceof Error ? err.message : undefined;
+}
+
+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 is PromiseRejectedResult => r.status === "rejected")
+ .map((r) => r.reason);
+}
+
+async function refreshSpaceMirror(): Promise<void> {
+ const cloudSpaces = await SpacesService.mySpaces();
+ const purged = readPurgedSpaceIds();
+ for (const cloudSpace of cloudSpaces) {
+ // A purge racing this refresh must not resurrect the space.
+ if (purged[cloudSpace.id]) continue;
+ await window.electronAPI.upsertSpaceFromCloud?.(
+ cloudSpace as unknown as Record<string, unknown>
+ );
+ }
+ await loadSpaces();
+}
+
+export async function createSpace(
+ workspaceId: string,
+ input: { name: string; emoji?: string | null },
+ teams: { existingTeamIds: string[]; newTeam?: { name: string; memberIds: string[] } }
+): Promise<{ space: SpaceItem | null; failedMembers: number }> {
+ const teamIds = [...teams.existingTeamIds];
+ let failedMembers = 0;
+ if (teams.newTeam) {
+ const team = await TeamsService.create(workspaceId, { name: teams.newTeam.name });
+ failedMembers = (await settleAddMembers(team.id, teams.newTeam.memberIds)).length;
+ teamIds.push(team.id);
+ }
+ const cloudSpace = await SpacesService.create(workspaceId, {
+ name: input.name,
+ emoji: input.emoji,
+ team_ids: teamIds,
+ });
+ const space =
+ (await window.electronAPI.upsertSpaceFromCloud?.(
+ cloudSpace as unknown as Record<string, unknown>
+ )) ?? null;
+ // Cloud upserts insert as 'pending' (backfill marker); a space created this
+ // second has no pre-existing content, so settle it — no skeletons.
+ if (space) await window.electronAPI.setSpaceSyncStatus?.(space.id, "synced");
+ await loadSpaces();
+ syncService.requestSyncAll("manual");
+ return { space, failedMembers };
+}
+
+export async function renameSpace(
+ space: SpaceItem,
+ updates: { name: string; emoji: string | null }
+): Promise<{ success: boolean; error?: string }> {
+ const local = await updateSpaceMeta(space.id, updates);
+ if (!local.success) return local;
+ if (!space.cloud_space_id) return { success: true };
+ try {
+ await SpacesService.update(space.cloud_space_id, updates);
+ return { success: true };
+ } catch (err) {
+ await updateSpaceMeta(space.id, { name: space.name, emoji: space.emoji ?? null });
+ return { success: false, error: errorMessage(err) };
+ }
+}
+
+export async function deleteSpace(
+ space: SpaceItem
+): Promise<{ success: boolean; error?: string }> {
+ if (space.cloud_space_id) {
+ try {
+ // Server archives the space; its teams survive as workspace entities and
+ // members purge on their next spaces pass.
+ await SpacesService.remove(space.cloud_space_id);
+ } catch (err) {
+ return { success: false, error: errorMessage(err) };
+ }
+ // Park the space id so an in-flight pull can't resurrect purged rows.
+ await markSpacePurged(space.cloud_space_id);
+ }
+ // Store cleanup rides on the space-purged broadcast.
+ return purgeSpace(space.id);
+}
+
+export async function assignTeamToSpace(space: SpaceItem, teamId: string): Promise<void> {
+ await SpacesService.assignTeam(requireCloudSpaceId(space), teamId);
+ await refreshSpaceMirror();
+}
+
+// Unassigning may cost the caller their own access (last of their teams on the
+// space): the follow-up sync pass purges the space locally in that case.
+export async function unassignTeamFromSpace(space: SpaceItem, teamId: string): Promise<void> {
+ await SpacesService.unassignTeam(requireCloudSpaceId(space), teamId);
+ await refreshSpaceMirror();
+ syncService.requestSyncAll("manual");
+}
+
+export async function addTeamMembers(
+ teamId: string,
+ userIds: string[]
+): Promise<{ failures: unknown[] }> {
+ const failures = await settleAddMembers(teamId, userIds);
+ await refreshSpaceMirror();
+ return { failures };
+}
+
+export async function removeTeamMember(teamId: string, userId: string): Promise<void> {
+ await TeamsService.removeMember(teamId, userId);
+ await refreshSpaceMirror();
+}
+
+export async function setTeamMemberRole(
+ teamId: string,
+ userId: string,
+ role: TeamRole
+): Promise<void> {
+ // The members POST upserts (ON CONFLICT DO UPDATE): role change via add.
+ await TeamsService.addMember(teamId, userId, role);
+ await refreshSpaceMirror();
+}
+
+// Self-removal from a team. Spaces backed only by this team disappear on the
+// follow-up sync pass (never purged here: other teams may still grant access).
+export async function leaveTeam(teamId: string, userId: string): Promise<void> {
+ await TeamsService.removeMember(teamId, userId);
+ await refreshSpaceMirror();
+ syncService.requestSyncAll("manual");
+}
+
+export async function renameTeam(teamId: string, name: string): Promise<void> {
+ await TeamsService.update(teamId, { name });
+ // Team names are mirrored inside each space's teams list.
+ await refreshSpaceMirror();
+}
+
+// Archives the team. Never marks the purge guard: spaces it backed may survive
+// via other teams — the follow-up sync pass decides what disappears.
+export async function deleteTeam(teamId: string): Promise<void> {
+ await TeamsService.remove(teamId);
+ await refreshSpaceMirror();
+ syncService.requestSyncAll("manual");
+}
diff --git a/src/services/teamSpaceActions.ts b/src/services/teamSpaceActions.ts
deleted file mode 100644
index 3d4b780df..000000000
--- a/src/services/teamSpaceActions.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { TeamsService } from "./TeamsService";
-import { markTeamSpacePurged, syncService } from "./SyncService";
-import { loadSpaces, purgeSpace, updateSpaceMeta } from "../stores/noteStore";
-import { useWorkspaceStore } from "../stores/workspaceStore";
-import type { SpaceItem, TeamMember, TeamRole } from "../types/electron";
-
-// Single mutation path for team spaces: server call → local SQLite mirror → store refresh.
-
-function requireTeamId(space: SpaceItem): string {
- if (!space.cloud_team_id) throw new Error("Not a cloud team space");
- return space.cloud_team_id;
-}
-
-function errorMessage(err: unknown): string | undefined {
- return err instanceof Error ? err.message : undefined;
-}
-
-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 is PromiseRejectedResult => r.status === "rejected")
- .map((r) => r.reason);
-}
-
-/** Refetch the roster and mirror its size into the local space row (narrow update). */
-async function syncRoster(space: SpaceItem, teamId: string): Promise<TeamMember[]> {
- const roster = await TeamsService.listMembers(teamId);
- await window.electronAPI.updateSpaceMemberCount?.(space.id, roster.length);
- await loadSpaces();
- return roster;
-}
-
-export async function createTeamSpace(
- workspaceId: string,
- input: { name: string; emoji?: string | null },
- memberIds: string[] = []
-): Promise<{ space: SpaceItem | null; failedMembers: number }> {
- const team = await TeamsService.create(workspaceId, input);
- const failedMembers = (await settleAddMembers(team.id, memberIds)).length;
- // member_count mirrors the server's explicit roster; the creator is implicit.
- const space =
- (await window.electronAPI.upsertSpaceFromCloud?.({
- ...team,
- my_role: "admin",
- member_count: memberIds.length - failedMembers,
- })) ?? null;
- // Cloud upserts insert as 'pending' (backfill marker); a team created this
- // second has no pre-existing content, so settle it — no skeletons.
- if (space) await window.electronAPI.setSpaceSyncStatus?.(space.id, "synced");
- await loadSpaces();
- syncService.requestSyncAll("manual");
- return { space, failedMembers };
-}
-
-export async function renameTeamSpace(
- space: SpaceItem,
- updates: { name: string; emoji: string | null }
-): Promise<{ success: boolean; error?: string }> {
- // Optimistic local rename; reverted below if the server rejects it.
- const local = await updateSpaceMeta(space.id, updates);
- if (!local.success) return local;
- if (!space.cloud_team_id) return { success: true };
- try {
- await TeamsService.update(space.cloud_team_id, updates);
- return { success: true };
- } catch (err) {
- await updateSpaceMeta(space.id, { name: space.name, emoji: space.emoji ?? null });
- return { success: false, error: errorMessage(err) };
- }
-}
-
-export async function deleteTeamSpace(
- space: SpaceItem
-): Promise<{ success: boolean; error?: string }> {
- 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) {
- return { success: false, error: errorMessage(err) };
- }
- // Park the team id so an in-flight pull can't resurrect purged rows.
- await markTeamSpacePurged(space.cloud_team_id);
- }
- // Store cleanup rides on the space-purged broadcast.
- return purgeSpace(space.id);
-}
-
-/**
- * A "leave" by an implicit workspace owner/admin (no team_members row) is a
- * server no-op — purging locally would only resurrect the space on the next
- * sync pass, so the roster is re-checked and "implicit" returns without purging.
- */
-export async function leaveTeamSpace(
- space: SpaceItem,
- userId: string
-): Promise<"left" | "implicit"> {
- const teamId = requireTeamId(space);
- const workspaceRole = useWorkspaceStore
- .getState()
- .workspaces.find((w) => w.id === space.workspace_id)?.role;
- const isImplicitAdmin = workspaceRole === "owner" || workspaceRole === "admin";
- const roster = await TeamsService.listMembers(teamId);
- if (isImplicitAdmin || !roster.some((m) => m.user_id === userId)) return "implicit";
- await TeamsService.removeMember(teamId, userId);
- await markTeamSpacePurged(teamId);
- await purgeSpace(space.id);
- return "left";
-}
-
-export async function setMemberRole(
- space: SpaceItem,
- userId: string,
- role: TeamRole
-): Promise<TeamMember[]> {
- const teamId = requireTeamId(space);
- // The members POST upserts (ON CONFLICT DO UPDATE): role change via add.
- await TeamsService.addMember(teamId, userId, role);
- return syncRoster(space, teamId);
-}
-
-export async function addMembers(
- space: SpaceItem,
- userIds: string[]
-): Promise<{ roster: TeamMember[]; failures: unknown[] }> {
- const teamId = requireTeamId(space);
- const failures = await settleAddMembers(teamId, userIds);
- const roster = await syncRoster(space, teamId);
- return { roster, failures };
-}
-
-export async function removeMember(space: SpaceItem, userId: string): Promise<TeamMember[]> {
- const teamId = requireTeamId(space);
- await TeamsService.removeMember(teamId, userId);
- return syncRoster(space, teamId);
-}
diff --git a/src/services/tools/searchNotesTool.ts b/src/services/tools/searchNotesTool.ts
index 09dd29305..2a3166c93 100644
--- a/src/services/tools/searchNotesTool.ts
+++ b/src/services/tools/searchNotesTool.ts
@@ -71,8 +71,8 @@ export function createSearchNotesTool(options: SearchToolOptions): ToolDefinitio
// didn't resolve must not widen to an all-spaces cloud search.
const strategies: Array<() => Promise<ToolResult>> = [];
const cloudCanScope = fixedScope
- ? !!space && (space.kind === "private" || !!space.cloud_team_id)
- : !space || space.kind === "private" || !!space.cloud_team_id;
+ ? !!space && (space.kind === "private" || !!space.cloud_space_id)
+ : !space || space.kind === "private" || !!space.cloud_space_id;
if (useCloudSearch && cloudCanScope && folderId == null) {
strategies.push(() => executeCloudSearch(query, limit, space, spaces));
}
@@ -148,14 +148,14 @@ async function executeCloudSearch(
spaces: SpaceItem[]
): Promise<ToolResult> {
const { NotesService } = await import("../../services/NotesService.js");
- // No space → all accessible spaces; team space → that team only (membership
+ // No space → all accessible spaces; team space → that space only (membership
// is server-enforced); private space → the personal-only default.
- const teamId = space?.kind === "team" ? (space.cloud_team_id ?? undefined) : undefined;
+ const spaceId = space?.kind === "team" ? (space.cloud_space_id ?? undefined) : undefined;
const scope = space ? undefined : ("all" as const);
- const { notes: cloudNotes } = await NotesService.search(query, limit, scope, teamId);
+ const { notes: cloudNotes } = await NotesService.search(query, limit, scope, spaceId);
- const spaceNameByTeamId = new Map(
- spaces.filter((s) => s.cloud_team_id).map((s) => [s.cloud_team_id!, s.name])
+ const spaceNameByCloudId = new Map(
+ spaces.filter((s) => s.cloud_space_id).map((s) => [s.cloud_space_id!, s.name])
);
const privateSpaceName = spaces.find((s) => s.kind === "private")?.name ?? null;
const results = cloudNotes.map((cn) => ({
@@ -164,7 +164,7 @@ async function executeCloudSearch(
date: cn.created_at,
type: cn.note_type,
score: cn.score,
- space: cn.team_id ? (spaceNameByTeamId.get(cn.team_id) ?? null) : privateSpaceName,
+ space: cn.space_id ? (spaceNameByCloudId.get(cn.space_id) ?? null) : privateSpaceName,
content: (cn.enhanced_content || cn.content).slice(0, MAX_CONTENT_LENGTH),
}));
diff --git a/src/stores/noteStore.ts b/src/stores/noteStore.ts
index f025cdbe3..ceb6e6e3c 100644
--- a/src/stores/noteStore.ts
+++ b/src/stores/noteStore.ts
@@ -536,7 +536,7 @@ export function removeNote(id: number): void {
function handleSpacePurged(spaceId: number): void {
const state = useNoteStore.getState();
- const purgedTeamId = state.spaces.find((s) => s.id === spaceId)?.cloud_team_id ?? null;
+ const purgedCloudSpaceId = state.spaces.find((s) => s.id === spaceId)?.cloud_space_id ?? null;
const removedKeys = new Set<string>([spaceContainerKey(spaceId)]);
state.folders.forEach((f) => {
if (f.space_id === spaceId) removedKeys.add(folderContainerKey(f.id));
@@ -574,7 +574,7 @@ function handleSpacePurged(spaceId: number): void {
Object.entries(state.noteConflicts).filter(
([clientId, cloudNote]) =>
!purgedClientIds.has(clientId) &&
- (purgedTeamId == null || cloudNote.team_id !== purgedTeamId)
+ (purgedCloudSpaceId == null || cloudNote.space_id !== purgedCloudSpaceId)
)
);
Object.keys(state.noteConflicts).forEach((clientId) => {
diff --git a/src/types/electron.ts b/src/types/electron.ts
index 2b2cca1f8..64590bd59 100644
--- a/src/types/electron.ts
+++ b/src/types/electron.ts
@@ -69,9 +69,7 @@ export interface NoteItem {
client_note_id: string;
sync_status: "synced" | "pending" | "error";
deleted_at: string | null;
- workspace_id?: string | null;
- team_id?: string | null;
- // 1 while a cloud-backed row that left a team still owes its scope
+ // 1 while a cloud-backed row that left a team space still owes its scope
// retraction push (D6); cleared when the row settles.
left_team?: number;
}
@@ -140,24 +138,33 @@ export interface FolderItem {
cloud_id: string | null;
sync_status: "synced" | "pending" | "error";
deleted_at: string | null;
- workspace_id?: string | null;
- team_id?: string | null;
- // 1 while a cloud-backed row that left a team still owes its scope
+ // 1 while a cloud-backed row that left a team space still owes its scope
// retraction push (D6); cleared when the row settles.
left_team?: number;
}
+/** A team assigned to a space, as mirrored from GET /api/me/spaces. */
+export interface SpaceTeamRef {
+ id: string;
+ name: string;
+ // Explicit team membership role, if any (workspace admins may have none).
+ my_role?: "admin" | "member" | null;
+}
+
export interface SpaceItem {
id: number;
client_space_id: string;
- cloud_team_id: string | null;
+ cloud_space_id: string | null;
workspace_id: string | null;
kind: "private" | "team";
name: string;
emoji: string | null;
sort_order: number;
+ // Server-computed max effective role across assigned teams (ws owner/admin ⇒ admin).
my_role: "admin" | "member" | null;
+ // Server-computed deduped union of assigned team rosters.
member_count: number | null;
+ teams: SpaceTeamRef[];
sync_status: "synced" | "pending" | "error";
deleted_at: string | null;
created_at: string;
@@ -780,12 +787,8 @@ declare global {
relocatedTitles?: string[];
error?: string;
}>;
- getSpaceByCloudTeamId?: (cloudTeamId: string) => Promise<SpaceItem | null>;
- upsertSpaceFromCloud?: (team: Record<string, unknown>) => Promise<SpaceItem>;
- updateSpaceMemberCount?: (
- id: number,
- count: number
- ) => Promise<{ success: boolean; space?: SpaceItem; error?: string }>;
+ getSpaceByCloudSpaceId?: (cloudSpaceId: string) => Promise<SpaceItem | null>;
+ upsertSpaceFromCloud?: (space: Record<string, unknown>) => Promise<SpaceItem>;
setSpaceSyncStatus?: (
id: number,
status: SpaceItem["sync_status"]
diff --git a/test/helpers/spacesDatabase.test.js b/test/helpers/spacesDatabase.test.js
index f5db76ecc..55d07ab92 100644
--- a/test/helpers/spacesDatabase.test.js
+++ b/test/helpers/spacesDatabase.test.js
@@ -942,3 +942,74 @@ test("createSpace refuses non-team kinds so the private space stays unique", (t)
.get().count;
assert.equal(privateCount, 1);
});
+
+test("upsertSpaceFromCloud round-trips the teams mirror as a parsed array", (t) => {
+ const db = createDb(t);
+ if (!db) return;
+ const teams = [{ id: "team-1", name: "Design", my_role: "admin" }];
+ const space = db.upsertSpaceFromCloud({
+ id: "space-1",
+ name: "Design space",
+ workspace_id: "ws-1",
+ teams,
+ });
+ assert.deepEqual(space.teams, teams);
+ assert.deepEqual(db.getSpaces().find((s) => s.id === space.id).teams, teams);
+ assert.deepEqual(db.getSpaceByCloudSpaceId("space-1").teams, teams);
+
+ // A corrupt column must degrade to an empty array, never throw.
+ db.db.prepare("UPDATE spaces SET teams = 'not json' WHERE id = ?").run(space.id);
+ assert.deepEqual(db.getSpaces().find((s) => s.id === space.id).teams, []);
+});
+
+test("upsertSpaceFromCloud adopts a pre-spaces row via its single backfilled team", (t) => {
+ const db = createDb(t);
+ if (!db) return;
+ // A row mirrored before the spaces refactor: keyed by cloud_team_id only.
+ db.db
+ .prepare(
+ "INSERT INTO spaces (client_space_id, cloud_team_id, kind, name, sort_order, sync_status) VALUES ('legacy-client-id', 'team-1', 'team', 'Legacy', 1, 'synced')"
+ )
+ .run();
+ const legacyId = db.db.prepare("SELECT id FROM spaces WHERE cloud_team_id = 'team-1'").get().id;
+
+ const adopted = db.upsertSpaceFromCloud({
+ id: "team-1",
+ name: "Legacy",
+ workspace_id: "ws-1",
+ teams: [{ id: "team-1", name: "Legacy team", my_role: "member" }],
+ });
+ assert.equal(adopted.id, legacyId, "local id survives so chats and tree state keep working");
+ assert.equal(adopted.cloud_space_id, "team-1");
+ assert.equal(adopted.sync_status, "synced", "adoption must not trigger a backfill storm");
+
+ // Idempotent: the next pass hits the cloud_space_id key, no duplicate row.
+ const again = db.upsertSpaceFromCloud({
+ id: "team-1",
+ name: "Legacy",
+ teams: [{ id: "team-1", name: "Legacy team", my_role: "member" }],
+ });
+ assert.equal(again.id, legacyId);
+ assert.equal(db.db.prepare("SELECT COUNT(*) as count FROM spaces WHERE kind = 'team'").get().count, 1);
+});
+
+test("upsertSpaceFromCloud never adopts by team for multi-team spaces", (t) => {
+ const db = createDb(t);
+ if (!db) return;
+ db.db
+ .prepare(
+ "INSERT INTO spaces (client_space_id, cloud_team_id, kind, name, sort_order, sync_status) VALUES ('legacy-client-id', 'team-1', 'team', 'Legacy', 1, 'synced')"
+ )
+ .run();
+
+ const fresh = db.upsertSpaceFromCloud({
+ id: "space-9",
+ name: "Multi",
+ teams: [
+ { id: "team-1", name: "A", my_role: "member" },
+ { id: "team-2", name: "B", my_role: null },
+ ],
+ });
+ assert.notEqual(fresh.client_space_id, "legacy-client-id");
+ assert.equal(fresh.sync_status, "pending", "a genuinely new space still backfills");
+});
diff --git a/test/lib/spacePermissions.test.js b/test/lib/spacePermissions.test.js
new file mode 100644
index 000000000..0e2b1efb7
--- /dev/null
+++ b/test/lib/spacePermissions.test.js
@@ -0,0 +1,23 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const { canManageSpace, canManageTeamRoster } = require("../../src/lib/spacePermissions.ts");
+
+test("canManageSpace: space admin or workspace owner/admin", () => {
+ const space = (myRole) => ({ my_role: myRole });
+ assert.equal(canManageSpace(space("admin"), null), true);
+ assert.equal(canManageSpace(space("member"), "owner"), true);
+ assert.equal(canManageSpace(space("member"), "admin"), true);
+ assert.equal(canManageSpace(space("member"), "member"), false);
+ assert.equal(canManageSpace(space(null), "member"), false);
+ assert.equal(canManageSpace(space(null), null), false);
+});
+
+test("canManageTeamRoster: team admin or workspace owner/admin", () => {
+ assert.equal(canManageTeamRoster("admin", null), true);
+ assert.equal(canManageTeamRoster("admin", "member"), true);
+ assert.equal(canManageTeamRoster("member", "owner"), true);
+ assert.equal(canManageTeamRoster(null, "admin"), true);
+ assert.equal(canManageTeamRoster("member", "member"), false);
+ assert.equal(canManageTeamRoster(null, "member"), false);
+ assert.equal(canManageTeamRoster(undefined, null), false);
+});