mirror of
https://github.com/grafana/grafana.git
synced 2025-02-11 08:05: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>
209 lines
7.2 KiB
TypeScript
209 lines
7.2 KiB
TypeScript
import { serializeStateToUrlParam } from '@grafana/data/src/utils/url';
|
|
import { exploreReducer, navigateToExplore, splitCloseAction } from './main';
|
|
import { thunkTester } from 'test/core/thunk/thunkTester';
|
|
import { PanelModel } from 'app/features/dashboard/state';
|
|
import { MockDataSourceApi } from '../../../../test/mocks/datasource_srv';
|
|
import { ExploreId, ExploreItemState, ExploreState } from '../../../types';
|
|
import { reducerTester } from '../../../../test/core/redux/reducerTester';
|
|
import { ExploreUrlState } from '@grafana/data';
|
|
import { locationService } from '@grafana/runtime';
|
|
|
|
const getNavigateToExploreContext = async (openInNewWindow?: (url: string) => void) => {
|
|
const url = '/explore';
|
|
const panel: Partial<PanelModel> = {
|
|
datasource: 'mocked datasource',
|
|
targets: [{ refId: 'A' }],
|
|
};
|
|
const datasource = new MockDataSourceApi(panel.datasource!);
|
|
const get = jest.fn().mockResolvedValue(datasource);
|
|
const getDataSourceSrv = jest.fn().mockReturnValue({ get });
|
|
const getTimeSrv = jest.fn();
|
|
const getExploreUrl = jest.fn().mockResolvedValue(url);
|
|
|
|
const dispatchedActions = await thunkTester({})
|
|
.givenThunk(navigateToExplore)
|
|
.whenThunkIsDispatched(panel, { getDataSourceSrv, getTimeSrv, getExploreUrl, openInNewWindow });
|
|
|
|
return {
|
|
url,
|
|
panel,
|
|
datasource,
|
|
get,
|
|
getDataSourceSrv,
|
|
getTimeSrv,
|
|
getExploreUrl,
|
|
dispatchedActions,
|
|
};
|
|
};
|
|
|
|
describe('navigateToExplore', () => {
|
|
describe('when navigateToExplore thunk is dispatched', () => {
|
|
describe('and openInNewWindow is undefined', () => {
|
|
const openInNewWindow: (url: string) => void = (undefined as unknown) as (url: string) => void;
|
|
it('then it should dispatch correct actions', async () => {
|
|
const { url } = await getNavigateToExploreContext(openInNewWindow);
|
|
expect(locationService.getLocation().pathname).toEqual(url);
|
|
});
|
|
|
|
it('then getDataSourceSrv should have been once', async () => {
|
|
const { getDataSourceSrv } = await getNavigateToExploreContext(openInNewWindow);
|
|
|
|
expect(getDataSourceSrv).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('then getDataSourceSrv.get should have been called with correct arguments', async () => {
|
|
const { get, panel } = await getNavigateToExploreContext(openInNewWindow);
|
|
|
|
expect(get).toHaveBeenCalledTimes(1);
|
|
expect(get).toHaveBeenCalledWith(panel.datasource);
|
|
});
|
|
|
|
it('then getTimeSrv should have been called once', async () => {
|
|
const { getTimeSrv } = await getNavigateToExploreContext(openInNewWindow);
|
|
|
|
expect(getTimeSrv).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('then getExploreUrl should have been called with correct arguments', async () => {
|
|
const { getExploreUrl, panel, datasource, getDataSourceSrv, getTimeSrv } = await getNavigateToExploreContext(
|
|
openInNewWindow
|
|
);
|
|
|
|
expect(getExploreUrl).toHaveBeenCalledTimes(1);
|
|
expect(getExploreUrl).toHaveBeenCalledWith({
|
|
panel,
|
|
panelTargets: panel.targets,
|
|
panelDatasource: datasource,
|
|
datasourceSrv: getDataSourceSrv(),
|
|
timeSrv: getTimeSrv(),
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('and openInNewWindow is defined', () => {
|
|
const openInNewWindow: (url: string) => void = jest.fn();
|
|
it('then it should dispatch no actions', async () => {
|
|
const { dispatchedActions } = await getNavigateToExploreContext(openInNewWindow);
|
|
|
|
expect(dispatchedActions).toEqual([]);
|
|
});
|
|
|
|
it('then getDataSourceSrv should have been once', async () => {
|
|
const { getDataSourceSrv } = await getNavigateToExploreContext(openInNewWindow);
|
|
|
|
expect(getDataSourceSrv).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('then getDataSourceSrv.get should have been called with correct arguments', async () => {
|
|
const { get, panel } = await getNavigateToExploreContext(openInNewWindow);
|
|
|
|
expect(get).toHaveBeenCalledTimes(1);
|
|
expect(get).toHaveBeenCalledWith(panel.datasource);
|
|
});
|
|
|
|
it('then getTimeSrv should have been called once', async () => {
|
|
const { getTimeSrv } = await getNavigateToExploreContext(openInNewWindow);
|
|
|
|
expect(getTimeSrv).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('then getExploreUrl should have been called with correct arguments', async () => {
|
|
const { getExploreUrl, panel, datasource, getDataSourceSrv, getTimeSrv } = await getNavigateToExploreContext(
|
|
openInNewWindow
|
|
);
|
|
|
|
expect(getExploreUrl).toHaveBeenCalledTimes(1);
|
|
expect(getExploreUrl).toHaveBeenCalledWith({
|
|
panel,
|
|
panelTargets: panel.targets,
|
|
panelDatasource: datasource,
|
|
datasourceSrv: getDataSourceSrv(),
|
|
timeSrv: getTimeSrv(),
|
|
});
|
|
});
|
|
|
|
it('then openInNewWindow should have been called with correct arguments', async () => {
|
|
const openInNewWindowFunc = jest.fn();
|
|
const { url } = await getNavigateToExploreContext(openInNewWindowFunc);
|
|
|
|
expect(openInNewWindowFunc).toHaveBeenCalledTimes(1);
|
|
expect(openInNewWindowFunc).toHaveBeenCalledWith(url);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('Explore reducer', () => {
|
|
describe('split view', () => {
|
|
describe('split close', () => {
|
|
it('should keep right pane as left when left is closed', () => {
|
|
const leftItemMock = ({
|
|
containerWidth: 100,
|
|
} as unknown) as ExploreItemState;
|
|
|
|
const rightItemMock = ({
|
|
containerWidth: 200,
|
|
} as unknown) as ExploreItemState;
|
|
|
|
const initialState = ({
|
|
left: leftItemMock,
|
|
right: rightItemMock,
|
|
} as unknown) as ExploreState;
|
|
|
|
// closing left item
|
|
reducerTester<ExploreState>()
|
|
.givenReducer(exploreReducer, initialState)
|
|
.whenActionIsDispatched(splitCloseAction({ itemId: ExploreId.left }))
|
|
.thenStateShouldEqual(({
|
|
left: rightItemMock,
|
|
right: undefined,
|
|
} as unknown) as ExploreState);
|
|
});
|
|
it('should reset right pane when it is closed ', () => {
|
|
const leftItemMock = ({
|
|
containerWidth: 100,
|
|
} as unknown) as ExploreItemState;
|
|
|
|
const rightItemMock = ({
|
|
containerWidth: 200,
|
|
} as unknown) as ExploreItemState;
|
|
|
|
const initialState = ({
|
|
left: leftItemMock,
|
|
right: rightItemMock,
|
|
} as unknown) as ExploreState;
|
|
|
|
// closing left item
|
|
reducerTester<ExploreState>()
|
|
.givenReducer(exploreReducer, initialState)
|
|
.whenActionIsDispatched(splitCloseAction({ itemId: ExploreId.right }))
|
|
.thenStateShouldEqual(({
|
|
left: leftItemMock,
|
|
right: undefined,
|
|
} as unknown) as ExploreState);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
export const setup = (urlStateOverrides?: any) => {
|
|
const urlStateDefaults: ExploreUrlState = {
|
|
datasource: 'some-datasource',
|
|
queries: [],
|
|
range: {
|
|
from: '',
|
|
to: '',
|
|
},
|
|
};
|
|
const urlState: ExploreUrlState = { ...urlStateDefaults, ...urlStateOverrides };
|
|
const serializedUrlState = serializeStateToUrlParam(urlState);
|
|
const initialState = ({
|
|
split: false,
|
|
} as unknown) as ExploreState;
|
|
|
|
return {
|
|
initialState,
|
|
serializedUrlState,
|
|
};
|
|
};
|