Expressions: Fixes the issue showing expressions editor (#62510)

* Use suggested value for uid

* update the snapshot

* use __expr__

* replace all -100 with __expr__

* update snapshot

* more changes

* revert redundant change

* Use expr.DatasourceUID where it's possible

* generate files
This commit is contained in:
ismail simsek
2023-01-31 18:50:10 +01:00
committed by GitHub
parent fdb1a47ca2
commit 91221bc436
54 changed files with 259 additions and 242 deletions

View File

@@ -39,7 +39,7 @@ exports[`PanelAlertTabContent Will render alerts belonging to panel and a button
},
},
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{
@@ -64,7 +64,7 @@ exports[`PanelAlertTabContent Will render alerts belonging to panel and a button
],
"datasource": {
"type": "__expr__",
"uid": "-100",
"uid": "__expr__",
},
"expression": "A",
"hide": false,
@@ -76,7 +76,7 @@ exports[`PanelAlertTabContent Will render alerts belonging to panel and a button
"refId": "B",
},
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{
@@ -103,7 +103,7 @@ exports[`PanelAlertTabContent Will render alerts belonging to panel and a button
],
"datasource": {
"type": "__expr__",
"uid": "-100",
"uid": "__expr__",
},
"expression": "B",
"hide": false,

View File

@@ -12,7 +12,7 @@ exports[`Query and expressions reducer should add a new expression 1`] = `
"refId": "A",
},
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{
@@ -141,7 +141,7 @@ exports[`Query and expressions reducer should rewire expressions 1`] = `
"refId": "A",
},
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{
@@ -187,7 +187,7 @@ exports[`Query and expressions reducer should set data queries 1`] = `
{
"queries": [
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{
@@ -233,7 +233,7 @@ exports[`Query and expressions reducer should update an expression 1`] = `
{
"queries": [
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{
@@ -287,7 +287,7 @@ exports[`Query and expressions reducer should update an expression refId and rew
"refId": "C",
},
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{
@@ -341,7 +341,7 @@ exports[`Query and expressions reducer should update expression type 1`] = `
"refId": "A",
},
{
"datasourceUid": "-100",
"datasourceUid": "__expr__",
"model": {
"conditions": [
{

View File

@@ -151,7 +151,7 @@ describe('Query and expressions reducer', () => {
const expressionQuery: AlertQuery = {
refId: 'B',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
relativeTimeRange: { from: 900, to: 1000 },
model: {
queryType: 'query',
@@ -166,7 +166,7 @@ describe('Query and expressions reducer', () => {
const expressionQuery2: AlertQuery = {
refId: 'C',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
relativeTimeRange: { from: 1, to: 3 },
model: {
queryType: 'query',
@@ -205,7 +205,7 @@ describe('Query and expressions reducer', () => {
queryType: 'query',
},
{
datasourceUid: '-100',
datasourceUid: '__expr__',
relativeTimeRange: { from: 900, to: 1000 },
model: {
datasource: '__expr__',
@@ -219,7 +219,7 @@ describe('Query and expressions reducer', () => {
refId: 'B',
},
{
datasourceUid: '-100',
datasourceUid: '__expr__',
relativeTimeRange: { from: 900, to: 1000 },
model: {
datasource: '__expr__',
@@ -240,7 +240,7 @@ describe('Query and expressions reducer', () => {
const expressionQuery: AlertQuery = {
refId: 'B',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
queryType: 'query',
datasource: '__expr__',
@@ -275,7 +275,7 @@ describe('Query and expressions reducer', () => {
queryType: 'query',
},
{
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
datasource: '__expr__',
expression: 'A',

View File

@@ -25,7 +25,7 @@ describe('rule-editor', () => {
const classicCondition = {
refId: 'B',
datasourceUid: '-100',
datasourceUid: '__expr__',
queryType: '',
model: {
refId: 'B',
@@ -55,7 +55,7 @@ describe('rule-editor', () => {
const mathExpression = {
refId: 'B',
datasourceUid: '-100',
datasourceUid: '__expr__',
queryType: '',
model: {
refId: 'B',
@@ -68,7 +68,7 @@ describe('rule-editor', () => {
const reduceExpression = {
refId: 'B',
datasourceUid: '-100',
datasourceUid: '__expr__',
queryType: '',
model: {
refId: 'B',
@@ -82,7 +82,7 @@ describe('rule-editor', () => {
const resampleExpression = {
refId: 'A',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
refId: 'A',
type: 'resample',
@@ -101,14 +101,14 @@ describe('rule-editor', () => {
const thresholdExpression = {
refId: 'C',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
refId: 'C',
type: 'threshold',
expression: 'B',
datasource: {
type: '__expr__',
uid: '-100',
uid: '__expr__',
},
conditions: [
{
@@ -253,7 +253,7 @@ describe('getThresholdsForQueries', () => {
const classicCondition = {
refId: 'B',
datasourceUid: '-100',
datasourceUid: '__expr__',
queryType: '',
model: {
refId: 'B',
@@ -319,7 +319,7 @@ function createThresholdExample(thresholdType: string): AlertQuery[] {
const reduceExpression = {
refId: 'B',
datasourceUid: '-100',
datasourceUid: '__expr__',
queryType: '',
model: {
refId: 'B',
@@ -333,7 +333,7 @@ function createThresholdExample(thresholdType: string): AlertQuery[] {
const thresholdExpression = {
refId: 'C',
datasourceUid: '-100',
datasourceUid: '__expr__',
queryType: '',
model: {
refId: 'C',

View File

@@ -102,7 +102,7 @@ const grafanaAlert = {
refId: 'B',
queryType: '',
relativeTimeRange: { from: 0, to: 0 },
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
conditions: [
{

View File

@@ -12,7 +12,7 @@ describe('timeRange', () => {
const expressionQuery: AlertQuery = {
refId: 'B',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
queryType: 'query',
datasource: '__expr__',
@@ -40,7 +40,7 @@ describe('timeRange', () => {
const expressionQuery: AlertQuery = {
refId: 'C',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
queryType: 'query',
datasource: '__expr__',
@@ -80,7 +80,7 @@ describe('timeRange', () => {
const expressionQuery: AlertQuery = {
refId: 'B',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
queryType: 'query',
datasource: '__expr__',
@@ -105,7 +105,7 @@ describe('timeRange', () => {
const expressionQuery: AlertQuery = {
refId: 'C',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
queryType: 'query',
datasource: '__expr__',
@@ -142,7 +142,7 @@ describe('timeRange', () => {
const expressionQuery: AlertQuery = {
refId: 'B',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
queryType: 'query',
datasource: '__expr__',
@@ -175,7 +175,7 @@ describe('timeRange', () => {
const expressionQuery: AlertQuery = {
refId: 'B',
queryType: 'expression',
datasourceUid: '-100',
datasourceUid: '__expr__',
model: {
queryType: 'query',
datasource: '__expr__',

View File

@@ -1,4 +1,4 @@
import { Observable, from, mergeMap } from 'rxjs';
import { from, mergeMap, Observable } from 'rxjs';
import {
DataQueryRequest,
@@ -61,10 +61,9 @@ export class ExpressionDatasourceApi extends DataSourceWithBackend<ExpressionQue
}
/**
* MATCHES a constant in DataSourceWithBackend, this should be '__expr__'
* @deprecated
* MATCHES a constant in DataSourceWithBackend
*/
export const ExpressionDatasourceUID = '-100';
export const ExpressionDatasourceUID = '__expr__';
export const instanceSettings: DataSourceInstanceSettings = {
id: -100,