IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugin Admin App: make the catalog look like internal component (#34341)

Browse Source 
* Allow Route component usage in app plugins

* i tried

* fix catalog app

* fix catalog app

* fix catalog app

* cleanup imports

* plugin catalog enabled to plugin admin

* rename plugin catalog to plugin admin

* expose catalog url

* update text

* import from react-router-dom

* fix imports -- add logging

* merge changes

* avoid onNavUpdate

* Fixed onNavChange issues

* fix library imports

* more links

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
This commit is contained in:
Ryan McKinley
2021-05-20 01:42:26 -07:00
committed by GitHub
parent 95ee5f01b5
commit a91edd7267
56 changed files with 316 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/tests/testinfra/testinfra.go
View File

@@ -233,10 +233,10 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
_, err = anonSect.NewKey("enabled", "false")
require.NoError(t, err)
}
if o.CatalogAppEnabled {
if o.PluginAdminEnabled {
anonSect, err := cfg.NewSection("plugins")
require.NoError(t, err)
_, err = anonSect.NewKey("catalog_app_enabled", "true")
_, err = anonSect.NewKey("plugin_admin_enabled", "true")
require.NoError(t, err)
}
}
@@ -257,5 +257,5 @@ type GrafanaOpts struct {
AnonymousUserRole models.RoleType
EnableQuota bool
DisableAnonymous bool
CatalogAppEnabled bool
PluginAdminEnabled bool
}