From 32629b8920688b8dfbfde9d19318bc52835f5b66 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:25:09 -0700
Subject: [PATCH] do not overwrite idGoal parameter if found in API metadata

---
 src/data.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/data.ts b/src/data.ts
index c812429..4e6161d 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -224,6 +224,9 @@ function getReportData(request: GoogleAppsScript.Data_Studio.Request<ConnectorPa
     reportParams.enhanced = '1';
   }
 
+  delete reportParams.apiModule;
+  delete reportParams.apiAction;
+
   const SHOW_COLUMNS_UNSUPPORTED_METHODS = [
     'VisitFrequency.get',
     'Contents.getContentPieces',
@@ -292,7 +295,7 @@ function getReportData(request: GoogleAppsScript.Data_Studio.Request<ConnectorPa
       showColumns,
     };
 
-    if (reportParams.apiModule !== 'Goals') {
+    if (reportParams.apiModule !== 'Goals' && typeof params.idGoal === 'undefined') {
       params.filter_update_columns_when_show_all_goals = '1';
       params.idGoal = '0'; // calculate extra metrics for all goals
     }