Elgato_dark/podman-desktop
1
0
Fork 0
mirror of https://github.com/podman-desktop/podman-desktop synced 2026-05-24 10:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: prefer-optional-chain syntax

Browse source 
fixes linting issues

Change-Id: I8ca754cca17fc141bc5e84de74e0560edc91b0d5
Signed-off-by: Florent Benoit <fbenoit@redhat.com>
This commit is contained in:
Florent Benoit 2023-05-15 13:06:03 +02:00 committed by Florent BENOIT
parent d10c734e0b
commit 369291bc17
17 changed files with 44 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.json
View file

@ -55,6 +55,7 @@
"@typescript-eslint/await-thenable": "error",
"@typescript-eslint/no-floating-promises": "error",
"@typescript-eslint/no-misused-promises": "error",
"@typescript-eslint/prefer-optional-chain": "error",
/**
* Having a semicolon helps the optimizer interpret your code correctly.

2
extensions/podman/src/podman-configuration.ts
View file

@ -55,7 +55,7 @@ export class PodmanConfiguration {
const containersConfigFile = await this.readContainersConfigFile();
const tomlConfigFile = toml.parse(containersConfigFile);
if (tomlConfigFile && tomlConfigFile.engine) {
if (tomlConfigFile?.engine) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const engineConf: any = tomlConfigFile.engine;

6
extensions/podman/src/podman-install.ts
View file

@ -149,11 +149,7 @@ export class PodmanInstall {
const installer = this.getInstaller();
const bundledVersion = getBundledPodmanVersion();
if (
installer &&
installer.requireUpdate(installedVersion) &&
this.podmanInfo.ignoreVersionUpdate !== bundledVersion
) {
if (installer?.requireUpdate(installedVersion) && this.podmanInfo.ignoreVersionUpdate !== bundledVersion) {
return { installedVersion, hasUpdate: true, bundledVersion };
}
return { installedVersion, hasUpdate: false, bundledVersion };

2
packages/main/src/mainWindow.ts
View file

@ -193,7 +193,7 @@ async function createWindow() {
// In development mode, show the "Open DevTools of Extension" menu item
if (import.meta.env.DEV) {
let extensionId = '';
if (parameters.linkURL && parameters.linkURL.includes('/contribs')) {
if (parameters?.linkURL?.includes('/contribs')) {
extensionId = parameters.linkURL.split('/contribs/')[1];
}
return [

5
packages/main/src/plugin/authentication.ts
View file

@ -215,10 +215,7 @@ export class AuthenticationImpl {
if (!options.silent) {
const providerRequests = this._signInRequests.get(providerId);
const scopesList = sortedScopes.join(' ');
const extHasRequests =
providerRequests &&
providerRequests[scopesList] &&
providerRequests[scopesList].includes(requestingExtension.id);
const extHasRequests = providerRequests?.[scopesList]?.includes(requestingExtension.id);
if (extHasRequests) {
// request was added already by this extension
return;

11
packages/main/src/plugin/container-registry.ts
View file

@ -584,10 +584,7 @@ export class ContainerProviderRegistry {
containerProvider.connection.endpoint.socketPath === providerContainerConnectionInfo.endpoint.socketPath &&
containerProvider.connection.name === providerContainerConnectionInfo.name,
);
if (!matchingContainerProvider || !matchingContainerProvider.api) {
throw new Error('No provider with a running engine');
}
if (!matchingContainerProvider.api) {
if (!matchingContainerProvider?.api) {
throw new Error('no running provider for the matching container');
}
return matchingContainerProvider.api;
@ -715,7 +712,7 @@ export class ContainerProviderRegistry {
containerProvider.connection.endpoint.socketPath === selectedProvider.endpoint.socketPath &&
containerProvider.connection.name === selectedProvider.name,
);
if (!matchingContainerProvider || !matchingContainerProvider.libpodApi) {
if (!matchingContainerProvider?.libpodApi) {
throw new Error('No provider with a running engine');
}
const result = await matchingContainerProvider.libpodApi.createPod(podOptions);
@ -1029,7 +1026,7 @@ export class ContainerProviderRegistry {
containerProvider.connection.endpoint.socketPath === selectedProvider.endpoint.socketPath &&
containerProvider.name === selectedProvider.name,
);
if (!matchingContainerProvider || !matchingContainerProvider.libpodApi) {
if (!matchingContainerProvider?.libpodApi) {
throw new Error('No provider with a running engine');
}
return matchingContainerProvider.libpodApi.playKube(kubernetesYamlFilePath);
@ -1050,7 +1047,7 @@ export class ContainerProviderRegistry {
containerProvider.connection.name === selectedProvider.name &&
selectedProvider.status === 'started',
);
if (!matchingContainerProvider || !matchingContainerProvider.api) {
if (!matchingContainerProvider?.api) {
throw new Error('No provider with a running engine');
}

2
packages/main/src/plugin/docker-extension/docker-desktop-installation.ts
View file

@ -64,7 +64,7 @@ export class DockerDesktopInstallation {
// host binaries
const hostFiles: string[] = [];
if (metadata.host && metadata.host.binaries) {
if (metadata?.host?.binaries) {
// grab current platform
let platform: string = process.platform;
if (platform === 'win32') {

6
packages/main/src/plugin/events/emitter.ts
View file

@ -24,7 +24,7 @@ class CallbackList implements Iterable<Callback> {
private _contexts: any[] | undefined;
get length(): number {
return (this._callbacks && this._callbacks.length) || 0;
return this._callbacks?.length || 0;
}
public add(callback: Function, context: any = undefined, bucket?: IDisposable[]): void {
@ -146,7 +146,7 @@ export class Emitter<T = any> {
if (!this._callbacks) {
this._callbacks = new CallbackList();
}
if (this._options && this._options.onFirstListenerAdd && this._callbacks.isEmpty()) {
if (this._options?.onFirstListenerAdd && this._callbacks.isEmpty()) {
this._options.onFirstListenerAdd(this);
}
this._callbacks.add(listener, thisArgs);
@ -161,7 +161,7 @@ export class Emitter<T = any> {
if (!this._disposed) {
this._callbacks?.remove(listener, thisArgs);
result.dispose = Emitter._noop;
if (this._options && this._options.onLastListenerRemove && this._callbacks?.isEmpty()) {
if (this._options?.onLastListenerRemove && this._callbacks?.isEmpty()) {
this._options.onLastListenerRemove(this);
}
}

4
packages/main/src/plugin/extension-loader.ts
View file

@ -167,7 +167,7 @@ export class ExtensionLoader {
const extension = Array.from(analyzedExtensions.values()).find(extension =>
path.normalize(parent.filename).startsWith(path.normalize(extension.path)),
);
if (extension && extension.api) {
if (extension?.api) {
return extension.api;
}
throw new Error('Unable to find extension API');
@ -763,7 +763,7 @@ export class ExtensionLoader {
while (i--) {
const childMod: NodeJS.Module | undefined = mod?.children[i];
// ensure the child module is not null, is in the plug-in folder, and is not a native module (see above)
if (childMod && childMod.id.startsWith(extension.path) && !childMod.id.endsWith('.node')) {
if (childMod?.id.startsWith(extension.path) && !childMod.id.endsWith('.node')) {
// cleanup exports - note that some modules (e.g. ansi-styles) define their
// exports in an immutable manner, so overwriting the exports throws an error
delete childMod.exports;

6
packages/main/src/plugin/image-registry.ts
View file

@ -285,7 +285,7 @@ export class ImageRegistry {
/(?<scheme>Bearer|Basic) realm="(?<realm>[^"]+)"(,service="(?<service>[^"]+)")?(,scope="(?<scope>[^"]+)")?/;
const parsed = WWW_AUTH_REGEXP.exec(wwwAuthenticate);
if (parsed && parsed.groups) {
if (parsed?.groups) {
const { realm, service, scope, scheme } = parsed.groups;
return { authUrl: realm, service, scope, scheme };
}
@ -305,8 +305,8 @@ export class ImageRegistry {
if (this.proxyEnabled) {
// use proxy when performing got request
const proxy = this.proxySettings;
const httpProxyUrl = proxy && proxy.httpProxy;
const httpsProxyUrl = proxy && proxy.httpsProxy;
const httpProxyUrl = proxy?.httpProxy;
const httpsProxyUrl = proxy?.httpsProxy;
if (httpProxyUrl) {
if (!options.agent) {

4
packages/main/src/plugin/input-quickpick/input-quickpick-registry.ts
View file

@ -137,7 +137,7 @@ export class InputQuickPickRegistry {
const callback = this.callbacksInputBox.get(id);
// if there is a callback
if (callback && callback.options?.validateInput) {
if (callback?.options?.validateInput) {
return callback.options.validateInput(value);
}
return undefined;
@ -149,7 +149,7 @@ export class InputQuickPickRegistry {
const callback = this.callbacksQuickPicks.get(id);
// if there is a callback
if (callback && callback.options?.onDidSelectItem) {
if (callback?.options?.onDidSelectItem) {
// grab item
const item = callback.items[index];

12
packages/main/src/plugin/kubernetes-client.ts
View file

@ -383,7 +383,7 @@ export class KubernetesClient {
fieldSelector,
labelSelector,
);
if (res && res.body) {
if (res?.body) {
return res.body;
} else {
return {
@ -434,7 +434,7 @@ export class KubernetesClient {
const k8sApi = this.kubeConfig.makeApiClient(CoreV1Api);
try {
const res = await k8sApi.readNamespacedPod(name, namespace);
if (res && res.body) {
if (res?.body) {
return res.body;
} else {
return undefined;
@ -448,7 +448,7 @@ export class KubernetesClient {
const k8sApi = this.kubeConfig.makeApiClient(CoreV1Api);
try {
const res = await k8sApi.readNamespacedConfigMap(name, namespace);
if (res && res.body) {
if (res?.body) {
return res.body;
} else {
return undefined;
@ -462,7 +462,7 @@ export class KubernetesClient {
try {
const k8sApi = this.kubeConfig.makeApiClient(CoreV1Api);
const res = await k8sApi.listNamespace();
if (res && res.body) {
if (res?.body) {
return res.body;
} else {
return {
@ -489,7 +489,7 @@ export class KubernetesClient {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
private wrapK8sClientError(e: any): Error {
if (e.response && e.response.body) {
if (e?.response?.body) {
if (e.response.body.message) {
return this.newError(e.response.body.message, e);
}
@ -633,7 +633,7 @@ export class KubernetesClient {
await this.createResources(context, manifests, namespace);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (error: any) {
if (error.response && error.response.body) {
if (error?.response?.body) {
if (error.response.body.message) {
throw new Error(error.response.body.message);
}

18
packages/main/src/plugin/provider-registry.ts
View file

@ -442,7 +442,7 @@ export class ProviderRegistry {
if (provider.containerConnections && provider.containerConnections.length > 0) {
const connection = provider.containerConnections[0];
const lifecycle = connection.lifecycle;
if (!lifecycle || !lifecycle.start) {
if (!lifecycle?.start) {
throw new Error('The container connection does not support start lifecycle');
}
@ -469,7 +469,7 @@ export class ProviderRegistry {
return this.intializeProviderLifecycle(providerInternalId);
}
if (provider.containerProviderConnectionFactory && provider.containerProviderConnectionFactory.initialize) {
if (provider?.containerProviderConnectionFactory?.initialize) {
this.telemetryService
.track('initializeProvider', {
name: provider.name,
@ -479,7 +479,7 @@ export class ProviderRegistry {
return provider.containerProviderConnectionFactory.initialize();
}
if (provider.kubernetesProviderConnectionFactory && provider.kubernetesProviderConnectionFactory.initialize) {
if (provider?.kubernetesProviderConnectionFactory?.initialize) {
this.telemetryService
.track('initializeProvider', {
name: provider.name,
@ -549,13 +549,13 @@ export class ProviderRegistry {
// container connection factory ?
let containerProviderConnectionInitialization = false;
if (provider.containerProviderConnectionFactory && provider.containerProviderConnectionFactory.initialize) {
if (provider?.containerProviderConnectionFactory?.initialize) {
containerProviderConnectionInitialization = true;
}
// kubernetes connection factory ?
let kubernetesProviderConnectionCreation = false;
if (provider.kubernetesProviderConnectionFactory && provider.kubernetesProviderConnectionFactory.create) {
if (provider?.kubernetesProviderConnectionFactory?.create) {
kubernetesProviderConnectionCreation = true;
}
@ -576,7 +576,7 @@ export class ProviderRegistry {
const kubernetesProviderConnectionCreationButtonTitle =
provider.kubernetesProviderConnectionFactory?.creationButtonTitle;
const emptyConnectionMarkdownDescription = provider.emptyConnectionMarkdownDescription;
if (provider.kubernetesProviderConnectionFactory && provider.kubernetesProviderConnectionFactory.initialize) {
if (provider?.kubernetesProviderConnectionFactory?.initialize) {
kubernetesProviderConnectionInitialization = true;
}
@ -780,7 +780,7 @@ export class ProviderRegistry {
const connection = this.getMatchingConnectionFromProvider(internalProviderId, providerConnectionInfo);
const lifecycle = connection.lifecycle;
if (!lifecycle || !lifecycle.start) {
if (!lifecycle?.start) {
throw new Error('The container connection does not support start lifecycle');
}
@ -830,7 +830,7 @@ export class ProviderRegistry {
const connection = this.getMatchingConnectionFromProvider(internalProviderId, providerConnectionInfo);
const lifecycle = connection.lifecycle;
if (!lifecycle || !lifecycle.stop) {
if (!lifecycle?.stop) {
throw new Error('The container connection does not support stop lifecycle');
}
@ -880,7 +880,7 @@ export class ProviderRegistry {
const connection = this.getMatchingConnectionFromProvider(internalProviderId, providerConnectionInfo);
const lifecycle = connection.lifecycle;
if (!lifecycle || !lifecycle.delete) {
if (!lifecycle?.delete) {
throw new Error('The container connection does not support delete lifecycle');
}
this.telemetryService

8
packages/preload-docker-extension/src/index.ts
View file

@ -184,7 +184,7 @@ export class DockerExtensionPreload {
'docker-plugin-adapter:execWithOptions-callback-stdout',
(_event, callbackId: number, data: string) => {
const streamOptions = this.onDockerPluginExecWithOptionsCallbacks.get(callbackId);
if (streamOptions && streamOptions.onOutput) {
if (streamOptions?.onOutput) {
streamOptions.onOutput({ stdout: data });
}
},
@ -193,7 +193,7 @@ export class DockerExtensionPreload {
'docker-plugin-adapter:execWithOptions-callback-stderr',
(_event, callbackId: number, data: string) => {
const streamOptions = this.onDockerPluginExecWithOptionsCallbacks.get(callbackId);
if (streamOptions && streamOptions.onOutput) {
if (streamOptions?.onOutput) {
streamOptions.onOutput({ stderr: data });
}
},
@ -202,14 +202,14 @@ export class DockerExtensionPreload {
'docker-plugin-adapter:execWithOptions-callback-close',
(_event, callbackId: number, exitCode: number) => {
const streamOptions = this.onDockerPluginExecWithOptionsCallbacks.get(callbackId);
if (streamOptions && streamOptions.onClose) {
if (streamOptions?.onClose) {
streamOptions.onClose(exitCode);
}
},
);
ipcRenderer.on('docker-plugin-adapter:execWithOptions-callback-error', (_event, callbackId: number, error: any) => {
const streamOptions = this.onDockerPluginExecWithOptionsCallbacks.get(callbackId);
if (streamOptions && streamOptions.onError) {
if (streamOptions?.onError) {
streamOptions.onError(error);
}
});

6
packages/renderer/src/lib/container/container-utils.ts
View file

@ -25,9 +25,9 @@ import { filesize } from 'filesize';
export class ContainerUtils {
getName(containerInfo: ContainerInfo) {
// part of a compose ?
const composeService = (containerInfo.Labels || {})['com.docker.compose.service'];
const composeService = containerInfo.Labels?.['com.docker.compose.service'];
if (composeService) {
const composeContainerNumber = (containerInfo.Labels || {})['com.docker.compose.container-number'];
const composeContainerNumber = containerInfo.Labels?.['com.docker.compose.container-number'];
if (composeContainerNumber) {
return `${composeService}-${composeContainerNumber}`;
}
@ -139,7 +139,7 @@ export class ContainerUtils {
getContainerGroup(containerInfo: ContainerInfo): ContainerGroupPartInfoUI {
// compose metatadata ?
const composeProject = (containerInfo.Labels || {})['com.docker.compose.project'];
const composeProject = containerInfo.Labels?.['com.docker.compose.project'];
if (composeProject) {
return {
name: composeProject,

2
packages/renderer/src/lib/preferences/Util.ts
View file

@ -49,7 +49,7 @@ export function writeToTerminal(xterm: any, data: string[], colorPrefix: string)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
function writeMultilineString(xterm: any, data: string, colorPrefix: string): void {
if (data && data.includes && data.includes('\n')) {
if (data?.includes?.('\n')) {
const toWrite = data.split('\n');
for (const s of toWrite) {
xterm.write(colorPrefix + s + '\n\r');

2
website/src/components/TailWindThemeSelector/index.tsx
View file

@ -3,7 +3,7 @@ import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
function TailWindThemeSelector(): JSX.Element {
function updadeTailwindDarkTheme() {
if (!document || !document.documentElement) {
if (!document?.documentElement) {
return;
}