Merge remote-tracking branch 'origin/develop' into fix.webhook-url-regex

rudderlabs · Nov 6, 2024 · 909b01d · 909b01d
2 parents 53741f2 + 6e42f7f
commit 909b01d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/src/configurations/destinations/google_adwords_enhanced_conversions/db-config.json b/src/configurations/destinations/google_adwords_enhanced_conversions/db-config.json
@@ -42,14 +42,7 @@
       "warehouse": ["cloud"]
     },
     "destConfig": {
-      "defaultConfig": [
-        "rudderAccountId",
-        "customerId",
-        "listOfConversions",
-        "subAccount",
-        "loginCustomerId",
-        "requireHash"
-      ],
+      "defaultConfig": ["rudderAccountId", "listOfConversions", "requireHash", "configData"],
       "android": [
         "connectionMode",
         "consentManagement",

diff --git a/src/configurations/destinations/google_adwords_enhanced_conversions/schema.json b/src/configurations/destinations/google_adwords_enhanced_conversions/schema.json
@@ -2,7 +2,29 @@
   "configSchema": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
+    "required": ["configData"],
+    "additionalProperties": false,
     "properties": {
+      "configData": {
+        "type": "string",
+        "default": "{\"customerId\": \"123\"}"
+      },
+      "requireHash": {
+        "type": "boolean",
+        "default": true
+      },
+      "listOfConversions": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "conversions": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+            }
+          }
+        }
+      },
       "oneTrustCookieCategories": {
         "type": "object",
         "properties": {

diff --git a/src/configurations/destinations/google_adwords_enhanced_conversions/ui-config.json b/src/configurations/destinations/google_adwords_enhanced_conversions/ui-config.json
@@ -13,35 +13,20 @@
                 "icon": "settings",
                 "fields": [
                   {
-                    "type": "textInput",
-                    "label": "Customer ID",
-                    "note": "Enter the Customer ID",
-                    "configKey": "customerId",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
-                    "regexErrorMessage": "Invalid Customer Id",
-                    "placeholder": "e.g: 9693XX9833"
-                  },
-                  {
-                    "type": "checkbox",
-                    "label": "Sub Account",
-                    "configKey": "subAccount",
-                    "default": false
-                  },
-                  {
-                    "type": "textInput",
-                    "label": "Login Customer ID",
-                    "note": "Enter the Login Customer ID",
-                    "configKey": "loginCustomerId",
-                    "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
-                    "regexErrorMessage": "Invalid Login Customer Id",
+                    "type": "nestedSelect",
+                    "label": "Select account",
+                    "apiName": "getConfigData",
+                    "configKey": "configData",
+                    "placeholder": "Select account details",
                     "preRequisites": {
                       "fields": [
                         {
-                          "configKey": "subAccount",
-                          "value": true
+                          "exists": true,
+                          "configKey": "rudderAccountId"
                         }
                       ]
-                    }
+                    },
+                    "apiDependencies": ["rudderAccountId"]
                   }
                 ]
               }