Automated test cycle task display tag and automatic expansion configuration items

Author: kakj-go

apistructs/permission.go

@@ -173,6 +173,13 @@ type PermissionList struct {
 
 	// 无权限（access=false）时，该字段返回联系人 ID 列表，例如无应用权限时，返回应用管理员列表
 	ContactsWhenNoPermission []string `json:"contactsWhenNoPermission,omitempty"`
+
+	ScopeInfo ScopeInfo `json:"scopeInfo"`
+}
+
+type ScopeInfo struct {
+	ProjectName string `json:"projectName"`
+	AppName     string `json:"appName"`
 }
 
 // PermissionListResponse 权限列表响应信息

apistructs/pipeline_task.go

@@ -151,6 +151,32 @@ type PipelineTaskLoop struct {
 	Strategy *LoopStrategy `json:"strategy,omitempty" yaml:"strategy,omitempty"`
 }
 
+func (l *PipelineTaskLoop) IsEmpty() bool {
+	if l == nil {
+		return true
+	}
+	if l.Break != "" {
+		return false
+	}
+
+	if l.Strategy != nil {
+		if l.Strategy.DeclineLimitSec > 0 {
+			return false
+		}
+		if l.Strategy.DeclineRatio > 0 {
+			return false
+		}
+		if l.Strategy.IntervalSec > 0 {
+			return false
+		}
+		if l.Strategy.MaxTimes > 0 {
+			return false
+		}
+	}
+
+	return true
+}
+
 type PipelineTaskErrResponse struct {
 	Code string             `json:"code"`
 	Msg  string             `json:"msg"`

apistructs/pipeline_task_test.go

@@ -59,3 +59,75 @@ func TestConvertErrors(t *testing.T) {
 	task.Result.ConvertErrors()
 	assert.Equal(t, fmt.Sprintf("err\nstartTime: %s\nendTime: %s\ncount: %d", start.Format("2006-01-02 15:04:05"), end.Format("2006-01-02 15:04:05"), 2), task.Result.Errors[0].Msg)
 }
+
+func TestPipelineTaskLoop_IsEmpty(t *testing.T) {
+	type fields struct {
+		Break    string
+		Strategy *LoopStrategy
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		want   bool
+	}{
+		{
+			name: "test_break",
+			fields: fields{
+				Break: "test",
+			},
+			want: false,
+		},
+		{
+			name: "test_DeclineLimitSec",
+			fields: fields{
+				Strategy: &LoopStrategy{
+					DeclineLimitSec: 1,
+				},
+			},
+			want: false,
+		},
+		{
+			name: "test_DeclineRatio",
+			fields: fields{
+				Strategy: &LoopStrategy{
+					DeclineLimitSec: 1,
+				},
+			},
+			want: false,
+		},
+		{
+			name: "test_IntervalSec",
+			fields: fields{
+				Strategy: &LoopStrategy{
+					DeclineLimitSec: 1,
+				},
+			},
+			want: false,
+		},
+		{
+			name: "test_MaxTimes",
+			fields: fields{
+				Strategy: &LoopStrategy{
+					DeclineLimitSec: 1,
+				},
+			},
+			want: false,
+		},
+		{
+			name:   "test_MaxTimes",
+			fields: fields{},
+			want:   true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			l := &PipelineTaskLoop{
+				Break:    tt.fields.Break,
+				Strategy: tt.fields.Strategy,
+			}
+			if got := l.IsEmpty(); got != tt.want {
+				t.Errorf("IsEmpty() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

modules/openapi/component-protocol/scenarios/auto-test-scenes/components/apiEditor/helper.go

@@ -16,6 +16,7 @@ package apiEditor
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 
@@ -24,13 +25,13 @@ import (
 	"github.com/erda-project/erda/pkg/expression"
 )
 
-const props1 string = `{
+var props1 = `{
 	 "loopFormField":[
 		{
 			"component":"formGroup",
 			"key":"loop",
 			"componentProps":{
-				"defaultExpand":false,
+				"defaultExpand": ` + LoopFormFieldDefaultExpand.string() + `,
 				"expandable":true,
 				"title":"循环策略"
 			},
@@ -335,9 +336,42 @@ const props3 string = `}
 //}
 const props4 string = `}`
 
-func genProps(input, execute string) interface{} {
+type optionKey string
+
+// placeholder for whether the loop strategy is expanded by default
+const LoopFormFieldDefaultExpand = optionKey("defaultExpand")
+
+func (opt optionKey) string() string {
+	return "{{_" + string(opt) + "_}}"
+}
+
+type replaceOption struct {
+	key   optionKey
+	value string
+}
+
+var defaultReplaceOptions = []replaceOption{
+	{
+		key:   LoopFormFieldDefaultExpand,
+		value: "false",
+	},
+}
+
+func genProps(input, execute string, replaceOpts ...replaceOption) interface{} {
+	// because props are assembled by splicing json strings,
+	// dynamic setting values can only be replaced by placeholders.
+	var propsJson = props1 + input + props2 + input + props3 + execute + props4
+
+	for _, opt := range replaceOpts {
+		propsJson = strings.ReplaceAll(propsJson, opt.key.string(), opt.value)
+	}
+
+	for _, opt := range defaultReplaceOptions {
+		propsJson = strings.ReplaceAll(propsJson, opt.key.string(), opt.value)
+	}
+
 	var propsI interface{}
-	if err := json.Unmarshal([]byte(props1+input+props2+input+props3+execute+props4), &propsI); err != nil {
+	if err := json.Unmarshal([]byte(propsJson), &propsI); err != nil {
 		logrus.Errorf("init props name=testplan component=formModal propsType=CreateTestPlan err: errMsg: %v", err)
 	}
 

modules/openapi/component-protocol/scenarios/auto-test-scenes/components/apiEditor/render.go

@@ -365,6 +365,17 @@ LABEL:
 	if err := json.Unmarshal([]byte(sceneStep.Value), &apiInfo); err != nil {
 		return err
 	}
+
+	// replace placeholders in props
+	var opts []replaceOption
+	if !apiInfo.Loop.IsEmpty() {
+		opts = append(opts, replaceOption{
+			key:   LoopFormFieldDefaultExpand,
+			value: "true",
+		})
+	}
+	c.Props = genProps(string(inputBytes), executeString, opts...)
+
 	apiInfo.APIInfo.Name = sceneStep.Name
 	c.State["data"] = map[string]interface{}{"apiSpec": apiInfo.APIInfo, "apiSpecId": sceneStep.APISpecID, "loop": apiInfo.Loop}
 	return nil

modules/openapi/component-protocol/scenarios/auto-test-scenes/components/stages/model.go

@@ -41,12 +41,18 @@ type Data struct {
 	Type string      `json:"type"`
 }
 
+type Tag struct {
+	Label string `json:"label"`
+	Color string `json:"color"`
+}
+
 type StageData struct {
 	Title      string                 `json:"title"`
 	ID         uint64                 `json:"id"`
 	GroupID    int64                  `json:"groupId"`
 	Disabled   bool                   `json:"disabled"`
 	Operations map[string]interface{} `json:"operations"`
+	Tags       []Tag                  `json:"tags"`
 }
 
 type InParams struct {

modules/openapi/component-protocol/scenarios/auto-test-scenes/components/stages/stages.go

@@ -19,6 +19,7 @@ import (
 	"strconv"
 
 	"github.com/erda-project/erda/apistructs"
+	st "github.com/erda-project/erda/modules/openapi/component-protocol/pkg/autotest/step"
 )
 
 type MU struct {
@@ -116,6 +117,16 @@ func RenderStage(groupID uint64, step apistructs.AutoTestSceneStep) (StageData,
 		o3.Meta.ID = step.ID
 		o3.CopyText = step.ToJsonCopyText()
 		pd.Operations["copyAsJson"] = o3
+
+		var apiInfo st.APISpec
+		if err := json.Unmarshal([]byte(step.Value), &apiInfo); err == nil {
+			if !apiInfo.Loop.IsEmpty() {
+				pd.Tags = append(pd.Tags, Tag{
+					Label: "循环步骤",
+					Color: "blue",
+				})
+			}
+		}
 	}
 
 	os := OperationInfo{