Skip to content

Commit 23a80fe

Browse files
hotfix to #1980254: [Test]When any other sub is selected, the resource group of "Java Tooling Tests with TTL = 7 Days" is preserved after loading
1 parent 24c9e30 commit 23a80fe

File tree

1 file changed

+9
-0
lines changed
  • Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/java/com/microsoft/azure/toolkit/ide/common/favorite

1 file changed

+9
-0
lines changed

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/java/com/microsoft/azure/toolkit/ide/common/favorite/FavoriteNodeView.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import javax.annotation.Nonnull;
2020
import javax.annotation.Nullable;
21+
import java.util.List;
2122
import java.util.Objects;
2223
import java.util.Optional;
2324

@@ -44,6 +45,10 @@ public String getTips() {
4445
@Override
4546
public String getDescription() {
4647
final AzResource<?, ?, ?> r = view.getResource();
48+
final List<Subscription> subscriptions = Azure.az(AzureAccount.class).account().getSelectedSubscriptions();
49+
if (!subscriptions.contains(r.getSubscription())) {
50+
return String.format("(%s)", r.getSubscription().getName());
51+
}
4752
if (r instanceof AbstractAzResource &&
4853
((AbstractAzResource<?, ?, ?>) r).isDraftForCreating() &&
4954
!Objects.equals(r.getStatus(), AzResource.Status.CREATING)) {
@@ -96,6 +101,10 @@ public String getIconPath() {
96101
@Override
97102
public boolean isEnabled() {
98103
final AzResource<?, ?, ?> r = view.getResource();
104+
final List<Subscription> subscriptions = Azure.az(AzureAccount.class).account().getSelectedSubscriptions();
105+
if (!subscriptions.contains(r.getSubscription())) {
106+
return false;
107+
}
99108
if (r instanceof AbstractAzResource &&
100109
((AbstractAzResource<?, ?, ?>) r).isDraftForCreating() &&
101110
!Objects.equals(r.getStatus(), AzResource.Status.CREATING)) {

0 commit comments

Comments
 (0)