mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -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>
327 lines
8.9 KiB
TypeScript
327 lines
8.9 KiB
TypeScript
import _ from 'lodash';
|
|
import { ITimeoutService } from 'angular';
|
|
import {
|
|
dateMath,
|
|
dateTime,
|
|
getDefaultTimeRange,
|
|
isDateTime,
|
|
rangeUtil,
|
|
RawTimeRange,
|
|
TimeRange,
|
|
toUtc,
|
|
} from '@grafana/data';
|
|
|
|
import coreModule from 'app/core/core_module';
|
|
import { ContextSrv } from 'app/core/services/context_srv';
|
|
import { DashboardModel } from '../state/DashboardModel';
|
|
import { getShiftedTimeRange, getZoomedTimeRange } from 'app/core/utils/timePicker';
|
|
import { appEvents } from '../../../core/core';
|
|
import { config } from 'app/core/config';
|
|
import { getRefreshFromUrl } from '../utils/getRefreshFromUrl';
|
|
import { locationService } from '@grafana/runtime';
|
|
import { ShiftTimeEvent, ShiftTimeEventPayload, ZoomOutEvent } from '../../../types/events';
|
|
|
|
export class TimeSrv {
|
|
time: any;
|
|
refreshTimer: any;
|
|
refresh: any;
|
|
oldRefresh: string | null | undefined;
|
|
dashboard: DashboardModel;
|
|
timeAtLoad: any;
|
|
private autoRefreshBlocked: boolean;
|
|
|
|
/** @ngInject */
|
|
constructor(private $timeout: ITimeoutService, private timer: any, private contextSrv: ContextSrv) {
|
|
// default time
|
|
this.time = getDefaultTimeRange().raw;
|
|
this.refreshDashboard = this.refreshDashboard.bind(this);
|
|
appEvents.subscribe(ZoomOutEvent, (e) => {
|
|
this.zoomOut(e.payload);
|
|
});
|
|
appEvents.subscribe(ShiftTimeEvent, (e) => {
|
|
this.shiftTime(e.payload);
|
|
});
|
|
|
|
document.addEventListener('visibilitychange', () => {
|
|
if (this.autoRefreshBlocked && document.visibilityState === 'visible') {
|
|
this.autoRefreshBlocked = false;
|
|
this.refreshDashboard();
|
|
}
|
|
});
|
|
}
|
|
|
|
init(dashboard: DashboardModel) {
|
|
this.timer.cancelAll();
|
|
|
|
this.dashboard = dashboard;
|
|
this.time = dashboard.time;
|
|
this.refresh = dashboard.refresh;
|
|
|
|
this.initTimeFromUrl();
|
|
this.parseTime();
|
|
|
|
// remember time at load so we can go back to it
|
|
this.timeAtLoad = _.cloneDeep(this.time);
|
|
|
|
if (this.refresh) {
|
|
this.setAutoRefresh(this.refresh);
|
|
}
|
|
}
|
|
|
|
getValidIntervals(intervals: string[]): string[] {
|
|
if (!this.contextSrv.minRefreshInterval) {
|
|
return intervals;
|
|
}
|
|
|
|
return intervals.filter((str) => str !== '').filter(this.contextSrv.isAllowedInterval);
|
|
}
|
|
|
|
private parseTime() {
|
|
// when absolute time is saved in json it is turned to a string
|
|
if (_.isString(this.time.from) && this.time.from.indexOf('Z') >= 0) {
|
|
this.time.from = dateTime(this.time.from).utc();
|
|
}
|
|
if (_.isString(this.time.to) && this.time.to.indexOf('Z') >= 0) {
|
|
this.time.to = dateTime(this.time.to).utc();
|
|
}
|
|
}
|
|
|
|
private parseUrlParam(value: any) {
|
|
if (value.indexOf('now') !== -1) {
|
|
return value;
|
|
}
|
|
if (value.length === 8) {
|
|
const utcValue = toUtc(value, 'YYYYMMDD');
|
|
if (utcValue.isValid()) {
|
|
return utcValue;
|
|
}
|
|
} else if (value.length === 15) {
|
|
const utcValue = toUtc(value, 'YYYYMMDDTHHmmss');
|
|
if (utcValue.isValid()) {
|
|
return utcValue;
|
|
}
|
|
}
|
|
|
|
if (!isNaN(value)) {
|
|
const epoch = parseInt(value, 10);
|
|
return toUtc(epoch);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
private getTimeWindow(time: string, timeWindow: string) {
|
|
const valueTime = parseInt(time, 10);
|
|
let timeWindowMs;
|
|
|
|
if (timeWindow.match(/^\d+$/) && parseInt(timeWindow, 10)) {
|
|
// when time window specified in ms
|
|
timeWindowMs = parseInt(timeWindow, 10);
|
|
} else {
|
|
timeWindowMs = rangeUtil.intervalToMs(timeWindow);
|
|
}
|
|
|
|
return {
|
|
from: toUtc(valueTime - timeWindowMs / 2),
|
|
to: toUtc(valueTime + timeWindowMs / 2),
|
|
};
|
|
}
|
|
|
|
private initTimeFromUrl() {
|
|
const params = locationService.getSearch();
|
|
|
|
if (params.get('time') && params.get('time.window')) {
|
|
this.time = this.getTimeWindow(params.get('time')!, params.get('time.window')!);
|
|
}
|
|
|
|
if (params.get('from')) {
|
|
this.time.from = this.parseUrlParam(params.get('from')!) || this.time.from;
|
|
}
|
|
|
|
if (params.get('to')) {
|
|
this.time.to = this.parseUrlParam(params.get('to')!) || this.time.to;
|
|
}
|
|
|
|
// if absolute ignore refresh option saved to dashboard
|
|
if (params.get('to') && params.get('to')!.indexOf('now') === -1) {
|
|
this.refresh = false;
|
|
this.dashboard.refresh = false;
|
|
}
|
|
|
|
let paramsJSON: Record<string, string> = {};
|
|
params.forEach(function (value, key) {
|
|
paramsJSON[key] = value;
|
|
});
|
|
|
|
// but if refresh explicitly set then use that
|
|
this.refresh = getRefreshFromUrl({
|
|
params: paramsJSON,
|
|
currentRefresh: this.refresh,
|
|
refreshIntervals: this.dashboard?.timepicker?.refresh_intervals,
|
|
isAllowedIntervalFn: this.contextSrv.isAllowedInterval,
|
|
minRefreshInterval: config.minRefreshInterval,
|
|
});
|
|
}
|
|
|
|
updateTimeRangeFromUrl() {
|
|
const params = locationService.getSearch();
|
|
|
|
if (params.get('left')) {
|
|
return; // explore handles this;
|
|
}
|
|
|
|
const urlRange = this.timeRangeForUrl();
|
|
const from = params.get('from');
|
|
const to = params.get('to');
|
|
|
|
// check if url has time range
|
|
if (from && to) {
|
|
// is it different from what our current time range?
|
|
if (from !== urlRange.from || to !== urlRange.to) {
|
|
// issue update
|
|
this.initTimeFromUrl();
|
|
this.setTime(this.time, true);
|
|
}
|
|
} else if (this.timeHasChangedSinceLoad()) {
|
|
this.setTime(this.timeAtLoad, true);
|
|
}
|
|
}
|
|
|
|
private timeHasChangedSinceLoad() {
|
|
return this.timeAtLoad && (this.timeAtLoad.from !== this.time.from || this.timeAtLoad.to !== this.time.to);
|
|
}
|
|
|
|
setAutoRefresh(interval: any) {
|
|
this.dashboard.refresh = interval;
|
|
this.cancelNextRefresh();
|
|
|
|
if (interval) {
|
|
const validInterval = this.contextSrv.getValidInterval(interval);
|
|
const intervalMs = rangeUtil.intervalToMs(validInterval);
|
|
|
|
this.refreshTimer = this.timer.register(
|
|
this.$timeout(() => {
|
|
this.startNextRefreshTimer(intervalMs);
|
|
this.refreshDashboard();
|
|
}, intervalMs)
|
|
);
|
|
}
|
|
|
|
if (interval) {
|
|
const refresh = this.contextSrv.getValidInterval(interval);
|
|
locationService.partial({ refresh }, true);
|
|
} else {
|
|
locationService.partial({ refresh: null }, true);
|
|
}
|
|
}
|
|
|
|
refreshDashboard() {
|
|
this.dashboard.timeRangeUpdated(this.timeRange());
|
|
}
|
|
|
|
private startNextRefreshTimer(afterMs: number) {
|
|
this.cancelNextRefresh();
|
|
this.refreshTimer = this.timer.register(
|
|
this.$timeout(() => {
|
|
this.startNextRefreshTimer(afterMs);
|
|
if (this.contextSrv.isGrafanaVisible()) {
|
|
this.refreshDashboard();
|
|
} else {
|
|
this.autoRefreshBlocked = true;
|
|
}
|
|
}, afterMs)
|
|
);
|
|
}
|
|
|
|
private cancelNextRefresh() {
|
|
this.timer.cancel(this.refreshTimer);
|
|
}
|
|
|
|
setTime(time: RawTimeRange, fromRouteUpdate?: boolean) {
|
|
_.extend(this.time, time);
|
|
|
|
// disable refresh if zoom in or zoom out
|
|
if (isDateTime(time.to)) {
|
|
this.oldRefresh = this.dashboard.refresh || this.oldRefresh;
|
|
this.setAutoRefresh(false);
|
|
} else if (this.oldRefresh && this.oldRefresh !== this.dashboard.refresh) {
|
|
this.setAutoRefresh(this.oldRefresh);
|
|
this.oldRefresh = null;
|
|
}
|
|
|
|
// update url
|
|
if (fromRouteUpdate !== true) {
|
|
const urlRange = this.timeRangeForUrl();
|
|
const urlParams = locationService.getSearch();
|
|
|
|
urlParams.set('from', urlRange.from.toString());
|
|
urlParams.set('to', urlRange.to.toString());
|
|
|
|
locationService.push({
|
|
...locationService.getLocation(),
|
|
search: urlParams.toString(),
|
|
});
|
|
}
|
|
|
|
this.refreshDashboard();
|
|
}
|
|
|
|
timeRangeForUrl = () => {
|
|
const range = this.timeRange().raw;
|
|
|
|
if (isDateTime(range.from)) {
|
|
range.from = range.from.valueOf().toString();
|
|
}
|
|
if (isDateTime(range.to)) {
|
|
range.to = range.to.valueOf().toString();
|
|
}
|
|
|
|
return range;
|
|
};
|
|
|
|
timeRange(): TimeRange {
|
|
// make copies if they are moment (do not want to return out internal moment, because they are mutable!)
|
|
const raw = {
|
|
from: isDateTime(this.time.from) ? dateTime(this.time.from) : this.time.from,
|
|
to: isDateTime(this.time.to) ? dateTime(this.time.to) : this.time.to,
|
|
};
|
|
|
|
const timezone = this.dashboard ? this.dashboard.getTimezone() : undefined;
|
|
|
|
return {
|
|
from: dateMath.parse(raw.from, false, timezone)!,
|
|
to: dateMath.parse(raw.to, true, timezone)!,
|
|
raw: raw,
|
|
};
|
|
}
|
|
|
|
zoomOut(factor: number) {
|
|
const range = this.timeRange();
|
|
const { from, to } = getZoomedTimeRange(range, factor);
|
|
|
|
this.setTime({ from: toUtc(from), to: toUtc(to) });
|
|
}
|
|
|
|
shiftTime(direction: ShiftTimeEventPayload) {
|
|
const range = this.timeRange();
|
|
const { from, to } = getShiftedTimeRange(direction, range);
|
|
|
|
this.setTime({
|
|
from: toUtc(from),
|
|
to: toUtc(to),
|
|
});
|
|
}
|
|
}
|
|
|
|
let singleton: TimeSrv;
|
|
|
|
export function setTimeSrv(srv: TimeSrv) {
|
|
singleton = srv;
|
|
}
|
|
|
|
export function getTimeSrv(): TimeSrv {
|
|
return singleton;
|
|
}
|
|
|
|
coreModule.service('timeSrv', TimeSrv);
|