Merge pull request #6799 from microsoft/fix-endgame-202207

Resolve issues in july endgame

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-guidance/src/main/java/com/microsoft/azure/toolkit/ide/guidance/GuidanceViewManager.java

@@ -35,12 +35,13 @@ public void openCourseView(@Nonnull final Project project, @Nonnull final Course
         AzureTaskManager.getInstance().runLater(() -> {
             assert toolWindow != null;
             toolWindow.setAvailable(true);
-            final GuidanceView guidanceView = GuidanceViewFactory.getGuidanceView(project);
-            if (Objects.nonNull(guidanceView)) {
-                final Course course = new Course(courseConfig, project);
-                guidanceView.showCourseView(course);
-            }
-            toolWindow.activate(null);
+            toolWindow.activate(() -> {
+                final GuidanceView guidanceView = GuidanceViewFactory.getGuidanceView(project);
+                if (Objects.nonNull(guidanceView)) {
+                    final Course course = new Course(courseConfig, project);
+                    guidanceView.showCourseView(course);
+                }
+            });
         });
     }
 
@@ -49,12 +50,13 @@ public void showCoursesView(@Nonnull final Project project) {
         final ToolWindow toolWindow = ToolWindowManager.getInstance(project).getToolWindow(GuidanceViewManager.TOOL_WINDOW_ID);
         AzureTaskManager.getInstance().runLater(() -> {
             assert toolWindow != null;
-            toolWindow.setAvailable(true);
-            final GuidanceView guidanceView = GuidanceViewFactory.getGuidanceView(project);
-            if (Objects.nonNull(guidanceView)) {
-                guidanceView.showCoursesView();
-            }
-            toolWindow.activate(null);
+            toolWindow.activate(() -> {
+                toolWindow.setAvailable(true);
+                final GuidanceView guidanceView = GuidanceViewFactory.getGuidanceView(project);
+                if (Objects.nonNull(guidanceView)) {
+                    guidanceView.showCoursesView();
+                }
+            });
         });
     }
 

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

@@ -150,6 +150,7 @@ private void refreshChildrenView() {
         @Override
         @AzureOperation(name = "common.load_children.node", params = "this.getLabel()", type = AzureOperation.Type.ACTION)
         public synchronized void refreshChildren(boolean... incremental) {
+            Optional.ofNullable(this.inner).ifPresent(ignore -> this.setAllowsChildren(inner.hasChildren()));
             if (this.getAllowsChildren() && BooleanUtils.isNotFalse(this.loaded)) {
                 final DefaultTreeModel model = (DefaultTreeModel) this.tree.getModel();
                 if (incremental.length > 0 && incremental[0] && Objects.nonNull(model)) {
@@ -161,6 +162,9 @@ public synchronized void refreshChildren(boolean... incremental) {
                 }
                 this.loaded = null;
                 this.loadChildren(incremental);
+            } else if (!this.getAllowsChildren()) {
+                this.removeAllChildren();
+                this.refreshChildrenView();
             }
         }
 

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azure/toolkit/ide/appservice/file/AppServiceFileActionsContributor.java

@@ -46,7 +46,7 @@ public void registerGroups(AzureActionManager am) {
 
     @Override
     public void registerActions(AzureActionManager am) {
-        final Consumer<AppServiceFile> refresh = file -> AzureEventBus.emit("resource.refresh.resource", file);
+        final Consumer<AppServiceFile> refresh = file -> AzureEventBus.emit("resource.refreshed.resource", file);
         final ActionView.Builder refreshView = new ActionView.Builder("Refresh", AzureIcons.Action.REFRESH.getIconPath())
                 .title(s -> Optional.ofNullable(s).map(r -> description("resource.refresh.resource", ((AppServiceFile) r).getName())).orElse(null))
                 .enabled(s -> s instanceof AppServiceFile);

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azure/toolkit/ide/appservice/file/AppServiceFileNode.java

@@ -68,7 +68,7 @@ public AppServiceFileNode(@Nonnull AppServiceFile data) {
 
     @Override
     public boolean hasChildren() {
-        return file.getType() == AppServiceFile.Type.DIRECTORY;
+        return file.getType() == AppServiceFile.Type.DIRECTORY && appService.getFormalStatus().isRunning();
     }
 
     @Override
@@ -87,6 +87,7 @@ static class AppServiceFileLabelView implements NodeView {
         @Getter
         private final AppServiceFile file;
         private final AzureEventBus.EventListener listener;
+        private final AzureEventBus.EventListener appStatusListener;
 
         @Nullable
         @Setter
@@ -96,14 +97,23 @@ static class AppServiceFileLabelView implements NodeView {
         public AppServiceFileLabelView(@Nonnull AppServiceFile file) {
             this.file = file;
             this.listener = new AzureEventBus.EventListener(this::onEvent);
+            this.appStatusListener= new AzureEventBus.EventListener(this::onAppStatusChanged);
             AzureEventBus.on("resource.refreshed.resource", listener);
+            AzureEventBus.on("resource.status_changed.resource", appStatusListener);
             this.refreshView();
         }
 
+        private void onAppStatusChanged(AzureEvent event) {
+            final Object source = event.getSource();
+            if ((source instanceof AppServiceAppBase && StringUtils.equalsIgnoreCase(((AppServiceAppBase<?, ?, ?>) source).getId(), this.file.getApp().getId()))) {
+                AzureTaskManager.getInstance().runLater(this::refreshChildren);
+            }
+        }
+
         private void onEvent(AzureEvent event) {
             final String type = event.getType();
             final Object source = event.getSource();
-            if (source instanceof AppServiceFile && StringUtils.equalsIgnoreCase(((AppServiceFile) source).getFullName(), this.file.getFullName())) {
+            if ((source instanceof AppServiceFile && StringUtils.equalsIgnoreCase(((AppServiceFile) source).getFullName(), this.file.getFullName()))) {
                 AzureTaskManager.getInstance().runLater(this::refreshChildren);
             }
         }
@@ -140,6 +150,7 @@ private static String formatDateTime(@Nullable final String dateTime) {
         @Override
         public void dispose() {
             AzureEventBus.off("resource.refreshed.resource", listener);
+            AzureEventBus.off("resource.status_changed.resource", appStatusListener);
             this.refresher = null;
         }
     }