From 253ab0751bb4d4af878b91b970c9352406ed677e Mon Sep 17 00:00:00 2001
From: Lingeshwar S <lingesh100@gmail.com>
Date: Mon, 23 Sep 2024 12:45:53 +0530
Subject: [PATCH] [PLAT-15400][PLAT-15401][PLAT-13051] - Connection pooling ui
 issues and other ui issues

Summary:
**[PLAT-15400]** - Connection Pooling not abled even on selecting Enable Connection Pooling during universe creation

**[PLAT-15401]** - Enable Connection Pooling Option Not Displayed as Toggled On in Edit Universe

**[PLAT-13051]** - Wording change for "Select new CA signed cert" dialog - for Encryption in Transit

Test Plan: Tested manually

Reviewers: kkannan

Reviewed By: kkannan

Subscribers: yugaware, ui

Differential Revision: https://phorge.dev.yugabyte.com/D38311
---
 .../forms/RollingUpgradeForm/RollingUpgradeForm.js    |  2 +-
 .../features/universe/universe-form/utils/helpers.ts  | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/managed/ui/src/components/common/forms/RollingUpgradeForm/RollingUpgradeForm.js b/managed/ui/src/components/common/forms/RollingUpgradeForm/RollingUpgradeForm.js
index 684af4bf6775..cd88b57fcf49 100644
--- a/managed/ui/src/components/common/forms/RollingUpgradeForm/RollingUpgradeForm.js
+++ b/managed/ui/src/components/common/forms/RollingUpgradeForm/RollingUpgradeForm.js
@@ -571,7 +571,7 @@ export default class RollingUpgradeForm extends Component {
                   }}
                 />
               ) : (
-                <span>Select new CA signed cert from the list</span>
+                <span>Select a new certificate from the list</span>
               )
             }
             asyncValidating={
diff --git a/managed/ui/src/redesign/features/universe/universe-form/utils/helpers.ts b/managed/ui/src/redesign/features/universe/universe-form/utils/helpers.ts
index 4be38dc398a5..53fe1a0e33b3 100644
--- a/managed/ui/src/redesign/features/universe/universe-form/utils/helpers.ts
+++ b/managed/ui/src/redesign/features/universe/universe-form/utils/helpers.ts
@@ -239,7 +239,8 @@ export const getFormData = (
       communicationPorts,
       customizePort: false, //** */
       ybcPackagePath: null, //** */,
-      enablePGCompatibitilty: isPGEnabledFromIntent(userIntent)
+      enablePGCompatibitilty: isPGEnabledFromIntent(userIntent),
+      enableConnectionPooling: _.get(userIntent, 'enableConnectionPooling', false)
     },
     instanceTags: transformInstanceTags(userIntent.instanceTags),
     gFlags: userIntent?.specificGFlags
@@ -252,10 +253,6 @@ export const getFormData = (
     inheritFlagsFromPrimary: userIntent?.specificGFlags?.inheritFromPrimary
   };
 
-  if (!_.isEmpty(userIntent?.enableConnectionPooling)) {
-    data.advancedConfig.enableConnectionPooling = userIntent.enableConnectionPooling;
-  }
-
   if (data.cloudConfig.masterPlacement === MasterPlacementMode.DEDICATED) {
     data.instanceConfig.masterInstanceType = userIntent.masterInstanceType;
     data.instanceConfig.masterDeviceInfo = userIntent.masterDeviceInfo;
@@ -319,6 +316,7 @@ export const getUserIntent = (
     enableIPV6: advancedConfig.enableIPV6,
     enableExposingService: advancedConfig.enableExposingService,
     useSystemd: advancedConfig.useSystemd,
+    enableConnectionPooling: _.get(advancedConfig, 'enableConnectionPooling', false),
     imageBundleUUID: instanceConfig.imageBundleUUID!
   };
 
@@ -354,9 +352,6 @@ export const getUserIntent = (
   if (!_.isEmpty(azOverrides)) intent.userIntentOverrides = { azOverrides };
   if (!_.isEmpty(proxyConfig)) intent.proxyConfig = proxyConfig;
   if (!_.isEmpty(universeOverrides)) intent.universeOverrides = universeOverrides;
-  if (!_.isEmpty(advancedConfig?.enableConnectionPooling)) {
-    intent.enableConnectionPooling = advancedConfig.enableConnectionPooling;
-  }
 
   if (
     cloudConfig.provider?.code === CloudType.kubernetes &&