Merge pull request YaoApp#296 from trheyi/main

[add] dashboard widget
AbbetWang · Dec 18, 2022 · 98a6da9 · 98a6da9
2 parents 33e0f52 + 605d4d9
commit 98a6da9
Show file tree

Hide file tree

Showing 17 changed files with 1,251 additions and 11 deletions.
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -3,12 +3,13 @@ package cmd
 import (
 	"bufio"
 	"fmt"
+	"os"
+
 	"github.com/blang/semver"
 	"github.com/fatih/color"
 	"github.com/rhysd/go-github-selfupdate/selfupdate"
 	"github.com/spf13/cobra"
 	"github.com/yaoapp/yao/share"
-	"os"
 )
 
 var upgradeCmd = &cobra.Command{
@@ -27,7 +28,7 @@ var upgradeCmd = &cobra.Command{
 		currentVersion := semver.MustParse(share.VERSION)
 		if !found || latest.Version.LTE(currentVersion) {
 			fmt.Println(color.GreenString(L("🎉Current version is the latest🎉")))
-			os.Exit(1)
+			os.Exit(0)
 		}
 		fmt.Println(color.WhiteString(L("Do you want to update to %s ? (y/n): "), latest.Version))
 		input, err := bufio.NewReader(os.Stdin).ReadString('\n')

diff --git a/widgets/component/types.go b/widgets/component/types.go
@@ -16,9 +16,10 @@ type Instances []InstanceDSL
 
 // InstanceDSL the component instance DSL
 type InstanceDSL struct {
-	Name   string      `json:"name,omitempty"`
-	Width  interface{} `json:"width,omitempty"`
-	Height interface{} `json:"height,omitempty"`
+	Name   string        `json:"name,omitempty"`
+	Width  interface{}   `json:"width,omitempty"`
+	Height interface{}   `json:"height,omitempty"`
+	Rows   []InstanceDSL `json:"rows,omitempty"`
 }
 
 // ActionsExport the export actions

diff --git a/widgets/dashboard/action.go b/widgets/dashboard/action.go
@@ -0,0 +1,42 @@
+package dashboard
+
+import (
+	"github.com/yaoapp/yao/widgets/action"
+)
+
+var processActionDefaults = map[string]*action.Process{
+
+	"Setting": {
+		Name:    "yao.dashboard.Setting",
+		Guard:   "bearer-jwt",
+		Process: "yao.dashboard.Xgen",
+		Default: []interface{}{nil},
+	},
+	"Component": {
+		Name:    "yao.dashboard.Component",
+		Guard:   "bearer-jwt",
+		Default: []interface{}{nil, nil, nil},
+	},
+	"Data": {
+		Name:    "yao.dashboard.Data",
+		Guard:   "bearer-jwt",
+		Default: []interface{}{nil},
+	},
+}
+
+// SetDefaultProcess set the default value of action
+func (act *ActionDSL) SetDefaultProcess() {
+
+	act.Setting = action.ProcessOf(act.Setting).
+		Merge(processActionDefaults["Setting"]).
+		SetHandler(processHandler)
+
+	act.Component = action.ProcessOf(act.Component).
+		Merge(processActionDefaults["Component"]).
+		SetHandler(processHandler)
+
+	act.Data = action.ProcessOf(act.Data).
+		WithBefore(act.BeforeData).WithAfter(act.AfterData).
+		Merge(processActionDefaults["Data"]).
+		SetHandler(processHandler)
+}
diff --git a/widgets/dashboard/api.go b/widgets/dashboard/api.go
@@ -0,0 +1,118 @@
+package dashboard
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+	jsoniter "github.com/json-iterator/go"
+	"github.com/yaoapp/gou"
+	"github.com/yaoapp/yao/share"
+	"github.com/yaoapp/yao/widgets/action"
+)
+
+// Guard form widget dashboard
+func Guard(c *gin.Context) {
+
+	id := c.Param("id")
+	if id == "" {
+		abort(c, 400, "the dashboard widget id does not found")
+		return
+	}
+
+	dashboard, has := Dashboards[id]
+	if !has {
+		abort(c, 404, fmt.Sprintf("the dashboard widget %s does not exist", id))
+		return
+	}
+
+	act, err := dashboard.getAction(c.FullPath())
+	if err != nil {
+		abort(c, 404, err.Error())
+		return
+	}
+
+	err = act.UseGuard(c, id)
+	if err != nil {
+		abort(c, 400, err.Error())
+		return
+	}
+
+}
+
+func abort(c *gin.Context, code int, message string) {
+	c.JSON(code, gin.H{"code": code, "message": message})
+	c.Abort()
+}
+
+func (dashboard *DSL) getAction(path string) (*action.Process, error) {
+
+	switch path {
+	case "/api/__yao/dashboard/:id/setting":
+		return dashboard.Action.Setting, nil
+	case "/api/__yao/dashboard/:id/component/:xpath/:method":
+		return dashboard.Action.Component, nil
+	case "/api/__yao/dashboard/:id/data":
+		return dashboard.Action.Data, nil
+	}
+
+	return nil, fmt.Errorf("the form widget %s %s action does not exist", dashboard.ID, path)
+}
+
+// export API
+func exportAPI() error {
+
+	http := gou.HTTP{
+		Name:        "Widget Dashboard API",
+		Description: "Widget Dashboard API",
+		Version:     share.VERSION,
+		Guard:       "widget-dashboard",
+		Group:       "__yao/dashboard",
+		Paths:       []gou.Path{},
+	}
+
+	//   GET  /api/__yao/dashboard/:id/setting  					-> Default process: yao.dashboard.Xgen
+	path := gou.Path{
+		Label:       "Setting",
+		Description: "Setting",
+		Path:        "/:id/setting",
+		Method:      "GET",
+		Process:     "yao.dashboard.Setting",
+		In:          []string{"$param.id"},
+		Out:         gou.Out{Status: 200, Type: "application/json"},
+	}
+	http.Paths = append(http.Paths, path)
+
+	//   GET  /api/__yao/dashboard/:id/data 					-> Default process: yao.dashboard.Data $param.id :query
+	path = gou.Path{
+		Label:       "Data",
+		Description: "Data",
+		Path:        "/:id/data",
+		Method:      "GET",
+		Process:     "yao.dashboard.Data",
+		In:          []string{"$param.id", ":query"},
+		Out:         gou.Out{Status: 200, Type: "application/json"},
+	}
+	http.Paths = append(http.Paths, path)
+
+	//   GET  /api/__yao/dashboard/:id/component/:xpath/:method  	-> Default process: yao.dashboard.Component $param.id $param.xpath $param.method :query
+	path = gou.Path{
+		Label:       "Component",
+		Description: "Component",
+		Path:        "/:id/component/:xpath/:method",
+		Method:      "GET",
+		Process:     "yao.dashboard.Component",
+		In:          []string{"$param.id", "$param.xpath", "$param.method", ":query"},
+		Out:         gou.Out{Status: 200, Type: "application/json"},
+	}
+	http.Paths = append(http.Paths, path)
+
+	// api source
+	source, err := jsoniter.Marshal(http)
+	if err != nil {
+		return err
+	}
+
+	// load apis
+	_, err = gou.LoadAPIReturn(string(source), "widgets.dashboard")
+	return err
+}