fix: publish/draft status. handlign better

This commit is contained in:
2026-02-14 21:51:04 +01:00
parent 4b31d9d421
commit c429fb6087
5 changed files with 343 additions and 6 deletions

View File

@@ -906,6 +906,8 @@ const PostEditor: React.FC<PostEditorProps> = ({ postId }) => {
setContent(reverted.content);
setTags(reverted.tags);
setCategory(reverted.categories[0] || 'article');
// Update local post state so UI reflects the published status
setPost(reverted as PostData);
updatePost(postId, reverted as Partial<PostData>);
markClean(postId);
showToast.success('Reverted to last published version');

View File

@@ -1,6 +1,7 @@
import React, { useState, useEffect, useCallback } from 'react';
import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
import { useAppStore, PostData, MediaData } from '../../store';
import { showToast } from '../Toast';
import { groupPostsByStatus } from '../../utils';
import type { ChatConversation, ImportDefinitionData } from '../../types/electron';
import './Sidebar.css';
@@ -524,6 +525,76 @@ const PostsList: React.FC = () => {
applyFilters();
}, [selectedTags, selectedCategories]);
// Track previous post statuses to detect changes
const prevPostStatusMapRef = useRef<Map<string, string>>(new Map());
// Re-run search/filter when a post's status changes (e.g., draft becomes published or vice versa)
// This ensures the sidebar lists are always up-to-date without stale cached data
useEffect(() => {
const currentStatusMap = new Map(posts.map(p => [p.id, p.status]));
const prevStatusMap = prevPostStatusMapRef.current;
// Check if any post's status changed
let statusChanged = false;
for (const [id, status] of currentStatusMap) {
const prevStatus = prevStatusMap.get(id);
if (prevStatus !== undefined && prevStatus !== status) {
statusChanged = true;
break;
}
}
// Update the ref for next comparison
prevPostStatusMapRef.current = currentStatusMap;
// If a status changed and we have active filters, re-run them to get fresh data
if (statusChanged) {
if (searchQuery) {
// Re-run search inline to avoid dependency on handleSearch
const refreshSearch = async () => {
try {
const results = await window.electronAPI?.posts.search(searchQuery);
if (results) {
const fullPosts: PostData[] = [];
for (const result of results as { id: string }[]) {
const post = await window.electronAPI?.posts.get(result.id);
if (post) {
fullPosts.push(post as PostData);
}
}
setSearchResults(fullPosts);
}
} catch (error) {
console.error('Search refresh failed:', error);
}
};
refreshSearch();
} else if (selectedYear || selectedTags.length > 0 || selectedCategories.length > 0) {
// Re-run filter
const refetchFilters = async () => {
try {
const results = await window.electronAPI?.posts.filter({
year: selectedYear,
month: selectedMonth,
tags: selectedTags.length > 0 ? selectedTags : undefined,
categories: selectedCategories.length > 0 ? selectedCategories : undefined,
});
if (results) {
setFilteredPosts(results as PostData[]);
}
} catch (error) {
console.error('Filter refresh failed:', error);
}
};
refetchFilters();
} else {
// No active filters, just clear any stale cached results
setSearchResults(null);
setFilteredPosts(null);
}
}
}, [posts, searchQuery, selectedYear, selectedMonth, selectedTags, selectedCategories]);
const handleCreatePost = async () => {
// Create a real post immediately in the database with default empty content
try {
@@ -566,11 +637,12 @@ const PostsList: React.FC = () => {
const isFiltered = filteredDisplayPosts !== null;
const hasActiveFilters = searchQuery || selectedYear || selectedTags.length > 0 || selectedCategories.length > 0;
const groupedPosts = {
draft: posts.filter(p => p.status === 'draft'),
published: (filteredDisplayPosts ?? posts).filter(p => p.status === 'published'),
archived: (filteredDisplayPosts ?? posts).filter(p => p.status === 'archived'),
};
// Memoized grouping that freshens cached filter results with current store data
// This ensures status changes are reflected even when filters are active
const groupedPosts = useMemo(
() => groupPostsByStatus(posts, filteredDisplayPosts),
[posts, filteredDisplayPosts]
);
const clearAllFilters = () => {
setSearchQuery('');

View File

@@ -1,2 +1,3 @@
export { AutoSaveManager, type AutoSaveConfig } from './autoSave';
export { unescapeMacroSyntax } from './markdownEscape';
export { groupPostsByStatus, type GroupedPosts, type PostStatus } from './postGrouping';

View File

@@ -0,0 +1,39 @@
import type { PostData } from '../store';
export type PostStatus = 'draft' | 'published' | 'archived';
export interface GroupedPosts {
draft: PostData[];
published: PostData[];
archived: PostData[];
}
/**
* Groups posts by status, freshening cached filter results with current store data.
*
* This ensures that when a post's status changes in the store, the change is
* reflected in all sections even when filters are active and have cached stale data.
*
* @param storePosts - Fresh posts from the Zustand store
* @param filteredPosts - Cached posts from search/filter results (may be stale), or null if no filter active
* @returns Posts grouped by status with freshened data
*/
export function groupPostsByStatus(
storePosts: PostData[],
filteredPosts: PostData[] | null
): GroupedPosts {
// Create a map for O(1) lookup of fresh post data from the store
const postsById = new Map(storePosts.map(p => [p.id, p]));
// Freshen filtered posts by using current store data when available
const freshenedFilteredPosts = filteredPosts?.map(cachedPost => {
const freshPost = postsById.get(cachedPost.id);
return freshPost ?? cachedPost;
}) ?? null;
return {
draft: storePosts.filter(p => p.status === 'draft'),
published: (freshenedFilteredPosts ?? storePosts).filter(p => p.status === 'published'),
archived: (freshenedFilteredPosts ?? storePosts).filter(p => p.status === 'archived'),
};
}