Skip to content

Commit c205938

Browse files
author
amvanbaren
committed
Use nullish coalescing
1 parent 682e31f commit c205938

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

‎cli/src/registry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export class Registry {
3434
this.url = options.registryUrl;
3535
else
3636
this.url = DEFAULT_URL;
37-
this.maxNamespaceSize = options.maxNamespaceSize || DEFAULT_NAMESPACE_SIZE;
38-
this.maxPublishSize = options.maxPublishSize || DEFAULT_PUBLISH_SIZE;
37+
this.maxNamespaceSize = options.maxNamespaceSize ?? DEFAULT_NAMESPACE_SIZE;
38+
this.maxPublishSize = options.maxPublishSize ?? DEFAULT_PUBLISH_SIZE;
3939
this.username = options.username;
4040
this.password = options.password;
4141
}

‎cli/src/util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export function statusError(response: http.IncomingMessage): Error {
9999
export function readFile(name: string, packagePath?: string, encoding: BufferEncoding = 'utf-8'): Promise<string> {
100100
return new Promise((resolve, reject) => {
101101
fs.readFile(
102-
path.join(packagePath || process.cwd(), name),
102+
path.join(packagePath ?? process.cwd(), name),
103103
{ encoding },
104104
(err, content) => {
105105
if (err) {
@@ -132,7 +132,7 @@ export function validateManifest(manifest: Manifest): void {
132132
export function writeFile(name: string, content: string, packagePath?: string, encoding: BufferEncoding = 'utf-8'): Promise<void> {
133133
return new Promise((resolve, reject) => {
134134
fs.writeFile(
135-
path.join(packagePath || process.cwd(), name),
135+
path.join(packagePath ?? process.cwd(), name),
136136
content,
137137
{ encoding },
138138
err => {

‎webui/src/pages/extension-detail/extension-detail.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ export const ExtensionDetail: FunctionComponent = () => {
216216

217217
const renderExtension = (extension: Extension): ReactNode => {
218218
const tab = versionPointsToTab(version) ? version as string : 'overview';
219-
const headerTheme = extension.galleryTheme || pageSettings.themeType || 'light';
219+
const headerTheme = extension.galleryTheme ?? pageSettings.themeType ?? 'light';
220220
const headerColor = headerTheme === 'dark' ? '#fff' : '#151515';
221221
return <>
222222
<Box
223223
sx={{
224-
bgcolor: extension.galleryColor || 'neutral.dark',
224+
bgcolor: extension.galleryColor ?? 'neutral.dark',
225225
color: headerColor
226226
}}
227227
>
@@ -240,7 +240,7 @@ export const ExtensionDetail: FunctionComponent = () => {
240240
<Box
241241
component='img'
242242
src={icon || pageSettings.urls.extensionDefaultIcon }
243-
alt={extension.displayName || extension.name}
243+
alt={extension.displayName ?? extension.name}
244244
sx={{
245245
height: '7.5rem',
246246
maxWidth: '9rem',
@@ -289,7 +289,7 @@ export const ExtensionDetail: FunctionComponent = () => {
289289
>
290290
<WarningIcon fontSize='large' />
291291
<Box ml={1}>
292-
This version of the &ldquo;{extension.displayName || extension.name}&rdquo; extension was published
292+
This version of the &ldquo;{extension.displayName ?? extension.name}&rdquo; extension was published
293293
by <Link href={extension.publishedBy.homepage}>
294294
{extension.publishedBy.loginName}
295295
</Link>. That user account is not a verified publisher of
@@ -320,7 +320,7 @@ export const ExtensionDetail: FunctionComponent = () => {
320320
<Box overflow='auto' sx={{ pt: 1, overflow: 'visible' }}>
321321
<Badge color='secondary' badgeContent='Preview' invisible={!extension.preview} sx={previewBadgeStyle}>
322322
<Typography variant='h5' sx={{ fontWeight: 'bold', mb: 1 }}>
323-
{ extension.displayName || extension.name}
323+
{ extension.displayName ?? extension.name}
324324
</Typography>
325325
</Badge>
326326
<Box
@@ -335,7 +335,7 @@ export const ExtensionDetail: FunctionComponent = () => {
335335
<StyledRouteLink
336336
to={createRoute([NamespaceDetailRoutes.ROOT, extension.namespace])}
337337
style={{ color: themeColor }}>
338-
{extension.namespaceDisplayName || extension.namespace}
338+
{extension.namespaceDisplayName ?? extension.namespace}
339339
</StyledRouteLink>
340340
</Box>
341341
<TextDivider themeType={themeType} collapseSmall={true} />
@@ -373,7 +373,7 @@ export const ExtensionDetail: FunctionComponent = () => {
373373
`Average rating: ${getRoundedRating(extension.averageRating)} out of 5 (${extension.reviewCount} reviews)`
374374
: 'Not rated yet'
375375
}>
376-
<ExportRatingStars number={extension.averageRating || 0} fontSize='small' />
376+
<ExportRatingStars number={extension.averageRating ?? 0} fontSize='small' />
377377
({reviewCountFormatted})
378378
</StyledLink>
379379
</Box>
@@ -410,7 +410,7 @@ export const ExtensionDetail: FunctionComponent = () => {
410410
user.avatarUrl ?
411411
<Avatar
412412
src={user.avatarUrl}
413-
alt={user.fullName || user.loginName}
413+
alt={user.fullName ?? user.loginName}
414414
variant='rounded'
415415
sx={{ width: '60px', height: '60px' }} />
416416
: null
@@ -449,7 +449,7 @@ export const ExtensionDetail: FunctionComponent = () => {
449449
href={extension.files.license}
450450
sx={{ color: themeColor }}
451451
title={extension.license ? 'License type' : undefined} >
452-
{extension.license || 'Provided license'}
452+
{extension.license ?? 'Provided license'}
453453
</StyledLink>;
454454
} else if (extension.license) {
455455
return extension.license;

‎webui/src/pages/extension-list/extension-list-container.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ export const ExtensionListContainer: FunctionComponent = () => {
3333

3434
useEffect(() => {
3535
const searchParams = new URLSearchParams(search);
36-
setSearchQuery(searchParams.get('search') || '');
37-
setCategory(searchParams.get('category') as ExtensionCategory || '');
38-
setSortBy(searchParams.get('sortBy') as SortBy || 'relevance');
39-
setSortOrder(searchParams.get('sortOrder') as SortOrder || 'desc');
36+
setSearchQuery(searchParams.get('search') ?? '');
37+
setCategory(searchParams.get('category') as ExtensionCategory ?? '');
38+
setSortBy(searchParams.get('sortBy') as SortBy ?? 'relevance');
39+
setSortOrder(searchParams.get('sortOrder') as SortOrder ?? 'desc');
4040
}, []);
4141

4242
const onSearchChanged = (searchQuery: string): void => {

‎webui/src/pages/namespace-detail/namespace-detail.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,19 @@ export const NamespaceDetail: FunctionComponent = () => {
120120
<Grid item>
121121
<Box
122122
component='img'
123-
src={namespaceDetails.logo || pageSettings.urls.extensionDefaultIcon}
123+
src={namespaceDetails.logo ?? pageSettings.urls.extensionDefaultIcon}
124124
sx={{
125125
height: '7.5rem',
126126
maxWidth: '9rem',
127127
mr: { xs: 0, sm: 0, md: '2rem', lg: '2rem', xl: '2rem' },
128128
pt: 1
129129
}}
130-
alt={namespaceDetails.displayName || namespaceDetails.name} />
130+
alt={namespaceDetails.displayName ?? namespaceDetails.name} />
131131
</Grid>
132132
<Grid item xs={7}>
133133
<Grid container spacing={2}>
134134
<Grid item xs={12}>
135-
<Typography variant='h5'>{namespaceDetails.displayName || namespaceDetails.name}</Typography>
135+
<Typography variant='h5'>{namespaceDetails.displayName ?? namespaceDetails.name}</Typography>
136136
</Grid>
137137
<Grid item xs={12} sx={{ pr: '0 !important' }}>
138138
{

‎webui/src/pages/user/user-namespace-details.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export const UserNamespaceDetails: FunctionComponent<UserNamespaceDetailsProps>
188188

189189
setDetailsUpdated(true);
190190
setCurrentDetails(copy(details));
191-
setBannerNamespaceName(details.displayName || details.name);
191+
setBannerNamespaceName(details.displayName ?? details.name);
192192
} catch (err) {
193193
context.handleError(err);
194194
} finally {

‎webui/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,5 +196,5 @@ export function getTargetPlatformDisplayName(targetPlatform: string): string {
196196
[TargetPlatform.WEB, 'Web']
197197
]);
198198

199-
return targetPlatformDisplayNames.get(targetPlatform) || '';
199+
return targetPlatformDisplayNames.get(targetPlatform) ?? '';
200200
}

0 commit comments

Comments
 (0)