Skip to content

Commit 55cca79

Browse files
kkerezsialexkerezsini
kkerezsi
and
alexkerezsini
authored
fix(asset): fix data link construction (#109)
Co-authored-by: NI\akerezsi <alex.kerezsi@ni.com>
1 parent 5aab752 commit 55cca79

File tree

3 files changed

+29
-26
lines changed

3 files changed

+29
-26
lines changed

‎src/datasources/asset/components/editors/list-assets/ListAssetsEditor.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { ListAssetsQuery } from '../../../types/ListAssets.types';
99
import { AssetQueryBuilder } from './query-builder/AssetQueryBuilder';
1010
import { Workspace } from '../../../../../core/types';
1111
import { ListAssetsDataSource } from '../../../data-sources/list-assets/ListAssetsDataSource';
12-
import { filterXSSLINQExpression } from 'core/utils';
1312

1413
type Props = {
1514
query: ListAssetsQuery;
@@ -32,7 +31,7 @@ export function ListAssetsEditor({ query, handleQueryChange, datasource }: Props
3231

3332
function onParameterChange(ev: CustomEvent) {
3433
if (query.filter !== ev.detail.linq) {
35-
query.filter = filterXSSLINQExpression(ev.detail.linq);
34+
query.filter = ev.detail.linq;
3635
handleQueryChange(query, true);
3736
}
3837
}

‎src/datasources/asset/data-sources/calibration-forecast/CalibrationForecastDataSource.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DataQueryRequest, DataFrameDTO, DataSourceInstanceSettings, FieldDTO, TestDataSourceResponse, DataLink } from '@grafana/data';
22
import { AssetDataSourceOptions, AssetQuery, AssetQueryType, AssetType, AssetTypeOptions, BusType, BusTypeOptions } from '../../types/types';
3-
import { BackendSrv, config, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
3+
import { BackendSrv, getBackendSrv, getTemplateSrv, TemplateSrv, locationService } from '@grafana/runtime';
44
import { AssetDataSourceBase } from '../AssetDataSourceBase';
55
import { AssetCalibrationForecastKey, AssetCalibrationTimeBasedGroupByType, CalibrationForecastQuery, CalibrationForecastResponse, ColumnDescriptorType, FieldDTOWithDescriptor } from '../../types/CalibrationForecastQuery.types';
66
import { transformComputedFieldsQuery } from '../../../../core/query-builder.utils';
@@ -116,9 +116,13 @@ export class CalibrationForecastDataSource extends AssetDataSourceBase {
116116
});
117117
}
118118

119-
private createDataLinks(timeGrouping: AssetCalibrationForecastKey): DataLink[] {
120-
const url = config.appUrl + 'd/${__dashboard.uid}/${__dashboard}?orgId=${__org.id}&${__all_variables}';
119+
private constructDataLinkBaseUrl(){
120+
const pathname = locationService.getLocation().pathname;
121+
return pathname + '?orgId=${__org.id}&${__all_variables}';
122+
}
121123

124+
private createDataLinks(timeGrouping: AssetCalibrationForecastKey): DataLink[] {
125+
const url = this.constructDataLinkBaseUrl();
122126
return [
123127
{
124128
title: `View ${timeGrouping}`, targetBlank: false, url: `${url}`,

‎src/datasources/asset/data-sources/calibration-forecast/__snapshots__/CalibrationForecastDataSource.test.ts.snap

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Time based data links creates data links for Day grouping 1`] = `"d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}&from=1640995200000&to=1641081600000"`;
3+
exports[`Time based data links creates data links for Day grouping 1`] = `"/?orgId=\${__org.id}&\${__all_variables}&from=1640995200000&to=1641081600000"`;
44

5-
exports[`Time based data links creates data links for Month grouping 1`] = `"d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}&from=1641081600000&to=1643760000000"`;
5+
exports[`Time based data links creates data links for Month grouping 1`] = `"/?orgId=\${__org.id}&\${__all_variables}&from=1641081600000&to=1643760000000"`;
66

7-
exports[`Time based data links creates data links for Week grouping 1`] = `"d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}&from=1641168000000&to=1641689999999"`;
7+
exports[`Time based data links creates data links for Week grouping 1`] = `"/?orgId=\${__org.id}&\${__all_variables}&from=1641168000000&to=1641689999999"`;
88

99
exports[`queries asset calibration forecast with day groupBy 1`] = `
1010
[
@@ -37,7 +37,7 @@ exports[`queries asset calibration forecast with day groupBy 1`] = `
3737
"onBuildUrl": [Function],
3838
"targetBlank": false,
3939
"title": "View Day",
40-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
40+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
4141
},
4242
],
4343
},
@@ -85,7 +85,7 @@ exports[`queries asset calibration forecast with month groupBy 1`] = `
8585
"onBuildUrl": [Function],
8686
"targetBlank": false,
8787
"title": "View Month",
88-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
88+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
8989
},
9090
],
9191
},
@@ -133,7 +133,7 @@ exports[`queries asset calibration forecast with week groupBy 1`] = `
133133
"onBuildUrl": [Function],
134134
"targetBlank": false,
135135
"title": "View Week",
136-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
136+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
137137
},
138138
],
139139
},
@@ -353,7 +353,7 @@ exports[`queries calibration forecast with month and assetType groupBy 1`] = `
353353
"onBuildUrl": [Function],
354354
"targetBlank": false,
355355
"title": "View Month",
356-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
356+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
357357
},
358358
],
359359
},
@@ -377,7 +377,7 @@ exports[`queries calibration forecast with month and assetType groupBy 1`] = `
377377
"onBuildUrl": [Function],
378378
"targetBlank": false,
379379
"title": "View Month",
380-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
380+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
381381
},
382382
],
383383
},
@@ -401,7 +401,7 @@ exports[`queries calibration forecast with month and assetType groupBy 1`] = `
401401
"onBuildUrl": [Function],
402402
"targetBlank": false,
403403
"title": "View Month",
404-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
404+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
405405
},
406406
],
407407
},
@@ -449,7 +449,7 @@ exports[`queries calibration forecast with month and busType groupBy 1`] = `
449449
"onBuildUrl": [Function],
450450
"targetBlank": false,
451451
"title": "View Month",
452-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
452+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
453453
},
454454
],
455455
},
@@ -473,7 +473,7 @@ exports[`queries calibration forecast with month and busType groupBy 1`] = `
473473
"onBuildUrl": [Function],
474474
"targetBlank": false,
475475
"title": "View Month",
476-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
476+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
477477
},
478478
],
479479
},
@@ -497,7 +497,7 @@ exports[`queries calibration forecast with month and busType groupBy 1`] = `
497497
"onBuildUrl": [Function],
498498
"targetBlank": false,
499499
"title": "View Month",
500-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
500+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
501501
},
502502
],
503503
},
@@ -545,7 +545,7 @@ exports[`queries calibration forecast with month and location groupBy 1`] = `
545545
"onBuildUrl": [Function],
546546
"targetBlank": false,
547547
"title": "View Month",
548-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
548+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
549549
},
550550
],
551551
},
@@ -569,7 +569,7 @@ exports[`queries calibration forecast with month and location groupBy 1`] = `
569569
"onBuildUrl": [Function],
570570
"targetBlank": false,
571571
"title": "View Month",
572-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
572+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
573573
},
574574
],
575575
},
@@ -593,7 +593,7 @@ exports[`queries calibration forecast with month and location groupBy 1`] = `
593593
"onBuildUrl": [Function],
594594
"targetBlank": false,
595595
"title": "View Month",
596-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
596+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
597597
},
598598
],
599599
},
@@ -641,7 +641,7 @@ exports[`queries calibration forecast with month and vendor groupBy 1`] = `
641641
"onBuildUrl": [Function],
642642
"targetBlank": false,
643643
"title": "View Month",
644-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
644+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
645645
},
646646
],
647647
},
@@ -665,7 +665,7 @@ exports[`queries calibration forecast with month and vendor groupBy 1`] = `
665665
"onBuildUrl": [Function],
666666
"targetBlank": false,
667667
"title": "View Month",
668-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
668+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
669669
},
670670
],
671671
},
@@ -689,7 +689,7 @@ exports[`queries calibration forecast with month and vendor groupBy 1`] = `
689689
"onBuildUrl": [Function],
690690
"targetBlank": false,
691691
"title": "View Month",
692-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
692+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
693693
},
694694
],
695695
},
@@ -737,7 +737,7 @@ exports[`queries calibration forecast with month and workspace groupBy 1`] = `
737737
"onBuildUrl": [Function],
738738
"targetBlank": false,
739739
"title": "View Month",
740-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
740+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
741741
},
742742
],
743743
},
@@ -761,7 +761,7 @@ exports[`queries calibration forecast with month and workspace groupBy 1`] = `
761761
"onBuildUrl": [Function],
762762
"targetBlank": false,
763763
"title": "View Month",
764-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
764+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
765765
},
766766
],
767767
},
@@ -785,7 +785,7 @@ exports[`queries calibration forecast with month and workspace groupBy 1`] = `
785785
"onBuildUrl": [Function],
786786
"targetBlank": false,
787787
"title": "View Month",
788-
"url": "d/\${__dashboard.uid}/\${__dashboard}?orgId=\${__org.id}&\${__all_variables}",
788+
"url": "/?orgId=\${__org.id}&\${__all_variables}",
789789
},
790790
],
791791
},

0 commit comments

Comments
 (0)