inputs are not set with values of selected account when open from explorer.

wangmingliang-ms · wangmingliang-ms · commit 34267a3fe8f1 · 2022-12-01T16:08:41.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/IntelliJCosmosActionsContributorForUltimate.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/IntelliJCosmosActionsContributorForUltimate.java
@@ -27,6 +27,7 @@
 import java.util.function.BiConsumer;
 
 import static com.microsoft.azure.toolkit.intellij.cosmos.dbtools.AzureCosmosDbAccountParamEditor.KEY_COSMOS_ACCOUNT_ID;
+import static com.microsoft.azure.toolkit.intellij.cosmos.dbtools.AzureCosmosDbAccountParamEditor.KEY_FROM_AZURE_EXPLORER;
 
 public class IntelliJCosmosActionsContributorForUltimate implements IActionsContributor {
     @Override
@@ -46,6 +47,7 @@ private void openDatabaseTool(Project project, CosmosDBAccount account) {
         final LocalDataSourceManager manager = LocalDataSourceManager.getInstance(project);
         final DbDataSource newElement = ((DbPsiFacadeImpl) facade).createDataSourceWrapperElement(ds, manager);
         ds.setAdditionalProperty(KEY_COSMOS_ACCOUNT_ID, account.getId());
+        ds.setAdditionalProperty(KEY_FROM_AZURE_EXPLORER, String.valueOf(true));
         DataSourceManagerDialog.showDialog(facade, newElement, null, null, null);
     }
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/dbtools/AzureCosmosDbAccountParamEditor.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/dbtools/AzureCosmosDbAccountParamEditor.java
@@ -63,6 +63,7 @@
 
 public class AzureCosmosDbAccountParamEditor extends ParamEditorBase<AzureCosmosDbAccountParamEditor.CosmosDbAccountComboBox> {
     public static final String KEY_COSMOS_ACCOUNT_ID = "AZURE_COSMOS_ACCOUNT";
+    public static final String KEY_FROM_AZURE_EXPLORER = "FROM_EXPLORER";
     public static final String NO_ACCOUNT_TIPS_TEMPLATE = "<html>No Azure Cosmos DB accounts (%s). You can <a href=''>create one</a> first.</html>";
     public static final String NOT_SIGNIN_TIPS = "<html><a href=\"\">Sign in</a> to select an existing Azure Cosmos DB account.</html>";
     private final DatabaseAccountKind kind;
@@ -76,13 +77,19 @@ public class AzureCosmosDbAccountParamEditor extends ParamEditorBase<AzureCosmos
     public AzureCosmosDbAccountParamEditor(@Nonnull DatabaseAccountKind kind, @Nonnull String label, @Nonnull DataInterchange interchange) {
         super(new CosmosDbAccountComboBox(kind), interchange, FieldSize.LARGE, label);
         this.kind = kind;
-        this.accountId = interchange.getProperty(KEY_COSMOS_ACCOUNT_ID);
+        final String accountId = interchange.getProperty(KEY_COSMOS_ACCOUNT_ID);
+        // inputs will be fill with values from account if `this.accountId` is null;
+        // fill inputs with values from account if it is from azure explorer
+        // don't change values of inputs if it's modifying an existing data source
+        if (Objects.isNull(interchange.getProperty(KEY_FROM_AZURE_EXPLORER)) && Objects.nonNull(accountId)) {
+            this.accountId = accountId;
+        }
         final CosmosDbAccountComboBox combox = this.getEditorComponent();
         combox.addValueChangedListener(this::setAccount);
         interchange.addPersistentProperty(KEY_COSMOS_ACCOUNT_ID);
-        if (StringUtils.isNotBlank(this.accountId)) {
+        if (StringUtils.isNotBlank(accountId)) {
             interchange.putProperty(KEY_COSMOS_ACCOUNT_ID, null);
-            combox.setValue(new AzureComboBox.ItemReference<>(i -> i.getId().equals(this.accountId)));
+            combox.setValue(new AzureComboBox.ItemReference<>(i -> i.getId().equals(accountId)));
         }
 
         interchange.addPropertyChangeListener((evt -> onPropertiesChanged(evt.getPropertyName(), evt.getNewValue())), this);

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import java.util.function.BiConsumer;`
`28`	`28`
`29`	`29`	`import static com.microsoft.azure.toolkit.intellij.cosmos.dbtools.AzureCosmosDbAccountParamEditor.KEY_COSMOS_ACCOUNT_ID;`
	`30`	`+import static com.microsoft.azure.toolkit.intellij.cosmos.dbtools.AzureCosmosDbAccountParamEditor.KEY_FROM_AZURE_EXPLORER;`
`30`	`31`
`31`	`32`	`public class IntelliJCosmosActionsContributorForUltimate implements IActionsContributor {`
`32`	`33`	`@Override`
`@@ -46,6 +47,7 @@ private void openDatabaseTool(Project project, CosmosDBAccount account) {`
`46`	`47`	`final LocalDataSourceManager manager = LocalDataSourceManager.getInstance(project);`
`47`	`48`	`final DbDataSource newElement = ((DbPsiFacadeImpl) facade).createDataSourceWrapperElement(ds, manager);`
`48`	`49`	`ds.setAdditionalProperty(KEY_COSMOS_ACCOUNT_ID, account.getId());`
	`50`	`+ ds.setAdditionalProperty(KEY_FROM_AZURE_EXPLORER, String.valueOf(true));`
`49`	`51`	`DataSourceManagerDialog.showDialog(facade, newElement, null, null, null);`
`50`	`52`	`}`
`51`	`53`	`}`