Skip to content

Commit 62aa880

Browse files
Merge pull request #6906 from microsoft/miller/hotfixes-202208
hotfix to #1980254: [Test]When any other sub is selected, the resourc…
2 parents a4cf4d9 + 15599f1 commit 62aa880

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/action/IntellijAzureActionManager.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.microsoft.azure.toolkit.lib.common.action.ActionView;
2727
import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
2828
import com.microsoft.azure.toolkit.lib.common.action.IActionGroup;
29+
import com.microsoft.azure.toolkit.lib.common.model.AbstractAzResource;
2930
import com.microsoft.azure.toolkit.lib.common.view.IView;
3031
import lombok.Getter;
3132
import org.apache.commons.lang3.StringUtils;
@@ -131,7 +132,12 @@ public void actionPerformed(@Nonnull AnActionEvent e) {
131132
public void update(@Nonnull AnActionEvent e) {
132133
final T source = (T) e.getDataContext().getData(Action.SOURCE);
133134
final IView.Label view = this.action.getView(source);
134-
final boolean visible = Objects.nonNull(view) && view.isEnabled() && Objects.nonNull(action.getHandler(source, e));
135+
final boolean visible;
136+
if (source instanceof AbstractAzResource && !((AbstractAzResource<?, ?, ?>) source).getSubscription().isSelected() && this.action.isAuthRequired()) {
137+
visible = false;
138+
} else {
139+
visible = Objects.nonNull(view) && view.isEnabled() && Objects.nonNull(action.getHandler(source, e));
140+
}
135141
e.getPresentation().setVisible(visible);
136142
if (visible) {
137143
applyView(view, e.getPresentation());

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/java/com/microsoft/azure/toolkit/ide/common/action/ResourceCommonActionsContributor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void registerActions(AzureActionManager am) {
121121
.enabled(s -> s instanceof AzResource);
122122
final Action<AzResource<?, ?, ?>> openPortalUrlAction = new Action<>(OPEN_PORTAL_URL, openPortalUrl, openPortalUrlView);
123123
openPortalUrlAction.setShortcuts("control alt O");
124-
am.registerAction(OPEN_PORTAL_URL, openPortalUrlAction);
124+
am.registerAction(OPEN_PORTAL_URL, openPortalUrlAction.setAuthRequired(false));
125125

126126
// register commands
127127
final Action<String> action = new Action<>(OPEN_URL, (s) -> {
@@ -163,7 +163,7 @@ public void registerActions(AzureActionManager am) {
163163

164164
final ActionView.Builder openReferenceBookView = new ActionView.Builder("View Azure SDK")
165165
.title((s) -> OperationBundle.description("common.open_azure_reference_book"));
166-
am.registerAction(OPEN_AZURE_REFERENCE_BOOK, new Action<>(OPEN_AZURE_REFERENCE_BOOK, openReferenceBookView));
166+
am.registerAction(OPEN_AZURE_REFERENCE_BOOK, new Action<>(OPEN_AZURE_REFERENCE_BOOK, openReferenceBookView).setAuthRequired(false));
167167

168168
final ActionView.Builder createView = new ActionView.Builder("Create", AzureIcons.Action.CREATE.getIconPath())
169169
.title(s -> Optional.ofNullable(s).map(r -> {
@@ -196,7 +196,7 @@ public void registerActions(AzureActionManager am) {
196196
}
197197
}, pinView);
198198
pinAction.setShortcuts("F11");
199-
am.registerAction(ResourceCommonActionsContributor.PIN, pinAction);
199+
am.registerAction(ResourceCommonActionsContributor.PIN, pinAction.setAuthRequired(false));
200200
}
201201

202202
@Override

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

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

1919
import javax.annotation.Nonnull;
2020
import javax.annotation.Nullable;
21-
import java.util.List;
2221
import java.util.Objects;
2322
import java.util.Optional;
2423

@@ -45,8 +44,7 @@ public String getTips() {
4544
@Override
4645
public String getDescription() {
4746
final AzResource<?, ?, ?> r = view.getResource();
48-
final List<Subscription> subscriptions = Azure.az(AzureAccount.class).account().getSelectedSubscriptions();
49-
if (!subscriptions.contains(r.getSubscription())) {
47+
if (!r.getSubscription().isSelected()) {
5048
return String.format("(%s)", r.getSubscription().getName());
5149
}
5250
if (r instanceof AbstractAzResource &&
@@ -101,8 +99,7 @@ public String getIconPath() {
10199
@Override
102100
public boolean isEnabled() {
103101
final AzResource<?, ?, ?> r = view.getResource();
104-
final List<Subscription> subscriptions = Azure.az(AzureAccount.class).account().getSelectedSubscriptions();
105-
if (!subscriptions.contains(r.getSubscription())) {
102+
if (!r.getSubscription().isSelected()) {
106103
return false;
107104
}
108105
if (r instanceof AbstractAzResource &&

0 commit comments

Comments
 (0)