Merge pull request #6287 from microsoft/endgame-december

Endgame december for 2021.3

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/component/table/AppSettingsDialogPresenter.java

@@ -8,11 +8,13 @@
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
 import com.microsoft.azure.toolkit.lib.appservice.service.impl.FunctionApp;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azuretools.core.mvp.ui.base.MvpPresenter;
 import rx.Observable;
 
 import java.nio.file.Path;
+import java.util.Map;
 
 public class AppSettingsDialogPresenter<V extends ImportAppSettingsView> extends MvpPresenter<V> {
     public void onLoadFunctionApps() {
@@ -40,16 +42,17 @@ public void onLoadFunctionAppSettings(FunctionApp functionApp) {
     }
 
     public void onLoadLocalSettings(Path localSettingsJsonPath) {
-        Observable.fromCallable(() -> {
+        final AzureTaskManager tm = AzureTaskManager.getInstance();
+        tm.runOnPooledThread(() -> {
             getMvpView().beforeFillAppSettings();
-            return AppSettingsTableUtils.getAppSettingsFromLocalSettingsJson(localSettingsJsonPath.toFile());
-        }).subscribeOn(getSchedulerProvider().io())
-                .subscribe(appSettings -> AzureTaskManager.getInstance().runLater(() -> {
-                    if (isViewDetached()) {
-                        return;
-                    }
-                    getMvpView().fillFunctionAppSettings(appSettings);
-                }));
+            final Map<String, String> settings = AppSettingsTableUtils.getAppSettingsFromLocalSettingsJson(localSettingsJsonPath.toFile());
+            tm.runLater(() -> {
+                if (isViewDetached()) {
+                    return;
+                }
+                getMvpView().fillFunctionAppSettings(settings);
+            }, AzureTask.Modality.ANY);
+        });
     }
 
     private void errorHandler(Throwable e) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/component/table/AppSettingsTableUtils.java

@@ -39,6 +39,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import static com.microsoft.azure.toolkit.intellij.common.AzureBundle.message;
 
@@ -114,11 +115,11 @@ public void windowClosed(WindowEvent windowEvent) {
             @Override
             public void actionPerformed(AnActionEvent anActionEvent) {
                 try {
-                    FileSaverDescriptor fileDescriptor = new FileSaverDescriptor(message("function.appSettings.export.description"), "");
+                    final FileSaverDescriptor fileDescriptor = new FileSaverDescriptor(message("function.appSettings.export.description"), "");
                     final FileSaverDialog dialog = FileChooserFactory.getInstance().createSaveFileDialog(fileDescriptor, (Project) null);
                     final VirtualFile userHome = LocalFileSystem.getInstance().findFileByPath(System.getProperty("user.home"));
                     final VirtualFileWrapper fileWrapper = dialog.save(userHome, LOCAL_SETTINGS_JSON);
-                    final File file = fileWrapper.getFile();
+                    final File file = Optional.ofNullable(fileWrapper).map(VirtualFileWrapper::getFile).orElse(null);
                     if (file != null) {
                         AppSettingsTableUtils.exportLocalSettingsJsonFile(file, appSettingsTable.getAppSettings());
                         AzureMessager.getMessager().info(message("function.appSettings.export.succeed.title"), message("function.appSettings.export.succeed.message"));

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/component/SpringCloudAppConfigPanel.java

@@ -121,11 +121,12 @@ public synchronized void updateForm(@Nonnull SpringCloudApp app) {
             AzureTaskManager.getInstance().runLater(() -> {
                 if (testUrl != null) {
                     this.txtTestEndpoint.setHyperlinkText(testUrl.length() > 60 ? testUrl.substring(0, 60) + "..." : testUrl);
+                    this.txtTestEndpoint.setHyperlinkTarget(testUrl.endsWith("/") ? testUrl.substring(0, testUrl.length() - 1) : testUrl);
                 } else {
                     this.txtTestEndpoint.setVisible(false);
                     this.lblTestEndpoint.setVisible(false);
+                    this.txtTestEndpoint.setHyperlinkTarget(null);
                 }
-                this.txtTestEndpoint.setHyperlinkTarget(testUrl);
                 this.txtStorage.setText(Objects.nonNull(disk) ? disk.toString() : "---");
                 this.txtEndpoint.setHyperlinkTarget(url);
                 this.txtEndpoint.setEnabled(Objects.nonNull(url));

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-springcloud-lib/src/main/java/com/microsoft/azure/toolkit/ide/springcloud/SpringCloudActionsContributor.java

@@ -36,7 +36,10 @@ public void registerActions(AzureActionManager am) {
                 .enabled(s -> s instanceof SpringCloudApp && ((SpringCloudApp) s).entity().isPublic());
         am.registerAction(OPEN_PUBLIC_URL, new Action<>(openPublicUrl, openPublicUrlView));
 
-        final Consumer<SpringCloudApp> openTestUrl = s -> am.getAction(ResourceCommonActionsContributor.OPEN_URL).handle(s.testUrl());
+        final Consumer<SpringCloudApp> openTestUrl = s -> {
+            final String testUrl = s.testUrl();
+            am.getAction(ResourceCommonActionsContributor.OPEN_URL).handle(testUrl.endsWith("/") ? testUrl.substring(0, testUrl.length() - 1) : testUrl);
+        };
         final ActionView.Builder openTestUrlView = new ActionView.Builder("Access Test Endpoint", "/icons/action/browser.svg")
                 .title(s -> Optional.ofNullable(s).map(r -> title("springcloud.open_test_url.app", ((SpringCloudApp) r).name())).orElse(null))
                 .enabled(s -> s instanceof SpringCloudApp);