mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 08:35:43 -06:00
* 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>
375 lines
12 KiB
TypeScript
375 lines
12 KiB
TypeScript
import React from 'react';
|
|
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
|
|
import Wrapper from './Wrapper';
|
|
import { configureStore } from '../../store/configureStore';
|
|
import { Provider } from 'react-redux';
|
|
import { locationService, setDataSourceSrv } from '@grafana/runtime';
|
|
import {
|
|
ArrayDataFrame,
|
|
DataQueryResponse,
|
|
DataSourceApi,
|
|
DataSourceInstanceSettings,
|
|
FieldType,
|
|
QueryEditorProps,
|
|
ScopedVars,
|
|
} from '@grafana/data';
|
|
import { selectors } from '@grafana/e2e-selectors';
|
|
|
|
import { setTimeSrv } from '../dashboard/services/TimeSrv';
|
|
import { from, Observable } from 'rxjs';
|
|
import { LokiDatasource } from '../../plugins/datasource/loki/datasource';
|
|
import { LokiQuery } from '../../plugins/datasource/loki/types';
|
|
import { fromPairs } from 'lodash';
|
|
import { EnhancedStore } from '@reduxjs/toolkit';
|
|
import userEvent from '@testing-library/user-event';
|
|
import { splitOpen } from './state/main';
|
|
import { Route, Router } from 'react-router-dom';
|
|
import { GrafanaRoute } from 'app/core/navigation/GrafanaRoute';
|
|
|
|
type Mock = jest.Mock;
|
|
|
|
jest.mock('react-virtualized-auto-sizer', () => {
|
|
return {
|
|
__esModule: true,
|
|
default(props: any) {
|
|
return <div>{props.children({ width: 1000 })}</div>;
|
|
},
|
|
};
|
|
});
|
|
|
|
describe('Wrapper', () => {
|
|
it('shows warning if there are no data sources', async () => {
|
|
setup({ datasources: [] });
|
|
// Will throw if isn't found
|
|
screen.getByText(/Explore requires at least one data source/i);
|
|
});
|
|
|
|
it('inits url and renders editor but does not call query on empty url', async () => {
|
|
const { datasources } = setup();
|
|
|
|
// Wait for rendering the editor
|
|
await screen.findByText(/Editor/i);
|
|
|
|
// At this point url should be initialised to some defaults
|
|
expect(locationService.getSearchObject()).toEqual({
|
|
orgId: 1,
|
|
left: JSON.stringify(['now-1h', 'now', 'loki', {}]),
|
|
});
|
|
expect(datasources.loki.query).not.toBeCalled();
|
|
});
|
|
|
|
it('runs query when url contains query and renders results', async () => {
|
|
const query = { left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]) };
|
|
const { datasources, store } = setup({ query });
|
|
(datasources.loki.query as Mock).mockReturnValueOnce(makeLogsQueryResponse());
|
|
|
|
// Make sure we render the logs panel
|
|
await screen.findByText(/^Logs$/i);
|
|
|
|
// Make sure we render the log line
|
|
await screen.findByText(/custom log line/i);
|
|
|
|
// And that the editor gets the expr from the url
|
|
await screen.findByText(`loki Editor input: { label="value"}`);
|
|
|
|
// We did not change the url
|
|
expect(locationService.getSearchObject()).toEqual({
|
|
orgId: 1,
|
|
...query,
|
|
});
|
|
|
|
expect(store.getState().explore.richHistory[0]).toMatchObject({
|
|
datasourceId: '1',
|
|
datasourceName: 'loki',
|
|
queries: [{ expr: '{ label="value"}' }],
|
|
});
|
|
|
|
// We called the data source query method once
|
|
expect(datasources.loki.query).toBeCalledTimes(1);
|
|
expect((datasources.loki.query as Mock).mock.calls[0][0]).toMatchObject({
|
|
targets: [{ expr: '{ label="value"}' }],
|
|
});
|
|
});
|
|
|
|
it('handles url change and runs the new query', async () => {
|
|
const query = { left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]) };
|
|
const { datasources } = setup({ query });
|
|
(datasources.loki.query as Mock).mockReturnValueOnce(makeLogsQueryResponse());
|
|
// Wait for rendering the logs
|
|
await screen.findByText(/custom log line/i);
|
|
|
|
(datasources.loki.query as Mock).mockReturnValueOnce(makeLogsQueryResponse('different log'));
|
|
|
|
locationService.partial({
|
|
left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="different"}' }]),
|
|
});
|
|
|
|
// Editor renders the new query
|
|
await screen.findByText(`loki Editor input: { label="different"}`);
|
|
// Renders new response
|
|
await screen.findByText(/different log/i);
|
|
});
|
|
|
|
it('handles url change and runs the new query with different datasource', async () => {
|
|
const query = { left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]) };
|
|
const { datasources } = setup({ query });
|
|
(datasources.loki.query as Mock).mockReturnValueOnce(makeLogsQueryResponse());
|
|
// Wait for rendering the logs
|
|
await screen.findByText(/custom log line/i);
|
|
await screen.findByText(`loki Editor input: { label="value"}`);
|
|
|
|
(datasources.elastic.query as Mock).mockReturnValueOnce(makeMetricsQueryResponse());
|
|
|
|
locationService.partial({
|
|
left: JSON.stringify(['now-1h', 'now', 'elastic', { expr: 'other query' }]),
|
|
});
|
|
|
|
// Editor renders the new query
|
|
await screen.findByText(`elastic Editor input: other query`);
|
|
// Renders graph
|
|
await screen.findByText(/Graph/i);
|
|
});
|
|
|
|
it('handles changing the datasource manually', async () => {
|
|
const query = { left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]) };
|
|
const { datasources } = setup({ query });
|
|
(datasources.loki.query as Mock).mockReturnValueOnce(makeLogsQueryResponse());
|
|
// Wait for rendering the editor
|
|
await screen.findByText(/Editor/i);
|
|
await changeDatasource('elastic');
|
|
|
|
await screen.findByText('elastic Editor input:');
|
|
expect(datasources.elastic.query).not.toBeCalled();
|
|
expect(locationService.getSearchObject()).toEqual({
|
|
orgId: 1,
|
|
left: JSON.stringify(['now-1h', 'now', 'elastic', {}]),
|
|
});
|
|
});
|
|
|
|
it('opens the split pane when split button is clicked', async () => {
|
|
setup();
|
|
// Wait for rendering the editor
|
|
const splitButton = await screen.findByText(/split/i);
|
|
fireEvent.click(splitButton);
|
|
await waitFor(() => {
|
|
const editors = screen.getAllByText('loki Editor input:');
|
|
expect(editors.length).toBe(2);
|
|
});
|
|
});
|
|
|
|
it('inits with two panes if specified in url', async () => {
|
|
const query = {
|
|
left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]),
|
|
right: JSON.stringify(['now-1h', 'now', 'elastic', { expr: 'error' }]),
|
|
};
|
|
|
|
const { datasources } = setup({ query });
|
|
(datasources.loki.query as Mock).mockReturnValueOnce(makeLogsQueryResponse());
|
|
(datasources.elastic.query as Mock).mockReturnValueOnce(makeLogsQueryResponse());
|
|
|
|
// Make sure we render the logs panel
|
|
await waitFor(() => {
|
|
const logsPanels = screen.getAllByText(/^Logs$/i);
|
|
expect(logsPanels.length).toBe(2);
|
|
});
|
|
|
|
// Make sure we render the log line
|
|
const logsLines = await screen.findAllByText(/custom log line/i);
|
|
expect(logsLines.length).toBe(2);
|
|
|
|
// And that the editor gets the expr from the url
|
|
await screen.findByText(`loki Editor input: { label="value"}`);
|
|
await screen.findByText(`elastic Editor input: error`);
|
|
|
|
// We did not change the url
|
|
expect(locationService.getSearchObject()).toEqual({
|
|
orgId: 1,
|
|
...query,
|
|
});
|
|
|
|
// We called the data source query method once
|
|
expect(datasources.loki.query).toBeCalledTimes(1);
|
|
expect((datasources.loki.query as Mock).mock.calls[0][0]).toMatchObject({
|
|
targets: [{ expr: '{ label="value"}' }],
|
|
});
|
|
|
|
expect(datasources.elastic.query).toBeCalledTimes(1);
|
|
expect((datasources.elastic.query as Mock).mock.calls[0][0]).toMatchObject({
|
|
targets: [{ expr: 'error' }],
|
|
});
|
|
});
|
|
|
|
it('can close a pane from a split', async () => {
|
|
const query = {
|
|
left: JSON.stringify(['now-1h', 'now', 'loki', {}]),
|
|
right: JSON.stringify(['now-1h', 'now', 'elastic', {}]),
|
|
};
|
|
setup({ query });
|
|
const closeButtons = await screen.findAllByTitle(/Close split pane/i);
|
|
userEvent.click(closeButtons[1]);
|
|
|
|
await waitFor(() => {
|
|
const logsPanels = screen.queryAllByTitle(/Close split pane/i);
|
|
expect(logsPanels.length).toBe(0);
|
|
});
|
|
});
|
|
|
|
it('handles url change to split view', async () => {
|
|
const query = {
|
|
left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]),
|
|
};
|
|
const { datasources } = setup({ query });
|
|
(datasources.loki.query as Mock).mockReturnValue(makeLogsQueryResponse());
|
|
(datasources.elastic.query as Mock).mockReturnValue(makeLogsQueryResponse());
|
|
|
|
locationService.partial({
|
|
left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]),
|
|
right: JSON.stringify(['now-1h', 'now', 'elastic', { expr: 'error' }]),
|
|
});
|
|
|
|
// Editor renders the new query
|
|
await screen.findByText(`loki Editor input: { label="value"}`);
|
|
await screen.findByText(`elastic Editor input: error`);
|
|
});
|
|
|
|
it('handles opening split with split open func', async () => {
|
|
const query = {
|
|
left: JSON.stringify(['now-1h', 'now', 'loki', { expr: '{ label="value"}' }]),
|
|
};
|
|
const { datasources, store } = setup({ query });
|
|
(datasources.loki.query as Mock).mockReturnValue(makeLogsQueryResponse());
|
|
(datasources.elastic.query as Mock).mockReturnValue(makeLogsQueryResponse());
|
|
|
|
// This is mainly to wait for render so that the left pane state is initialized as that is needed for splitOpen
|
|
// to work
|
|
await screen.findByText(`loki Editor input: { label="value"}`);
|
|
|
|
store.dispatch(
|
|
splitOpen<any>({ datasourceUid: 'elastic', query: { expr: 'error' } }) as any
|
|
);
|
|
|
|
// Editor renders the new query
|
|
await screen.findByText(`elastic Editor input: error`);
|
|
await screen.findByText(`loki Editor input: { label="value"}`);
|
|
});
|
|
});
|
|
|
|
type DatasourceSetup = { settings: DataSourceInstanceSettings; api: DataSourceApi };
|
|
type SetupOptions = {
|
|
datasources?: DatasourceSetup[];
|
|
query?: any;
|
|
};
|
|
function setup(options?: SetupOptions): { datasources: { [name: string]: DataSourceApi }; store: EnhancedStore } {
|
|
// Clear this up otherwise it persists data source selection
|
|
// TODO: probably add test for that too
|
|
window.localStorage.clear();
|
|
|
|
// Create this here so any mocks are recreated on setup and don't retain state
|
|
const defaultDatasources: DatasourceSetup[] = [
|
|
makeDatasourceSetup(),
|
|
makeDatasourceSetup({ name: 'elastic', id: 2 }),
|
|
];
|
|
|
|
const dsSettings = options?.datasources || defaultDatasources;
|
|
|
|
setDataSourceSrv({
|
|
getList(): DataSourceInstanceSettings[] {
|
|
return dsSettings.map((d) => d.settings);
|
|
},
|
|
getInstanceSettings(name: string) {
|
|
return dsSettings.map((d) => d.settings).find((x) => x.name === name);
|
|
},
|
|
get(name?: string | null, scopedVars?: ScopedVars): Promise<DataSourceApi> {
|
|
return Promise.resolve((name ? dsSettings.find((d) => d.api.name === name) : dsSettings[0])!.api);
|
|
},
|
|
} as any);
|
|
|
|
setTimeSrv({
|
|
init() {},
|
|
getValidIntervals(intervals: string[]): string[] {
|
|
return intervals;
|
|
},
|
|
} as any);
|
|
|
|
const store = configureStore();
|
|
store.getState().user = {
|
|
orgId: 1,
|
|
timeZone: 'utc',
|
|
};
|
|
|
|
locationService.push({ pathname: '/explore' });
|
|
|
|
if (options?.query) {
|
|
locationService.partial(options.query);
|
|
}
|
|
|
|
const route = { component: Wrapper };
|
|
|
|
render(
|
|
<Provider store={store}>
|
|
<Router history={locationService.getHistory()}>
|
|
<Route path="/explore" exact render={(props) => <GrafanaRoute {...props} route={route as any} />} />
|
|
</Router>
|
|
</Provider>
|
|
);
|
|
|
|
return { datasources: fromPairs(dsSettings.map((d) => [d.api.name, d.api])), store };
|
|
}
|
|
|
|
function makeDatasourceSetup({ name = 'loki', id = 1 }: { name?: string; id?: number } = {}): DatasourceSetup {
|
|
const meta: any = {
|
|
info: {
|
|
logos: {
|
|
small: '',
|
|
},
|
|
},
|
|
id: id.toString(),
|
|
};
|
|
return {
|
|
settings: {
|
|
id,
|
|
uid: name,
|
|
type: 'logs',
|
|
name,
|
|
meta,
|
|
jsonData: {},
|
|
},
|
|
api: {
|
|
components: {
|
|
QueryEditor(props: QueryEditorProps<LokiDatasource, LokiQuery>) {
|
|
return (
|
|
<div>
|
|
{name} Editor input: {props.query.expr}
|
|
</div>
|
|
);
|
|
},
|
|
},
|
|
name: name,
|
|
query: jest.fn(),
|
|
meta,
|
|
} as any,
|
|
};
|
|
}
|
|
|
|
function makeLogsQueryResponse(marker = ''): Observable<DataQueryResponse> {
|
|
const df = new ArrayDataFrame([{ ts: Date.now(), line: `custom log line ${marker}` }]);
|
|
df.meta = {
|
|
preferredVisualisationType: 'logs',
|
|
};
|
|
df.fields[0].type = FieldType.time;
|
|
return from([{ data: [df] }]);
|
|
}
|
|
|
|
function makeMetricsQueryResponse(): Observable<DataQueryResponse> {
|
|
const df = new ArrayDataFrame([{ ts: Date.now(), val: 1 }]);
|
|
df.fields[0].type = FieldType.time;
|
|
return from([{ data: [df] }]);
|
|
}
|
|
|
|
async function changeDatasource(name: string) {
|
|
const datasourcePicker = (await screen.findByLabelText(selectors.components.DataSourcePicker.container)).children[0];
|
|
fireEvent.keyDown(datasourcePicker, { keyCode: 40 });
|
|
const option = screen.getByText(name);
|
|
fireEvent.click(option);
|
|
}
|