diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 321204d99cf..9daebc6cba5 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -249,7 +249,7 @@ var ( }, { Name: "dataConnectionsConsole", - Description: "Enables a new top-level page called Data Connections. This page is an experiment for better grouping of installing / configuring data sources and other plugins.", + Description: "Enables a new top-level page called Connections. This page is an experiment for better grouping of installing / configuring data sources and other plugins.", State: FeatureStateAlpha, }, { diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index c280a2a41a1..c306652d70f 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -184,7 +184,7 @@ const ( FlagLogRequestsInstrumentedAsUnknown = "logRequestsInstrumentedAsUnknown" // FlagDataConnectionsConsole - // Enables a new top-level page called Data Connections. This page is an experiment for better grouping of installing / configuring data sources and other plugins. + // Enables a new top-level page called Connections. This page is an experiment for better grouping of installing / configuring data sources and other plugins. FlagDataConnectionsConsole = "dataConnectionsConsole" // FlagInternationalization diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go index c280fa05e9e..64cd3320be1 100644 --- a/pkg/services/navtree/navtreeimpl/navtree.go +++ b/pkg/services/navtree/navtreeimpl/navtree.go @@ -508,7 +508,7 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *models.ReqContext) *navtree var children []*navtree.NavLink var navLink *navtree.NavLink - baseId := "data-connections" + baseId := "connections" baseUrl := s.cfg.AppSubURL + "/" + baseId children = append(children, &navtree.NavLink{ @@ -536,7 +536,7 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *models.ReqContext) *navtree }) navLink = &navtree.NavLink{ - Text: "Data Connections", + Text: "Connections", Icon: "link", Id: baseId, Url: baseUrl, diff --git a/public/app/features/data-connections/DataConnectionsPage.test.tsx b/public/app/features/connections/ConnectionsPage.test.tsx similarity index 94% rename from public/app/features/data-connections/DataConnectionsPage.test.tsx rename to public/app/features/connections/ConnectionsPage.test.tsx index c23ab82a0aa..7e1c33fa469 100644 --- a/public/app/features/data-connections/DataConnectionsPage.test.tsx +++ b/public/app/features/connections/ConnectionsPage.test.tsx @@ -8,7 +8,7 @@ import { getMockDataSources } from 'app/features/datasources/__mocks__'; import * as api from 'app/features/datasources/api'; import { configureStore } from 'app/store/configureStore'; -import DataConnectionsPage from './DataConnectionsPage'; +import ConnectionsPage from './ConnectionsPage'; import { navIndex } from './__mocks__/store.navIndex.mock'; import { ROUTE_BASE_ID, ROUTES } from './constants'; @@ -22,13 +22,13 @@ const renderPage = (path = `/${ROUTE_BASE_ID}`): RenderResult => { return render( - + ); }; -describe('Data Connections Page', () => { +describe('Connections Page', () => { const mockDatasources = getMockDataSources(3); beforeEach(() => { diff --git a/public/app/features/data-connections/DataConnectionsPage.tsx b/public/app/features/connections/ConnectionsPage.tsx similarity index 97% rename from public/app/features/data-connections/DataConnectionsPage.tsx rename to public/app/features/connections/ConnectionsPage.tsx index d8ed4a78f51..410e4eebf28 100644 --- a/public/app/features/data-connections/DataConnectionsPage.tsx +++ b/public/app/features/connections/ConnectionsPage.tsx @@ -12,7 +12,7 @@ import { CloudIntegrations } from './tabs/CloudIntegrations'; import { DataSourcesEdit } from './tabs/DataSourcesEdit'; import { Plugins } from './tabs/Plugins'; -export default function DataConnectionsPage() { +export default function ConnectionsPage() { const navModel = useNavModel(); return ( diff --git a/public/app/features/data-connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/__mocks__/store.navIndex.mock.ts similarity index 95% rename from public/app/features/data-connections/__mocks__/store.navIndex.mock.ts rename to public/app/features/connections/__mocks__/store.navIndex.mock.ts index ca393c9f96e..7ce642f2493 100644 --- a/public/app/features/data-connections/__mocks__/store.navIndex.mock.ts +++ b/public/app/features/connections/__mocks__/store.navIndex.mock.ts @@ -1210,224 +1210,224 @@ export const navIndex: NavIndex = { ], }, }, - 'data-connections': { - id: 'data-connections', - text: 'Data Connections', + connections: { + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', active: false, }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', active: false, }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', active: true, }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', active: false, }, ], }, - 'data-connections-datasources': { - id: 'data-connections-datasources', + 'connections-datasources': { + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, }, - 'data-connections-plugins': { - id: 'data-connections-plugins', + 'connections-plugins': { + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, }, - 'data-connections-cloud-integrations': { - id: 'data-connections-cloud-integrations', + 'connections-cloud-integrations': { + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, }, - 'data-connections-recorded-queries': { - id: 'data-connections-recorded-queries', + 'connections-recorded-queries': { + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, diff --git a/public/app/features/connections/constants.ts b/public/app/features/connections/constants.ts new file mode 100644 index 00000000000..e609bd6d929 --- /dev/null +++ b/public/app/features/connections/constants.ts @@ -0,0 +1,14 @@ +// The ID of the app plugin that we render under that "Cloud Integrations" tab +export const CLOUD_ONBOARDING_APP_ID = 'grafana-easystart-app'; + +// The ID of the main nav-tree item (the main item in the NavIndex) +export const ROUTE_BASE_ID = 'connections'; + +export const ROUTES = { + DataSources: `/${ROUTE_BASE_ID}/datasources`, + DataSourcesNew: `/${ROUTE_BASE_ID}/datasources/new`, + DataSourcesEdit: `/${ROUTE_BASE_ID}/datasources/edit/:uid`, + DataSourcesDashboards: `/${ROUTE_BASE_ID}/datasources/edit/:uid/dashboards`, + Plugins: `/${ROUTE_BASE_ID}/plugins`, + CloudIntegrations: `/${ROUTE_BASE_ID}/cloud-integrations`, +} as const; diff --git a/public/app/features/data-connections/hooks/useNavModel.ts b/public/app/features/connections/hooks/useNavModel.ts similarity index 91% rename from public/app/features/data-connections/hooks/useNavModel.ts rename to public/app/features/connections/hooks/useNavModel.ts index f3aa6be0a9d..3b85563fafb 100644 --- a/public/app/features/data-connections/hooks/useNavModel.ts +++ b/public/app/features/connections/hooks/useNavModel.ts @@ -14,7 +14,7 @@ export const useNavModel = () => { const node = navIndex[ROUTE_BASE_ID]; const main = node; const isDefaultRoute = (item: NavModelItem) => - currentPath === `/${ROUTE_BASE_ID}` && item.id === 'data-connections-datasources'; + currentPath === `/${ROUTE_BASE_ID}` && item.id === 'connections-datasources'; const isItemActive = (item: NavModelItem) => currentPath.startsWith(item.url || ''); main.children = main.children?.map((item) => ({ diff --git a/public/app/features/data-connections/routes.tsx b/public/app/features/connections/routes.tsx similarity index 90% rename from public/app/features/data-connections/routes.tsx rename to public/app/features/connections/routes.tsx index 5366ec53caa..db117d9a784 100644 --- a/public/app/features/data-connections/routes.tsx +++ b/public/app/features/connections/routes.tsx @@ -11,7 +11,7 @@ export function getRoutes(): RouteDescriptor[] { path: `/${ROUTE_BASE_ID}`, exact: false, component: SafeDynamicImport( - () => import(/* webpackChunkName: "DataConnectionsPage"*/ 'app/features/data-connections/DataConnectionsPage') + () => import(/* webpackChunkName: "DataConnectionsPage"*/ 'app/features/connections/ConnectionsPage') ), }, ]; diff --git a/public/app/features/data-connections/tabs/CloudIntegrations/CloudIntegrations.tsx b/public/app/features/connections/tabs/CloudIntegrations/CloudIntegrations.tsx similarity index 100% rename from public/app/features/data-connections/tabs/CloudIntegrations/CloudIntegrations.tsx rename to public/app/features/connections/tabs/CloudIntegrations/CloudIntegrations.tsx diff --git a/public/app/features/data-connections/tabs/CloudIntegrations/index.tsx b/public/app/features/connections/tabs/CloudIntegrations/index.tsx similarity index 100% rename from public/app/features/data-connections/tabs/CloudIntegrations/index.tsx rename to public/app/features/connections/tabs/CloudIntegrations/index.tsx diff --git a/public/app/features/data-connections/tabs/DataSourcesEdit/DataSourcesEdit.tsx b/public/app/features/connections/tabs/DataSourcesEdit/DataSourcesEdit.tsx similarity index 100% rename from public/app/features/data-connections/tabs/DataSourcesEdit/DataSourcesEdit.tsx rename to public/app/features/connections/tabs/DataSourcesEdit/DataSourcesEdit.tsx diff --git a/public/app/features/data-connections/tabs/DataSourcesEdit/index.tsx b/public/app/features/connections/tabs/DataSourcesEdit/index.tsx similarity index 100% rename from public/app/features/data-connections/tabs/DataSourcesEdit/index.tsx rename to public/app/features/connections/tabs/DataSourcesEdit/index.tsx diff --git a/public/app/features/data-connections/tabs/Plugins/Plugins.tsx b/public/app/features/connections/tabs/Plugins/Plugins.tsx similarity index 100% rename from public/app/features/data-connections/tabs/Plugins/Plugins.tsx rename to public/app/features/connections/tabs/Plugins/Plugins.tsx diff --git a/public/app/features/data-connections/tabs/Plugins/index.tsx b/public/app/features/connections/tabs/Plugins/index.tsx similarity index 100% rename from public/app/features/data-connections/tabs/Plugins/index.tsx rename to public/app/features/connections/tabs/Plugins/index.tsx diff --git a/public/app/features/data-connections/constants.ts b/public/app/features/data-connections/constants.ts deleted file mode 100644 index 7b97dcb6707..00000000000 --- a/public/app/features/data-connections/constants.ts +++ /dev/null @@ -1,14 +0,0 @@ -// The ID of the app plugin that we render under that "Cloud Integrations" tab -export const CLOUD_ONBOARDING_APP_ID = 'grafana-easystart-app'; - -// The ID of the main nav-tree item (the main item in the NavIndex) -export const ROUTE_BASE_ID = 'data-connections'; - -export enum ROUTES { - DataSources = '/data-connections/datasources', - DataSourcesNew = '/data-connections/datasources/new', - DataSourcesEdit = '/data-connections/datasources/edit/:uid', - DataSourcesDashboards = '/data-connections/datasources/edit/:uid/dashboards', - Plugins = '/data-connections/plugins', - CloudIntegrations = '/data-connections/cloud-integrations', -} diff --git a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts index 276be9dc342..73374cab1a3 100644 --- a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts +++ b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts @@ -1210,220 +1210,220 @@ export const navIndex: NavIndex = { ], }, }, - 'data-connections': { - id: 'data-connections', - text: 'Data Connections', + connections: { + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, - 'data-connections-datasources': { - id: 'data-connections-datasources', + 'connections-datasources': { + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, }, - 'data-connections-plugins': { - id: 'data-connections-plugins', + 'connections-plugins': { + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, }, - 'data-connections-cloud-integrations': { - id: 'data-connections-cloud-integrations', + 'connections-cloud-integrations': { + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, }, - 'data-connections-recorded-queries': { - id: 'data-connections-recorded-queries', + 'connections-recorded-queries': { + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', parentItem: { - id: 'data-connections', - text: 'Data Connections', + id: 'connections', + text: 'Connections', section: NavSection.Core, icon: 'link', - url: '/data-connections', + url: '/connections', sortWeight: -1500, children: [ { - id: 'data-connections-datasources', + id: 'connections-datasources', text: 'Data sources', description: 'Add and configure data sources', icon: 'database', - url: '/data-connections/datasources', + url: '/connections/datasources', }, { - id: 'data-connections-plugins', + id: 'connections-plugins', text: 'Plugins', description: 'Manage plugins', icon: 'plug', - url: '/data-connections/plugins', + url: '/connections/plugins', }, { - id: 'data-connections-cloud-integrations', + id: 'connections-cloud-integrations', text: 'Cloud integrations', description: 'Manage your cloud integrations', icon: 'bolt', - url: '/data-connections/cloud-integrations', + url: '/connections/cloud-integrations', }, { - id: 'data-connections-recorded-queries', + id: 'connections-recorded-queries', text: 'Recorded queries', description: 'Manage your recorded queries', icon: 'record-audio', - url: '/data-connections/recorded-queries', + url: '/connections/recorded-queries', }, ], }, diff --git a/public/app/features/datasources/state/contexts.ts b/public/app/features/datasources/state/contexts.ts index 8153c3f4610..df94279c2f5 100644 --- a/public/app/features/datasources/state/contexts.ts +++ b/public/app/features/datasources/state/contexts.ts @@ -4,5 +4,5 @@ import { DATASOURCES_ROUTES } from '../constants'; import { DataSourcesRoutes } from '../types'; // The purpose of this context is to be able to override the data-sources routes (used for links for example) used under -// the app/features/datasources modules, so we can reuse them more easily in different parts of the application (e.g. under Data Connections) +// the app/features/datasources modules, so we can reuse them more easily in different parts of the application (e.g. under Connections) export const DataSourcesRoutesContext = createContext(DATASOURCES_ROUTES); diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx index fb7d0a0474e..7b8e0e4213d 100644 --- a/public/app/routes/routes.tsx +++ b/public/app/routes/routes.tsx @@ -9,7 +9,7 @@ import { contextSrv } from 'app/core/services/context_srv'; import UserAdminPage from 'app/features/admin/UserAdminPage'; import LdapPage from 'app/features/admin/ldap/LdapPage'; import { getAlertingRoutes } from 'app/features/alerting/routes'; -import { getRoutes as getDataConnectionsRoutes } from 'app/features/data-connections/routes'; +import { getRoutes as getDataConnectionsRoutes } from 'app/features/connections/routes'; import { DATASOURCES_ROUTES } from 'app/features/datasources/constants'; import { getLiveRoutes } from 'app/features/live/pages/routes'; import { getRoutes as getPluginCatalogRoutes } from 'app/features/plugins/admin/routes';