hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Cherry-Pick from v4.2.4 (#2701)

Browse Source 
Co-authored-by: Jim Ehrismann <40840436+jim-docker@users.noreply.github.com>
This commit is contained in:
Sebastian Malton 2021-05-12 08:04:01 -04:00 committed by GitHub
parent 3a3edeea08
commit 0771fd5be5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/components/+extensions/extensions.tsx
View File

@ -167,15 +167,13 @@ async function validatePackage(filePath: string): Promise<LensExtensionManifest>
return manifest; return manifest;
} }
async function createTempFilesAndValidate({ fileName, dataP }: InstallRequest, disposer: ExtendableDisposer): Promise<InstallRequestValidated | null> { async function createTempFilesAndValidate({ fileName, dataP }: InstallRequest): Promise<InstallRequestValidated | null> {
// copy files to temp // copy files to temp
await fse.ensureDir(getExtensionPackageTemp()); await fse.ensureDir(getExtensionPackageTemp());
// validate packages // validate packages
const tempFile = getExtensionPackageTemp(fileName); const tempFile = getExtensionPackageTemp(fileName);
disposer.push(() => fse.unlink(tempFile));
try { try {
const data = await dataP; const data = await dataP;
@ -318,7 +316,7 @@ export async function attemptInstallByInfo({ name, version, requireConfirmation
async function attemptInstall(request: InstallRequest, d?: ExtendableDisposer): Promise<void> { async function attemptInstall(request: InstallRequest, d?: ExtendableDisposer): Promise<void> {
const dispose = disposer(ExtensionInstallationStateStore.startPreInstall(), d); const dispose = disposer(ExtensionInstallationStateStore.startPreInstall(), d);
const validatedRequest = await createTempFilesAndValidate(request, dispose); const validatedRequest = await createTempFilesAndValidate(request);
if (!validatedRequest) { if (!validatedRequest) {
return dispose(); return dispose();

6
src/renderer/components/select/select.scss
View File

@ -106,7 +106,7 @@ html {
&--is-disabled { &--is-disabled {
cursor: not-allowed; cursor: not-allowed;
background: none !important; background: none !important;
color: $contentColor; color: inherit;
opacity: .75; opacity: .75;
} }
@ -166,6 +166,10 @@ html {
&--is-focused { &--is-focused {
color: white; color: white;
} }
&--is-disabled:hover {
color: inherit;
}
} }
} }
} }