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

Refactor autoInitExtensions

Browse Source 
Signed-off-by: Juho Heikka <juho.heikka@gmail.com>
This commit is contained in:
Juho Heikka 2021-12-21 13:14:35 +02:00
parent 1781a05ea8
commit 1dd462e9b4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/extensions/extension-loader/extension-loader.ts
View File

@ -313,7 +313,7 @@ export class ExtensionLoader {
}
protected autoInitExtensions(register: (ext: LensExtension) => Promise<Disposer[]>) {
const bundledLoaded: Promise<void>[] = [];
const loadingExtensions: { isBundled: boolean, loaded: Promise<void> }[] = [];
reaction(() => this.toJSON(), installedExtensions => {
for (const [extId, extension] of installedExtensions) {
@ -334,9 +334,10 @@ export class ExtensionLoader {
logger.error(`${logModule}: failed to enable`, { ext: extension, err });
});
if (extension.isBundled) {
bundledLoaded.push(loaded);
}
loadingExtensions.push({
isBundled: extension.isBundled,
loaded,
});
this.instances.set(extId, instance);
} catch (err) {
logger.error(`${logModule}: activation extension error`, { ext: extension, err });
@ -349,7 +350,7 @@ export class ExtensionLoader {
fireImmediately: true,
});
return Promise.all(bundledLoaded);
return loadingExtensions;
}
protected requireExtension(extension: InstalledExtension): LensExtensionConstructor | null {

5
src/renderer/root-frame.tsx
View File

@ -56,7 +56,10 @@ export class RootFrame extends React.Component {
catalogEntityRegistry.init();
try {
await extensionLoader.loadOnClusterManagerRenderer();
const loadingExtensions = extensionLoader.loadOnClusterManagerRenderer();
const loadingBundledExtensions = loadingExtensions.filter(e => e.isBundled).map(e => e.loaded);
await Promise.all(loadingBundledExtensions);
} finally {
ipcRenderer.send(BundledExtensionsLoaded);
}