Merge pull request #7136 from microsoft/hotfix-dbtools

no default server is selected when open datasource dialog from dataso…

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-database/src/main/java/com/microsoft/azure/toolkit/intellij/database/dbtools/DatabaseServerParamEditor.java

@@ -83,11 +83,12 @@ public class DatabaseServerParamEditor extends ParamEditorBase<DatabaseServerPar
     public DatabaseServerParamEditor(@Nonnull Class<? extends IDatabaseServer<?>> clazz, @Nonnull String label, @Nonnull DataInterchange interchange) {
         super(new SqlDbServerComboBox(clazz), interchange, FieldSize.LARGE, label);
         this.clazz = clazz;
-        this.jdbcUrl = Optional.ofNullable(interchange.getDataSource().getUrl()).filter(StringUtils::isNotBlank).map(JdbcUrl::from).orElse(null);
+        final LocalDataSource dataSource = getDataSourceConfigurable().getDataSource();
+        this.jdbcUrl = Optional.ofNullable(dataSource.getUrl()).filter(StringUtils::isNotBlank).map(JdbcUrl::from).orElse(null);
         final SqlDbServerComboBox combox = this.getEditorComponent();
         combox.addValueChangedListener(this::setServer);
         interchange.addPersistentProperty(KEY_DB_SERVER_ID);
-        final boolean isModifying = StringUtils.isNotBlank(interchange.getDataSource().getUsername());
+        final boolean isModifying = StringUtils.isNotBlank(dataSource.getUsername());
         if (isModifying && Objects.nonNull(this.jdbcUrl)) {
             final JdbcUrl url = this.jdbcUrl;
             combox.setValue(new AzureComboBox.ItemReference<>(i -> i.getJdbcUrl().getServerHost().equals(url.getServerHost())));
@@ -171,9 +172,11 @@ private void createServerInIde(InputEvent e) {
     }
 
     private void onPropertiesChanged(String propertyName, Object newValue) {
-        if (!this.updating && Objects.nonNull(this.jdbcUrl) && StringUtils.isNotEmpty((String) newValue)) {
-            if (StringUtils.equals(propertyName, "host") && !Objects.equals(this.jdbcUrl.getServerHost(), newValue)) {
-                this.getEditorComponent().setValue((IDatabaseServer<?>) null);
+        if (!this.updating && StringUtils.isNotEmpty((String) newValue) && StringUtils.equals(propertyName, "host")) {
+            final SqlDbServerComboBox combox = this.getEditorComponent();
+            final IDatabaseServer<?> server = combox.getValue();
+            if (Objects.nonNull(server) && !Objects.equals(server.getJdbcUrl().getServerHost(), newValue)) {
+                combox.setValue((IDatabaseServer<?>) null);
                 this.setServer(null);
             }
         }

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

@@ -210,6 +210,9 @@ public static synchronized void popup(@Nullable Project project) {
         popDaysLater(3);
 
         final JFrame frame = ((JFrame) IdeUtils.getWindow(project));
+        if (RatePopup.balloon.isDisposed()) {
+            return;
+        }
         RatePopup.balloon.show(new PositionTracker<>(frame.getRootPane()) {
             @Override
             public RelativePoint recalculateLocation(@NotNull Balloon balloon) {