Implement Canvas V2 subgraphs, assets and asynchronous AI execution
This commit is contained in:
@@ -14,17 +14,25 @@ func lockMaterial(ctx context.Context, tx *sql.Tx, project, workspace, material,
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
err = tx.QueryRowContext(ctx, `
|
||||
SELECT m.kind,CASE
|
||||
// Child grants cannot bypass a parent. The effective role is inherited from
|
||||
// the root board; workspace membership participates at every ancestor.
|
||||
err = tx.QueryRowContext(ctx, `WITH RECURSIVE chain AS (
|
||||
SELECT m.id,m.kind,0 AS depth,ARRAY[m.id] AS path FROM materials m
|
||||
WHERE m.project=$1 AND m.workspace_id=$2 AND m.id=$3
|
||||
UNION ALL
|
||||
SELECT m.id,m.kind,c.depth+1,c.path||m.id FROM chain c
|
||||
JOIN canvas_subgraphs s ON s.project=$1 AND s.workspace_id=$2 AND s.child_board_id=c.id
|
||||
JOIN materials m ON m.project=s.project AND m.workspace_id=s.workspace_id AND m.id=s.parent_board_id
|
||||
WHERE c.depth<8 AND NOT m.id=ANY(c.path)
|
||||
), root AS (SELECT * FROM chain ORDER BY depth DESC LIMIT 1)
|
||||
SELECT (SELECT kind FROM chain WHERE depth=0),CASE
|
||||
WHEN member.role='admin' THEN 'admin'
|
||||
WHEN member.role='editor' OR access.role='editor' THEN 'editor'
|
||||
ELSE 'viewer' END
|
||||
FROM materials m
|
||||
LEFT JOIN workspace_members member ON (member.project,member.workspace_id)=(m.project,m.workspace_id) AND member.account_id=$4
|
||||
LEFT JOIN material_grants access ON (access.project,access.workspace_id,access.material_id)=(m.project,m.workspace_id,m.id) AND access.account_id=$4
|
||||
WHERE m.project=$1 AND m.workspace_id=$2 AND m.id=$3 AND (member.role IS NOT NULL OR access.role IS NOT NULL)
|
||||
FOR UPDATE OF m
|
||||
`, project, workspace, material, account).Scan(&kind, &role)
|
||||
WHEN member.role='editor' OR access.role='editor' THEN 'editor' ELSE 'viewer' END
|
||||
FROM root LEFT JOIN workspace_members member ON member.project=$1 AND member.workspace_id=$2 AND member.account_id=$4
|
||||
LEFT JOIN material_grants access ON access.project=$1 AND access.workspace_id=$2 AND access.material_id=root.id AND access.account_id=$4
|
||||
WHERE (member.role IS NOT NULL OR access.role IS NOT NULL)
|
||||
AND NOT EXISTS(SELECT 1 FROM canvas_subgraphs s WHERE s.project=$1 AND s.workspace_id=$2 AND s.child_board_id IN(SELECT id FROM chain) AND s.archived_at IS NOT NULL)
|
||||
`, project, workspace, material, account).Scan(&kind, &role)
|
||||
return kind, role, err
|
||||
}
|
||||
|
||||
@@ -259,20 +267,38 @@ func (s *service) listMaterials(w http.ResponseWriter, r *http.Request, project,
|
||||
reject(w, 400, "invalid_filter")
|
||||
return nil
|
||||
}
|
||||
includeSubgraphs := false
|
||||
if value := r.URL.Query().Get("include_subgraphs"); value != "" {
|
||||
if value != "true" && value != "false" {
|
||||
reject(w, 400, "invalid_filter")
|
||||
return nil
|
||||
}
|
||||
includeSubgraphs = value == "true"
|
||||
}
|
||||
tag := r.URL.Query().Get("tag")
|
||||
rows, err := s.db.QueryContext(r.Context(), `
|
||||
SELECT jsonb_build_object('id',m.id,'workspace_id',m.workspace_id,'kind',m.kind,'slug',m.slug,'title',m.title,
|
||||
'description',m.description,'version',m.version,'created_at',m.created_at,'modified_at',m.modified_at,
|
||||
'description',m.description,'version',m.version,'created_at',m.created_at,'modified_at',m.modified_at,'parent_board_id',sg.parent_board_id,'frame_id',sg.frame_id,
|
||||
'opened_at',opened.opened_at,'tags',COALESCE((SELECT jsonb_agg(jsonb_build_object('id',t.id,'name',t.name,'color',t.color) ORDER BY lower(t.name),t.id)
|
||||
FROM material_tags mt JOIN tags t ON (t.project,t.workspace_id,t.id)=(mt.project,mt.workspace_id,mt.tag_id)
|
||||
WHERE (mt.project,mt.workspace_id,mt.material_id)=(m.project,m.workspace_id,m.id)),'[]'::jsonb))
|
||||
FROM materials m LEFT JOIN material_opens opened ON (opened.project,opened.workspace_id,opened.material_id)=(m.project,m.workspace_id,m.id) AND opened.account_id=$3
|
||||
LEFT JOIN canvas_subgraphs sg ON sg.project=m.project AND sg.workspace_id=m.workspace_id AND sg.child_board_id=m.id
|
||||
JOIN LATERAL (
|
||||
WITH RECURSIVE chain(id,depth,archived,path) AS (
|
||||
SELECT m.id,0,false,ARRAY[m.id]
|
||||
UNION ALL SELECT parent.parent_board_id,c.depth+1,c.archived OR parent.archived_at IS NOT NULL,c.path||parent.parent_board_id
|
||||
FROM chain c JOIN canvas_subgraphs parent ON parent.project=m.project AND parent.workspace_id=m.workspace_id AND parent.child_board_id=c.id
|
||||
WHERE c.depth<8 AND NOT parent.parent_board_id=ANY(c.path)
|
||||
) SELECT id AS root_id,bool_or(archived) OVER () AS archived FROM chain ORDER BY depth DESC LIMIT 1
|
||||
) ancestry ON TRUE
|
||||
WHERE m.project=$1 AND m.workspace_id=$2
|
||||
AND NOT ancestry.archived AND ($9 OR sg.child_board_id IS NULL)
|
||||
AND (EXISTS(SELECT 1 FROM workspace_members member WHERE (member.project,member.workspace_id)=(m.project,m.workspace_id) AND member.account_id=$3)
|
||||
OR EXISTS(SELECT 1 FROM material_grants g WHERE (g.project,g.workspace_id,g.material_id)=(m.project,m.workspace_id,m.id) AND g.account_id=$3))
|
||||
OR EXISTS(SELECT 1 FROM material_grants g WHERE (g.project,g.workspace_id,g.material_id)=(m.project,m.workspace_id,ancestry.root_id) AND g.account_id=$3))
|
||||
AND ($4='' OR m.title ILIKE '%'||$4||'%') AND ($5='' OR m.kind=$5)
|
||||
AND ($6='' OR EXISTS(SELECT 1 FROM material_tags t WHERE (t.project,t.workspace_id,t.material_id)=(m.project,m.workspace_id,m.id) AND t.tag_id::text=$6))
|
||||
ORDER BY `+order+` LIMIT $7 OFFSET $8`, project, r.PathValue("workspace"), account, query, kind, tag, limit+1, offset)
|
||||
ORDER BY `+order+` LIMIT $7 OFFSET $8`, project, r.PathValue("workspace"), account, query, kind, tag, limit+1, offset, includeSubgraphs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user