From caf070dca3aabaf0bb3b0028ace02fa09c3ec7b6 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sat, 11 Nov 2023 18:16:04 -0500 Subject: [PATCH] yarn prettier Signed-off-by: Yuri Shkuro --- packages/jaeger-ui/src/utils/config/get-config.test.js | 4 ++-- packages/jaeger-ui/src/utils/config/get-config.tsx | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/jaeger-ui/src/utils/config/get-config.test.js b/packages/jaeger-ui/src/utils/config/get-config.test.js index 75e445b054..52ab1d867a 100644 --- a/packages/jaeger-ui/src/utils/config/get-config.test.js +++ b/packages/jaeger-ui/src/utils/config/get-config.test.js @@ -108,8 +108,8 @@ describe('getConfig()', () => { } embedded[key] = { a: true, b: false }; const expected = { ...defaultConfig, ...embedded }; - expected[key] = { ...defaultConfig[key], ...embedded[key]}; - expect(getConfig()).toEqual({...expected, storageCapabilities: capabilities}); + expected[key] = { ...defaultConfig[key], ...embedded[key] }; + expect(getConfig()).toEqual({ ...expected, storageCapabilities: capabilities }); }); }); }); diff --git a/packages/jaeger-ui/src/utils/config/get-config.tsx b/packages/jaeger-ui/src/utils/config/get-config.tsx index 11f3ee01f6..f9913acc23 100644 --- a/packages/jaeger-ui/src/utils/config/get-config.tsx +++ b/packages/jaeger-ui/src/utils/config/get-config.tsx @@ -30,14 +30,14 @@ const getConfig = memoizeOne(function getConfig() { const embedded = getUiConfig(); if (!embedded) { - return {...defaultConfig, storageCapabilities: capabilities}; + return { ...defaultConfig, storageCapabilities: capabilities }; } // check for deprecated config values if (Array.isArray(deprecations)) { deprecations.forEach(deprecation => processDeprecation(embedded, deprecation, !haveWarnedDeprecations)); haveWarnedDeprecations = true; } - const rv = { ...defaultConfig, ...embedded}; + const rv = { ...defaultConfig, ...embedded }; // mergeFields config values should be merged instead of fully replaced const keys = mergeFields; for (let i = 0; i < keys.length; i++) { @@ -46,7 +46,7 @@ const getConfig = memoizeOne(function getConfig() { rv[key] = { ...defaultConfig[key], ...embedded[key] }; } } - return {...rv, storageCapabilities: capabilities}; + return { ...rv, storageCapabilities: capabilities }; }); function getUiConfig() { @@ -61,8 +61,8 @@ function getUiConfig() { function getCapabilities() { const getter = window.getJaegerStorageCapabilities; - const capabilities = (typeof getter === 'function') ? getter() : null; - return (capabilities) ? capabilities : defaultConfig.storageCapabilities; + const capabilities = typeof getter === 'function' ? getter() : null; + return capabilities ? capabilities : defaultConfig.storageCapabilities; } export default getConfig;