Skip to content

Commit 2e8e047

Browse files
committed
Bug Fix #4883 Cannot select subscriptions in intellij
1 parent c2525e8 commit 2e8e047

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azuretools/ijidea/actions/SelectSubscriptionsAction.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646

4747
import java.util.List;
4848
import java.util.Objects;
49+
import java.util.Optional;
4950

5051
public class SelectSubscriptionsAction extends AzureAnAction {
5152
private static final Logger LOGGER = Logger.getInstance(SelectSubscriptionsAction.class);
@@ -81,12 +82,11 @@ public static Single<List<SubscriptionDetail>> selectSubscriptions(Project proje
8182
}
8283

8384
final SubscriptionManager subscriptionManager = manager.getSubscriptionManager();
84-
List<SubscriptionDetail> subs = subscriptionManager.getSubscriptionDetails();
85-
SubscriptionsDialog d = SubscriptionsDialog.go(subs, project);
86-
if (Objects.nonNull(d)) {
87-
subscriptionManager.setSubscriptionDetails(subs);
88-
}
89-
return Single.just(subs);
85+
86+
return loadSubscriptions(subscriptionManager, project)
87+
.switchMap((subs) -> selectSubscriptions(project, subs))
88+
.toSingle()
89+
.doOnSuccess((subs) -> Optional.ofNullable(subs).ifPresent(subscriptionManager::setSubscriptionDetails));
9090
}
9191

9292
private static Observable<List<SubscriptionDetail>> selectSubscriptions(final Project project, List<SubscriptionDetail> subs) {

0 commit comments

Comments
 (0)