mirror of
https://github.com/velocitatem/cvfs.git
synced 2026-05-31 08:43:37 +00:00
feat: surface published assets for versions
This commit is contained in:
@@ -5,8 +5,14 @@ from fastapi.responses import Response
|
|||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
|
||||||
from app.api.deps import get_current_user, get_db
|
from app.api.deps import get_current_user, get_db
|
||||||
|
from app.core.config import get_settings
|
||||||
from app.schemas import DocumentListResponse, DocumentResponse
|
from app.schemas import DocumentListResponse, DocumentResponse
|
||||||
from app.services.documents import create_document, delete_document, get_document, list_documents
|
from app.services.documents import (
|
||||||
|
create_document,
|
||||||
|
delete_document,
|
||||||
|
get_document,
|
||||||
|
list_documents,
|
||||||
|
)
|
||||||
from app.services.storage import storage_client
|
from app.services.storage import storage_client
|
||||||
from dlib.auth import AuthenticatedUser
|
from dlib.auth import AuthenticatedUser
|
||||||
from dlib.cv import generate_patched_docx
|
from dlib.cv import generate_patched_docx
|
||||||
@@ -21,7 +27,7 @@ async def list_user_documents(
|
|||||||
user: AuthenticatedUser = Depends(get_current_user),
|
user: AuthenticatedUser = Depends(get_current_user),
|
||||||
):
|
):
|
||||||
documents = await list_documents(session, owner_id=user.sub)
|
documents = await list_documents(session, owner_id=user.sub)
|
||||||
payload = [DocumentResponse.model_validate(doc) for doc in documents]
|
payload = [_build_document_response(doc) for doc in documents]
|
||||||
return DocumentListResponse(items=payload)
|
return DocumentListResponse(items=payload)
|
||||||
|
|
||||||
|
|
||||||
@@ -34,7 +40,7 @@ async def get_user_document(
|
|||||||
document = await get_document(session, owner_id=user.sub, document_id=document_id)
|
document = await get_document(session, owner_id=user.sub, document_id=document_id)
|
||||||
if not document:
|
if not document:
|
||||||
raise HTTPException(status_code=404, detail="Document not found")
|
raise HTTPException(status_code=404, detail="Document not found")
|
||||||
return DocumentResponse.model_validate(document)
|
return _build_document_response(document)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{document_id}/versions/{version_id}/download")
|
@router.get("/{document_id}/versions/{version_id}/download")
|
||||||
@@ -75,7 +81,7 @@ async def upload_document(
|
|||||||
description=description,
|
description=description,
|
||||||
upload=file,
|
upload=file,
|
||||||
)
|
)
|
||||||
return DocumentResponse.model_validate(document)
|
return _build_document_response(document)
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{document_id}", status_code=204)
|
@router.delete("/{document_id}", status_code=204)
|
||||||
@@ -87,3 +93,20 @@ async def delete_user_document(
|
|||||||
deleted = await delete_document(session, owner_id=user.sub, document_id=document_id)
|
deleted = await delete_document(session, owner_id=user.sub, document_id=document_id)
|
||||||
if not deleted:
|
if not deleted:
|
||||||
raise HTTPException(status_code=404, detail="Document not found")
|
raise HTTPException(status_code=404, detail="Document not found")
|
||||||
|
|
||||||
|
|
||||||
|
def _build_document_response(document) -> DocumentResponse:
|
||||||
|
settings = get_settings()
|
||||||
|
base = (settings.public_base_url or "").rstrip("/")
|
||||||
|
response = DocumentResponse.model_validate(document)
|
||||||
|
versions = []
|
||||||
|
for version in response.versions:
|
||||||
|
assets = []
|
||||||
|
for asset in version.public_assets:
|
||||||
|
slug = asset.slug
|
||||||
|
url = asset.url
|
||||||
|
if slug and not url:
|
||||||
|
url = f"{base}/cv/{slug}" if base else f"/cv/{slug}"
|
||||||
|
assets.append(asset.model_copy(update={"url": url}))
|
||||||
|
versions.append(version.model_copy(update={"public_assets": assets}))
|
||||||
|
return response.model_copy(update={"versions": versions})
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ class VersionResponse(BaseModel):
|
|||||||
created_at: datetime
|
created_at: datetime
|
||||||
updated_at: datetime
|
updated_at: datetime
|
||||||
patches: list["PatchResponse"] = Field(default_factory=list)
|
patches: list["PatchResponse"] = Field(default_factory=list)
|
||||||
|
public_assets: list["PublicAssetResponse"] = Field(default_factory=list)
|
||||||
|
|
||||||
|
|
||||||
class PatchResponse(BaseModel):
|
class PatchResponse(BaseModel):
|
||||||
|
|||||||
@@ -43,7 +43,12 @@ async def create_document(
|
|||||||
stmt = (
|
stmt = (
|
||||||
select(CvDocument)
|
select(CvDocument)
|
||||||
.where(CvDocument.id == doc.id)
|
.where(CvDocument.id == doc.id)
|
||||||
.options(selectinload(CvDocument.versions).selectinload(CvVersion.patches))
|
.options(
|
||||||
|
selectinload(CvDocument.versions).options(
|
||||||
|
selectinload(CvVersion.patches),
|
||||||
|
selectinload(CvVersion.public_assets),
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
result = await session.execute(stmt)
|
result = await session.execute(stmt)
|
||||||
return result.scalars().unique().one()
|
return result.scalars().unique().one()
|
||||||
@@ -53,7 +58,12 @@ async def list_documents(session: AsyncSession, owner_id: str) -> list[CvDocumen
|
|||||||
stmt = (
|
stmt = (
|
||||||
select(CvDocument)
|
select(CvDocument)
|
||||||
.where(CvDocument.owner_id == owner_id)
|
.where(CvDocument.owner_id == owner_id)
|
||||||
.options(selectinload(CvDocument.versions).selectinload(CvVersion.patches))
|
.options(
|
||||||
|
selectinload(CvDocument.versions).options(
|
||||||
|
selectinload(CvVersion.patches),
|
||||||
|
selectinload(CvVersion.public_assets),
|
||||||
|
)
|
||||||
|
)
|
||||||
.order_by(CvDocument.created_at.desc())
|
.order_by(CvDocument.created_at.desc())
|
||||||
)
|
)
|
||||||
result = await session.execute(stmt)
|
result = await session.execute(stmt)
|
||||||
@@ -66,7 +76,12 @@ async def get_document(
|
|||||||
stmt = (
|
stmt = (
|
||||||
select(CvDocument)
|
select(CvDocument)
|
||||||
.where(CvDocument.id == document_id, CvDocument.owner_id == owner_id)
|
.where(CvDocument.id == document_id, CvDocument.owner_id == owner_id)
|
||||||
.options(selectinload(CvDocument.versions).selectinload(CvVersion.patches))
|
.options(
|
||||||
|
selectinload(CvDocument.versions).options(
|
||||||
|
selectinload(CvVersion.patches),
|
||||||
|
selectinload(CvVersion.public_assets),
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
result = await session.execute(stmt)
|
result = await session.execute(stmt)
|
||||||
return result.scalars().unique().one_or_none()
|
return result.scalars().unique().one_or_none()
|
||||||
|
|||||||
@@ -481,8 +481,8 @@ export default function Dashboard() {
|
|||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState('');
|
const [error, setError] = useState('');
|
||||||
const [modal, setModal] = useState<Modal>(null);
|
const [modal, setModal] = useState<Modal>(null);
|
||||||
const [publishedAsset, setPublishedAsset] = useState<PublicAsset | null>(null);
|
const [publishedAnalytics, setPublishedAnalytics] = useState<Record<string, PublicAssetAnalytics>>({});
|
||||||
const [publishedAnalytics, setPublishedAnalytics] = useState<PublicAssetAnalytics | null>(null);
|
const [recentlyPublishedSlug, setRecentlyPublishedSlug] = useState<string | null>(null);
|
||||||
const [activeTab, setActiveTab] = useState<Tab>('content');
|
const [activeTab, setActiveTab] = useState<Tab>('content');
|
||||||
const [submissions, setSubmissions] = useState<Submission[]>([]);
|
const [submissions, setSubmissions] = useState<Submission[]>([]);
|
||||||
const [subsLoading, setSubsLoading] = useState(false);
|
const [subsLoading, setSubsLoading] = useState(false);
|
||||||
@@ -506,6 +506,8 @@ export default function Dashboard() {
|
|||||||
setPendingEdits(new Map());
|
setPendingEdits(new Map());
|
||||||
setApplyError('');
|
setApplyError('');
|
||||||
setApplyLoading(false);
|
setApplyLoading(false);
|
||||||
|
setPublishedAnalytics({});
|
||||||
|
setRecentlyPublishedSlug(null);
|
||||||
}, [selectedVersionId]);
|
}, [selectedVersionId]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -519,6 +521,24 @@ export default function Dashboard() {
|
|||||||
|
|
||||||
const selectedDoc = docs.find(d => d.id === selectedDocId) ?? null;
|
const selectedDoc = docs.find(d => d.id === selectedDocId) ?? null;
|
||||||
const selectedVersion = selectedDoc?.versions.find(v => v.id === selectedVersionId) ?? null;
|
const selectedVersion = selectedDoc?.versions.find(v => v.id === selectedVersionId) ?? null;
|
||||||
|
const publishedAssets = selectedVersion?.public_assets ?? [];
|
||||||
|
const sortedPublishedAssets = [...publishedAssets].sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime());
|
||||||
|
const publicBaseUrl = (process.env.NEXT_PUBLIC_BASE_URL ?? '').replace(/\/$/, '');
|
||||||
|
|
||||||
|
const resolveAssetUrl = (asset: PublicAsset): string => {
|
||||||
|
if (asset.url) return asset.url;
|
||||||
|
if (publicBaseUrl) return `${publicBaseUrl}/cv/${asset.slug}`;
|
||||||
|
return `/cv/${asset.slug}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const loadPublishedAnalytics = async (slug: string) => {
|
||||||
|
try {
|
||||||
|
const stats = await fetchPublicAssetAnalytics(slug);
|
||||||
|
setPublishedAnalytics(prev => ({ ...prev, [slug]: stats }));
|
||||||
|
} catch {
|
||||||
|
// swallow for now; UI button can be retried
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const refreshDocs = async () => {
|
const refreshDocs = async () => {
|
||||||
const fresh = await fetchDocuments().catch(() => docs);
|
const fresh = await fetchDocuments().catch(() => docs);
|
||||||
@@ -785,34 +805,64 @@ export default function Dashboard() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{publishedAsset && (
|
{sortedPublishedAssets.length > 0 && (
|
||||||
<div style={{
|
<div style={{
|
||||||
padding: '10px 12px', background: '#f0fdf4', border: '1px solid #bbf7d0',
|
padding: '10px 12px', background: '#f0fdf4', border: '1px solid #bbf7d0',
|
||||||
borderRadius: 5, marginBottom: 12, fontSize: 13, display: 'flex', flexDirection: 'column', gap: 6,
|
borderRadius: 5, marginBottom: 12, fontSize: 13, display: 'flex', flexDirection: 'column', gap: 10,
|
||||||
}}>
|
}}>
|
||||||
<div style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
|
<div style={{ display: 'flex', gap: 8, alignItems: 'center', flexWrap: 'wrap' }}>
|
||||||
<span style={{ color: '#166534', fontWeight: 500 }}>Published</span>
|
<span style={{ color: '#166534', fontWeight: 500 }}>Published variants ({sortedPublishedAssets.length})</span>
|
||||||
{publishedAnalytics !== null && (
|
{recentlyPublishedSlug && (
|
||||||
<span style={{ color: '#166534', fontSize: 11, background: '#dcfce7', padding: '1px 7px', borderRadius: 10 }}>
|
<span style={{ fontSize: 11, color: '#14532d', background: '#dcfce7', padding: '1px 8px', borderRadius: 9999 }}>
|
||||||
{publishedAnalytics.view_count} view{publishedAnalytics.view_count !== 1 ? 's' : ''}
|
Latest: {recentlyPublishedSlug}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
<button
|
|
||||||
onClick={() => fetchPublicAssetAnalytics(publishedAsset.slug).then(setPublishedAnalytics).catch(() => null)}
|
|
||||||
style={{ background: 'none', border: '1px solid #bbf7d0', cursor: 'pointer', color: '#15803d', fontSize: 11, padding: '1px 6px', borderRadius: 4 }}
|
|
||||||
>
|
|
||||||
↻ stats
|
|
||||||
</button>
|
|
||||||
<button onClick={() => { setPublishedAsset(null); setPublishedAnalytics(null); }} style={{ background: 'none', border: 'none', cursor: 'pointer', color: '#166534', fontSize: 16, lineHeight: 1, marginLeft: 'auto' }}>×</button>
|
|
||||||
</div>
|
</div>
|
||||||
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
|
<div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
|
||||||
<a href={publishedAsset.url ?? '#'} target="_blank" rel="noreferrer" style={{ color: '#166534', fontSize: 12, textDecoration: 'underline' }}>
|
{sortedPublishedAssets.map(asset => {
|
||||||
Share link
|
const stats = publishedAnalytics[asset.slug];
|
||||||
</a>
|
return (
|
||||||
<span style={{ color: '#bbf7d0' }}>|</span>
|
<div key={asset.id} style={{ border: '1px solid #bbf7d0', borderRadius: 6, padding: '8px 10px', background: '#fff' }}>
|
||||||
<a href={getPublicPdfUrl(publishedAsset.slug)} target="_blank" rel="noreferrer" style={{ color: '#166534', fontSize: 12, textDecoration: 'underline' }}>
|
<div style={{ display: 'flex', gap: 10, alignItems: 'center', flexWrap: 'wrap' }}>
|
||||||
View PDF
|
<span style={{ fontFamily: 'var(--font-mono)', color: '#166534', fontSize: 12 }}>{asset.slug}</span>
|
||||||
</a>
|
<span style={{ fontSize: 11, color: '#166534' }}>{fmt(asset.created_at)}</span>
|
||||||
|
{recentlyPublishedSlug === asset.slug && (
|
||||||
|
<span style={{ fontSize: 10, color: '#14532d', background: '#dcfce7', padding: '1px 6px', borderRadius: 9999 }}>New</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap', marginTop: 6 }}>
|
||||||
|
<a href={resolveAssetUrl(asset)} target="_blank" rel="noreferrer" style={{ color: '#166534', fontSize: 12, textDecoration: 'underline' }}>
|
||||||
|
Share link
|
||||||
|
</a>
|
||||||
|
<span style={{ color: '#bbf7d0' }}>|</span>
|
||||||
|
<a href={getPublicPdfUrl(asset.slug)} target="_blank" rel="noreferrer" style={{ color: '#166534', fontSize: 12, textDecoration: 'underline' }}>
|
||||||
|
View PDF
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div style={{ display: 'flex', gap: 10, alignItems: 'center', flexWrap: 'wrap', marginTop: 6 }}>
|
||||||
|
<span style={{ fontSize: 11, color: '#166534' }}>
|
||||||
|
{stats
|
||||||
|
? (
|
||||||
|
<>
|
||||||
|
{stats.view_count} view{stats.view_count !== 1 ? 's' : ''}
|
||||||
|
{stats.last_viewed_at && (
|
||||||
|
<> · last {fmt(stats.last_viewed_at)}</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
: 'No stats yet'}
|
||||||
|
</span>
|
||||||
|
<button
|
||||||
|
className="btn btn-ghost"
|
||||||
|
style={{ fontSize: 11, padding: '2px 8px' }}
|
||||||
|
onClick={() => loadPublishedAnalytics(asset.slug)}
|
||||||
|
>
|
||||||
|
{stats ? 'Refresh stats' : 'Fetch stats'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -914,7 +964,12 @@ export default function Dashboard() {
|
|||||||
<PublishModal
|
<PublishModal
|
||||||
version={selectedVersion}
|
version={selectedVersion}
|
||||||
onClose={() => setModal(null)}
|
onClose={() => setModal(null)}
|
||||||
onDone={asset => { setPublishedAsset(asset); setPublishedAnalytics(null); setModal(null); }}
|
onDone={asset => {
|
||||||
|
setModal(null);
|
||||||
|
setRecentlyPublishedSlug(asset.slug);
|
||||||
|
setPublishedAnalytics({});
|
||||||
|
refreshDocs();
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ export type Version = {
|
|||||||
structured_blocks?: StructuredBlock[] | null;
|
structured_blocks?: StructuredBlock[] | null;
|
||||||
artifact_docx_key?: string | null;
|
artifact_docx_key?: string | null;
|
||||||
patches: Patch[];
|
patches: Patch[];
|
||||||
|
public_assets: PublicAsset[];
|
||||||
created_at: string;
|
created_at: string;
|
||||||
updated_at: string;
|
updated_at: string;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user