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

Themes: Fix issue generating themes due to code in @grafana/data accessing window object during module load (#27441)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-09-08 12:16:26 +02:00 committed by GitHub
parent f22f0a89a6
commit 6a9bfa19be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-data/src/valueFormats/categories.ts
View File

@ -4,7 +4,7 @@ import {
dateTimeAsIsoNoDateIfToday, dateTimeAsIsoNoDateIfToday,
dateTimeAsUS, dateTimeAsUS,
dateTimeAsUSNoDateIfToday, dateTimeAsUSNoDateIfToday,
dateTimeAsLocal, getDateTimeAsLocalFormat,
dateTimeFromNow, dateTimeFromNow,
toClockMilliseconds, toClockMilliseconds,
toClockSeconds, toClockSeconds,
@ -176,7 +176,7 @@ export const getCategories = (): ValueFormatCategory[] => [
{ name: 'Datetime ISO (No date if today)', id: 'dateTimeAsIsoNoDateIfToday', fn: dateTimeAsIsoNoDateIfToday }, { name: 'Datetime ISO (No date if today)', id: 'dateTimeAsIsoNoDateIfToday', fn: dateTimeAsIsoNoDateIfToday },
{ name: 'Datetime US', id: 'dateTimeAsUS', fn: dateTimeAsUS }, { name: 'Datetime US', id: 'dateTimeAsUS', fn: dateTimeAsUS },
{ name: 'Datetime US (No date if today)', id: 'dateTimeAsUSNoDateIfToday', fn: dateTimeAsUSNoDateIfToday }, { name: 'Datetime US (No date if today)', id: 'dateTimeAsUSNoDateIfToday', fn: dateTimeAsUSNoDateIfToday },
{ name: 'Datetime local', id: 'dateTimeAsLocal', fn: dateTimeAsLocal }, { name: 'Datetime local', id: 'dateTimeAsLocal', fn: getDateTimeAsLocalFormat() },
{ name: 'From Now', id: 'dateTimeFromNow', fn: dateTimeFromNow }, { name: 'From Now', id: 'dateTimeFromNow', fn: dateTimeFromNow },
], ],
}, },

5
packages/grafana-data/src/valueFormats/dateTimeFormatters.ts
View File

@ -369,7 +369,9 @@ export const dateTimeAsIso = toDateTimeValueFormatter('YYYY-MM-DD HH:mm:ss');
export const dateTimeAsIsoNoDateIfToday = toDateTimeValueFormatter('YYYY-MM-DD HH:mm:ss', 'HH:mm:ss'); export const dateTimeAsIsoNoDateIfToday = toDateTimeValueFormatter('YYYY-MM-DD HH:mm:ss', 'HH:mm:ss');
export const dateTimeAsUS = toDateTimeValueFormatter('MM/DD/YYYY h:mm:ss a'); export const dateTimeAsUS = toDateTimeValueFormatter('MM/DD/YYYY h:mm:ss a');
export const dateTimeAsUSNoDateIfToday = toDateTimeValueFormatter('MM/DD/YYYY h:mm:ss a', 'h:mm:ss a'); export const dateTimeAsUSNoDateIfToday = toDateTimeValueFormatter('MM/DD/YYYY h:mm:ss a', 'h:mm:ss a');
export const dateTimeAsLocal = toDateTimeValueFormatter(
export function getDateTimeAsLocalFormat() {
return toDateTimeValueFormatter(
localTimeFormat({ localTimeFormat({
year: 'numeric', year: 'numeric',
month: '2-digit', month: '2-digit',
@ -379,6 +381,7 @@ export const dateTimeAsLocal = toDateTimeValueFormatter(
second: '2-digit', second: '2-digit',
}) })
); );
}
export function dateTimeFromNow( export function dateTimeFromNow(
value: number, value: number,