Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the bug fo menu AppMonitor only have two options #2077

Merged

Conversation

Counterflowwind
Copy link
Contributor

What type of this PR

Add one of the following kinds:
/kind bug

ChangeLog

Language Changelog
🇺🇸 English fix the bug fo menu AppMonitor only have two options
🇨🇳 中文 dop项目应用监控只有两个选项

Need cherry-pick to release versions?

Add comment like /cherry-pick release/1.0 when this PR is merged.

For details on the cherry pick process, see the cherry pick requests section under CONTRIBUTING.md.

@Counterflowwind Counterflowwind added msp microsevice platform bugfix labels Sep 23, 2021
@codecov
Copy link

codecov bot commented Sep 23, 2021

Codecov Report

Merging #2077 (e9fa386) into master (82e11ee) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2077   +/-   ##
=======================================
  Coverage   15.54%   15.54%           
=======================================
  Files        1168     1168           
  Lines      113675   113675           
=======================================
  Hits        17670    17670           
  Misses      94028    94028           
  Partials     1977     1977           
Impacted Files Coverage Δ
modules/msp/menu/menu.service.go 46.66% <100.00%> (ø)

@liuhaoyang liuhaoyang merged commit c9f075f into erda-project:master Sep 23, 2021
@liuhaoyang
Copy link
Contributor

/cherry-pick release/1.3

@erda-bot
Copy link
Member

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

Auto-merging modules/msp/menu/menu.service.go
CONFLICT (content): Merge conflict in modules/msp/menu/menu.service.go
diff --cc modules/msp/menu/menu.service.go
index a48b8fc1,eac6a3cf..00000000
--- a/modules/msp/menu/menu.service.go
+++ b/modules/msp/menu/menu.service.go
@@@ -117,8 -117,7 +117,12 @@@ func (s *menuService) GetMenu(ctx conte
  		menuMap := make(map[string]*pb.MenuItem)
  		for _, item := range items {
  			isK8s := clusterInfo.IsK8S() || (!splitEDAS && clusterInfo.IsEDAS())
++<<<<<<< HEAD
 +			if item.EnName == "EnvironmentSet" || item.EnName == "AppMonitor" {
 +				fmt.Println(item.EnName, isK8s)
++=======
+ 			if item.EnName == "EnvironmentSet" {
++>>>>>>> c9f075f5 (fix the bug of AppMonitor just have two options (#2077))
  				for _, child := range item.Children {
  					child.Params = item.Params
  					// 反转exists字段,隐藏引导页,显示功能子菜单

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix msp microsevice platform
Development

Successfully merging this pull request may close these issues.

3 participants