chore(release): pull release/v1.98.0 into main

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.98.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.97.2...v1.98.0) (2024-11-11)
+
+
+### Features
+
+* gaec migration ([#1783](https://github.com/rudderlabs/rudder-config-schema/issues/1783)) ([6e42f7f](https://github.com/rudderlabs/rudder-config-schema/commit/6e42f7f3b333642d5302f0ababac482fa852d3b5))
+* muliselect int-info component ([#1792](https://github.com/rudderlabs/rudder-config-schema/issues/1792)) ([2e64eca](https://github.com/rudderlabs/rudder-config-schema/commit/2e64ecac8d7fe981f327e8253cd13821d7927c3c))
+
+
+### Bug Fixes
+
+* gaec schema ([#1787](https://github.com/rudderlabs/rudder-config-schema/issues/1787)) ([faa4fa6](https://github.com/rudderlabs/rudder-config-schema/commit/faa4fa61a60edae5a9aaf3242b9d61da8654c2f9))
+* http enchancements ([#1759](https://github.com/rudderlabs/rudder-config-schema/issues/1759)) ([3886598](https://github.com/rudderlabs/rudder-config-schema/commit/38865980a34deb77fb33e9b6f8948fa37aeee10b))
+
 ### [1.97.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.97.1...v1.97.2) (2024-11-07)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.97.2",
+  "version": "1.98.0",
   "description": "",
   "main": "src/index.ts",
   "private": true,

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",

src/configurations/destinations/google_adwords_enhanced_conversions/schema.json

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

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"]
                   }
                 ]
               }
@@ -78,17 +63,13 @@
                 "note": "Enter your list of Conversions",
                 "fields": [
                   {
-                    "type": "tagInput",
-                    "label": "List of Conversion",
                     "note": "Add your conversions names",
+                    "type": "dynamicMultiSelect",
+                    "label": "List of Conversion",
                     "configKey": "listOfConversions",
-                    "tagKey": "conversions",
-                    "placeholder": "e.g: Credit card visit",
-                    "default": [
-                      {
-                        "conversions": ""
-                      }
-                    ]
+                    "mode": "tags",
+                    "apiName": "getConversionId",
+                    "placeholder": "e.g: Credit card visit"
                   },
                   {
                     "type": "checkbox",

src/configurations/destinations/http/db-config.json

@@ -122,7 +122,10 @@
   },
   "options": {
     "isBeta": true,
-    "hidden": true,
+    "hidden": {
+      "featureFlagName": "AMP_http_webhook",
+      "featureFlagValue": false
+    },
     "secondPositionRedirectComponent": true
   }
 }

src/configurations/destinations/http/ui-config.json

@@ -526,6 +526,7 @@
                     "to": "$."
                   }
                 ],
+                "jsonPathValidation": true,
                 "columns": [
                   {
                     "type": "textInput",
@@ -551,6 +552,8 @@
                 "label": "Map your query parameters",
                 "configKey": "queryParams",
                 "default": [],
+                "jsonPathValidation": true,
+                "hideKeysJsonView": true,
                 "columns": [
                   {
                     "type": "textInput",
@@ -562,7 +565,7 @@
                     "type": "textInput",
                     "key": "from",
                     "label": "Value",
-                    "placeholder": "e.g: $.userId"
+                    "placeholder": "e.g: $.userId or \"userId\""
                   }
                 ]
               }
@@ -576,6 +579,8 @@
                 "label": "Map your headers",
                 "configKey": "headers",
                 "default": [],
+                "hideKeysJsonView": true,
+                "jsonPathValidation": true,
                 "columns": [
                   {
                     "type": "textInput",
@@ -587,7 +592,7 @@
                     "type": "textInput",
                     "key": "from",
                     "label": "Value",
-                    "placeholder": "e.g. application/json"
+                    "placeholder": "e.g. \"application/json\""
                   }
                 ]
               }

test/data/validation/destinations/google_adwords_enhanced_conversions.json

@@ -220,5 +220,22 @@
       "ketchConsentPurposes.unity.0 must be object"
     ],
     "result": false
+  },
+  {
+    "config": {
+      "rudderAccountId": "3454354534",
+      "authStatus": "active",
+      "configData": "{\"customerId\": \"1234567890\", \"loginCustomerId\": \"\"}"
+    },
+    "result": true
+  },
+  {
+    "config": {
+      "rudderAccountId": "3454354534",
+      "listOfConversions": ["Page View", "Product Added"],
+      "authStatus": "active",
+      "configData": "{\"customerId\": \"1234567890\", \"loginCustomerId\": \"\"}"
+    },
+    "result": true
   }
 ]