feat: support for sharing dashboards (#1150)

* feat: support for sharing dashboards

* merge dashboard get interface

* update read-only permission verification
This commit is contained in:
KurolZ 2022-09-16 15:03:12 +08:00 committed by GitHub
parent 3a3ad5d9d9
commit 95727e9c00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 2 deletions

View File

@ -166,6 +166,7 @@ CREATE TABLE `board` (
`group_id` bigint not null default 0 comment 'busi group id', `group_id` bigint not null default 0 comment 'busi group id',
`name` varchar(191) not null, `name` varchar(191) not null,
`tags` varchar(255) not null comment 'split by space', `tags` varchar(255) not null comment 'split by space',
`public` tinyint(1) not null default 0 comment '0:false 1:true',
`create_at` bigint not null default 0, `create_at` bigint not null default 0,
`create_by` varchar(64) not null default '', `create_by` varchar(64) not null default '',
`update_at` bigint not null default 0, `update_at` bigint not null default 0,

View File

@ -19,6 +19,7 @@ type Board struct {
UpdateAt int64 `json:"update_at"` UpdateAt int64 `json:"update_at"`
UpdateBy string `json:"update_by"` UpdateBy string `json:"update_by"`
Configs string `json:"configs" gorm:"-"` Configs string `json:"configs" gorm:"-"`
Public int `json:"public"` // 0: false, 1: true
} }
func (b *Board) TableName() string { func (b *Board) TableName() string {

View File

@ -195,10 +195,11 @@ func configRoute(r *gin.Engine, version string) {
pages.POST("/busi-group/:id/boards", auth(), user(), perm("/dashboards/add"), bgrw(), boardAdd) pages.POST("/busi-group/:id/boards", auth(), user(), perm("/dashboards/add"), bgrw(), boardAdd)
pages.POST("/busi-group/:id/board/:bid/clone", auth(), user(), perm("/dashboards/add"), bgrw(), boardClone) pages.POST("/busi-group/:id/board/:bid/clone", auth(), user(), perm("/dashboards/add"), bgrw(), boardClone)
pages.GET("/board/:bid", auth(), user(), boardGet) pages.GET("/board/:bid", boardGet)
pages.GET("/board/:bid/pure", boardPureGet) pages.GET("/board/:bid/pure", boardPureGet)
pages.PUT("/board/:bid", auth(), user(), perm("/dashboards/put"), boardPut) pages.PUT("/board/:bid", auth(), user(), perm("/dashboards/put"), boardPut)
pages.PUT("/board/:bid/configs", auth(), user(), perm("/dashboards/put"), boardPutConfigs) pages.PUT("/board/:bid/configs", auth(), user(), perm("/dashboards/put"), boardPutConfigs)
pages.PUT("/board/:bid/public", auth(), user(), perm("/dashboards/put"), boardPutPublic)
pages.DELETE("/boards", auth(), user(), perm("/dashboards/del"), boardDel) pages.DELETE("/boards", auth(), user(), perm("/dashboards/del"), boardDel)
// migrate v5.8.0 // migrate v5.8.0

View File

@ -13,6 +13,7 @@ type boardForm struct {
Name string `json:"name"` Name string `json:"name"`
Tags string `json:"tags"` Tags string `json:"tags"`
Configs string `json:"configs"` Configs string `json:"configs"`
Public int `json:"public"`
} }
func boardAdd(c *gin.Context) { func boardAdd(c *gin.Context) {
@ -48,6 +49,13 @@ func boardGet(c *gin.Context) {
ginx.Bomb(http.StatusNotFound, "No such dashboard") ginx.Bomb(http.StatusNotFound, "No such dashboard")
} }
if board.Public == 0 {
auth()(c)
user()(c)
bgroCheck(c, board.GroupId)
}
ginx.NewRender(c).Data(board, nil) ginx.NewRender(c).Data(board, nil)
} }
@ -139,6 +147,25 @@ func boardPutConfigs(c *gin.Context) {
ginx.NewRender(c).Data(bo, nil) ginx.NewRender(c).Data(bo, nil)
} }
// bgrwCheck
func boardPutPublic(c *gin.Context) {
var f boardForm
ginx.BindJSON(c, &f)
me := c.MustGet("user").(*models.User)
bo := Board(ginx.UrlParamInt64(c, "bid"))
// check permission
bgrwCheck(c, bo.GroupId)
bo.Public = f.Public
bo.UpdateBy = me.Username
bo.UpdateAt = time.Now().Unix()
err := bo.Update("public", "update_by", "update_at")
ginx.NewRender(c).Data(bo, err)
}
func boardGets(c *gin.Context) { func boardGets(c *gin.Context) {
bgid := ginx.UrlParamInt64(c, "id") bgid := ginx.UrlParamInt64(c, "id")
query := ginx.QueryStr(c, "query", "") query := ginx.QueryStr(c, "query", "")

View File

@ -225,7 +225,7 @@ func bgroCheck(c *gin.Context, bgid int64) {
me := c.MustGet("user").(*models.User) me := c.MustGet("user").(*models.User)
bg := BusiGroup(bgid) bg := BusiGroup(bgid)
can, err := me.CanDoBusiGroup(bg, "ro") can, err := me.CanDoBusiGroup(bg)
ginx.Dangerous(err) ginx.Dangerous(err)
if !can { if !can {