Files tab: .md → note editor via CheckFileAction + frontend
Backend: - FindByFileID: notes+files JOIN query - LinkFile: INSERT OR IGNORE notes record - CheckFileAction binding: note/preview/external/auto-link Frontend (App.svelte): - Import isMarkdownFile from fileUtils - openPreview now calls CheckFileAction for .md files - .md+note → switch to Notes tab + note editor - .md outside Notes/ → inline preview - non-.md → unchanged Tests: 7 new (FindByFileID×3, CheckFileAction×4), all PASS
This commit is contained in:
@@ -191,6 +191,14 @@ type FileTreeItemDTO struct {
|
||||
HasKids bool `json:"hasKids"`
|
||||
}
|
||||
|
||||
// PreflightFileAction describes what should happen when opening a file from the Files tab.
|
||||
type PreflightFileAction struct {
|
||||
Action string `json:"action"` // "note" | "preview" | "external"
|
||||
NoteID string `json:"noteId,omitempty"`
|
||||
NoteTitle string `json:"noteTitle,omitempty"`
|
||||
FileName string `json:"fileName"`
|
||||
}
|
||||
|
||||
type ActionDTO struct {
|
||||
ID string `json:"id"`
|
||||
NodeID string `json:"nodeId"`
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"verstak/internal/core/activity"
|
||||
"verstak/internal/core/files"
|
||||
"verstak/internal/core/nodes"
|
||||
@@ -168,6 +172,44 @@ func (a *App) ValidateName(name string) error {
|
||||
return files.ValidateName(name)
|
||||
}
|
||||
|
||||
func (a *App) CheckFileAction(fileID string) (*PreflightFileAction, error) {
|
||||
if err := a.requireVault(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
fileRec, err := a.files.Get(fileID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("get file: %w", err)
|
||||
}
|
||||
name := strings.ToLower(fileRec.Filename)
|
||||
isMD := strings.HasSuffix(name, ".md") || strings.HasSuffix(name, ".markdown")
|
||||
if !isMD {
|
||||
return &PreflightFileAction{Action: "external", FileName: fileRec.Filename}, nil
|
||||
}
|
||||
// .md file — check for linked note
|
||||
noteRec, err := a.notes.FindByFileID(fileID)
|
||||
if err == nil && noteRec != nil {
|
||||
noteNode, nodeErr := a.nodes.Get(noteRec.NodeID)
|
||||
title := fileRec.Filename
|
||||
if nodeErr == nil && noteNode != nil {
|
||||
title = noteNode.Title
|
||||
}
|
||||
return &PreflightFileAction{Action: "note", NoteID: noteRec.NodeID, NoteTitle: title, FileName: fileRec.Filename}, nil
|
||||
}
|
||||
// .md inside Notes/ with no note record — auto-link
|
||||
pathLower := strings.ToLower(fileRec.Path)
|
||||
insideNotes := strings.Contains(pathLower, string(filepath.Separator)+"notes"+string(filepath.Separator)) ||
|
||||
strings.HasPrefix(pathLower, "notes"+string(filepath.Separator))
|
||||
if insideNotes {
|
||||
noteNode, nodeErr := a.nodes.Get(fileRec.NodeID)
|
||||
if nodeErr == nil && noteNode != nil {
|
||||
_ = a.notes.LinkFile(noteNode.ID, fileID, "markdown")
|
||||
return &PreflightFileAction{Action: "note", NoteID: noteNode.ID, NoteTitle: noteNode.Title, FileName: fileRec.Filename}, nil
|
||||
}
|
||||
}
|
||||
// .md outside Notes/ — internal preview
|
||||
return &PreflightFileAction{Action: "preview", FileName: fileRec.Filename}, nil
|
||||
}
|
||||
|
||||
func (a *App) PreviewImport(sourcePath string) (*files.ImportSummary, error) {
|
||||
if err := a.requireVault(); err != nil {
|
||||
return nil, err
|
||||
|
||||
+21
-21
File diff suppressed because one or more lines are too long
@@ -19,7 +19,7 @@
|
||||
background: #13131f;
|
||||
}
|
||||
</style>
|
||||
<script type="module" crossorigin src="/assets/main-DwDG7FeH.js"></script>
|
||||
<script type="module" crossorigin src="/assets/main-CzfuqGWF.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/main-bQpH1es2.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -246,3 +246,217 @@ func TestRepairMovesDirectNoteChildrenToNotesFolder(t *testing.T) {
|
||||
t.Errorf("file path should be %q, got %q", expectedRelPath, recs[0].Path)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// TestCheckFileAction_NoteLinked verifies that CheckFileAction returns
|
||||
// Action="note" for a .md file linked to a note record.
|
||||
func TestCheckFileAction_NoteLinked(t *testing.T) {
|
||||
app, _ := setupTestApp(t)
|
||||
proj, err := app.CreateNodeFromTemplate("", "TestProj", "project.default")
|
||||
if err != nil {
|
||||
t.Fatalf("create project: %v", err)
|
||||
}
|
||||
// Find the Overview note — it should be inside Notes folder, linked via notes record
|
||||
children, err := app.nodes.ListChildren(proj.ID, false)
|
||||
if err != nil {
|
||||
t.Fatalf("ListChildren: %v", err)
|
||||
}
|
||||
var notesFolder *nodes.Node
|
||||
for i := range children {
|
||||
if children[i].Title == notes.NotesFolder && children[i].Type == "folder" {
|
||||
notesFolder = &children[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
if notesFolder == nil {
|
||||
t.Fatal("Notes folder not found")
|
||||
}
|
||||
notesChildren, err := app.nodes.ListChildren(notesFolder.ID, false)
|
||||
if err != nil {
|
||||
t.Fatalf("ListChildren(Notes): %v", err)
|
||||
}
|
||||
if len(notesChildren) == 0 {
|
||||
t.Fatal("expected at least one note inside Notes folder")
|
||||
}
|
||||
// Get file ID for the Overview note
|
||||
items, err := app.ListItems(notesFolder.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("ListItems: %v", err)
|
||||
}
|
||||
var overviewFileID string
|
||||
for _, item := range items {
|
||||
if item.Type == "note" && item.Name == "Overview" {
|
||||
overviewFileID = item.FileID
|
||||
break
|
||||
}
|
||||
}
|
||||
if overviewFileID == "" {
|
||||
t.Fatal("Overview note has no FileID")
|
||||
}
|
||||
// CheckFileAction should return Action="note"
|
||||
action, err := app.CheckFileAction(overviewFileID)
|
||||
if err != nil {
|
||||
t.Fatalf("CheckFileAction: %v", err)
|
||||
}
|
||||
if action.Action != "note" {
|
||||
t.Errorf("expected Action=note for linked .md, got %q", action.Action)
|
||||
}
|
||||
if action.NoteID == "" {
|
||||
t.Error("expected non-empty NoteID for linked note")
|
||||
}
|
||||
if action.NoteTitle == "" {
|
||||
t.Error("expected non-empty NoteTitle")
|
||||
}
|
||||
if action.FileName == "" {
|
||||
t.Error("expected non-empty FileName")
|
||||
}
|
||||
}
|
||||
|
||||
// TestCheckFileAction_ExternalForNonMD verifies that non-.md files return
|
||||
// Action="external" from CheckFileAction.
|
||||
func TestCheckFileAction_ExternalForNonMD(t *testing.T) {
|
||||
app, vault := setupTestApp(t)
|
||||
proj, err := app.CreateNodeFromTemplate("", "TestProj", "project.default")
|
||||
if err != nil {
|
||||
t.Fatalf("create project: %v", err)
|
||||
}
|
||||
// Create a file node and record for a non-.md file
|
||||
fileNode, err := app.nodes.Create(&proj.ID, nodes.TypeFile, "image.png", 0, "", filepath.Join(proj.FsPath, "image.png"))
|
||||
if err != nil {
|
||||
t.Fatalf("create file node: %v", err)
|
||||
}
|
||||
absPath := filepath.Join(vault, proj.FsPath, "image.png")
|
||||
if err := os.MkdirAll(filepath.Dir(absPath), 0o755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(absPath, []byte("fake-png"), 0o640); err != nil {
|
||||
t.Fatalf("write file: %v", err)
|
||||
}
|
||||
// Insert file record directly
|
||||
_, err = app.db.Exec(
|
||||
`INSERT INTO files (id,node_id,filename,path,storage_mode,size,sha256,mime,created_at,updated_at,missing)
|
||||
VALUES (?,?,?,?,'vault',0,'','image/png','2024-01-01T00:00:00Z','2024-01-01T00:00:00Z',0)`,
|
||||
"file-png-"+fileNode.ID, fileNode.ID, "image.png", filepath.Join(proj.FsPath, "image.png"))
|
||||
if err != nil {
|
||||
t.Fatalf("insert file record: %v", err)
|
||||
}
|
||||
// CheckFileAction should return Action="external"
|
||||
action, err := app.CheckFileAction("file-png-" + fileNode.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("CheckFileAction: %v", err)
|
||||
}
|
||||
if action.Action != "external" {
|
||||
t.Errorf("expected Action=external for .png, got %q", action.Action)
|
||||
}
|
||||
if action.FileName != "image.png" {
|
||||
t.Errorf("expected FileName=image.png, got %q", action.FileName)
|
||||
}
|
||||
}
|
||||
|
||||
// TestCheckFileAction_PreviewForMDOutsideNotes verifies that .md files
|
||||
// outside Notes/ without a note record return Action="preview".
|
||||
func TestCheckFileAction_PreviewForMDOutsideNotes(t *testing.T) {
|
||||
app, vault := setupTestApp(t)
|
||||
proj, err := app.CreateNodeFromTemplate("", "TestProj", "project.default")
|
||||
if err != nil {
|
||||
t.Fatalf("create project: %v", err)
|
||||
}
|
||||
// Create a .md file directly under the project (not inside Notes/)
|
||||
mdNode, err := app.nodes.Create(&proj.ID, nodes.TypeFile, "readme.md", 0, "", filepath.Join(proj.FsPath, "readme.md"))
|
||||
if err != nil {
|
||||
t.Fatalf("create md node: %v", err)
|
||||
}
|
||||
absPath := filepath.Join(vault, proj.FsPath, "readme.md")
|
||||
if err := os.MkdirAll(filepath.Dir(absPath), 0o755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(absPath, []byte("# Readme\n"), 0o640); err != nil {
|
||||
t.Fatalf("write file: %v", err)
|
||||
}
|
||||
// Insert file record directly
|
||||
_, err = app.db.Exec(
|
||||
`INSERT INTO files (id,node_id,filename,path,storage_mode,size,sha256,mime,created_at,updated_at,missing)
|
||||
VALUES (?,?,?,?,'vault',0,'','text/markdown','2024-01-01T00:00:00Z','2024-01-01T00:00:00Z',0)`,
|
||||
"file-md-"+mdNode.ID, mdNode.ID, "readme.md", filepath.Join(proj.FsPath, "readme.md"))
|
||||
if err != nil {
|
||||
t.Fatalf("insert file record: %v", err)
|
||||
}
|
||||
// Do NOT create a notes record — this .md is outside Notes/
|
||||
action, err := app.CheckFileAction("file-md-" + mdNode.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("CheckFileAction: %v", err)
|
||||
}
|
||||
if action.Action != "preview" {
|
||||
t.Errorf("expected Action=preview for .md outside Notes/, got %q", action.Action)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCheckFileAction_AutoLinkInNotes(t *testing.T) {
|
||||
app, vault := setupTestApp(t)
|
||||
proj, err := app.CreateNodeFromTemplate("", "TestProj", "project.default")
|
||||
if err != nil {
|
||||
t.Fatalf("create project: %v", err)
|
||||
}
|
||||
// Find Notes folder
|
||||
children, err := app.nodes.ListChildren(proj.ID, false)
|
||||
if err != nil {
|
||||
t.Fatalf("ListChildren: %v", err)
|
||||
}
|
||||
var notesFolder *nodes.Node
|
||||
for i := range children {
|
||||
if children[i].Title == notes.NotesFolder && children[i].Type == "folder" {
|
||||
notesFolder = &children[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
if notesFolder == nil {
|
||||
t.Fatal("Notes folder not found")
|
||||
}
|
||||
// Create a .md file INSIDE Notes/ but WITHOUT a notes record
|
||||
mdNode, err := app.nodes.Create(¬esFolder.ID, nodes.TypeFile, "orphan.md", 0, "",
|
||||
filepath.Join(proj.FsPath, notes.NotesFolder, "orphan.md"))
|
||||
if err != nil {
|
||||
t.Fatalf("create md node: %v", err)
|
||||
}
|
||||
notesDir := filepath.Join(vault, proj.FsPath, notes.NotesFolder)
|
||||
if err := os.MkdirAll(notesDir, 0o755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
absPath := filepath.Join(notesDir, "orphan.md")
|
||||
if err := os.WriteFile(absPath, []byte("# Orphan Note\n"), 0o640); err != nil {
|
||||
t.Fatalf("write file: %v", err)
|
||||
}
|
||||
// Insert file record
|
||||
_, err = app.db.Exec(
|
||||
`INSERT INTO files (id,node_id,filename,path,storage_mode,size,sha256,mime,created_at,updated_at,missing)
|
||||
VALUES (?,?,?,?,'vault',0,'','text/markdown','2024-01-01T00:00:00Z','2024-01-01T00:00:00Z',0)`,
|
||||
"file-orphan-"+mdNode.ID, mdNode.ID, "orphan.md",
|
||||
filepath.Join(proj.FsPath, notes.NotesFolder, "orphan.md"))
|
||||
if err != nil {
|
||||
t.Fatalf("insert file record: %v", err)
|
||||
}
|
||||
// No notes record yet — just file + node
|
||||
// CheckFileAction should auto-link and return Action="note"
|
||||
action, err := app.CheckFileAction("file-orphan-" + mdNode.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("CheckFileAction: %v", err)
|
||||
}
|
||||
if action.Action != "note" {
|
||||
t.Errorf("expected Action=note for .md inside Notes/, got %q", action.Action)
|
||||
}
|
||||
if action.NoteID == "" {
|
||||
t.Error("expected auto-linked NoteID")
|
||||
}
|
||||
if action.NoteTitle == "" {
|
||||
t.Error("expected NoteTitle for auto-linked note")
|
||||
}
|
||||
// Verify notes record was actually created
|
||||
noteRec, err := app.notes.FindByFileID("file-orphan-" + mdNode.ID)
|
||||
if err != nil {
|
||||
t.Fatalf("FindByFileID after auto-link: %v", err)
|
||||
}
|
||||
if noteRec == nil {
|
||||
t.Fatal("expected note record after auto-link")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user