Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o chore/eject-cra-retry-3
appsmithorg · Feb 12, 2025 · 7fca371 · 7fca371
2 parents 6502ee6 + 9aa065b
commit 7fca371
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts
@@ -53,7 +53,7 @@ describe(
       agHelper.GetNClickByContains(dataSources._dropdownOption, "friends");
 
       GenerateCRUDNValidateDeployPage(
-        "<p>Monica's old friend Rachel moves in with her after leaving her fiancé.</p>",
+        "Monica's old friend Rachel moves in with her after leaving her fiancé.",
         `1994-09-22T00:00:00+00:00`,
         "http://www.tvmaze.com/episodes/40646/friends-1x01-the-one-where-it-all-began",
         11,

diff --git a/app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx b/app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx
@@ -12,6 +12,7 @@ import {
   COMMITTING_AND_PUSHING_CHANGES,
   createMessage,
   DISCARD_CHANGES,
+  DISCARD_SUCCESS,
   DISCARDING_AND_PULLING_CHANGES,
   GIT_NO_UPDATED_TOOLTIP,
   PULL_CHANGES,
@@ -239,7 +240,7 @@ function TabDeployView({
     AnalyticsUtil.logEvent("GIT_DISCARD", {
       source: "GIT_DISCARD_BUTTON_PRESS_2",
     });
-    discard(createMessage(DISCARD_CHANGES));
+    discard(createMessage(DISCARD_SUCCESS));
     setShowDiscardWarning(false);
     setShouldDiscard(true);
     setIsDiscarding(true);

diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java b/app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java
@@ -363,15 +363,14 @@ private Set<String> populateHintMessages(List<String> columnNames) {
         @Override
         public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
             log.debug(Thread.currentThread().getName() + ": datasourceCreate() called for MSSQL plugin.");
-            return connectionPoolConfig
-                    .getMaxConnectionPoolSize()
-                    .flatMap(maxPoolSize -> {
+            return Mono.defer(
+                    () -> connectionPoolConfig.getMaxConnectionPoolSize().flatMap(maxPoolSize -> {
                         return Mono.fromCallable(() -> {
-                            log.debug(Thread.currentThread().getName() + ": Connecting to SQL Server db");
-                            return createConnectionPool(datasourceConfiguration, maxPoolSize);
-                        });
-                    })
-                    .subscribeOn(scheduler);
+                                    log.debug(Thread.currentThread().getName() + ": Connecting to SQL Server db");
+                                    return createConnectionPool(datasourceConfiguration, maxPoolSize);
+                                })
+                                .subscribeOn(scheduler);
+                    }));
         }
 
         @Override