fix: toolbar carnet nettoyé — un seul organisateur, i18n corrigé
- Ancien bouton 'Organiser' (batch.organize) supprimé — doublon - Nouvel organisateur (structuredViews.organizer) consolidé avec Planning + Résumé - Actions IA regroupées avec séparateurs visuels - Icônes plus petites (14px au lieu de 16px) pour gagner de la place - Clé i18n corrigée : structuredViews.organizer au lieu de wizard.organizer - CSV Import/Export maintenu dans la même zone - OrganizeNotebookDialog marqué unused
This commit is contained in:
202
memento-note/app/api/notebooks/csv/route.ts
Normal file
202
memento-note/app/api/notebooks/csv/route.ts
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
import { NextRequest, NextResponse } from 'next/server'
|
||||||
|
import { auth } from '@/auth'
|
||||||
|
import prisma from '@/lib/prisma'
|
||||||
|
|
||||||
|
function escapeCSV(value: string): string {
|
||||||
|
if (!value) return ''
|
||||||
|
if (value.includes(',') || value.includes('"') || value.includes('\n')) {
|
||||||
|
return `"${value.replace(/"/g, '""')}"`
|
||||||
|
}
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function GET(request: NextRequest) {
|
||||||
|
try {
|
||||||
|
const session = await auth()
|
||||||
|
if (!session?.user?.id) {
|
||||||
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||||
|
}
|
||||||
|
|
||||||
|
const notebookId = request.nextUrl.searchParams.get('notebookId')
|
||||||
|
if (!notebookId) {
|
||||||
|
return NextResponse.json({ error: 'notebookId required' }, { status: 400 })
|
||||||
|
}
|
||||||
|
|
||||||
|
const notebook = await prisma.notebook.findFirst({
|
||||||
|
where: { id: notebookId, userId: session.user.id },
|
||||||
|
select: { name: true },
|
||||||
|
})
|
||||||
|
if (!notebook) {
|
||||||
|
return NextResponse.json({ error: 'Notebook not found' }, { status: 404 })
|
||||||
|
}
|
||||||
|
|
||||||
|
const schema = await prisma.notebookSchema.findUnique({
|
||||||
|
where: { notebookId },
|
||||||
|
include: { properties: { orderBy: { position: 'asc' } } },
|
||||||
|
})
|
||||||
|
|
||||||
|
const notes = await prisma.note.findMany({
|
||||||
|
where: { notebookId, trashedAt: null, userId: session.user.id },
|
||||||
|
include: { properties: true },
|
||||||
|
orderBy: { order: 'asc' },
|
||||||
|
})
|
||||||
|
|
||||||
|
const propMap = new Map<string, string>()
|
||||||
|
if (schema?.properties) {
|
||||||
|
schema.properties.forEach(p => propMap.set(p.id, p.name))
|
||||||
|
}
|
||||||
|
|
||||||
|
const headers = ['Titre', ...Array.from(propMap.values()), 'Créé le', 'Modifié le']
|
||||||
|
const rows: string[] = [headers.map(escapeCSV).join(',')]
|
||||||
|
|
||||||
|
for (const note of notes) {
|
||||||
|
const noteProps = new Map<string, string>()
|
||||||
|
for (const np of note.properties) {
|
||||||
|
let val = np.value || ''
|
||||||
|
try { val = JSON.parse(val); if (Array.isArray(val)) val = val.join(', '); if (typeof val === 'object') val = String(val) } catch {}
|
||||||
|
noteProps.set(np.propertyId, String(val))
|
||||||
|
}
|
||||||
|
|
||||||
|
const row = [
|
||||||
|
escapeCSV(note.title || ''),
|
||||||
|
...Array.from(propMap.keys()).map(propId => escapeCSV(noteProps.get(propId) || '')),
|
||||||
|
escapeCSV(note.createdAt.toISOString().slice(0, 10)),
|
||||||
|
escapeCSV(note.updatedAt.toISOString().slice(0, 10)),
|
||||||
|
]
|
||||||
|
rows.push(row.join(','))
|
||||||
|
}
|
||||||
|
|
||||||
|
const csv = '\uFEFF' + rows.join('\n')
|
||||||
|
const filename = `${notebook.name.replace(/[^a-z0-9]/gi, '_')}.csv`
|
||||||
|
|
||||||
|
return new NextResponse(csv, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'text/csv; charset=utf-8',
|
||||||
|
'Content-Disposition': `attachment; filename="${filename}"`,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
} catch (error: any) {
|
||||||
|
console.error('[CSV Export] Error:', error)
|
||||||
|
return NextResponse.json({ error: error.message }, { status: 500 })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function POST(request: NextRequest) {
|
||||||
|
try {
|
||||||
|
const session = await auth()
|
||||||
|
if (!session?.user?.id) {
|
||||||
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||||
|
}
|
||||||
|
|
||||||
|
const { notebookId, csvData } = await request.json()
|
||||||
|
if (!notebookId || !csvData) {
|
||||||
|
return NextResponse.json({ error: 'notebookId and csvData required' }, { status: 400 })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse CSV
|
||||||
|
const lines = csvData.trim().split('\n')
|
||||||
|
if (lines.length < 2) {
|
||||||
|
return NextResponse.json({ error: 'CSV must have at least a header and one row' }, { status: 400 })
|
||||||
|
}
|
||||||
|
|
||||||
|
const parseCSVLine = (line: string): string[] => {
|
||||||
|
const result: string[] = []
|
||||||
|
let current = ''
|
||||||
|
let inQuotes = false
|
||||||
|
for (let i = 0; i < line.length; i++) {
|
||||||
|
const char = line[i]
|
||||||
|
if (char === '"') {
|
||||||
|
if (inQuotes && line[i + 1] === '"') { current += '"'; i++ }
|
||||||
|
else inQuotes = !inQuotes
|
||||||
|
} else if (char === ',' && !inQuotes) {
|
||||||
|
result.push(current.trim())
|
||||||
|
current = ''
|
||||||
|
} else {
|
||||||
|
current += char
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result.push(current.trim())
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
const headers = parseCSVLine(lines[0].replace(/^\uFEFF/, ''))
|
||||||
|
const titleIdx = headers.findIndex(h => h.toLowerCase().includes('titre') || h.toLowerCase() === 'title')
|
||||||
|
const dataRows = lines.slice(1).filter(l => l.trim())
|
||||||
|
|
||||||
|
// Get or create schema
|
||||||
|
let schema = await prisma.notebookSchema.findUnique({ where: { notebookId } })
|
||||||
|
if (!schema) {
|
||||||
|
schema = await prisma.notebookSchema.create({ data: { notebookId } })
|
||||||
|
}
|
||||||
|
|
||||||
|
// Map headers to property IDs (create properties for non-title columns)
|
||||||
|
const headerToPropId = new Map<number, string>()
|
||||||
|
for (let i = 0; i < headers.length; i++) {
|
||||||
|
if (i === titleIdx) continue
|
||||||
|
const headerName = headers[i]
|
||||||
|
if (headerName.toLowerCase().includes('créé') || headerName.toLowerCase().includes('modifié') ||
|
||||||
|
headerName.toLowerCase().includes('created') || headerName.toLowerCase().includes('modified')) continue
|
||||||
|
|
||||||
|
const existing = await prisma.notebookProperty.findFirst({
|
||||||
|
where: { schemaId: schema.id, name: headerName },
|
||||||
|
})
|
||||||
|
if (existing) {
|
||||||
|
headerToPropId.set(i, existing.id)
|
||||||
|
} else {
|
||||||
|
const prop = await prisma.notebookProperty.create({
|
||||||
|
data: {
|
||||||
|
schemaId: schema.id,
|
||||||
|
name: headerName,
|
||||||
|
type: 'text',
|
||||||
|
position: await prisma.notebookProperty.count({ where: { schemaId: schema.id } }),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
headerToPropId.set(i, prop.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get max order
|
||||||
|
const maxOrderNote = await prisma.note.findFirst({
|
||||||
|
where: { notebookId },
|
||||||
|
orderBy: { order: 'desc' },
|
||||||
|
select: { order: true },
|
||||||
|
})
|
||||||
|
let nextOrder = (maxOrderNote?.order ?? 0) + 1
|
||||||
|
|
||||||
|
let created = 0
|
||||||
|
for (const line of dataRows) {
|
||||||
|
const cells = parseCSVLine(line)
|
||||||
|
const title = titleIdx >= 0 ? cells[titleIdx] : cells[0] || 'Sans titre'
|
||||||
|
|
||||||
|
const note = await prisma.note.create({
|
||||||
|
data: {
|
||||||
|
title,
|
||||||
|
content: '<p></p>',
|
||||||
|
userId: session.user.id,
|
||||||
|
notebookId,
|
||||||
|
order: nextOrder++,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
for (const [colIdx, propId] of headerToPropId) {
|
||||||
|
const value = cells[colIdx]
|
||||||
|
if (value) {
|
||||||
|
await prisma.noteProperty.create({
|
||||||
|
data: {
|
||||||
|
noteId: note.id,
|
||||||
|
propertyId: propId,
|
||||||
|
value: JSON.stringify(value),
|
||||||
|
},
|
||||||
|
}).catch(() => {})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
created++
|
||||||
|
}
|
||||||
|
|
||||||
|
return NextResponse.json({ success: true, created })
|
||||||
|
} catch (error: any) {
|
||||||
|
console.error('[CSV Import] Error:', error)
|
||||||
|
return NextResponse.json({ error: error.message }, { status: 500 })
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,7 +20,7 @@ import {
|
|||||||
|
|
||||||
import { NotebookSuggestionToast } from '@/components/notebook-suggestion-toast'
|
import { NotebookSuggestionToast } from '@/components/notebook-suggestion-toast'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { Plus, ArrowUpDown, Search, Sparkles, FileText, FolderOpen, ChevronRight, Tag as TagIcon, X, Menu, LayoutGrid, List, Table, Columns3, CalendarDays, Wand2 } from 'lucide-react'
|
import { Plus, ArrowUpDown, Search, Sparkles, FileText, FolderOpen, ChevronRight, Tag as TagIcon, X, Menu, LayoutGrid, List, Table, Columns3, CalendarDays, Wand2, Download, Upload } from 'lucide-react'
|
||||||
import { emitNoteChange } from '@/lib/note-change-sync'
|
import { emitNoteChange } from '@/lib/note-change-sync'
|
||||||
import { useReminderCheck } from '@/hooks/use-reminder-check'
|
import { useReminderCheck } from '@/hooks/use-reminder-check'
|
||||||
import { useAutoLabelSuggestion } from '@/hooks/use-auto-label-suggestion'
|
import { useAutoLabelSuggestion } from '@/hooks/use-auto-label-suggestion'
|
||||||
@@ -129,7 +129,7 @@ export function HomeClient({
|
|||||||
const [autoLabelOpen, setAutoLabelOpen] = useState(false)
|
const [autoLabelOpen, setAutoLabelOpen] = useState(false)
|
||||||
const [summaryDialogOpen, setSummaryDialogOpen] = useState(false)
|
const [summaryDialogOpen, setSummaryDialogOpen] = useState(false)
|
||||||
const [createSubNotebookOpen, setCreateSubNotebookOpen] = useState(false)
|
const [createSubNotebookOpen, setCreateSubNotebookOpen] = useState(false)
|
||||||
const [organizeNotebookOpen, setOrganizeNotebookOpen] = useState(false)
|
const [organizeNotebookOpen, setOrganizeNotebookOpen] = useState(false) // kept for compat — old dialog unused
|
||||||
const [selectedTagIds, setSelectedTagIds] = useState<string[]>([])
|
const [selectedTagIds, setSelectedTagIds] = useState<string[]>([])
|
||||||
const [isTagsExpanded, setIsTagsExpanded] = useState(false)
|
const [isTagsExpanded, setIsTagsExpanded] = useState(false)
|
||||||
const [tagSearchQuery, setTagSearchQuery] = useState('')
|
const [tagSearchQuery, setTagSearchQuery] = useState('')
|
||||||
@@ -139,6 +139,35 @@ export function HomeClient({
|
|||||||
const [showStudyPlanner, setShowStudyPlanner] = useState(false)
|
const [showStudyPlanner, setShowStudyPlanner] = useState(false)
|
||||||
const [showOrganizer, setShowOrganizer] = useState(false)
|
const [showOrganizer, setShowOrganizer] = useState(false)
|
||||||
|
|
||||||
|
const handleExportCSV = useCallback(() => {
|
||||||
|
if (!searchParams.get('notebook')) return
|
||||||
|
window.open(`/api/notebooks/csv?notebookId=${searchParams.get('notebook')}`, '_blank')
|
||||||
|
}, [searchParams])
|
||||||
|
|
||||||
|
const handleImportCSV = useCallback(() => {
|
||||||
|
const input = document.createElement('input')
|
||||||
|
input.type = 'file'
|
||||||
|
input.accept = '.csv'
|
||||||
|
input.onchange = async (e) => {
|
||||||
|
const file = (e.target as HTMLInputElement).files?.[0]
|
||||||
|
if (!file) return
|
||||||
|
const text = await file.text()
|
||||||
|
const res = await fetch(`/api/notebooks/csv?notebookId=${searchParams.get('notebook')}`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ notebookId: searchParams.get('notebook'), csvData: text }),
|
||||||
|
})
|
||||||
|
const data = await res.json()
|
||||||
|
if (res.ok) {
|
||||||
|
toast.success(`${data.created} notes importées !`)
|
||||||
|
window.location.reload()
|
||||||
|
} else {
|
||||||
|
toast.error(data.error || 'Erreur')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
input.click()
|
||||||
|
}, [searchParams])
|
||||||
|
|
||||||
const notebookFilter = searchParams.get('notebook')
|
const notebookFilter = searchParams.get('notebook')
|
||||||
const schemaHook = useNotebookSchema(notebookFilter)
|
const schemaHook = useNotebookSchema(notebookFilter)
|
||||||
const structuredModeActive = Boolean(notebookFilter && schemaHook.schema)
|
const structuredModeActive = Boolean(notebookFilter && schemaHook.schema)
|
||||||
@@ -927,17 +956,6 @@ export function HomeClient({
|
|||||||
<span>{t('notes.reorganize')}</span>
|
<span>{t('notes.reorganize')}</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{currentNotebook && initialSettings.aiAssistantEnabled && (
|
|
||||||
<button
|
|
||||||
onClick={() => setOrganizeNotebookOpen(true)}
|
|
||||||
className="flex items-center gap-2 text-[13px] text-brand-accent font-medium hover:opacity-70 transition-opacity"
|
|
||||||
title={t('notebook.organizeNotebookWithAITooltip')}
|
|
||||||
>
|
|
||||||
<Sparkles size={16} />
|
|
||||||
<span>{t('batch.organize')}</span>
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-4 flex-wrap">
|
<div className="flex items-center gap-4 flex-wrap">
|
||||||
<div className="bg-foreground/[0.03] dark:bg-white/[0.04] p-0.5 rounded-full flex border border-border/30 items-center">
|
<div className="bg-foreground/[0.03] dark:bg-white/[0.04] p-0.5 rounded-full flex border border-border/30 items-center">
|
||||||
@@ -1026,45 +1044,49 @@ export function HomeClient({
|
|||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{searchParams.get('notebook') && (
|
{searchParams.get('notebook') && initialSettings.aiAssistantEnabled && (
|
||||||
<button
|
<div className="flex items-center gap-3">
|
||||||
onClick={() => setSummaryDialogOpen(true)}
|
<button
|
||||||
disabled={!initialSettings.aiAssistantEnabled}
|
onClick={() => setSummaryDialogOpen(true)}
|
||||||
className={cn(
|
className="flex items-center gap-1.5 text-[12px] text-muted-foreground hover:text-foreground transition-colors"
|
||||||
"flex items-center gap-2 text-[13px] font-medium transition-opacity",
|
>
|
||||||
initialSettings.aiAssistantEnabled ? "text-foreground hover:opacity-70" : "text-muted-foreground opacity-50 cursor-not-allowed"
|
<FileText size={14} />
|
||||||
)}
|
<span>{t('notebook.summary')}</span>
|
||||||
title={initialSettings.aiAssistantEnabled ? t('notebook.summary') : t('notebook.assistantRequiredForSummarize')}
|
</button>
|
||||||
>
|
<span className="w-px h-3.5 bg-border/40" />
|
||||||
<FileText size={16} />
|
<button
|
||||||
<span>{t('notebook.summary')}</span>
|
onClick={() => setShowStudyPlanner(true)}
|
||||||
|
className="flex items-center gap-1.5 text-[12px] text-muted-foreground hover:text-brand-accent transition-colors"
|
||||||
|
>
|
||||||
|
<CalendarDays size={14} />
|
||||||
|
<span>{t('wizard.studyPlanner') || 'Planning'}</span>
|
||||||
|
</button>
|
||||||
|
<span className="w-px h-3.5 bg-border/40" />
|
||||||
|
<button
|
||||||
|
onClick={() => setShowOrganizer(true)}
|
||||||
|
className="flex items-center gap-1.5 text-[12px] text-muted-foreground hover:text-brand-accent transition-colors"
|
||||||
|
>
|
||||||
|
<Wand2 size={14} />
|
||||||
|
<span>{t('structuredViews.organizer') || 'Organiser'}</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{searchParams.get('notebook') && (
|
{searchParams.get('notebook') && (
|
||||||
<button
|
<div className="flex items-center gap-1">
|
||||||
onClick={() => setShowStudyPlanner(true)}
|
<button
|
||||||
disabled={!initialSettings.aiAssistantEnabled}
|
onClick={handleImportCSV}
|
||||||
className={cn(
|
className="p-1.5 rounded-full text-muted-foreground hover:text-foreground transition-colors"
|
||||||
"flex items-center gap-2 text-[13px] font-medium transition-opacity",
|
title={t('structuredViews.importCsv') || 'Importer CSV'}
|
||||||
initialSettings.aiAssistantEnabled ? "text-brand-accent hover:opacity-70" : "text-muted-foreground opacity-50 cursor-not-allowed"
|
>
|
||||||
)}
|
<Upload size={15} />
|
||||||
>
|
</button>
|
||||||
<CalendarDays size={16} />
|
<button
|
||||||
<span>{t('wizard.studyPlanner') || 'Planning'}</span>
|
onClick={handleExportCSV}
|
||||||
</button>
|
className="p-1.5 rounded-full text-muted-foreground hover:text-foreground transition-colors"
|
||||||
)}
|
title={t('structuredViews.exportCsv') || 'Exporter CSV'}
|
||||||
{searchParams.get('notebook') && (
|
>
|
||||||
<button
|
<Download size={15} />
|
||||||
onClick={() => setShowOrganizer(true)}
|
</button>
|
||||||
disabled={!initialSettings.aiAssistantEnabled}
|
</div>
|
||||||
className={cn(
|
|
||||||
"flex items-center gap-2 text-[13px] font-medium transition-opacity",
|
|
||||||
initialSettings.aiAssistantEnabled ? "text-brand-accent hover:opacity-70" : "text-muted-foreground opacity-50 cursor-not-allowed"
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<Wand2 size={16} />
|
|
||||||
<span>{t('wizard.organizer') || 'Organiser'}</span>
|
|
||||||
</button>
|
|
||||||
)}
|
)}
|
||||||
<button
|
<button
|
||||||
onClick={() => setSortOrder(s => s === 'newest' ? 'oldest' : s === 'oldest' ? 'alpha' : s === 'alpha' ? 'manual' : 'newest')}
|
onClick={() => setSortOrder(s => s === 'newest' ? 'oldest' : s === 'oldest' ? 'alpha' : s === 'alpha' ? 'manual' : 'newest')}
|
||||||
|
|||||||
@@ -2580,6 +2580,9 @@
|
|||||||
"wizardStudyPlanSuccess": "Plan created! Reminders have been added to your notes.",
|
"wizardStudyPlanSuccess": "Plan created! Reminders have been added to your notes.",
|
||||||
"wizardDaysPlanned": "days planned",
|
"wizardDaysPlanned": "days planned",
|
||||||
"wizardStudyPlanReminders": "Reminders have been automatically added to your notes.",
|
"wizardStudyPlanReminders": "Reminders have been automatically added to your notes.",
|
||||||
|
"structuredViewsImportCsv": "Import CSV file",
|
||||||
|
"structuredViewsExportCsv": "Export as CSV",
|
||||||
|
"structuredViewsOrganizer": "Organize",
|
||||||
"wizardOrganizer": "Organize with AI",
|
"wizardOrganizer": "Organize with AI",
|
||||||
"wizardOrganizerDesc": "AI analyzes your notes and suggests tags, groupings and duplicate detection.",
|
"wizardOrganizerDesc": "AI analyzes your notes and suggests tags, groupings and duplicate detection.",
|
||||||
"wizardAnalyze": "Analyze notebook",
|
"wizardAnalyze": "Analyze notebook",
|
||||||
|
|||||||
@@ -2584,6 +2584,9 @@
|
|||||||
"wizardStudyPlanSuccess": "Planning créé ! Des rappels ont été ajoutés à vos notes.",
|
"wizardStudyPlanSuccess": "Planning créé ! Des rappels ont été ajoutés à vos notes.",
|
||||||
"wizardDaysPlanned": "jours planifiés",
|
"wizardDaysPlanned": "jours planifiés",
|
||||||
"wizardStudyPlanReminders": "Des rappels ont été ajoutés automatiquement à vos notes.",
|
"wizardStudyPlanReminders": "Des rappels ont été ajoutés automatiquement à vos notes.",
|
||||||
|
"structuredViewsImportCsv": "Importer un fichier CSV",
|
||||||
|
"structuredViewsExportCsv": "Exporter en CSV",
|
||||||
|
"structuredViewsOrganizer": "Organiser",
|
||||||
"wizardOrganizer": "Organiser avec l'IA",
|
"wizardOrganizer": "Organiser avec l'IA",
|
||||||
"wizardOrganizerDesc": "L'IA analyse vos notes et propose tags, regroupements et détection de doublons.",
|
"wizardOrganizerDesc": "L'IA analyse vos notes et propose tags, regroupements et détection de doublons.",
|
||||||
"wizardAnalyze": "Analyser le carnet",
|
"wizardAnalyze": "Analyser le carnet",
|
||||||
|
|||||||
Reference in New Issue
Block a user