Skip to content

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

feat(notes): per-space members, create without a group, Groups rename (#2194)

Gabriel Stein4d2ae5ec7647
diff --git a/src/components/AcceptInvitationModal.tsx b/src/components/AcceptInvitationModal.tsx
index 182d7344d..ddf768677 100644
--- a/src/components/AcceptInvitationModal.tsx
+++ b/src/components/AcceptInvitationModal.tsx
@@ -21,16 +21,17 @@ import { syncService } from "../services/SyncService.js";
import { afterWorkspaceJoined } from "../services/membershipActions";
import { useToast } from "./ui/useToast";
import SignInDialog from "./SignInDialog";
+import { formatList } from "../lib/formatList";
import type { InvitationPreview } from "../types/electron";
interface Props {
token: string | null;
onClose: () => void;
- onAccepted?: (entry: { workspaceId: string; teamIds: string[] }) => void;
+ onAccepted?: (entry: { workspaceId: string; teamIds: string[]; spaceIds: string[] }) => void;
}
export default function AcceptInvitationModal({ token, onClose, onAccepted }: Props) {
- const { t } = useTranslation();
+ const { t, i18n } = useTranslation();
const { toast } = useToast();
const { isSignedIn, user } = useAuth();
const [preview, setPreview] = useState<InvitationPreview | null>(null);
@@ -90,11 +91,12 @@ export default function AcceptInvitationModal({ token, onClose, onAccepted }: Pr
onClose();
// Navigate with the accept response, not the preview: the invitation
// may have been re-targeted since it was previewed, and the server's
- // team_ids are authoritative. The preview only fills in for API
- // responses that predate team_ids.
+ // team_ids/space_ids are authoritative. The preview only fills in for
+ // API responses that predate team_ids.
onAccepted?.({
workspaceId: accepted.workspace_id,
teamIds: accepted.team_ids ?? preview?.team_ids ?? [],
+ spaceIds: accepted.space_ids ?? [],
});
} catch (err) {
toast({
@@ -136,11 +138,19 @@ export default function AcceptInvitationModal({ token, onClose, onAccepted }: Pr
role: t(`settingsPage.workspace.role.${preview.workspace_role}`),
})}
</DialogDescription>
- {(preview.team_ids?.length ?? 0) > 0 && (
- // The preview endpoint returns team ids only, so show a count.
+ {(preview.space_names?.length ?? 0) > 0 ? (
<DialogDescription className="text-xs text-muted-foreground/80 mt-1">
- {t("notes.spaces.invitedTo", { count: preview.team_ids.length })}
+ {t("notes.spaces.invitedToSpaces", {
+ spaces: formatList(i18n.language, preview.space_names ?? []),
+ })}
</DialogDescription>
+ ) : (
+ (preview.team_ids?.length ?? 0) > 0 && (
+ // Group grants arrive as ids only, so show a count.
+ <DialogDescription className="text-xs text-muted-foreground/80 mt-1">
+ {t("notes.spaces.invitedTo", { count: preview.team_ids.length })}
+ </DialogDescription>
+ )
)}
{wrongAccount ? (
<DialogDescription className="text-xs text-destructive mt-1">
diff --git a/src/components/ControlPanel.tsx b/src/components/ControlPanel.tsx
index 74ca937af..f1b5b72a4 100644
--- a/src/components/ControlPanel.tsx
+++ b/src/components/ControlPanel.tsx
@@ -129,6 +129,7 @@ export default function ControlPanel({ initialSettingsSection }: ControlPanelPro
const [invitationNotesEntry, setInvitationNotesEntry] = useState<{
workspaceId: string;
teamIds: string[];
+ spaceIds: string[];
} | null>(null);
const [showSearch, setShowSearch] = useState(false);
const showDiscarded = useShowDiscarded();
diff --git a/src/components/InviteTeammateDialog.tsx b/src/components/InviteTeammateDialog.tsx
index e8727e66b..32acdb17b 100644
--- a/src/components/InviteTeammateDialog.tsx
+++ b/src/components/InviteTeammateDialog.tsx
@@ -25,10 +25,13 @@ interface Props {
onOpenChange: (open: boolean) => void;
workspaceId: string;
workspaceName: string;
- onInvited?: () => void;
+ /** Receives the normalized email the invitation was sent to. */
+ onInvited?: (email: string) => void;
cancelLabel?: string;
- /** Team spaces the invitee joins on accept (threaded into the invitation). */
+ /** Teams the invitee joins on accept (threaded into the invitation). */
teamIds?: string[];
+ /** Spaces the invitee is added to directly on accept. */
+ spaceIds?: string[];
initialEmail?: string;
}
@@ -40,6 +43,7 @@ export default function InviteTeammateDialog({
onInvited,
cancelLabel,
teamIds,
+ spaceIds,
initialEmail,
}: Props) {
const { t } = useTranslation();
@@ -97,11 +101,13 @@ export default function InviteTeammateDialog({
e.preventDefault();
if (!email.trim()) return;
setSubmitting(true);
+ const normalizedEmail = email.trim().toLowerCase();
try {
const result = await InvitationsService.send(workspaceId, {
- email: email.trim().toLowerCase(),
+ email: normalizedEmail,
role,
...(teamIds && teamIds.length > 0 ? { team_ids: teamIds } : {}),
+ ...(spaceIds && spaceIds.length > 0 ? { space_ids: spaceIds } : {}),
});
if (result.email_sent) {
toast({
@@ -115,7 +121,7 @@ export default function InviteTeammateDialog({
variant: "destructive",
});
}
- onInvited?.();
+ onInvited?.(normalizedEmail);
onOpenChange(false);
} catch (error) {
toast({
diff --git a/src/components/MemberRoster.tsx b/src/components/MemberRoster.tsx
new file mode 100644
index 000000000..b60be97e2
--- /dev/null
+++ b/src/components/MemberRoster.tsx
@@ -0,0 +1,258 @@
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Check, ChevronDown, Loader2, Mail } from "./icons";
+import { Button } from "./ui/button";
+import { BIDI_VALUE_TOKEN, BidiInterpolatedText } from "./ui/BidiInterpolatedText";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from "./ui/dropdown-menu";
+import { cn } from "./lib/utils";
+import MemberAvatar from "./MemberAvatar";
+import MemberPickList from "./MemberPickList";
+import RoleBadge from "./RoleBadge";
+import { formatList } from "../lib/formatList";
+import type { TeamRole, WorkspaceMember } from "../types/electron";
+
+const ROLES: TeamRole[] = ["admin", "member"];
+const ROLE_LABEL_KEY: Record<TeamRole, string> = {
+ admin: "notes.spaces.members.roleAdmin",
+ member: "notes.spaces.members.roleMember",
+};
+const ROLE_DESCRIPTION_KEY: Record<TeamRole, string> = {
+ admin: "notes.spaces.members.roleAdminDescription",
+ member: "notes.spaces.members.roleMemberDescription",
+};
+// Quiet trigger: reads as the row's role text with a chevron, not a button.
+const ROLE_TRIGGER_CLASS =
+ "inline-flex h-7 shrink-0 items-center gap-1 rounded-md px-1.5 text-xs text-foreground/80 outline-none transition-colors " +
+ "hover:bg-foreground/5 hover:text-foreground focus-visible:ring-1 focus-visible:ring-ring/30 data-[state=open]:bg-foreground/5 " +
+ "disabled:opacity-60 dark:hover:bg-white/5 dark:data-[state=open]:bg-white/5";
+
+export interface RosterMember {
+ user_id: string;
+ email: string;
+ name: string | null;
+ image: string | null;
+ role: TeamRole;
+ /** Direct grant on the container; null when the row exists only through groups. */
+ direct_role?: TeamRole | null;
+ /** Names of the groups that grant this row access. */
+ via?: string[];
+ /** Groups whose grant alone makes this row an admin; a demotion here can't lower that. */
+ adminVia?: string[];
+}
+
+interface MemberRosterProps<M extends RosterMember> {
+ members: M[];
+ loading: boolean;
+ loadFailed: boolean;
+ onRetry: () => void;
+ currentUserId?: string;
+ canManage: boolean;
+ /** Rows with a server round-trip in flight. */
+ busyIds: Set<string>;
+ onRoleChange: (member: M, role: TeamRole) => void;
+ /** The wrapper owns confirmation and the actual removal. */
+ onRemove: (member: M) => void;
+ /** Workspace members not yet on the roster. */
+ addCandidates: WorkspaceMember[];
+ onAdd: (member: WorkspaceMember) => void;
+ /** Shown when typing an unknown email in the add search (invite affordance). */
+ onInvite?: (email: string) => void;
+}
+
+// Presentational roster shared by team and space membership: rows with a
+// quiet role menu, plus the add-people block. Data loading and mutations
+// live in the wrappers (TeamRosterSection, SpaceMembersPanel).
+export default function MemberRoster<M extends RosterMember>({
+ members,
+ loading,
+ loadFailed,
+ onRetry,
+ currentUserId,
+ canManage,
+ busyIds,
+ onRoleChange,
+ onRemove,
+ addCandidates,
+ onAdd,
+ onInvite,
+}: MemberRosterProps<M>) {
+ const { t, i18n } = useTranslation();
+ const [addSearch, setAddSearch] = useState("");
+ const formatGroups = (names: string[]) => formatList(i18n.language, names);
+
+ const searchEmail = addSearch.trim().toLowerCase();
+ // addCandidates is the workspace roster minus current members, so together
+ // they cover everyone already in the workspace.
+ const showInviteFooter =
+ !!onInvite &&
+ searchEmail.includes("@") &&
+ !members.some((m) => m.email.toLowerCase() === searchEmail) &&
+ !addCandidates.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/70 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={onRetry}>
+ {t("settingsPage.workspace.loadError.retry")}
+ </Button>
+ </div>
+ ) : (
+ <div className="rounded-lg border border-border/70 dark:border-border-subtle/70 divide-y divide-border/60 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 = busyIds.has(member.user_id);
+ const groups = member.via ?? [];
+ // Only a group grants this row: removal happens in that group.
+ const viaGroupOnly = !member.direct_role && groups.length > 0;
+ const adminVia = member.adminVia ?? [];
+ 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 dir="auto" className="text-xs font-medium text-foreground truncate">
+ {member.name || member.email}
+ </p>
+ {member.name && (
+ <p dir="ltr" className="text-xs text-muted-foreground truncate">
+ {member.email}
+ </p>
+ )}
+ </div>
+ {groups.length > 0 && (
+ <span className="text-[10px] text-foreground/45 truncate max-w-32">
+ {t("notes.spaces.members.viaGroup", { group: formatGroups(groups) })}
+ </span>
+ )}
+ {canManage && !isSelf ? (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button type="button" disabled={isBusy} className={ROLE_TRIGGER_CLASS}>
+ {t(ROLE_LABEL_KEY[member.role])}
+ {isBusy ? (
+ <Loader2 className="size-3 animate-spin" />
+ ) : (
+ <ChevronDown size={12} className="text-foreground/45" />
+ )}
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end" className="w-60">
+ {ROLES.map((role) => {
+ const lockedByGroup = role === "member" && adminVia.length > 0;
+ return (
+ <DropdownMenuItem
+ key={role}
+ disabled={lockedByGroup}
+ onClick={() => {
+ if (role !== member.role) onRoleChange(member, role);
+ }}
+ className="flex-col items-start gap-0.5 rounded-md px-2 py-1.5"
+ >
+ <span className="flex w-full items-center text-xs font-medium">
+ {t(ROLE_LABEL_KEY[role])}
+ {member.role === role && (
+ <Check size={12} className="ms-auto text-primary" />
+ )}
+ </span>
+ <span className="text-[11px] text-muted-foreground whitespace-normal">
+ {lockedByGroup
+ ? t("notes.spaces.members.roleFromGroup", {
+ group: formatGroups(adminVia),
+ })
+ : t(ROLE_DESCRIPTION_KEY[role])}
+ </span>
+ </DropdownMenuItem>
+ );
+ })}
+ <DropdownMenuSeparator />
+ {viaGroupOnly ? (
+ <DropdownMenuItem
+ disabled
+ className="rounded-md px-2 py-1.5 text-[11px] text-muted-foreground whitespace-normal"
+ >
+ {t("notes.spaces.members.managedByGroup", {
+ group: formatGroups(groups),
+ })}
+ </DropdownMenuItem>
+ ) : (
+ <DropdownMenuItem
+ onClick={() => onRemove(member)}
+ className="rounded-md px-2 py-1.5 text-xs text-destructive focus:bg-destructive/10 focus:text-destructive"
+ >
+ {t("notes.spaces.members.remove")}
+ </DropdownMenuItem>
+ )}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ ) : (
+ <RoleBadge label={t(ROLE_LABEL_KEY[member.role])} />
+ )}
+ </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
+ revealOnFocus
+ members={addCandidates}
+ search={addSearch}
+ onSearchChange={setAddSearch}
+ onSelect={onAdd}
+ currentUserId={currentUserId}
+ busyIds={busyIds}
+ 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-start",
+ "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">
+ <BidiInterpolatedText
+ text={t("notes.spaces.members.inviteFooter", {
+ email: BIDI_VALUE_TOKEN,
+ })}
+ value={addSearch.trim()}
+ />
+ </span>
+ </button>
+ ) : undefined
+ }
+ />
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/src/components/TeamRosterSection.tsx b/src/components/TeamRosterSection.tsx
index 50fd229e5..5bd3689ad 100644
--- a/src/components/TeamRosterSection.tsx
+++ b/src/components/TeamRosterSection.tsx
@@ -1,40 +1,13 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useMemo } from "react";
import { useTranslation } from "react-i18next";
-import { Check, ChevronDown, Loader2, Mail } from "./icons";
-import { Button } from "./ui/button";
-import { BIDI_VALUE_TOKEN, BidiInterpolatedText } from "./ui/BidiInterpolatedText";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from "./ui/dropdown-menu";
import { useToast } from "./ui/useToast";
-import { cn } from "./lib/utils";
-import MemberAvatar from "./MemberAvatar";
-import MemberPickList from "./MemberPickList";
-import RoleBadge from "./RoleBadge";
+import MemberRoster from "./MemberRoster";
+import { useMemberRoster } from "../hooks/useMemberRoster";
import { orderMemberCandidates } from "../lib/memberCandidates";
import { TeamsService } from "../services/TeamsService";
import { addTeamMembers, removeTeamMember, setTeamMemberRole } from "../services/spaceActions";
import type { TeamMember, TeamRole, WorkspaceMember } from "../types/electron";
-const ROLES: TeamRole[] = ["admin", "member"];
-const ROLE_LABEL_KEY: Record<TeamRole, string> = {
- admin: "notes.spaces.members.roleAdmin",
- member: "notes.spaces.members.roleMember",
-};
-const ROLE_DESCRIPTION_KEY: Record<TeamRole, string> = {
- admin: "notes.spaces.members.roleAdminDescription",
- member: "notes.spaces.members.roleMemberDescription",
-};
-// Quiet trigger: reads as the row's role text with a chevron, not a button.
-const ROLE_TRIGGER_CLASS =
- "inline-flex h-7 shrink-0 items-center gap-1 rounded-md px-1.5 text-xs text-foreground/80 outline-none transition-colors " +
- "hover:bg-foreground/5 hover:text-foreground focus-visible:ring-1 focus-visible:ring-ring/30 data-[state=open]:bg-foreground/5 " +
- "disabled:opacity-60 dark:hover:bg-white/5 dark:data-[state=open]:bg-white/5";
-
interface TeamRosterSectionProps {
teamId: string;
/** Names the team in the add-people label and confirmation toasts. */
@@ -50,6 +23,7 @@ interface TeamRosterSectionProps {
removeConfirm: (member: TeamMember, onConfirm: () => void) => void;
}
+// Team-backed MemberRoster: every row is a direct team membership.
export default function TeamRosterSection({
teamId,
teamName,
@@ -62,63 +36,23 @@ export default function TeamRosterSection({
}: 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);
- }
+ const load = useCallback(async () => {
+ const list = await TeamsService.listMembers(teamId);
+ onRosterChange?.(list);
+ return list;
}, [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 { members, loading, loadFailed, reload, busyIds, mutate } = useMemberRoster(load);
const handleRoleChange = (member: TeamMember, role: TeamRole) => {
- if (role === member.role) return;
- void withRowBusy(member.user_id, async () => {
+ void mutate(member.user_id, async () => {
await setTeamMemberRole(teamId, member.user_id, role);
toast({ title: t("notes.spaces.members.roleUpdated") });
});
};
const handleAdd = (member: WorkspaceMember) => {
- void withRowBusy(member.user_id, async () => {
+ void mutate(member.user_id, async () => {
const { failures } = await addTeamMembers(teamId, [member.user_id]);
if (failures.length > 0) throw failures[0];
toast({
@@ -130,6 +64,22 @@ export default function TeamRosterSection({
});
};
+ const handleRemove = (member: TeamMember) => {
+ removeConfirm(
+ member,
+ () =>
+ void mutate(member.user_id, async () => {
+ await removeTeamMember(teamId, member.user_id);
+ toast({
+ title: t("notes.spaces.members.removedFromTeam", {
+ name: member.name || member.email,
+ team: teamName,
+ }),
+ });
+ })
+ );
+ };
+
const memberIds = useMemo(() => new Set(members.map((m) => m.user_id)), [members]);
const addCandidates = useMemo(
() =>
@@ -140,155 +90,20 @@ export default function TeamRosterSection({
[workspaceMembers, memberIds, currentUserId]
);
- const searchEmail = addSearch.trim().toLowerCase();
- const showInviteFooter =
- !!onInvite &&
- searchEmail.includes("@") &&
- !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/70 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/70 dark:border-border-subtle/70 divide-y divide-border/60 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 dir="auto" className="text-xs font-medium text-foreground truncate">
- {member.name || member.email}
- </p>
- {member.name && (
- <p dir="ltr" className="text-xs text-muted-foreground truncate">
- {member.email}
- </p>
- )}
- </div>
- {canManage && !isSelf ? (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <button type="button" disabled={isBusy} className={ROLE_TRIGGER_CLASS}>
- {t(ROLE_LABEL_KEY[member.role])}
- {isBusy ? (
- <Loader2 className="size-3 animate-spin" />
- ) : (
- <ChevronDown size={12} className="text-foreground/45" />
- )}
- </button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end" className="w-60">
- {ROLES.map((role) => (
- <DropdownMenuItem
- key={role}
- onClick={() => handleRoleChange(member, role)}
- className="flex-col items-start gap-0.5 rounded-md px-2 py-1.5"
- >
- <span className="flex w-full items-center text-xs font-medium">
- {t(ROLE_LABEL_KEY[role])}
- {member.role === role && (
- <Check size={12} className="ms-auto text-primary" />
- )}
- </span>
- <span className="text-[11px] text-muted-foreground">
- {t(ROLE_DESCRIPTION_KEY[role])}
- </span>
- </DropdownMenuItem>
- ))}
- <DropdownMenuSeparator />
- <DropdownMenuItem
- onClick={() =>
- removeConfirm(
- member,
- () =>
- void withRowBusy(member.user_id, async () => {
- await removeTeamMember(teamId, member.user_id);
- toast({
- title: t("notes.spaces.members.removedFromTeam", {
- name: member.name || member.email,
- team: teamName,
- }),
- });
- })
- )
- }
- className="rounded-md px-2 py-1.5 text-xs text-destructive focus:bg-destructive/10 focus:text-destructive"
- >
- {t("notes.spaces.members.remove")}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- ) : (
- <RoleBadge label={t(ROLE_LABEL_KEY[member.role])} />
- )}
- </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
- revealOnFocus
- members={addCandidates}
- search={addSearch}
- onSearchChange={setAddSearch}
- onSelect={handleAdd}
- currentUserId={currentUserId}
- 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-start",
- "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">
- <BidiInterpolatedText
- text={t("notes.spaces.members.inviteFooter", {
- email: BIDI_VALUE_TOKEN,
- })}
- value={addSearch.trim()}
- />
- </span>
- </button>
- ) : undefined
- }
- />
- </div>
- )}
- </div>
+ <MemberRoster
+ members={members}
+ loading={loading}
+ loadFailed={loadFailed}
+ onRetry={() => void reload()}
+ currentUserId={currentUserId}
+ canManage={canManage}
+ busyIds={busyIds}
+ onRoleChange={handleRoleChange}
+ onRemove={handleRemove}
+ addCandidates={addCandidates}
+ onAdd={handleAdd}
+ onInvite={onInvite}
+ />
);
}
diff --git a/src/components/notes/CreateSpaceDialog.tsx b/src/components/notes/CreateSpaceDialog.tsx
index dfc569894..65fff7754 100644
--- a/src/components/notes/CreateSpaceDialog.tsx
+++ b/src/components/notes/CreateSpaceDialog.tsx
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { useShallow } from "zustand/react/shallow";
import { useTranslation } from "react-i18next";
-import { Check, Loader2, Plus } from "../icons";
+import { Check, ChevronRight, Loader2 } from "../icons";
import {
Dialog,
DialogContent,
@@ -11,11 +11,9 @@ import {
DialogFooter,
} from "../ui/dialog";
import { Button } from "../ui/button";
-import { Input } from "../ui/input";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select";
import { useToast } from "../ui/useToast";
import CreateWorkspaceDialog from "../CreateWorkspaceDialog";
-import CreateTeamDialog from "../CreateTeamDialog";
import MemberPickList from "../MemberPickList";
import { createSpace } from "../../services/spaceActions";
import { TeamsService } from "../../services/TeamsService";
@@ -24,7 +22,6 @@ import { useWorkspaceStore } from "../../stores/workspaceStore";
import { useAuth } from "../../hooks/useAuth";
import { useDelayedFlag } from "../../hooks/useDelayedFlag";
import SpaceNameField from "./SpaceNameField";
-import { orderMemberCandidates } from "../../lib/memberCandidates";
import { canManageWorkspace } from "../../lib/spacePermissions";
import {
manageableWorkspaces as findManageableWorkspaces,
@@ -73,9 +70,7 @@ export default function CreateSpaceDialog({
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 [createTeamOpen, setCreateTeamOpen] = useState(false);
+ const [groupsOpen, setGroupsOpen] = useState(false);
const [isCreating, setIsCreating] = useState(false);
const [selectedWorkspaceId, setSelectedWorkspaceId] = useState<string | null>(null);
const showSpinner = useDelayedFlag(isCreating);
@@ -109,12 +104,8 @@ export default function CreateSpaceDialog({
setTeamsError(false);
setTeamsWorkspaceId(null);
try {
- const list = await TeamsService.list(workspaceId);
- setTeams(list);
+ setTeams(await TeamsService.list(workspaceId));
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);
}
@@ -138,10 +129,18 @@ export default function CreateSpaceDialog({
});
}, [open, manageableWorkspaces, defaultWorkspace?.id, initialWorkspaceId]);
+ // The creator becomes the space's admin on the server, so they are not a
+ // pick-list candidate.
const candidates = useMemo(
- () => (rosterWorkspaceId === workspace?.id ? orderMemberCandidates(roster, user?.id) : []),
+ () =>
+ rosterWorkspaceId === workspace?.id
+ ? roster.filter((member) => member.user_id !== user?.id)
+ : [],
[roster, rosterWorkspaceId, user?.id, workspace?.id]
);
+ const workspaceTeams = teamsWorkspaceId === workspace?.id ? teams : [];
+ // Hold the section's place while the roster loads so the footer doesn't jump.
+ const peopleLoading = workspace != null && rosterWorkspaceId !== workspace.id && !membersError;
const handleOpenChange = (nextOpen: boolean) => {
onOpenChange(nextOpen);
if (!nextOpen) {
@@ -153,9 +152,7 @@ export default function CreateSpaceDialog({
setTeams([]);
setTeamsWorkspaceId(null);
setSelectedTeamIds(new Set());
- setNewTeamOpen(false);
- setNewTeamName("");
- setCreateTeamOpen(false);
+ setGroupsOpen(false);
setSelectedWorkspaceId(null);
}
};
@@ -185,55 +182,24 @@ export default function CreateSpaceDialog({
});
};
- const handleTeamCreated = (team: Team) => {
- setTeams((prev) => [...prev, team]);
- setSelectedTeamIds((prev) => new Set(prev).add(team.id));
- toast({ title: t("settingsPage.workspace.teams.created", { team: team.name }) });
- };
-
const handleWorkspaceChange = (workspaceId: string) => {
setSelectedWorkspaceId(workspaceId);
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;
-
- // Teams for the target workspace haven't arrived yet: skeleton the section
- // (a bare "New team" button next to the label reads as misplaced UI).
- const teamsLoading = !teamsError && teamsWorkspaceId !== workspace?.id;
-
const handleCreate = async () => {
const trimmed = name.trim();
- if (!trimmed || isCreating || !workspace || !hasTeamSelection) return;
+ if (!trimmed || isCreating || !workspace) return;
setIsCreating(true);
try {
- // The server adds the creator to a new team as admin; re-adding them
- // here would upsert that role back down to member.
- const memberIds = [...selectedIds].filter((id) => id !== user?.id);
- const { space, failedMembers } = await createSpace(
+ const space = await createSpace(
workspace.id,
{ name: trimmed, emoji },
- {
- existingTeamIds: [...selectedTeamIds],
- newTeam: newTeamOpen ? { name: newTeamName.trim() || trimmed, memberIds } : undefined,
- }
+ { memberIds: [...selectedIds], teamIds: [...selectedTeamIds] }
);
- if (failedMembers > 0) {
- toast({
- title: t("notes.spaces.members.addFailed", {
- failed: failedMembers,
- total: memberIds.length,
- }),
- variant: "destructive",
- });
- }
if (space) {
revealContainer(space.id, null);
setActiveContext(space.id, null);
@@ -255,15 +221,6 @@ export default function CreateSpaceDialog({
<>
<CreateWorkspaceDialog open={needsWorkspace} onOpenChange={handleWorkspaceDialogChange} />
- {workspace && (
- <CreateTeamDialog
- workspaceId={workspace.id}
- open={createTeamOpen}
- onOpenChange={setCreateTeamOpen}
- onCreated={handleTeamCreated}
- />
- )}
-
<Dialog open={open && !needsWorkspace} onOpenChange={handleOpenChange}>
<DialogContent className="sm:max-w-95 p-6 gap-5">
<DialogHeader>
@@ -352,33 +309,96 @@ export default function CreateSpaceDialog({
/>
</div>
- <div className="space-y-1.5">
- <p className="text-xs font-medium text-foreground/50">
- {t("notes.spaces.teams.assignLabel")}
- </p>
- {teamsError && teams.length === 0 ? (
- <div className="rounded border border-border/70 dark:border-border-subtle/60 px-3 py-2.5 flex items-center justify-between gap-2">
- <p className="text-xs text-muted-foreground">
- {t("notes.spaces.teams.loadError")}
- </p>
- <Button
- variant="ghost"
- size="sm"
- onClick={() => {
- if (workspace) void loadTeams(workspace.id);
- }}
- className="h-6 px-2 text-xs shrink-0"
+ {/* A workspace of one has nobody to add; the section only
+ appears once the roster shows other people (or failed). */}
+ {(peopleLoading || membersError || candidates.length > 0) && (
+ <div className="space-y-1.5">
+ <p className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.members.addPeople")}
+ </p>
+ {peopleLoading ? (
+ <div className="h-24 rounded-lg bg-foreground/5 dark:bg-white/5 animate-pulse" />
+ ) : membersError ? (
+ <div className="rounded border border-border/70 dark:border-border-subtle/60 px-3 py-2.5 flex items-center justify-between gap-2">
+ <p className="text-xs text-muted-foreground">
+ {t("settingsPage.workspace.members.loadError")}
+ </p>
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => {
+ if (workspace) void loadMembers(workspace.id);
+ }}
+ className="h-6 px-2 text-xs shrink-0"
+ >
+ {t("settingsPage.workspace.loadError.retry")}
+ </Button>
+ </div>
+ ) : (
+ <MemberPickList
+ members={candidates}
+ search={memberSearch}
+ onSearchChange={setMemberSearch}
+ onSelect={toggleMember}
+ selectedIds={selectedIds}
+ currentUserId={user?.id}
+ />
+ )}
+ </div>
+ )}
+
+ {(teamsError || workspaceTeams.length > 0) && (
+ <div className="space-y-1.5">
+ <div className="-mx-1">
+ <button
+ type="button"
+ aria-expanded={groupsOpen}
+ onClick={() => setGroupsOpen((open) => !open)}
+ className={cn(
+ "flex w-full min-w-0 items-center gap-1.5 h-8 px-1.5 rounded-md",
+ "transition-colors duration-150 outline-none",
+ "hover:bg-foreground/4 dark:hover:bg-white/4",
+ "focus-visible:ring-1 focus-visible:ring-ring/30"
+ )}
>
- {t("settingsPage.workspace.loadError.retry")}
- </Button>
+ <ChevronRight
+ size={12}
+ aria-hidden="true"
+ className={cn(
+ "shrink-0 text-foreground/45 transition-transform duration-150",
+ groupsOpen ? "rotate-90" : "rtl:rotate-180"
+ )}
+ />
+ <span className="text-xs font-medium text-foreground/50 truncate">
+ {t("notes.spaces.groups.optional")}
+ </span>
+ {selectedTeamIds.size > 0 && (
+ <span className="ms-auto text-[10px] text-foreground/45 shrink-0">
+ {selectedTeamIds.size}
+ </span>
+ )}
+ </button>
</div>
- ) : teamsLoading ? (
- <div className="h-24 rounded bg-foreground/5 dark:bg-white/5 animate-pulse" />
- ) : (
- <>
- {teams.length > 0 && (
+ {groupsOpen &&
+ (teamsError ? (
+ <div className="rounded border border-border/70 dark:border-border-subtle/60 px-3 py-2.5 flex items-center justify-between gap-2">
+ <p className="text-xs text-muted-foreground">
+ {t("notes.spaces.teams.loadError")}
+ </p>
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => {
+ if (workspace) void loadTeams(workspace.id);
+ }}
+ className="h-6 px-2 text-xs shrink-0"
+ >
+ {t("settingsPage.workspace.loadError.retry")}
+ </Button>
+ </div>
+ ) : (
<div className="rounded border border-border/70 dark:border-border-subtle/60 overflow-y-auto max-h-36 p-1">
- {teams.map((team) => {
+ {workspaceTeams.map((team) => {
const isSelected = selectedTeamIds.has(team.id);
return (
<button
@@ -406,80 +426,9 @@ export default function CreateSpaceDialog({
);
})}
</div>
- )}
- {newTeamOpen ? (
- <div className="rounded border border-border/70 dark:border-border-subtle/60 p-2.5 space-y-2">
- <div className="space-y-1.5">
- <label
- htmlFor="create-space-new-team-name"
- className="text-xs font-medium text-foreground/50"
- >
- {t("notes.spaces.teams.newTeamNameLabel")}
- </label>
- <Input
- dir="auto"
- id="create-space-new-team-name"
- 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={candidates}
- search={memberSearch}
- onSearchChange={setMemberSearch}
- onSelect={toggleMember}
- selectedIds={selectedIds}
- currentUserId={user?.id}
- />
- ) : null}
- {teams.length > 0 && (
- <Button
- variant="ghost"
- size="sm"
- onClick={() => {
- setNewTeamOpen(false);
- setNewTeamName("");
- setSelectedIds(new Set());
- }}
- className="h-6 px-2 text-xs"
- >
- {t("common.cancel")}
- </Button>
- )}
- </div>
- ) : (
- <Button
- variant="ghost"
- size="sm"
- onClick={() => setCreateTeamOpen(true)}
- className="h-7 px-2 text-xs text-foreground/60"
- >
- <Plus size={12} className="me-1" />
- {t("notes.spaces.teams.newTeam")}
- </Button>
- )}
- </>
- )}
- </div>
+ ))}
+ </div>
+ )}
<DialogFooter>
<Button
@@ -489,10 +438,7 @@ export default function CreateSpaceDialog({
>
{t("common.cancel")}
</Button>
- <Button
- onClick={handleCreate}
- disabled={!name.trim() || isCreating || !workspace || !hasTeamSelection}
- >
+ <Button onClick={handleCreate} disabled={!name.trim() || isCreating || !workspace}>
{showSpinner && <Loader2 className="me-1.5 h-3.5 w-3.5 animate-spin" />}
{t("notes.spaces.create")}
</Button>
diff --git a/src/components/notes/PersonalNotesView.tsx b/src/components/notes/PersonalNotesView.tsx
index 2f07f89a2..d133f428b 100644
--- a/src/components/notes/PersonalNotesView.tsx
+++ b/src/components/notes/PersonalNotesView.tsx
@@ -125,7 +125,7 @@ interface PersonalNotesViewProps {
event: any;
} | null;
onMeetingRecordingRequestHandled?: () => void;
- invitationEntry?: { workspaceId: string; teamIds: string[] } | null;
+ invitationEntry?: { workspaceId: string; teamIds: string[]; spaceIds: string[] } | null;
onInvitationEntryHandled?: () => void;
/** The topbar slot the New note button portals into; null while the topbar hides it. */
topBarActions?: HTMLElement | null;
@@ -303,21 +303,25 @@ export default function PersonalNotesView({
}, [invitationEntry, isSidePanelLayout]);
// The acceptance modal starts a sync before navigating here. Once the first
- // space an invited team can access appears in the local mirror, take the
- // user to it instead of leaving the newly shared content hidden behind
- // Personal.
+ // space the invitation granted (directly or via a 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);
+ const invitedSpaceIds = new Set(invitationEntry.spaceIds);
+ // Workspace owners/admins receive implicit access, so their invitation
+ // may enumerate no grants at all. In that case, open the first accessible
+ // team space belonging to the accepted workspace.
+ const anyGrant = invitedTeamIds.size === 0 && invitedSpaceIds.size === 0;
const invitedSpace = spaces.find(
(space) =>
space.kind === "team" &&
space.workspace_id === invitationEntry.workspaceId &&
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 || space.teams.some((team) => invitedTeamIds.has(team.id)))
+ (anyGrant ||
+ invitedSpaceIds.has(space.cloud_space_id) ||
+ space.teams.some((team) => invitedTeamIds.has(team.id)))
);
if (!invitedSpace) return;
diff --git a/src/components/notes/SpaceGroupsSection.tsx b/src/components/notes/SpaceGroupsSection.tsx
new file mode 100644
index 000000000..ce6164b13
--- /dev/null
+++ b/src/components/notes/SpaceGroupsSection.tsx
@@ -0,0 +1,326 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Info, Loader2, Plus, X } from "../icons";
+import { ConfirmDialog } from "../ui/dialog";
+import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from "../ui/select";
+import { Button } from "../ui/button";
+import { useDialogs } from "../../hooks/useDialogs";
+import { useDelayedFlag } from "../../hooks/useDelayedFlag";
+import CreateTeamDialog from "../CreateTeamDialog";
+import { TeamsService } from "../../services/TeamsService";
+import {
+ assignTeamToSpace,
+ setSpaceTeamAccess,
+ unassignTeamFromSpace,
+} from "../../services/spaceActions";
+import { useToast } from "../ui/useToast";
+import { useWorkspaceStore } from "../../stores/workspaceStore";
+import { canManageSpace, canManageWorkspace } from "../../lib/spacePermissions";
+import type { SpaceItem, SpaceTeamRef, Team } from "../../types/electron";
+
+interface SpaceGroupsSectionProps {
+ space: SpaceItem;
+ /** Fires after any assignment change so the people list can refetch. */
+ onChanged: () => void;
+}
+
+// Groups (teams) assigned to a space and the controls to change them:
+// assign, per-assignment access cap, unassign, new group. The people the
+// groups bring in are shown in the flat roster above this section.
+export default function SpaceGroupsSection({ space, onChanged }: SpaceGroupsSectionProps) {
+ const { t } = useTranslation();
+ const { toast } = useToast();
+ const { confirmDialog, showConfirmDialog, hideConfirmDialog } = useDialogs();
+ const workspaceRole = useWorkspaceStore(
+ (s) => s.workspaces.find((w) => w.id === space.workspace_id)?.role ?? null
+ );
+ const [workspaceTeams, setWorkspaceTeams] = useState<Team[]>([]);
+ const [teamsLoading, setTeamsLoading] = useState(false);
+ const [teamsError, setTeamsError] = useState(false);
+ const [pendingTeamId, setPendingTeamId] = useState<string | null>(null);
+ const [isAssigning, setIsAssigning] = useState(false);
+ const showAssignSpinner = useDelayedFlag(isAssigning);
+ const [newTeamOpen, setNewTeamOpen] = useState(false);
+ const [accessBusyTeamId, setAccessBusyTeamId] = useState<string | null>(null);
+
+ const canManage = canManageSpace(space, workspaceRole);
+ // Group creation is 403'd below workspace admin.
+ const isWorkspaceAdmin = canManageWorkspace(workspaceRole);
+
+ const loadWorkspaceTeams = useCallback(async (workspaceId: string) => {
+ setTeamsLoading(true);
+ setTeamsError(false);
+ try {
+ setWorkspaceTeams(await TeamsService.list(workspaceId));
+ } catch {
+ setWorkspaceTeams([]);
+ setTeamsError(true);
+ } finally {
+ setTeamsLoading(false);
+ }
+ }, []);
+
+ useEffect(() => {
+ // Any workspace member may list teams; counts feed the rows.
+ if (space.workspace_id) void loadWorkspaceTeams(space.workspace_id);
+ }, [space.workspace_id, loadWorkspaceTeams]);
+
+ const unassignedTeams = useMemo(
+ () => workspaceTeams.filter((team) => !space.teams.some((t) => t.id === team.id)),
+ [workspaceTeams, space.teams]
+ );
+
+ const memberCountByTeam = useMemo(
+ () => new Map(workspaceTeams.map((team) => [team.id, team.member_count ?? 0])),
+ [workspaceTeams]
+ );
+
+ const reportError = (err: unknown) => {
+ toast({
+ title: t("common.error"),
+ description: err instanceof Error ? err.message : t("common.unknownError"),
+ variant: "destructive",
+ });
+ };
+
+ const confirmUnassignTeam = (teamId: string, teamName: string) => {
+ showConfirmDialog({
+ title: t("notes.spaces.teamsMembers.removeTeamConfirm", {
+ team: teamName,
+ space: space.name,
+ }),
+ description: t("notes.spaces.teamsMembers.removeTeamConfirmDescription"),
+ confirmText: t("notes.spaces.teamsMembers.removeTeamFromSpace"),
+ variant: "destructive",
+ onConfirm: async () => {
+ try {
+ await unassignTeamFromSpace(space, teamId);
+ toast({
+ title: t("notes.spaces.teamsMembers.teamRemoved", {
+ team: teamName,
+ space: space.name,
+ }),
+ });
+ onChanged();
+ } catch (err) {
+ reportError(err);
+ }
+ },
+ });
+ };
+
+ const assignTeam = async (team: Team) => {
+ await assignTeamToSpace(space, team.id);
+ toast({
+ title: t("notes.spaces.teamsMembers.teamAdded", { team: team.name, space: space.name }),
+ });
+ onChanged();
+ };
+
+ const handleAssignTeam = async () => {
+ const team = unassignedTeams.find((candidate) => candidate.id === pendingTeamId);
+ if (!team || isAssigning) return;
+ setIsAssigning(true);
+ try {
+ await assignTeam(team);
+ setPendingTeamId(null);
+ } catch (err) {
+ reportError(err);
+ } finally {
+ setIsAssigning(false);
+ }
+ };
+
+ // Downgrading the caller's only admin-granting team is allowed (symmetric
+ // with unassign): reversible by any workspace admin and never touches
+ // content access. The mirror refresh flips canManage if it applies.
+ const handleAccessChange = async (teamRef: SpaceTeamRef, access: "admin" | "member") => {
+ if (access === (teamRef.access ?? "admin") || accessBusyTeamId) return;
+ setAccessBusyTeamId(teamRef.id);
+ try {
+ await setSpaceTeamAccess(space, teamRef.id, access);
+ toast({
+ title: t("notes.spaces.teamsMembers.accessChanged", { team: teamRef.name }),
+ });
+ onChanged();
+ } catch (err) {
+ reportError(err);
+ } finally {
+ setAccessBusyTeamId(null);
+ }
+ };
+
+ // Registered in workspaceTeams before assignment: if assigning fails, the
+ // new team still surfaces in the unassigned select for a retry.
+ const handleTeamCreated = async (team: Team) => {
+ setWorkspaceTeams((prev) => [...prev, team]);
+ try {
+ await assignTeam(team);
+ } catch (err) {
+ reportError(err);
+ }
+ };
+
+ return (
+ <>
+ <div className="space-y-3">
+ {teamsError && space.workspace_id && (
+ <div className="rounded border border-border/70 dark:border-border-subtle/60 px-3 py-2.5 flex items-center justify-between gap-2">
+ <p className="text-xs text-muted-foreground">{t("notes.spaces.teams.loadError")}</p>
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={teamsLoading}
+ onClick={() => {
+ if (space.workspace_id) {
+ void loadWorkspaceTeams(space.workspace_id);
+ }
+ }}
+ className="h-6 px-2 text-xs shrink-0"
+ >
+ {teamsLoading && <Loader2 className="me-1.5 h-3 w-3 animate-spin" />}
+ {t("common.retry")}
+ </Button>
+ </div>
+ )}
+
+ {space.teams.length === 0 && (
+ <p className="text-xs text-muted-foreground">{t("notes.spaces.teamsMembers.noTeams")}</p>
+ )}
+
+ {space.teams.map((teamRef) => {
+ const memberCount = memberCountByTeam.get(teamRef.id);
+ const access = teamRef.access ?? "admin";
+ return (
+ <div key={teamRef.id} className="space-y-1.5">
+ <div className="flex items-center gap-1 -mx-1">
+ <div className="flex flex-1 min-w-0 items-center gap-1.5 h-8 px-1.5">
+ <span dir="auto" className="text-xs font-semibold text-foreground truncate">
+ {teamRef.name}
+ </span>
+ {memberCount != null && (
+ <span className="ms-auto text-[10px] text-foreground/45 shrink-0">
+ {t("settingsPage.workspace.teams.memberCount", { count: memberCount })}
+ </span>
+ )}
+ </div>
+ {canManage ? (
+ <Select
+ value={access}
+ disabled={accessBusyTeamId === teamRef.id}
+ onValueChange={(next) =>
+ void handleAccessChange(teamRef, next as "admin" | "member")
+ }
+ >
+ <SelectTrigger
+ className="h-7 w-25 px-2 text-xs rounded-md shrink-0"
+ aria-label={t("notes.spaces.teamsMembers.accessLabel")}
+ >
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="admin" className="text-xs">
+ {t("notes.spaces.teamsMembers.accessAdmin")}
+ </SelectItem>
+ <SelectItem value="member" className="text-xs">
+ {t("notes.spaces.teamsMembers.accessMember")}
+ </SelectItem>
+ </SelectContent>
+ </Select>
+ ) : (
+ <span className="text-[10px] text-foreground/45 shrink-0 px-1">
+ {t(
+ access === "admin"
+ ? "notes.spaces.teamsMembers.accessAdmin"
+ : "notes.spaces.teamsMembers.accessMember"
+ )}
+ </span>
+ )}
+ {canManage && (
+ <button
+ type="button"
+ 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 shrink-0"
+ >
+ <X className="w-3.5 h-3.5" />
+ </button>
+ )}
+ </div>
+ {access === "member" && (
+ <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.accessHint", { team: teamRef.name })}
+ </p>
+ )}
+ </div>
+ );
+ })}
+
+ {((canManage && unassignedTeams.length > 0) || isWorkspaceAdmin) && (
+ <div className="space-y-1.5">
+ <label className="text-xs font-medium text-foreground/50">
+ {t("notes.spaces.teamsMembers.addTeamLabel")}
+ </label>
+ {canManage && unassignedTeams.length > 0 && (
+ <div className="flex items-center gap-2">
+ <Select value={pendingTeamId ?? ""} onValueChange={setPendingTeamId}>
+ <SelectTrigger className="h-8 flex-1 text-xs">
+ <SelectValue placeholder={t("notes.spaces.teamsMembers.chooseTeam")} />
+ </SelectTrigger>
+ <SelectContent>
+ {unassignedTeams.map((team) => (
+ <SelectItem key={team.id} value={team.id} className="text-xs">
+ <span dir="auto">{team.name}</span>
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <Button
+ size="sm"
+ onClick={() => void handleAssignTeam()}
+ disabled={!pendingTeamId || isAssigning}
+ className="h-8 shrink-0"
+ >
+ {showAssignSpinner && <Loader2 className="me-1.5 h-3 w-3 animate-spin" />}
+ {t("common.add")}
+ </Button>
+ </div>
+ )}
+ {isWorkspaceAdmin && (
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => setNewTeamOpen(true)}
+ className="h-7 px-2 text-xs text-foreground/60"
+ >
+ <Plus size={12} className="me-1" />
+ {t("notes.spaces.teams.newTeam")}
+ </Button>
+ )}
+ </div>
+ )}
+ </div>
+
+ {space.workspace_id && (
+ <CreateTeamDialog
+ workspaceId={space.workspace_id}
+ open={newTeamOpen}
+ onOpenChange={setNewTeamOpen}
+ onCreated={handleTeamCreated}
+ />
+ )}
+
+ <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/notes/SpaceMembersPanel.tsx b/src/components/notes/SpaceMembersPanel.tsx
index 52f099c0b..c0ef635a2 100644
--- a/src/components/notes/SpaceMembersPanel.tsx
+++ b/src/components/notes/SpaceMembersPanel.tsx
@@ -1,45 +1,41 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { useShallow } from "zustand/react/shallow";
import { useTranslation } from "react-i18next";
-import { ChevronRight, Info, Loader2, Plus, X } from "../icons";
+import { ChevronRight } from "../icons";
import { ConfirmDialog } from "../ui/dialog";
-import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from "../ui/select";
-import { Button } from "../ui/button";
+import { BIDI_VALUE_TOKEN, BidiInterpolatedText } from "../ui/BidiInterpolatedText";
import { useDialogs } from "../../hooks/useDialogs";
import { useAuth } from "../../hooks/useAuth";
-import { useDelayedFlag } from "../../hooks/useDelayedFlag";
+import { useMemberRoster } from "../../hooks/useMemberRoster";
import { cn } from "../lib/utils";
-import CreateTeamDialog from "../CreateTeamDialog";
import InviteTeammateDialog from "../InviteTeammateDialog";
-import TeamRosterSection from "../TeamRosterSection";
-import { TeamsService } from "../../services/TeamsService";
+import MemberRoster from "../MemberRoster";
+import SpaceGroupsSection from "./SpaceGroupsSection";
+import { SpacesService, type SpaceMemberEntry } from "../../services/SpacesService";
import {
- assignTeamToSpace,
- setSpaceTeamAccess,
- unassignTeamFromSpace,
+ addSpaceMembers,
+ removeSpaceMember,
+ setSpaceMemberRole,
} from "../../services/spaceActions";
import { useToast } from "../ui/useToast";
import { useWorkspaceStore } from "../../stores/workspaceStore";
-import { useSpaces } from "../../stores/noteStore";
-import {
- canManageSpace,
- canManageTeamRoster,
- canManageWorkspace,
-} from "../../lib/spacePermissions";
-import type { SpaceItem, SpaceTeamRef, Team, TeamMember } from "../../types/electron";
+import { formatList } from "../../lib/formatList";
+import { orderMemberCandidates } from "../../lib/memberCandidates";
+import { canManageSpace, canManageWorkspace } from "../../lib/spacePermissions";
+import type { SpaceItem, TeamRole, WorkspaceMember } from "../../types/electron";
interface SpaceMembersPanelProps {
space: SpaceItem;
}
-// Teams assigned to a space, their rosters, and the controls to change them.
+// Everyone with access to a space — added directly or through a group — as
+// one flat list, with group assignment tucked into a disclosure below.
// Rendered inside SpaceSettingsDialog's Members tab.
export default function SpaceMembersPanel({ space }: SpaceMembersPanelProps) {
- const { t } = useTranslation();
+ const { t, i18n } = useTranslation();
const { toast } = useToast();
const { user } = useAuth();
const { confirmDialog, showConfirmDialog, hideConfirmDialog } = useDialogs();
- const spaces = useSpaces();
const {
workspace,
members: roster,
@@ -51,394 +47,183 @@ export default function SpaceMembersPanel({ space }: SpaceMembersPanelProps) {
refreshMembers: s.refreshMembers,
}))
);
- const [workspaceTeams, setWorkspaceTeams] = useState<Team[]>([]);
- const [teamsLoading, setTeamsLoading] = useState(false);
- const [teamsError, setTeamsError] = useState(false);
const [inviteOpen, setInviteOpen] = useState(false);
const [inviteEmail, setInviteEmail] = useState<string | undefined>(undefined);
- const [inviteTeamId, setInviteTeamId] = useState<string | null>(null);
- const [pendingTeamId, setPendingTeamId] = useState<string | null>(null);
- const [isAssigning, setIsAssigning] = useState(false);
- const showAssignSpinner = useDelayedFlag(isAssigning);
- // Per-team expansion; absent = default (expanded only for single-team spaces).
- const [expandedOverrides, setExpandedOverrides] = useState<Map<string, boolean>>(new Map());
- const [newTeamOpen, setNewTeamOpen] = useState(false);
- const [accessBusyTeamId, setAccessBusyTeamId] = useState<string | null>(null);
+ // Invitees don't appear in the roster until they accept, so the last sent
+ // invite stays visible under the add block.
+ const [invitedEmail, setInvitedEmail] = useState<string | null>(null);
+ const [groupsOpen, setGroupsOpen] = useState(false);
const canManage = canManageSpace(space, workspace?.role ?? null);
+ // Workspace invites are 403'd below workspace admin.
const isWorkspaceAdmin = canManageWorkspace(workspace?.role);
- // Team creation and workspace invites are 403'd below workspace admin.
- const canInviteToWorkspace = isWorkspaceAdmin;
-
- const isTeamExpanded = (teamId: string): boolean =>
- expandedOverrides.get(teamId) ?? space.teams.length === 1;
-
- const toggleTeamExpanded = (teamId: string): void => {
- setExpandedOverrides((prev) => new Map(prev).set(teamId, !isTeamExpanded(teamId)));
- };
+ const spaceId = space.cloud_space_id;
- const loadWorkspaceTeams = useCallback(async (workspaceId: string) => {
- setTeamsLoading(true);
- setTeamsError(false);
- try {
- setWorkspaceTeams(await TeamsService.list(workspaceId));
- } catch {
- setWorkspaceTeams([]);
- setTeamsError(true);
- } finally {
- setTeamsLoading(false);
- }
- }, []);
+ const load = useCallback(
+ () => (spaceId ? SpacesService.listMembers(spaceId) : Promise.resolve<SpaceMemberEntry[]>([])),
+ [spaceId]
+ );
+ const { members, loading, loadFailed, reload, busyIds, mutate } = useMemberRoster(load);
useEffect(() => {
- if (!space.workspace_id) return;
- void refreshMembers(space.workspace_id).catch(() => {});
- // Any workspace member may list teams; counts feed the collapsed rows.
- void loadWorkspaceTeams(space.workspace_id);
- }, [space.workspace_id, refreshMembers, loadWorkspaceTeams]);
-
- // How many OTHER spaces each assigned team has access to — 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]
+ if (space.workspace_id) void refreshMembers(space.workspace_id).catch(() => {});
+ }, [space.workspace_id, refreshMembers]);
+
+ const rows = useMemo(
+ () =>
+ members.map((m) => ({
+ ...m,
+ via: m.via_teams.map((team) => team.name),
+ adminVia: m.via_teams
+ .filter((team) => team.role === "admin" && team.access === "admin")
+ .map((team) => team.name),
+ })),
+ [members]
);
- const memberCountByTeam = useMemo(
- () => new Map(workspaceTeams.map((team) => [team.id, team.member_count ?? 0])),
- [workspaceTeams]
+ const memberIds = useMemo(() => new Set(members.map((m) => m.user_id)), [members]);
+ const addCandidates = useMemo(
+ () =>
+ orderMemberCandidates(
+ roster.filter((member) => !memberIds.has(member.user_id)),
+ user?.id
+ ),
+ [roster, memberIds, user?.id]
);
- const confirmRemoveMember = useCallback(
- (member: TeamMember, onConfirm: () => void) => {
- showConfirmDialog({
- title: t("notes.spaces.members.removeConfirm", {
+ const handleRoleChange = (member: SpaceMemberEntry, role: TeamRole) => {
+ void mutate(member.user_id, async () => {
+ await setSpaceMemberRole(space, member.user_id, role);
+ toast({ title: t("notes.spaces.members.roleUpdated") });
+ });
+ };
+
+ const handleAdd = (member: WorkspaceMember) => {
+ void mutate(member.user_id, async () => {
+ const { failures } = await addSpaceMembers(space, [member.user_id]);
+ if (failures.length > 0) throw failures[0];
+ toast({
+ title: t("notes.spaces.members.addedToTeam", {
name: member.name || member.email,
- space: space.name,
+ team: space.name,
}),
- description: t("notes.spaces.members.removeConfirmDescription"),
- confirmText: t("notes.spaces.members.remove"),
- variant: "destructive",
- onConfirm,
});
- },
- [showConfirmDialog, t, space.name]
- );
+ });
+ };
- const confirmUnassignTeam = (teamId: string, teamName: string) => {
- const isLastTeam = space.teams.length === 1;
+ // Removing drops the direct grant only; access through a group stays and
+ // is said so up front and after the fact.
+ const handleRemove = (member: SpaceMemberEntry) => {
+ const name = member.name || member.email;
+ const groupNames = (teams: { name: string }[]) =>
+ formatList(
+ i18n.language,
+ teams.map((team) => team.name)
+ );
showConfirmDialog({
- title: t("notes.spaces.teamsMembers.removeTeamConfirm", {
- team: teamName,
- space: space.name,
- }),
- description: isLastTeam
- ? t("notes.spaces.teamsMembers.lastTeamWarning")
- : t("notes.spaces.teamsMembers.removeTeamConfirmDescription"),
- confirmText: t("notes.spaces.teamsMembers.removeTeamFromSpace"),
+ title: t("notes.spaces.members.removeConfirm", { name, space: space.name }),
+ description:
+ member.via_teams.length > 0
+ ? t("notes.spaces.members.removeKeepsGroupAccess", {
+ groups: groupNames(member.via_teams),
+ })
+ : t("notes.spaces.members.removeConfirmDescription"),
+ confirmText: t("notes.spaces.members.remove"),
variant: "destructive",
- onConfirm: async () => {
- try {
- await unassignTeamFromSpace(space, teamId);
+ onConfirm: () =>
+ void mutate(member.user_id, async () => {
+ const { still_via_teams } = await removeSpaceMember(space, member.user_id);
toast({
- title: t("notes.spaces.teamsMembers.teamRemoved", {
- team: teamName,
- space: space.name,
- }),
+ title:
+ still_via_teams.length > 0
+ ? t("notes.spaces.members.stillViaGroups", {
+ name,
+ groups: groupNames(still_via_teams),
+ })
+ : t("notes.spaces.members.removedFromTeam", { name, team: space.name }),
});
- } catch (err) {
- toast({
- title: t("common.error"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
- variant: "destructive",
- });
- }
- },
+ }),
});
};
- const handleAssignTeam = async () => {
- const team = unassignedTeams.find((candidate) => candidate.id === pendingTeamId);
- if (!team || isAssigning) return;
- setIsAssigning(true);
- try {
- await assignTeamToSpace(space, team.id);
- setPendingTeamId(null);
- toast({
- title: t("notes.spaces.teamsMembers.teamAdded", { team: team.name, space: space.name }),
- });
- } catch (err) {
- toast({
- title: t("common.error"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
- variant: "destructive",
- });
- } finally {
- setIsAssigning(false);
- }
- };
-
- // Downgrading the caller's only admin-granting team is allowed (symmetric
- // with unassign): reversible by any workspace admin and never touches
- // content access. The mirror refresh flips canManage if it applies.
- const handleAccessChange = async (teamRef: SpaceTeamRef, access: "admin" | "member") => {
- if (access === (teamRef.access ?? "admin") || accessBusyTeamId) return;
- setAccessBusyTeamId(teamRef.id);
- try {
- await setSpaceTeamAccess(space, teamRef.id, access);
- toast({
- title: t("notes.spaces.teamsMembers.accessChanged", { team: teamRef.name }),
- });
- } catch (err) {
- toast({
- title: t("common.error"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
- variant: "destructive",
- });
- } finally {
- setAccessBusyTeamId(null);
- }
- };
-
- // Registered in workspaceTeams before assignment: if assigning fails, the
- // new team still surfaces in the unassigned select for a retry. The new
- // row stays collapsed like the rest — members were already picked in the
- // create dialog.
- const handleTeamCreated = async (team: Team) => {
- setWorkspaceTeams((prev) => [...prev, team]);
- try {
- await assignTeamToSpace(space, team.id);
- toast({
- title: t("notes.spaces.teamsMembers.teamAdded", { team: team.name, space: space.name }),
- });
- } catch (err) {
- toast({
- title: t("common.error"),
- description: err instanceof Error ? err.message : t("common.unknownError"),
- variant: "destructive",
- });
- }
- };
-
- if (!space.cloud_space_id) return null;
+ if (!spaceId) return null;
return (
<>
<div className="space-y-4">
- {teamsError && space.workspace_id && (
- <div className="rounded border border-border/70 dark:border-border-subtle/60 px-3 py-2.5 flex items-center justify-between gap-2">
- <p className="text-xs text-muted-foreground">{t("notes.spaces.teams.loadError")}</p>
- <Button
- variant="ghost"
- size="sm"
- disabled={teamsLoading}
- onClick={() => {
- if (space.workspace_id) {
- void loadWorkspaceTeams(space.workspace_id);
+ <MemberRoster
+ members={rows}
+ loading={loading}
+ loadFailed={loadFailed}
+ onRetry={() => void reload()}
+ currentUserId={user?.id}
+ canManage={canManage}
+ busyIds={busyIds}
+ onRoleChange={handleRoleChange}
+ onRemove={handleRemove}
+ addCandidates={addCandidates}
+ onAdd={handleAdd}
+ onInvite={
+ isWorkspaceAdmin
+ ? (email) => {
+ setInviteEmail(email);
+ setInviteOpen(true);
}
- }}
- className="h-6 px-2 text-xs shrink-0"
- >
- {teamsLoading && <Loader2 className="me-1.5 h-3 w-3 animate-spin" />}
- {t("common.retry")}
- </Button>
- </div>
- )}
+ : undefined
+ }
+ />
- {space.teams.length === 0 && (
- <p className="text-xs text-muted-foreground">{t("notes.spaces.teamsMembers.noTeams")}</p>
+ {invitedEmail && (
+ <p className="text-[11px] text-muted-foreground">
+ <BidiInterpolatedText
+ text={t("notes.spaces.members.invited", { email: BIDI_VALUE_TOKEN })}
+ value={invitedEmail}
+ />
+ </p>
)}
- {space.teams.map((teamRef) => {
- const otherSpaces = otherSpacesByTeam.get(teamRef.id) ?? 0;
- const memberCount = memberCountByTeam.get(teamRef.id);
- const expanded = isTeamExpanded(teamRef.id);
- return (
- <div key={teamRef.id} className="space-y-2">
- <div className="flex items-center gap-1 -mx-1">
- <button
- type="button"
- aria-expanded={expanded}
- onClick={() => toggleTeamExpanded(teamRef.id)}
- className={cn(
- "flex flex-1 min-w-0 items-center gap-1.5 h-8 px-1.5 rounded-md",
- "transition-colors duration-150 outline-none",
- "hover:bg-foreground/4 dark:hover:bg-white/4",
- "focus-visible:ring-1 focus-visible:ring-ring/30"
- )}
- >
- <ChevronRight
- size={12}
- aria-hidden="true"
- className={cn(
- "shrink-0 text-foreground/45 transition-transform duration-150",
- expanded ? "rotate-90" : "rtl:rotate-180"
- )}
- />
- <span dir="auto" className="text-xs font-semibold text-foreground truncate">
- {teamRef.name}
- </span>
- {memberCount != null && (
- <span className="ms-auto text-[10px] text-foreground/45 shrink-0">
- {t("settingsPage.workspace.teams.memberCount", { count: memberCount })}
- </span>
- )}
- </button>
- {canManage ? (
- <Select
- value={teamRef.access ?? "admin"}
- disabled={accessBusyTeamId === teamRef.id}
- onValueChange={(access) =>
- void handleAccessChange(teamRef, access as "admin" | "member")
- }
- >
- <SelectTrigger
- className="h-7 w-25 px-2 text-xs rounded-md shrink-0"
- aria-label={t("notes.spaces.teamsMembers.accessLabel")}
- >
- <SelectValue />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="admin" className="text-xs">
- {t("notes.spaces.teamsMembers.accessAdmin")}
- </SelectItem>
- <SelectItem value="member" className="text-xs">
- {t("notes.spaces.teamsMembers.accessMember")}
- </SelectItem>
- </SelectContent>
- </Select>
- ) : (
- <span className="text-[10px] text-foreground/45 shrink-0 px-1">
- {t(
- (teamRef.access ?? "admin") === "admin"
- ? "notes.spaces.teamsMembers.accessAdmin"
- : "notes.spaces.teamsMembers.accessMember"
- )}
- </span>
- )}
- {canManage && (
- <button
- type="button"
- 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 shrink-0"
- >
- <X className="w-3.5 h-3.5" />
- </button>
- )}
- </div>
- {expanded && (
- <>
- {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>
- )}
- {(teamRef.access ?? "admin") === "member" && (
- <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.accessHint", { team: teamRef.name })}
- </p>
- )}
- <TeamRosterSection
- teamId={teamRef.id}
- teamName={teamRef.name}
- 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 className="space-y-2">
+ <div className="-mx-1">
+ <button
+ type="button"
+ aria-expanded={groupsOpen}
+ onClick={() => setGroupsOpen((open) => !open)}
+ className={cn(
+ "flex w-full min-w-0 items-center gap-1.5 h-8 px-1.5 rounded-md",
+ "transition-colors duration-150 outline-none",
+ "hover:bg-foreground/4 dark:hover:bg-white/4",
+ "focus-visible:ring-1 focus-visible:ring-ring/30"
)}
- </div>
- );
- })}
-
- {((canManage && unassignedTeams.length > 0) || isWorkspaceAdmin) && (
- <div className="space-y-1.5">
- <label className="text-xs font-medium text-foreground/50">
- {t("notes.spaces.teamsMembers.addTeamLabel")}
- </label>
- {canManage && unassignedTeams.length > 0 && (
- <div className="flex items-center gap-2">
- <Select value={pendingTeamId ?? ""} onValueChange={setPendingTeamId}>
- <SelectTrigger className="h-8 flex-1 text-xs">
- <SelectValue placeholder={t("notes.spaces.teamsMembers.chooseTeam")} />
- </SelectTrigger>
- <SelectContent>
- {unassignedTeams.map((team) => (
- <SelectItem key={team.id} value={team.id} className="text-xs">
- <span dir="auto">{team.name}</span>
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- <Button
- size="sm"
- onClick={() => void handleAssignTeam()}
- disabled={!pendingTeamId || isAssigning}
- className="h-8 shrink-0"
- >
- {showAssignSpinner && <Loader2 className="me-1.5 h-3 w-3 animate-spin" />}
- {t("common.add")}
- </Button>
- </div>
- )}
- {isWorkspaceAdmin && (
- <Button
- variant="ghost"
- size="sm"
- onClick={() => setNewTeamOpen(true)}
- className="h-7 px-2 text-xs text-foreground/60"
- >
- <Plus size={12} className="me-1" />
- {t("notes.spaces.teams.newTeam")}
- </Button>
- )}
+ >
+ <ChevronRight
+ size={12}
+ aria-hidden="true"
+ className={cn(
+ "shrink-0 text-foreground/45 transition-transform duration-150",
+ groupsOpen ? "rotate-90" : "rtl:rotate-180"
+ )}
+ />
+ <span className="text-xs font-semibold text-foreground truncate">
+ {t("notes.spaces.groups.title")}
+ </span>
+ <span className="ms-auto text-[10px] text-foreground/45 shrink-0">
+ {space.teams.length}
+ </span>
+ </button>
</div>
- )}
+ {groupsOpen && <SpaceGroupsSection space={space} onChanged={() => void reload()} />}
+ </div>
</div>
- {space.workspace_id && (
- <CreateTeamDialog
- workspaceId={space.workspace_id}
- open={newTeamOpen}
- onOpenChange={setNewTeamOpen}
- onCreated={handleTeamCreated}
- />
- )}
-
- {workspace && inviteTeamId && (
+ {workspace && (
<InviteTeammateDialog
open={inviteOpen}
onOpenChange={setInviteOpen}
workspaceId={workspace.id}
workspaceName={workspace.name}
- teamIds={[inviteTeamId]}
+ spaceIds={[spaceId]}
initialEmail={inviteEmail}
+ onInvited={setInvitedEmail}
/>
)}
diff --git a/src/components/notes/SpaceSettingsDialog.tsx b/src/components/notes/SpaceSettingsDialog.tsx
index 1a5f9151b..030974ac0 100644
--- a/src/components/notes/SpaceSettingsDialog.tsx
+++ b/src/components/notes/SpaceSettingsDialog.tsx
@@ -7,9 +7,15 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs";
import { useToast } from "../ui/useToast";
import { useAuth } from "../../hooks/useAuth";
import { useDialogs } from "../../hooks/useDialogs";
-import { canManageSpace, canManageWorkspace, teamsUserCanLeave } from "../../lib/spacePermissions";
+import {
+ canLeaveSpace,
+ canManageSpace,
+ canManageWorkspace,
+ teamsUserCanLeave,
+} from "../../lib/spacePermissions";
+import { formatList } from "../../lib/formatList";
import { localMutationErrorKey } from "../../lib/localMutationError";
-import { leaveTeam, renameSpace } from "../../services/spaceActions";
+import { leaveSpace, leaveTeam, renameSpace } from "../../services/spaceActions";
import { useWorkspaceStore } from "../../stores/workspaceStore";
import DeleteSpaceDialog from "./DeleteSpaceDialog";
import SpaceMembersPanel from "./SpaceMembersPanel";
@@ -128,26 +134,44 @@ export default function SpaceSettingsDialog({
const leaveTeams = teamsUserCanLeave(space);
const canLeave =
- Boolean(space.cloud_space_id) &&
- !isWorkspaceAdmin &&
- leaveTeams.length > 0 &&
- Boolean(user?.id);
+ Boolean(space.cloud_space_id) && !isWorkspaceAdmin && canLeaveSpace(space) && Boolean(user?.id);
+ // A direct grant is dropped on its own and access through groups is left
+ // where it is: groups are managed in the group. Leaving through groups is
+ // offered only when they are the sole grant, with its own warning.
const confirmLeave = () => {
if (!canLeave || !user?.id) return;
const userId = user.id;
- const teamNames = new Intl.ListFormat(i18n.language, { type: "conjunction" }).format(
- leaveTeams.map((team) => team.name)
- );
+ const direct = space.my_direct_role != null;
+ const groupNames = (names: string[]) => formatList(i18n.language, names);
+ const groups = groupNames(leaveTeams.map((team) => team.name));
+ const description = !direct
+ ? t("notes.spaces.leaveConfirmDescription", { teams: groups })
+ : leaveTeams.length > 0
+ ? t("notes.spaces.leaveKeepsGroupAccess", { groups })
+ : t("notes.spaces.leaveDirectDescription");
showConfirmDialog({
title: t("notes.spaces.leaveConfirmTitle", { space: space.name }),
- description: t("notes.spaces.leaveConfirmDescription", { teams: teamNames }),
+ description,
confirmText: t("notes.spaces.leave"),
variant: "destructive",
onConfirm: async () => {
setLeaving(true);
try {
- for (const team of leaveTeams) await leaveTeam(team.id, userId);
+ if (direct) {
+ const { still_via_teams } = await leaveSpace(space, userId);
+ if (still_via_teams.length > 0) {
+ toast({
+ title: t("notes.spaces.stillViaGroups", {
+ space: space.name,
+ groups: groupNames(still_via_teams.map((team) => team.name)),
+ }),
+ });
+ return;
+ }
+ } else {
+ for (const team of leaveTeams) await leaveTeam(team.id, userId);
+ }
toast({ title: t("notes.spaces.left", { space: space.name }) });
onOpenChange(false);
} catch (err) {
diff --git a/src/components/notes/overview/ContainerOverview.tsx b/src/components/notes/overview/ContainerOverview.tsx
index ea579f650..74e53a94c 100644
--- a/src/components/notes/overview/ContainerOverview.tsx
+++ b/src/components/notes/overview/ContainerOverview.tsx
@@ -169,7 +169,7 @@ export function ContainerOverview({
onOpenChange={setShowInviteDialog}
workspaceId={workspace.id}
workspaceName={workspace.name}
- teamIds={space.teams.map((team) => team.id)}
+ spaceIds={[space.cloud_space_id]}
/>
)}
</div>
diff --git a/src/helpers/database.js b/src/helpers/database.js
index 0d768c760..b517e36b7 100644
--- a/src/helpers/database.js
+++ b/src/helpers/database.js
@@ -1091,6 +1091,13 @@ class DatabaseManager {
} catch (err) {
if (!err.message.includes("duplicate column")) throw err;
}
+ try {
+ // Direct space_members grant ('admin' | 'member'), distinct from the
+ // effective my_role: it decides whether the user can leave the space.
+ this.db.exec("ALTER TABLE spaces ADD COLUMN my_direct_role 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"
);
@@ -3688,7 +3695,8 @@ class DatabaseManager {
this.db
.prepare(
`UPDATE spaces SET cloud_space_id = ?, workspace_id = ?, name = ?, emoji = ?, my_role = ?,
- member_count = ?, teams = ?, deleted_at = NULL, updated_at = ? WHERE id = ?`
+ my_direct_role = ?, member_count = ?, teams = ?, deleted_at = NULL, updated_at = ?
+ WHERE id = ?`
)
.run(
space.id,
@@ -3696,6 +3704,7 @@ class DatabaseManager {
space.name,
space.emoji ?? null,
space.my_role ?? null,
+ space.my_direct_role ?? null,
space.member_count ?? null,
teamsJson,
updatedAt,
@@ -3715,8 +3724,9 @@ class DatabaseManager {
const result = this.db
.prepare(
`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', ?, ?)`
+ sort_order, my_role, my_direct_role, member_count, teams, sync_status, created_at,
+ updated_at)
+ VALUES (?, ?, ?, 'team', ?, ?, ?, ?, ?, ?, ?, 'pending', ?, ?)`
)
.run(
randomUUID(),
@@ -3726,6 +3736,7 @@ class DatabaseManager {
space.emoji ?? null,
(maxOrder?.max_order ?? 0) + 1,
space.my_role ?? null,
+ space.my_direct_role ?? null,
space.member_count ?? null,
teamsJson,
space.created_at || updatedAt,
diff --git a/src/hooks/useMemberRoster.ts b/src/hooks/useMemberRoster.ts
new file mode 100644
index 000000000..48b171676
--- /dev/null
+++ b/src/hooks/useMemberRoster.ts
@@ -0,0 +1,56 @@
+import { useCallback, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useToast } from "../components/ui/useToast";
+
+// Load state plus per-row mutation tracking for a roster backed by a server
+// list. Shared by the team- and space-backed wrappers around MemberRoster so
+// both reload after every mutation and surface failures the same way.
+export function useMemberRoster<M>(load: () => Promise<M[]>) {
+ const { t } = useTranslation();
+ const { toast } = useToast();
+ const [members, setMembers] = useState<M[]>([]);
+ const [loading, setLoading] = useState(false);
+ const [loadFailed, setLoadFailed] = useState(false);
+ const [busyIds, setBusyIds] = useState<Set<string>>(new Set());
+
+ const reload = useCallback(async () => {
+ setLoading(true);
+ setLoadFailed(false);
+ try {
+ setMembers(await load());
+ } catch {
+ setLoadFailed(true);
+ } finally {
+ setLoading(false);
+ }
+ }, [load]);
+
+ useEffect(() => {
+ void reload();
+ }, [reload]);
+
+ const mutate = useCallback(
+ async (userId: string, action: () => Promise<void>) => {
+ setBusyIds((prev) => new Set(prev).add(userId));
+ try {
+ await action();
+ await reload();
+ } catch (err) {
+ toast({
+ title: t("common.error"),
+ description: err instanceof Error ? err.message : t("common.unknownError"),
+ variant: "destructive",
+ });
+ } finally {
+ setBusyIds((prev) => {
+ const next = new Set(prev);
+ next.delete(userId);
+ return next;
+ });
+ }
+ },
+ [reload, toast, t]
+ );
+
+ return { members, loading, loadFailed, reload, busyIds, mutate };
+}
diff --git a/src/lib/formatList.ts b/src/lib/formatList.ts
new file mode 100644
index 000000000..00ba1e639
--- /dev/null
+++ b/src/lib/formatList.ts
@@ -0,0 +1,4 @@
+/** Locale-aware "A, B, and C" for names shown in copy. */
+export function formatList(language: string, items: string[]): string {
+ return new Intl.ListFormat(language, { type: "conjunction" }).format(items);
+}
diff --git a/src/lib/spacePermissions.ts b/src/lib/spacePermissions.ts
index 64aee9fa4..d700b87ce 100644
--- a/src/lib/spacePermissions.ts
+++ b/src/lib/spacePermissions.ts
@@ -19,10 +19,19 @@ export function canManageSpace(space: SpaceItem, workspaceRole: WorkspaceRole |
* belong to. Workspace owners/admins may hold access with no team membership
* at all, in which case there is nothing to leave.
*/
-export function teamsUserCanLeave(space: SpaceItem): SpaceTeamRef[] {
+export function teamsUserCanLeave(space: Pick<SpaceItem, "teams">): SpaceTeamRef[] {
return space.teams.filter((team) => team.my_role != null);
}
+/**
+ * Whether the current user holds any grant they can give up: a direct
+ * membership or a team they belong to. Workspace owners/admins with implicit
+ * access alone have nothing to leave.
+ */
+export function canLeaveSpace(space: Pick<SpaceItem, "my_direct_role" | "teams">): boolean {
+ return space.my_direct_role != null || teamsUserCanLeave(space).length > 0;
+}
+
/**
* 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.
diff --git a/src/locales/ar/translation.json b/src/locales/ar/translation.json
index c4ba72632..26244145b 100644
--- a/src/locales/ar/translation.json
+++ b/src/locales/ar/translation.json
@@ -1426,7 +1426,7 @@
"newSpace": "مساحة فريق جديدة",
"newSpaceInWorkspace": "مساحة فريق جديدة في {{workspace}}",
"createTitle": "إنشاء مساحة فريق",
- "createDescription": "منطقة مشتركة داخل مساحة عمل يمكن لفريق واحد أو أكثر الوصول إليها.",
+ "createDescription": "منطقة مشتركة داخل مساحة عمل للأشخاص والمجموعات الذين تضيفهم.",
"nameAndIconLabel": "الاسم والأيقونة",
"create": "إنشاء",
"couldNotCreate": "تعذر إنشاء المساحة",
@@ -1437,18 +1437,21 @@
"couldNotRename": "تعذر إعادة تسمية المساحة",
"couldNotChangeEmoji": "تعذّر تغيير الرمز التعبيري",
"deleteSpace": "حذف المساحة",
- "deleteHintTeam": "يزيل هذه المساحة للجميع. تبقى فرقها كما هي.",
+ "deleteHintTeam": "يزيل هذه المساحة للجميع. تبقى مجموعاتها كما هي.",
"deleteHintLocal": "يحذف هذه المساحة نهائيًا مع مجلداتها وملاحظاتها على هذا الجهاز.",
"leaveTitle": "مغادرة المساحة",
"leaveDescription": "ستبقى ملاحظاتك متاحة للأعضاء الآخرين.",
"leave": "مغادرة المساحة",
"leaveConfirmTitle": "مغادرة {{space}}؟",
- "leaveConfirmDescription": "ستتم إزالتك من {{teams}} وستفقد الوصول إلى أي مساحات أخرى تفتحها تلك الفرق.",
+ "leaveConfirmDescription": "ستتم إزالتك من {{teams}} وستفقد الوصول إلى أي مساحات أخرى تفتحها تلك المجموعات.",
+ "leaveDirectDescription": "ستفقد إمكانية الوصول إلى هذه المساحة.",
+ "leaveKeepsGroupAccess": "ستحتفظ بالوصول عبر {{groups}}.",
"left": "غادرت {{space}}",
+ "stillViaGroups": "لا يزال بإمكانك الوصول إلى {{space}} عبر {{groups}}.",
"couldNotLeave": "تعذّرت مغادرة المساحة",
"deleteConfirmTitle": "حذف المساحة؟",
"deleteConfirmDescription": "سيؤدي هذا إلى حذف {{space}} بشكل دائم مع جميع مجلداتها وملاحظاتها على هذا الجهاز.",
- "deleteConfirmTeamDescription": "سيؤدي هذا إلى حذف {{space}} للجميع. ستبقى فرقها، ولكن سيفقد الأعضاء إمكانية الوصول إلى جميع مجلداتها وملاحظاتها.",
+ "deleteConfirmTeamDescription": "سيؤدي هذا إلى حذف {{space}} للجميع. ستبقى مجموعاتها، ولكن سيفقد الأعضاء إمكانية الوصول إلى جميع مجلداتها وملاحظاتها.",
"deleteTypeName": "اكتب {{space}} للتأكيد",
"couldNotDelete": "تعذر حذف المساحة",
"deleted": "تم حذف {{space}}",
@@ -1491,6 +1494,7 @@
"addPeople": "إضافة أشخاص",
"addedToTeam": "تمت إضافة {{name}} إلى {{team}}",
"removedFromTeam": "تمت إزالة {{name}} من {{team}}",
+ "stillViaGroups": "لا يزال {{name}} يملك الوصول عبر {{groups}}",
"roleUpdated": "تم تحديث الدور",
"you": "أنت",
"addFailed": "عدد الأشخاص الذين تعذرت إضافتهم: {{failed}} من أصل {{total}}",
@@ -1503,8 +1507,13 @@
"remove": "إزالة",
"removeConfirm": "إزالة {{name}} من {{space}}؟",
"removeConfirmDescription": "سيفقد هذا الشخص إمكانية الوصول إلى جميع الملاحظات في هذه المساحة.",
+ "removeKeepsGroupAccess": "سيحتفظون بالوصول عبر {{groups}}.",
"inviteFooter": "دعوة {{email}} إلى مساحة العمل…",
- "empty": "لم تتم إضافة أحد بعد"
+ "empty": "لم تتم إضافة أحد بعد",
+ "viaGroup": "عبر {{group}}",
+ "managedByGroup": "تمت الإضافة عبر {{group}}. أزل العضو من هناك.",
+ "roleFromGroup": "مشرف عبر {{group}}. غيّر ذلك هناك.",
+ "invited": "تم إرسال الدعوة إلى {{email}}"
},
"invitedTo_zero": "ستنضم إلى {{count}} مساحات فريق",
"invitedTo_one": "ستنضم إلى {{count}} مساحة فريق",
@@ -1512,23 +1521,17 @@
"invitedTo_few": "ستنضم إلى {{count}} مساحات فريق",
"invitedTo_many": "ستنضم إلى {{count}} مساحة فريق",
"invitedTo_other": "ستنضم إلى {{count}} مساحة فريق",
+ "invitedToSpaces": "ستنضم إلى {{spaces}}",
"teamsMembers": {
- "title": "الفرق والأعضاء في {{space}}",
- "noTeams": "لا توجد فرق لديها وصول إلى هذه المساحة بعد. يمكن فقط لمسؤولي مساحة العمل رؤيتها.",
- "addTeamLabel": "إضافة فريق إلى هذه المساحة",
- "chooseTeam": "اختيار فريق…",
+ "title": "أعضاء {{space}}",
+ "noTeams": "لا توجد مجموعات لديها وصول إلى هذه المساحة بعد.",
+ "addTeamLabel": "إضافة مجموعة إلى هذه المساحة",
+ "chooseTeam": "اختيار مجموعة…",
"teamAdded": "تمت إضافة {{team}} إلى {{space}}",
"teamRemoved": "تمت إزالة {{team}} من {{space}}",
"removeTeamFromSpace": "إزالة من المساحة",
"removeTeamConfirm": "إزالة {{team}} من {{space}}؟",
- "removeTeamConfirmDescription": "سيفقد أعضاؤه إمكانية الوصول إلى هذه المساحة ما لم يشملهم فريق آخر معين.",
- "lastTeamWarning": "هذا هو الفريق الوحيد الذي لديه وصول إلى هذه المساحة. بعد إزالته، سيحتفظ مسؤولو مساحة العمل فقط بإمكانية الوصول.",
- "affectsOtherSpaces_zero": "تسري التغييرات التي تُجرى على {{team}} أيضًا على {{count}} مساحات أخرى يمكنه الوصول إليها.",
- "affectsOtherSpaces_one": "تسري التغييرات التي تُجرى على {{team}} أيضًا على {{count}} مساحة أخرى يمكنه الوصول إليها.",
- "affectsOtherSpaces_two": "تسري التغييرات التي تُجرى على {{team}} أيضًا على {{count}} مساحتين أخريين يمكنه الوصول إليهما.",
- "affectsOtherSpaces_few": "تسري التغييرات التي تُجرى على {{team}} أيضًا على {{count}} مساحات أخرى يمكنه الوصول إليها.",
- "affectsOtherSpaces_many": "تسري التغييرات التي تُجرى على {{team}} أيضًا على {{count}} مساحةً أخرى يمكنه الوصول إليها.",
- "affectsOtherSpaces_other": "تسري التغييرات التي تُجرى على {{team}} أيضًا على {{count}} مساحة أخرى يمكنه الوصول إليها.",
+ "removeTeamConfirmDescription": "سيفقد أعضاؤها إمكانية الوصول إلى هذه المساحة ما لم يكونوا مضافين مباشرةً أو تشملهم مجموعة أخرى.",
"accessLabel": "صلاحية الوصول إلى المساحة",
"accessAdmin": "مسؤول",
"accessMember": "عضو",
@@ -1536,10 +1539,12 @@
"accessHint": "يدير مسؤولو {{team}} هذه المساحة فقط عندما يتم تعيين وصولها إلى مسؤول (Admin)."
},
"teams": {
- "assignLabel": "الفرق",
- "newTeam": "فريق جديد",
- "newTeamNameLabel": "اسم الفريق",
- "loadError": "تعذر تحميل الفرق."
+ "newTeam": "مجموعة جديدة",
+ "loadError": "تعذر تحميل المجموعات."
+ },
+ "groups": {
+ "title": "المجموعات التي لديها وصول",
+ "optional": "المجموعات (اختياري)"
}
},
"structureIntro": {
@@ -1555,7 +1560,7 @@
},
"teamSpace": {
"title": "مساحة الفريق",
- "description": "منطقة مشتركة داخل مساحة العمل. يمنح فريق واحد أو أكثر الوصول إليها."
+ "description": "منطقة مشتركة داخل مساحة العمل. أضف أشخاصًا أو مجموعات لمنحهم الوصول."
},
"contents": "يمكن أن تحتوي كل مساحة على مجلدات وملاحظات.",
"done": "فهمت",
@@ -2324,7 +2329,7 @@
"tab": {
"general": "عام",
"members": "الأعضاء",
- "teams": "الفرق",
+ "teams": "المجموعات",
"developer": "للمطورين"
},
"role": {
@@ -2388,14 +2393,14 @@
"errorTitle": "تعذر تحديث الطلب"
},
"teams": {
- "title": "الفرق",
- "description": "مجموعات من أعضاء مساحة العمل التي تمنح الوصول إلى مساحات الفريق.",
- "new": "فريق جديد",
- "empty": "لا توجد فرق بعد.",
- "createFirst": "أنشئ فريقك الأول",
+ "title": "المجموعات",
+ "description": "مجموعات من أعضاء مساحة العمل يمكن منحها الوصول إلى مساحات الفريق معًا.",
+ "new": "مجموعة جديدة",
+ "empty": "لا توجد مجموعات بعد.",
+ "createFirst": "أنشئ مجموعتك الأولى",
"addMembersLabel": "إضافة أعضاء",
- "createTitle": "إنشاء فريق",
- "nameLabel": "اسم الفريق",
+ "createTitle": "إنشاء مجموعة",
+ "nameLabel": "اسم المجموعة",
"memberCount_zero": "{{count}} أعضاء",
"memberCount_one": "{{count}} عضو",
"memberCount_two": "{{count}} عضوان",
@@ -2409,24 +2414,24 @@
"grantsAccessToSpaces_few": "يمنح الوصول إلى {{count}} مساحات",
"grantsAccessToSpaces_many": "يمنح الوصول إلى {{count}} مساحةً",
"grantsAccessToSpaces_other": "يمنح الوصول إلى {{count}} مساحة",
- "couldNotCreate": "تعذر إنشاء الفريق",
+ "couldNotCreate": "تعذر إنشاء المجموعة",
"created": "تم إنشاء {{team}}",
"deleted": "تم حذف {{team}}",
"deleteConfirmTitle": "حذف {{team}}؟",
- "deleteConfirmDescription": "هذا يؤرشف الفريق. سيفقد أعضاؤه أي وصول منحه إياهم.",
- "deleteConfirmSpaceAccess_zero": "يمنح هذا الفريق الوصول إلى {{count}} مساحات. سيفقد أعضاؤه هذا الوصول.",
- "deleteConfirmSpaceAccess_one": "يمنح هذا الفريق الوصول إلى {{count}} مساحة. سيفقد أعضاؤه هذا الوصول.",
- "deleteConfirmSpaceAccess_two": "يمنح هذا الفريق الوصول إلى {{count}} مساحتين. سيفقد أعضاؤه هذا الوصول.",
- "deleteConfirmSpaceAccess_few": "يمنح هذا الفريق الوصول إلى {{count}} مساحات. سيفقد أعضاؤه هذا الوصول.",
- "deleteConfirmSpaceAccess_many": "يمنح هذا الفريق الوصول إلى {{count}} مساحةً. سيفقد أعضاؤه هذا الوصول.",
- "deleteConfirmSpaceAccess_other": "يمنح هذا الفريق الوصول إلى {{count}} مساحة. سيفقد أعضاؤه هذا الوصول.",
+ "deleteConfirmDescription": "هذا يؤرشف المجموعة. سيفقد أعضاؤها أي وصول منحته إياهم.",
+ "deleteConfirmSpaceAccess_zero": "تمنح هذه المجموعة الوصول إلى {{count}} مساحات. سيفقد أعضاؤها هذا الوصول.",
+ "deleteConfirmSpaceAccess_one": "تمنح هذه المجموعة الوصول إلى {{count}} مساحة. سيفقد أعضاؤها هذا الوصول.",
+ "deleteConfirmSpaceAccess_two": "تمنح هذه المجموعة الوصول إلى {{count}} مساحتين. سيفقد أعضاؤها هذا الوصول.",
+ "deleteConfirmSpaceAccess_few": "تمنح هذه المجموعة الوصول إلى {{count}} مساحات. سيفقد أعضاؤها هذا الوصول.",
+ "deleteConfirmSpaceAccess_many": "تمنح هذه المجموعة الوصول إلى {{count}} مساحةً. سيفقد أعضاؤها هذا الوصول.",
+ "deleteConfirmSpaceAccess_other": "تمنح هذه المجموعة الوصول إلى {{count}} مساحة. سيفقد أعضاؤها هذا الوصول.",
"members": {
"title": "أعضاء {{team}}",
"removeConfirm": "إزالة {{name}} من {{team}}؟",
- "leave": "مغادرة الفريق",
+ "leave": "مغادرة المجموعة",
"leftTeam": "لقد غادرت {{team}}",
"leaveConfirm": "مغادرة {{team}}؟",
- "leaveConfirmDescription": "ستفقد إمكانية الوصول إلى المساحات المخصصة لهذا الفريق ما لم يضمك فريق آخر."
+ "leaveConfirmDescription": "ستفقد إمكانية الوصول إلى المساحات المخصصة لهذه المجموعة ما لم تكن مضافًا مباشرةً أو تضمك مجموعة أخرى."
}
},
"invites": {
diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json
index a93b48384..380c7388d 100644
--- a/src/locales/de/translation.json
+++ b/src/locales/de/translation.json
@@ -1592,7 +1592,7 @@
"tab": {
"general": "Allgemein",
"members": "Mitglieder",
- "teams": "Teams",
+ "teams": "Gruppen",
"developer": "Entwickler"
},
"role": {
@@ -1650,33 +1650,33 @@
"errorTitle": "Anfrage konnte nicht aktualisiert werden"
},
"teams": {
- "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",
+ "title": "Gruppen",
+ "description": "Gruppen von Workspace-Mitgliedern, denen gemeinsam Zugriff auf Team-Spaces gewährt werden kann.",
+ "new": "Neue Gruppe",
+ "empty": "Noch keine Gruppen.",
+ "createFirst": "Erstelle deine erste Gruppe",
"addMembersLabel": "Mitglieder hinzufügen",
- "createTitle": "Team erstellen",
- "nameLabel": "Teamname",
+ "createTitle": "Gruppe erstellen",
+ "nameLabel": "Gruppenname",
"memberCount_one": "{{count}} Mitglied",
"memberCount_other": "{{count}} Mitglieder",
"membersButton": "Mitglieder",
"grantsAccessToSpaces_one": "Gewährt Zugriff auf {{count}} Space",
"grantsAccessToSpaces_other": "Gewährt Zugriff auf {{count}} Spaces",
- "couldNotCreate": "Team konnte nicht erstellt werden",
+ "couldNotCreate": "Gruppe konnte nicht erstellt werden",
"created": "{{team}} erstellt",
"deleted": "{{team}} gelöscht",
"deleteConfirmTitle": "{{team}} löschen?",
- "deleteConfirmDescription": "Das Team wird archiviert. Seine Mitglieder verlieren den dadurch gewährten Zugriff.",
- "deleteConfirmSpaceAccess_one": "Dieses Team gewährt Zugriff auf {{count}} Space. Seine Mitglieder verlieren diesen Zugriff.",
- "deleteConfirmSpaceAccess_other": "Dieses Team gewährt Zugriff auf {{count}} Spaces. Seine Mitglieder verlieren diesen Zugriff.",
+ "deleteConfirmDescription": "Die Gruppe wird archiviert. Ihre Mitglieder verlieren den dadurch gewährten Zugriff.",
+ "deleteConfirmSpaceAccess_one": "Diese Gruppe gewährt Zugriff auf {{count}} Space. Ihre Mitglieder verlieren diesen Zugriff.",
+ "deleteConfirmSpaceAccess_other": "Diese Gruppe gewährt Zugriff auf {{count}} Spaces. Ihre Mitglieder verlieren diesen Zugriff.",
"members": {
"title": "Mitglieder von {{team}}",
"removeConfirm": "{{name}} aus {{team}} entfernen?",
- "leave": "Team verlassen",
+ "leave": "Gruppe verlassen",
"leftTeam": "Du hast {{team}} verlassen",
"leaveConfirm": "{{team}} verlassen?",
- "leaveConfirmDescription": "Du verlierst den Zugriff auf die Spaces, denen dieses Team zugewiesen ist, sofern dich kein anderes Team einschließt."
+ "leaveConfirmDescription": "Du verlierst den Zugriff auf die Spaces, denen diese Gruppe zugewiesen ist, sofern du nicht direkt hinzugefügt wurdest oder eine andere Gruppe dich einschließt."
}
},
"invites": {
@@ -3097,7 +3097,7 @@
"newSpace": "Neuer Team-Bereich",
"newSpaceInWorkspace": "Neuer Team-Bereich in {{workspace}}",
"createTitle": "Team-Bereich erstellen",
- "createDescription": "Ein gemeinsamer Bereich in einem Workspace, auf den ein oder mehrere Teams Zugriff haben.",
+ "createDescription": "Ein gemeinsamer Bereich in einem Workspace für die Personen und Gruppen, die du hinzufügst.",
"nameAndIconLabel": "Name und Symbol",
"create": "Erstellen",
"couldNotCreate": "Bereich konnte nicht erstellt werden",
@@ -3108,18 +3108,21 @@
"couldNotRename": "Bereich konnte nicht umbenannt werden",
"couldNotChangeEmoji": "Emoji konnte nicht geändert werden",
"deleteSpace": "Bereich löschen",
- "deleteHintTeam": "Entfernt diesen Space für alle. Seine Teams bleiben bestehen.",
+ "deleteHintTeam": "Entfernt diesen Space für alle. Seine Gruppen bleiben bestehen.",
"deleteHintLocal": "Löscht diesen Space mit seinen Ordnern und Notizen auf diesem Gerät endgültig.",
"leaveTitle": "Space verlassen",
"leaveDescription": "Deine Notizen bleiben für die anderen Mitglieder verfügbar.",
"leave": "Space verlassen",
"leaveConfirmTitle": "{{space}} verlassen?",
- "leaveConfirmDescription": "Du wirst aus {{teams}} entfernt und verlierst den Zugriff auf alle anderen Spaces, die diese Teams öffnen können.",
+ "leaveConfirmDescription": "Du wirst aus {{teams}} entfernt und verlierst den Zugriff auf alle anderen Spaces, die diese Gruppen öffnen können.",
+ "leaveDirectDescription": "Du verlierst den Zugriff auf diesen Space.",
+ "leaveKeepsGroupAccess": "Du behältst den Zugriff über {{groups}}.",
"left": "Du hast {{space}} verlassen",
+ "stillViaGroups": "Du hast weiterhin Zugriff auf {{space}} über {{groups}}.",
"couldNotLeave": "Space konnte nicht verlassen werden",
"deleteConfirmTitle": "Bereich löschen?",
"deleteConfirmDescription": "Dadurch werden {{space}} und alle zugehörigen Ordner und Notizen auf diesem Gerät endgültig gelöscht.",
- "deleteConfirmTeamDescription": "Dies löscht {{space}} für alle. Die Teams bleiben bestehen, aber Mitglieder verlieren den Zugriff auf alle Ordner und Notizen.",
+ "deleteConfirmTeamDescription": "Dies löscht {{space}} für alle. Die Gruppen 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",
@@ -3158,6 +3161,7 @@
"addPeople": "Personen hinzufügen",
"addedToTeam": "{{name}} wurde zu {{team}} hinzugefügt",
"removedFromTeam": "{{name}} wurde aus {{team}} entfernt",
+ "stillViaGroups": "{{name}} hat weiterhin Zugriff über {{groups}}",
"roleUpdated": "Rolle aktualisiert",
"you": "Du",
"addFailed": "{{failed}} von {{total}} Personen konnten nicht hinzugefügt werden",
@@ -3170,24 +3174,27 @@
"remove": "Entfernen",
"removeConfirm": "{{name}} aus {{space}} entfernen?",
"removeConfirmDescription": "Diese Person verliert den Zugriff auf alle Notizen in diesem Bereich.",
+ "removeKeepsGroupAccess": "Der Zugriff über {{groups}} bleibt bestehen.",
"inviteFooter": "{{email}} in den Workspace einladen…",
- "empty": "Noch niemand hinzugefügt"
+ "empty": "Noch niemand hinzugefügt",
+ "viaGroup": "über {{group}}",
+ "managedByGroup": "Über {{group}} hinzugefügt. Entferne die Person dort.",
+ "roleFromGroup": "Admin über {{group}}. Ändere es dort.",
+ "invited": "Einladung an {{email}} gesendet"
},
"invitedTo_one": "Sie treten {{count}} Team-Bereich bei",
"invitedTo_other": "Sie treten {{count}} Team-Bereichen bei",
+ "invitedToSpaces": "Du trittst {{spaces}} bei",
"teamsMembers": {
- "title": "Teams & Mitglieder von {{space}}",
- "noTeams": "Diesem Space sind noch keine Teams zugewiesen. Nur Workspace-Admins können ihn sehen.",
- "addTeamLabel": "Team zu diesem Bereich hinzufügen",
- "chooseTeam": "Team auswählen…",
+ "title": "Mitglieder von {{space}}",
+ "noTeams": "Diesem Space sind noch keine Gruppen zugewiesen.",
+ "addTeamLabel": "Gruppe zu diesem Space hinzufügen",
+ "chooseTeam": "Gruppe auswählen…",
"teamAdded": "{{team}} wurde zu {{space}} hinzugefügt",
"teamRemoved": "{{team}} wurde aus {{space}} entfernt",
"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 mit Zugriff auf diesen 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.",
+ "removeTeamConfirmDescription": "Ihre Mitglieder verlieren den Zugriff auf diesen Space, sofern sie nicht direkt hinzugefügt wurden oder eine andere Gruppe sie einschließt.",
"accessLabel": "Space-Zugriff",
"accessAdmin": "Admin",
"accessMember": "Mitglied",
@@ -3195,10 +3202,12 @@
"accessHint": "Admins von {{team}} verwalten diesen Space nur, wenn sein Zugriff auf Admin gesetzt ist."
},
"teams": {
- "assignLabel": "Teams",
- "newTeam": "Neues Team",
- "newTeamNameLabel": "Teamname",
- "loadError": "Teams konnten nicht geladen werden."
+ "newTeam": "Neue Gruppe",
+ "loadError": "Gruppen konnten nicht geladen werden."
+ },
+ "groups": {
+ "title": "Gruppen mit Zugriff",
+ "optional": "Gruppen (optional)"
}
},
"structureIntro": {
@@ -3214,7 +3223,7 @@
},
"teamSpace": {
"title": "Team-Bereich",
- "description": "Ein gemeinsamer Bereich in einem Workspace. Ein oder mehrere Teams gewähren Zugriff."
+ "description": "Ein gemeinsamer Bereich in einem Workspace. Füge Personen oder Gruppen hinzu, um ihnen Zugriff zu geben."
},
"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 4854966ff..3c0821a33 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -1592,7 +1592,7 @@
"tab": {
"general": "General",
"members": "Members",
- "teams": "Teams",
+ "teams": "Groups",
"developer": "Developer"
},
"role": {
@@ -1650,33 +1650,33 @@
"errorTitle": "Could not update the request"
},
"teams": {
- "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",
+ "title": "Groups",
+ "description": "Groups of workspace members that can be given access to team spaces together.",
+ "new": "New group",
+ "empty": "No groups yet.",
+ "createFirst": "Create your first group",
"addMembersLabel": "Add members",
- "createTitle": "Create team",
- "nameLabel": "Team name",
+ "createTitle": "Create group",
+ "nameLabel": "Group name",
"memberCount_one": "{{count}} member",
"memberCount_other": "{{count}} members",
"membersButton": "Members",
"grantsAccessToSpaces_one": "Grants access to {{count}} space",
"grantsAccessToSpaces_other": "Grants access to {{count}} spaces",
- "couldNotCreate": "Couldn't create team",
+ "couldNotCreate": "Couldn't create group",
"created": "Created {{team}}",
"deleted": "Deleted {{team}}",
"deleteConfirmTitle": "Delete {{team}}?",
- "deleteConfirmDescription": "This archives the team. Its members lose any access it granted.",
- "deleteConfirmSpaceAccess_one": "This team grants access to {{count}} space. Its members will lose that access.",
- "deleteConfirmSpaceAccess_other": "This team grants access to {{count}} spaces. Its members will lose that access.",
+ "deleteConfirmDescription": "This archives the group. Its members lose any access it granted.",
+ "deleteConfirmSpaceAccess_one": "This group grants access to {{count}} space. Its members will lose that access.",
+ "deleteConfirmSpaceAccess_other": "This group grants access to {{count}} spaces. Its members will lose that access.",
"members": {
"title": "Members of {{team}}",
"removeConfirm": "Remove {{name}} from {{team}}?",
- "leave": "Leave team",
+ "leave": "Leave group",
"leftTeam": "You left {{team}}",
"leaveConfirm": "Leave {{team}}?",
- "leaveConfirmDescription": "You'll lose access to the spaces this team is assigned to unless another team includes you."
+ "leaveConfirmDescription": "You'll lose access to the spaces this group is assigned to unless you were added directly or another group includes you."
}
},
"invites": {
@@ -3097,7 +3097,7 @@
"newSpace": "New team space",
"newSpaceInWorkspace": "New team space in {{workspace}}",
"createTitle": "Create team space",
- "createDescription": "A shared area inside a workspace that one or more teams can access.",
+ "createDescription": "A shared area inside a workspace for the people and groups you add.",
"nameAndIconLabel": "Name and icon",
"create": "Create",
"couldNotCreate": "Couldn't create space",
@@ -3108,18 +3108,21 @@
"couldNotRename": "Couldn't rename space",
"couldNotChangeEmoji": "Couldn't change emoji",
"deleteSpace": "Delete space",
- "deleteHintTeam": "Removes this space for everyone. Its teams remain.",
+ "deleteHintTeam": "Removes this space for everyone. Its groups remain.",
"deleteHintLocal": "Permanently deletes this space with its folders and notes on this device.",
"leaveTitle": "Leave space",
"leaveDescription": "Your notes stay available to the other members.",
"leave": "Leave space",
"leaveConfirmTitle": "Leave {{space}}?",
- "leaveConfirmDescription": "You'll be removed from {{teams}} and lose access to any other spaces those teams can open.",
+ "leaveConfirmDescription": "You'll be removed from {{teams}} and lose access to any other spaces those groups can open.",
+ "leaveDirectDescription": "You'll lose access to this space.",
+ "leaveKeepsGroupAccess": "You'll keep access through {{groups}}.",
"left": "Left {{space}}",
+ "stillViaGroups": "You still have access to {{space}} through {{groups}}.",
"couldNotLeave": "Couldn't leave 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. Its teams remain, but members lose access to all of its folders and notes.",
+ "deleteConfirmTeamDescription": "This deletes {{space}} for everyone. Its groups 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}}",
@@ -3158,6 +3161,7 @@
"addPeople": "Add people",
"addedToTeam": "{{name}} added to {{team}}",
"removedFromTeam": "{{name}} removed from {{team}}",
+ "stillViaGroups": "{{name}} still has access through {{groups}}",
"roleUpdated": "Role updated",
"you": "You",
"addFailed": "{{failed}} of {{total}} people couldn't be added",
@@ -3170,24 +3174,27 @@
"remove": "Remove",
"removeConfirm": "Remove {{name}} from {{space}}?",
"removeConfirmDescription": "They'll lose access to all notes in this space.",
+ "removeKeepsGroupAccess": "They'll keep access through {{groups}}.",
"inviteFooter": "Invite {{email}} to workspace…",
- "empty": "No one has been added yet"
+ "empty": "No one has been added yet",
+ "viaGroup": "via {{group}}",
+ "managedByGroup": "Added through {{group}}. Remove them there.",
+ "roleFromGroup": "Admin through {{group}}. Change it there.",
+ "invited": "Invitation sent to {{email}}"
},
"invitedTo_one": "You'll join {{count}} team space",
"invitedTo_other": "You'll join {{count}} team spaces",
+ "invitedToSpaces": "You'll join {{spaces}}",
"teamsMembers": {
- "title": "Teams & members of {{space}}",
- "noTeams": "No teams have access to this space yet. Only workspace admins can see it.",
- "addTeamLabel": "Add a team to this space",
- "chooseTeam": "Choose team…",
+ "title": "Members of {{space}}",
+ "noTeams": "No groups have access to this space yet.",
+ "addTeamLabel": "Add a group to this space",
+ "chooseTeam": "Choose group…",
"teamAdded": "{{team}} added to {{space}}",
"teamRemoved": "{{team}} removed from {{space}}",
"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 with access to this space. After removing it, only workspace admins keep access.",
- "affectsOtherSpaces_one": "Changes to {{team}} also apply to {{count}} other space it has access to.",
- "affectsOtherSpaces_other": "Changes to {{team}} also apply to {{count}} other spaces it has access to.",
+ "removeTeamConfirmDescription": "Its members will lose access to this space unless they were added directly or another group includes them.",
"accessLabel": "Space access",
"accessAdmin": "Admin",
"accessMember": "Member",
@@ -3195,10 +3202,12 @@
"accessHint": "Admins of {{team}} manage this space only when its access is set to Admin."
},
"teams": {
- "assignLabel": "Teams",
- "newTeam": "New team",
- "newTeamNameLabel": "Team name",
- "loadError": "Couldn't load teams."
+ "newTeam": "New group",
+ "loadError": "Couldn't load groups."
+ },
+ "groups": {
+ "title": "Groups with access",
+ "optional": "Groups (optional)"
}
},
"structureIntro": {
@@ -3214,7 +3223,7 @@
},
"teamSpace": {
"title": "Team space",
- "description": "A shared area inside a workspace. One or more teams grant access to it."
+ "description": "A shared area inside a workspace. Add people or groups to give them access."
},
"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 34c5967f9..4e1851607 100644
--- a/src/locales/es/translation.json
+++ b/src/locales/es/translation.json
@@ -2355,7 +2355,7 @@
"tab": {
"general": "General",
"members": "Miembros",
- "teams": "Equipos",
+ "teams": "Grupos",
"developer": "Desarrollador"
},
"role": {
@@ -2413,33 +2413,33 @@
"errorTitle": "No se pudo actualizar la solicitud"
},
"teams": {
- "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",
+ "title": "Grupos",
+ "description": "Grupos de miembros del workspace a los que se puede dar acceso a espacios de equipo de una vez.",
+ "new": "Nuevo grupo",
+ "empty": "Aún no hay grupos.",
+ "createFirst": "Crea tu primer grupo",
"addMembersLabel": "Añadir miembros",
- "createTitle": "Crear equipo",
- "nameLabel": "Nombre del equipo",
+ "createTitle": "Crear grupo",
+ "nameLabel": "Nombre del grupo",
"memberCount_one": "{{count}} miembro",
"memberCount_other": "{{count}} miembros",
"membersButton": "Miembros",
"grantsAccessToSpaces_one": "Da acceso a {{count}} espacio",
"grantsAccessToSpaces_other": "Da acceso a {{count}} espacios",
- "couldNotCreate": "No se pudo crear el equipo",
+ "couldNotCreate": "No se pudo crear el grupo",
"created": "{{team}} creado",
"deleted": "{{team}} eliminado",
"deleteConfirmTitle": "¿Eliminar {{team}}?",
- "deleteConfirmDescription": "Esto archiva el equipo. Sus miembros pierden el acceso que concedía.",
- "deleteConfirmSpaceAccess_one": "Este equipo da acceso a {{count}} espacio. Sus miembros perderán ese acceso.",
- "deleteConfirmSpaceAccess_other": "Este equipo da acceso a {{count}} espacios. Sus miembros perderán ese acceso.",
+ "deleteConfirmDescription": "Esto archiva el grupo. Sus miembros pierden el acceso que concedía.",
+ "deleteConfirmSpaceAccess_one": "Este grupo da acceso a {{count}} espacio. Sus miembros perderán ese acceso.",
+ "deleteConfirmSpaceAccess_other": "Este grupo da acceso a {{count}} espacios. Sus miembros perderán ese acceso.",
"members": {
"title": "Miembros de {{team}}",
"removeConfirm": "¿Quitar a {{name}} de {{team}}?",
- "leave": "Salir del equipo",
+ "leave": "Salir del grupo",
"leftTeam": "Saliste de {{team}}",
"leaveConfirm": "¿Salir de {{team}}?",
- "leaveConfirmDescription": "Perderás el acceso a los espacios asignados a este equipo salvo que otro equipo te incluya."
+ "leaveConfirmDescription": "Perderás el acceso a los espacios asignados a este grupo salvo que te hayan añadido directamente u otro grupo te incluya."
}
},
"invites": {
@@ -2807,7 +2807,7 @@
"newSpace": "Nuevo espacio de equipo",
"newSpaceInWorkspace": "Nuevo espacio de equipo en {{workspace}}",
"createTitle": "Crear espacio de equipo",
- "createDescription": "Un área compartida dentro de un workspace a la que pueden acceder uno o más equipos.",
+ "createDescription": "Un área compartida dentro de un workspace para las personas y grupos que añadas.",
"nameAndIconLabel": "Nombre e icono",
"create": "Crear",
"couldNotCreate": "No se pudo crear el espacio",
@@ -2818,18 +2818,21 @@
"couldNotRename": "No se pudo renombrar el espacio",
"couldNotChangeEmoji": "No se pudo cambiar el emoji",
"deleteSpace": "Eliminar espacio",
- "deleteHintTeam": "Elimina este espacio para todos. Sus equipos se conservan.",
+ "deleteHintTeam": "Elimina este espacio para todos. Sus grupos se conservan.",
"deleteHintLocal": "Elimina permanentemente este espacio con sus carpetas y notas en este dispositivo.",
"leaveTitle": "Salir del espacio",
"leaveDescription": "Tus notas seguirán disponibles para los demás miembros.",
"leave": "Salir del espacio",
"leaveConfirmTitle": "¿Salir de {{space}}?",
- "leaveConfirmDescription": "Se te quitará de {{teams}} y perderás el acceso a cualquier otro espacio que abran esos equipos.",
+ "leaveConfirmDescription": "Se te quitará de {{teams}} y perderás el acceso a cualquier otro espacio que abran esos grupos.",
+ "leaveDirectDescription": "Perderás el acceso a este espacio.",
+ "leaveKeepsGroupAccess": "Conservarás el acceso a través de {{groups}}.",
"left": "Saliste de {{space}}",
+ "stillViaGroups": "Sigues teniendo acceso a {{space}} a través de {{groups}}.",
"couldNotLeave": "No se pudo salir del espacio",
"deleteConfirmTitle": "¿Eliminar espacio?",
"deleteConfirmDescription": "Esto elimina permanentemente {{space}} con todas sus carpetas y notas en este dispositivo.",
- "deleteConfirmTeamDescription": "Esto elimina {{space}} para todos. Sus equipos permanecen, pero los miembros pierden el acceso a todas sus carpetas y notas.",
+ "deleteConfirmTeamDescription": "Esto elimina {{space}} para todos. Sus grupos 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",
@@ -2868,6 +2871,7 @@
"addPeople": "Añadir personas",
"addedToTeam": "{{name}} añadido a {{team}}",
"removedFromTeam": "{{name}} eliminado de {{team}}",
+ "stillViaGroups": "{{name}} sigue teniendo acceso a través de {{groups}}",
"roleUpdated": "Rol actualizado",
"you": "Tú",
"addFailed": "No se pudo añadir a {{failed}} de {{total}} personas",
@@ -2880,24 +2884,27 @@
"remove": "Quitar",
"removeConfirm": "¿Quitar a {{name}} de {{space}}?",
"removeConfirmDescription": "Perderá el acceso a todas las notas de este espacio.",
+ "removeKeepsGroupAccess": "Conservarán el acceso a través de {{groups}}.",
"inviteFooter": "Invitar a {{email}} al espacio de trabajo…",
- "empty": "Aún no se ha añadido a nadie"
+ "empty": "Aún no se ha añadido a nadie",
+ "viaGroup": "vía {{group}}",
+ "managedByGroup": "Añadido a través de {{group}}. Quítalo desde ahí.",
+ "roleFromGroup": "Administrador a través de {{group}}. Cámbialo allí.",
+ "invited": "Invitación enviada a {{email}}"
},
"invitedTo_one": "Te unirás a {{count}} espacio de equipo",
"invitedTo_other": "Te unirás a {{count}} espacios de equipo",
+ "invitedToSpaces": "Te unirás a {{spaces}}",
"teamsMembers": {
- "title": "Equipos y miembros de {{space}}",
- "noTeams": "Ningún equipo tiene acceso a este espacio todavía. Solo los administradores del workspace pueden verlo.",
- "addTeamLabel": "Añadir un equipo a este espacio",
- "chooseTeam": "Elegir equipo…",
+ "title": "Miembros de {{space}}",
+ "noTeams": "Ningún grupo tiene acceso a este espacio todavía.",
+ "addTeamLabel": "Añadir un grupo a este espacio",
+ "chooseTeam": "Elegir grupo…",
"teamAdded": "{{team}} añadido a {{space}}",
"teamRemoved": "{{team}} eliminado de {{space}}",
"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 con acceso a 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 al que tiene acceso.",
- "affectsOtherSpaces_other": "Los cambios en {{team}} también se aplican a {{count}} otros espacios a los que tiene acceso.",
+ "removeTeamConfirmDescription": "Sus miembros perderán el acceso a este espacio salvo que los hayan añadido directamente u otro grupo los incluya.",
"accessLabel": "Acceso al espacio",
"accessAdmin": "Administrador",
"accessMember": "Miembro",
@@ -2905,10 +2912,12 @@
"accessHint": "Los administradores de {{team}} solo gestionan este espacio cuando su acceso está establecido en Administrador."
},
"teams": {
- "assignLabel": "Equipos",
- "newTeam": "Nuevo equipo",
- "newTeamNameLabel": "Nombre del equipo",
- "loadError": "No se pudieron cargar los equipos."
+ "newTeam": "Nuevo grupo",
+ "loadError": "No se pudieron cargar los grupos."
+ },
+ "groups": {
+ "title": "Grupos con acceso",
+ "optional": "Grupos (opcional)"
}
},
"structureIntro": {
@@ -2924,7 +2933,7 @@
},
"teamSpace": {
"title": "Espacio de equipo",
- "description": "Un área compartida dentro de un workspace. Uno o más equipos conceden acceso a ella."
+ "description": "Un área compartida dentro de un workspace. Añade personas o grupos para darles acceso."
},
"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 e2d4048f3..5aa6b64e7 100644
--- a/src/locales/fr/translation.json
+++ b/src/locales/fr/translation.json
@@ -1592,7 +1592,7 @@
"tab": {
"general": "Général",
"members": "Membres",
- "teams": "Équipes",
+ "teams": "Groupes",
"developer": "Développeur"
},
"role": {
@@ -1650,33 +1650,33 @@
"errorTitle": "Impossible de mettre à jour la demande"
},
"teams": {
- "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",
+ "title": "Groupes",
+ "description": "Groupes de membres du workspace auxquels on peut donner accès aux espaces d'équipe en une fois.",
+ "new": "Nouveau groupe",
+ "empty": "Pas encore de groupes.",
+ "createFirst": "Créez votre premier groupe",
"addMembersLabel": "Ajouter des membres",
- "createTitle": "Créer une équipe",
- "nameLabel": "Nom de l'équipe",
+ "createTitle": "Créer un groupe",
+ "nameLabel": "Nom du groupe",
"memberCount_one": "{{count}} membre",
"memberCount_other": "{{count}} membres",
"membersButton": "Membres",
"grantsAccessToSpaces_one": "Donne accès à {{count}} espace",
"grantsAccessToSpaces_other": "Donne accès à {{count}} espaces",
- "couldNotCreate": "Impossible de créer l'équipe",
+ "couldNotCreate": "Impossible de créer le groupe",
"created": "{{team}} créée",
"deleted": "{{team}} supprimée",
"deleteConfirmTitle": "Supprimer {{team}} ?",
- "deleteConfirmDescription": "Cela archive l'équipe. Ses membres perdent l'accès qu'elle accordait.",
- "deleteConfirmSpaceAccess_one": "Cette équipe donne accès à {{count}} espace. Ses membres perdront cet accès.",
- "deleteConfirmSpaceAccess_other": "Cette équipe donne accès à {{count}} espaces. Ses membres perdront cet accès.",
+ "deleteConfirmDescription": "Cela archive le groupe. Ses membres perdent l'accès qu'il accordait.",
+ "deleteConfirmSpaceAccess_one": "Ce groupe donne accès à {{count}} espace. Ses membres perdront cet accès.",
+ "deleteConfirmSpaceAccess_other": "Ce groupe donne accès à {{count}} espaces. Ses membres perdront cet accès.",
"members": {
"title": "Membres de {{team}}",
"removeConfirm": "Retirer {{name}} de {{team}} ?",
- "leave": "Quitter l'équipe",
+ "leave": "Quitter le groupe",
"leftTeam": "Vous avez quitté {{team}}",
"leaveConfirm": "Quitter {{team}} ?",
- "leaveConfirmDescription": "Vous perdrez l'accès aux espaces auxquels cette équipe est rattachée, sauf si une autre équipe vous inclut."
+ "leaveConfirmDescription": "Vous perdrez l'accès aux espaces auxquels ce groupe est rattaché, sauf si vous y avez été ajouté directement ou si un autre groupe vous inclut."
}
},
"invites": {
@@ -3097,7 +3097,7 @@
"newSpace": "Nouvel espace d'équipe",
"newSpaceInWorkspace": "Nouvel espace d'équipe dans {{workspace}}",
"createTitle": "Créer un espace d'équipe",
- "createDescription": "Un espace partagé au sein d'un workspace, accessible à une ou plusieurs équipes.",
+ "createDescription": "Un espace partagé au sein d'un workspace pour les personnes et les groupes que vous ajoutez.",
"nameAndIconLabel": "Nom et icône",
"create": "Créer",
"couldNotCreate": "Impossible de créer l'espace",
@@ -3108,18 +3108,21 @@
"couldNotRename": "Impossible de renommer l'espace",
"couldNotChangeEmoji": "Impossible de changer l'emoji",
"deleteSpace": "Supprimer l'espace",
- "deleteHintTeam": "Supprime cet espace pour tout le monde. Ses équipes sont conservées.",
+ "deleteHintTeam": "Supprime cet espace pour tout le monde. Ses groupes sont conservés.",
"deleteHintLocal": "Supprime définitivement cet espace, ses dossiers et ses notes sur cet appareil.",
"leaveTitle": "Quitter l'espace",
"leaveDescription": "Vos notes restent accessibles aux autres membres.",
"leave": "Quitter l'espace",
"leaveConfirmTitle": "Quitter {{space}} ?",
- "leaveConfirmDescription": "Vous serez retiré de {{teams}} et perdrez l'accès aux autres espaces ouverts par ces équipes.",
+ "leaveConfirmDescription": "Vous serez retiré de {{teams}} et perdrez l'accès aux autres espaces ouverts par ces groupes.",
+ "leaveDirectDescription": "Vous perdrez l'accès à cet espace.",
+ "leaveKeepsGroupAccess": "Vous garderez l'accès via {{groups}}.",
"left": "Vous avez quitté {{space}}",
+ "stillViaGroups": "Vous avez toujours accès à {{space}} via {{groups}}.",
"couldNotLeave": "Impossible de quitter 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. Ses équipes subsistent, mais les membres perdent l'accès à tous ses dossiers et notes.",
+ "deleteConfirmTeamDescription": "Cela supprime {{space}} pour tout le monde. Ses groupes 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é",
@@ -3158,6 +3161,7 @@
"addPeople": "Ajouter des personnes",
"addedToTeam": "{{name}} ajouté à {{team}}",
"removedFromTeam": "{{name}} retiré de {{team}}",
+ "stillViaGroups": "{{name}} a toujours accès via {{groups}}",
"roleUpdated": "Rôle mis à jour",
"you": "Vous",
"addFailed": "Impossible d'ajouter {{failed}} personnes sur {{total}}",
@@ -3170,24 +3174,27 @@
"remove": "Retirer",
"removeConfirm": "Retirer {{name}} de {{space}} ?",
"removeConfirmDescription": "Cette personne perdra l'accès à toutes les notes de cet espace.",
+ "removeKeepsGroupAccess": "L'accès via {{groups}} est conservé.",
"inviteFooter": "Inviter {{email}} dans l'espace de travail…",
- "empty": "Personne n'a encore été ajouté"
+ "empty": "Personne n'a encore été ajouté",
+ "viaGroup": "via {{group}}",
+ "managedByGroup": "Ajouté via {{group}}. Retirez-le depuis ce groupe.",
+ "roleFromGroup": "Admin via {{group}}. Modifiez-le là-bas.",
+ "invited": "Invitation envoyée à {{email}}"
},
"invitedTo_one": "Vous rejoindrez {{count}} espace d'équipe",
"invitedTo_other": "Vous rejoindrez {{count}} espaces d'équipe",
+ "invitedToSpaces": "Vous rejoindrez {{spaces}}",
"teamsMembers": {
- "title": "Équipes et membres de {{space}}",
- "noTeams": "Aucune équipe n'est encore rattachée à cet espace. Seuls les administrateurs du workspace peuvent le voir.",
- "addTeamLabel": "Ajouter une équipe à cet espace",
- "chooseTeam": "Choisir une équipe…",
+ "title": "Membres de {{space}}",
+ "noTeams": "Aucun groupe n'est encore rattaché à cet espace.",
+ "addTeamLabel": "Ajouter un groupe à cet espace",
+ "chooseTeam": "Choisir un groupe…",
"teamAdded": "{{team}} ajoutée à {{space}}",
"teamRemoved": "{{team}} retirée de {{space}}",
"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 auquel elle a accès.",
- "affectsOtherSpaces_other": "Les modifications de {{team}} s'appliquent aussi à {{count}} autres espaces auxquels elle a accès.",
+ "removeTeamConfirmDescription": "Ses membres perdront l'accès à cet espace, sauf s'ils ont été ajoutés directement ou si un autre groupe les inclut.",
"accessLabel": "Accès à l'espace",
"accessAdmin": "Administrateur",
"accessMember": "Membre",
@@ -3195,10 +3202,12 @@
"accessHint": "Les administrateurs de {{team}} ne gèrent cet espace que lorsque son accès est défini sur Administrateur."
},
"teams": {
- "assignLabel": "Équipes",
- "newTeam": "Nouvelle équipe",
- "newTeamNameLabel": "Nom de l'équipe",
- "loadError": "Impossible de charger les équipes."
+ "newTeam": "Nouveau groupe",
+ "loadError": "Impossible de charger les groupes."
+ },
+ "groups": {
+ "title": "Groupes ayant accès",
+ "optional": "Groupes (facultatif)"
}
},
"structureIntro": {
@@ -3214,7 +3223,7 @@
},
"teamSpace": {
"title": "Espace d'équipe",
- "description": "Un espace partagé au sein d'un workspace. Une ou plusieurs équipes y donnent accès."
+ "description": "Un espace partagé au sein d'un workspace. Ajoutez des personnes ou des groupes pour leur donner 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 1267751d3..42b1221cd 100644
--- a/src/locales/it/translation.json
+++ b/src/locales/it/translation.json
@@ -2302,7 +2302,7 @@
"tab": {
"general": "Generale",
"members": "Membri",
- "teams": "Team",
+ "teams": "Gruppi",
"developer": "Sviluppatore"
},
"role": {
@@ -2360,33 +2360,33 @@
"errorTitle": "Impossibile aggiornare la richiesta"
},
"teams": {
- "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",
+ "title": "Gruppi",
+ "description": "Gruppi di membri del workspace a cui concedere insieme l'accesso agli spazi di team.",
+ "new": "Nuovo gruppo",
+ "empty": "Ancora nessun gruppo.",
+ "createFirst": "Crea il tuo primo gruppo",
"addMembersLabel": "Aggiungi membri",
- "createTitle": "Crea team",
- "nameLabel": "Nome del team",
+ "createTitle": "Crea gruppo",
+ "nameLabel": "Nome del gruppo",
"memberCount_one": "{{count}} membro",
"memberCount_other": "{{count}} membri",
"membersButton": "Membri",
"grantsAccessToSpaces_one": "Dà accesso a {{count}} spazio",
"grantsAccessToSpaces_other": "Dà accesso a {{count}} spazi",
- "couldNotCreate": "Impossibile creare il team",
+ "couldNotCreate": "Impossibile creare il gruppo",
"created": "{{team}} creato",
"deleted": "{{team}} eliminato",
"deleteConfirmTitle": "Eliminare {{team}}?",
- "deleteConfirmDescription": "Questo archivia il team. I suoi membri perdono l'accesso che concedeva.",
- "deleteConfirmSpaceAccess_one": "Questo team dà accesso a {{count}} spazio. I suoi membri perderanno questo accesso.",
- "deleteConfirmSpaceAccess_other": "Questo team dà accesso a {{count}} spazi. I suoi membri perderanno questo accesso.",
+ "deleteConfirmDescription": "Questo archivia il gruppo. I suoi membri perdono l'accesso che concedeva.",
+ "deleteConfirmSpaceAccess_one": "Questo gruppo dà accesso a {{count}} spazio. I suoi membri perderanno questo accesso.",
+ "deleteConfirmSpaceAccess_other": "Questo gruppo dà accesso a {{count}} spazi. I suoi membri perderanno questo accesso.",
"members": {
"title": "Membri di {{team}}",
"removeConfirm": "Rimuovere {{name}} da {{team}}?",
- "leave": "Lascia il team",
+ "leave": "Lascia il gruppo",
"leftTeam": "Hai lasciato {{team}}",
"leaveConfirm": "Lasciare {{team}}?",
- "leaveConfirmDescription": "Perderai l'accesso agli spazi assegnati a questo team, a meno che un altro team non ti includa."
+ "leaveConfirmDescription": "Perderai l'accesso agli spazi assegnati a questo gruppo, a meno che tu non sia stato aggiunto direttamente o un altro gruppo non ti includa."
}
},
"invites": {
@@ -2754,7 +2754,7 @@
"newSpace": "Nuovo spazio del team",
"newSpaceInWorkspace": "Nuovo spazio del team in {{workspace}}",
"createTitle": "Crea spazio del team",
- "createDescription": "Un'area condivisa all'interno di un workspace a cui possono accedere uno o più team.",
+ "createDescription": "Un'area condivisa all'interno di un workspace per le persone e i gruppi che aggiungi.",
"nameAndIconLabel": "Nome e icona",
"create": "Crea",
"couldNotCreate": "Impossibile creare lo spazio",
@@ -2765,18 +2765,21 @@
"couldNotRename": "Impossibile rinominare lo spazio",
"couldNotChangeEmoji": "Impossibile cambiare l'emoji",
"deleteSpace": "Elimina spazio",
- "deleteHintTeam": "Rimuove questo spazio per tutti. I suoi team restano.",
+ "deleteHintTeam": "Rimuove questo spazio per tutti. I suoi gruppi restano.",
"deleteHintLocal": "Elimina definitivamente questo spazio con le sue cartelle e note su questo dispositivo.",
"leaveTitle": "Lascia lo spazio",
"leaveDescription": "Le tue note restano disponibili per gli altri membri.",
"leave": "Lascia lo spazio",
"leaveConfirmTitle": "Lasciare {{space}}?",
- "leaveConfirmDescription": "Verrai rimosso da {{teams}} e perderai l'accesso agli altri spazi che quei team possono aprire.",
+ "leaveConfirmDescription": "Verrai rimosso da {{teams}} e perderai l'accesso agli altri spazi che quei gruppi possono aprire.",
+ "leaveDirectDescription": "Perderai l'accesso a questo spazio.",
+ "leaveKeepsGroupAccess": "Manterrai l'accesso tramite {{groups}}.",
"left": "Hai lasciato {{space}}",
+ "stillViaGroups": "Hai ancora accesso a {{space}} tramite {{groups}}.",
"couldNotLeave": "Impossibile lasciare lo 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 suoi team restano, ma i membri perdono l'accesso a tutte le cartelle e note.",
+ "deleteConfirmTeamDescription": "Questo elimina {{space}} per tutti. I suoi gruppi 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",
@@ -2815,6 +2818,7 @@
"addPeople": "Aggiungi persone",
"addedToTeam": "{{name}} aggiunto a {{team}}",
"removedFromTeam": "{{name}} rimosso da {{team}}",
+ "stillViaGroups": "{{name}} ha ancora accesso tramite {{groups}}",
"roleUpdated": "Ruolo aggiornato",
"you": "Tu",
"addFailed": "Impossibile aggiungere {{failed}} persone su {{total}}",
@@ -2827,24 +2831,27 @@
"remove": "Rimuovi",
"removeConfirm": "Rimuovere {{name}} da {{space}}?",
"removeConfirmDescription": "Questa persona perderà l'accesso a tutte le note di questo spazio.",
+ "removeKeepsGroupAccess": "Manterranno l'accesso tramite {{groups}}.",
"inviteFooter": "Invita {{email}} nell'area di lavoro…",
- "empty": "Nessuno è stato ancora aggiunto"
+ "empty": "Nessuno è stato ancora aggiunto",
+ "viaGroup": "tramite {{group}}",
+ "managedByGroup": "Aggiunto tramite {{group}}. Rimuovilo da lì.",
+ "roleFromGroup": "Admin tramite {{group}}. Modificalo lì.",
+ "invited": "Invito inviato a {{email}}"
},
"invitedTo_one": "Entrerai in {{count}} spazio del team",
"invitedTo_other": "Entrerai in {{count}} spazi del team",
+ "invitedToSpaces": "Entrerai in {{spaces}}",
"teamsMembers": {
- "title": "Team e membri di {{space}}",
- "noTeams": "Nessun team ha ancora accesso a questo spazio. Solo gli amministratori del workspace possono vederlo.",
- "addTeamLabel": "Aggiungi un team a questo spazio",
- "chooseTeam": "Scegli team…",
+ "title": "Membri di {{space}}",
+ "noTeams": "Nessun gruppo ha ancora accesso a questo spazio.",
+ "addTeamLabel": "Aggiungi un gruppo a questo spazio",
+ "chooseTeam": "Scegli gruppo…",
"teamAdded": "{{team}} aggiunto a {{space}}",
"teamRemoved": "{{team}} rimosso da {{space}}",
"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 con accesso a 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 a cui ha accesso.",
- "affectsOtherSpaces_other": "Le modifiche a {{team}} si applicano anche ad altri {{count}} spazi a cui ha accesso.",
+ "removeTeamConfirmDescription": "I suoi membri perderanno l'accesso a questo spazio, a meno che non siano stati aggiunti direttamente o un altro gruppo non li includa.",
"accessLabel": "Accesso allo spazio",
"accessAdmin": "Amministratore",
"accessMember": "Membro",
@@ -2852,10 +2859,12 @@
"accessHint": "Gli amministratori di {{team}} gestiscono questo spazio solo quando il suo accesso è impostato su Amministratore."
},
"teams": {
- "assignLabel": "Team",
- "newTeam": "Nuovo team",
- "newTeamNameLabel": "Nome del team",
- "loadError": "Impossibile caricare i team."
+ "newTeam": "Nuovo gruppo",
+ "loadError": "Impossibile caricare i gruppi."
+ },
+ "groups": {
+ "title": "Gruppi con accesso",
+ "optional": "Gruppi (facoltativo)"
}
},
"structureIntro": {
@@ -2871,7 +2880,7 @@
},
"teamSpace": {
"title": "Spazio del team",
- "description": "Un'area condivisa all'interno di un workspace. Uno o più team ne concedono l'accesso."
+ "description": "Un'area condivisa all'interno di un workspace. Aggiungi persone o gruppi per dare loro 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 1d19a10dc..a6f86f63c 100644
--- a/src/locales/ja/translation.json
+++ b/src/locales/ja/translation.json
@@ -2302,7 +2302,7 @@
"tab": {
"general": "一般",
"members": "メンバー",
- "teams": "チーム",
+ "teams": "グループ",
"developer": "開発者"
},
"role": {
@@ -2360,33 +2360,33 @@
"errorTitle": "リクエストを更新できませんでした"
},
"teams": {
- "title": "チーム",
- "description": "チームスペースへのアクセスを付与するワークスペースメンバーのグループ。",
- "new": "新しいチーム",
- "empty": "チームはまだありません。",
- "createFirst": "最初のチームを作成",
+ "title": "グループ",
+ "description": "チームスペースへのアクセスをまとめて付与できるワークスペースメンバーのグループ。",
+ "new": "新しいグループ",
+ "empty": "グループはまだありません。",
+ "createFirst": "最初のグループを作成",
"addMembersLabel": "メンバーを追加",
- "createTitle": "チームを作成",
- "nameLabel": "チーム名",
+ "createTitle": "グループを作成",
+ "nameLabel": "グループ名",
"memberCount_one": "{{count}}人のメンバー",
"memberCount_other": "{{count}}人のメンバー",
"membersButton": "メンバー",
"grantsAccessToSpaces_one": "{{count}} 件のスペースへのアクセスを付与しています",
"grantsAccessToSpaces_other": "{{count}} 件のスペースへのアクセスを付与しています",
- "couldNotCreate": "チームを作成できませんでした",
+ "couldNotCreate": "グループを作成できませんでした",
"created": "{{team}} を作成しました",
"deleted": "{{team}} を削除しました",
"deleteConfirmTitle": "{{team}} を削除しますか?",
- "deleteConfirmDescription": "チームをアーカイブします。このチームが付与していたアクセスは失われます。",
- "deleteConfirmSpaceAccess_one": "このチームは {{count}} 件のスペースへのアクセスを付与しています。メンバーはそのアクセスを失います。",
- "deleteConfirmSpaceAccess_other": "このチームは {{count}} 件のスペースへのアクセスを付与しています。メンバーはそのアクセスを失います。",
+ "deleteConfirmDescription": "グループをアーカイブします。このグループが付与していたアクセスは失われます。",
+ "deleteConfirmSpaceAccess_one": "このグループは {{count}} 件のスペースへのアクセスを付与しています。メンバーはそのアクセスを失います。",
+ "deleteConfirmSpaceAccess_other": "このグループは {{count}} 件のスペースへのアクセスを付与しています。メンバーはそのアクセスを失います。",
"members": {
"title": "{{team}} のメンバー",
"removeConfirm": "{{name}} を {{team}} から外しますか?",
- "leave": "チームから退出",
+ "leave": "グループから退出",
"leftTeam": "{{team}} から退出しました",
"leaveConfirm": "{{team}} から退出しますか?",
- "leaveConfirmDescription": "他のチームに含まれていない限り、このチームが付与するスペースへのアクセスを失います。"
+ "leaveConfirmDescription": "直接追加されているか他のグループに含まれていない限り、このグループが付与するスペースへのアクセスを失います。"
}
},
"invites": {
@@ -2682,7 +2682,7 @@
"newSpace": "新しいチームスペース",
"newSpaceInWorkspace": "{{workspace}} に新しいチームスペース",
"createTitle": "チームスペースを作成",
- "createDescription": "ワークスペース内の共有エリアで、1つ以上のチームがアクセスできます。",
+ "createDescription": "ワークスペース内の共有エリアです。追加した人やグループがアクセスできます。",
"nameAndIconLabel": "名前とアイコン",
"create": "作成",
"couldNotCreate": "スペースを作成できませんでした",
@@ -2693,18 +2693,21 @@
"couldNotRename": "スペースの名前を変更できませんでした",
"couldNotChangeEmoji": "絵文字を変更できませんでした",
"deleteSpace": "スペースを削除",
- "deleteHintTeam": "全員からこのスペースを削除します。チームは残ります。",
+ "deleteHintTeam": "全員からこのスペースを削除します。グループは残ります。",
"deleteHintLocal": "このデバイス上のフォルダーとノートを含め、このスペースを完全に削除します。",
"leaveTitle": "スペースから退出",
"leaveDescription": "あなたのノートは他のメンバーが引き続き利用できます。",
"leave": "スペースから退出",
"leaveConfirmTitle": "{{space}} から退出しますか?",
- "leaveConfirmDescription": "{{teams}} から削除され、それらのチームが開ける他のスペースへのアクセスも失われます。",
+ "leaveConfirmDescription": "{{teams}} から削除され、それらのグループが開ける他のスペースへのアクセスも失われます。",
+ "leaveDirectDescription": "このスペースへのアクセスを失います。",
+ "leaveKeepsGroupAccess": "{{groups}} 経由のアクセスは維持されます。",
"left": "{{space}} から退出しました",
+ "stillViaGroups": "{{groups}} 経由で引き続き {{space}} にアクセスできます。",
"couldNotLeave": "スペースから退出できませんでした",
"deleteConfirmTitle": "スペースを削除しますか?",
"deleteConfirmDescription": "{{space}}とそのすべてのフォルダとノートがこのデバイスから完全に削除されます。",
- "deleteConfirmTeamDescription": "{{space}} を全員に対して削除します。チームは残りますが、メンバーはすべてのフォルダーとノートへのアクセスを失います。",
+ "deleteConfirmTeamDescription": "{{space}} を全員に対して削除します。グループは残りますが、メンバーはすべてのフォルダーとノートへのアクセスを失います。",
"deleteTypeName": "確認のため {{space}} と入力してください",
"couldNotDelete": "スペースを削除できませんでした",
"deleted": "{{space}} を削除しました",
@@ -2743,6 +2746,7 @@
"addPeople": "メンバーを追加",
"addedToTeam": "{{name}} を {{team}} に追加しました",
"removedFromTeam": "{{name}} を {{team}} から削除しました",
+ "stillViaGroups": "{{name}} は {{groups}} 経由で引き続きアクセスできます",
"roleUpdated": "役割を更新しました",
"you": "自分",
"addFailed": "{{total}}人中{{failed}}人を追加できませんでした",
@@ -2755,24 +2759,27 @@
"remove": "削除",
"removeConfirm": "{{name}} を {{space}} から削除しますか?",
"removeConfirmDescription": "このスペースのすべてのノートにアクセスできなくなります。",
+ "removeKeepsGroupAccess": "{{groups}} 経由のアクセスは維持されます。",
"inviteFooter": "{{email}} をワークスペースに招待…",
- "empty": "まだ誰も追加されていません"
+ "empty": "まだ誰も追加されていません",
+ "viaGroup": "{{group}} 経由",
+ "managedByGroup": "{{group}} 経由で追加されています。削除はそのグループで行ってください。",
+ "roleFromGroup": "{{group}} 経由の管理者です。変更はそちらで行ってください。",
+ "invited": "{{email}} に招待を送信しました"
},
"invitedTo_one": "{{count}} 件のチームスペースに参加します",
"invitedTo_other": "{{count}} 件のチームスペースに参加します",
+ "invitedToSpaces": "{{spaces}} に参加します",
"teamsMembers": {
- "title": "{{space}} のチームとメンバー",
- "noTeams": "このスペースにアクセスできるチームはまだありません。ワークスペース管理者のみが閲覧できます。",
- "addTeamLabel": "このスペースにチームを追加",
- "chooseTeam": "チームを選択…",
+ "title": "{{space}} のメンバー",
+ "noTeams": "このスペースにアクセスできるグループはまだありません。",
+ "addTeamLabel": "このスペースにグループを追加",
+ "chooseTeam": "グループを選択…",
"teamAdded": "{{team}} を {{space}} に追加しました",
"teamRemoved": "{{team}} を {{space}} から削除しました",
"removeTeamFromSpace": "スペースから外す",
"removeTeamConfirm": "{{team}} を {{space}} から外しますか?",
- "removeTeamConfirmDescription": "他の割り当て済みチームに含まれていない限り、そのメンバーはこのスペースへのアクセスを失います。",
- "lastTeamWarning": "このスペースにアクセスできる唯一のチームです。外すと、ワークスペース管理者のみがアクセスを保持します。",
- "affectsOtherSpaces_one": "{{team}} への変更は、このチームがアクセスできる他 {{count}} 件のスペースにも適用されます。",
- "affectsOtherSpaces_other": "{{team}} への変更は、このチームがアクセスできる他 {{count}} 件のスペースにも適用されます。",
+ "removeTeamConfirmDescription": "直接追加されているか他の割り当て済みグループに含まれていない限り、そのメンバーはこのスペースへのアクセスを失います。",
"accessLabel": "スペースへのアクセス",
"accessAdmin": "管理者",
"accessMember": "メンバー",
@@ -2780,10 +2787,12 @@
"accessHint": "{{team}} の管理者は、アクセスが「管理者」に設定されている場合のみこのスペースを管理できます。"
},
"teams": {
- "assignLabel": "チーム",
- "newTeam": "新しいチーム",
- "newTeamNameLabel": "チーム名",
- "loadError": "チームを読み込めませんでした。"
+ "newTeam": "新しいグループ",
+ "loadError": "グループを読み込めませんでした。"
+ },
+ "groups": {
+ "title": "アクセスできるグループ",
+ "optional": "グループ(任意)"
}
},
"structureIntro": {
@@ -2799,7 +2808,7 @@
},
"teamSpace": {
"title": "チームスペース",
- "description": "ワークスペース内の共有エリア。1つ以上のチームがアクセスを付与します。"
+ "description": "ワークスペース内の共有エリア。人やグループを追加してアクセスを付与します。"
},
"contents": "各スペースにはフォルダーとノートを作成できます。",
"done": "了解",
diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
index d84c6228e..5d8d7b33c 100644
--- a/src/locales/pt/translation.json
+++ b/src/locales/pt/translation.json
@@ -2281,7 +2281,7 @@
"tab": {
"general": "Geral",
"members": "Membros",
- "teams": "Equipes",
+ "teams": "Grupos",
"developer": "Desenvolvedor"
},
"role": {
@@ -2339,33 +2339,33 @@
"errorTitle": "Não foi possível atualizar o pedido"
},
"teams": {
- "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",
+ "title": "Grupos",
+ "description": "Grupos de membros do workspace que podem receber acesso a espaços de equipe de uma vez.",
+ "new": "Novo grupo",
+ "empty": "Nenhum grupo ainda.",
+ "createFirst": "Crie seu primeiro grupo",
"addMembersLabel": "Adicionar membros",
- "createTitle": "Criar equipe",
- "nameLabel": "Nome da equipe",
+ "createTitle": "Criar grupo",
+ "nameLabel": "Nome do grupo",
"memberCount_one": "{{count}} membro",
"memberCount_other": "{{count}} membros",
"membersButton": "Membros",
"grantsAccessToSpaces_one": "Dá acesso a {{count}} espaço",
"grantsAccessToSpaces_other": "Dá acesso a {{count}} espaços",
- "couldNotCreate": "Não foi possível criar a equipe",
+ "couldNotCreate": "Não foi possível criar o grupo",
"created": "{{team}} criada",
"deleted": "{{team}} excluída",
"deleteConfirmTitle": "Excluir {{team}}?",
- "deleteConfirmDescription": "Isso arquiva a equipe. Seus membros perdem o acesso que ela concedia.",
- "deleteConfirmSpaceAccess_one": "Esta equipe dá acesso a {{count}} espaço. Seus membros perderão esse acesso.",
- "deleteConfirmSpaceAccess_other": "Esta equipe dá acesso a {{count}} espaços. Seus membros perderão esse acesso.",
+ "deleteConfirmDescription": "Isso arquiva o grupo. Seus membros perdem o acesso que ele concedia.",
+ "deleteConfirmSpaceAccess_one": "Este grupo dá acesso a {{count}} espaço. Seus membros perderão esse acesso.",
+ "deleteConfirmSpaceAccess_other": "Este grupo dá acesso a {{count}} espaços. Seus membros perderão esse acesso.",
"members": {
"title": "Membros de {{team}}",
"removeConfirm": "Remover {{name}} de {{team}}?",
- "leave": "Sair da equipe",
+ "leave": "Sair do grupo",
"leftTeam": "Você saiu de {{team}}",
"leaveConfirm": "Sair de {{team}}?",
- "leaveConfirmDescription": "Você perderá o acesso aos espaços atribuídos a esta equipe, a menos que outra equipe o inclua."
+ "leaveConfirmDescription": "Você perderá o acesso aos espaços atribuídos a este grupo, a menos que tenha sido adicionado diretamente ou outro grupo o inclua."
}
},
"invites": {
@@ -2754,7 +2754,7 @@
"newSpace": "Novo espaço de equipe",
"newSpaceInWorkspace": "Novo espaço de equipe em {{workspace}}",
"createTitle": "Criar espaço de equipe",
- "createDescription": "Uma área compartilhada dentro de um workspace que uma ou mais equipes podem acessar.",
+ "createDescription": "Uma área compartilhada dentro de um workspace para as pessoas e grupos que você adicionar.",
"nameAndIconLabel": "Nome e ícone",
"create": "Criar",
"couldNotCreate": "Não foi possível criar o espaço",
@@ -2765,18 +2765,21 @@
"couldNotRename": "Não foi possível renomear o espaço",
"couldNotChangeEmoji": "Não foi possível alterar o emoji",
"deleteSpace": "Excluir espaço",
- "deleteHintTeam": "Remove este espaço para todos. Suas equipes permanecem.",
+ "deleteHintTeam": "Remove este espaço para todos. Seus grupos permanecem.",
"deleteHintLocal": "Exclui permanentemente este espaço com suas pastas e notas neste dispositivo.",
"leaveTitle": "Sair do espaço",
"leaveDescription": "Suas notas continuam disponíveis para os outros membros.",
"leave": "Sair do espaço",
"leaveConfirmTitle": "Sair de {{space}}?",
- "leaveConfirmDescription": "Você será removido de {{teams}} e perderá o acesso a outros espaços que essas equipes podem abrir.",
+ "leaveConfirmDescription": "Você será removido de {{teams}} e perderá o acesso a outros espaços que esses grupos podem abrir.",
+ "leaveDirectDescription": "Você perderá o acesso a este espaço.",
+ "leaveKeepsGroupAccess": "Você manterá o acesso por meio de {{groups}}.",
"left": "Você saiu de {{space}}",
+ "stillViaGroups": "Você ainda tem acesso a {{space}} por meio de {{groups}}.",
"couldNotLeave": "Não foi possível sair do 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. Suas equipes permanecem, mas os membros perdem o acesso a todas as pastas e notas.",
+ "deleteConfirmTeamDescription": "Isso exclui {{space}} para todos. Seus grupos 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",
@@ -2815,6 +2818,7 @@
"addPeople": "Adicionar pessoas",
"addedToTeam": "{{name}} adicionado a {{team}}",
"removedFromTeam": "{{name}} removido de {{team}}",
+ "stillViaGroups": "{{name}} ainda tem acesso por meio de {{groups}}",
"roleUpdated": "Função atualizada",
"you": "Você",
"addFailed": "Não foi possível adicionar {{failed}} de {{total}} pessoas",
@@ -2827,24 +2831,27 @@
"remove": "Remover",
"removeConfirm": "Remover {{name}} de {{space}}?",
"removeConfirmDescription": "A pessoa perderá o acesso a todas as notas deste espaço.",
+ "removeKeepsGroupAccess": "O acesso por meio de {{groups}} será mantido.",
"inviteFooter": "Convidar {{email}} para o espaço de trabalho…",
- "empty": "Ninguém foi adicionado ainda"
+ "empty": "Ninguém foi adicionado ainda",
+ "viaGroup": "via {{group}}",
+ "managedByGroup": "Adicionado por meio de {{group}}. Remova a pessoa lá.",
+ "roleFromGroup": "Administrador por meio de {{group}}. Altere isso lá.",
+ "invited": "Convite enviado para {{email}}"
},
"invitedTo_one": "Você entrará em {{count}} espaço de equipe",
"invitedTo_other": "Você entrará em {{count}} espaços de equipe",
+ "invitedToSpaces": "Você entrará em {{spaces}}",
"teamsMembers": {
- "title": "Equipes e membros de {{space}}",
- "noTeams": "Nenhuma equipe tem acesso a este espaço ainda. Apenas administradores do workspace podem vê-lo.",
- "addTeamLabel": "Adicionar uma equipe a este espaço",
- "chooseTeam": "Escolher equipe…",
+ "title": "Membros de {{space}}",
+ "noTeams": "Nenhum grupo tem acesso a este espaço ainda.",
+ "addTeamLabel": "Adicionar um grupo a este espaço",
+ "chooseTeam": "Escolher grupo…",
"teamAdded": "{{team}} adicionada a {{space}}",
"teamRemoved": "{{team}} removida de {{space}}",
"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 com acesso a 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 ao qual ela tem acesso.",
- "affectsOtherSpaces_other": "Alterações em {{team}} também se aplicam a {{count}} outros espaços aos quais ela tem acesso.",
+ "removeTeamConfirmDescription": "Seus membros perderão o acesso a este espaço, a menos que tenham sido adicionados diretamente ou outro grupo os inclua.",
"accessLabel": "Acesso ao espaço",
"accessAdmin": "Administrador",
"accessMember": "Membro",
@@ -2852,10 +2859,12 @@
"accessHint": "Os administradores de {{team}} só gerenciam este espaço quando seu acesso está definido como Administrador."
},
"teams": {
- "assignLabel": "Equipes",
- "newTeam": "Nova equipe",
- "newTeamNameLabel": "Nome da equipe",
- "loadError": "Não foi possível carregar as equipes."
+ "newTeam": "Novo grupo",
+ "loadError": "Não foi possível carregar os grupos."
+ },
+ "groups": {
+ "title": "Grupos com acesso",
+ "optional": "Grupos (opcional)"
}
},
"structureIntro": {
@@ -2871,7 +2880,7 @@
},
"teamSpace": {
"title": "Espaço de equipe",
- "description": "Uma área compartilhada dentro de um workspace. Uma ou mais equipes concedem acesso a ela."
+ "description": "Uma área compartilhada dentro de um workspace. Adicione pessoas ou grupos para dar acesso a elas."
},
"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 5be698102..29eb51c14 100644
--- a/src/locales/ru/translation.json
+++ b/src/locales/ru/translation.json
@@ -2308,7 +2308,7 @@
"tab": {
"general": "Общие",
"members": "Участники",
- "teams": "Команды",
+ "teams": "Группы",
"developer": "Разработчик"
},
"role": {
@@ -2366,14 +2366,14 @@
"errorTitle": "Не удалось обновить запрос"
},
"teams": {
- "title": "Команды",
- "description": "Группы участников рабочего пространства, дающие доступ к командным пространствам.",
- "new": "Новая команда",
- "empty": "Команд пока нет.",
- "createFirst": "Создайте первую команду",
+ "title": "Группы",
+ "description": "Группы участников рабочего пространства, которым можно сразу дать доступ к командным пространствам.",
+ "new": "Новая группа",
+ "empty": "Групп пока нет.",
+ "createFirst": "Создайте первую группу",
"addMembersLabel": "Добавить участников",
- "createTitle": "Создать команду",
- "nameLabel": "Название команды",
+ "createTitle": "Создать группу",
+ "nameLabel": "Название группы",
"memberCount_one": "{{count}} участник",
"memberCount_few": "{{count}} участника",
"memberCount_many": "{{count}} участников",
@@ -2383,22 +2383,22 @@
"grantsAccessToSpaces_few": "Даёт доступ к {{count}} пространствам",
"grantsAccessToSpaces_many": "Даёт доступ к {{count}} пространствам",
"grantsAccessToSpaces_other": "Даёт доступ к {{count}} пространствам",
- "couldNotCreate": "Не удалось создать команду",
+ "couldNotCreate": "Не удалось создать группу",
"created": "{{team}} создана",
"deleted": "{{team}} удалена",
"deleteConfirmTitle": "Удалить {{team}}?",
- "deleteConfirmDescription": "Команда будет архивирована. Её участники потеряют предоставленный ею доступ.",
- "deleteConfirmSpaceAccess_one": "Эта команда даёт доступ к {{count}} пространству. Её участники потеряют этот доступ.",
- "deleteConfirmSpaceAccess_few": "Эта команда даёт доступ к {{count}} пространствам. Её участники потеряют этот доступ.",
- "deleteConfirmSpaceAccess_many": "Эта команда даёт доступ к {{count}} пространствам. Её участники потеряют этот доступ.",
- "deleteConfirmSpaceAccess_other": "Эта команда даёт доступ к {{count}} пространствам. Её участники потеряют этот доступ.",
+ "deleteConfirmDescription": "Группа будет архивирована. Её участники потеряют предоставленный ею доступ.",
+ "deleteConfirmSpaceAccess_one": "Эта группа даёт доступ к {{count}} пространству. Её участники потеряют этот доступ.",
+ "deleteConfirmSpaceAccess_few": "Эта группа даёт доступ к {{count}} пространствам. Её участники потеряют этот доступ.",
+ "deleteConfirmSpaceAccess_many": "Эта группа даёт доступ к {{count}} пространствам. Её участники потеряют этот доступ.",
+ "deleteConfirmSpaceAccess_other": "Эта группа даёт доступ к {{count}} пространствам. Её участники потеряют этот доступ.",
"members": {
"title": "Участники {{team}}",
"removeConfirm": "Убрать {{name}} из {{team}}?",
- "leave": "Покинуть команду",
+ "leave": "Покинуть группу",
"leftTeam": "Вы покинули {{team}}",
"leaveConfirm": "Покинуть {{team}}?",
- "leaveConfirmDescription": "Вы потеряете доступ к пространствам, к которым привязана эта команда, если вас не включает другая команда."
+ "leaveConfirmDescription": "Вы потеряете доступ к пространствам, к которым привязана эта группа, если вас не добавили напрямую и не включает другая группа."
}
},
"invites": {
@@ -2770,7 +2770,7 @@
"newSpace": "Новое командное пространство",
"newSpaceInWorkspace": "Новое командное пространство в {{workspace}}",
"createTitle": "Создать командное пространство",
- "createDescription": "Общая область внутри рабочего пространства, к которой имеют доступ одна или несколько команд.",
+ "createDescription": "Общая область внутри рабочего пространства для людей и групп, которых вы добавите.",
"nameAndIconLabel": "Название и значок",
"create": "Создать",
"couldNotCreate": "Не удалось создать пространство",
@@ -2781,18 +2781,21 @@
"couldNotRename": "Не удалось переименовать пространство",
"couldNotChangeEmoji": "Не удалось изменить эмодзи",
"deleteSpace": "Удалить пространство",
- "deleteHintTeam": "Удаляет это пространство для всех. Его команды сохраняются.",
+ "deleteHintTeam": "Удаляет это пространство для всех. Его группы сохраняются.",
"deleteHintLocal": "Безвозвратно удаляет это пространство вместе с папками и заметками на этом устройстве.",
"leaveTitle": "Покинуть пространство",
"leaveDescription": "Ваши заметки останутся доступны другим участникам.",
"leave": "Покинуть пространство",
"leaveConfirmTitle": "Покинуть {{space}}?",
- "leaveConfirmDescription": "Вы будете удалены из {{teams}} и потеряете доступ к другим пространствам, которые открывают эти команды.",
+ "leaveConfirmDescription": "Вы будете удалены из {{teams}} и потеряете доступ к другим пространствам, которые открывают эти группы.",
+ "leaveDirectDescription": "Вы потеряете доступ к этому пространству.",
+ "leaveKeepsGroupAccess": "Вы сохраните доступ через {{groups}}.",
"left": "Вы покинули {{space}}",
+ "stillViaGroups": "У вас остаётся доступ к {{space}} через {{groups}}.",
"couldNotLeave": "Не удалось покинуть пространство",
"deleteConfirmTitle": "Удалить пространство?",
"deleteConfirmDescription": "Пространство {{space}} со всеми его папками и заметками будет безвозвратно удалено с этого устройства.",
- "deleteConfirmTeamDescription": "Это удалит {{space}} для всех. Команды сохранятся, но участники потеряют доступ ко всем папкам и заметкам.",
+ "deleteConfirmTeamDescription": "Это удалит {{space}} для всех. Группы сохранятся, но участники потеряют доступ ко всем папкам и заметкам.",
"deleteTypeName": "Введите {{space}} для подтверждения",
"couldNotDelete": "Не удалось удалить пространство",
"deleted": "{{space}} удалено",
@@ -2833,6 +2836,7 @@
"addPeople": "Добавить людей",
"addedToTeam": "{{name}} добавлен(а) в {{team}}",
"removedFromTeam": "{{name}} удалён(а) из {{team}}",
+ "stillViaGroups": "{{name}} по-прежнему имеет доступ через {{groups}}",
"roleUpdated": "Роль обновлена",
"you": "Вы",
"addFailed": "Не удалось добавить {{failed}} из {{total}} участников",
@@ -2845,28 +2849,29 @@
"remove": "Удалить",
"removeConfirm": "Удалить {{name}} из {{space}}?",
"removeConfirmDescription": "Этот участник потеряет доступ ко всем заметкам этого пространства.",
+ "removeKeepsGroupAccess": "Доступ через {{groups}} сохранится.",
"inviteFooter": "Пригласить {{email}} в рабочее пространство…",
- "empty": "Пока никто не добавлен"
+ "empty": "Пока никто не добавлен",
+ "viaGroup": "через {{group}}",
+ "managedByGroup": "Добавлен через {{group}}. Удалите участника там.",
+ "roleFromGroup": "Администратор через {{group}}. Измените это там.",
+ "invited": "Приглашение отправлено на {{email}}"
},
"invitedTo_one": "Вы присоединитесь к {{count}} командному пространству",
"invitedTo_few": "Вы присоединитесь к {{count}} командным пространствам",
"invitedTo_many": "Вы присоединитесь к {{count}} командным пространствам",
"invitedTo_other": "Вы присоединитесь к {{count}} командным пространствам",
+ "invitedToSpaces": "Вы присоединитесь к {{spaces}}",
"teamsMembers": {
- "title": "Команды и участники {{space}}",
- "noTeams": "К этому пространству пока не привязана ни одна команда. Его видят только администраторы рабочего пространства.",
- "addTeamLabel": "Добавить команду в это пространство",
- "chooseTeam": "Выберите команду…",
+ "title": "Участники {{space}}",
+ "noTeams": "К этому пространству пока не привязана ни одна группа.",
+ "addTeamLabel": "Добавить группу в это пространство",
+ "chooseTeam": "Выберите группу…",
"teamAdded": "{{team}} добавлена в {{space}}",
"teamRemoved": "{{team}} удалена из {{space}}",
"removeTeamFromSpace": "Убрать из пространства",
"removeTeamConfirm": "Убрать {{team}} из {{space}}?",
- "removeTeamConfirmDescription": "Её участники потеряют доступ к этому пространству, если их не включает другая привязанная команда.",
- "lastTeamWarning": "Это единственная команда с доступом к этому пространству. После удаления доступ сохранят только администраторы рабочего пространства.",
- "affectsOtherSpaces_one": "Изменения в {{team}} также применяются к {{count}} другому пространству, к которому у неё есть доступ.",
- "affectsOtherSpaces_few": "Изменения в {{team}} также применяются к {{count}} другим пространствам, к которым у неё есть доступ.",
- "affectsOtherSpaces_many": "Изменения в {{team}} также применяются к {{count}} другим пространствам, к которым у неё есть доступ.",
- "affectsOtherSpaces_other": "Изменения в {{team}} также применяются к {{count}} другим пространствам, к которым у неё есть доступ.",
+ "removeTeamConfirmDescription": "Её участники потеряют доступ к этому пространству, если их не добавили напрямую и не включает другая привязанная группа.",
"accessLabel": "Доступ к пространству",
"accessAdmin": "Администратор",
"accessMember": "Участник",
@@ -2874,10 +2879,12 @@
"accessHint": "Администраторы {{team}} управляют этим пространством, только если его доступ установлен на «Администратор»."
},
"teams": {
- "assignLabel": "Команды",
- "newTeam": "Новая команда",
- "newTeamNameLabel": "Название команды",
- "loadError": "Не удалось загрузить команды."
+ "newTeam": "Новая группа",
+ "loadError": "Не удалось загрузить группы."
+ },
+ "groups": {
+ "title": "Группы с доступом",
+ "optional": "Группы (необязательно)"
}
},
"structureIntro": {
@@ -2893,7 +2900,7 @@
},
"teamSpace": {
"title": "Командное пространство",
- "description": "Общая область внутри рабочего пространства. Доступ к ней предоставляют одна или несколько команд."
+ "description": "Общая область внутри рабочего пространства. Добавьте людей или группы, чтобы дать им доступ."
},
"contents": "В каждом пространстве могут быть папки и заметки.",
"done": "Понятно",
diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.json
index d248e5160..32b51f4eb 100644
--- a/src/locales/zh-CN/translation.json
+++ b/src/locales/zh-CN/translation.json
@@ -2302,7 +2302,7 @@
"tab": {
"general": "常规",
"members": "成员",
- "teams": "团队",
+ "teams": "群组",
"developer": "开发者"
},
"role": {
@@ -2360,33 +2360,33 @@
"errorTitle": "无法更新申请"
},
"teams": {
- "title": "团队",
- "description": "授予团队空间访问权限的工作区成员分组。",
- "new": "新建团队",
- "empty": "还没有团队。",
- "createFirst": "创建你的第一个团队",
+ "title": "群组",
+ "description": "可一次性获得团队空间访问权限的工作区成员群组。",
+ "new": "新建群组",
+ "empty": "还没有群组。",
+ "createFirst": "创建你的第一个群组",
"addMembersLabel": "添加成员",
- "createTitle": "创建团队",
- "nameLabel": "团队名称",
+ "createTitle": "创建群组",
+ "nameLabel": "群组名称",
"memberCount_one": "{{count}} 名成员",
"memberCount_other": "{{count}} 名成员",
"membersButton": "成员",
"grantsAccessToSpaces_one": "授予 {{count}} 个空间的访问权限",
"grantsAccessToSpaces_other": "授予 {{count}} 个空间的访问权限",
- "couldNotCreate": "无法创建团队",
+ "couldNotCreate": "无法创建群组",
"created": "已创建 {{team}}",
"deleted": "已删除 {{team}}",
"deleteConfirmTitle": "删除 {{team}}?",
- "deleteConfirmDescription": "这将归档该团队。其成员将失去它授予的访问权限。",
- "deleteConfirmSpaceAccess_one": "该团队授予 {{count}} 个空间的访问权限。其成员将失去该访问权限。",
- "deleteConfirmSpaceAccess_other": "该团队授予 {{count}} 个空间的访问权限。其成员将失去该访问权限。",
+ "deleteConfirmDescription": "这将归档该群组。其成员将失去它授予的访问权限。",
+ "deleteConfirmSpaceAccess_one": "该群组授予 {{count}} 个空间的访问权限。其成员将失去该访问权限。",
+ "deleteConfirmSpaceAccess_other": "该群组授予 {{count}} 个空间的访问权限。其成员将失去该访问权限。",
"members": {
"title": "{{team}} 的成员",
"removeConfirm": "将 {{name}} 从 {{team}} 移除?",
- "leave": "退出团队",
+ "leave": "退出群组",
"leftTeam": "你已退出 {{team}}",
"leaveConfirm": "退出 {{team}}?",
- "leaveConfirmDescription": "除非其他团队包含你,否则你将失去通过该团队获得的空间访问权限。"
+ "leaveConfirmDescription": "除非你被直接添加或其他群组包含你,否则你将失去通过该群组获得的空间访问权限。"
}
},
"invites": {
@@ -2754,7 +2754,7 @@
"newSpace": "新建团队空间",
"newSpaceInWorkspace": "在 {{workspace}} 中新建团队空间",
"createTitle": "创建团队空间",
- "createDescription": "工作区内的共享区域,可供一个或多个团队访问。",
+ "createDescription": "工作区内的共享区域,供你添加的人员和群组访问。",
"nameAndIconLabel": "名称和图标",
"create": "创建",
"couldNotCreate": "无法创建空间",
@@ -2765,18 +2765,21 @@
"couldNotRename": "无法重命名空间",
"couldNotChangeEmoji": "无法更改表情",
"deleteSpace": "删除空间",
- "deleteHintTeam": "为所有人移除此空间,其团队会保留。",
+ "deleteHintTeam": "为所有人移除此空间,其群组会保留。",
"deleteHintLocal": "永久删除此空间以及此设备上的文件夹和笔记。",
"leaveTitle": "退出空间",
"leaveDescription": "你的笔记仍可供其他成员访问。",
"leave": "退出空间",
"leaveConfirmTitle": "退出 {{space}}?",
- "leaveConfirmDescription": "你将从 {{teams}} 中移除,并失去这些团队可访问的其他空间的权限。",
+ "leaveConfirmDescription": "你将从 {{teams}} 中移除,并失去这些群组可访问的其他空间的权限。",
+ "leaveDirectDescription": "你将失去对此空间的访问权限。",
+ "leaveKeepsGroupAccess": "你将保留通过 {{groups}} 的访问权限。",
"left": "已退出 {{space}}",
+ "stillViaGroups": "你仍可通过 {{groups}} 访问 {{space}}。",
"couldNotLeave": "无法退出空间",
"deleteConfirmTitle": "删除空间?",
"deleteConfirmDescription": "这将从此设备永久删除 {{space}} 及其所有文件夹和笔记。",
- "deleteConfirmTeamDescription": "这将为所有人删除 {{space}}。团队会保留,但成员将失去对其所有文件夹和笔记的访问权限。",
+ "deleteConfirmTeamDescription": "这将为所有人删除 {{space}}。群组会保留,但成员将失去对其所有文件夹和笔记的访问权限。",
"deleteTypeName": "输入 {{space}} 以确认",
"couldNotDelete": "无法删除空间",
"deleted": "已删除 {{space}}",
@@ -2815,6 +2818,7 @@
"addPeople": "添加成员",
"addedToTeam": "已将 {{name}} 添加到 {{team}}",
"removedFromTeam": "已将 {{name}} 从 {{team}} 移除",
+ "stillViaGroups": "{{name}} 仍可通过 {{groups}} 访问",
"roleUpdated": "角色已更新",
"you": "你",
"addFailed": "{{total}} 人中有 {{failed}} 人无法添加",
@@ -2827,24 +2831,27 @@
"remove": "移除",
"removeConfirm": "将 {{name}} 从 {{space}} 中移除?",
"removeConfirmDescription": "对方将无法再访问此空间的所有笔记。",
+ "removeKeepsGroupAccess": "他们将保留通过 {{groups}} 的访问权限。",
"inviteFooter": "邀请 {{email}} 加入工作区…",
- "empty": "尚未添加任何成员"
+ "empty": "尚未添加任何成员",
+ "viaGroup": "通过 {{group}}",
+ "managedByGroup": "通过 {{group}} 添加。请在该群组中移除。",
+ "roleFromGroup": "通过 {{group}} 获得管理员身份,请在该群组中更改。",
+ "invited": "已向 {{email}} 发送邀请"
},
"invitedTo_one": "你将加入 {{count}} 个团队空间",
"invitedTo_other": "你将加入 {{count}} 个团队空间",
+ "invitedToSpaces": "你将加入 {{spaces}}",
"teamsMembers": {
- "title": "{{space}} 的团队与成员",
- "noTeams": "尚无团队可访问此空间。只有工作区管理员可以看到它。",
- "addTeamLabel": "向此空间添加团队",
- "chooseTeam": "选择团队…",
+ "title": "{{space}} 的成员",
+ "noTeams": "尚无群组可访问此空间。",
+ "addTeamLabel": "向此空间添加群组",
+ "chooseTeam": "选择群组…",
"teamAdded": "已将 {{team}} 添加到 {{space}}",
"teamRemoved": "已将 {{team}} 从 {{space}} 移除",
"removeTeamFromSpace": "从空间移除",
"removeTeamConfirm": "将 {{team}} 从 {{space}} 移除?",
- "removeTeamConfirmDescription": "除非其他已分配的团队包含这些成员,否则他们将失去对此空间的访问权限。",
- "lastTeamWarning": "这是唯一可访问此空间的团队。移除后,只有工作区管理员保留访问权限。",
- "affectsOtherSpaces_one": "对 {{team}} 的更改也会应用到它可访问的另外 {{count}} 个空间。",
- "affectsOtherSpaces_other": "对 {{team}} 的更改也会应用到它可访问的另外 {{count}} 个空间。",
+ "removeTeamConfirmDescription": "除非这些成员被直接添加或其他已分配的群组包含他们,否则他们将失去对此空间的访问权限。",
"accessLabel": "空间访问权限",
"accessAdmin": "管理员",
"accessMember": "成员",
@@ -2852,10 +2859,12 @@
"accessHint": "仅当访问权限设为“管理员”时,{{team}} 的管理员才能管理此空间。"
},
"teams": {
- "assignLabel": "团队",
- "newTeam": "新建团队",
- "newTeamNameLabel": "团队名称",
- "loadError": "无法加载团队。"
+ "newTeam": "新建群组",
+ "loadError": "无法加载群组。"
+ },
+ "groups": {
+ "title": "有访问权限的群组",
+ "optional": "群组(可选)"
}
},
"structureIntro": {
@@ -2871,7 +2880,7 @@
},
"teamSpace": {
"title": "团队空间",
- "description": "工作区内的共享区域。由一个或多个团队授予访问权限。"
+ "description": "工作区内的共享区域。添加人员或群组以授予访问权限。"
},
"contents": "每个空间都可以包含文件夹和笔记。",
"done": "知道了",
diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.json
index 00adbb5e4..bfedaebd8 100644
--- a/src/locales/zh-TW/translation.json
+++ b/src/locales/zh-TW/translation.json
@@ -2302,7 +2302,7 @@
"tab": {
"general": "一般",
"members": "成員",
- "teams": "團隊",
+ "teams": "群組",
"developer": "開發者"
},
"role": {
@@ -2360,33 +2360,33 @@
"errorTitle": "無法更新申請"
},
"teams": {
- "title": "團隊",
- "description": "授予團隊空間存取權的工作區成員群組。",
- "new": "新增團隊",
- "empty": "還沒有團隊。",
- "createFirst": "建立你的第一個團隊",
+ "title": "群組",
+ "description": "可一次取得團隊空間存取權的工作區成員群組。",
+ "new": "新增群組",
+ "empty": "還沒有群組。",
+ "createFirst": "建立你的第一個群組",
"addMembersLabel": "新增成員",
- "createTitle": "建立團隊",
- "nameLabel": "團隊名稱",
+ "createTitle": "建立群組",
+ "nameLabel": "群組名稱",
"memberCount_one": "{{count}} 位成員",
"memberCount_other": "{{count}} 位成員",
"membersButton": "成員",
"grantsAccessToSpaces_one": "授予 {{count}} 個空間的存取權",
"grantsAccessToSpaces_other": "授予 {{count}} 個空間的存取權",
- "couldNotCreate": "無法建立團隊",
+ "couldNotCreate": "無法建立群組",
"created": "已建立 {{team}}",
"deleted": "已刪除 {{team}}",
"deleteConfirmTitle": "刪除 {{team}}?",
- "deleteConfirmDescription": "這將封存該團隊。其成員將失去它授予的存取權。",
- "deleteConfirmSpaceAccess_one": "該團隊授予 {{count}} 個空間的存取權。其成員將失去該存取權。",
- "deleteConfirmSpaceAccess_other": "該團隊授予 {{count}} 個空間的存取權。其成員將失去該存取權。",
+ "deleteConfirmDescription": "這將封存該群組。其成員將失去它授予的存取權。",
+ "deleteConfirmSpaceAccess_one": "該群組授予 {{count}} 個空間的存取權。其成員將失去該存取權。",
+ "deleteConfirmSpaceAccess_other": "該群組授予 {{count}} 個空間的存取權。其成員將失去該存取權。",
"members": {
"title": "{{team}} 的成員",
"removeConfirm": "將 {{name}} 從 {{team}} 移除?",
- "leave": "退出團隊",
+ "leave": "退出群組",
"leftTeam": "你已退出 {{team}}",
"leaveConfirm": "退出 {{team}}?",
- "leaveConfirmDescription": "除非其他團隊包含你,否則你將失去透過該團隊取得的空間存取權。"
+ "leaveConfirmDescription": "除非你被直接加入或其他群組包含你,否則你將失去透過該群組取得的空間存取權。"
}
},
"invites": {
@@ -2754,7 +2754,7 @@
"newSpace": "新增團隊空間",
"newSpaceInWorkspace": "在 {{workspace}} 中新增團隊空間",
"createTitle": "建立團隊空間",
- "createDescription": "工作區內的共享區域,可供一個或多個團隊存取。",
+ "createDescription": "工作區內的共享區域,供你加入的人員和群組存取。",
"nameAndIconLabel": "名稱與圖示",
"create": "建立",
"couldNotCreate": "無法建立空間",
@@ -2765,18 +2765,21 @@
"couldNotRename": "無法重新命名空間",
"couldNotChangeEmoji": "無法變更表情符號",
"deleteSpace": "刪除空間",
- "deleteHintTeam": "為所有人移除此空間,其團隊會保留。",
+ "deleteHintTeam": "為所有人移除此空間,其群組會保留。",
"deleteHintLocal": "永久刪除此空間以及此裝置上的資料夾與筆記。",
"leaveTitle": "離開空間",
"leaveDescription": "你的筆記仍可供其他成員存取。",
"leave": "離開空間",
"leaveConfirmTitle": "要離開 {{space}} 嗎?",
- "leaveConfirmDescription": "你將從 {{teams}} 中移除,並失去這些團隊可開啟的其他空間的存取權。",
+ "leaveConfirmDescription": "你將從 {{teams}} 中移除,並失去這些群組可開啟的其他空間的存取權。",
+ "leaveDirectDescription": "你將失去此空間的存取權。",
+ "leaveKeepsGroupAccess": "你將保留透過 {{groups}} 的存取權。",
"left": "已離開 {{space}}",
+ "stillViaGroups": "你仍可透過 {{groups}} 存取 {{space}}。",
"couldNotLeave": "無法離開空間",
"deleteConfirmTitle": "刪除空間?",
"deleteConfirmDescription": "這會從此裝置永久刪除 {{space}} 及其所有資料夾和筆記。",
- "deleteConfirmTeamDescription": "這將為所有人刪除 {{space}}。團隊會保留,但成員將失去其所有資料夾與筆記的存取權。",
+ "deleteConfirmTeamDescription": "這將為所有人刪除 {{space}}。群組會保留,但成員將失去其所有資料夾與筆記的存取權。",
"deleteTypeName": "輸入 {{space}} 以確認",
"couldNotDelete": "無法刪除空間",
"deleted": "已刪除 {{space}}",
@@ -2815,6 +2818,7 @@
"addPeople": "新增成員",
"addedToTeam": "已將 {{name}} 加入 {{team}}",
"removedFromTeam": "已將 {{name}} 從 {{team}} 移除",
+ "stillViaGroups": "{{name}} 仍可透過 {{groups}} 存取",
"roleUpdated": "角色已更新",
"you": "你",
"addFailed": "{{total}} 人中有 {{failed}} 人無法加入",
@@ -2827,24 +2831,27 @@
"remove": "移除",
"removeConfirm": "要將 {{name}} 從 {{space}} 移除嗎?",
"removeConfirmDescription": "對方將無法再存取此空間的所有筆記。",
+ "removeKeepsGroupAccess": "他們將保留透過 {{groups}} 的存取權。",
"inviteFooter": "邀請 {{email}} 加入工作區…",
- "empty": "尚未新增任何成員"
+ "empty": "尚未新增任何成員",
+ "viaGroup": "透過 {{group}}",
+ "managedByGroup": "透過 {{group}} 加入。請在該群組中移除。",
+ "roleFromGroup": "透過 {{group}} 取得管理員身分,請在該群組中變更。",
+ "invited": "已向 {{email}} 傳送邀請"
},
"invitedTo_one": "你將加入 {{count}} 個團隊空間",
"invitedTo_other": "你將加入 {{count}} 個團隊空間",
+ "invitedToSpaces": "你將加入 {{spaces}}",
"teamsMembers": {
- "title": "{{space}} 的團隊與成員",
- "noTeams": "尚無團隊可存取此空間。只有工作區管理員可以看到它。",
- "addTeamLabel": "將團隊加入此空間",
- "chooseTeam": "選擇團隊…",
+ "title": "{{space}} 的成員",
+ "noTeams": "尚無群組可存取此空間。",
+ "addTeamLabel": "將群組加入此空間",
+ "chooseTeam": "選擇群組…",
"teamAdded": "已將 {{team}} 加入 {{space}}",
"teamRemoved": "已將 {{team}} 從 {{space}} 移除",
"removeTeamFromSpace": "從空間移除",
"removeTeamConfirm": "將 {{team}} 從 {{space}} 移除?",
- "removeTeamConfirmDescription": "除非其他已指派的團隊包含這些成員,否則他們將失去此空間的存取權。",
- "lastTeamWarning": "這是唯一可存取此空間的團隊。移除後,只有工作區管理員保留存取權。",
- "affectsOtherSpaces_one": "對 {{team}} 的變更也會套用到它可存取的另外 {{count}} 個空間。",
- "affectsOtherSpaces_other": "對 {{team}} 的變更也會套用到它可存取的另外 {{count}} 個空間。",
+ "removeTeamConfirmDescription": "除非這些成員被直接加入或其他已指派的群組包含他們,否則他們將失去此空間的存取權。",
"accessLabel": "空間存取權",
"accessAdmin": "管理員",
"accessMember": "成員",
@@ -2852,10 +2859,12 @@
"accessHint": "僅當存取權設為「管理員」時,{{team}} 的管理員才能管理此空間。"
},
"teams": {
- "assignLabel": "團隊",
- "newTeam": "新增團隊",
- "newTeamNameLabel": "團隊名稱",
- "loadError": "無法載入團隊。"
+ "newTeam": "新增群組",
+ "loadError": "無法載入群組。"
+ },
+ "groups": {
+ "title": "有存取權的群組",
+ "optional": "群組(選填)"
}
},
"structureIntro": {
@@ -2871,7 +2880,7 @@
},
"teamSpace": {
"title": "團隊空間",
- "description": "工作區內的共享區域。由一個或多個團隊授予存取權。"
+ "description": "工作區內的共享區域。加入人員或群組以授予存取權。"
},
"contents": "每個空間都可以包含資料夾和筆記。",
"done": "知道了",
diff --git a/src/services/InvitationsService.ts b/src/services/InvitationsService.ts
index 8b9fa6444..6b1e24626 100644
--- a/src/services/InvitationsService.ts
+++ b/src/services/InvitationsService.ts
@@ -13,7 +13,8 @@ async function list(workspaceId: string): Promise<WorkspaceInvitation[]> {
async function send(
workspaceId: string,
- input: { email: string; role?: "admin" | "member"; team_ids?: string[] }
+ // space_ids become member grants applied when the invitation is accepted.
+ input: { email: string; role?: "admin" | "member"; team_ids?: string[]; space_ids?: string[] }
): Promise<InvitationSendResult> {
const res = await cloudPost<DataWrap<InvitationSendResult>>(
`/api/workspaces/${workspaceId}/invitations`,
@@ -40,15 +41,20 @@ async function preview(token: string): Promise<InvitationPreview> {
return res.data;
}
-// team_ids is the authoritative post-accept team list (the invitation may
-// have been edited since it was previewed); optional only because older API
-// responses predate it.
-async function accept(
- token: string
-): Promise<{ workspace_id: string; role: string; team_ids?: string[] }> {
- const res = await cloudPost<
- DataWrap<{ workspace_id: string; role: string; team_ids?: string[] }>
- >(`/api/invitations/${encodeURIComponent(token)}/accept`);
+// team_ids and space_ids are the authoritative post-accept grants (the
+// invitation may have been edited since it was previewed); optional only
+// because older API responses predate them.
+type InvitationAcceptResult = {
+ workspace_id: string;
+ role: string;
+ team_ids?: string[];
+ space_ids?: string[];
+};
+
+async function accept(token: string): Promise<InvitationAcceptResult> {
+ const res = await cloudPost<DataWrap<InvitationAcceptResult>>(
+ `/api/invitations/${encodeURIComponent(token)}/accept`
+ );
return res.data;
}
diff --git a/src/services/SpacesService.ts b/src/services/SpacesService.ts
index e76dcb2b4..b245ebf62 100644
--- a/src/services/SpacesService.ts
+++ b/src/services/SpacesService.ts
@@ -16,15 +16,19 @@ export interface MySpace {
description: string | null;
emoji: string | null;
my_role: TeamRole;
+ // Direct space_members grant; null when access is via teams or workspace role.
+ my_direct_role: TeamRole | null;
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.
+// Union roster entry: one row per user across direct members and all assigned
+// teams, with attribution of which grant(s) convey the access. via_teams is
+// [] for a direct-only member.
export interface SpaceMemberEntry extends TeamMember {
+ direct_role: TeamRole | null;
via_teams: {
team_id: string;
name: string;
@@ -33,9 +37,9 @@ export interface SpaceMemberEntry extends TeamMember {
}[];
}
-// 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.
+// Every space the caller can access across all their workspaces (direct
+// member, 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;
@@ -46,9 +50,16 @@ async function mySpacesForAuthValidation(generation: number): Promise<MySpace[]>
return res.data;
}
+// The creator becomes a direct admin server-side; member_ids join as members.
async function create(
workspaceId: string,
- input: { name: string; emoji?: string | null; description?: string; team_ids: string[] }
+ input: {
+ name: string;
+ emoji?: string | null;
+ description?: string;
+ member_ids: string[];
+ team_ids: string[];
+ }
): Promise<MySpace> {
const res = await cloudPost<DataWrap<MySpace>>(`/api/workspaces/${workspaceId}/spaces`, input);
return res.data;
@@ -84,6 +95,35 @@ async function listMembers(spaceId: string): Promise<SpaceMemberEntry[]> {
return res.data;
}
+// The members POST upserts, so re-adding an existing direct member changes
+// their role rather than failing.
+async function addMember(
+ spaceId: string,
+ userId: string,
+ role: TeamRole = "member"
+): Promise<void> {
+ await cloudPost(`/api/spaces/${spaceId}/members`, { user_id: userId, role });
+}
+
+// Promoting someone who is only present via a team creates their direct row.
+async function setMemberRole(spaceId: string, userId: string, role: TeamRole): Promise<void> {
+ await cloudPatch(`/api/spaces/${spaceId}/members/${userId}`, { role });
+}
+
+export interface SpaceMemberRemoval {
+ removed: boolean;
+ still_via_teams: { team_id: string; name: string }[];
+}
+
+// Deletes only the direct grant; still_via_teams names the teams that keep
+// the user in the space, so callers can say so.
+async function removeMember(spaceId: string, userId: string): Promise<SpaceMemberRemoval> {
+ const res = await cloudDelete<DataWrap<SpaceMemberRemoval>>(
+ `/api/spaces/${spaceId}/members/${userId}`
+ );
+ return res.data;
+}
+
export const SpacesService = {
mySpaces,
mySpacesForAuthValidation,
@@ -93,4 +133,7 @@ export const SpacesService = {
assignTeam,
unassignTeam,
listMembers,
+ addMember,
+ setMemberRole,
+ removeMember,
};
diff --git a/src/services/spaceActions.ts b/src/services/spaceActions.ts
index e163040ce..4731e2f50 100644
--- a/src/services/spaceActions.ts
+++ b/src/services/spaceActions.ts
@@ -5,10 +5,10 @@ import { loadSpaces, purgeSpace, updateSpaceMeta } from "../stores/noteStore";
import { invalidateSpaceRoster } from "../lib/spaceRosterCache";
import { createSpaceActions } from "./spaceActionsCore";
-// Single mutation path for spaces and their assigned teams: server call →
-// local SQLite mirror → store refresh. The orchestration lives in an
-// injectable core so ordering, rollback, and partial-failure behavior stay
-// testable without a renderer or cloud server.
+// Single mutation path for spaces, their direct members, and their assigned
+// teams: server call → local SQLite mirror → store refresh. The orchestration
+// lives in an injectable core so ordering, rollback, and partial-failure
+// behavior stay testable without a renderer or cloud server.
const actions = createSpaceActions({
teams: TeamsService,
spaces: SpacesService,
@@ -35,6 +35,10 @@ export const {
assignTeamToSpace,
setSpaceTeamAccess,
unassignTeamFromSpace,
+ addSpaceMembers,
+ setSpaceMemberRole,
+ removeSpaceMember,
+ leaveSpace,
addTeamMembers,
removeTeamMember,
setTeamMemberRole,
diff --git a/src/services/spaceActionsCore.ts b/src/services/spaceActionsCore.ts
index d9311e720..b69f20c7b 100644
--- a/src/services/spaceActionsCore.ts
+++ b/src/services/spaceActionsCore.ts
@@ -1,9 +1,5 @@
import type { SpaceItem, TeamRole } from "../types/electron";
-import type { MySpace } from "./SpacesService";
-
-interface CloudTeam {
- id: string;
-}
+import type { MySpace, SpaceMemberRemoval } from "./SpacesService";
interface MutationResult {
success: boolean;
@@ -12,7 +8,6 @@ interface MutationResult {
export interface SpaceActionsDependencies {
teams: {
- create: (workspaceId: string, input: { name: string }) => Promise<CloudTeam>;
remove: (teamId: string) => Promise<void>;
addMember: (teamId: string, userId: string, role?: TeamRole) => Promise<void>;
removeMember: (teamId: string, userId: string) => Promise<void>;
@@ -21,12 +16,15 @@ export interface SpaceActionsDependencies {
mySpaces: () => Promise<MySpace[]>;
create: (
workspaceId: string,
- input: { name: string; emoji?: string | null; team_ids: string[] }
+ input: { name: string; emoji?: string | null; member_ids: string[]; team_ids: string[] }
) => Promise<MySpace>;
update: (spaceId: string, updates: { name: string; emoji: string | null }) => Promise<MySpace>;
remove: (spaceId: string) => Promise<void>;
assignTeam: (spaceId: string, teamId: string, access?: "admin" | "member") => Promise<void>;
unassignTeam: (spaceId: string, teamId: string) => Promise<void>;
+ addMember: (spaceId: string, userId: string, role?: TeamRole) => Promise<void>;
+ setMemberRole: (spaceId: string, userId: string, role: TeamRole) => Promise<void>;
+ removeMember: (spaceId: string, userId: string) => Promise<SpaceMemberRemoval>;
};
local: {
upsertSpaceFromCloud: (space: Record<string, unknown>) => Promise<SpaceItem | null>;
@@ -58,10 +56,12 @@ function errorMessage(err: unknown): string | undefined {
}
export function createSpaceActions(deps: SpaceActionsDependencies) {
- async function settleAddMembers(teamId: string, userIds: string[]): Promise<unknown[]> {
- const results = await Promise.allSettled(
- userIds.map((userId) => deps.teams.addMember(teamId, userId))
- );
+ // One failed add must not abort the rest; callers report the failures.
+ async function settleAddMembers(
+ userIds: string[],
+ add: (userId: string) => Promise<void>
+ ): Promise<unknown[]> {
+ const results = await Promise.allSettled(userIds.map(add));
return results
.filter((result): result is PromiseRejectedResult => result.status === "rejected")
.map((result) => result.reason);
@@ -76,40 +76,26 @@ export function createSpaceActions(deps: SpaceActionsDependencies) {
await deps.local.loadSpaces();
}
+ // Members and teams travel in the create body, so the server grants them
+ // atomically with the space; there is no partial-failure state to report.
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;
- let createdTeamId: string | null = null;
- if (teams.newTeam) {
- const team = await deps.teams.create(workspaceId, { name: teams.newTeam.name });
- createdTeamId = team.id;
- failedMembers = (await settleAddMembers(team.id, teams.newTeam.memberIds)).length;
- teamIds.push(team.id);
- }
-
- let cloudSpace: MySpace;
- try {
- cloudSpace = await deps.spaces.create(workspaceId, {
- name: input.name,
- emoji: input.emoji,
- team_ids: teamIds,
- });
- } catch (err) {
- if (createdTeamId) await deps.teams.remove(createdTeamId).catch(() => {});
- throw err;
- }
-
+ access: { memberIds: string[]; teamIds: string[] }
+ ): Promise<SpaceItem | null> {
+ const cloudSpace = await deps.spaces.create(workspaceId, {
+ name: input.name,
+ emoji: input.emoji,
+ member_ids: access.memberIds,
+ team_ids: access.teamIds,
+ });
const space = await deps.local.upsertSpaceFromCloud(
cloudSpace as unknown as Record<string, unknown>
);
if (space) await deps.local.setSpaceSyncStatus(space.id, "synced");
await deps.local.loadSpaces();
deps.sync.requestSyncAll("manual");
- return { space, failedMembers };
+ return space;
}
async function renameSpace(
@@ -183,11 +169,48 @@ export function createSpaceActions(deps: SpaceActionsDependencies) {
deps.sync.requestSyncAll("manual");
}
+ async function addSpaceMembers(
+ space: SpaceItem,
+ userIds: string[]
+ ): Promise<{ failures: unknown[] }> {
+ const spaceId = requireCloudSpaceId(space);
+ const failures = await settleAddMembers(userIds, (userId) =>
+ deps.spaces.addMember(spaceId, userId)
+ );
+ await refreshSpaceMirror();
+ return { failures };
+ }
+
+ async function setSpaceMemberRole(
+ space: SpaceItem,
+ userId: string,
+ role: TeamRole
+ ): Promise<void> {
+ await deps.spaces.setMemberRole(requireCloudSpaceId(space), userId, role);
+ await refreshSpaceMirror();
+ }
+
+ async function removeSpaceMember(space: SpaceItem, userId: string): Promise<SpaceMemberRemoval> {
+ const result = await deps.spaces.removeMember(requireCloudSpaceId(space), userId);
+ await refreshSpaceMirror();
+ return result;
+ }
+
+ // Dropping one's own direct grant can revoke container access, so the
+ // sync pass runs to purge content the mirror no longer lists.
+ async function leaveSpace(space: SpaceItem, userId: string): Promise<SpaceMemberRemoval> {
+ const result = await removeSpaceMember(space, userId);
+ deps.sync.requestSyncAll("manual");
+ return result;
+ }
+
async function addTeamMembers(
teamId: string,
userIds: string[]
): Promise<{ failures: unknown[] }> {
- const failures = await settleAddMembers(teamId, userIds);
+ const failures = await settleAddMembers(userIds, (userId) =>
+ deps.teams.addMember(teamId, userId)
+ );
await refreshSpaceMirror();
return { failures };
}
@@ -221,6 +244,10 @@ export function createSpaceActions(deps: SpaceActionsDependencies) {
assignTeamToSpace,
setSpaceTeamAccess,
unassignTeamFromSpace,
+ addSpaceMembers,
+ setSpaceMemberRole,
+ removeSpaceMember,
+ leaveSpace,
addTeamMembers,
removeTeamMember,
setTeamMemberRole,
diff --git a/src/types/electron.ts b/src/types/electron.ts
index a407dbd0f..2118475b0 100644
--- a/src/types/electron.ts
+++ b/src/types/electron.ts
@@ -479,9 +479,13 @@ export interface SpaceItem {
name: string;
emoji: string | null;
sort_order: number;
- // Server-computed max effective role across assigned teams (ws owner/admin ⇒ admin).
+ // Server-computed effective role: direct grant or best role across assigned
+ // teams (ws owner/admin ⇒ admin).
my_role: "admin" | "member" | null;
- // Server-computed deduped union of assigned team rosters.
+ // Direct space_members grant, null when access comes only via teams or the
+ // workspace role. Absent on mirrors written before the API shipped it.
+ my_direct_role?: TeamRole | null;
+ // Server-computed deduped union of direct members and assigned team rosters.
member_count: number | null;
teams: SpaceTeamRef[];
sync_status: "synced" | "pending" | "error";
@@ -624,6 +628,8 @@ export interface InvitationPreview {
email: string;
workspace_role: WorkspaceRole;
team_ids: string[];
+ /** Live spaces the invite grants directly; absent from APIs that predate space grants. */
+ space_names?: string[];
expires_at: string;
workspace_id: string;
workspace_name: string;
diff --git a/test/components/directionalContentPolicy.test.js b/test/components/directionalContentPolicy.test.js
index a69f6a275..b8091822d 100644
--- a/test/components/directionalContentPolicy.test.js
+++ b/test/components/directionalContentPolicy.test.js
@@ -137,9 +137,13 @@ test("localized sentences isolate technical interpolations without changing word
/<BidiInterpolatedText[\s\S]*?updates\.whatsNew[\s\S]*?value=\{updateInfo\.version\}/,
],
[
- "src/components/TeamRosterSection.tsx",
+ "src/components/MemberRoster.tsx",
/<BidiInterpolatedText[\s\S]*?members\.inviteFooter[\s\S]*?value=\{addSearch\.trim\(\)\}/,
],
+ [
+ "src/components/notes/SpaceMembersPanel.tsx",
+ /<BidiInterpolatedText[\s\S]*?members\.invited[\s\S]*?value=\{invitedEmail\}/,
+ ],
[
"src/components/IntegrationsView.tsx",
/<BidiInterpolatedText[\s\S]*?googleCalendar\.disconnectConfirm[\s\S]*?value=\{confirmDisconnectEmail\}/,
@@ -198,8 +202,8 @@ test("user-authored names and previews detect direction at their display boundar
["src/components/notes/CreateSpaceDialog.tsx", /<span\s+dir="auto"[^>]*>\s*\{item\.name\}/],
["src/components/notes/CreateSpaceDialog.tsx", /<p\s+dir="auto"[^>]*>\s*\{workspace\.name\}/],
["src/components/notes/CreateSpaceDialog.tsx", /<span\s+dir="auto"[^>]*>\s*\{team\.name\}/],
- ["src/components/notes/SpaceMembersPanel.tsx", /<span\s+dir="auto"[^>]*>\s*\{teamRef\.name\}/],
- ["src/components/notes/SpaceMembersPanel.tsx", /<span\s+dir="auto"[^>]*>\s*\{team\.name\}/],
+ ["src/components/notes/SpaceGroupsSection.tsx", /<span\s+dir="auto"[^>]*>\s*\{teamRef\.name\}/],
+ ["src/components/notes/SpaceGroupsSection.tsx", /<span\s+dir="auto"[^>]*>\s*\{team\.name\}/],
[
"src/components/settings/WorkspaceSection.tsx",
/<h2\s+dir="auto"[^>]*>\s*\{workspace\.name\}/,
diff --git a/test/components/fieldDirectionPolicy.test.js b/test/components/fieldDirectionPolicy.test.js
index 4916f48b2..4e25f196a 100644
--- a/test/components/fieldDirectionPolicy.test.js
+++ b/test/components/fieldDirectionPolicy.test.js
@@ -71,7 +71,6 @@ const EXPECTED_SHARED_FIELD_DIRECTIONS = {
"src/components/SnippetsView.tsx": ["auto", "auto", "auto", "auto"],
"src/components/TranscriptionModelPicker.tsx": ["ltr", "ltr", "ltr"],
"src/components/notes/ActionManagerDialog.tsx": ["auto", "auto"],
- "src/components/notes/CreateSpaceDialog.tsx": ["auto"],
"src/components/notes/DeleteSpaceDialog.tsx": ["auto"],
"src/components/notes/UploadAudioView.tsx": ["auto"],
"src/components/onboarding/ProviderSetupStep.tsx": ["ltr", "ltr", "ltr", "ltr", "ltr", "ltr"],
diff --git a/test/helpers/spacesDatabase.test.js b/test/helpers/spacesDatabase.test.js
index 12bb0213b..3e9ef6b45 100644
--- a/test/helpers/spacesDatabase.test.js
+++ b/test/helpers/spacesDatabase.test.js
@@ -1671,6 +1671,34 @@ test("upsertSpaceFromCloud round-trips the teams mirror as a parsed array", (t)
assert.deepEqual(db.getSpaces().find((s) => s.id === space.id).teams, []);
});
+test("upsertSpaceFromCloud mirrors the direct role and clears it when the grant goes", (t) => {
+ const db = createDb(t);
+ if (!db) return;
+ const created = db.upsertSpaceFromCloud({
+ id: "space-1",
+ name: "Design space",
+ workspace_id: "ws-1",
+ my_role: "admin",
+ my_direct_role: "admin",
+ teams: [],
+ });
+ assert.equal(created.my_direct_role, "admin");
+ assert.equal(db.getSpaceByCloudSpaceId("space-1").my_direct_role, "admin");
+
+ // Access now flows only through a team: the effective role survives, the
+ // direct grant must not linger and keep "Leave space" offered.
+ const updated = db.upsertSpaceFromCloud({
+ id: "space-1",
+ name: "Design space",
+ workspace_id: "ws-1",
+ my_role: "member",
+ teams: [{ id: "team-1", name: "Design", my_role: "member" }],
+ });
+ assert.equal(updated.id, created.id);
+ assert.equal(updated.my_role, "member");
+ assert.equal(updated.my_direct_role, null);
+});
+
test("upsertSpaceFromCloud adopts a pre-spaces row via its single backfilled team", (t) => {
const db = createDb(t);
if (!db) return;
diff --git a/test/lib/spacePermissions.test.js b/test/lib/spacePermissions.test.js
index 49543dea1..7886939f5 100644
--- a/test/lib/spacePermissions.test.js
+++ b/test/lib/spacePermissions.test.js
@@ -167,3 +167,17 @@ test("teamsUserCanLeave: only teams the user explicitly belongs to", () => {
);
assert.deepEqual(teamsUserCanLeave({ teams: [] }), []);
});
+
+test("canLeaveSpace: a direct grant or an explicit team membership can be given up", () => {
+ const { canLeaveSpace } = require("../../src/lib/spacePermissions.ts");
+ const viaTeam = [{ id: "t1", name: "Sales", my_role: "member" }];
+ const implicitOnly = [{ id: "t2", name: "Ops", my_role: null }];
+ assert.equal(canLeaveSpace({ my_direct_role: "member", teams: [] }), true);
+ assert.equal(canLeaveSpace({ my_direct_role: "admin", teams: implicitOnly }), true);
+ assert.equal(canLeaveSpace({ my_direct_role: null, teams: viaTeam }), true);
+ assert.equal(canLeaveSpace({ my_direct_role: null, teams: implicitOnly }), false);
+ assert.equal(canLeaveSpace({ my_direct_role: null, teams: [] }), false);
+ // Mirrors written before the API shipped my_direct_role omit it entirely.
+ assert.equal(canLeaveSpace({ teams: viaTeam }), true);
+ assert.equal(canLeaveSpace({ teams: [] }), false);
+});
diff --git a/test/locales/translationCoverage.test.js b/test/locales/translationCoverage.test.js
index 53d1593f5..102c196f5 100644
--- a/test/locales/translationCoverage.test.js
+++ b/test/locales/translationCoverage.test.js
@@ -31,7 +31,6 @@ const ARABIC_PLURAL_BASES = [
"workspaces.join.memberCount",
"notes.spaces.noteCount",
"notes.spaces.invitedTo",
- "notes.spaces.teamsMembers.affectsOtherSpaces",
"notes.addToFolder.addCount",
"notes.overview.meta.folders",
"notes.overview.meta.members",
diff --git a/test/services/spaceActions.test.js b/test/services/spaceActions.test.js
index 91f0bbb56..c9aa56f51 100644
--- a/test/services/spaceActions.test.js
+++ b/test/services/spaceActions.test.js
@@ -14,10 +14,6 @@ function makeHarness() {
};
const deps = {
teams: {
- create: async (workspaceId, input) => {
- calls.push(["team.create", workspaceId, input]);
- return { id: "new-team" };
- },
remove: async (teamId) => calls.push(["team.remove", teamId]),
addMember: async (teamId, userId, role) =>
calls.push(["team.addMember", teamId, userId, role]),
@@ -40,6 +36,14 @@ function makeHarness() {
assignTeam: async (spaceId, teamId, access) =>
calls.push(["space.assignTeam", spaceId, teamId, access]),
unassignTeam: async (spaceId, teamId) => calls.push(["space.unassignTeam", spaceId, teamId]),
+ addMember: async (spaceId, userId, role) =>
+ calls.push(["space.addMember", spaceId, userId, role]),
+ setMemberRole: async (spaceId, userId, role) =>
+ calls.push(["space.setMemberRole", spaceId, userId, role]),
+ removeMember: async (spaceId, userId) => {
+ calls.push(["space.removeMember", spaceId, userId]);
+ return { removed: true, still_via_teams: [] };
+ },
},
local: {
upsertSpaceFromCloud: async (space) => {
@@ -70,73 +74,47 @@ function makeHarness() {
return { calls, cloudSpace, localSpace, deps };
}
-test("createSpace orchestrates inline-team members, local settling, and sync", async () => {
+test("createSpace sends members and teams in one body, settles locally, and syncs", async () => {
const { createSpaceActions } = await load();
const { calls, deps, localSpace } = makeHarness();
- deps.teams.addMember = async (teamId, userId) => {
- calls.push(["team.addMember", teamId, userId]);
- if (userId === "bad-user") throw new Error("member failed");
- };
const actions = createSpaceActions(deps);
- const result = await actions.createSpace(
+ const space = await actions.createSpace(
"workspace-1",
{ name: "Roadmap", emoji: "🧭" },
- {
- existingTeamIds: ["existing-team"],
- newTeam: { name: "Product", memberIds: ["good-user", "bad-user"] },
- }
+ { memberIds: ["user-1", "user-2"], teamIds: ["existing-team"] }
);
- assert.equal(result.space, localSpace);
- assert.equal(result.failedMembers, 1);
- assert.deepEqual(
- calls.find(([name]) => name === "space.create"),
- [
- "space.create",
- "workspace-1",
- {
- name: "Roadmap",
- emoji: "🧭",
- team_ids: ["existing-team", "new-team"],
- },
- ]
- );
+ assert.equal(space, localSpace);
+ assert.deepEqual(calls[0], [
+ "space.create",
+ "workspace-1",
+ {
+ name: "Roadmap",
+ emoji: "🧭",
+ member_ids: ["user-1", "user-2"],
+ team_ids: ["existing-team"],
+ },
+ ]);
assert.ok(calls.some((call) => call[0] === "local.upsert"));
assert.ok(calls.some((call) => call[0] === "local.setStatus" && call[2] === "synced"));
assert.deepEqual(calls.at(-1), ["sync", "manual"]);
});
-test("createSpace removes an inline team when cloud space creation fails", async () => {
+test("createSpace leaves no local trace when the cloud create fails", async () => {
const { createSpaceActions } = await load();
const { calls, deps } = makeHarness();
const failure = new Error("plan limit");
deps.spaces.create = async () => {
throw failure;
};
- // Cleanup is best-effort and must never replace the create failure.
- deps.teams.remove = async (teamId) => {
- calls.push(["team.remove", teamId]);
- throw new Error("cleanup failed");
- };
const actions = createSpaceActions(deps);
await assert.rejects(
- actions.createSpace(
- "workspace-1",
- { name: "Roadmap" },
- { existingTeamIds: [], newTeam: { name: "Product", memberIds: [] } }
- ),
+ actions.createSpace("workspace-1", { name: "Roadmap" }, { memberIds: [], teamIds: [] }),
failure
);
- assert.deepEqual(
- calls.find(([name]) => name === "team.remove"),
- ["team.remove", "new-team"]
- );
- assert.equal(
- calls.some(([name]) => name === "local.upsert"),
- false
- );
+ assert.equal(calls.length, 0);
});
test("renameSpace rolls back a rejected cloud rename", async () => {
@@ -243,6 +221,65 @@ test("team mutations refresh the full mirror and schedule sync only when needed"
);
});
+test("direct member mutations refresh the mirror and only leaving schedules sync", async () => {
+ const { createSpaceActions } = await load();
+ const { calls, deps, localSpace } = makeHarness();
+ const stillViaTeams = [{ team_id: "team-1", name: "Sales" }];
+ deps.spaces.removeMember = async (spaceId, userId) => {
+ calls.push(["space.removeMember", spaceId, userId]);
+ return { removed: true, still_via_teams: stillViaTeams };
+ };
+ const actions = createSpaceActions(deps);
+
+ await actions.setSpaceMemberRole(localSpace, "user-1", "admin");
+ const removed = await actions.removeSpaceMember(localSpace, "user-1");
+ const left = await actions.leaveSpace(localSpace, "me");
+
+ assert.deepEqual(removed.still_via_teams, stillViaTeams);
+ assert.deepEqual(left.still_via_teams, stillViaTeams);
+ assert.deepEqual(
+ calls.filter(([name]) => name.startsWith("space.")),
+ [
+ ["space.setMemberRole", "cloud-space-1", "user-1", "admin"],
+ ["space.mySpaces"],
+ ["space.removeMember", "cloud-space-1", "user-1"],
+ ["space.mySpaces"],
+ ["space.removeMember", "cloud-space-1", "me"],
+ ["space.mySpaces"],
+ ]
+ );
+ assert.equal(calls.filter(([name]) => name === "roster.invalidate").length, 3);
+ assert.equal(calls.filter(([name]) => name === "mirror.upsert").length, 3);
+ assert.deepEqual(
+ calls.filter(([name]) => name === "sync"),
+ [["sync", "manual"]],
+ "only leaving can revoke the caller's own container access"
+ );
+});
+
+test("addSpaceMembers reports partial failures and still refreshes the mirror", async () => {
+ const { createSpaceActions } = await load();
+ const { calls, deps, localSpace } = makeHarness();
+ deps.spaces.addMember = async (spaceId, userId) => {
+ calls.push(["space.addMember", spaceId, userId]);
+ if (userId === "bad-user") throw new Error("not in workspace");
+ };
+ const actions = createSpaceActions(deps);
+
+ const { failures } = await actions.addSpaceMembers(localSpace, ["good-user", "bad-user"]);
+
+ assert.equal(failures.length, 1);
+ assert.match(failures[0].message, /not in workspace/);
+ assert.deepEqual(
+ calls.filter(([name]) => name === "space.addMember"),
+ [
+ ["space.addMember", "cloud-space-1", "good-user"],
+ ["space.addMember", "cloud-space-1", "bad-user"],
+ ]
+ );
+ assert.ok(calls.some(([name]) => name === "mirror.upsert"));
+});
+
test("addTeamMembers reports partial failures and still refreshes the mirror", async () => {
const { createSpaceActions } = await load();
const { calls, deps } = makeHarness();
@@ -263,9 +300,9 @@ test("team assignment rejects local-only spaces before making a cloud request",
const { calls, deps, localSpace } = makeHarness();
const actions = createSpaceActions(deps);
- await assert.rejects(
- actions.assignTeamToSpace({ ...localSpace, cloud_space_id: null }, "team-1"),
- /Not a cloud space/
- );
+ const localOnly = { ...localSpace, cloud_space_id: null };
+ await assert.rejects(actions.assignTeamToSpace(localOnly, "team-1"), /Not a cloud space/);
+ await assert.rejects(actions.addSpaceMembers(localOnly, ["user-1"]), /Not a cloud space/);
+ await assert.rejects(actions.leaveSpace(localOnly, "me"), /Not a cloud space/);
assert.equal(calls.length, 0);
});
diff --git a/test/services/spacesService.test.js b/test/services/spacesService.test.js
new file mode 100644
index 000000000..b34a81b60
--- /dev/null
+++ b/test/services/spacesService.test.js
@@ -0,0 +1,82 @@
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const { installBrowserGlobals } = require("../lib/rendererTestHarness");
+
+// Captures the IPC payload the services hand to the main process, so the wire
+// bodies the API's zod schemas receive are pinned here.
+function installCloudCapture(t, responseData = {}) {
+ const requests = [];
+ installBrowserGlobals(t, {
+ window: {
+ electronAPI: {
+ cloudApiRequest: async (options) => {
+ requests.push(options);
+ return { success: true, data: { data: responseData } };
+ },
+ },
+ },
+ });
+ return requests;
+}
+
+test("SpacesService.create sends member_ids alongside team_ids", async (t) => {
+ const requests = installCloudCapture(t, { id: "space-1", my_direct_role: "admin" });
+ const { SpacesService } = require("../../src/services/SpacesService.ts");
+
+ const space = await SpacesService.create("ws-1", {
+ name: "Roadmap",
+ emoji: null,
+ member_ids: ["user-1"],
+ team_ids: [],
+ });
+
+ assert.equal(space.my_direct_role, "admin");
+ assert.equal(requests[0].method, "POST");
+ assert.equal(requests[0].path, "/api/workspaces/ws-1/spaces");
+ assert.deepEqual(requests[0].body, {
+ name: "Roadmap",
+ emoji: null,
+ member_ids: ["user-1"],
+ team_ids: [],
+ });
+});
+
+test("SpacesService direct-member calls hit the members routes with the API's field names", async (t) => {
+ const stillViaTeams = [{ team_id: "team-1", name: "Sales" }];
+ const requests = installCloudCapture(t, { removed: true, still_via_teams: stillViaTeams });
+ const { SpacesService } = require("../../src/services/SpacesService.ts");
+
+ await SpacesService.addMember("space-1", "user-1");
+ await SpacesService.addMember("space-1", "user-2", "admin");
+ await SpacesService.setMemberRole("space-1", "user-1", "admin");
+ const removal = await SpacesService.removeMember("space-1", "user-1");
+
+ assert.deepEqual(
+ requests.map(({ method, path, body }) => [method, path, body]),
+ [
+ ["POST", "/api/spaces/space-1/members", { user_id: "user-1", role: "member" }],
+ ["POST", "/api/spaces/space-1/members", { user_id: "user-2", role: "admin" }],
+ ["PATCH", "/api/spaces/space-1/members/user-1", { role: "admin" }],
+ ["DELETE", "/api/spaces/space-1/members/user-1", undefined],
+ ]
+ );
+ assert.deepEqual(removal, { removed: true, still_via_teams: stillViaTeams });
+});
+
+test("InvitationsService.send forwards space_ids and accept surfaces the granted space ids", async (t) => {
+ const requests = installCloudCapture(t, {
+ workspace_id: "ws-1",
+ role: "member",
+ team_ids: [],
+ space_ids: ["space-1"],
+ });
+ const { InvitationsService } = require("../../src/services/InvitationsService.ts");
+
+ await InvitationsService.send("ws-1", { email: "[email protected]", space_ids: ["space-1"] });
+ const accepted = await InvitationsService.accept("tok en");
+
+ assert.equal(requests[0].path, "/api/workspaces/ws-1/invitations");
+ assert.deepEqual(requests[0].body, { email: "[email protected]", space_ids: ["space-1"] });
+ assert.equal(requests[1].path, "/api/invitations/tok%20en/accept");
+ assert.deepEqual(accepted.space_ids, ["space-1"]);
+});