Skip to content

Commit cbce42f

Browse files
committed
close-wizard-on-url-change
1 parent fe46379 commit cbce42f

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

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

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,41 +91,20 @@ public void connectionGained() {
9191

9292

9393
project.getMessageBus().connect().subscribe(ApiClientChangedEvent.getAPI_CLIENT_CHANGED_TOPIC(), (ApiClientChangedEvent) newUrl -> oneShotTask("MainToolWindowCardsController.apiClientChanged", (Function0<Void>) () -> {
94-
//on new install the wizard opens and lets user install digma backend.
95-
//if the user doesn't have docker and wants to change to centralized deployment,
96-
// user will change the url in settings, the plugin will connect to the centralized deployment,
97-
// but there will be no way out of the wizard because there is no close button and no finish button.
98-
//so here we close the wizard in this scenario, the wizard will close and user will see the login screen.
99-
//isFirstWizardLaunch will be true on new install, when the wizard opens first time,
100-
// the flag will change only when INSTALLATION_WIZARD/FINISH message, so while the wizard is open
101-
// isFirstWizardLaunch should be true.
102-
//if user had a working local deployment and then decides to change to centralized, if the wizard is open
103-
// in that stage the wizard should have a close button.
104-
if (wizard.isOn() && PersistenceService.getInstance().isFirstWizardLaunch()) {
105-
if (isCentralized()) {
94+
if (wizard.isOn()) {
10695
//do here everything that happens on INSTALLATION_WIZARD/FINISH message
10796
PersistenceService.getInstance().firstWizardLaunchDone();
10897
EDT.ensureEDT(() -> {
10998
ToolWindowShower.getInstance(project).showToolWindow();
110-
project.getService(RecentActivityToolWindowShower.class).showToolWindow();
99+
RecentActivityToolWindowShower.getInstance(project).showToolWindow();
111100
wizardFinished();
112101
});
113-
}
114102
}
115103
return null;
116104
}));
117105
}
118106

119107

120-
private boolean isCentralized() {
121-
try {
122-
var about = AnalyticsService.getInstance(project).getAbout();
123-
return Boolean.TRUE.equals(about.isCentralize());
124-
} catch (Throwable e) {
125-
return false;
126-
}
127-
}
128-
129108

130109
public static MainToolWindowCardsController getInstance(@NotNull Project project) {
131110
return project.getService(MainToolWindowCardsController.class);

0 commit comments

Comments
 (0)