feat: integrate tooltip functionality across various components
- Added TooltipProvider and Tooltip components to enhance user experience with contextual information. - Wrapped existing components such as TeamListView, TeamDetailView, and SendMessageDialog with tooltips for better interaction feedback. - Implemented MessagesFilterPopover to allow filtering messages by sender and recipient, improving message management. - Updated KanbanBoard and KanbanFilterPopover to include tooltips for view mode buttons, enhancing usability. These changes aim to provide users with clearer guidance and improve overall interaction within the application.
This commit is contained in:
parent
f1df2be208
commit
a5e9da278c
10 changed files with 565 additions and 254 deletions
|
|
@ -4,6 +4,7 @@ import { ConfirmDialog } from './components/common/ConfirmDialog';
|
||||||
import { ContextSwitchOverlay } from './components/common/ContextSwitchOverlay';
|
import { ContextSwitchOverlay } from './components/common/ContextSwitchOverlay';
|
||||||
import { ErrorBoundary } from './components/common/ErrorBoundary';
|
import { ErrorBoundary } from './components/common/ErrorBoundary';
|
||||||
import { TabbedLayout } from './components/layout/TabbedLayout';
|
import { TabbedLayout } from './components/layout/TabbedLayout';
|
||||||
|
import { TooltipProvider } from './components/ui/tooltip';
|
||||||
import { useTheme } from './hooks/useTheme';
|
import { useTheme } from './hooks/useTheme';
|
||||||
import { api } from './api';
|
import { api } from './api';
|
||||||
import { initializeNotificationListeners, useStore } from './store';
|
import { initializeNotificationListeners, useStore } from './store';
|
||||||
|
|
@ -43,9 +44,11 @@ export const App = (): React.JSX.Element => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
|
<TooltipProvider delayDuration={300}>
|
||||||
<ContextSwitchOverlay />
|
<ContextSwitchOverlay />
|
||||||
<TabbedLayout />
|
<TabbedLayout />
|
||||||
<ConfirmDialog />
|
<ConfirmDialog />
|
||||||
|
</TooltipProvider>
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,13 @@ import { KanbanBoard } from './kanban/KanbanBoard';
|
||||||
import { UNASSIGNED_OWNER } from './kanban/KanbanFilterPopover';
|
import { UNASSIGNED_OWNER } from './kanban/KanbanFilterPopover';
|
||||||
import { MemberDetailDialog } from './members/MemberDetailDialog';
|
import { MemberDetailDialog } from './members/MemberDetailDialog';
|
||||||
import { MemberList } from './members/MemberList';
|
import { MemberList } from './members/MemberList';
|
||||||
|
import { MessagesFilterPopover } from './messages/MessagesFilterPopover';
|
||||||
import { CollapsibleTeamSection } from './CollapsibleTeamSection';
|
import { CollapsibleTeamSection } from './CollapsibleTeamSection';
|
||||||
import { TeamProvisioningBanner } from './TeamProvisioningBanner';
|
import { TeamProvisioningBanner } from './TeamProvisioningBanner';
|
||||||
import { TeamSessionsSection } from './TeamSessionsSection';
|
import { TeamSessionsSection } from './TeamSessionsSection';
|
||||||
|
|
||||||
import type { KanbanFilterState } from './kanban/KanbanFilterPopover';
|
import type { KanbanFilterState } from './kanban/KanbanFilterPopover';
|
||||||
|
import type { MessagesFilterState } from './messages/MessagesFilterPopover';
|
||||||
import type { Session } from '@renderer/types/data';
|
import type { Session } from '@renderer/types/data';
|
||||||
import type { ResolvedTeamMember, TeamTask } from '@shared/types';
|
import type { ResolvedTeamMember, TeamTask } from '@shared/types';
|
||||||
|
|
||||||
|
|
@ -134,6 +136,12 @@ export const TeamDetailView = ({ teamName }: TeamDetailViewProps): React.JSX.Ele
|
||||||
);
|
);
|
||||||
|
|
||||||
const [kanbanSearch, setKanbanSearch] = useState('');
|
const [kanbanSearch, setKanbanSearch] = useState('');
|
||||||
|
const [messagesSearchQuery, setMessagesSearchQuery] = useState('');
|
||||||
|
const [messagesFilter, setMessagesFilter] = useState<MessagesFilterState>({
|
||||||
|
from: new Set(),
|
||||||
|
to: new Set(),
|
||||||
|
});
|
||||||
|
const [messagesFilterOpen, setMessagesFilterOpen] = useState(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!teamName) {
|
if (!teamName) {
|
||||||
|
|
@ -251,12 +259,31 @@ export const TeamDetailView = ({ teamName }: TeamDetailViewProps): React.JSX.Ele
|
||||||
|
|
||||||
const filteredMessages = useMemo(() => {
|
const filteredMessages = useMemo(() => {
|
||||||
if (!data) return [];
|
if (!data) return [];
|
||||||
if (!timeWindow) return data.messages;
|
let list = data.messages;
|
||||||
return data.messages.filter((m) => {
|
if (timeWindow) {
|
||||||
|
list = list.filter((m) => {
|
||||||
const ts = new Date(m.timestamp).getTime();
|
const ts = new Date(m.timestamp).getTime();
|
||||||
return ts >= timeWindow.start && ts < timeWindow.end;
|
return ts >= timeWindow.start && ts < timeWindow.end;
|
||||||
});
|
});
|
||||||
}, [data, timeWindow]);
|
}
|
||||||
|
if (messagesFilter.from.size > 0) {
|
||||||
|
list = list.filter((m) => m.from?.trim() && messagesFilter.from.has(m.from.trim()));
|
||||||
|
}
|
||||||
|
if (messagesFilter.to.size > 0) {
|
||||||
|
list = list.filter((m) => m.to?.trim() && messagesFilter.to.has(m.to.trim()));
|
||||||
|
}
|
||||||
|
const q = messagesSearchQuery.trim().toLowerCase();
|
||||||
|
if (q) {
|
||||||
|
list = list.filter((m) => {
|
||||||
|
const text = (m.text ?? '').toLowerCase();
|
||||||
|
const summary = (m.summary ?? '').toLowerCase();
|
||||||
|
const from = (m.from ?? '').toLowerCase();
|
||||||
|
const to = (m.to ?? '').toLowerCase();
|
||||||
|
return text.includes(q) || summary.includes(q) || from.includes(q) || to.includes(q);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return list;
|
||||||
|
}, [data, timeWindow, messagesFilter, messagesSearchQuery]);
|
||||||
|
|
||||||
const kanbanDisplayTasks = useMemo(() => {
|
const kanbanDisplayTasks = useMemo(() => {
|
||||||
const query = kanbanSearch.trim();
|
const query = kanbanSearch.trim();
|
||||||
|
|
@ -593,10 +620,30 @@ export const TeamDetailView = ({ teamName }: TeamDetailViewProps): React.JSX.Ele
|
||||||
badge={filteredMessages.length}
|
badge={filteredMessages.length}
|
||||||
defaultOpen
|
defaultOpen
|
||||||
action={
|
action={
|
||||||
|
<div className="flex items-center gap-2 pl-2">
|
||||||
|
<div className="flex w-36 items-center gap-1.5 rounded-md border border-[var(--color-border)] bg-transparent px-2 py-1">
|
||||||
|
<Search size={12} className="shrink-0 text-[var(--color-text-muted)]" />
|
||||||
|
<input
|
||||||
|
type="search"
|
||||||
|
placeholder="Поиск..."
|
||||||
|
value={messagesSearchQuery}
|
||||||
|
onChange={(e) => setMessagesSearchQuery(e.target.value)}
|
||||||
|
onPointerDown={(e) => e.stopPropagation()}
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
className="min-w-0 flex-1 bg-transparent text-xs text-[var(--color-text)] placeholder:text-[var(--color-text-muted)] focus:outline-none"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<MessagesFilterPopover
|
||||||
|
filter={messagesFilter}
|
||||||
|
messages={data?.messages ?? []}
|
||||||
|
open={messagesFilterOpen}
|
||||||
|
onOpenChange={setMessagesFilterOpen}
|
||||||
|
onApply={setMessagesFilter}
|
||||||
|
/>
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
size="sm"
|
size="sm"
|
||||||
className="h-7 gap-1.5 px-2.5 text-xs font-medium text-[var(--color-text)]"
|
className="h-7 shrink-0 gap-1.5 px-2.5 text-xs font-medium text-[var(--color-text)]"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
setSendDialogRecipient(undefined);
|
setSendDialogRecipient(undefined);
|
||||||
|
|
@ -607,6 +654,7 @@ export const TeamDetailView = ({ teamName }: TeamDetailViewProps): React.JSX.Ele
|
||||||
<MessageSquare size={12} />
|
<MessageSquare size={12} />
|
||||||
Message
|
Message
|
||||||
</Button>
|
</Button>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ActivityTimeline
|
<ActivityTimeline
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,12 @@ import { api, isElectronMode } from '@renderer/api';
|
||||||
import { Badge } from '@renderer/components/ui/badge';
|
import { Badge } from '@renderer/components/ui/badge';
|
||||||
import { Button } from '@renderer/components/ui/button';
|
import { Button } from '@renderer/components/ui/button';
|
||||||
import { Input } from '@renderer/components/ui/input';
|
import { Input } from '@renderer/components/ui/input';
|
||||||
|
import {
|
||||||
|
Tooltip,
|
||||||
|
TooltipContent,
|
||||||
|
TooltipProvider,
|
||||||
|
TooltipTrigger,
|
||||||
|
} from '@renderer/components/ui/tooltip';
|
||||||
import { getTeamColorSet } from '@renderer/constants/teamColors';
|
import { getTeamColorSet } from '@renderer/constants/teamColors';
|
||||||
import { useStore } from '@renderer/store';
|
import { useStore } from '@renderer/store';
|
||||||
import { buildTaskCountsByTeam, normalizePath } from '@renderer/utils/pathNormalize';
|
import { buildTaskCountsByTeam, normalizePath } from '@renderer/utils/pathNormalize';
|
||||||
|
|
@ -377,6 +383,7 @@ export const TeamListView = (): React.JSX.Element => {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<TooltipProvider delayDuration={300}>
|
||||||
<div className="size-full overflow-auto p-4">
|
<div className="size-full overflow-auto p-4">
|
||||||
{renderHeader()}
|
{renderHeader()}
|
||||||
|
|
||||||
|
|
@ -423,22 +430,30 @@ export const TeamListView = (): React.JSX.Element => {
|
||||||
<StatusBadge status={status} />
|
<StatusBadge status={status} />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex shrink-0 gap-1">
|
<div className="flex shrink-0 gap-1">
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="shrink-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-blue-500/10 hover:text-blue-300 group-hover:opacity-100"
|
className="shrink-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-blue-500/10 hover:text-blue-300 group-hover:opacity-100"
|
||||||
onClick={(e) => handleCopyTeam(team.teamName, e)}
|
onClick={(e) => handleCopyTeam(team.teamName, e)}
|
||||||
title="Copy team"
|
|
||||||
>
|
>
|
||||||
<Copy size={14} />
|
<Copy size={14} />
|
||||||
</button>
|
</button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="bottom">Copy team</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="shrink-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-red-500/10 hover:text-red-300 group-hover:opacity-100"
|
className="shrink-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-red-500/10 hover:text-red-300 group-hover:opacity-100"
|
||||||
onClick={(e) => handleDeleteTeam(team.teamName, e)}
|
onClick={(e) => handleDeleteTeam(team.teamName, e)}
|
||||||
title="Delete team"
|
|
||||||
>
|
>
|
||||||
<Trash2 size={14} />
|
<Trash2 size={14} />
|
||||||
</button>
|
</button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="bottom">Delete team</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p className="mt-2 line-clamp-2 min-h-10 text-xs text-[var(--color-text-muted)]">
|
<p className="mt-2 line-clamp-2 min-h-10 text-xs text-[var(--color-text-muted)]">
|
||||||
|
|
@ -479,7 +494,10 @@ export const TeamListView = (): React.JSX.Element => {
|
||||||
)}
|
)}
|
||||||
{(() => {
|
{(() => {
|
||||||
const tc = taskCountsByTeam.get(team.teamName);
|
const tc = taskCountsByTeam.get(team.teamName);
|
||||||
if (!tc || (tc.pending === 0 && tc.inProgress === 0 && tc.completed === 0)) {
|
if (
|
||||||
|
!tc ||
|
||||||
|
(tc.pending === 0 && tc.inProgress === 0 && tc.completed === 0)
|
||||||
|
) {
|
||||||
return (
|
return (
|
||||||
<Badge variant="secondary" className="text-[10px] font-normal">
|
<Badge variant="secondary" className="text-[10px] font-normal">
|
||||||
Tasks: 0
|
Tasks: 0
|
||||||
|
|
@ -536,5 +554,6 @@ export const TeamListView = (): React.JSX.Element => {
|
||||||
)}
|
)}
|
||||||
{createDialogElement}
|
{createDialogElement}
|
||||||
</div>
|
</div>
|
||||||
|
</TooltipProvider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { useCallback, useMemo } from 'react';
|
import { useCallback, useMemo } from 'react';
|
||||||
|
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
|
||||||
import { useStore } from '@renderer/store';
|
import { useStore } from '@renderer/store';
|
||||||
import { formatDistanceToNowStrict } from 'date-fns';
|
import { formatDistanceToNowStrict } from 'date-fns';
|
||||||
import {
|
import {
|
||||||
|
|
@ -205,9 +206,10 @@ const SessionRow = ({
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div className="flex shrink-0 items-center gap-1">
|
<div className="flex shrink-0 items-center gap-1">
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
title={isSelected ? 'Remove filter' : 'Filter by this session'}
|
|
||||||
className={`rounded p-0.5 text-[var(--color-text-muted)] transition-opacity hover:text-blue-400 ${
|
className={`rounded p-0.5 text-[var(--color-text-muted)] transition-opacity hover:text-blue-400 ${
|
||||||
isSelected ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'
|
isSelected ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'
|
||||||
}`}
|
}`}
|
||||||
|
|
@ -218,6 +220,13 @@ const SessionRow = ({
|
||||||
>
|
>
|
||||||
{isSelected ? <FilterX size={12} /> : <Filter size={12} />}
|
{isSelected ? <FilterX size={12} /> : <Filter size={12} />}
|
||||||
</button>
|
</button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="left">
|
||||||
|
{isSelected ? 'Remove filter' : 'Filter by this session'}
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="rounded p-0.5 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:text-[var(--color-text)] group-hover:opacity-100"
|
className="rounded p-0.5 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:text-[var(--color-text)] group-hover:opacity-100"
|
||||||
|
|
@ -228,6 +237,9 @@ const SessionRow = ({
|
||||||
>
|
>
|
||||||
<ExternalLink size={12} />
|
<ExternalLink size={12} />
|
||||||
</button>
|
</button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="left">Open session</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ import {
|
||||||
SelectTrigger,
|
SelectTrigger,
|
||||||
SelectValue,
|
SelectValue,
|
||||||
} from '@renderer/components/ui/select';
|
} from '@renderer/components/ui/select';
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
|
||||||
import { getTeamColorSet } from '@renderer/constants/teamColors';
|
import { getTeamColorSet } from '@renderer/constants/teamColors';
|
||||||
import { useDraftPersistence } from '@renderer/hooks/useDraftPersistence';
|
import { useDraftPersistence } from '@renderer/hooks/useDraftPersistence';
|
||||||
import { buildReplyBlock } from '@renderer/utils/agentMessageFormatting';
|
import { buildReplyBlock } from '@renderer/utils/agentMessageFormatting';
|
||||||
|
|
@ -180,6 +181,8 @@ export const SendMessageDialog = ({
|
||||||
|
|
||||||
{quote ? (
|
{quote ? (
|
||||||
<div className="relative rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] p-2.5">
|
<div className="relative rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] p-2.5">
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="absolute right-1.5 top-1.5 rounded p-0.5 text-[var(--color-text-muted)] hover:text-[var(--color-text)]"
|
className="absolute right-1.5 top-1.5 rounded p-0.5 text-[var(--color-text-muted)] hover:text-[var(--color-text)]"
|
||||||
|
|
@ -187,6 +190,9 @@ export const SendMessageDialog = ({
|
||||||
>
|
>
|
||||||
<X size={12} />
|
<X size={12} />
|
||||||
</button>
|
</button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="left">Remove quote</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
<span className="mb-0.5 block text-[10px] font-medium text-[var(--color-text-muted)]">
|
<span className="mb-0.5 block text-[10px] font-medium text-[var(--color-text-muted)]">
|
||||||
Replying to @{quote.from}
|
Replying to @{quote.from}
|
||||||
</span>
|
</span>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import { useCallback, useMemo, useState } from 'react';
|
||||||
import { MarkdownViewer } from '@renderer/components/chat/viewers/MarkdownViewer';
|
import { MarkdownViewer } from '@renderer/components/chat/viewers/MarkdownViewer';
|
||||||
import { ReplyQuoteBlock } from '@renderer/components/team/activity/ReplyQuoteBlock';
|
import { ReplyQuoteBlock } from '@renderer/components/team/activity/ReplyQuoteBlock';
|
||||||
import { MentionableTextarea } from '@renderer/components/ui/MentionableTextarea';
|
import { MentionableTextarea } from '@renderer/components/ui/MentionableTextarea';
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
|
||||||
import { useDraftPersistence } from '@renderer/hooks/useDraftPersistence';
|
import { useDraftPersistence } from '@renderer/hooks/useDraftPersistence';
|
||||||
import { useMarkCommentsRead } from '@renderer/hooks/useMarkCommentsRead';
|
import { useMarkCommentsRead } from '@renderer/hooks/useMarkCommentsRead';
|
||||||
import { useStore } from '@renderer/store';
|
import { useStore } from '@renderer/store';
|
||||||
|
|
@ -156,6 +157,8 @@ export const TaskCommentsSection = ({
|
||||||
{replyTo.text}
|
{replyTo.text}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="shrink-0 rounded p-0.5 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-surface)] hover:text-[var(--color-text-secondary)]"
|
className="shrink-0 rounded p-0.5 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-surface)] hover:text-[var(--color-text-secondary)]"
|
||||||
|
|
@ -163,6 +166,9 @@ export const TaskCommentsSection = ({
|
||||||
>
|
>
|
||||||
<X size={12} />
|
<X size={12} />
|
||||||
</button>
|
</button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="left">Cancel reply</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { useMemo, useState } from 'react';
|
import { useMemo, useState } from 'react';
|
||||||
|
|
||||||
import { Button } from '@renderer/components/ui/button';
|
import { Button } from '@renderer/components/ui/button';
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
|
||||||
import { cn } from '@renderer/lib/utils';
|
import { cn } from '@renderer/lib/utils';
|
||||||
import { Columns3, LayoutGrid } from 'lucide-react';
|
import { Columns3, LayoutGrid } from 'lucide-react';
|
||||||
|
|
||||||
|
|
@ -138,6 +139,8 @@ export const KanbanBoard = ({
|
||||||
onFilterChange={onFilterChange}
|
onFilterChange={onFilterChange}
|
||||||
/>
|
/>
|
||||||
<div className="inline-flex rounded-md border border-[var(--color-border)]">
|
<div className="inline-flex rounded-md border border-[var(--color-border)]">
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
|
@ -149,10 +152,14 @@ export const KanbanBoard = ({
|
||||||
)}
|
)}
|
||||||
onClick={() => setViewMode('grid')}
|
onClick={() => setViewMode('grid')}
|
||||||
aria-label="Grid view"
|
aria-label="Grid view"
|
||||||
title="Grid"
|
|
||||||
>
|
>
|
||||||
<LayoutGrid size={14} />
|
<LayoutGrid size={14} />
|
||||||
</Button>
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="bottom">Grid view</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
|
@ -164,10 +171,12 @@ export const KanbanBoard = ({
|
||||||
)}
|
)}
|
||||||
onClick={() => setViewMode('columns')}
|
onClick={() => setViewMode('columns')}
|
||||||
aria-label="Columns view"
|
aria-label="Columns view"
|
||||||
title="Columns"
|
|
||||||
>
|
>
|
||||||
<Columns3 size={14} />
|
<Columns3 size={14} />
|
||||||
</Button>
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="bottom">Columns view</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import { useMemo } from 'react';
|
||||||
import { Button } from '@renderer/components/ui/button';
|
import { Button } from '@renderer/components/ui/button';
|
||||||
import { Checkbox } from '@renderer/components/ui/checkbox';
|
import { Checkbox } from '@renderer/components/ui/checkbox';
|
||||||
import { Popover, PopoverContent, PopoverTrigger } from '@renderer/components/ui/popover';
|
import { Popover, PopoverContent, PopoverTrigger } from '@renderer/components/ui/popover';
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
|
||||||
import { Crown, Filter } from 'lucide-react';
|
import { Crown, Filter } from 'lucide-react';
|
||||||
|
|
||||||
import type { Session } from '@renderer/types/data';
|
import type { Session } from '@renderer/types/data';
|
||||||
|
|
@ -57,13 +58,14 @@ export const KanbanFilterPopover = ({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Popover>
|
<Popover>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
<PopoverTrigger asChild>
|
<PopoverTrigger asChild>
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="sm"
|
size="sm"
|
||||||
className="relative h-7 px-2 text-[var(--color-text-muted)] hover:text-[var(--color-text)]"
|
className="relative h-7 px-2 text-[var(--color-text-muted)] hover:text-[var(--color-text)]"
|
||||||
aria-label="Filter tasks"
|
aria-label="Filter tasks"
|
||||||
title="Filter"
|
|
||||||
>
|
>
|
||||||
<Filter size={14} />
|
<Filter size={14} />
|
||||||
{activeCount > 0 && (
|
{activeCount > 0 && (
|
||||||
|
|
@ -73,6 +75,9 @@ export const KanbanFilterPopover = ({
|
||||||
)}
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="bottom">Filter tasks</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
<PopoverContent align="end" className="w-72 p-0">
|
<PopoverContent align="end" className="w-72 p-0">
|
||||||
{/* Session section */}
|
{/* Session section */}
|
||||||
<div className="border-b border-[var(--color-border)] p-3">
|
<div className="border-b border-[var(--color-border)] p-3">
|
||||||
|
|
|
||||||
171
src/renderer/components/team/messages/MessagesFilterPopover.tsx
Normal file
171
src/renderer/components/team/messages/MessagesFilterPopover.tsx
Normal file
|
|
@ -0,0 +1,171 @@
|
||||||
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
|
||||||
|
import { Button } from '@renderer/components/ui/button';
|
||||||
|
import { Checkbox } from '@renderer/components/ui/checkbox';
|
||||||
|
import { Popover, PopoverContent, PopoverTrigger } from '@renderer/components/ui/popover';
|
||||||
|
import { Filter } from 'lucide-react';
|
||||||
|
|
||||||
|
import type { InboxMessage } from '@shared/types';
|
||||||
|
|
||||||
|
export interface MessagesFilterState {
|
||||||
|
from: Set<string>;
|
||||||
|
to: Set<string>;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface MessagesFilterPopoverProps {
|
||||||
|
filter: MessagesFilterState;
|
||||||
|
messages: InboxMessage[];
|
||||||
|
open: boolean;
|
||||||
|
onOpenChange: (open: boolean) => void;
|
||||||
|
onApply: (filter: MessagesFilterState) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
function collectFromOptions(messages: InboxMessage[]): string[] {
|
||||||
|
const set = new Set<string>();
|
||||||
|
for (const m of messages) {
|
||||||
|
if (m.from?.trim()) set.add(m.from.trim());
|
||||||
|
}
|
||||||
|
return Array.from(set).sort();
|
||||||
|
}
|
||||||
|
|
||||||
|
function collectToOptions(messages: InboxMessage[]): string[] {
|
||||||
|
const set = new Set<string>();
|
||||||
|
for (const m of messages) {
|
||||||
|
if (m.to?.trim()) set.add(m.to.trim());
|
||||||
|
}
|
||||||
|
return Array.from(set).sort();
|
||||||
|
}
|
||||||
|
|
||||||
|
export const MessagesFilterPopover = ({
|
||||||
|
filter,
|
||||||
|
messages,
|
||||||
|
open,
|
||||||
|
onOpenChange,
|
||||||
|
onApply,
|
||||||
|
}: MessagesFilterPopoverProps): React.JSX.Element => {
|
||||||
|
const [draft, setDraft] = useState<MessagesFilterState>({ from: new Set(), to: new Set() });
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (open) {
|
||||||
|
setDraft({
|
||||||
|
from: new Set(filter.from),
|
||||||
|
to: new Set(filter.to),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [open, filter.from, filter.to]);
|
||||||
|
|
||||||
|
const fromOptions = useMemo(() => collectFromOptions(messages), [messages]);
|
||||||
|
const toOptions = useMemo(() => collectToOptions(messages), [messages]);
|
||||||
|
|
||||||
|
const activeCount = (filter.from.size > 0 ? 1 : 0) + (filter.to.size > 0 ? 1 : 0);
|
||||||
|
const draftCount = (draft.from.size > 0 ? 1 : 0) + (draft.to.size > 0 ? 1 : 0);
|
||||||
|
|
||||||
|
const toggleFrom = (name: string): void => {
|
||||||
|
setDraft((prev) => {
|
||||||
|
const next = new Set(prev.from);
|
||||||
|
if (next.has(name)) next.delete(name);
|
||||||
|
else next.add(name);
|
||||||
|
return { ...prev, from: next };
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleTo = (name: string): void => {
|
||||||
|
setDraft((prev) => {
|
||||||
|
const next = new Set(prev.to);
|
||||||
|
if (next.has(name)) next.delete(name);
|
||||||
|
else next.add(name);
|
||||||
|
return { ...prev, to: next };
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSave = (): void => {
|
||||||
|
onApply(draft);
|
||||||
|
onOpenChange(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleReset = (): void => {
|
||||||
|
const empty = { from: new Set<string>(), to: new Set<string>() };
|
||||||
|
setDraft(empty);
|
||||||
|
onApply(empty);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Popover open={open} onOpenChange={onOpenChange}>
|
||||||
|
<PopoverTrigger asChild>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="relative h-7 px-2 text-[var(--color-text-muted)] hover:text-[var(--color-text)]"
|
||||||
|
aria-label="Filter messages"
|
||||||
|
title="Filter"
|
||||||
|
>
|
||||||
|
<Filter size={14} />
|
||||||
|
{activeCount > 0 && (
|
||||||
|
<span className="absolute -right-1 -top-1 flex size-4 items-center justify-center rounded-full bg-blue-500 text-[10px] font-medium text-white">
|
||||||
|
{activeCount}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</PopoverTrigger>
|
||||||
|
<PopoverContent align="end" className="w-72 p-0">
|
||||||
|
<div className="border-b border-[var(--color-border)] p-3">
|
||||||
|
<p className="mb-2 text-[11px] font-medium uppercase tracking-wider text-[var(--color-text-muted)]">
|
||||||
|
Кто писал
|
||||||
|
</p>
|
||||||
|
<div className="max-h-40 space-y-1 overflow-y-auto">
|
||||||
|
{fromOptions.length === 0 ? (
|
||||||
|
<p className="text-xs italic text-[var(--color-text-muted)]">Нет данных</p>
|
||||||
|
) : (
|
||||||
|
fromOptions.map((name) => (
|
||||||
|
<label
|
||||||
|
key={name}
|
||||||
|
className="flex cursor-pointer items-center gap-2 rounded-md px-1 py-0.5 text-xs text-[var(--color-text-secondary)] hover:bg-[var(--color-surface-raised)]"
|
||||||
|
>
|
||||||
|
<Checkbox
|
||||||
|
checked={draft.from.has(name)}
|
||||||
|
onCheckedChange={() => toggleFrom(name)}
|
||||||
|
/>
|
||||||
|
{name}
|
||||||
|
</label>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="border-b border-[var(--color-border)] p-3">
|
||||||
|
<p className="mb-2 text-[11px] font-medium uppercase tracking-wider text-[var(--color-text-muted)]">
|
||||||
|
Кому писали
|
||||||
|
</p>
|
||||||
|
<div className="max-h-40 space-y-1 overflow-y-auto">
|
||||||
|
{toOptions.length === 0 ? (
|
||||||
|
<p className="text-xs italic text-[var(--color-text-muted)]">Нет данных</p>
|
||||||
|
) : (
|
||||||
|
toOptions.map((name) => (
|
||||||
|
<label
|
||||||
|
key={name}
|
||||||
|
className="flex cursor-pointer items-center gap-2 rounded-md px-1 py-0.5 text-xs text-[var(--color-text-secondary)] hover:bg-[var(--color-surface-raised)]"
|
||||||
|
>
|
||||||
|
<Checkbox checked={draft.to.has(name)} onCheckedChange={() => toggleTo(name)} />
|
||||||
|
{name}
|
||||||
|
</label>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-between gap-2 p-2">
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="h-7 px-2 text-[11px] text-[var(--color-text-muted)] hover:text-[var(--color-text)]"
|
||||||
|
disabled={draftCount === 0}
|
||||||
|
onClick={handleReset}
|
||||||
|
>
|
||||||
|
Сбросить
|
||||||
|
</Button>
|
||||||
|
<Button size="sm" className="h-7 px-3 text-[11px]" onClick={handleSave}>
|
||||||
|
Сохранить
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</PopoverContent>
|
||||||
|
</Popover>
|
||||||
|
);
|
||||||
|
};
|
||||||
32
src/renderer/components/ui/tooltip.tsx
Normal file
32
src/renderer/components/ui/tooltip.tsx
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
/* eslint-disable react/jsx-props-no-spreading -- Standard Radix/shadcn pattern */
|
||||||
|
import * as React from 'react';
|
||||||
|
|
||||||
|
import * as TooltipPrimitive from '@radix-ui/react-tooltip';
|
||||||
|
import { cn } from '@renderer/lib/utils';
|
||||||
|
|
||||||
|
const TooltipProvider = TooltipPrimitive.Provider;
|
||||||
|
|
||||||
|
const Tooltip = TooltipPrimitive.Root;
|
||||||
|
const TooltipTrigger = TooltipPrimitive.Trigger;
|
||||||
|
const TooltipPortal = TooltipPrimitive.Portal;
|
||||||
|
|
||||||
|
const TooltipContent = React.forwardRef<
|
||||||
|
React.ComponentRef<typeof TooltipPrimitive.Content>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
|
||||||
|
>(({ className, sideOffset = 4, ...props }, ref) => (
|
||||||
|
<TooltipPrimitive.Portal>
|
||||||
|
<TooltipPrimitive.Content
|
||||||
|
ref={ref}
|
||||||
|
sideOffset={sideOffset}
|
||||||
|
className={cn(
|
||||||
|
'z-50 max-w-[var(--radix-tooltip-content-available-width)] rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] px-3 py-1.5 text-xs text-[var(--color-text)] shadow-md outline-none animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
|
||||||
|
className
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
</TooltipPrimitive.Portal>
|
||||||
|
));
|
||||||
|
TooltipContent.displayName = TooltipPrimitive.Content.displayName;
|
||||||
|
|
||||||
|
export { Tooltip, TooltipContent, TooltipPortal, TooltipProvider, TooltipTrigger };
|
||||||
|
/* eslint-enable react/jsx-props-no-spreading */
|
||||||
Loading…
Reference in a new issue