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

refactor: rename Data Connections to Connections (#56353)

Browse Source
This commit is contained in:
Levente Balogh 2022-10-05 09:56:58 +02:00 committed by GitHub
parent b1b3f9e24c
commit ae5e8bc53b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 162 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/featuremgmt/registry.go
View File

@ -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,
},
{

2
pkg/services/featuremgmt/toggles_gen.go
View File

@ -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

4
pkg/services/navtree/navtreeimpl/navtree.go
View File

@ -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,

6
public/app/features/data-connections/DataConnectionsPage.test.tsx → public/app/features/connections/ConnectionsPage.test.tsx
View File

@ -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(
<Provider store={store}>
<Router history={locationService.getHistory()}>
<DataConnectionsPage />
<ConnectionsPage />
</Router>
</Provider>
);
};
describe('Data Connections Page', () => {
describe('Connections Page', () => {
const mockDatasources = getMockDataSources(3);
beforeEach(() => {

2
public/app/features/data-connections/DataConnectionsPage.tsx → public/app/features/connections/ConnectionsPage.tsx
View File

@ -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 (

136
public/app/features/data-connections/__mocks__/store.navIndex.mock.ts → public/app/features/connections/__mocks__/store.navIndex.mock.ts
View File

@ -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',
},
],
},

14
public/app/features/connections/constants.ts Normal file
View File

@ -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;

2
public/app/features/data-connections/hooks/useNavModel.ts → public/app/features/connections/hooks/useNavModel.ts
View File

@ -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) => ({

2
public/app/features/data-connections/routes.tsx → public/app/features/connections/routes.tsx
View File

@ -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')
),
},
];

0
public/app/features/data-connections/tabs/CloudIntegrations/CloudIntegrations.tsx → public/app/features/connections/tabs/CloudIntegrations/CloudIntegrations.tsx
View File

0
public/app/features/data-connections/tabs/CloudIntegrations/index.tsx → public/app/features/connections/tabs/CloudIntegrations/index.tsx
View File

0
public/app/features/data-connections/tabs/DataSourcesEdit/DataSourcesEdit.tsx → public/app/features/connections/tabs/DataSourcesEdit/DataSourcesEdit.tsx
View File

0
public/app/features/data-connections/tabs/DataSourcesEdit/index.tsx → public/app/features/connections/tabs/DataSourcesEdit/index.tsx
View File

0
public/app/features/data-connections/tabs/Plugins/Plugins.tsx → public/app/features/connections/tabs/Plugins/Plugins.tsx
View File

0
public/app/features/data-connections/tabs/Plugins/index.tsx → public/app/features/connections/tabs/Plugins/index.tsx
View File

14
public/app/features/data-connections/constants.ts
View File

@ -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',
}

136
public/app/features/datasources/__mocks__/store.navIndex.mock.ts
View File

@ -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',
},
],
},

2
public/app/features/datasources/state/contexts.ts
View File

@ -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<DataSourcesRoutes>(DATASOURCES_ROUTES);

2
public/app/routes/routes.tsx
View File

@ -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';