refactor: dashboard preview

Author: ziyujiahao

backend/apps/api.py

@@ -4,6 +4,7 @@
 from apps.settings.api import terminology
 from apps.datasource.api import datasource
 from apps.chat.api import chat
+from apps.dashboard.api import dashboard_api
 
 
 api_router = APIRouter()
@@ -13,5 +14,6 @@
 api_router.include_router(terminology.router)
 api_router.include_router(datasource.router)
 api_router.include_router(chat.router)
+api_router.include_router(dashboard_api.router)
 
 

backend/apps/dashboard/api/dashboard_api.py

@@ -1,11 +1,9 @@
-import hashlib
-import os
-import uuid
-from typing import List
+
 from fastapi import APIRouter, File, UploadFile, HTTPException
 
-from apps.dashboard.crud.dashboard_service import get_dashboard_list, preview_with_id
-from common.core.deps import SessionDep
+from apps.dashboard.crud.dashboard_service import get_dashboard_list, preview_with_id,create_dashboard
+from apps.dashboard.models.dashboard_model import CreateDashboard
+from common.core.deps import SessionDep, CurrentUser
 
 router = APIRouter(tags=["dashboard"], prefix="/dashboard")
 
@@ -15,4 +13,8 @@ async def datasource_list(session: SessionDep):
 
 @router.get("/preview_dashboard/{id}")
 async def preview_dashboard(session: SessionDep,id:str):
-    return preview_with_id(session=session,dashboard_id=id)
+    return preview_with_id(session=session,dashboard_id=id)
+
+@router.post("/add", response_model=CreateDashboard)
+async def add(session: SessionDep, user: CurrentUser, dashboard: CreateDashboard):
+    return create_dashboard(session, user, dashboard)

backend/apps/dashboard/crud/dashboard_service.py

@@ -1,13 +1,23 @@
 from select import select
-
-from apps.dashboard.models.dashboard_model import CoreDashboard
-from common.core.deps import SessionDep
-
-
+from apps.dashboard.models.dashboard_model import CoreDashboard, CreateDashboard
+from common.core.deps import SessionDep, CurrentUser
+import uuid
 def get_dashboard_list(session: SessionDep):
     statement = select(CoreDashboard).order_by(CoreDashboard.create_time.desc())
     dashboard_list = session.exec(statement).fetchall()
     return dashboard_list
 
 def preview_with_id(session: SessionDep, dashboard_id: str):
-    return  session.query(CoreDashboard).filter(CoreDashboard.id == id).first()
+    return  session.query(CoreDashboard).filter(CoreDashboard.id == id).first()
+
+
+def create_dashboard(session: SessionDep, user: CurrentUser, dashboard: CreateDashboard):
+    new_id = uuid.uuid4().hex
+    record = CoreDashboard(**dashboard.model_dump())
+    record.id = new_id
+    record.create_by = user.id
+    session.add(record)
+    session.flush()
+    session.refresh(record)
+    session.commit()
+    return record

backend/apps/dashboard/models/dashboard_model.py

@@ -1,5 +1,7 @@
 from sqlmodel import SQLModel, Field
-from sqlalchemy import String, Column, Text, SmallInteger, BigInteger, Integer
+from sqlalchemy import String, Column, Text, SmallInteger, BigInteger, Integer,DateTime
+from pydantic import BaseModel
+from datetime import datetime
 
 
 class CoreDashboard(SQLModel, table=True):
@@ -121,3 +123,18 @@ class CoreDashboard(SQLModel, table=True):
         max_length=50,
         sa_column=Column(String(50), nullable=True)
     )
+
+# dashboard create obj
+class CreateDashboard(BaseModel):
+    id: str = ''
+    name: str = ''
+    pid: str = ''
+    workspace_id: str = ''
+    org_id: str = ''
+    description: str = ''
+    type: str = ''
+    node_type: str = ''
+    canvas_style_data: str =''
+    component_data: str = ''
+    configuration: str = ''
+    create_by: int = 0

frontend/components.d.ts

@@ -21,6 +21,7 @@ declare module '@vue/runtime-core' {
     ElDropdown: typeof import('element-plus-secondary/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus-secondary/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus-secondary/es')['ElDropdownMenu']
+    ElEmpty: typeof import('element-plus-secondary/es')['ElEmpty']
     ElFooter: typeof import('element-plus-secondary/es')['ElFooter']
     ElForm: typeof import('element-plus-secondary/es')['ElForm']
     ElFormItem: typeof import('element-plus-secondary/es')['ElFormItem']
@@ -32,6 +33,7 @@ declare module '@vue/runtime-core' {
     ElMenuItem: typeof import('element-plus-secondary/es')['ElMenuItem']
     ElOption: typeof import('element-plus-secondary/es')['ElOption']
     ElPagination: typeof import('element-plus-secondary/es')['ElPagination']
+    ElPopover: typeof import('element-plus-secondary/es')['ElPopover']
     ElRadio: typeof import('element-plus-secondary/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus-secondary/es')['ElRadioGroup']
     ElRow: typeof import('element-plus-secondary/es')['ElRow']
@@ -46,6 +48,8 @@ declare module '@vue/runtime-core' {
     ElTabPane: typeof import('element-plus-secondary/es')['ElTabPane']
     ElTabs: typeof import('element-plus-secondary/es')['ElTabs']
     ElTooltip: typeof import('element-plus-secondary/es')['ElTooltip']
+    ElTree: typeof import('element-plus-secondary/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus-secondary/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus-secondary/es')['ElUpload']
     Icon: typeof import('./src/components/icon-custom/src/Icon.vue')['default']
     Layout: typeof import('./src/components/layout/index.vue')['default']

frontend/src/api/dashboard.ts

@@ -5,4 +5,5 @@ export const dashboardApi = {
   getDashboardInfo: (params:any) => request.post(`/dashboard/get_dashboard/${params.id}`,params),
   sqNameCheck: (data: any) => request.post('/dashboard/name_check',data),
   moveResource: (data: any) => request.post('/dashboard/move',data),
+  addResource: (data: any) => request.post('/dashboard/add',data)
 }