From 6d067b68e28e3794b9b4b381f5b296f54d88e218 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 7 Apr 2021 10:35:39 -0400 Subject: [PATCH] resolve pr comments Signed-off-by: Sebastian Malton --- src/renderer/components/+extensions/extensions.tsx | 6 +++--- src/renderer/components/confirm-dialog/confirm-dialog.tsx | 4 ---- src/renderer/protocol-handler/app-handlers.ts | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx index 8fd5b111c1..0d611e90dc 100644 --- a/src/renderer/components/+extensions/extensions.tsx +++ b/src/renderer/components/+extensions/extensions.tsx @@ -313,7 +313,7 @@ export async function attemptInstallByInfo({ name, version, requireConfirmation const url = json.versions[version].dist.tarball; const fileName = path.basename(url); - const { promise: dataP } = downloadFile({ url, timeout: 60000 /*1m*/ }); + const { promise: dataP } = downloadFile({ url, timeout: 10 * 60 * 1000 }); return attemptInstall({ fileName, dataP }, disposer); } @@ -405,7 +405,7 @@ async function installFromInput(input: string) { if (InputValidators.isUrl.validate(input)) { // install via url disposer = ExtensionInstallationStateStore.startPreInstall(); - const { promise } = downloadFile({ url: input, timeout: 60000 /*1m*/ }); + const { promise } = downloadFile({ url: input, timeout: 10 * 60 * 1000 }); const fileName = path.basename(input); await attemptInstall({ fileName, dataP: promise }, disposer); @@ -589,7 +589,7 @@ export class Extensions extends React.Component { className="box grow" theme="round-black" disabled={ExtensionInstallationStateStore.anyPreInstallingOrInstalling} - placeholder={`Path or URL to an extension package (${supportedFormats.join(", ")})`} + placeholder={`Name or file path or URL to an extension package (${supportedFormats.join(", ")})`} showErrorsAsTooltip={{ preferredPositions: TooltipPosition.BOTTOM }} validators={installPath ? Extensions.installInputValidator : undefined} value={installPath} diff --git a/src/renderer/components/confirm-dialog/confirm-dialog.tsx b/src/renderer/components/confirm-dialog/confirm-dialog.tsx index 617f53fe86..dd03555433 100644 --- a/src/renderer/components/confirm-dialog/confirm-dialog.tsx +++ b/src/renderer/components/confirm-dialog/confirm-dialog.tsx @@ -48,10 +48,6 @@ export class ConfirmDialog extends React.Component { }); } - private static closeDialog() { - ConfirmDialog.isOpen = false; - } - public defaultParams: ConfirmDialogParams = { ok: noop, labelOk: "Ok", diff --git a/src/renderer/protocol-handler/app-handlers.ts b/src/renderer/protocol-handler/app-handlers.ts index 203f5fc6f3..b3ace68a45 100644 --- a/src/renderer/protocol-handler/app-handlers.ts +++ b/src/renderer/protocol-handler/app-handlers.ts @@ -56,7 +56,7 @@ export function bindProtocolAddRouteHandlers() { .addInternalHandler("/extensions", () => { navigate(extensionsURL()); }) - .addInternalHandler(`/extensions${LensProtocolRouter.ExtensionUrlSchema}`, ({ pathname, search: { version } }) => { + .addInternalHandler(`/extensions/install${LensProtocolRouter.ExtensionUrlSchema}`, ({ pathname, search: { version } }) => { const name = [ pathname[EXTENSION_PUBLISHER_MATCH], pathname[EXTENSION_NAME_MATCH],