public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Connections: Stop using dataConnectionsConsole feature toggle (#72111)

Browse Source 
* remove dataConnectionsConsole feature toggle

* fix imports

* reintroduce dataConnectionsConsole

To prevent breaking change
This commit is contained in:
mikkancso
2023-07-24 10:54:52 +02:00
committed by GitHub
parent 84f94cdc24
commit b08271da32
8 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/navtree/navtreeimpl/applinks_test.go
-2
View File
@@ -294,7 +294,6 @@ func TestAddAppLinks(t *testing.T) {
})
t.Run("Should replace page from plugin", func(t *testing.T) {
service.features = featuremgmt.WithFeatures(featuremgmt.FlagDataConnectionsConsole)
service.navigationAppConfig = map[string]NavigationAppConfig{}
service.navigationAppPathConfig = map[string]NavigationAppConfig{
"/connections/add-new-connection": {SectionID: "connections"},
@@ -334,7 +333,6 @@ func TestAddAppLinks(t *testing.T) {
})
t.Run("Should not register pages under the app plugin section unless AddToNav=true", func(t *testing.T) {
service.features = featuremgmt.WithFeatures(featuremgmt.FlagDataConnectionsConsole)
service.navigationAppPathConfig = map[string]NavigationAppConfig{} // We don't configure it as a standalone plugin page
treeRoot := navtree.NavTreeRoot{}
pkg/services/navtree/navtreeimpl/navtree.go
+2 -4
View File
@@ -142,10 +142,8 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere
}
}
if s.features.IsEnabled(featuremgmt.FlagDataConnectionsConsole) {
if connectionsSection := s.buildDataConnectionsNavLink(c); connectionsSection != nil {
treeRoot.AddSection(connectionsSection)
}
if connectionsSection := s.buildDataConnectionsNavLink(c); connectionsSection != nil {
treeRoot.AddSection(connectionsSection)
}
orgAdminNode, err := s.getAdminNode(c)