action add timeout input (#3125)

Author: kakj-go

modules/openapi/component-protocol/scenarios/action/components/actionForm/render.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/erda-project/erda/apistructs"
 	protocol "github.com/erda-project/erda/modules/openapi/component-protocol"
+	"github.com/erda-project/erda/pkg/i18n"
 	"github.com/erda-project/erda/pkg/parser/diceyml"
 )
 
@@ -108,6 +109,21 @@ func GenHeaderProps(actionExt *apistructs.ExtensionVersion, versions []VersionOp
 	return
 }
 
+func GenTimeoutProps(local *i18n.LocaleResource) (props []apistructs.FormPropItem, err error) {
+	timeout := apistructs.FormPropItem{
+		Label:     local.Get("wb.content.action.input.label.timeout"),
+		Component: "inputNumber",
+		Key:       "timeout",
+		ComponentProps: map[string]interface{}{
+			"placeholder": local.Get("wb.content.action.input.label.timeoutPlaceholder"),
+		},
+		DefaultValue: "3600",
+	}
+
+	props = append(props, timeout)
+	return
+}
+
 func GenResourceProps(actionExt *apistructs.ExtensionVersion) (props []apistructs.FormPropItem, err error) {
 	if actionExt == nil {
 		err = fmt.Errorf("empty action extension")
@@ -263,6 +279,7 @@ func GenActionProps(ctx context.Context, c *apistructs.Component, name, version
 	}
 	// 默认请求时，version为空，需要以默认版本覆盖
 	c.State["version"] = actionExt.Version
+	local := bdl.Bdl.GetLocale(bdl.Locale)
 
 	header, err := GenHeaderProps(actionExt, versions)
 	if err != nil {
@@ -282,11 +299,18 @@ func GenActionProps(ctx context.Context, c *apistructs.Component, name, version
 		return
 	}
 
+	timeouts, err := GenTimeoutProps(local)
+	if err != nil {
+		logrus.Errorf("generate action timeout props failed, name: %s, version: %s, err:%v", name, version, err)
+		return
+	}
+
 	var props []apistructs.FormPropItem
 	props = append(props, header...)
 	props = append(props, params...)
 	props = append(props, resource...)
 	props = append(props, loop...)
+	props = append(props, timeouts...)
 	c.Props = map[string]interface{}{
 		"fields": props,
 	}

modules/openapi/component-protocol/scenarios/action/components/actionForm/render_test.go

@@ -0,0 +1,66 @@
+// Copyright (c) 2021 Terminus, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package action
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/erda-project/erda/apistructs"
+	"github.com/erda-project/erda/pkg/i18n"
+)
+
+func TestGenTimeoutProps1(t *testing.T) {
+	type args struct {
+		local *i18n.LocaleResource
+	}
+	tests := []struct {
+		name      string
+		args      args
+		wantProps []apistructs.FormPropItem
+		wantErr   bool
+	}{
+		{
+			name: "test",
+			args: args{
+				local: &i18n.LocaleResource{},
+			},
+			wantProps: []apistructs.FormPropItem{
+				{
+					Label:     "wb.content.action.input.label.timeout",
+					Component: "inputNumber",
+					Key:       "timeout",
+					ComponentProps: map[string]interface{}{
+						"placeholder": "wb.content.action.input.label.timeoutPlaceholder",
+					},
+					DefaultValue: "3600",
+				},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotProps, err := GenTimeoutProps(tt.args.local)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GenTimeoutProps() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(gotProps, tt.wantProps) {
+				t.Errorf("GenTimeoutProps() gotProps = %v, want %v", gotProps, tt.wantProps)
+			}
+		})
+	}
+}

pkg/erda-configs/i18n/action.json

@@ -0,0 +1,11 @@
+{
+  "zh-CN": {
+    "wb.content.action.input.label.timeout": "超时时间",
+    "wb.content.action.input.label.timeoutPlaceholder": "请输入执行超时时间"
+  },
+  "en-US": {
+    "wb.content.action.input.label.timeout": "timeout",
+    "wb.content.action.input.label.timeoutPlaceholder": "please enter the execution timeout"
+  }
+}
+