ソースを参照

DataLinks: Fixed interpolation of series name, fixes #18250 (#18251)

Torkel Ödegaard 6 年 前
コミット
43543d5682

+ 2 - 10
public/app/features/panel/panellinks/link_srv.ts

@@ -91,22 +91,14 @@ export class LinkSrv implements LinkService {
   }
   }
 
 
   getDataPointVars = (seriesName: string, valueTime: DateTime) => {
   getDataPointVars = (seriesName: string, valueTime: DateTime) => {
-    // const valueTimeQuery = toUrlParams({
-    //   time: dateTime(valueTime).valueOf(),
-    // });
-
-    const seriesQuery = toUrlParams({
-      series: seriesName,
-    });
-
     return {
     return {
       [DataLinkBuiltInVars.valueTime]: {
       [DataLinkBuiltInVars.valueTime]: {
         text: valueTime.valueOf(),
         text: valueTime.valueOf(),
         value: valueTime.valueOf(),
         value: valueTime.valueOf(),
       },
       },
       [DataLinkBuiltInVars.seriesName]: {
       [DataLinkBuiltInVars.seriesName]: {
-        text: seriesQuery,
-        value: seriesQuery,
+        text: seriesName,
+        value: seriesName,
       },
       },
     };
     };
   };
   };

+ 2 - 2
public/app/features/panel/panellinks/specs/link_srv.test.ts

@@ -102,12 +102,12 @@ describe('linkSrv', () => {
         linkSrv.getDataLinkUIModel(
         linkSrv.getDataLinkUIModel(
           {
           {
             title: 'Any title',
             title: 'Any title',
-            url: `/d/1?$${DataLinkBuiltInVars.seriesName}`,
+            url: `/d/1?var-test=$${DataLinkBuiltInVars.seriesName}`,
           },
           },
           {},
           {},
           dataPointMock
           dataPointMock
         ).href
         ).href
-      ).toEqual('/d/1?series=A-series');
+      ).toEqual('/d/1?var-test=A-series');
     });
     });
     it('should interpolate time range based on datapoint timestamp', () => {
     it('should interpolate time range based on datapoint timestamp', () => {
       expect(
       expect(