-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for custom activity type (including variables) #23
Open
AgnesToulet
wants to merge
2
commits into
grafana:main
Choose a base branch
from
AgnesToulet:custom-activity-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,7 @@ import { | |
TimeSeriesPoints, | ||
TimeSeriesValue, | ||
} from '@grafana/data'; | ||
import { getTemplateSrv } from '@grafana/runtime'; | ||
import StravaApi from './stravaApi'; | ||
import polyline from './polyline'; | ||
import { | ||
|
@@ -55,7 +56,7 @@ export default class StravaDatasource extends DataSourceApi<StravaQuery, StravaJ | |
}); | ||
|
||
for (const target of options.targets) { | ||
const filteredActivities = this.filterActivities(activities, target.activityType); | ||
const filteredActivities = this.filterActivities(activities, target.activityType, target.customActivityType); | ||
switch (target.format) { | ||
case StravaQueryFormat.Table: | ||
const tableData = this.transformActivitiesToTable(filteredActivities, target); | ||
|
@@ -105,18 +106,25 @@ export default class StravaDatasource extends DataSourceApi<StravaQuery, StravaJ | |
return authCode; | ||
} | ||
|
||
filterActivities(activities: any[], activityType: StravaActivityType): any[] { | ||
filterActivities(allActivities: any[], activityType: StravaActivityType, customActivityType: string): any[] { | ||
let activities = [activityType] | ||
if (!activityType) { | ||
// No filter, return all | ||
return activities; | ||
return allActivities; | ||
} else if (activityType === 'Custom' && customActivityType) { | ||
// Handle template variables if any | ||
if (customActivityType.indexOf('$') != -1) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You don't need to check value for variables, |
||
customActivityType = getTemplateSrv().replace(customActivityType, undefined, 'csv') | ||
} | ||
activities = customActivityType.split(',').map(activity => activity.trim()) | ||
} | ||
|
||
return activities.filter(activity => { | ||
return allActivities.filter(activity => { | ||
if (activityType === 'Other') { | ||
return activity.type !== 'Run' && activity.type !== 'Ride'; | ||
} else { | ||
} | ||
return activity.type === activityType; | ||
} | ||
|
||
return activities.indexOf(activity.type) != -1 | ||
}); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't better to convert activity selector to support multi-value selection and add variables to the list?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How would you know which variable to put in the list?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Usually, it's just a list of created variables from templateSrv, but it might be bad from UX perspective.