IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: revert to isoWeek when resolving weekly indices (#31709)

Browse Source 
* Elasticsearch: revert to isoWeek when resolving weekly indices

* Add type assertion explainer
This commit is contained in:
Giordano Ricci
2021-03-05 09:28:46 +00:00
committed by GitHub
parent fb58c06383
commit bbee7da3e0
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/grafana-data/src/datetime/moment_wrapper.ts
View File

@@ -1,6 +1,6 @@
import { TimeZone } from '../types/time';
/* eslint-disable id-blacklist, no-restricted-imports, @typescript-eslint/ban-types */
import moment, { Moment, MomentInput, DurationInputArg1 } from 'moment';
import moment, { Moment, MomentInput, DurationInputArg1, DurationInputArg2 } from 'moment';
export interface DateTimeBuiltinFormat {
__momentBuiltinFormatBrand: any;
}
@@ -17,6 +17,7 @@ export type DurationUnit =
| 'M'
| 'week'
| 'weeks'
| 'isoWeek'
| 'w'
| 'day'
| 'days'
@@ -96,7 +97,8 @@ export const toUtc = (input?: DateTimeInput, formatInput?: FormatInput): DateTim
};
export const toDuration = (input?: DurationInput, unit?: DurationUnit): DateTimeDuration => {
return moment.duration(input as DurationInputArg1, unit) as DateTimeDuration;
// moment built-in types are a bit flaky, for example `isoWeek` is not in the type definition but it's present in the js source.
return moment.duration(input as DurationInputArg1, unit as DurationInputArg2) as DateTimeDuration;
};
export const dateTime = (input?: DateTimeInput, formatInput?: FormatInput): DateTime => {