From b5febb91bde99fb0b6965557d897066a1f3a3d26 Mon Sep 17 00:00:00 2001 From: Felipe Cadavid Date: Tue, 13 Jun 2023 12:03:25 -0500 Subject: [PATCH] refactor: use ?? + remove unnecessary typeof --- packages/react/counter/src/Counter.tsx | 10 +++++----- packages/react/counter/src/utils.ts | 2 +- packages/react/leaderboard/src/Leaderboard.tsx | 8 ++++---- packages/react/time-series/src/TimeSeries.tsx | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/react/counter/src/Counter.tsx b/packages/react/counter/src/Counter.tsx index 8dcc4c10..08d10819 100644 --- a/packages/react/counter/src/Counter.tsx +++ b/packages/react/counter/src/Counter.tsx @@ -75,10 +75,10 @@ export function Counter(props: CounterProps) { uniqueName: query?.metric, counterInput: { timeRange: { - relative: query?.timeRange?.relative || null, - n: query?.timeRange?.n || null, - start: query?.timeRange?.start || null, - stop: query?.timeRange?.stop || null + relative: query?.timeRange?.relative ?? null, + n: query?.timeRange?.n ?? null, + start: query?.timeRange?.start ?? null, + stop: query?.timeRange?.stop ?? null }, filters, propeller: query?.propeller @@ -141,7 +141,7 @@ export function Counter(props: CounterProps) { if (!isStatic) { const fetchedValue = await fetchData() - if (typeof fetchedValue === 'undefined') { + if (fetchedValue === undefined) { setHasError(true) console.error(`QueryError: Your metric ${query?.metric} returned undefined.`) return diff --git a/packages/react/counter/src/utils.ts b/packages/react/counter/src/utils.ts index 9129e2b0..1a1b0b16 100644 --- a/packages/react/counter/src/utils.ts +++ b/packages/react/counter/src/utils.ts @@ -29,7 +29,7 @@ export const getValueWithPrefixAndSufix = (params: { }) => { const { prefix, value, sufix, localize } = params - if (typeof value === 'undefined') return + if (value === undefined) return return (prefix ? prefix : '') + getValue({ value, localize }) + (sufix ? sufix : '') } diff --git a/packages/react/leaderboard/src/Leaderboard.tsx b/packages/react/leaderboard/src/Leaderboard.tsx index ef7ce46d..be34d898 100644 --- a/packages/react/leaderboard/src/Leaderboard.tsx +++ b/packages/react/leaderboard/src/Leaderboard.tsx @@ -214,10 +214,10 @@ export function Leaderboard(props: LeaderboardProps) { rowLimit: query?.rowLimit, dimensions, timeRange: { - relative: query?.timeRange?.relative || null, - n: query?.timeRange?.n || null, - start: query?.timeRange?.start || null, - stop: query?.timeRange?.stop || null + relative: query?.timeRange?.relative ?? null, + n: query?.timeRange?.n ?? null, + start: query?.timeRange?.start ?? null, + stop: query?.timeRange?.stop ?? null } } }, diff --git a/packages/react/time-series/src/TimeSeries.tsx b/packages/react/time-series/src/TimeSeries.tsx index 7c65c15b..4037b934 100644 --- a/packages/react/time-series/src/TimeSeries.tsx +++ b/packages/react/time-series/src/TimeSeries.tsx @@ -268,10 +268,10 @@ export function TimeSeries(props: TimeSeriesProps) { uniqueName: query?.metric, timeSeriesInput: { timeRange: { - relative: query?.timeRange?.relative || null, - n: query?.timeRange?.n || null, - start: query?.timeRange?.start || null, - stop: query?.timeRange?.stop || null + relative: query?.timeRange?.relative ?? null, + n: query?.timeRange?.n ?? null, + start: query?.timeRange?.start ?? null, + stop: query?.timeRange?.stop ?? null }, granularity, filters: filters,