2021-08-19 06:38:31 +02:00
|
|
|
import { lastValueFrom } from 'rxjs';
|
2021-05-14 09:50:49 -05:00
|
|
|
import { DataSourcePluginMeta, DataSourceSettings, locationUtil } from '@grafana/data';
|
|
|
|
|
import { DataSourceWithBackend, getDataSourceSrv, locationService } from '@grafana/runtime';
|
|
|
|
|
import { updateNavIndex } from 'app/core/actions';
|
2020-01-23 20:37:20 -05:00
|
|
|
import { getBackendSrv } from 'app/core/services/backend_srv';
|
2018-11-07 14:28:44 -08:00
|
|
|
import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
|
2019-05-13 22:55:49 -07:00
|
|
|
import { importDataSourcePlugin } from 'app/features/plugins/plugin_loader';
|
2021-11-19 13:42:26 +01:00
|
|
|
import { getPluginSettings } from 'app/features/plugins/pluginSettings';
|
2021-05-14 09:50:49 -05:00
|
|
|
import { DataSourcePluginCategory, ThunkDispatch, ThunkResult } from 'app/types';
|
|
|
|
|
|
|
|
|
|
import { buildCategories } from './buildCategories';
|
|
|
|
|
import { buildNavModel } from './navModel';
|
2020-01-13 08:03:22 +01:00
|
|
|
import {
|
|
|
|
|
dataSourceLoaded,
|
|
|
|
|
dataSourceMetaLoaded,
|
|
|
|
|
dataSourcePluginsLoad,
|
|
|
|
|
dataSourcePluginsLoaded,
|
|
|
|
|
dataSourcesLoaded,
|
2020-01-23 20:37:20 -05:00
|
|
|
initDataSourceSettingsFailed,
|
|
|
|
|
initDataSourceSettingsSucceeded,
|
2021-05-14 09:50:49 -05:00
|
|
|
testDataSourceFailed,
|
2020-01-23 20:37:20 -05:00
|
|
|
testDataSourceStarting,
|
|
|
|
|
testDataSourceSucceeded,
|
2020-01-13 08:03:22 +01:00
|
|
|
} from './reducers';
|
2020-01-23 20:37:20 -05:00
|
|
|
import { getDataSource, getDataSourceMeta } from './selectors';
|
2022-01-19 11:27:45 +01:00
|
|
|
import { accessControlQueryParam } from 'app/core/utils/accessControl';
|
2018-09-28 11:05:34 +02:00
|
|
|
|
2020-01-06 16:56:34 +01:00
|
|
|
export interface DataSourceTypesLoadedPayload {
|
|
|
|
|
plugins: DataSourcePluginMeta[];
|
|
|
|
|
categories: DataSourcePluginCategory[];
|
|
|
|
|
}
|
2018-09-28 11:05:34 +02:00
|
|
|
|
2020-01-23 20:37:20 -05:00
|
|
|
export interface InitDataSourceSettingDependencies {
|
|
|
|
|
loadDataSource: typeof loadDataSource;
|
2021-10-08 12:31:43 +02:00
|
|
|
loadDataSourceMeta: typeof loadDataSourceMeta;
|
2020-01-23 20:37:20 -05:00
|
|
|
getDataSource: typeof getDataSource;
|
|
|
|
|
getDataSourceMeta: typeof getDataSourceMeta;
|
|
|
|
|
importDataSourcePlugin: typeof importDataSourcePlugin;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-03 09:07:50 -05:00
|
|
|
export interface TestDataSourceDependencies {
|
|
|
|
|
getDatasourceSrv: typeof getDataSourceSrv;
|
|
|
|
|
getBackendSrv: typeof getBackendSrv;
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-23 20:37:20 -05:00
|
|
|
export const initDataSourceSettings = (
|
2021-05-08 09:13:26 -07:00
|
|
|
pageId: string,
|
2020-01-23 20:37:20 -05:00
|
|
|
dependencies: InitDataSourceSettingDependencies = {
|
|
|
|
|
loadDataSource,
|
2021-10-08 12:31:43 +02:00
|
|
|
loadDataSourceMeta,
|
2020-01-23 20:37:20 -05:00
|
|
|
getDataSource,
|
|
|
|
|
getDataSourceMeta,
|
|
|
|
|
importDataSourcePlugin,
|
|
|
|
|
}
|
|
|
|
|
): ThunkResult<void> => {
|
2021-05-08 09:13:26 -07:00
|
|
|
return async (dispatch, getState) => {
|
|
|
|
|
if (!pageId) {
|
2020-01-23 20:37:20 -05:00
|
|
|
dispatch(initDataSourceSettingsFailed(new Error('Invalid ID')));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
try {
|
2021-10-08 12:31:43 +02:00
|
|
|
const loadedDataSource = await dispatch(dependencies.loadDataSource(pageId));
|
|
|
|
|
await dispatch(dependencies.loadDataSourceMeta(loadedDataSource));
|
2021-05-08 09:13:26 -07:00
|
|
|
|
|
|
|
|
// have we already loaded the plugin then we can skip the steps below?
|
2020-01-23 20:37:20 -05:00
|
|
|
if (getState().dataSourceSettings.plugin) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const dataSource = dependencies.getDataSource(getState().dataSources, pageId);
|
2020-07-08 11:05:20 +02:00
|
|
|
const dataSourceMeta = dependencies.getDataSourceMeta(getState().dataSources, dataSource!.type);
|
2020-01-23 20:37:20 -05:00
|
|
|
const importedPlugin = await dependencies.importDataSourcePlugin(dataSourceMeta);
|
|
|
|
|
|
|
|
|
|
dispatch(initDataSourceSettingsSucceeded(importedPlugin));
|
|
|
|
|
} catch (err) {
|
|
|
|
|
dispatch(initDataSourceSettingsFailed(err));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
2020-02-03 09:07:50 -05:00
|
|
|
export const testDataSource = (
|
|
|
|
|
dataSourceName: string,
|
|
|
|
|
dependencies: TestDataSourceDependencies = {
|
|
|
|
|
getDatasourceSrv,
|
|
|
|
|
getBackendSrv,
|
|
|
|
|
}
|
|
|
|
|
): ThunkResult<void> => {
|
2020-01-23 20:37:20 -05:00
|
|
|
return async (dispatch: ThunkDispatch, getState) => {
|
2020-02-03 09:07:50 -05:00
|
|
|
const dsApi = await dependencies.getDatasourceSrv().get(dataSourceName);
|
2020-01-23 20:37:20 -05:00
|
|
|
|
|
|
|
|
if (!dsApi.testDatasource) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dispatch(testDataSourceStarting());
|
|
|
|
|
|
2020-02-03 09:07:50 -05:00
|
|
|
dependencies.getBackendSrv().withNoBackendCache(async () => {
|
2020-01-23 20:37:20 -05:00
|
|
|
try {
|
|
|
|
|
const result = await dsApi.testDatasource();
|
|
|
|
|
|
|
|
|
|
dispatch(testDataSourceSucceeded(result));
|
|
|
|
|
} catch (err) {
|
2021-07-08 14:32:27 +02:00
|
|
|
const { statusText, message: errMessage, details, data } = err;
|
|
|
|
|
|
|
|
|
|
const message = errMessage || data?.message || 'HTTP error ' + statusText;
|
2020-01-23 20:37:20 -05:00
|
|
|
|
2021-04-08 13:32:12 +01:00
|
|
|
dispatch(testDataSourceFailed({ message, details }));
|
2020-01-23 20:37:20 -05:00
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
2018-09-28 11:05:34 +02:00
|
|
|
export function loadDataSources(): ThunkResult<void> {
|
2021-01-20 07:59:48 +01:00
|
|
|
return async (dispatch) => {
|
2018-09-28 11:05:34 +02:00
|
|
|
const response = await getBackendSrv().get('/api/datasources');
|
2019-01-31 06:38:40 +01:00
|
|
|
dispatch(dataSourcesLoaded(response));
|
2018-09-28 11:05:34 +02:00
|
|
|
};
|
|
|
|
|
}
|
2018-10-02 16:50:34 +02:00
|
|
|
|
2021-10-08 12:31:43 +02:00
|
|
|
export function loadDataSource(uid: string): ThunkResult<Promise<DataSourceSettings>> {
|
2021-01-20 07:59:48 +01:00
|
|
|
return async (dispatch) => {
|
2021-05-08 09:13:26 -07:00
|
|
|
const dataSource = await getDataSourceUsingUidOrId(uid);
|
2021-10-08 12:31:43 +02:00
|
|
|
|
|
|
|
|
dispatch(dataSourceLoaded(dataSource));
|
|
|
|
|
return dataSource;
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export function loadDataSourceMeta(dataSource: DataSourceSettings): ThunkResult<void> {
|
|
|
|
|
return async (dispatch) => {
|
2019-04-29 09:14:39 -07:00
|
|
|
const pluginInfo = (await getPluginSettings(dataSource.type)) as DataSourcePluginMeta;
|
2019-05-13 22:55:49 -07:00
|
|
|
const plugin = await importDataSourcePlugin(pluginInfo);
|
2021-05-14 09:50:49 -05:00
|
|
|
const isBackend = plugin.DataSourceClass.prototype instanceof DataSourceWithBackend;
|
|
|
|
|
const meta = {
|
|
|
|
|
...pluginInfo,
|
2021-11-17 06:05:39 -05:00
|
|
|
isBackend: pluginInfo.backend || isBackend,
|
2021-05-14 09:50:49 -05:00
|
|
|
};
|
2021-10-08 12:31:43 +02:00
|
|
|
|
2021-05-14 09:50:49 -05:00
|
|
|
dispatch(dataSourceMetaLoaded(meta));
|
|
|
|
|
|
|
|
|
|
plugin.meta = meta;
|
2019-05-13 22:55:49 -07:00
|
|
|
dispatch(updateNavIndex(buildNavModel(dataSource, plugin)));
|
2018-10-08 14:09:02 +02:00
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-08 09:13:26 -07:00
|
|
|
/**
|
|
|
|
|
* Get data source by uid or id, if old id detected handles redirect
|
|
|
|
|
*/
|
2021-09-14 09:24:18 -04:00
|
|
|
export async function getDataSourceUsingUidOrId(uid: string | number): Promise<DataSourceSettings> {
|
2021-05-08 09:13:26 -07:00
|
|
|
// Try first with uid api
|
|
|
|
|
try {
|
2021-08-19 06:38:31 +02:00
|
|
|
const byUid = await lastValueFrom(
|
|
|
|
|
getBackendSrv().fetch<DataSourceSettings>({
|
2021-05-08 09:13:26 -07:00
|
|
|
method: 'GET',
|
2022-01-19 11:27:45 +01:00
|
|
|
url: `/api/datasources/uid/${uid}`,
|
|
|
|
|
params: accessControlQueryParam(),
|
2021-05-08 09:13:26 -07:00
|
|
|
showErrorAlert: false,
|
|
|
|
|
})
|
2021-08-19 06:38:31 +02:00
|
|
|
);
|
2021-05-08 09:13:26 -07:00
|
|
|
|
|
|
|
|
if (byUid.ok) {
|
|
|
|
|
return byUid.data;
|
|
|
|
|
}
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.log('Failed to lookup data source by uid', err);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// try lookup by old db id
|
2021-09-14 09:24:18 -04:00
|
|
|
const id = typeof uid === 'string' ? parseInt(uid, 10) : uid;
|
2021-05-08 09:13:26 -07:00
|
|
|
if (!Number.isNaN(id)) {
|
2021-08-19 06:38:31 +02:00
|
|
|
const response = await lastValueFrom(
|
|
|
|
|
getBackendSrv().fetch<DataSourceSettings>({
|
2021-05-08 09:13:26 -07:00
|
|
|
method: 'GET',
|
2022-01-19 11:27:45 +01:00
|
|
|
url: `/api/datasources/${id}`,
|
|
|
|
|
params: accessControlQueryParam(),
|
2021-05-08 09:13:26 -07:00
|
|
|
showErrorAlert: false,
|
|
|
|
|
})
|
2021-08-19 06:38:31 +02:00
|
|
|
);
|
2021-05-08 09:13:26 -07:00
|
|
|
|
2021-09-14 09:24:18 -04:00
|
|
|
// If the uid is a number, then this is a refresh on one of the settings tabs
|
|
|
|
|
// and we can return the response data
|
|
|
|
|
if (response.ok && typeof uid === 'number' && response.data.id === uid) {
|
|
|
|
|
return response.data;
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-14 09:50:49 -05:00
|
|
|
// Not ideal to do a full page reload here but so tricky to handle this
|
|
|
|
|
// otherwise We can update the location using react router, but need to
|
|
|
|
|
// fully reload the route as the nav model page index is not matching with
|
|
|
|
|
// the url in that case. And react router has no way to unmount remount a
|
|
|
|
|
// route
|
2021-05-08 09:13:26 -07:00
|
|
|
if (response.ok && response.data.id.toString() === uid) {
|
|
|
|
|
window.location.href = locationUtil.assureBaseUrl(`/datasources/edit/${response.data.uid}`);
|
|
|
|
|
return {} as DataSourceSettings; // avoids flashing an error
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
throw Error('Could not find data source');
|
|
|
|
|
}
|
|
|
|
|
|
2019-04-29 09:14:39 -07:00
|
|
|
export function addDataSource(plugin: DataSourcePluginMeta): ThunkResult<void> {
|
2018-10-05 11:33:41 +02:00
|
|
|
return async (dispatch, getStore) => {
|
2018-10-06 19:22:16 +02:00
|
|
|
await dispatch(loadDataSources());
|
2018-10-05 11:33:41 +02:00
|
|
|
|
2018-10-06 19:22:16 +02:00
|
|
|
const dataSources = getStore().dataSources.dataSources;
|
2018-10-05 11:33:41 +02:00
|
|
|
|
2018-10-06 19:22:16 +02:00
|
|
|
const newInstance = {
|
|
|
|
|
name: plugin.name,
|
|
|
|
|
type: plugin.id,
|
|
|
|
|
access: 'proxy',
|
|
|
|
|
isDefault: dataSources.length === 0,
|
|
|
|
|
};
|
2018-10-05 11:33:41 +02:00
|
|
|
|
2018-10-06 19:22:16 +02:00
|
|
|
if (nameExits(dataSources, newInstance.name)) {
|
|
|
|
|
newInstance.name = findNewName(dataSources, newInstance.name);
|
2018-10-05 11:33:41 +02:00
|
|
|
}
|
|
|
|
|
|
2018-10-06 19:22:16 +02:00
|
|
|
const result = await getBackendSrv().post('/api/datasources', newInstance);
|
2022-01-24 10:45:05 +01:00
|
|
|
await getDatasourceSrv().reload();
|
2021-05-08 09:13:26 -07:00
|
|
|
locationService.push(`/datasources/edit/${result.datasource.uid}`);
|
2018-10-03 09:56:15 +02:00
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-06 16:56:34 +01:00
|
|
|
export function loadDataSourcePlugins(): ThunkResult<void> {
|
2021-01-20 07:59:48 +01:00
|
|
|
return async (dispatch) => {
|
2020-01-06 16:56:34 +01:00
|
|
|
dispatch(dataSourcePluginsLoad());
|
|
|
|
|
const plugins = await getBackendSrv().get('/api/plugins', { enabled: 1, type: 'datasource' });
|
|
|
|
|
const categories = buildCategories(plugins);
|
|
|
|
|
dispatch(dataSourcePluginsLoaded({ plugins, categories }));
|
2018-10-02 16:50:34 +02:00
|
|
|
};
|
|
|
|
|
}
|
2018-10-05 11:33:41 +02:00
|
|
|
|
2019-01-17 18:51:07 +01:00
|
|
|
export function updateDataSource(dataSource: DataSourceSettings): ThunkResult<void> {
|
2021-01-20 07:59:48 +01:00
|
|
|
return async (dispatch) => {
|
2021-05-08 09:13:26 -07:00
|
|
|
await getBackendSrv().put(`/api/datasources/${dataSource.id}`, dataSource); // by UID not yet supported
|
2022-01-24 10:45:05 +01:00
|
|
|
await getDatasourceSrv().reload();
|
2021-05-08 09:13:26 -07:00
|
|
|
return dispatch(loadDataSource(dataSource.uid));
|
2018-10-31 14:28:16 +01:00
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export function deleteDataSource(): ThunkResult<void> {
|
|
|
|
|
return async (dispatch, getStore) => {
|
|
|
|
|
const dataSource = getStore().dataSources.dataSource;
|
Routing NG: Replace Angular routing with react-router (#31463)
* Add router packages
* Get react app root work instead of Angular one
* Logger util
* Patch Angular routing ($routeProvider, $routeParamsProvider)
* Use react-router-dom history instead of separate dependency
* Add test routes
* Sidemenu - use Link instead of anchors
* Patch Angular $location service (stub)
* WIP: geting rid of $location provider from TimeSrv
* Intercept anchor clicks to use history under the hood
* Sync Redux location slice with history state
* Make login/logout work
* Debug routes for testing
* Make force login work
* Make sure query param change does not recreate page components
* Hide side menu in specified locations
* Make the dashboar route query parameters work, make panel edit menu work
* Enable more routes
* Fix side menu
* Handle view modes
* Disable playlist routes
* Make SafeDynamicImport work again
* Bring back router-debug
* Separate redux location sync from route rendering
* Refactor updateLocation to thunk and move force refresh(login) to it
* Fixing init dashboard issue
* Support switching between dashboards without an unmount of DashboardPage
* More fixes for init dashboard and panel edit
* More type fixes
* Moving angular location wrapper out of main LocationService, and fixing typescript issues
* Fixed last typescript errors
* LocationService: Move to runtime and remove getLocationService and export singleston const instead (#31523)
* Moving location service implementation to runtime and removing get function and making it a package const singleton
* Added test that used locationService directly
* removed unused import
* AngularApp: Moving angular dependencies and the app boot out of the main app into it's own file (#31525)
* Fixes angular panels by calling the monkey patch
* Moving angular stuff to to it's own files
* udpated
* Fixing clicking on divs and spans inside anchor
* Moving app notifications out of angular app and removing angular directive wrapper
* Moving search from angular to react and removing angular search wrapper
* Clean up, tried to remove the redux location wrapper but requires a big update for DashboardPage, so adding it back
* Moving AppWrapper to root to limit circular dependencies (app/core -> app/routing and back)
* Open and close search now works
* Hide sidemenu when in kiosk mode
* Restoring some keybindings like ESC key
* Removed kiosk events and simplified it, just handled through updating URL
* Fixing typescript errors
* Simplified GrafanaRouteComponentProps and renamed to ContainerProps
* renamed back
* Changed AlertRuleList to use GrafanaRouteComponentProps and location.search passed to it
* Removing the reloadOnSearch property, this is not needed now for react as react by default does not unmount components when only url match or query parmas change
* SafeDynamicImport causing unmount un every search update, not sure how to fix yet
* Fix signature for SafeDynamicImport so we do not create new route components on every route render
* Removing the redux location wrapper as it was causing errors, and making dashboard page work with RouteProps (location, match) etc
* Updating DashboardPage and SoloPanelPage to use match params and history location
* Fixed DashboardPage tests
* Fixing solo route tests
* LocationService: Rename getCurrentLocation to just getLocation
* do not intercept link clicks with target blank or self
* Experimental useUrlParams hook
* Update DataSourceSettingsPage to use router match params
* fix links with urls that have no starting / to work like before
* Fix forceLogin
* Add queryParams to GrafanaRouteComponentProps
* PanelEditor get rid of updateLocation and location state
* Improve grafana route query params typing
* Add getSearchObject to LocationService
* Use DashboardPAge queryParams instead of location.search parsing
* Fix DashboardPage typing
* Fix some tests weirdness
* Bring back KeyboardSrv
* Fixes typescript issues
* Team pages now use router match params
* Get rid of from GrafanaRouteComponent props
* Removed unnessary calls to getSearchObject when calling locationService.partial
* Updated DashboardPage tests after queryParams was added
* Fixing dashboard settings back
* GrafanaRoute: Adding tests and remove use of global locationService
* Fixing tests and typescript errors
* Bring back kiosk modes and add tests
* Fix TimeSrv tests
* Fix typecheck errors
* Fixing tests
* Updated SideMenu test to react-testing and wrapped component in Router, and fixed issue importing createMemoryHistory
* Get rid of routeChange event from TimeSrv from
* Fixed TopSectionItem test
* Trying to make basename work but failing
* Update TopSectionItem snapshot
* Fix TopSectionItem snapshot test
* Fix API keys creation
* Remove Angular dependencies from KeybindingSrv (#31617)
* Remove Angular dependency from KeybindingsSrv
* Fix tests and typecheck issues
* basename is starting to work
* Make dashboard save work
* KeybindingSrv: Remove as angular service and no usage angular scope
* So long bridge_srv, we won't miss you
* Update snapshots
* Dashboard: Refactoring ChangeTracker to use History api and no angular (#31653)
* Dashboard: Refactoring ChangeTracker to use History api and no angular
* Updated
* Removed logging
* fixed unit tests
* updated snapshots
* Mechanism for force reloading routes (#31683)
* e2e: Fixes various things in e2e scenarios after router migration (#31685)
* Explore: Update reading query params from router props and updating location via locationService (ReactRouter) (#31688)
* RoutingNG: Initial explore redux location to router location migration
* Updated explore Wrapper tests
* Fixing more tests
* remove loggin
* rename back to make naming consistent
* Fixing return to dashboard button
* fixing navigation to explore from dashboard
* updated routeProps
* Updated tests
* Make DashboardListPage work
* Fixing navigation after add new data source, and fixes explore e2e
* Fixing solo panel page
* PluginsPage now works
* RoutingNG: When parsing and rendering url search/query params preseve old logic of handling booleans and arrays (#31725)
* RoutingNG: When parsing and rendering url search/query params preserve old logic of handling booleans and arrays
* Fixed test
* Make snapshots list work
* fixed alert notification channel edit page
* Simplify LocationService, did not need special handling for login or forceLogin as target _self on link already handles that
* fixed UserAdminPage
* fixed edit orgs page
* Fixing LdapPage
* fixing dashboard import
* Fixed new folder page
* Fixed data source dashboards page
* fixing Folder permissions and folder settings page
* fixing snapshot list page nav model
* remove unused file
* Added placeholder page for playlist
* Moved browser compatability to index-template
* Restored 404/default page
* Fixed reset password page
* Fixed SignUpInvited page
* Fixing CreateTeam, Create user page, add panel widget
* Restore browwser file to make tests happy
* Fixed unit tests
* Removed unused import
* Replacing usage of updateLocation
* Fixed test
* Updating search filters to use history / location service for filters
* remove unused file
* AppRootPage fixed
* Fixing test and search issue
* Changes to support enterprise extensions
* remove console.log
* Removing more use of redux location
* Fixed signup page
* removed unused old angular controllers
* Fixing bugs
* one final bugfix
* Removed location from redux state
* Fixing ts issues and tests
* Fixing test issue
* fixing tests
* Fixing tests
* removed unused stuff
* Fixed search test
* Adding some doc comments
* Routing NG: Angular location provider patch (#31773)
* Patch Angulars $location provider
* Update public/app/angular/bridgeReactAngularRouting.ts
* Remove only test
* Update tests, disable loggers in test env
* Routing NG: remove $location provider usage (#31816)
* Remove dashboard_loaders
* Remove $location from Analytics service, track page views form GrafanaRoute
* Remove NotificationsEditCtrl
* Remove Angular dependencies from uploadDashboardDirective
* Update public/app/features/dashboard/containers/DashboardPage.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Update public/app/features/dashboard/containers/DashboardPage.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Remove unused test helpers (#31831)
* Playlist react (#31829)
* playlist list in react
* Playlist start
* Things started to work
* Updated
* Handle empty list
* Fix ts
* Fixes and kiosk mode stuff
* Removed unused events
* fixing ts issue
* Another ts issue
* Fixing tests
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* fixed test
* Update public/app/AppWrapper.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Update public/app/AppWrapper.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Remove Angular dependency from DashboardLoaderSrv (#31863)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
2021-03-10 18:03:36 +01:00
|
|
|
|
2018-10-31 14:28:16 +01:00
|
|
|
await getBackendSrv().delete(`/api/datasources/${dataSource.id}`);
|
2022-01-24 10:45:05 +01:00
|
|
|
await getDatasourceSrv().reload();
|
Routing NG: Replace Angular routing with react-router (#31463)
* Add router packages
* Get react app root work instead of Angular one
* Logger util
* Patch Angular routing ($routeProvider, $routeParamsProvider)
* Use react-router-dom history instead of separate dependency
* Add test routes
* Sidemenu - use Link instead of anchors
* Patch Angular $location service (stub)
* WIP: geting rid of $location provider from TimeSrv
* Intercept anchor clicks to use history under the hood
* Sync Redux location slice with history state
* Make login/logout work
* Debug routes for testing
* Make force login work
* Make sure query param change does not recreate page components
* Hide side menu in specified locations
* Make the dashboar route query parameters work, make panel edit menu work
* Enable more routes
* Fix side menu
* Handle view modes
* Disable playlist routes
* Make SafeDynamicImport work again
* Bring back router-debug
* Separate redux location sync from route rendering
* Refactor updateLocation to thunk and move force refresh(login) to it
* Fixing init dashboard issue
* Support switching between dashboards without an unmount of DashboardPage
* More fixes for init dashboard and panel edit
* More type fixes
* Moving angular location wrapper out of main LocationService, and fixing typescript issues
* Fixed last typescript errors
* LocationService: Move to runtime and remove getLocationService and export singleston const instead (#31523)
* Moving location service implementation to runtime and removing get function and making it a package const singleton
* Added test that used locationService directly
* removed unused import
* AngularApp: Moving angular dependencies and the app boot out of the main app into it's own file (#31525)
* Fixes angular panels by calling the monkey patch
* Moving angular stuff to to it's own files
* udpated
* Fixing clicking on divs and spans inside anchor
* Moving app notifications out of angular app and removing angular directive wrapper
* Moving search from angular to react and removing angular search wrapper
* Clean up, tried to remove the redux location wrapper but requires a big update for DashboardPage, so adding it back
* Moving AppWrapper to root to limit circular dependencies (app/core -> app/routing and back)
* Open and close search now works
* Hide sidemenu when in kiosk mode
* Restoring some keybindings like ESC key
* Removed kiosk events and simplified it, just handled through updating URL
* Fixing typescript errors
* Simplified GrafanaRouteComponentProps and renamed to ContainerProps
* renamed back
* Changed AlertRuleList to use GrafanaRouteComponentProps and location.search passed to it
* Removing the reloadOnSearch property, this is not needed now for react as react by default does not unmount components when only url match or query parmas change
* SafeDynamicImport causing unmount un every search update, not sure how to fix yet
* Fix signature for SafeDynamicImport so we do not create new route components on every route render
* Removing the redux location wrapper as it was causing errors, and making dashboard page work with RouteProps (location, match) etc
* Updating DashboardPage and SoloPanelPage to use match params and history location
* Fixed DashboardPage tests
* Fixing solo route tests
* LocationService: Rename getCurrentLocation to just getLocation
* do not intercept link clicks with target blank or self
* Experimental useUrlParams hook
* Update DataSourceSettingsPage to use router match params
* fix links with urls that have no starting / to work like before
* Fix forceLogin
* Add queryParams to GrafanaRouteComponentProps
* PanelEditor get rid of updateLocation and location state
* Improve grafana route query params typing
* Add getSearchObject to LocationService
* Use DashboardPAge queryParams instead of location.search parsing
* Fix DashboardPage typing
* Fix some tests weirdness
* Bring back KeyboardSrv
* Fixes typescript issues
* Team pages now use router match params
* Get rid of from GrafanaRouteComponent props
* Removed unnessary calls to getSearchObject when calling locationService.partial
* Updated DashboardPage tests after queryParams was added
* Fixing dashboard settings back
* GrafanaRoute: Adding tests and remove use of global locationService
* Fixing tests and typescript errors
* Bring back kiosk modes and add tests
* Fix TimeSrv tests
* Fix typecheck errors
* Fixing tests
* Updated SideMenu test to react-testing and wrapped component in Router, and fixed issue importing createMemoryHistory
* Get rid of routeChange event from TimeSrv from
* Fixed TopSectionItem test
* Trying to make basename work but failing
* Update TopSectionItem snapshot
* Fix TopSectionItem snapshot test
* Fix API keys creation
* Remove Angular dependencies from KeybindingSrv (#31617)
* Remove Angular dependency from KeybindingsSrv
* Fix tests and typecheck issues
* basename is starting to work
* Make dashboard save work
* KeybindingSrv: Remove as angular service and no usage angular scope
* So long bridge_srv, we won't miss you
* Update snapshots
* Dashboard: Refactoring ChangeTracker to use History api and no angular (#31653)
* Dashboard: Refactoring ChangeTracker to use History api and no angular
* Updated
* Removed logging
* fixed unit tests
* updated snapshots
* Mechanism for force reloading routes (#31683)
* e2e: Fixes various things in e2e scenarios after router migration (#31685)
* Explore: Update reading query params from router props and updating location via locationService (ReactRouter) (#31688)
* RoutingNG: Initial explore redux location to router location migration
* Updated explore Wrapper tests
* Fixing more tests
* remove loggin
* rename back to make naming consistent
* Fixing return to dashboard button
* fixing navigation to explore from dashboard
* updated routeProps
* Updated tests
* Make DashboardListPage work
* Fixing navigation after add new data source, and fixes explore e2e
* Fixing solo panel page
* PluginsPage now works
* RoutingNG: When parsing and rendering url search/query params preseve old logic of handling booleans and arrays (#31725)
* RoutingNG: When parsing and rendering url search/query params preserve old logic of handling booleans and arrays
* Fixed test
* Make snapshots list work
* fixed alert notification channel edit page
* Simplify LocationService, did not need special handling for login or forceLogin as target _self on link already handles that
* fixed UserAdminPage
* fixed edit orgs page
* Fixing LdapPage
* fixing dashboard import
* Fixed new folder page
* Fixed data source dashboards page
* fixing Folder permissions and folder settings page
* fixing snapshot list page nav model
* remove unused file
* Added placeholder page for playlist
* Moved browser compatability to index-template
* Restored 404/default page
* Fixed reset password page
* Fixed SignUpInvited page
* Fixing CreateTeam, Create user page, add panel widget
* Restore browwser file to make tests happy
* Fixed unit tests
* Removed unused import
* Replacing usage of updateLocation
* Fixed test
* Updating search filters to use history / location service for filters
* remove unused file
* AppRootPage fixed
* Fixing test and search issue
* Changes to support enterprise extensions
* remove console.log
* Removing more use of redux location
* Fixed signup page
* removed unused old angular controllers
* Fixing bugs
* one final bugfix
* Removed location from redux state
* Fixing ts issues and tests
* Fixing test issue
* fixing tests
* Fixing tests
* removed unused stuff
* Fixed search test
* Adding some doc comments
* Routing NG: Angular location provider patch (#31773)
* Patch Angulars $location provider
* Update public/app/angular/bridgeReactAngularRouting.ts
* Remove only test
* Update tests, disable loggers in test env
* Routing NG: remove $location provider usage (#31816)
* Remove dashboard_loaders
* Remove $location from Analytics service, track page views form GrafanaRoute
* Remove NotificationsEditCtrl
* Remove Angular dependencies from uploadDashboardDirective
* Update public/app/features/dashboard/containers/DashboardPage.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Update public/app/features/dashboard/containers/DashboardPage.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Remove unused test helpers (#31831)
* Playlist react (#31829)
* playlist list in react
* Playlist start
* Things started to work
* Updated
* Handle empty list
* Fix ts
* Fixes and kiosk mode stuff
* Removed unused events
* fixing ts issue
* Another ts issue
* Fixing tests
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* fixed test
* Update public/app/AppWrapper.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Update public/app/AppWrapper.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Remove Angular dependency from DashboardLoaderSrv (#31863)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
2021-03-10 18:03:36 +01:00
|
|
|
|
|
|
|
|
locationService.push('/datasources');
|
2018-10-31 14:28:16 +01:00
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-02 21:26:30 -07:00
|
|
|
interface ItemWithName {
|
|
|
|
|
name: string;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export function nameExits(dataSources: ItemWithName[], name: string) {
|
2018-10-05 11:33:41 +02:00
|
|
|
return (
|
2021-01-20 07:59:48 +01:00
|
|
|
dataSources.filter((dataSource) => {
|
2018-12-12 08:47:08 +01:00
|
|
|
return dataSource.name.toLowerCase() === name.toLowerCase();
|
2018-10-05 11:33:41 +02:00
|
|
|
}).length > 0
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-02 21:26:30 -07:00
|
|
|
export function findNewName(dataSources: ItemWithName[], name: string) {
|
2018-10-05 11:33:41 +02:00
|
|
|
// Need to loop through current data sources to make sure
|
|
|
|
|
// the name doesn't exist
|
|
|
|
|
while (nameExits(dataSources, name)) {
|
|
|
|
|
// If there's a duplicate name that doesn't end with '-x'
|
|
|
|
|
// we can add -1 to the name and be done.
|
|
|
|
|
if (!nameHasSuffix(name)) {
|
|
|
|
|
name = `${name}-1`;
|
|
|
|
|
} else {
|
|
|
|
|
// if there's a duplicate name that ends with '-x'
|
|
|
|
|
// we can try to increment the last digit until the name is unique
|
|
|
|
|
|
|
|
|
|
// remove the 'x' part and replace it with the new number
|
|
|
|
|
name = `${getNewName(name)}${incrementLastDigit(getLastDigit(name))}`;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return name;
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-02 21:26:30 -07:00
|
|
|
function nameHasSuffix(name: string) {
|
2018-10-05 11:33:41 +02:00
|
|
|
return name.endsWith('-', name.length - 1);
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-02 21:26:30 -07:00
|
|
|
function getLastDigit(name: string) {
|
2018-10-05 11:33:41 +02:00
|
|
|
return parseInt(name.slice(-1), 10);
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-02 21:26:30 -07:00
|
|
|
function incrementLastDigit(digit: number) {
|
2018-10-05 11:33:41 +02:00
|
|
|
return isNaN(digit) ? 1 : digit + 1;
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-02 21:26:30 -07:00
|
|
|
function getNewName(name: string) {
|
2018-10-05 11:33:41 +02:00
|
|
|
return name.slice(0, name.length - 1);
|
|
|
|
|
}
|