chore: refactorings for sidebar handling
This commit is contained in:
@@ -12,6 +12,9 @@ import { openChatTab, openEntityTab, openImportTab, openScriptTab, openSingleton
|
|||||||
import { createAndFocusPost } from '../../navigation/postCreation';
|
import { createAndFocusPost } from '../../navigation/postCreation';
|
||||||
import type { SidebarView } from '../../navigation/sidebarViewRegistry';
|
import type { SidebarView } from '../../navigation/sidebarViewRegistry';
|
||||||
import { useI18n } from '../../i18n';
|
import { useI18n } from '../../i18n';
|
||||||
|
import { useProjectScopedSidebarData } from './useProjectScopedSidebarData';
|
||||||
|
import { SidebarEntityList } from './SidebarEntityList';
|
||||||
|
import { formatSidebarRelativeDate } from './sidebarDateFormatting';
|
||||||
import './Sidebar.css';
|
import './Sidebar.css';
|
||||||
|
|
||||||
/** Get display name for media: title (truncated to 60 chars) or fallback to filename */
|
/** Get display name for media: title (truncated to 60 chars) or fallback to filename */
|
||||||
@@ -1371,23 +1374,29 @@ const SettingsNav: React.FC = () => {
|
|||||||
// Chat conversations list
|
// Chat conversations list
|
||||||
const ChatList: React.FC = () => {
|
const ChatList: React.FC = () => {
|
||||||
const { t, language } = useI18n();
|
const { t, language } = useI18n();
|
||||||
const { openTab, closeTab } = useAppStore();
|
const { openTab, closeTab, activeProject } = useAppStore();
|
||||||
const [conversations, setConversations] = useState<ChatConversation[]>([]);
|
const activeProjectId = activeProject?.id;
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
const [isReady, setIsReady] = useState(false);
|
const [isReady, setIsReady] = useState(false);
|
||||||
|
|
||||||
// Load conversations
|
const loadConversations = useCallback(async (): Promise<ChatConversation[]> => {
|
||||||
const loadConversations = useCallback(async () => {
|
|
||||||
try {
|
try {
|
||||||
const convs = await window.electronAPI?.chat.getConversations();
|
const convs = await window.electronAPI?.chat.getConversations();
|
||||||
if (convs) {
|
return convs ?? [];
|
||||||
setConversations(convs);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to load conversations:', error);
|
console.error('Failed to load conversations:', error);
|
||||||
|
return [];
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const {
|
||||||
|
items: conversations,
|
||||||
|
setItems: setConversations,
|
||||||
|
isLoading,
|
||||||
|
} = useProjectScopedSidebarData<ChatConversation>({
|
||||||
|
load: loadConversations,
|
||||||
|
activeProjectId,
|
||||||
|
});
|
||||||
|
|
||||||
// Check if service is ready
|
// Check if service is ready
|
||||||
const checkReady = useCallback(async () => {
|
const checkReady = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
@@ -1399,13 +1408,7 @@ const ChatList: React.FC = () => {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const init = async () => {
|
void checkReady();
|
||||||
setIsLoading(true);
|
|
||||||
await checkReady();
|
|
||||||
await loadConversations();
|
|
||||||
setIsLoading(false);
|
|
||||||
};
|
|
||||||
init();
|
|
||||||
|
|
||||||
// Subscribe to title updates
|
// Subscribe to title updates
|
||||||
const unsubTitle = window.electronAPI?.chat.onTitleUpdated((data) => {
|
const unsubTitle = window.electronAPI?.chat.onTitleUpdated((data) => {
|
||||||
@@ -1417,7 +1420,7 @@ const ChatList: React.FC = () => {
|
|||||||
return () => {
|
return () => {
|
||||||
unsubTitle?.();
|
unsubTitle?.();
|
||||||
};
|
};
|
||||||
}, [loadConversations, checkReady]);
|
}, [checkReady, setConversations]);
|
||||||
|
|
||||||
const handleNewChat = async () => {
|
const handleNewChat = async () => {
|
||||||
try {
|
try {
|
||||||
@@ -1448,109 +1451,75 @@ const ChatList: React.FC = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatChatDate = (dateString: string) => {
|
|
||||||
const date = new Date(dateString);
|
|
||||||
const now = new Date();
|
|
||||||
const diffDays = Math.floor((now.getTime() - date.getTime()) / (1000 * 60 * 60 * 24));
|
|
||||||
const uiDateLocale = UI_DATE_LOCALE[language] || UI_DATE_LOCALE.en;
|
|
||||||
|
|
||||||
if (diffDays === 0) {
|
|
||||||
return date.toLocaleTimeString(uiDateLocale, { hour: 'numeric', minute: '2-digit' });
|
|
||||||
} else if (diffDays === 1) {
|
|
||||||
return t('sidebar.chat.yesterday');
|
|
||||||
} else if (diffDays < 7) {
|
|
||||||
return date.toLocaleDateString(uiDateLocale, { weekday: 'short' });
|
|
||||||
}
|
|
||||||
return date.toLocaleDateString(uiDateLocale, { month: 'short', day: 'numeric' });
|
|
||||||
};
|
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="chat-list">
|
|
||||||
<div className="chat-list-header">
|
|
||||||
<span>{t('sidebar.chat.header')}</span>
|
|
||||||
</div>
|
|
||||||
<div className="chat-loading">{t('sidebar.loading')}</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="chat-list">
|
<SidebarEntityList
|
||||||
<div className="chat-list-header">
|
header={t('sidebar.chat.header')}
|
||||||
<span>{t('sidebar.chat.header')}</span>
|
createTitle={t('sidebar.chat.newChat')}
|
||||||
<button className="chat-new-button" onClick={handleNewChat} title={t('sidebar.chat.newChat')}>
|
onCreate={handleNewChat}
|
||||||
+
|
isLoading={isLoading}
|
||||||
</button>
|
loadingLabel={t('sidebar.loading')}
|
||||||
</div>
|
emptyMessage={t('sidebar.chat.noConversations')}
|
||||||
{!isReady && (
|
emptyActionLabel={t('sidebar.chat.startNew')}
|
||||||
<div className="chat-auth-prompt">
|
onEmptyAction={handleNewChat}
|
||||||
<p>{t('sidebar.chat.apiKeyNeeded')}</p>
|
items={conversations}
|
||||||
|
getItemKey={(conversation) => conversation.id}
|
||||||
|
topContent={
|
||||||
|
!isReady ? (
|
||||||
|
<div className="chat-auth-prompt">
|
||||||
|
<p>{t('sidebar.chat.apiKeyNeeded')}</p>
|
||||||
|
</div>
|
||||||
|
) : null
|
||||||
|
}
|
||||||
|
renderItem={(conversation) => (
|
||||||
|
<div
|
||||||
|
className="chat-list-item"
|
||||||
|
onClick={() => handleOpenChat(conversation.id)}
|
||||||
|
>
|
||||||
|
<div className="chat-item-content">
|
||||||
|
<div className="chat-item-title">{conversation.title}</div>
|
||||||
|
<div className="chat-item-date">
|
||||||
|
{formatSidebarRelativeDate({ dateString: conversation.updatedAt, language, t })}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
className="chat-item-delete"
|
||||||
|
onClick={(event) => {
|
||||||
|
event.stopPropagation();
|
||||||
|
handleDeleteChat(conversation.id);
|
||||||
|
}}
|
||||||
|
title={t('sidebar.chat.deleteConversation')}
|
||||||
|
>
|
||||||
|
×
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="chat-list-items">
|
/>
|
||||||
{conversations.length === 0 ? (
|
|
||||||
<div className="chat-empty">
|
|
||||||
<p>{t('sidebar.chat.noConversations')}</p>
|
|
||||||
<button className="chat-start-button" onClick={handleNewChat}>
|
|
||||||
{t('sidebar.chat.startNew')}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
conversations.map(conv => (
|
|
||||||
<div
|
|
||||||
key={conv.id}
|
|
||||||
className="chat-list-item"
|
|
||||||
onClick={() => handleOpenChat(conv.id)}
|
|
||||||
>
|
|
||||||
<div className="chat-item-content">
|
|
||||||
<div className="chat-item-title">{conv.title}</div>
|
|
||||||
<div className="chat-item-date">{formatChatDate(conv.updatedAt)}</div>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
className="chat-item-delete"
|
|
||||||
onClick={(e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
handleDeleteChat(conv.id);
|
|
||||||
}}
|
|
||||||
title={t('sidebar.chat.deleteConversation')}
|
|
||||||
>
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const ImportList: React.FC = () => {
|
const ImportList: React.FC = () => {
|
||||||
const { t, language } = useI18n();
|
const { t, language } = useI18n();
|
||||||
const { openTab, closeTab, activeProject } = useAppStore();
|
const { openTab, closeTab, activeProject } = useAppStore();
|
||||||
const [definitions, setDefinitions] = useState<ImportDefinitionData[]>([]);
|
const activeProjectId = activeProject?.id;
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
|
|
||||||
const loadDefinitions = useCallback(async () => {
|
const loadDefinitions = useCallback(async (): Promise<ImportDefinitionData[]> => {
|
||||||
try {
|
try {
|
||||||
const defs = await window.electronAPI?.importDefinitions.getAll();
|
const defs = await window.electronAPI?.importDefinitions.getAll();
|
||||||
if (defs) {
|
return defs ?? [];
|
||||||
setDefinitions(defs);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to load import definitions:', error);
|
console.error('Failed to load import definitions:', error);
|
||||||
|
return [];
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
// Reload definitions when project changes
|
const {
|
||||||
useEffect(() => {
|
items: definitions,
|
||||||
const init = async () => {
|
setItems: setDefinitions,
|
||||||
setIsLoading(true);
|
isLoading,
|
||||||
await loadDefinitions();
|
} = useProjectScopedSidebarData<ImportDefinitionData>({
|
||||||
setIsLoading(false);
|
load: loadDefinitions,
|
||||||
};
|
activeProjectId,
|
||||||
init();
|
});
|
||||||
}, [loadDefinitions, activeProject?.id]);
|
|
||||||
|
|
||||||
// Listen for import definition name updates
|
// Listen for import definition name updates
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -1598,126 +1567,62 @@ const ImportList: React.FC = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatDate = (dateString: string) => {
|
|
||||||
const date = new Date(dateString);
|
|
||||||
const now = new Date();
|
|
||||||
const diffDays = Math.floor((now.getTime() - date.getTime()) / (1000 * 60 * 60 * 24));
|
|
||||||
const uiDateLocale = UI_DATE_LOCALE[language] || UI_DATE_LOCALE.en;
|
|
||||||
if (diffDays === 0) {
|
|
||||||
return date.toLocaleTimeString(uiDateLocale, { hour: 'numeric', minute: '2-digit' });
|
|
||||||
} else if (diffDays === 1) {
|
|
||||||
return t('sidebar.chat.yesterday');
|
|
||||||
} else if (diffDays < 7) {
|
|
||||||
return date.toLocaleDateString(uiDateLocale, { weekday: 'short' });
|
|
||||||
}
|
|
||||||
return date.toLocaleDateString(uiDateLocale, { month: 'short', day: 'numeric' });
|
|
||||||
};
|
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="chat-list">
|
|
||||||
<div className="chat-list-header">
|
|
||||||
<span>{t('sidebar.import.header')}</span>
|
|
||||||
</div>
|
|
||||||
<div className="chat-loading">{t('sidebar.loading')}</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="chat-list">
|
<SidebarEntityList
|
||||||
<div className="chat-list-header">
|
header={t('sidebar.import.header')}
|
||||||
<span>{t('sidebar.import.header')}</span>
|
createTitle={t('sidebar.import.newDefinition')}
|
||||||
<button className="chat-new-button" onClick={handleNewDefinition} title={t('sidebar.import.newDefinition')}>
|
onCreate={handleNewDefinition}
|
||||||
+
|
isLoading={isLoading}
|
||||||
</button>
|
loadingLabel={t('sidebar.loading')}
|
||||||
</div>
|
emptyMessage={t('sidebar.import.none')}
|
||||||
<div className="chat-list-items">
|
emptyActionLabel={t('sidebar.import.createDefinition')}
|
||||||
{definitions.length === 0 ? (
|
onEmptyAction={handleNewDefinition}
|
||||||
<div className="chat-empty">
|
items={definitions}
|
||||||
<p>{t('sidebar.import.none')}</p>
|
getItemKey={(definition) => definition.id}
|
||||||
<button className="chat-start-button" onClick={handleNewDefinition}>
|
renderItem={(definition) => (
|
||||||
{t('sidebar.import.createDefinition')}
|
<div
|
||||||
</button>
|
className="chat-list-item"
|
||||||
</div>
|
onClick={() => handleOpenDefinition(definition.id)}
|
||||||
) : (
|
>
|
||||||
definitions.map(def => (
|
<div className="chat-item-content">
|
||||||
<div
|
<div className="chat-item-title">{definition.name}</div>
|
||||||
key={def.id}
|
<div className="chat-item-date">
|
||||||
className="chat-list-item"
|
{formatSidebarRelativeDate({ dateString: definition.updatedAt, language, t })}
|
||||||
onClick={() => handleOpenDefinition(def.id)}
|
|
||||||
>
|
|
||||||
<div className="chat-item-content">
|
|
||||||
<div className="chat-item-title">{def.name}</div>
|
|
||||||
<div className="chat-item-date">{formatDate(def.updatedAt)}</div>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
className="chat-item-delete"
|
|
||||||
onClick={(e) => handleDeleteDefinition(e, def.id)}
|
|
||||||
title={t('sidebar.import.deleteDefinition')}
|
|
||||||
>
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
))
|
</div>
|
||||||
)}
|
<button
|
||||||
</div>
|
className="chat-item-delete"
|
||||||
</div>
|
onClick={(event) => handleDeleteDefinition(event, definition.id)}
|
||||||
|
title={t('sidebar.import.deleteDefinition')}
|
||||||
|
>
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const ScriptsList: React.FC = () => {
|
const ScriptsList: React.FC = () => {
|
||||||
const { t, language } = useI18n();
|
const { t, language } = useI18n();
|
||||||
const { openTab, activeTabId, closeTab } = useAppStore();
|
const { openTab, activeTabId, closeTab } = useAppStore();
|
||||||
const [scripts, setScripts] = useState<Array<{ id: string; title: string; updatedAt: string }>>([]);
|
const activeProjectId = useAppStore((state) => state.activeProject?.id);
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
|
|
||||||
const loadScripts = useCallback(async () => {
|
const loadScripts = useCallback(async (): Promise<Array<{ id: string; title: string; updatedAt: string }>> => {
|
||||||
const items = await window.electronAPI?.scripts.getAll();
|
const items = await window.electronAPI?.scripts.getAll();
|
||||||
if (!items) {
|
return (items ?? []).map((item) => ({ id: item.id, title: item.title, updatedAt: item.updatedAt }));
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setScripts(items.map((item) => ({ id: item.id, title: item.title, updatedAt: item.updatedAt })));
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
const {
|
||||||
let cancelled = false;
|
items: scripts,
|
||||||
|
setItems: setScripts,
|
||||||
const loadInitialScripts = async () => {
|
isLoading,
|
||||||
setIsLoading(true);
|
reload: reloadScripts,
|
||||||
try {
|
} = useProjectScopedSidebarData<Array<{ id: string; title: string; updatedAt: string }>[number]>({
|
||||||
const items = await window.electronAPI?.scripts.getAll();
|
load: loadScripts,
|
||||||
if (cancelled) {
|
activeProjectId,
|
||||||
return;
|
refreshEventName: 'bds:scripts-changed',
|
||||||
}
|
});
|
||||||
|
|
||||||
setScripts((items ?? []).map((item) => ({ id: item.id, title: item.title, updatedAt: item.updatedAt })));
|
|
||||||
} finally {
|
|
||||||
if (!cancelled) {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
void loadInitialScripts();
|
|
||||||
|
|
||||||
const canListen = typeof window.addEventListener === 'function' && typeof window.removeEventListener === 'function';
|
|
||||||
const handleScriptsChanged = () => {
|
|
||||||
void loadScripts();
|
|
||||||
};
|
|
||||||
|
|
||||||
if (canListen) {
|
|
||||||
window.addEventListener('bds:scripts-changed', handleScriptsChanged);
|
|
||||||
}
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
cancelled = true;
|
|
||||||
if (canListen) {
|
|
||||||
window.removeEventListener('bds:scripts-changed', handleScriptsChanged);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}, [loadScripts]);
|
|
||||||
|
|
||||||
const handleCreateScript = async () => {
|
const handleCreateScript = async () => {
|
||||||
try {
|
try {
|
||||||
@@ -1741,28 +1646,13 @@ const ScriptsList: React.FC = () => {
|
|||||||
window.dispatchEvent(new CustomEvent('bds:scripts-changed'));
|
window.dispatchEvent(new CustomEvent('bds:scripts-changed'));
|
||||||
}
|
}
|
||||||
openScriptTab(openTab, created.id, 'pin');
|
openScriptTab(openTab, created.id, 'pin');
|
||||||
void loadScripts();
|
void reloadScripts();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to create script:', error);
|
console.error('Failed to create script:', error);
|
||||||
showToast.error(t('sidebar.scripts.createFailed'));
|
showToast.error(t('sidebar.scripts.createFailed'));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatDate = (dateString: string) => {
|
|
||||||
const date = new Date(dateString);
|
|
||||||
const now = new Date();
|
|
||||||
const diffDays = Math.floor((now.getTime() - date.getTime()) / (1000 * 60 * 60 * 24));
|
|
||||||
const uiDateLocale = UI_DATE_LOCALE[language] || UI_DATE_LOCALE.en;
|
|
||||||
if (diffDays === 0) {
|
|
||||||
return date.toLocaleTimeString(uiDateLocale, { hour: 'numeric', minute: '2-digit' });
|
|
||||||
} else if (diffDays === 1) {
|
|
||||||
return t('sidebar.chat.yesterday');
|
|
||||||
} else if (diffDays < 7) {
|
|
||||||
return date.toLocaleDateString(uiDateLocale, { weekday: 'short' });
|
|
||||||
}
|
|
||||||
return date.toLocaleDateString(uiDateLocale, { month: 'short', day: 'numeric' });
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleDeleteScript = async (event: React.MouseEvent, scriptId: string) => {
|
const handleDeleteScript = async (event: React.MouseEvent, scriptId: string) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
try {
|
try {
|
||||||
@@ -1782,75 +1672,53 @@ const ScriptsList: React.FC = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="chat-list">
|
|
||||||
<div className="chat-list-header">
|
|
||||||
<span>{t('sidebar.scripts.header')}</span>
|
|
||||||
</div>
|
|
||||||
<div className="chat-loading">{t('sidebar.loading')}</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="chat-list">
|
<SidebarEntityList
|
||||||
<div className="chat-list-header">
|
header={t('sidebar.scripts.header')}
|
||||||
<span>{t('sidebar.scripts.header')}</span>
|
createTitle={t('sidebar.scripts.newScript')}
|
||||||
<button
|
onCreate={handleCreateScript}
|
||||||
className="chat-new-button"
|
isLoading={isLoading}
|
||||||
onClick={handleCreateScript}
|
loadingLabel={t('sidebar.loading')}
|
||||||
aria-label={t('sidebar.scripts.newScript')}
|
emptyMessage={t('sidebar.scripts.none')}
|
||||||
title={t('sidebar.scripts.newScript')}
|
emptyActionLabel={t('sidebar.scripts.createScript')}
|
||||||
|
onEmptyAction={handleCreateScript}
|
||||||
|
items={scripts}
|
||||||
|
getItemKey={(script) => script.id}
|
||||||
|
renderItem={(script) => (
|
||||||
|
<div
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label={script.title}
|
||||||
|
className={`chat-list-item ${activeTabId === script.id ? 'active' : ''}`}
|
||||||
|
onClick={() => openScriptTab(openTab, script.id, 'preview')}
|
||||||
|
onDoubleClick={() => openScriptTab(openTab, script.id, 'pin')}
|
||||||
|
onKeyDown={(event) => {
|
||||||
|
if (event.key === 'Enter') {
|
||||||
|
openScriptTab(openTab, script.id, 'pin');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (event.key === ' ') {
|
||||||
|
event.preventDefault();
|
||||||
|
openScriptTab(openTab, script.id, 'preview');
|
||||||
|
}
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
+
|
<div className="chat-item-content">
|
||||||
</button>
|
<div className="chat-item-title">{script.title}</div>
|
||||||
</div>
|
<div className="chat-item-date">
|
||||||
<div className="chat-list-items">
|
{formatSidebarRelativeDate({ dateString: script.updatedAt, language, t })}
|
||||||
{scripts.length === 0 ? (
|
|
||||||
<div className="chat-empty">
|
|
||||||
<p>{t('sidebar.scripts.none')}</p>
|
|
||||||
<button className="chat-start-button" onClick={handleCreateScript}>
|
|
||||||
{t('sidebar.scripts.createScript')}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
scripts.map((script) => (
|
|
||||||
<div
|
|
||||||
key={script.id}
|
|
||||||
role="button"
|
|
||||||
tabIndex={0}
|
|
||||||
aria-label={script.title}
|
|
||||||
className={`chat-list-item ${activeTabId === script.id ? 'active' : ''}`}
|
|
||||||
onClick={() => openScriptTab(openTab, script.id, 'preview')}
|
|
||||||
onDoubleClick={() => openScriptTab(openTab, script.id, 'pin')}
|
|
||||||
onKeyDown={(event) => {
|
|
||||||
if (event.key === 'Enter') {
|
|
||||||
openScriptTab(openTab, script.id, 'pin');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (event.key === ' ') {
|
|
||||||
event.preventDefault();
|
|
||||||
openScriptTab(openTab, script.id, 'preview');
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div className="chat-item-content">
|
|
||||||
<div className="chat-item-title">{script.title}</div>
|
|
||||||
<div className="chat-item-date">{formatDate(script.updatedAt)}</div>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
className="chat-item-delete"
|
|
||||||
onClick={(event) => handleDeleteScript(event, script.id)}
|
|
||||||
title={t('sidebar.scripts.deleteScript')}
|
|
||||||
>
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
))
|
</div>
|
||||||
)}
|
<button
|
||||||
</div>
|
className="chat-item-delete"
|
||||||
</div>
|
onClick={(event) => handleDeleteScript(event, script.id)}
|
||||||
|
title={t('sidebar.scripts.deleteScript')}
|
||||||
|
>
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
70
src/renderer/components/Sidebar/SidebarEntityList.tsx
Normal file
70
src/renderer/components/Sidebar/SidebarEntityList.tsx
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
interface SidebarEntityListProps<TItem> {
|
||||||
|
header: string;
|
||||||
|
createTitle: string;
|
||||||
|
onCreate: () => void;
|
||||||
|
isLoading: boolean;
|
||||||
|
loadingLabel: string;
|
||||||
|
emptyMessage: string;
|
||||||
|
emptyActionLabel: string;
|
||||||
|
onEmptyAction: () => void;
|
||||||
|
items: TItem[];
|
||||||
|
renderItem: (item: TItem) => React.ReactNode;
|
||||||
|
getItemKey?: (item: TItem) => string;
|
||||||
|
topContent?: React.ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SidebarEntityList<TItem>({
|
||||||
|
header,
|
||||||
|
createTitle,
|
||||||
|
onCreate,
|
||||||
|
isLoading,
|
||||||
|
loadingLabel,
|
||||||
|
emptyMessage,
|
||||||
|
emptyActionLabel,
|
||||||
|
onEmptyAction,
|
||||||
|
items,
|
||||||
|
renderItem,
|
||||||
|
getItemKey,
|
||||||
|
topContent,
|
||||||
|
}: SidebarEntityListProps<TItem>): JSX.Element {
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div className="chat-list">
|
||||||
|
<div className="chat-list-header">
|
||||||
|
<span>{header}</span>
|
||||||
|
</div>
|
||||||
|
<div className="chat-loading">{loadingLabel}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="chat-list">
|
||||||
|
<div className="chat-list-header">
|
||||||
|
<span>{header}</span>
|
||||||
|
<button className="chat-new-button" onClick={onCreate} title={createTitle} aria-label={createTitle}>
|
||||||
|
+
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{topContent}
|
||||||
|
<div className="chat-list-items">
|
||||||
|
{items.length === 0 ? (
|
||||||
|
<div className="chat-empty">
|
||||||
|
<p>{emptyMessage}</p>
|
||||||
|
<button className="chat-start-button" onClick={onEmptyAction}>
|
||||||
|
{emptyActionLabel}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
items.map((item) => (
|
||||||
|
<React.Fragment key={getItemKey ? getItemKey(item) : String((item as { id?: string }).id)}>
|
||||||
|
{renderItem(item)}
|
||||||
|
</React.Fragment>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
34
src/renderer/components/Sidebar/sidebarDateFormatting.ts
Normal file
34
src/renderer/components/Sidebar/sidebarDateFormatting.ts
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
const UI_DATE_LOCALE: Record<string, string> = {
|
||||||
|
en: 'en-US',
|
||||||
|
de: 'de-DE',
|
||||||
|
fr: 'fr-FR',
|
||||||
|
it: 'it-IT',
|
||||||
|
es: 'es-ES',
|
||||||
|
};
|
||||||
|
|
||||||
|
interface FormatSidebarRelativeDateArgs {
|
||||||
|
dateString: string;
|
||||||
|
language: string;
|
||||||
|
t: (key: string) => string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function formatSidebarRelativeDate({ dateString, language, t }: FormatSidebarRelativeDateArgs): string {
|
||||||
|
const date = new Date(dateString);
|
||||||
|
const now = new Date();
|
||||||
|
const diffDays = Math.floor((now.getTime() - date.getTime()) / (1000 * 60 * 60 * 24));
|
||||||
|
const uiDateLocale = UI_DATE_LOCALE[language] || UI_DATE_LOCALE.en;
|
||||||
|
|
||||||
|
if (diffDays === 0) {
|
||||||
|
return date.toLocaleTimeString(uiDateLocale, { hour: 'numeric', minute: '2-digit' });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (diffDays === 1) {
|
||||||
|
return t('sidebar.chat.yesterday');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (diffDays < 7) {
|
||||||
|
return date.toLocaleDateString(uiDateLocale, { weekday: 'short' });
|
||||||
|
}
|
||||||
|
|
||||||
|
return date.toLocaleDateString(uiDateLocale, { month: 'short', day: 'numeric' });
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import { useCallback, useEffect, useState, type Dispatch, type SetStateAction } from 'react';
|
||||||
|
|
||||||
|
interface ProjectScopedSidebarDataOptions<TItem> {
|
||||||
|
load: () => Promise<TItem[] | null | undefined>;
|
||||||
|
activeProjectId?: string;
|
||||||
|
refreshEventName?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ProjectScopedSidebarDataResult<TItem> {
|
||||||
|
items: TItem[];
|
||||||
|
setItems: Dispatch<SetStateAction<TItem[]>>;
|
||||||
|
isLoading: boolean;
|
||||||
|
reload: () => Promise<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useProjectScopedSidebarData<TItem>(options: ProjectScopedSidebarDataOptions<TItem>): ProjectScopedSidebarDataResult<TItem> {
|
||||||
|
const { load, activeProjectId, refreshEventName } = options;
|
||||||
|
const [items, setItems] = useState<TItem[]>([]);
|
||||||
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
|
|
||||||
|
const reload = useCallback(async () => {
|
||||||
|
const nextItems = await load();
|
||||||
|
setItems(nextItems ?? []);
|
||||||
|
}, [load]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
|
|
||||||
|
const loadInitial = async () => {
|
||||||
|
setIsLoading(true);
|
||||||
|
try {
|
||||||
|
const nextItems = await load();
|
||||||
|
if (cancelled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setItems(nextItems ?? []);
|
||||||
|
} finally {
|
||||||
|
if (!cancelled) {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
void loadInitial();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
|
}, [load, activeProjectId]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!refreshEventName) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof window.addEventListener !== 'function' || typeof window.removeEventListener !== 'function') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleRefreshEvent = () => {
|
||||||
|
void reload();
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener(refreshEventName, handleRefreshEvent);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener(refreshEventName, handleRefreshEvent);
|
||||||
|
};
|
||||||
|
}, [refreshEventName, reload]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
items,
|
||||||
|
setItems,
|
||||||
|
isLoading,
|
||||||
|
reload,
|
||||||
|
};
|
||||||
|
}
|
||||||
67
tests/renderer/components/SidebarChat.test.tsx
Normal file
67
tests/renderer/components/SidebarChat.test.tsx
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||||||
|
import { act, render, screen } from '@testing-library/react';
|
||||||
|
import { Sidebar } from '../../../src/renderer/components/Sidebar/Sidebar';
|
||||||
|
import { useAppStore } from '../../../src/renderer/store';
|
||||||
|
|
||||||
|
describe('Sidebar chat list behavior', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
|
||||||
|
(window as any).electronAPI = {
|
||||||
|
...(window as any).electronAPI,
|
||||||
|
chat: {
|
||||||
|
getConversations: vi.fn(),
|
||||||
|
checkReady: vi.fn().mockResolvedValue({ ready: true }),
|
||||||
|
onTitleUpdated: vi.fn(() => () => {}),
|
||||||
|
createConversation: vi.fn(),
|
||||||
|
deleteConversation: vi.fn(),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
useAppStore.setState({
|
||||||
|
activeProject: null,
|
||||||
|
activeView: 'chat',
|
||||||
|
sidebarVisible: true,
|
||||||
|
tabs: [],
|
||||||
|
activeTabId: null,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reloads chat conversations when active project becomes available after mount', async () => {
|
||||||
|
const getConversationsMock = vi
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValueOnce([])
|
||||||
|
.mockResolvedValueOnce([
|
||||||
|
{
|
||||||
|
id: 'conv-1',
|
||||||
|
title: 'Project Conversation',
|
||||||
|
createdAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
updatedAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
(window as any).electronAPI.chat.getConversations = getConversationsMock;
|
||||||
|
|
||||||
|
render(<Sidebar />);
|
||||||
|
|
||||||
|
expect(await screen.findByText('No conversations yet')).toBeInTheDocument();
|
||||||
|
|
||||||
|
act(() => {
|
||||||
|
useAppStore.setState({
|
||||||
|
activeProject: {
|
||||||
|
id: 'project-1',
|
||||||
|
name: 'Project 1',
|
||||||
|
slug: 'project-1',
|
||||||
|
dataPath: '/tmp/project-1',
|
||||||
|
isActive: true,
|
||||||
|
createdAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
updatedAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(await screen.findByText('Project Conversation')).toBeInTheDocument();
|
||||||
|
expect(getConversationsMock).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
54
tests/renderer/components/SidebarDateFormatting.test.ts
Normal file
54
tests/renderer/components/SidebarDateFormatting.test.ts
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
||||||
|
import { formatSidebarRelativeDate } from '../../../src/renderer/components/Sidebar/sidebarDateFormatting';
|
||||||
|
|
||||||
|
describe('formatSidebarRelativeDate', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
vi.setSystemTime(new Date('2026-02-23T12:00:00.000Z'));
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('formats same-day dates as time', () => {
|
||||||
|
const result = formatSidebarRelativeDate({
|
||||||
|
dateString: '2026-02-23T10:30:00.000Z',
|
||||||
|
language: 'en',
|
||||||
|
t: () => 'Yesterday',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toMatch(/\d/);
|
||||||
|
expect(result).not.toBe('Yesterday');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('formats one-day-old dates as localized yesterday label', () => {
|
||||||
|
const result = formatSidebarRelativeDate({
|
||||||
|
dateString: '2026-02-22T10:30:00.000Z',
|
||||||
|
language: 'en',
|
||||||
|
t: () => 'Yesterday',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toBe('Yesterday');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('formats older dates within a week using weekday', () => {
|
||||||
|
const result = formatSidebarRelativeDate({
|
||||||
|
dateString: '2026-02-20T10:30:00.000Z',
|
||||||
|
language: 'en',
|
||||||
|
t: () => 'Yesterday',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toMatch(/^[A-Za-z]{3}$/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('formats older dates with month/day', () => {
|
||||||
|
const result = formatSidebarRelativeDate({
|
||||||
|
dateString: '2026-02-10T10:30:00.000Z',
|
||||||
|
language: 'en',
|
||||||
|
t: () => 'Yesterday',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toMatch(/[A-Za-z]{3}/);
|
||||||
|
});
|
||||||
|
});
|
||||||
72
tests/renderer/components/SidebarEntityList.test.tsx
Normal file
72
tests/renderer/components/SidebarEntityList.test.tsx
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { describe, it, expect, vi } from 'vitest';
|
||||||
|
import { fireEvent, render, screen } from '@testing-library/react';
|
||||||
|
import { SidebarEntityList } from '../../../src/renderer/components/Sidebar/SidebarEntityList';
|
||||||
|
|
||||||
|
describe('SidebarEntityList', () => {
|
||||||
|
it('renders loading state with header', () => {
|
||||||
|
render(
|
||||||
|
<SidebarEntityList
|
||||||
|
header="Header"
|
||||||
|
createTitle="Create"
|
||||||
|
onCreate={vi.fn()}
|
||||||
|
isLoading
|
||||||
|
loadingLabel="Loading..."
|
||||||
|
emptyMessage="Empty"
|
||||||
|
emptyActionLabel="Create first"
|
||||||
|
onEmptyAction={vi.fn()}
|
||||||
|
items={[]}
|
||||||
|
renderItem={() => null}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.getByText('Header')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Loading...')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders empty state and triggers empty action', () => {
|
||||||
|
const onEmptyAction = vi.fn();
|
||||||
|
|
||||||
|
render(
|
||||||
|
<SidebarEntityList
|
||||||
|
header="Header"
|
||||||
|
createTitle="Create"
|
||||||
|
onCreate={vi.fn()}
|
||||||
|
isLoading={false}
|
||||||
|
loadingLabel="Loading..."
|
||||||
|
emptyMessage="Empty"
|
||||||
|
emptyActionLabel="Create first"
|
||||||
|
onEmptyAction={onEmptyAction}
|
||||||
|
items={[]}
|
||||||
|
renderItem={() => null}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: 'Create first' }));
|
||||||
|
expect(onEmptyAction).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders rows and create button action', () => {
|
||||||
|
const onCreate = vi.fn();
|
||||||
|
|
||||||
|
render(
|
||||||
|
<SidebarEntityList
|
||||||
|
header="Header"
|
||||||
|
createTitle="Create"
|
||||||
|
onCreate={onCreate}
|
||||||
|
isLoading={false}
|
||||||
|
loadingLabel="Loading..."
|
||||||
|
emptyMessage="Empty"
|
||||||
|
emptyActionLabel="Create first"
|
||||||
|
onEmptyAction={vi.fn()}
|
||||||
|
items={[{ id: 'a' }]}
|
||||||
|
getItemKey={(item) => item.id}
|
||||||
|
renderItem={(item) => <div>{item.id}</div>}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.getByText('a')).toBeInTheDocument();
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: 'Create' }));
|
||||||
|
expect(onCreate).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||||||
import { render, screen, fireEvent } from '@testing-library/react';
|
import { act, render, screen, fireEvent } from '@testing-library/react';
|
||||||
import { Sidebar } from '../../../src/renderer/components/Sidebar/Sidebar';
|
import { Sidebar } from '../../../src/renderer/components/Sidebar/Sidebar';
|
||||||
import { useAppStore } from '../../../src/renderer/store';
|
import { useAppStore } from '../../../src/renderer/store';
|
||||||
|
|
||||||
@@ -227,4 +227,57 @@ describe('Sidebar scripts list behavior', () => {
|
|||||||
|
|
||||||
expect(await screen.findByRole('button', { name: 'Renamed Script' })).toBeInTheDocument();
|
expect(await screen.findByRole('button', { name: 'Renamed Script' })).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('reloads scripts when active project context becomes available after mount', async () => {
|
||||||
|
const getAllMock = vi
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValueOnce([])
|
||||||
|
.mockResolvedValueOnce([
|
||||||
|
{
|
||||||
|
id: 'script-1',
|
||||||
|
projectId: 'project-1',
|
||||||
|
slug: 'hello_script',
|
||||||
|
title: 'Hello Script',
|
||||||
|
kind: 'utility',
|
||||||
|
entrypoint: 'render',
|
||||||
|
enabled: true,
|
||||||
|
version: 1,
|
||||||
|
filePath: '/tmp/hello-script.py',
|
||||||
|
content: 'print("hello")',
|
||||||
|
createdAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
updatedAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
(window as any).electronAPI.scripts.getAll = getAllMock;
|
||||||
|
|
||||||
|
useAppStore.setState({
|
||||||
|
activeProject: null,
|
||||||
|
activeView: 'scripts',
|
||||||
|
sidebarVisible: true,
|
||||||
|
tabs: [],
|
||||||
|
activeTabId: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
render(<Sidebar />);
|
||||||
|
|
||||||
|
expect(await screen.findByText('No scripts yet')).toBeInTheDocument();
|
||||||
|
|
||||||
|
act(() => {
|
||||||
|
useAppStore.setState({
|
||||||
|
activeProject: {
|
||||||
|
id: 'project-1',
|
||||||
|
name: 'Project 1',
|
||||||
|
slug: 'project-1',
|
||||||
|
dataPath: '/tmp/project-1',
|
||||||
|
isActive: true,
|
||||||
|
createdAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
updatedAt: '2026-02-22T00:00:00.000Z',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(await screen.findByRole('button', { name: 'Hello Script' })).toBeInTheDocument();
|
||||||
|
expect(getAllMock).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user