@pipedream/google_ads 0.2.1 → 0.3.1

package/README.md

@@ -18,3 +18,44 @@ and campaigns programmatically. With the API, you can automate common tasks,
 such as creating and managing campaigns, adding and removing keywords, and
 adjusting bids. You can also use the API to get information about your
 campaigns, such as campaign stats, keyword stats, and ad performance.
+
+## Customizing API requests with the Pipedream proxy
+
+The Pipedream components interact with Google Ads API through Pipedream's proxy service, which handles authentication and developer token requirements.
+
+The component accepts a standard Google Ads API request object with the following structure:
+
+```javascript
+const googleAdsReq = {
+  method: "get|post|put|delete",  // HTTP method
+  url: "/v16/...",                // Google Ads API endpoint path
+  headers: {
+    "Authorization": `Bearer ${this.googleAds.$auth.oauth_access_token}`
+  },
+  data: {}                        // Optional request body for POST/PUT requests
+}
+```
+
+To make different API calls while using the proxy:
+
+1. Modify the `url` path to match your desired Google Ads API endpoint
+2. Update the `method` to match the required HTTP method
+3. Add any necessary request body data in the `data` field
+4. Include any required headers (Authorization is automatically included)
+
+Example for a custom query:
+
+```javascript
+const googleAdsReq = {
+  method: "post",
+  url: "/v16/customers/1234567890/googleAds:search",
+  headers: {
+    "Authorization": `Bearer ${this.googleAds.$auth.oauth_access_token}`
+  },
+  data: {
+    query: "SELECT campaign.id, campaign.name FROM campaign"
+  }
+}
+```
+
+The proxy endpoint will remain the same: `https://eolid4dq1k0t9hi.m.pipedream.net`

package/actions/add-contact-to-list-by-email/add-contact-to-list-by-email.mjs

@@ -7,7 +7,7 @@ export default {
   key: "google_ads-add-contact-to-list-by-email",
   name: "Add Contact to Customer List by Email",
   description: "Adds a contact to a specific customer list in Google Ads. Lists typically update in 6 to 12 hours after operation. [See the documentation](https://developers.google.com/google-ads/api/docs/remarketing/audience-segments/customer-match/get-started)",
-  version: "0.1.0",
+  version: "0.1.2",
   type: "action",
   props: {
     ...common.props,

package/actions/common/props.mjs

@@ -1,5 +1,5 @@
 const DEFAULT_DOCS =
-  "https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList";
+  "https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList";
 
 export const getAdditionalFields = (docsLink = DEFAULT_DOCS) => ({
   type: "object",

package/actions/create-customer-list/common-constants.mjs

@@ -57,7 +57,7 @@ const USER_LIST_CRM_BASED_PROPS = {
     type: "string",
     label: "App ID",
     description:
-      "A string that uniquely identifies a mobile application from which the data was collected. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#CrmBasedUserListInfo) for more details.",
+      "A string that uniquely identifies a mobile application from which the data was collected. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#CrmBasedUserListInfo) for more details.",
     optional: true,
   },
 };
@@ -74,7 +74,7 @@ const USER_LIST_RULE_BASED_PROPS = {
     type: "object",
     label: "Flexible Rule Customer List",
     description:
-      "Flexible rule representation of visitors with one or multiple actions. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#FlexibleRuleUserListInfo) on how to build this object. Values will be parsed as JSON where applicable.",
+      "Flexible rule representation of visitors with one or multiple actions. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#FlexibleRuleUserListInfo) on how to build this object. Values will be parsed as JSON where applicable.",
     optional: true,
   },
 };
@@ -84,7 +84,7 @@ const USER_LIST_LOGICAL_PROPS = {
     type: "string[]",
     label: "Rules",
     description:
-      "Logical list rules that define this customer list. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#UserListLogicalRuleInfo) on how to build each object. Values will be parsed as JSON where applicable.",
+      "Logical list rules that define this customer list. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#UserListLogicalRuleInfo) on how to build each object. Values will be parsed as JSON where applicable.",
   },
 };
 
@@ -92,7 +92,7 @@ const USER_LIST_BASIC_PROPS = {
   conversionActions: {
     type: "string[]",
     label: "Conversion action(s)",
-    description: "One or more [conversion actions](https://developers.google.com/google-ads/api/rest/reference/rest/v16/ConversionAction) to build the list with.",
+    description: "One or more [conversion actions](https://developers.google.com/google-ads/api/rest/reference/rest/v18/ConversionAction) to build the list with.",
     optional: true,
     options: async() => {
       const {
@@ -115,7 +115,7 @@ const USER_LIST_BASIC_PROPS = {
   remarketingActions: {
     type: "string[]",
     label: "Remarketing action(s)",
-    description: "One or more [remarketing actions](https://developers.google.com/google-ads/api/rest/reference/rest/v16/RemarketingAction).",
+    description: "One or more [remarketing actions](https://developers.google.com/google-ads/api/rest/reference/rest/v18/RemarketingAction).",
     optional: true,
     options: async() => {
       const {
@@ -198,21 +198,21 @@ export const USER_LIST_TYPE_OPTIONS = [
     label: "CRM-based - a list of provided customers",
     value: USER_LIST_TYPES.CRM_BASED,
     docsLink:
-      "https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#CrmBasedUserListInfo",
+      "https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#CrmBasedUserListInfo",
     props: USER_LIST_CRM_BASED_PROPS,
   },
   {
     label: "Rule-Based - a customer list generated by a rule",
     value: USER_LIST_TYPES.RULE_BASED,
     docsLink:
-      "https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#RuleBasedUserListInfo",
+      "https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#RuleBasedUserListInfo",
     props: USER_LIST_RULE_BASED_PROPS,
   },
   {
     label: "Logical - a custom combination of customer lists",
     value: USER_LIST_TYPES.LOGICAL,
     docsLink:
-      "https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#LogicalUserListInfo",
+      "https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#LogicalUserListInfo",
     props: USER_LIST_LOGICAL_PROPS,
   },
   {
@@ -220,7 +220,7 @@ export const USER_LIST_TYPE_OPTIONS = [
       "Basic - a customer list targeting as a collection of conversions or remarketing actions",
     value: USER_LIST_TYPES.BASIC,
     docsLink:
-      "https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#BasicUserListInfo",
+      "https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#BasicUserListInfo",
     props: USER_LIST_BASIC_PROPS,
   },
   {
@@ -228,7 +228,7 @@ export const USER_LIST_TYPE_OPTIONS = [
       "Lookalike - a list composed of customers similar to those of a configurable seed",
     value: USER_LIST_TYPES.LOOKALIKE,
     docsLink:
-      "https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#LookalikeUserListInfo",
+      "https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#LookalikeUserListInfo",
     props: USER_LIST_LOOKALIKE_PROPS,
   },
 ];

package/actions/create-customer-list/create-customer-list.mjs

@@ -14,9 +14,8 @@ export default {
   ...common,
   key: "google_ads-create-customer-list",
   name: "Create Customer List",
-  description:
-    "Create a new customer list in Google Ads. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList)",
-  version: "0.0.1",
+  description: "Create a new customer list in Google Ads. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList)",
+  version: "0.0.3",
   type: "action",
   props: {
     ...common.props,
@@ -34,8 +33,7 @@ export default {
     listType: {
       type: "string",
       label: "List Type",
-      description:
-        "The [type of customer list](https://developers.google.com/google-ads/api/rest/reference/rest/v16/UserList#CrmBasedUserListInfo) to create.",
+      description: "The [type of customer list](https://developers.google.com/google-ads/api/rest/reference/rest/v18/UserList#CrmBasedUserListInfo) to create.",
       options: USER_LIST_TYPE_OPTIONS.map(({
         label, value,
       }) => ({
@@ -95,6 +93,10 @@ export default {
   additionalProps() {
     const { listType } = this;
 
+    if (!listType) {
+      return {};
+    }
+
     const option = USER_LIST_TYPE_OPTIONS.find(
       ({ value }) => value === listType,
     );

package/actions/create-report/common-constants.mjs

@@ -0,0 +1,55 @@
+export const DATE_RANGE_OPTIONS = [
+  {
+    value: "CUSTOM",
+    label: "Specify a custom date range",
+  },
+  {
+    value: "TODAY",
+    label: "Today only",
+  },
+  {
+    value: "YESTERDAY",
+    label: "Yesterday only",
+  },
+  {
+    value: "LAST_7_DAYS",
+    label: "The last 7 days not including today",
+  },
+  {
+    value: "LAST_BUSINESS_WEEK",
+    label:
+      "The 5 day business week, Monday through Friday, of the previous business week",
+  },
+  {
+    value: "THIS_MONTH",
+    label: "All days in the current month",
+  },
+  {
+    value: "LAST_MONTH",
+    label: "All days in the previous month",
+  },
+  {
+    value: "LAST_14_DAYS",
+    label: "The last 14 days not including today",
+  },
+  {
+    value: "LAST_30_DAYS",
+    label: "The last 30 days not including today",
+  },
+  {
+    value: "THIS_WEEK_SUN_TODAY",
+    label: "The period between the previous Sunday and the current day",
+  },
+  {
+    value: "THIS_WEEK_MON_TODAY",
+    label: "The period between the previous Monday and the current day",
+  },
+  {
+    value: "LAST_WEEK_SUN_SAT",
+    label: "The 7-day period starting with the previous Sunday",
+  },
+  {
+    value: "LAST_WEEK_MON_SUN",
+    label: "The 7-day period starting with the previous Monday",
+  },
+];

package/actions/create-report/create-report.mjs

@@ -4,6 +4,8 @@ import { ad } from "../../common/resources/ad.mjs";
 import { campaign } from "../../common/resources/campaign.mjs";
 import { customer } from "../../common/resources/customer.mjs";
 import { ConfigurationError } from "@pipedream/platform";
+import { DATE_RANGE_OPTIONS } from "./common-constants.mjs";
+import { checkPrefix } from "../../common/utils.mjs";
 
 const RESOURCES = [
   adGroup,
@@ -16,8 +18,8 @@ export default {
   ...common,
   key: "google_ads-create-report",
   name: "Create Report",
-  description: "Generates a report from your Google Ads data. [See the documentation](https://developers.google.com/google-ads/api/fields/v16/overview)",
-  version: "0.0.2",
+  description: "Generates a report from your Google Ads data. [See the documentation](https://developers.google.com/google-ads/api/fields/v18/overview)",
+  version: "0.1.1",
   type: "action",
   props: {
     ...common.props,
@@ -41,12 +43,62 @@ export default {
       docsAlert: {
         type: "alert",
         alertType: "info",
-        content: `[See the documentation](https://developers.google.com/google-ads/api/fields/v16/${value}) for more information on available fields, segments and metrics.`,
+        content: `[See the documentation](https://developers.google.com/google-ads/api/fields/v18/${value}) for more information on available fields, segments and metrics.`,
       },
+      objectFilter: {
+        type: "string[]",
+        label: `Filter by ${label}s`,
+        description: `Select the ${label}s to generate a report for (or leave blank for all ${label}s)`,
+        optional: true,
+        useQuery: true,
+        options: async ({
+          query, prevContext: { nextPageToken: pageToken },
+        }) => {
+          const {
+            accountId, customerClientId, resource,
+          } = this;
+          const {
+            results, nextPageToken,
+          } = await this.googleAds.listResources({
+            accountId,
+            customerClientId,
+            resource,
+            query,
+            pageToken,
+          });
+          const options = results?.map?.((item) => this.getResourceOption(item, resource));
+          return {
+            options,
+            context: {
+              nextPageToken,
+            },
+          };
+        },
+      },
+      dateRange: {
+        type: "string",
+        label: "Date Range",
+        description: "Select a date range for the report",
+        options: DATE_RANGE_OPTIONS,
+        optional: true,
+        reloadProps: true,
+      },
+      ...(this.dateRange === "CUSTOM" && {
+        startDate: {
+          type: "string",
+          label: "Start Date",
+          description: "The start date, in `YYYY-MM-DD` format",
+        },
+        endDate: {
+          type: "string",
+          label: "End Date",
+          description: "The end date, in `YYYY-MM-DD` format",
+        },
+      }),
       fields: {
         type: "string[]",
         label: "Fields",
-        description: `${label} data fields to obtain`,
+        description: "Select any fields you want to include in your report.",
         options: resource.fields,
         optional: true,
         reloadProps: true,
@@ -54,15 +106,18 @@ export default {
       segments: {
         type: "string[]",
         label: "Segments",
-        description: `${label} segments to obtain [more info on the documentation](https://developers.google.com/google-ads/api/fields/v16/segments)`,
+        description: "Select any segments you want to include in your report. See the documentation [here](https://developers.google.com/google-ads/api/fields/v18/segments)",
         options: resource.segments,
+        default: [
+          "segments.date",
+        ],
         optional: true,
         reloadProps: true,
       },
       metrics: {
         type: "string[]",
         label: "Metrics",
-        description: `${label} metrics to obtain [more info on the documentation](https://developers.google.com/google-ads/api/fields/v16/metrics)`,
+        description: "Select any metrics you want to include in your report. See the documentation [here](https://developers.google.com/google-ads/api/fields/v18/metrics)",
         options: resource.metrics,
         optional: true,
         reloadProps: true,
@@ -114,17 +169,48 @@ export default {
     };
   },
   methods: {
+    getResourceOption(item, resource) {
+      let label, value;
+      switch (resource) {
+      case "campaign":
+        label = item.campaign.name;
+        value = item.campaign.id;
+        break;
+
+      case "customer":
+        label = item.customer.descriptiveName;
+        value = item.customer.id;
+        break;
+
+      case "ad_group":
+        label = item.adGroup.name;
+        value = item.adGroup.id;
+        break;
+
+      case "ad_group_ad":
+        label = item.adGroupAd.ad.name;
+        value = item.adGroupAd.ad.id;
+        break;
+      }
+
+      return {
+        label,
+        value,
+      };
+    },
     buildQuery() {
       const {
-        resource, limit, orderBy, direction,
+        resource, fields, segments, metrics, limit, orderBy, direction, objectFilter, dateRange,
       } = this;
-      const fields = this.fields?.map((i) => `${resource}.${i}`) ?? [];
-      const segments = this.segments?.map((i) => `segments.${i}`) ?? [];
-      const metrics = this.metrics?.map((i) => `metrics.${i}`) ?? [];
+
+      const filteredSegments = dateRange
+        ? segments
+        : segments?.filter((i) => i !== "segments.date");
+
       const selection = [
-        ...fields,
-        ...segments,
-        ...metrics,
+        ...checkPrefix(fields, resource),
+        ...checkPrefix(filteredSegments, "segments"),
+        ...checkPrefix(metrics, "metrics"),
       ];
 
       if (!selection.length) {
@@ -132,8 +218,22 @@ export default {
       }
 
       let query = `SELECT ${selection.join(", ")} FROM ${resource}`;
+      if (objectFilter) {
+        query += ` WHERE ${resource === "ad_group_ad"
+          ? "ad_group_ad.ad"
+          : resource}.id IN (${objectFilter.join?.(", ") ?? objectFilter})`;
+      }
+      if (dateRange) {
+        const dateClause = dateRange === "CUSTOM"
+          ? `BETWEEN '${this.startDate}' AND '${this.endDate}'`
+          : `DURING ${dateRange}`;
+        query += ` ${objectFilter
+          ? "AND"
+          : "WHERE"} segments.date ${dateClause}`;
+      }
+
       if (orderBy && direction) {
-        query += ` ORDER BY ${`${resource}.${orderBy}`} ${direction}`;
+        query += ` ORDER BY ${orderBy} ${direction}`;
       }
       if (limit) {
         query += ` LIMIT ${limit}`;
@@ -155,7 +255,7 @@ export default {
 
     const { length } = results;
 
-    $.export("$summary", `Sucessfully obtained ${length} result${length === 1
+    $.export("$summary", `Successfully obtained ${length} result${length === 1
       ? ""
       : "s"}`);
     return {

package/actions/send-offline-conversion/send-offline-conversion.mjs

@@ -7,8 +7,8 @@ export default {
   ...common,
   key: "google_ads-send-offline-conversion",
   name: "Send Offline Conversion",
-  description: "Send an event from to Google Ads to track offline conversions. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v16/ConversionAction)",
-  version: "0.0.1",
+  description: "Send an event from to Google Ads to track offline conversions. [See the documentation](https://developers.google.com/google-ads/api/rest/reference/rest/v18/ConversionAction)",
+  version: "0.0.3",
   type: "action",
   props: {
     ...common.props,
@@ -20,10 +20,10 @@ export default {
     type: {
       type: "string",
       label: "Type",
-      description: "[The type](https://developers.google.com/google-ads/api/rest/reference/rest/v16/ConversionAction#ConversionActionType) of the conversion action.",
+      description: "[The type](https://developers.google.com/google-ads/api/rest/reference/rest/v18/ConversionAction#ConversionActionType) of the conversion action.",
       options: CONVERSION_TYPE_OPTIONS,
     },
-    additionalFields: getAdditionalFields("https://developers.google.com/google-ads/api/rest/reference/rest/v16/ConversionAction"),
+    additionalFields: getAdditionalFields("https://developers.google.com/google-ads/api/rest/reference/rest/v18/ConversionAction"),
   },
   async run({ $ }) {
     const {

package/common/queries.mjs

@@ -20,6 +20,7 @@ function listUserLists() {
   const fields = [
     "id",
     "name",
+    "type",
   ].map((s) => `user_list.${s}`).join(", ");
 
   return `SELECT ${fields} FROM user_list`;
@@ -73,7 +74,7 @@ function listCampaigns({
   const defaultFields = [
     "id",
     "name",
-  ];
+  ].map((s) => `campaign.${s}`);
   if (typeof fields === "string") {
     fields = fields.split(",").map((s) => s.trim());
   }
@@ -91,7 +92,22 @@ function listCampaigns({
     ? ` WHERE ${savedIds.map((id) => `campaign.id != ${id}`).join(" AND ")}`
     : "";
 
-  return `SELECT ${fields.map((s) => `campaign.${s}`).join(", ")} FROM campaign${filter}`;
+  return `SELECT ${fields.join(", ")} FROM campaign${filter}`;
+}
+
+function listResources(resource, query) {
+  const name = resource === "customer"
+    ? "descriptive_name"
+    : "name";
+  const fieldResource = resource === "ad_group_ad"
+    ? "ad_group_ad.ad"
+    : resource;
+
+  let result = `SELECT ${fieldResource}.id, ${fieldResource}.${name} FROM ${resource}`;
+  if (query) {
+    result += ` WHERE ${fieldResource}.${name} LIKE '%${query}%'`;
+  }
+  return result;
 }
 
 export const QUERIES = {
@@ -101,5 +117,6 @@ export const QUERIES = {
   listLeadForms,
   listLeadFormSubmissionData,
   listRemarketingActions,
+  listResources,
   listUserLists,
 };

package/common/resources/ad.mjs

@@ -1,3 +1,5 @@
+import { getOption } from "../utils.mjs";
+
 const fields = [
   "action_items",
   "ad.added_by_google_ads",
@@ -213,7 +215,7 @@ const fields = [
   "primary_status_reasons",
   "resource_name",
   "status",
-];
+].map((f) => getOption(f, "ad_group_ad"));
 
 const segments = [
   "ad_destination_type",
@@ -226,20 +228,14 @@ const segments = [
   "conversion_lag_bucket",
   "conversion_or_adjustment_lag_bucket",
   "date",
-  "day_of_week",
   "device",
   "external_conversion_source",
   "keyword.ad_group_criterion",
   "keyword.info.match_type",
   "keyword.info.text",
-  "month",
-  "month_of_year",
   "new_versus_returning_customers",
-  "quarter",
   "slot",
-  "week",
-  "year",
-];
+].map((f) => getOption(f, "segments"));
 
 const metrics = [
   "absolute_top_impression_percentage",
@@ -319,7 +315,7 @@ const metrics = [
   "video_view_rate",
   "video_views",
   "view_through_conversions",
-];
+].map((f) => getOption(f, "metrics"));
 
 const resourceOption = {
   label: "Ad",

package/common/resources/adGroup.mjs

@@ -1,3 +1,5 @@
+import { getOption } from "../utils.mjs";
+
 const fields = [
   "ad_rotation_mode",
   "audience_setting.use_audience_grouped",
@@ -31,7 +33,7 @@ const fields = [
   "tracking_url_template",
   "type",
   "url_custom_parameters",
-];
+].map((f) => getOption(f, "ad_group"));
 
 const segments = [
   "ad_destination_type",
@@ -47,18 +49,12 @@ const segments = [
   "conversion_lag_bucket",
   "conversion_or_adjustment_lag_bucket",
   "date",
-  "day_of_week",
   "device",
   "external_conversion_source",
   "hour",
-  "month",
-  "month_of_year",
   "new_versus_returning_customers",
-  "quarter",
   "slot",
-  "week",
-  "year",
-];
+].map((f) => getOption(f, "segments"));
 
 const metrics = [
   "absolute_top_impression_percentage",
@@ -159,7 +155,7 @@ const metrics = [
   "video_view_rate",
   "video_views",
   "view_through_conversions",
-];
+].map((f) => getOption(f, "metrics"));
 
 const resourceOption = {
   label: "Ad Group",

package/common/resources/campaign.mjs

@@ -1,3 +1,5 @@
+import { getOption } from "../utils.mjs";
+
 const fields = [
   "accessible_bidding_strategy",
   "ad_serving_optimization_status",
@@ -93,7 +95,7 @@ const fields = [
   "vanity_pharma.vanity_pharma_display_url_mode",
   "vanity_pharma.vanity_pharma_text",
   "video_brand_safety_suitability",
-];
+].map((f) => getOption(f, "campaign"));
 
 const segments = [
   "ad_destination_type",
@@ -111,14 +113,10 @@ const segments = [
   "conversion_or_adjustment_lag_bucket",
   "conversion_value_rule_primary_dimension",
   "date",
-  "day_of_week",
   "device",
   "external_conversion_source",
   "hour",
-  "month",
-  "month_of_year",
   "new_versus_returning_customers",
-  "quarter",
   "recommendation_type",
   "sk_ad_network_ad_event_type",
   "sk_ad_network_attribution_credit",
@@ -130,9 +128,7 @@ const segments = [
   "sk_ad_network_source_type",
   "sk_ad_network_user_type",
   "slot",
-  "week",
-  "year",
-];
+].map((f) => getOption(f, "segments"));
 
 const metrics = [
   "absolute_top_impression_percentage",
@@ -274,7 +270,7 @@ const metrics = [
   "view_through_conversions_from_location_asset_other_engagement",
   "view_through_conversions_from_location_asset_store_visits",
   "view_through_conversions_from_location_asset_website",
-];
+].map((f) => getOption(f, "metrics"));
 
 const resourceOption = {
   label: "Campaign",

package/common/resources/customer.mjs

@@ -1,3 +1,5 @@
+import { getOption } from "../utils.mjs";
+
 const fields = [
   "auto_tagging_enabled",
   "call_reporting_setting.call_conversion_action",
@@ -32,7 +34,7 @@ const fields = [
   "time_zone",
   "tracking_url_template",
   "video_brand_safety_suitability",
-];
+].map((f) => getOption(f, "customer"));
 
 const segments = [
   "ad_network_type",
@@ -46,14 +48,10 @@ const segments = [
   "conversion_or_adjustment_lag_bucket",
   "conversion_value_rule_primary_dimension",
   "date",
-  "day_of_week",
   "device",
   "external_conversion_source",
   "hour",
-  "month",
-  "month_of_year",
   "new_versus_returning_customers",
-  "quarter",
   "recommendation_type",
   "sk_ad_network_ad_event_type",
   "sk_ad_network_attribution_credit",
@@ -65,9 +63,7 @@ const segments = [
   "sk_ad_network_source_type",
   "sk_ad_network_user_type",
   "slot",
-  "week",
-  "year",
-];
+].map((f) => getOption(f, "segments"));
 
 const metrics = [
   "absolute_top_impression_percentage",
@@ -166,7 +162,7 @@ const metrics = [
   "view_through_conversions_from_location_asset_other_engagement",
   "view_through_conversions_from_location_asset_store_visits",
   "view_through_conversions_from_location_asset_website",
-];
+].map((f) => getOption(f, "metrics"));
 
 const resourceOption = {
   label: "Customer",

package/common/utils.mjs

@@ -30,3 +30,19 @@ export function parseStringObject(value = "{}") {
 **${err.toString()}**`);
   }
 }
+
+export function getOption(label, prefix) {
+  return {
+    label,
+    value: `${prefix}.${label}`,
+  };
+}
+
+export function checkPrefix(value, prefix) {
+  const checkStr = (s) => s && (s?.startsWith?.(prefix)
+    ? s
+    : `${prefix}.${s}`);
+  return Array.isArray(value ?? [])
+    ? (value ?? []).map(checkStr)
+    : checkStr(value);
+}

package/google_ads.app.mjs

@@ -21,7 +21,7 @@ export default {
           accountId,
           customerClientId,
         });
-        return response?.map(({
+        return response?.filter(({ userList: { type } }) => type === "CRM_BASED")?.map(({
           userList: {
             id, name,
           },
@@ -34,7 +34,7 @@ export default {
     accountId: {
       type: "string",
       label: "Use Google Ads As",
-      description: "Select an account from the list of [customers directly accessible by the authenticated user](https://developers.google.com/google-ads/api/rest/reference/rest/v16/customers/listAccessibleCustomers). This is usually a **Manager Account**, used as `login-customer-id`",
+      description: "Select an account from the list of [customers directly accessible by the authenticated user](https://developers.google.com/google-ads/api/rest/reference/rest/v18/customers/listAccessibleCustomers). This is usually a **Manager Account**, used as `login-customer-id`",
       async options() {
         const response = await this.listAccessibleCustomers();
         return response?.map(((resourceName) => ({
@@ -46,7 +46,7 @@ export default {
     customerClientId: {
       type: "string",
       label: "Managed Account",
-      description: "Select a [customer client](https://developers.google.com/google-ads/api/reference/rpc/v16/CustomerClient) from the list of [customers linked to the selected account](https://developers.google.com/google-ads/api/docs/account-management/get-account-hierarchy).",
+      description: "Select a [customer client](https://developers.google.com/google-ads/api/reference/rpc/v18/CustomerClient) from the list of [customers linked to the selected account](https://developers.google.com/google-ads/api/docs/account-management/get-account-hierarchy).",
       useQuery: true,
       optional: true,
       async options({
@@ -71,7 +71,7 @@ export default {
     leadFormId: {
       type: "string",
       label: "Lead Form ID",
-      description: "Select a [Lead Form](https://developers.google.com/google-ads/api/rest/reference/rest/v16/Asset#LeadFormAsset) to watch for new entries.",
+      description: "Select a [Lead Form](https://developers.google.com/google-ads/api/rest/reference/rest/v18/Asset#LeadFormAsset) to watch for new entries.",
       async options({
         accountId, customerClientId,
       }) {
@@ -121,83 +121,102 @@ export default {
     }) {
       console.log("Executing query: ", query);
       const response = await this._makeRequest({
-        path: "/v16/customers/{customerClientId}/googleAds:search",
+        path: "/v18/customers/{customerClientId}/googleAds:search",
         method: "post",
         data: {
           query,
         },
         ...args,
       });
-      return response.results;
+      return response;
     },
     async listAccessibleCustomers() {
       const response = await this._makeRequest({
-        path: "/v16/customers:listAccessibleCustomers",
+        path: "/v18/customers:listAccessibleCustomers",
       });
       return response.resourceNames;
     },
     async listCustomerClients({
       query, ...args
     }) {
-      return this.search({
+      const { results } = await this.search({
         query: QUERIES.listCustomerClients(query),
         ...args,
       });
+      return results;
     },
     async createReport(args) {
-      return this.search(args);
+      const { results } = await this.search(args);
+      return results;
     },
     async createUserList(args) {
       const response = await this._makeRequest({
-        path: "v16/customers/{customerClientId}/userLists:mutate",
+        path: "v18/customers/{customerClientId}/userLists:mutate",
         method: "post",
         ...args,
       });
       return response;
     },
     async listUserLists(args) {
-      return this.search({
+      const { results } = await this.search({
         query: QUERIES.listUserLists(),
         ...args,
       });
+      return results;
     },
     async listConversionActions(args) {
-      return this.search({
+      const { results } = await this.search({
         query: QUERIES.listConversionActions(),
         ...args,
       });
+      return results;
     },
     async listRemarketingActions(args) {
-      return this.search({
+      const { results } = await this.search({
         query: QUERIES.listRemarketingActions(),
         ...args,
       });
+      return results;
     },
     async listLeadForms(args) {
-      return this.search({
+      const { results } = await this.search({
         query: QUERIES.listLeadForms(),
         ...args,
       });
+      return results;
     },
     async listCampaigns({
       query, ...args
     }) {
-      return this.search({
+      const { results } = await this.search({
         query: QUERIES.listCampaigns(query),
         ...args,
       });
+      return results;
+    },
+    async listResources({
+      resource, query, pageToken, ...args
+    }) {
+      return this.search({
+        query: QUERIES.listResources(resource, query),
+        params: {
+          pageToken,
+        },
+        ...args,
+      });
     },
     async getLeadFormData({
       leadFormId, ...args
     }) {
-      return this.search({
+      const { results } = await this.search({
         query: QUERIES.listLeadFormSubmissionData(leadFormId),
         ...args,
       });
+      return results;
     },
     async createConversionAction(args) {
       const response = await this._makeRequest({
-        path: "v16/customers/{customerClientId}/conversionActions:mutate",
+        path: "v18/customers/{customerClientId}/conversionActions:mutate",
         method: "post",
         ...args,
       });
@@ -208,14 +227,14 @@ export default {
     }) {
       return this._makeRequest({
         method: "POST",
-        path: `/v16/${path}:addOperations`,
+        path: `/v18/${path}:addOperations`,
         ...opts,
       });
     },
     async createOfflineUserDataJob(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        path: "/v16/customers/{customerClientId}/offlineUserDataJobs:create",
+        path: "/v18/customers/{customerClientId}/offlineUserDataJobs:create",
         ...opts,
       });
     },
@@ -224,7 +243,7 @@ export default {
     }) {
       return this._makeRequest({
         method: "POST",
-        path: `/v16/${path}:run`,
+        path: `/v18/${path}:run`,
         ...args,
       });
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_ads",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Pipedream Google Ads Components",
   "main": "google_ads.app.mjs",
   "keywords": [
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pipedream/platform": "^1.6.5",
+    "@pipedream/platform": "^3.0.3",
     "crypto": "^1.0.1"
   }
 }

package/sources/new-campaign-created/new-campaign-created.mjs

@@ -6,8 +6,8 @@ export default {
   ...common,
   key: "google_ads-new-campaign-created",
   name: "New Campaign Created",
-  description: "Emit new event when a new campaign is created. [See the documentation](https://developers.google.com/google-ads/api/fields/v16/campaign)",
-  version: "0.0.1",
+  description: "Emit new event when a new campaign is created. [See the documentation](https://developers.google.com/google-ads/api/fields/v18/campaign)",
+  version: "0.0.3",
   type: "source",
   dedupe: "unique",
   sampleEmit,
@@ -15,17 +15,16 @@ export default {
     ...common.props,
     customerClientId: {
       ...common.props.customerClientId,
-      optional: false,
     },
     fields: {
       type: "string[]",
       label: "Extra Fields",
-      description: "Additional [campaign fields](https://developers.google.com/google-ads/api/fields/v16/campaign) to emit in the event",
+      description: "Additional [campaign fields](https://developers.google.com/google-ads/api/fields/v18/campaign) to emit in the event",
       options: campaign.fields,
       optional: true,
       default: [
-        "id",
-        "name",
+        "campaign.id",
+        "campaign.name",
       ],
     },
   },

package/sources/new-lead-form-entry/new-lead-form-entry.mjs

@@ -7,8 +7,8 @@ export default {
   ...common,
   key: "google_ads-new-lead-form-entry",
   name: "New Lead Form Entry",
-  description: "Emit new event for new leads on a Lead Form. [See the documentation](https://developers.google.com/google-ads/api/fields/v16/lead_form_submission_data)",
-  version: "0.0.1",
+  description: "Emit new event for new leads on a Lead Form. [See the documentation](https://developers.google.com/google-ads/api/fields/v18/lead_form_submission_data)",
+  version: "0.0.3",
   type: "source",
   dedupe: "unique",
   sampleEmit,
@@ -29,7 +29,7 @@ export default {
     docsAlert: {
       type: "alert",
       alertType: "info",
-      content: "If needed, see Google's documentation on [submission fields](https://developers.google.com/google-ads/api/reference/rpc/v16/LeadFormSubmissionField) and [custom submission fields](https://developers.google.com/google-ads/api/reference/rpc/v16/CustomLeadFormSubmissionField).",
+      content: "If needed, see Google's documentation on [submission fields](https://developers.google.com/google-ads/api/reference/rpc/v18/LeadFormSubmissionField) and [custom submission fields](https://developers.google.com/google-ads/api/reference/rpc/v18/CustomLeadFormSubmissionField).",
     },
   },
   methods: {