From bb8bdaba9c642f3f0e4ab250b442cbfc209f51d4 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 18 May 2022 10:20:56 +0300 Subject: [PATCH] Fix timing of injects Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../menu/application-menu-items.injectable.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index 2782ca8edf..417c40ac2e 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -47,18 +47,14 @@ const applicationMenuItemsInjectable = getInjectable({ const applicationWindow = di.inject(applicationWindowInjectable); const showApplicationWindow = di.inject(showApplicationWindowInjectable); const reloadApplicationWindow = di.inject(reloadWindowInjectable, applicationWindow); + const navigateToPreferences = di.inject(navigateToPreferencesInjectable); + const navigateToExtensions = di.inject(navigateToExtensionsInjectable); + const navigateToCatalog = di.inject(navigateToCatalogInjectable); + const navigateToWelcome = di.inject(navigateToWelcomeInjectable); + const navigateToAddCluster = di.inject(navigateToAddClusterInjectable); + const stopServicesAndExitApp = di.inject(stopServicesAndExitAppInjectable); return computed((): MenuItemOpts[] => { - - // TODO: These injects should happen outside of the computed. - // TODO: Remove temporal dependencies in WindowManager to make sure timing is correct. - const stopServicesAndExitApp = di.inject(stopServicesAndExitAppInjectable); - const navigateToPreferences = di.inject(navigateToPreferencesInjectable); - const navigateToExtensions = di.inject(navigateToExtensionsInjectable); - const navigateToCatalog = di.inject(navigateToCatalogInjectable); - const navigateToWelcome = di.inject(navigateToWelcomeInjectable); - const navigateToAddCluster = di.inject(navigateToAddClusterInjectable); - const autoUpdateDisabled = !isAutoUpdateEnabled(); logger.info(`[MENU]: autoUpdateDisabled=${autoUpdateDisabled}`);