Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

support tree on public nodes

Smaug6739b46bbd3df26f
diff --git a/backend/models/node.model.go b/backend/models/node.model.go
index 1b4f16c3..e9ba2c83 100644
--- a/backend/models/node.model.go
+++ b/backend/models/node.model.go
@@ -52,3 +52,9 @@ type NodeResourceInfo struct {
UserId types.Snowflake `json:"user_id" db:"user_id"`
Metadata *types.JSONB `json:"metadata" db:"metadata"`
}
+
+// PublicNodeResponse represents the full response for a public node including its children
+type PublicNodeResponse struct {
+ Node *Node `json:"node"`
+ Children []*Node `json:"children"`
+}
diff --git a/backend/repositories/node.repository.go b/backend/repositories/node.repository.go
index 7309a0c3..b0901f60 100644
--- a/backend/repositories/node.repository.go
+++ b/backend/repositories/node.repository.go
@@ -20,6 +20,7 @@ type NodeRepository interface {
GetAllForBackup(userId types.Snowflake) ([]*models.Node, error)
GetByID(nodeId types.Snowflake) (*models.Node, error)
GetPublic(nodeId types.Snowflake) (*models.Node, error)
+ GetPublicDescendants(nodeId types.Snowflake) ([]*models.Node, error)
GetUserUploadsSize(userId types.Snowflake) (int64, error)
GetDescendantResources(nodeId types.Snowflake) ([]*models.NodeResourceInfo, error)
SearchFulltext(userId types.Snowflake, query string, includeContent bool, limit int) ([]*models.NodeSearchResult, error)
@@ -172,15 +173,31 @@ func (r *NodeRepositoryImpl) GetByID(nodeId types.Snowflake) (*models.Node, erro
return &node, nil
}
-// GetPublic retrieves a public node by ID
+// GetPublic retrieves a node if it or any of its ancestors is public
+// This allows accessing child nodes of a public parent through hierarchical inheritance
func (r *NodeRepositoryImpl) GetPublic(nodeId types.Snowflake) (*models.Node, error) {
var node models.Node
err := r.db.Get(&node, `
- SELECT id, user_id, parent_id, name, description, tags, role, color, icon, thumbnail, theme,
- accessibility, access, display, `+"`order`"+`, content, content_compiled, size, metadata,
- created_timestamp, updated_timestamp
- FROM nodes
- WHERE id = ? AND accessibility = 3`, nodeId)
+ WITH RECURSIVE ancestors AS (
+ -- Start with the requested node
+ SELECT id, parent_id, accessibility
+ FROM nodes
+ WHERE id = ?
+
+ UNION ALL
+
+ -- Recursively get parent nodes
+ SELECT n.id, n.parent_id, n.accessibility
+ FROM nodes n
+ JOIN ancestors a ON n.id = a.parent_id
+ )
+ SELECT n.id, n.user_id, n.parent_id, n.name, n.description, n.tags, n.role, n.color, n.icon, n.thumbnail, n.theme,
+ n.accessibility, n.access, n.display, n.`+"`order`"+`, n.content, n.content_compiled, n.size, n.metadata,
+ n.created_timestamp, n.updated_timestamp
+ FROM nodes n
+ WHERE n.id = ? AND EXISTS (
+ SELECT 1 FROM ancestors WHERE accessibility = 3
+ )`, nodeId, nodeId)
if err == sql.ErrNoRows {
return nil, nil
}
@@ -190,6 +207,37 @@ func (r *NodeRepositoryImpl) GetPublic(nodeId types.Snowflake) (*models.Node, er
return &node, nil
}
+// GetPublicDescendants retrieves ALL descendants of a node recursively (role 1, 2, 3 only)
+// Children inherit public access from their parent
+func (r *NodeRepositoryImpl) GetPublicDescendants(nodeId types.Snowflake) ([]*models.Node, error) {
+ var descendants []*models.Node
+ err := r.db.Select(&descendants, `
+ WITH RECURSIVE descendant_nodes AS (
+ -- Direct children of the public node
+ SELECT id, user_id, parent_id, name, description, tags, role, color, icon, thumbnail, theme,
+ accessibility, access, display, `+"`order`"+`, size, metadata,
+ created_timestamp, updated_timestamp
+ FROM nodes
+ WHERE parent_id = ? AND role IN (1, 2, 3)
+
+ UNION ALL
+
+ -- Recursively get all descendants
+ SELECT n.id, n.user_id, n.parent_id, n.name, n.description, n.tags, n.role, n.color, n.icon, n.thumbnail, n.theme,
+ n.accessibility, n.access, n.display, n.`+"`order`"+`, n.size, n.metadata,
+ n.created_timestamp, n.updated_timestamp
+ FROM nodes n
+ JOIN descendant_nodes d ON n.parent_id = d.id
+ WHERE n.role IN (1, 2, 3)
+ )
+ SELECT * FROM descendant_nodes
+ ORDER BY role ASC, `+"`order`"+` DESC, name ASC`, nodeId)
+ if err != nil {
+ return nil, fmt.Errorf("failed to get public descendants: %w", err)
+ }
+ return descendants, nil
+}
+
// GetUserUploadsSize calculates total upload size for a user
func (r *NodeRepositoryImpl) GetUserUploadsSize(userId types.Snowflake) (int64, error) {
var totalSize int64
diff --git a/backend/services/node.service.go b/backend/services/node.service.go
index a9e7b4df..7b7c889b 100644
--- a/backend/services/node.service.go
+++ b/backend/services/node.service.go
@@ -16,7 +16,7 @@ type NodeService interface {
GetSharedNodes(userId types.Snowflake, connectedUserId types.Snowflake, connectedUserRole permissions.UserRole) ([]*models.Node, error)
GetAllNodeBackup(userId types.Snowflake) ([]*models.Node, error)
GetUserUploadsSize(userId types.Snowflake) (int64, error)
- GetPublicNode(nodeId types.Snowflake) (*models.Node, error)
+ GetPublicNode(nodeId types.Snowflake) (*models.PublicNodeResponse, error)
GetNode(nodeId types.Snowflake, connectedUserId types.Snowflake, connectedUserRole permissions.UserRole, authorizer permissions.Authorizer) (map[string]interface{}, error)
CreateNode(node *models.Node, userId types.Snowflake) (*models.Node, error)
UpdateNode(nodeId types.Snowflake, node *models.Node, connectedUserId types.Snowflake, connectedUserRole permissions.UserRole, authorizer permissions.Authorizer) (*models.Node, error)
@@ -62,8 +62,30 @@ func (s *nodeService) GetUserUploadsSize(userId types.Snowflake) (int64, error)
return s.nodeRepo.GetUserUploadsSize(userId)
}
-func (s *nodeService) GetPublicNode(nodeId types.Snowflake) (*models.Node, error) {
- return s.nodeRepo.GetPublic(nodeId)
+func (s *nodeService) GetPublicNode(nodeId types.Snowflake) (*models.PublicNodeResponse, error) {
+ // Get the node if it or any ancestor is public
+ node, err := s.nodeRepo.GetPublic(nodeId)
+ if err != nil {
+ return nil, err
+ }
+ if node == nil {
+ return nil, nil
+ }
+
+ // For workspaces (role=1), categories (role=2), and documents with subdocs (role=3)
+ // fetch ALL descendants recursively - they inherit public access
+ var children []*models.Node
+ if node.Role == 1 || node.Role == 2 || node.Role == 3 {
+ children, err = s.nodeRepo.GetPublicDescendants(nodeId)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ return &models.PublicNodeResponse{
+ Node: node,
+ Children: children,
+ }, nil
}
func (s *nodeService) GetNode(nodeId types.Snowflake, connectedUserId types.Snowflake, connectedUserRole permissions.UserRole, authorizer permissions.Authorizer) (map[string]interface{}, error) {