Skip to content

Commit

Permalink
yarn prettier
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <github@ysh.us>
  • Loading branch information
yurishkuro committed Nov 11, 2023
1 parent 676c671 commit caf070d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions packages/jaeger-ui/src/utils/config/get-config.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
});
});
});
Expand Down
10 changes: 5 additions & 5 deletions packages/jaeger-ui/src/utils/config/get-config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand All @@ -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() {
Expand All @@ -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;
Expand Down

0 comments on commit caf070d

Please sign in to comment.