Merge pull request #915 from amvanbaren/optional-chain-expression

amvanbaren · web-flow · commit 682e31f6d0e3 · 2024-05-15T22:54:53.000+03:00
Use optional chain expression
diff --git a/cli/src/get.ts b/cli/src/get.ts
@@ -74,7 +74,7 @@ async function printMetadata(registry: Registry, extension: Extension, output?:
     }
     let filePath: string | undefined;
     const stats = await optionalStat(output);
-    if (stats && stats.isDirectory() || !stats && output.endsWith(path.sep)) {
+    if (stats?.isDirectory() || !stats && output.endsWith(path.sep)) {
         const fileName = `${extension.namespace}.${extension.name}-${extension.version}.json`;
         filePath = path.resolve(process.cwd(), output, fileName);
     } else {
@@ -94,7 +94,7 @@ async function download(registry: Registry, extension: Extension, output?: strin
     let filePath: string | undefined;
     if (output) {
         const stats = await optionalStat(output);
-        if (stats && stats.isDirectory() || !stats && output.endsWith(path.sep)) {
+        if (stats?.isDirectory() || !stats && output.endsWith(path.sep)) {
             filePath = path.resolve(process.cwd(), output, fileName);
         } else {
             filePath = path.resolve(process.cwd(), output);
diff --git a/cli/src/publish.ts b/cli/src/publish.ts
@@ -35,7 +35,7 @@ async function doPublish(options: InternalPublishOptions = {}): Promise<void> {
     }
 
     // if the packagePath is a link to a vsix, don't need to package it
-    if (options.packagePath && options.packagePath.endsWith('.vsix')) {
+    if (options.packagePath?.endsWith('.vsix')) {
         options.extensionFile = options.packagePath;
         delete options.packagePath;
         delete options.target;
diff --git a/cli/src/registry.ts b/cli/src/registry.ts
@@ -28,7 +28,7 @@ export class Registry {
     readonly password?: string;
 
     constructor(options: RegistryOptions = {}) {
-        if (options.registryUrl && options.registryUrl.endsWith('/'))
+        if (options.registryUrl?.endsWith('/'))
             this.url = options.registryUrl.substring(0, options.registryUrl.length - 1);
         else if (options.registryUrl)
             this.url = options.registryUrl;
diff --git a/webui/src/components/sidepanel/navigation-item.tsx b/webui/src/components/sidepanel/navigation-item.tsx
@@ -21,7 +21,7 @@ export const NavigationItem: FunctionComponent<PropsWithChildren<NavigationProps
         if (props.children) {
             setOpen(!open);
         } else if (props.route) {
-            props.onOpenRoute && props.onOpenRoute(props.route);
+            props.onOpenRoute?.call(props.route);
             navigate(props.route);
         }
     };
diff --git a/webui/src/pages/admin-dashboard/publisher-admin.tsx b/webui/src/pages/admin-dashboard/publisher-admin.tsx
@@ -49,7 +49,7 @@ export const PublisherAdmin: FunctionComponent = props => {
             }
             setLoading(false);
         } catch (err) {
-            if (err && err.status && err.status === 404) {
+            if (err?.status === 404) {
                 setNotFound(publisherName);
                 setPublisher(undefined);
             } else {
diff --git a/webui/src/pages/admin-dashboard/publisher-revoke-dialog.tsx b/webui/src/pages/admin-dashboard/publisher-revoke-dialog.tsx
@@ -32,7 +32,7 @@ export const PublisherRevokeDialog: FunctionComponent<PublisherRevokeDialogProps
     }, []);
 
     if (props.publisherInfo.user.publisherAgreement
-            && !(user && user.additionalLogins && user.additionalLogins.find(login => login.provider === 'eclipse'))) {
+            && !(user?.additionalLogins?.find(login => login.provider === 'eclipse'))) {
         // If a publisher agreement is required, the admin must be logged in with Eclipse to revoke it
         return <Link href={createAbsoluteURL([service.serverUrl, 'oauth2', 'authorization', 'eclipse'])}>
             <Button variant='contained' color='secondary'>
diff --git a/webui/src/pages/user/user-namespace-extension-list-item.tsx b/webui/src/pages/user/user-namespace-extension-list-item.tsx
@@ -63,7 +63,7 @@ export const UserNamespaceExtensionListItem: FunctionComponent<UserNamespaceExte
                     }}>
                     <Box
                         component='img'
-                        src={icon || (pageSettings && pageSettings.urls.extensionDefaultIcon) || ''}
+                        src={icon || (pageSettings?.urls.extensionDefaultIcon) || ''}
                         alt={extension.displayName || extension.name}
                         sx={{
                             flex: '0 0 15%',
diff --git a/webui/src/pages/user/user-publisher-agreement.tsx b/webui/src/pages/user/user-publisher-agreement.tsx
@@ -57,7 +57,7 @@ export const UserPublisherAgreement: FunctionComponent<UserPublisherAgreementPro
     };
 
     const openPublisherAgreement = () => {
-        if (!pageSettings || !pageSettings.urls.publisherAgreement) {
+        if (!pageSettings.urls.publisherAgreement) {
             handleError({ error: 'Publisher agreement text is not available.' });
         } else {
             setDialogOpen(true);
@@ -99,31 +99,31 @@ export const UserPublisherAgreement: FunctionComponent<UserPublisherAgreementPro
                         }
                     </Typography>
                     :
-                    !user.additionalLogins || !user.additionalLogins.find(login => login.provider === 'eclipse') ?
+                    user.additionalLogins?.find(login => login.provider === 'eclipse') ?
                         <>
                             <Typography variant='body1'>
                                 You need to sign the Eclipse Foundation Open VSX Publisher Agreement before you can publish
-                                any extension to this registry. To start the signing process, please log in with
-                                an Eclipse Foundation account.
+                                any extension to this registry.
                             </Typography>
                             <Box mt={2} display='flex' justifyContent='flex-end'>
-                                <Link href={createAbsoluteURL([service.serverUrl, 'oauth2', 'authorization', 'eclipse'])}>
-                                    <Button variant='outlined' color='secondary'>
-                                        Log in with Eclipse
-                                    </Button>
-                                </Link>
+                                <Button onClick={openPublisherAgreement} variant='outlined' color='secondary'>
+                                    Show Publisher Agreement
+                                </Button>
                             </Box>
                         </>
                         :
                         <>
                             <Typography variant='body1'>
                                 You need to sign the Eclipse Foundation Open VSX Publisher Agreement before you can publish
-                                any extension to this registry.
+                                any extension to this registry. To start the signing process, please log in with
+                                an Eclipse Foundation account.
                             </Typography>
                             <Box mt={2} display='flex' justifyContent='flex-end'>
-                                <Button onClick={openPublisherAgreement} variant='outlined' color='secondary'>
-                                    Show Publisher Agreement
-                                </Button>
+                                <Link href={createAbsoluteURL([service.serverUrl, 'oauth2', 'authorization', 'eclipse'])}>
+                                    <Button variant='outlined' color='secondary'>
+                                        Log in with Eclipse
+                                    </Button>
+                                </Link>
                             </Box>
                         </>}
         </Paper>

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ async function doPublish(options: InternalPublishOptions = {}): Promise<void> {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// if the packagePath is a link to a vsix, don't need to package it`
`38`		`- if (options.packagePath && options.packagePath.endsWith('.vsix')) {`
	`38`	`+ if (options.packagePath?.endsWith('.vsix')) {`
`39`	`39`	`options.extensionFile = options.packagePath;`
`40`	`40`	`delete options.packagePath;`
`41`	`41`	`delete options.target;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export const NavigationItem: FunctionComponent<PropsWithChildren<NavigationProps`
`21`	`21`	`if (props.children) {`
`22`	`22`	`setOpen(!open);`
`23`	`23`	`} else if (props.route) {`
`24`		`- props.onOpenRoute && props.onOpenRoute(props.route);`
	`24`	`+ props.onOpenRoute?.call(props.route);`
`25`	`25`	`navigate(props.route);`
`26`	`26`	`}`
`27`	`27`	`};`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export const PublisherAdmin: FunctionComponent = props => {`
`49`	`49`	`}`
`50`	`50`	`setLoading(false);`
`51`	`51`	`} catch (err) {`
`52`		`- if (err && err.status && err.status === 404) {`
	`52`	`+ if (err?.status === 404) {`
`53`	`53`	`setNotFound(publisherName);`
`54`	`54`	`setPublisher(undefined);`
`55`	`55`	`} else {`