mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 16:45: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>
250 lines
7.7 KiB
TypeScript
250 lines
7.7 KiB
TypeScript
import { AnyAction } from 'redux';
|
|
import { DataSourceSrv, getDataSourceSrv, locationService } from '@grafana/runtime';
|
|
import { DataQuery, ExploreUrlState, serializeStateToUrlParam, TimeRange, UrlQueryMap } from '@grafana/data';
|
|
import { GetExploreUrlArguments, stopQueryState } from 'app/core/utils/explore';
|
|
import { ExploreId, ExploreItemState, ExploreState } from 'app/types/explore';
|
|
import { paneReducer } from './explorePane';
|
|
import { createAction } from '@reduxjs/toolkit';
|
|
import { getUrlStateFromPaneState, makeExplorePaneState } from './utils';
|
|
import { ThunkResult } from '../../../types';
|
|
import { TimeSrv } from '../../dashboard/services/TimeSrv';
|
|
import { PanelModel } from 'app/features/dashboard/state';
|
|
|
|
//
|
|
// Actions and Payloads
|
|
//
|
|
|
|
export interface SyncTimesPayload {
|
|
syncedTimes: boolean;
|
|
}
|
|
export const syncTimesAction = createAction<SyncTimesPayload>('explore/syncTimes');
|
|
|
|
export const richHistoryUpdatedAction = createAction<any>('explore/richHistoryUpdated');
|
|
|
|
/**
|
|
* Resets state for explore.
|
|
*/
|
|
export interface ResetExplorePayload {
|
|
force?: boolean;
|
|
}
|
|
export const resetExploreAction = createAction<ResetExplorePayload>('explore/resetExplore');
|
|
|
|
/**
|
|
* Close the split view and save URL state.
|
|
*/
|
|
export interface SplitCloseActionPayload {
|
|
itemId: ExploreId;
|
|
}
|
|
export const splitCloseAction = createAction<SplitCloseActionPayload>('explore/splitClose');
|
|
|
|
/**
|
|
* Cleans up a pane state. Could seem like this should be in explorePane.ts actions but in case we area closing
|
|
* left pane we need to move right state to the left.
|
|
* Also this may seem redundant as we have splitClose actions which clears up state but that action is not called on
|
|
* URL change.
|
|
*/
|
|
export interface CleanupPanePayload {
|
|
exploreId: ExploreId;
|
|
}
|
|
export const cleanupPaneAction = createAction<CleanupPanePayload>('explore/cleanupPane');
|
|
|
|
//
|
|
// Action creators
|
|
//
|
|
|
|
/**
|
|
* Save local redux state back to the URL. Should be called when there is some change that should affect the URL.
|
|
* Not all of the redux state is reflected in URL though.
|
|
*/
|
|
export const stateSave = (options?: { replace?: boolean }): ThunkResult<void> => {
|
|
return (dispatch, getState) => {
|
|
const { left, right } = getState().explore;
|
|
const orgId = getState().user.orgId.toString();
|
|
const urlStates: { [index: string]: string | null } = { orgId };
|
|
|
|
urlStates.left = serializeStateToUrlParam(getUrlStateFromPaneState(left), true);
|
|
|
|
if (right) {
|
|
urlStates.right = serializeStateToUrlParam(getUrlStateFromPaneState(right), true);
|
|
} else {
|
|
urlStates.right = null;
|
|
}
|
|
|
|
lastSavedUrl.right = urlStates.right;
|
|
lastSavedUrl.left = urlStates.left;
|
|
|
|
locationService.partial({ ...urlStates }, options?.replace);
|
|
};
|
|
};
|
|
|
|
// Store the url we saved last se we are not trying to update local state based on that.
|
|
export const lastSavedUrl: UrlQueryMap = {};
|
|
|
|
/**
|
|
* Opens a new right split pane by navigating to appropriate URL. It either copies existing state of the left pane
|
|
* or uses values from options arg. This does only navigation each pane is then responsible for initialization from
|
|
* the URL.
|
|
*/
|
|
export function splitOpen<T extends DataQuery = any>(options?: {
|
|
datasourceUid: string;
|
|
query: T;
|
|
// Don't use right now. It's used for Traces to Logs interaction but is hacky in how the range is actually handled.
|
|
range?: TimeRange;
|
|
}): ThunkResult<void> {
|
|
return async (dispatch, getState) => {
|
|
const leftState: ExploreItemState = getState().explore[ExploreId.left];
|
|
const leftUrlState = getUrlStateFromPaneState(leftState);
|
|
let rightUrlState: ExploreUrlState = leftUrlState;
|
|
|
|
if (options) {
|
|
const datasourceName = getDataSourceSrv().getInstanceSettings(options.datasourceUid)?.name || '';
|
|
rightUrlState = {
|
|
datasource: datasourceName,
|
|
queries: [options.query],
|
|
range: options.range || leftState.range,
|
|
};
|
|
}
|
|
|
|
const urlState = serializeStateToUrlParam(rightUrlState, true);
|
|
locationService.partial({ right: urlState }, true);
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Close the split view and save URL state. We need to update the state here because when closing we cannot just
|
|
* update the URL and let the components handle it because if we swap panes from right to left it is not easily apparent
|
|
* from the URL.
|
|
*/
|
|
export function splitClose(itemId: ExploreId): ThunkResult<void> {
|
|
return (dispatch, getState) => {
|
|
dispatch(splitCloseAction({ itemId }));
|
|
dispatch(stateSave());
|
|
};
|
|
}
|
|
|
|
export interface NavigateToExploreDependencies {
|
|
getDataSourceSrv: () => DataSourceSrv;
|
|
getTimeSrv: () => TimeSrv;
|
|
getExploreUrl: (args: GetExploreUrlArguments) => Promise<string | undefined>;
|
|
openInNewWindow?: (url: string) => void;
|
|
}
|
|
|
|
export const navigateToExplore = (
|
|
panel: PanelModel,
|
|
dependencies: NavigateToExploreDependencies
|
|
): ThunkResult<void> => {
|
|
return async (dispatch) => {
|
|
const { getDataSourceSrv, getTimeSrv, getExploreUrl, openInNewWindow } = dependencies;
|
|
const datasourceSrv = getDataSourceSrv();
|
|
const datasource = await datasourceSrv.get(panel.datasource);
|
|
const path = await getExploreUrl({
|
|
panel,
|
|
panelTargets: panel.targets,
|
|
panelDatasource: datasource,
|
|
datasourceSrv,
|
|
timeSrv: getTimeSrv(),
|
|
});
|
|
|
|
if (openInNewWindow && path) {
|
|
openInNewWindow(path);
|
|
return;
|
|
}
|
|
|
|
locationService.push(path!);
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Global Explore state that handles multiple Explore areas and the split state
|
|
*/
|
|
const initialExploreItemState = makeExplorePaneState();
|
|
export const initialExploreState: ExploreState = {
|
|
syncedTimes: false,
|
|
left: initialExploreItemState,
|
|
right: undefined,
|
|
richHistory: [],
|
|
};
|
|
|
|
/**
|
|
* Global Explore reducer that handles multiple Explore areas (left and right).
|
|
* Actions that have an `exploreId` get routed to the ExploreItemReducer.
|
|
*/
|
|
export const exploreReducer = (state = initialExploreState, action: AnyAction): ExploreState => {
|
|
if (splitCloseAction.match(action)) {
|
|
const { itemId } = action.payload as SplitCloseActionPayload;
|
|
const targetSplit = {
|
|
left: itemId === ExploreId.left ? state.right! : state.left,
|
|
right: undefined,
|
|
};
|
|
return {
|
|
...state,
|
|
...targetSplit,
|
|
};
|
|
}
|
|
|
|
if (cleanupPaneAction.match(action)) {
|
|
const { exploreId } = action.payload as CleanupPanePayload;
|
|
if (exploreId === ExploreId.left) {
|
|
return {
|
|
...state,
|
|
[ExploreId.left]: state[ExploreId.right]!,
|
|
[ExploreId.right]: undefined,
|
|
};
|
|
} else {
|
|
return {
|
|
...state,
|
|
[ExploreId.right]: undefined,
|
|
};
|
|
}
|
|
}
|
|
|
|
if (syncTimesAction.match(action)) {
|
|
return { ...state, syncedTimes: action.payload.syncedTimes };
|
|
}
|
|
|
|
if (richHistoryUpdatedAction.match(action)) {
|
|
return {
|
|
...state,
|
|
richHistory: action.payload.richHistory,
|
|
};
|
|
}
|
|
|
|
if (resetExploreAction.match(action)) {
|
|
const payload: ResetExplorePayload = action.payload;
|
|
const leftState = state[ExploreId.left];
|
|
const rightState = state[ExploreId.right];
|
|
stopQueryState(leftState.querySubscription);
|
|
if (rightState) {
|
|
stopQueryState(rightState.querySubscription);
|
|
}
|
|
|
|
if (payload.force || !Number.isInteger(state.left.originPanelId)) {
|
|
return initialExploreState;
|
|
}
|
|
|
|
return {
|
|
...initialExploreState,
|
|
left: {
|
|
...initialExploreItemState,
|
|
queries: state.left.queries,
|
|
originPanelId: state.left.originPanelId,
|
|
},
|
|
};
|
|
}
|
|
|
|
if (action.payload) {
|
|
const { exploreId } = action.payload;
|
|
if (exploreId !== undefined) {
|
|
// @ts-ignore
|
|
const explorePaneState = state[exploreId];
|
|
return { ...state, [exploreId]: paneReducer(explorePaneState, action as any) };
|
|
}
|
|
}
|
|
|
|
return state;
|
|
};
|
|
|
|
export default {
|
|
explore: exploreReducer,
|
|
};
|