Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/apps/dashboard/api/dashboard_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async def list_resource_api(session: SessionDep, dashboard: QueryDashboard, curr
@router.post("/load_resource", summary=f"{PLACEHOLDER_PREFIX}load_resource_api")
@require_permissions(permission=SqlbotPermission(type='dashboard', keyExpression="dashboard.id"))
async def load_resource_api(session: SessionDep, current_user: CurrentUser, dashboard: QueryDashboard):
return load_resource(session=session, dashboard=dashboard)
return load_resource(session=session, dashboard=dashboard, current_user=current_user)


@router.post("/create_resource", response_model=BaseDashboard, summary=f"{PLACEHOLDER_PREFIX}create_resource_api")
Expand Down
17 changes: 16 additions & 1 deletion backend/apps/dashboard/crud/dashboard_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def list_resource(session: SessionDep, dashboard: QueryDashboard, current_user:
return tree


def load_resource(session: SessionDep, dashboard: QueryDashboard):
def load_resource(session: SessionDep, dashboard: QueryDashboard, current_user: CurrentUser):
sql = text("""
SELECT cd.*,
creator.name AS create_name,
Expand All @@ -47,6 +47,11 @@ def load_resource(session: SessionDep, dashboard: QueryDashboard):
""")
result = session.execute(sql, {"dashboard_id": dashboard.id}).mappings().first()

if not result:
raise ValueError(f"Resource with id {dashboard.id} does not exist")
if str(result['create_by']) != str(current_user.id):
raise ValueError(f"Resource with id {dashboard.id} not owned by the current user")

result_dict = dict(result)
canvas_view_obj = orjson.loads(result_dict['canvas_view_info'])
for item in canvas_view_obj.values():
Expand Down Expand Up @@ -80,6 +85,10 @@ def create_resource(session: SessionDep, user: CurrentUser, dashboard: CreateDas

def update_resource(session: SessionDep, user: CurrentUser, dashboard: QueryDashboard):
record = session.query(CoreDashboard).filter(CoreDashboard.id == dashboard.id).first()
if not record:
raise ValueError(f"Resource with id {dashboard.id} does not exist")
if str(record.create_by) != str(user.id):
raise ValueError(f"Resource with id {dashboard.id} not owned by the current user")
record.name = dashboard.name
record.update_by = user.id
record.update_time = int(time.time())
Expand All @@ -103,6 +112,10 @@ def create_canvas(session: SessionDep, user: CurrentUser, dashboard: CreateDashb

def update_canvas(session: SessionDep, user: CurrentUser, dashboard: CreateDashboard):
record = session.query(CoreDashboard).filter(CoreDashboard.id == dashboard.id).first()
if not record:
raise ValueError(f"Resource with id {dashboard.id} does not exist")
if str(record.create_by) != str(user.id):
raise ValueError(f"Resource with id {dashboard.id} not owned by the current user")
record.name = dashboard.name
record.update_by = user.id
record.update_time = int(time.time())
Expand Down Expand Up @@ -149,6 +162,8 @@ def delete_resource(session: SessionDep, current_user: CurrentUser, resource_id:
coreDashboard = session.get(CoreDashboard, resource_id)
if not coreDashboard:
raise ValueError(f"Resource with id {resource_id} does not exist")
if str(coreDashboard.create_by) != str(current_user.id):
raise ValueError(f"Resource with id {resource_id} not owned by the current user")
sql = text("DELETE FROM core_dashboard WHERE id = :resource_id")
result = session.execute(sql, {"resource_id": resource_id})
session.commit()
Expand Down