Fix auto test scene filetree edit scene (erda-project#3199) (erda-pro…

…ject#3200) Co-authored-by: shuofan <fanshuo2015@gmail.com>
erda-bot · Nov 26, 2021 · 44ef461 · 44ef461
1 parent d2a63b3
commit 44ef461
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/modules/dop/component-protocol/components/auto-test-scenes/leftPage/fileFormModal/model.go b/modules/dop/component-protocol/components/auto-test-scenes/leftPage/fileFormModal/model.go
@@ -18,6 +18,7 @@ import (
 	"github.com/erda-project/erda-infra/providers/component-protocol/cptype"
 	"github.com/erda-project/erda/apistructs"
 	"github.com/erda-project/erda/bundle"
+	"github.com/erda-project/erda/modules/dop/component-protocol/components/auto-test-scenes/common/gshelper"
 	autotestv2 "github.com/erda-project/erda/modules/dop/services/autotest_v2"
 	"github.com/erda-project/erda/modules/openapi/component-protocol/components/base"
 )
@@ -30,6 +31,7 @@ type ComponentFileFormModal struct {
 	Props      Props                  `json:"props"`
 	State      State                  `json:"state"`
 	Operations map[string]interface{} `json:"operations"`
+	gsHelper   *gshelper.GSHelper
 }
 
 type State struct {

diff --git a/modules/dop/component-protocol/components/auto-test-scenes/leftPage/fileFormModal/render.go b/modules/dop/component-protocol/components/auto-test-scenes/leftPage/fileFormModal/render.go
@@ -25,6 +25,7 @@ import (
 	"github.com/erda-project/erda-infra/providers/component-protocol/utils/cputil"
 	"github.com/erda-project/erda/apistructs"
 	"github.com/erda-project/erda/bundle"
+	"github.com/erda-project/erda/modules/dop/component-protocol/components/auto-test-scenes/common/gshelper"
 	"github.com/erda-project/erda/modules/dop/component-protocol/components/auto-test-scenes/leftPage/fileTree"
 	"github.com/erda-project/erda/modules/dop/component-protocol/types"
 	autotestv2 "github.com/erda-project/erda/modules/dop/services/autotest_v2"
@@ -40,6 +41,7 @@ func (a *ComponentFileFormModal) Render(ctx context.Context, c *cptype.Component
 	a.bdl = ctx.Value(types.GlobalCtxKeyBundle).(*bundle.Bundle)
 	a.sdk = cputil.SDK(ctx)
 	a.atTestPlan = ctx.Value(types.AutoTestPlanService).(*autotestv2.Service)
+	a.gsHelper = gshelper.NewGSHelper(gs)
 	err = a.unmarshal(c)
 	if err != nil {
 		return err
@@ -357,7 +359,7 @@ func (a *ComponentFileFormModal) GetSceneSet() error {
 }
 
 func (a *ComponentFileFormModal) GetScene(inParams fileTree.InParams) error {
-	id := a.State.SceneId
+	id := a.gsHelper.GetFileTreeSceneID()
 	req := apistructs.AutotestSceneRequest{
 		SceneID: id,
 	}
@@ -502,7 +504,7 @@ func (a *ComponentFileFormModal) UpdateSceneSet(inParams fileTree.InParams) erro
 
 func (a *ComponentFileFormModal) UpdateScene(inParams fileTree.InParams) error {
 	formData := a.State.FormData
-	id := a.State.SceneId
+	id := a.gsHelper.GetFileTreeSceneID()
 	req := apistructs.AutotestSceneSceneUpdateRequest{
 		Name:        formData.Name,
 		Description: formData.Description,

diff --git a/...ts/auto-test-scenes/rightPage/fileDetail/fileConfig/scenesSetConfig/scenesStages/model.go b/...ts/auto-test-scenes/rightPage/fileDetail/fileConfig/scenesSetConfig/scenesStages/model.go
@@ -145,6 +145,7 @@ func (s *SceneStage) initFromProtocol(ctx context.Context, c *cptype.Component,
 	s.State.Visible = false
 	s.State.ActionType = ""
 	s.State.IsAddParallel = false
+	s.State.IsClickFolderTableRow = false
 	return nil
 }
 

diff --git a/...uto-test-scenes/rightPage/fileDetail/fileConfig/scenesSetConfig/scenesStages/operation.go b/...uto-test-scenes/rightPage/fileDetail/fileConfig/scenesSetConfig/scenesStages/operation.go
@@ -254,6 +254,7 @@ func RenderEdit(s *SceneStage) error {
 	s.State.Visible = true
 	s.State.SceneID = meta.ID
 	s.State.SceneSetKey = s.gsHelper.GetGlobalSelectedSetID()
+	s.gsHelper.SetFileTreeSceneID(s.State.SceneID)
 	return nil
 }