Merge branch 'endgame-202211' into endgame-202211.next

microsoft · Dec 2, 2022 · 059af67 · 059af67
2 parents 755f837 + 169df5b
commit 059af67
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.../com/microsoft/azure/toolkit/intellij/cosmos/dbtools/AzureCosmosDbAccountParamEditor.java b/.../com/microsoft/azure/toolkit/intellij/cosmos/dbtools/AzureCosmosDbAccountParamEditor.java
@@ -183,8 +183,10 @@ private void setAccount(@Nullable CosmosDBAccount account) {
         manager.runOnPooledThread(() -> {
             this.connectionString = Optional.ofNullable(account).map(CosmosDBAccount::getCosmosDBAccountPrimaryConnectionString).orElse(null);
             manager.runLater(() -> {
+                final boolean fromExplorer = Objects.nonNull(interchange.getProperty(KEY_FROM_AZURE_EXPLORER));
+                interchange.putProperty(KEY_FROM_AZURE_EXPLORER, null);
                 interchange.putProperty(KEY_COSMOS_ACCOUNT_ID, Optional.ofNullable(newAccountId).orElse(NONE));
-                if (Objects.isNull(account) || Objects.isNull(connectionString) || StringUtils.equalsIgnoreCase(oldAccountId, newAccountId)) {
+                if (Objects.isNull(account) || Objects.isNull(connectionString) || StringUtils.equalsIgnoreCase(oldAccountId, newAccountId) && !fromExplorer) {
                     this.updating = false;
                     return;
                 }