mirror of
https://github.com/grafana/grafana.git
synced 2025-02-15 10:03:33 -06:00
* Refactor: Adds variables in state to TemplateSrv * Refactor: Introduces some typings and structures * Refactor: Introduces picker to adapter * Refactor: Removes useState and introduces contains instead * Refactor: Introduces Variable Editor * Refactor: Adds uuid and simplifies state * Refactor: Consolidates to VariableRenderer * Refactor: Adds name change capability * Refactor: Adds variableMiddleware * Refactor: Adds ability to change Angular type to type in State * Fix: Fixes so we check for duplicate names * Refactor: Adds ability to change State type to type in Angular * Refactor: Updates name in dashboard templating list * Refactor: Adds label change to VariableEditor * Refactor: Adds hide change to VariableEditor * Refactor: Adds update ability * Refactor: Adds tooltip * Refactor: Adds SelectionOptionsEditor * Refactor: Adds query editor and validation * Refactor: Adds regex and sort to editor * Refactor: Adds Selection options * Refactor: Adds Varible Values Previewer * Refactor: Changes from array in state to Record * Refactor: Removes getVariableAtIndex from templateSrv * Tests: Fixs broken tests * Chore: Fixes duplicate merge import * Refactor: Removes strict null errors * Refactor: Adds duplicate variable * Refactor: Adds remove variable * Refactor: Adds change order of variables * Refactor: Adds add new variable * Chore: Fixes Prettier formatting * Refactor: Adds VariablePicker * Fixed so sub menu is displayed when we only have redux template variables. * removed unused variable. * tags will be visibile in the new react picker. * added some nice colors to the tags. * Added thunk for selecting a tag. * Refactor: Cleans up templating state when dashboard unloads * Refactor: Adds save capabilities for variables in state * added possibility to select tag. * Added so you can deselect a tag. * Fixed issue with coloring on top. * minor refactoring to make the code more slim. * Refactor: Fixes dispatch return and copy of variable * selecting options when tag i selected * small refactoring. * fixed so we use options. * Refactor: Adds getValueForUrl capabilities * first implementation of keyboard navigation on picker. * removed comment. * fixed so you can toggle all options. * Refactor: Simplified state handling using Redux Toolkit and flat reducer structure * Refactor: Adds sharedTemplatingReducer and queryVariableReducer * Tests: Fixs broken tests * Chore: Removes some strict null errors * Tests: Fix broken tests * Refactor: Splitted QueryVariablePicker into smaller components * Refactor: Moves linktext and selected tags to component instead * Fix: Fixes the ability to have multiple dropdowns opened at same time * Fix: Fixes onKeyDown from prev refactor * Refactor: Adds searchfilter searching * Tests: Fixes after running e2e tests * Refactor: Adds an attempt to solve dependencies at startup * Refactor: Adds feature toggle * Refactor: Resets all angular files to master * Refactor: Move stuff to query folder * Refactor: Initial commit for SubMenu component * Refactor: Updated DashboardModel with new list * Refactor: Adds feature toggle to dashboard model and friends * Refactor: Adds picker to SubMenu * Refactor: Fixes styling on SubMenu * Refactor: Fixes processvariables * Refactor: Initial EditorList skeleton * Refactor: Refactors out VariableEditorList and VariableEditorContainer * Refactor: Adds New variable functionality * Refactor: Adds registred types * Refactor: Adds edit existing variable functionality * Refactor: Changes params to thunks * Refactor: Small fix for cleaning up state when clicking update/add * Refactor: Better typings for outer containers * Refactor: Adds change order functionality * Refactor: Removed notify angular args * Change so the url is in sync with the redux template variables. * Adding support for saving proper values and checking changes. * Refactor: Adds duplicate variable functionality * Feature: Adds remove variable functionality * Refactor: Small refactor so e2e tests work as before * Refactor: Returns null if no visible variables * Refactor: Adds annotations to SubMenu * Refactor: Fixes toggling of annotations in SubMenu * added dashboard links to new submehu. * Refactor: Small refactor breaking up into smaller components * Fix: Fixes infinite recursive loop when changing varible name * Templating: Do not mutate location query state * Refactor: Fixes minor timing issue when adding new variable * Refactor: removes initialization in variable_srv constructor * Refactor: Suggestion on how to handle templating.list in DashboardExporter * Refactor: Adds getVariables typings and changes ChangeTracker and ShareSnapshotCtrl * Refactor: Adds getVariable on DashboardModel and changes DashboardMigrator * Fix: Fixes repeated panels * wip: starting to add custom variable type. * Refactor: Merging two different toVariablePayload functions * Tests: Fixes broken tests * Fix: Reduces strict null errors * Tests: Initial commit and fixes strange dependency order * Tests: Covers sharedTemplatingReducer with tests * Refactor: Rename state/index.ts => state/reducers.ts as every where else * Refactor: Renames and moves adapters.ts * Tests: Adds tests for templatingReducer * Tests: Adds intitial tests for queryVariableReducer * starting to ad custom variable. * Tests: Adds more queryVariableReducer tests * Added support for custom variable. Next up applying some DRY principles and refactoring. * fixed compile issue. * added todo. * Tests: Fixes broken test * Tests: Covers queryVariableReducer with tests and fixed a couple of bugs * Fix: Fixes broken test * Fix: Reduces strict null errors * change so custom won't be depending on anything elese. * fixed descriptions. * removed unused dependency. * Fixed issue when adding a new variable and editor is being unmount twice. * fixed issue with select option loop. * changed so we update query on typing in editor and removed it from component state. * Moved runQuery up one level in the component tree. * renamed action and moved it to custom actions. * moved applyStateChanges to shared code. * removed todo comment. * first stab on moving picker to more general. * Refactor: Changes so we always show variables type * removed duplicate code regarding picker. * Did some renamings. * Feature: Adds text box variable type * moved tests from query reducer to picker reducer. * Removed picker from VariableState. * removed reference to picker. * Some more refactorings of the picker reducer + actions. * Chore: Refactors away editor state to its own state slice (#22515) * Refactor: Inital move, tests not working * Tests: Adds editorReducer tests * Refactor: Cleaning up * Refactor: Moves logic to thunk instead * Refactor: Initial commit * Refactor: Combines reducers to one state * Refactor: Adds combine reducers * moved navigation logic flow to a thunk instead of in the component. * fixed issue with rendering picker link. * Refactor: Removes variable prop from templating.variables * refactored and removed some more code. * Feature: adds Constant variable type * fixed so tags can be selected. * Fix: fixes default hide for constant and enum order * fixed so tags works again. * Fix: fixes so we use Angular editor when newVariables is not defined * Fix: fixes wrong hide default for Constant variable * Fix: fixes bug when using duplicate button * Fix: changes action id * Tests: prepares for newVariables * Chore: reduces strict null errors * Refactor: removes uuidInEditorReducer for simplification * Chore: changes after PR comments * Chore: uses getConfig instead of config * Tests: fixes so e2e tests check for feature toggle and fixed initLock bug * Refactor: changes so sharedReducer uses createSlice instead * Refactor: changes textBoxVariableReducer to use creactSlice instead * Refactor: changes queryBoxVariableReducer to use creactSlice instead * Refactor: changes customVariableReducer to use creactSlice instead * Refactor: changes constantVariableReducer to use creactSlice instead * Refactor: moves types to specific types.ts files instead * changed so we use queryValue stored on the variable to populate options input when opening picker. * Feature: adds the ability to test templating thunks using real store and middleware * Chore: cleans up unused import * excluded queryValue from the getSaveModel * Refactor: adds whenAsyncActionIsDispatched to reduxTester * Tests: adds initial tests for processVariables * Added reducer tests for constant variable. * added tests for custom reducer. * added tets for texbox reducer. * Tests: adds more tests for ProcessVariable * Refactor: fixes processVariable flow so we do notrun updateOptions twice * Tests: finishes tests for processVariables and removed skip test * added actions tests for custom and constant. * Tests: adds tests for setOptionFromUrl * Tests: adds a naive variable mock builder * Tests: adds tests for validateVariableSelectionState * added tests for query variable actions. * added last test for query actions. * added more tests. * some more tests. * fixed typing errors. * Fixed issues with variable tags. Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
273 lines
9.0 KiB
TypeScript
273 lines
9.0 KiB
TypeScript
// Services & Utils
|
|
import { createErrorNotification } from 'app/core/copy/appNotification';
|
|
import { backendSrv } from 'app/core/services/backend_srv';
|
|
import { DashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
|
|
import { DashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
|
|
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
|
|
import { AnnotationsSrv } from 'app/features/annotations/annotations_srv';
|
|
import { VariableSrv } from 'app/features/templating/variable_srv';
|
|
import { KeybindingSrv } from 'app/core/services/keybindingSrv';
|
|
// Actions
|
|
import { notifyApp, updateLocation } from 'app/core/actions';
|
|
import locationUtil from 'app/core/utils/location_util';
|
|
import {
|
|
clearDashboardQueriesToUpdateOnLoad,
|
|
dashboardInitCompleted,
|
|
dashboardInitFailed,
|
|
dashboardInitFetching,
|
|
dashboardInitServices,
|
|
dashboardInitSlow,
|
|
} from './reducers';
|
|
// Types
|
|
import { DashboardDTO, DashboardRouteInfo, StoreState, ThunkDispatch, ThunkResult } from 'app/types';
|
|
import { DashboardModel } from './DashboardModel';
|
|
import { DataQuery } from '@grafana/data';
|
|
import { getConfig } from '../../../core/config';
|
|
import { initDashboardTemplating, processVariables } from '../../templating/state/actions';
|
|
import { variableAdapters } from '../../templating/adapters';
|
|
|
|
export interface InitDashboardArgs {
|
|
$injector: any;
|
|
$scope: any;
|
|
urlUid?: string;
|
|
urlSlug?: string;
|
|
urlType?: string;
|
|
urlFolderId?: string;
|
|
routeInfo: DashboardRouteInfo;
|
|
fixUrl: boolean;
|
|
}
|
|
|
|
async function redirectToNewUrl(slug: string, dispatch: ThunkDispatch, currentPath: string) {
|
|
const res = await backendSrv.getDashboardBySlug(slug);
|
|
|
|
if (res) {
|
|
let newUrl = res.meta.url;
|
|
|
|
// fix solo route urls
|
|
if (currentPath.indexOf('dashboard-solo') !== -1) {
|
|
newUrl = newUrl.replace('/d/', '/d-solo/');
|
|
}
|
|
|
|
const url = locationUtil.stripBaseFromUrl(newUrl);
|
|
dispatch(updateLocation({ path: url, partial: true, replace: true }));
|
|
}
|
|
}
|
|
|
|
async function fetchDashboard(
|
|
args: InitDashboardArgs,
|
|
dispatch: ThunkDispatch,
|
|
getState: () => StoreState
|
|
): Promise<DashboardDTO | null> {
|
|
try {
|
|
switch (args.routeInfo) {
|
|
case DashboardRouteInfo.Home: {
|
|
// load home dash
|
|
const dashDTO: DashboardDTO = await backendSrv.get('/api/dashboards/home');
|
|
|
|
// if user specified a custom home dashboard redirect to that
|
|
if (dashDTO.redirectUri) {
|
|
const newUrl = locationUtil.stripBaseFromUrl(dashDTO.redirectUri);
|
|
dispatch(updateLocation({ path: newUrl, replace: true }));
|
|
return null;
|
|
}
|
|
|
|
// disable some actions on the default home dashboard
|
|
dashDTO.meta.canSave = false;
|
|
dashDTO.meta.canShare = false;
|
|
dashDTO.meta.canStar = false;
|
|
return dashDTO;
|
|
}
|
|
case DashboardRouteInfo.Normal: {
|
|
// for old db routes we redirect
|
|
if (args.urlType === 'db') {
|
|
redirectToNewUrl(args.urlSlug, dispatch, getState().location.path);
|
|
return null;
|
|
}
|
|
|
|
const loaderSrv: DashboardLoaderSrv = args.$injector.get('dashboardLoaderSrv');
|
|
const dashDTO: DashboardDTO = await loaderSrv.loadDashboard(args.urlType, args.urlSlug, args.urlUid);
|
|
|
|
if (args.fixUrl && dashDTO.meta.url) {
|
|
// check if the current url is correct (might be old slug)
|
|
const dashboardUrl = locationUtil.stripBaseFromUrl(dashDTO.meta.url);
|
|
const currentPath = getState().location.path;
|
|
|
|
if (dashboardUrl !== currentPath) {
|
|
// replace url to not create additional history items and then return so that initDashboard below isn't executed multiple times.
|
|
dispatch(updateLocation({ path: dashboardUrl, partial: true, replace: true }));
|
|
return null;
|
|
}
|
|
}
|
|
return dashDTO;
|
|
}
|
|
case DashboardRouteInfo.New: {
|
|
return getNewDashboardModelData(args.urlFolderId);
|
|
}
|
|
default:
|
|
throw { message: 'Unknown route ' + args.routeInfo };
|
|
}
|
|
} catch (err) {
|
|
dispatch(dashboardInitFailed({ message: 'Failed to fetch dashboard', error: err }));
|
|
console.log(err);
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This action (or saga) does everything needed to bootstrap a dashboard & dashboard model.
|
|
* First it handles the process of fetching the dashboard, correcting the url if required (causing redirects/url updates)
|
|
*
|
|
* This is used both for single dashboard & solo panel routes, home & new dashboard routes.
|
|
*
|
|
* Then it handles the initializing of the old angular services that the dashboard components & panels still depend on
|
|
*
|
|
*/
|
|
export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
|
|
return async (dispatch, getState) => {
|
|
// set fetching state
|
|
dispatch(dashboardInitFetching());
|
|
|
|
// Detect slow loading / initializing and set state flag
|
|
// This is in order to not show loading indication for fast loading dashboards as it creates blinking/flashing
|
|
setTimeout(() => {
|
|
if (getState().dashboard.getModel() === null) {
|
|
dispatch(dashboardInitSlow());
|
|
}
|
|
}, 500);
|
|
|
|
// fetch dashboard data
|
|
const dashDTO = await fetchDashboard(args, dispatch, getState);
|
|
|
|
// returns null if there was a redirect or error
|
|
if (!dashDTO) {
|
|
return;
|
|
}
|
|
|
|
// set initializing state
|
|
dispatch(dashboardInitServices());
|
|
|
|
// create model
|
|
let dashboard: DashboardModel;
|
|
try {
|
|
dashboard = new DashboardModel(dashDTO.dashboard, dashDTO.meta);
|
|
} catch (err) {
|
|
dispatch(dashboardInitFailed({ message: 'Failed create dashboard model', error: err }));
|
|
console.log(err);
|
|
return;
|
|
}
|
|
|
|
// add missing orgId query param
|
|
const storeState = getState();
|
|
if (!storeState.location.query.orgId) {
|
|
dispatch(updateLocation({ query: { orgId: storeState.user.orgId }, partial: true, replace: true }));
|
|
}
|
|
|
|
// init services
|
|
const timeSrv: TimeSrv = args.$injector.get('timeSrv');
|
|
const annotationsSrv: AnnotationsSrv = args.$injector.get('annotationsSrv');
|
|
const variableSrv: VariableSrv = args.$injector.get('variableSrv');
|
|
const keybindingSrv: KeybindingSrv = args.$injector.get('keybindingSrv');
|
|
const unsavedChangesSrv = args.$injector.get('unsavedChangesSrv');
|
|
const dashboardSrv: DashboardSrv = args.$injector.get('dashboardSrv');
|
|
|
|
timeSrv.init(dashboard);
|
|
annotationsSrv.init(dashboard);
|
|
|
|
if (storeState.dashboard.modifiedQueries) {
|
|
const { panelId, queries } = storeState.dashboard.modifiedQueries;
|
|
dashboard.meta.fromExplore = !!(panelId && queries);
|
|
}
|
|
|
|
// template values service needs to initialize completely before
|
|
// the rest of the dashboard can load
|
|
try {
|
|
if (!getConfig().featureToggles.newVariables) {
|
|
await variableSrv.init(dashboard);
|
|
}
|
|
if (getConfig().featureToggles.newVariables) {
|
|
const list =
|
|
dashboard.variables.list.length > 0
|
|
? dashboard.variables.list
|
|
: dashboard.templating.list.filter(v => variableAdapters.contains(v.type));
|
|
await dispatch(initDashboardTemplating(list));
|
|
await dispatch(processVariables());
|
|
}
|
|
} catch (err) {
|
|
dispatch(notifyApp(createErrorNotification('Templating init failed', err)));
|
|
console.log(err);
|
|
}
|
|
|
|
try {
|
|
dashboard.processRepeats();
|
|
dashboard.updateSubmenuVisibility();
|
|
|
|
// handle auto fix experimental feature
|
|
const queryParams = getState().location.query;
|
|
if (queryParams.autofitpanels) {
|
|
dashboard.autoFitPanels(window.innerHeight, queryParams.kiosk);
|
|
}
|
|
|
|
// init unsaved changes tracking
|
|
unsavedChangesSrv.init(dashboard, args.$scope);
|
|
keybindingSrv.setupDashboardBindings(args.$scope, dashboard);
|
|
} catch (err) {
|
|
dispatch(notifyApp(createErrorNotification('Dashboard init failed', err)));
|
|
console.log(err);
|
|
}
|
|
|
|
if (storeState.dashboard.modifiedQueries) {
|
|
const { panelId, queries } = storeState.dashboard.modifiedQueries;
|
|
updateQueriesWhenComingFromExplore(dispatch, dashboard, panelId, queries);
|
|
}
|
|
|
|
// legacy srv state
|
|
dashboardSrv.setCurrent(dashboard);
|
|
|
|
// yay we are done
|
|
dispatch(dashboardInitCompleted(dashboard));
|
|
};
|
|
}
|
|
|
|
function getNewDashboardModelData(urlFolderId?: string): any {
|
|
const data = {
|
|
meta: {
|
|
canStar: false,
|
|
canShare: false,
|
|
isNew: true,
|
|
folderId: 0,
|
|
},
|
|
dashboard: {
|
|
title: 'New dashboard',
|
|
panels: [
|
|
{
|
|
type: 'add-panel',
|
|
gridPos: { x: 0, y: 0, w: 12, h: 9 },
|
|
title: 'Panel Title',
|
|
},
|
|
],
|
|
},
|
|
};
|
|
|
|
if (urlFolderId) {
|
|
data.meta.folderId = parseInt(urlFolderId, 10);
|
|
}
|
|
|
|
return data;
|
|
}
|
|
|
|
function updateQueriesWhenComingFromExplore(
|
|
dispatch: ThunkDispatch,
|
|
dashboard: DashboardModel,
|
|
originPanelId: number,
|
|
queries: DataQuery[]
|
|
) {
|
|
const panelArrId = dashboard.panels.findIndex(panel => panel.id === originPanelId);
|
|
|
|
if (panelArrId > -1) {
|
|
dashboard.panels[panelArrId].targets = queries;
|
|
}
|
|
|
|
// Clear update state now that we're done
|
|
dispatch(clearDashboardQueriesToUpdateOnLoad());
|
|
}
|