diff --git a/src/common/utils/downloadFile.ts b/src/common/utils/downloadFile.ts index 666f713d09..02b9bbd797 100644 --- a/src/common/utils/downloadFile.ts +++ b/src/common/utils/downloadFile.ts @@ -32,5 +32,5 @@ export function downloadFile(opts: DownloadFileOptions): DownloadFileTicket { cancel() { req.abort(); } - } + }; } diff --git a/src/common/utils/tar.ts b/src/common/utils/tar.ts index 39b0a97d9f..2fb7fc7de6 100644 --- a/src/common/utils/tar.ts +++ b/src/common/utils/tar.ts @@ -37,7 +37,7 @@ export function readFileFromTar(tarFilePath: string, opts: ReadFileFromTarOpts): if (!fileChunks.length) { reject(notFoundMessage); } - }) + }); } export function extractTar(filePath: string, opts: ExtractOptions & { sync?: boolean } = {}) { @@ -45,5 +45,5 @@ export function extractTar(filePath: string, opts: ExtractOptions & { sync?: boo file: filePath, cwd: path.dirname(filePath), ...opts, - }) + }); } diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx index f77d3c1959..420d43ddd0 100644 --- a/src/renderer/components/+add-cluster/add-cluster.tsx +++ b/src/renderer/components/+add-cluster/add-cluster.tsx @@ -121,7 +121,7 @@ export class AddCluster extends React.Component { onDropKubeConfig = (files: File[]) => { this.sourceTab = KubeConfigSourceTab.FILE; this.setKubeConfig(files[0].path); - } + }; @action addClusters = () => { diff --git a/src/renderer/components/+extensions/extensions.scss b/src/renderer/components/+extensions/extensions.scss index 9d47a21800..114b7220ab 100644 --- a/src/renderer/components/+extensions/extensions.scss +++ b/src/renderer/components/+extensions/extensions.scss @@ -58,12 +58,11 @@ } .InstallingExtensionNotification { - .folder-remove-warning { + .remove-folder-warning { font-size: $font-size-small; - color: inherit; - cursor: pointer; font-style: italic; opacity: .8; + cursor: pointer; &:hover { opacity: 1; diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx index 997b8ffec6..72a48e7a91 100644 --- a/src/renderer/components/+extensions/extensions.tsx +++ b/src/renderer/components/+extensions/extensions.tsx @@ -77,7 +77,7 @@ export class Extensions extends React.Component { })) ); } - } + }; installExtensions = () => { if (this.downloadUrl) { @@ -86,13 +86,14 @@ export class Extensions extends React.Component { } else { this.installFromSelectFileDialog(); } - } + }; installFromNpmOrUrl = async (url = this.downloadUrl) => { if (!InputValidators.isUrl.validate(url)) { - url = extensionManager.getNpmPackageTarballUrl(url); + const npmPackageName = url; + url = extensionManager.getNpmPackageTarballUrl(npmPackageName); if (!url) { - Notifications.error(`Error: npm package "${url}" not found!`); + Notifications.error(`Error: npm package "${npmPackageName}" not found!`); return; } } @@ -110,7 +111,7 @@ export class Extensions extends React.Component { ); } - } + }; installOnDrop = (files: File[]) => { logger.info('Install from D&D'); @@ -120,7 +121,7 @@ export class Extensions extends React.Component { filePath: file.path, })) ); - } + }; async requestInstall(installRequests: InstallRequest[]) { const pendingFiles: Promise[] = []; @@ -133,7 +134,7 @@ export class Extensions extends React.Component { .catch(err => { Notifications.error(`Error while reading "${ext.filePath}": ${String(err)}`); }); - pendingFiles.push(promise) + pendingFiles.push(promise); }); await Promise.all(pendingFiles); installRequests = installRequests.filter(item => item.data); // remove items with reading errors @@ -143,7 +144,7 @@ export class Extensions extends React.Component { await fse.ensureDir(tempFolder); // copy files to temp, get extension info from package.json and do basic validation - let validatedInstalls: Promise[] = installRequests.map(async installReq => { + const validatedInstalls: Promise[] = installRequests.map(async installReq => { const { fileName, data } = installReq; const tempFile = path.join(tempFolder, fileName); await fse.writeFileSync(tempFile, data); // copy to temp @@ -161,7 +162,7 @@ export class Extensions extends React.Component { ...installReq, manifest: manifest, tmpFile: tempFile, - } + }; } catch (err) { fse.unlink(tempFile).catch(() => null); // remove invalid temp file Notifications.error( @@ -189,11 +190,8 @@ export class Extensions extends React.Component {

Install extension {name}@{version}?

Description: {description}

{folderExists && ( -
shell.openPath(extensionFolder)}> - -

- Warning: {extensionFolder} will be removed before installation. -

+
shell.openPath(extensionFolder)}> + Warning: {extensionFolder} will be removed before installation.
)}
@@ -203,7 +201,7 @@ export class Extensions extends React.Component { }}/> ); - }) + }); } async unpackExtension({ fileName, tmpFile, manifest: { name, version } }: InstallRequestValidated) { diff --git a/src/renderer/components/clipboard/clipboard.tsx b/src/renderer/components/clipboard/clipboard.tsx index 88be556b68..77543ea8f4 100644 --- a/src/renderer/components/clipboard/clipboard.tsx +++ b/src/renderer/components/clipboard/clipboard.tsx @@ -1,5 +1,5 @@ -import "./clipboard.scss" -import React from "react" +import "./clipboard.scss"; +import React from "react"; import { findDOMNode } from "react-dom"; import { autobind } from "../../../common/utils"; import { Notifications } from "../notifications"; @@ -16,12 +16,12 @@ export interface CopyToClipboardProps { export const defaultProps: Partial = { getNotificationMessage(copiedText: string) { - return

Copied to clipboard: {copiedText}

+ return

Copied to clipboard: {copiedText}

; } -} +}; export class Clipboard extends React.Component { - static displayName = "Clipboard" + static displayName = "Clipboard"; static defaultProps = defaultProps as object; get rootElem(): HTMLElement { @@ -49,13 +49,13 @@ export class Clipboard extends React.Component { render() { try { - let rootElem = this.rootReactElem; + const rootElem = this.rootReactElem; return React.cloneElement(rootElem, { className: cssNames(Clipboard.displayName, rootElem.props.className), onClick: this.onClick, }); } catch (err) { - logger.error(`Invalid usage components/CopyToClick usage. Children must contain root html element.`, { err: String(err) }) + logger.error(`Invalid usage components/CopyToClick usage. Children must contain root html element.`, { err: String(err) }); return this.rootReactElem; } } diff --git a/src/renderer/components/clipboard/index.ts b/src/renderer/components/clipboard/index.ts index 0483f275a4..b711992418 100644 --- a/src/renderer/components/clipboard/index.ts +++ b/src/renderer/components/clipboard/index.ts @@ -1 +1 @@ -export * from "./clipboard" +export * from "./clipboard"; diff --git a/src/renderer/components/input/drop-file-input.tsx b/src/renderer/components/input/drop-file-input.tsx index 013401c25c..87f86cdd9b 100644 --- a/src/renderer/components/input/drop-file-input.tsx +++ b/src/renderer/components/input/drop-file-input.tsx @@ -1,5 +1,5 @@ -import "./drop-file-input.scss" -import React from "react" +import "./drop-file-input.scss"; +import React from "react"; import { autobind, cssNames, IClassName } from "../../utils"; import { observable } from "mobx"; import { observer } from "mobx-react"; @@ -69,7 +69,7 @@ export class DropFileInput extends React.Component< return React.cloneElement(contentElem, contentElemProps); } } catch (err) { - logger.error("Invalid root content-element for DropFileInput", { err: String(err) }) + logger.error("Invalid root content-element for DropFileInput", { err: String(err) }); return this.props.children; } }