From 18e4f17c6cfe369b96f7fd9658ceb44477842c65 Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Wed, 15 Apr 2020 14:38:23 +0200 Subject: [PATCH] Move data links built in vars to grafana-data --- packages/grafana-data/src/utils/dataLinks.ts | 14 ++++++++++++++ packages/grafana-ui/src/utils/dataLinks.ts | 15 --------------- .../elasticsearch/configuration/DataLinks.tsx | 4 ++-- .../loki/configuration/DerivedFields.tsx | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 packages/grafana-data/src/utils/dataLinks.ts diff --git a/packages/grafana-data/src/utils/dataLinks.ts b/packages/grafana-data/src/utils/dataLinks.ts new file mode 100644 index 00000000000..70a9b72df10 --- /dev/null +++ b/packages/grafana-data/src/utils/dataLinks.ts @@ -0,0 +1,14 @@ +export const DataLinkBuiltInVars = { + keepTime: '__url_time_range', + timeRangeFrom: '__from', + timeRangeTo: '__to', + includeVars: '__all_variables', + seriesName: '__series.name', + fieldName: '__field.name', + valueTime: '__value.time', + valueNumeric: '__value.numeric', + valueText: '__value.text', + valueRaw: '__value.raw', + // name of the calculation represented by the value + valueCalc: '__value.calc', +}; diff --git a/packages/grafana-ui/src/utils/dataLinks.ts b/packages/grafana-ui/src/utils/dataLinks.ts index 9939816784d..30a8490e81a 100644 --- a/packages/grafana-ui/src/utils/dataLinks.ts +++ b/packages/grafana-ui/src/utils/dataLinks.ts @@ -1,21 +1,6 @@ import { ContextMenuItem } from '../components/ContextMenu/ContextMenu'; import { LinkModelSupplier } from '@grafana/data'; -export const DataLinkBuiltInVars = { - keepTime: '__url_time_range', - timeRangeFrom: '__from', - timeRangeTo: '__to', - includeVars: '__all_variables', - seriesName: '__series.name', - fieldName: '__field.name', - valueTime: '__value.time', - valueNumeric: '__value.numeric', - valueText: '__value.text', - valueRaw: '__value.raw', - // name of the calculation represented by the value - valueCalc: '__value.calc', -}; - /** * Delays creating links until we need to open the ContextMenu */ diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx index 06d09451577..dd7fb13a96b 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLinks.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { css } from 'emotion'; -import { Button, DataLinkBuiltInVars, stylesFactory, useTheme } from '@grafana/ui'; -import { GrafanaTheme, VariableOrigin } from '@grafana/data'; +import { Button, stylesFactory, useTheme } from '@grafana/ui'; +import { GrafanaTheme, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data'; import { DataLinkConfig } from '../types'; import { DataLink } from './DataLink'; diff --git a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx index 1505d13a9af..7f9217efcc4 100644 --- a/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx +++ b/public/app/plugins/datasource/loki/configuration/DerivedFields.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { css } from 'emotion'; -import { Button, DataLinkBuiltInVars, stylesFactory, useTheme } from '@grafana/ui'; -import { GrafanaTheme, VariableOrigin } from '@grafana/data'; +import { Button, stylesFactory, useTheme } from '@grafana/ui'; +import { GrafanaTheme, VariableOrigin, DataLinkBuiltInVars } from '@grafana/data'; import { DerivedFieldConfig } from '../types'; import { DerivedField } from './DerivedField'; import { DebugSection } from './DebugSection';