Merge pull request #2224 from digma-ai/close-wizard-only-on-first-launch

Close wizard only on first launch

Author: shalom938

ide-common/src/main/java/org/digma/intellij/plugin/ui/MainToolWindowCardsController.java

@@ -8,6 +8,8 @@
 import org.digma.intellij.plugin.analytics.*;
 import org.digma.intellij.plugin.common.*;
 import org.digma.intellij.plugin.log.Log;
+import org.digma.intellij.plugin.persistence.PersistenceService;
+import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower;
 import org.digma.intellij.plugin.ui.panels.DisposablePanel;
 import org.digma.intellij.plugin.updates.*;
 import org.jetbrains.annotations.NotNull;
@@ -95,9 +97,26 @@ public void connectionGained() {
             @Override
             public void apiClientChanged(@NotNull String newUrl) {
                 Backgroundable.ensurePooledThread(() -> {
-                    if (wizard.isOn()){
+                    //on new install the wizard opens and lets user install digma backend.
+                    //if the user doesn't have docker and wants to change to centralized deployment,
+                    // user will change the url in settings, the plugin will connect to the centralized deployment,
+                    // but there will be no way out of the wizard because there is no close button and no finish button.
+                    //so here we close the wizard in this scenario, the wizard will close and user will see the login screen.
+                    //isFirstWizardLaunch will be true on new install, when the wizard opens first time,
+                    // the flag will change only when INSTALLATION_WIZARD/FINISH message, so while the wizard is open
+                    // isFirstWizardLaunch should be true.
+                    //if user had a working local deployment and then decides to change to centralized, if the wizard is open
+                    // in that stage the wizard should have a close button.
+                    if (wizard.isOn() && PersistenceService.getInstance().isFirstWizardLaunch()){
                         if(isCentralized()){
-                            EDT.ensureEDT(() -> wizardFinished());
+                            //do here everything that happens on INSTALLATION_WIZARD/FINISH message
+                            PersistenceService.getInstance().firstWizardLaunchDone();
+                            updateInstallationWizardFlag();
+                            EDT.ensureEDT(() -> {
+                                ToolWindowShower.getInstance(project).showToolWindow();
+                                project.getService(RecentActivityToolWindowShower.class).showToolWindow();
+                                wizardFinished();
+                            });
                         }
                     }
                 });

…tivity/RecentActivityToolWindowShower.kt …tivity/RecentActivityToolWindowShower.ktsrc/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityToolWindowShower.kt renamed to ide-common/src/main/kotlin/org/digma/intellij/plugin/recentactivity/RecentActivityToolWindowShower.kt src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityToolWindowShower.kt renamed to ide-common/src/main/kotlin/org/digma/intellij/plugin/recentactivity/RecentActivityToolWindowShower.kt

@@ -1,4 +1,4 @@
-package org.digma.intellij.plugin.ui.recentactivity
+package org.digma.intellij.plugin.recentactivity
 
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.Logger

src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityService.kt

@@ -19,6 +19,7 @@ import org.digma.intellij.plugin.model.rest.recentactivity.RecentActivityResult
 import org.digma.intellij.plugin.persistence.PersistenceService
 import org.digma.intellij.plugin.posthog.ActivityMonitor
 import org.digma.intellij.plugin.posthog.UserActionOrigin
+import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.scope.ScopeManager
 import org.digma.intellij.plugin.scope.SpanScope
 import org.digma.intellij.plugin.ui.common.openJaegerFromRecentActivity

src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityToolWindowFactory.kt

@@ -10,6 +10,7 @@ import com.intellij.ui.content.ContentFactory
 import com.intellij.util.ui.JBUI
 import org.digma.intellij.plugin.analytics.AnalyticsService
 import org.digma.intellij.plugin.log.Log
+import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.ui.common.statuspanels.createAggressiveUpdatePanel
 import org.digma.intellij.plugin.ui.common.statuspanels.createNoConnectionPanel
 import java.awt.CardLayout

src/main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardSidePanelWindowPanel.kt

@@ -67,7 +67,7 @@ import org.digma.intellij.plugin.ui.jcef.serializeAndExecuteWindowPostMessageJav
 import org.digma.intellij.plugin.ui.jcef.updateDigmaEngineStatus
 import org.digma.intellij.plugin.ui.notificationcenter.AppNotificationCenter
 import org.digma.intellij.plugin.ui.panels.DisposablePanel
-import org.digma.intellij.plugin.ui.recentactivity.RecentActivityToolWindowShower
+import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.ui.settings.ApplicationUISettingsChangeNotifier
 import org.digma.intellij.plugin.ui.settings.SettingsChangeListener
 import org.digma.intellij.plugin.ui.settings.Theme
@@ -144,8 +144,6 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
     )
 
 
-    PersistenceService.getInstance().firstWizardLaunchDone()
-
 
     val lifeSpanHandler: CefLifeSpanHandlerAdapter = object : CefLifeSpanHandlerAdapter() {
         override fun onAfterCreated(browser: CefBrowser) {
@@ -224,6 +222,8 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
                     DigmathonService.getInstance().setProductKey(it)
                 }
 
+                PersistenceService.getInstance().firstWizardLaunchDone()
+
                 EDT.ensureEDT {
                     updateInstallationWizardFlag()
                     ToolWindowShower.getInstance(project).showToolWindow()