Merge pull request #63 from google-marketing-solutions/dev

Dev -> main
google-marketing-solutions · Oct 24, 2024 · 5acfde5 · 5acfde5
2 parents ddf9b65 + dad90fb
commit 5acfde5
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 2 deletions.
diff --git a/py/common/google_ads_client.py b/py/common/google_ads_client.py
@@ -24,7 +24,7 @@
     + '/{api_version}/customers/{customer_id}/googleAds:searchStream'
 )
 
-_API_VERSION = '15'
+_API_VERSION = '18'
 
 _CREDENTIAL_REQUIRED_KEYS = (
     'developer_token',

diff --git a/py/common/google_ads_client_test.py b/py/common/google_ads_client_test.py
@@ -68,7 +68,7 @@
 _FAKE_CUSTOMER_ID = '1234567890'
 _FAKE_CAMPAIGN_IDS = [1]
 
-_TEST_SEARCH_STREAM_URL = 'https://googleads.googleapis.com/v15/customers/1234567890/googleAds:searchStream'
+_TEST_SEARCH_STREAM_URL = 'https://googleads.googleapis.com/v18/customers/1234567890/googleAds:searchStream'
 _TEST_OAUTH2_TOKEN_URL = 'https://www.googleapis.com/oauth2/v3/token'
 
 

diff --git a/ui/src/app/accounts/accounts.component.ts b/ui/src/app/accounts/accounts.component.ts
@@ -33,6 +33,7 @@ import {SnackbarComponent} from '../snackbar/snackbar.component';
  * as there are other components that follow the same pattern/logic.
  */
 @Component({
+  standalone: false,
   selector: 'app-accounts',
   templateUrl: './accounts.component.html',
   styleUrls: ['./accounts.component.scss']

diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
@@ -21,6 +21,7 @@ import { Component } from '@angular/core';
  * The root component.
  */
 @Component({
+  standalone: false,
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']

diff --git a/ui/src/app/campaigns/campaigns.component.ts b/ui/src/app/campaigns/campaigns.component.ts
@@ -33,6 +33,7 @@ import {SnackbarComponent} from '../snackbar/snackbar.component';
  * as there are other components that follow the same pattern/logic.
  */
 @Component({
+  standalone: false,
   selector: 'app-campaigns',
   templateUrl: './campaigns.component.html',
   styleUrls: ['./campaigns.component.scss']

diff --git a/ui/src/app/content/content.component.ts b/ui/src/app/content/content.component.ts
@@ -58,6 +58,7 @@ enum TabIndex {
  * features.
  */
 @Component({
+  standalone: false,
   selector: 'app-content',
   templateUrl: './content.component.html',
   styleUrls: ['./content.component.scss']

diff --git a/ui/src/app/dialog/dialog.component.ts b/ui/src/app/dialog/dialog.component.ts
@@ -26,6 +26,7 @@ interface DialogData {
 
 /** The dialog component to display output. */
 @Component({
+  standalone: false,
   selector: 'app-dialog',
   templateUrl: './dialog.component.html',
   styleUrls: ['./dialog.component.scss']

diff --git a/ui/src/app/multi-select/multi-select.component.ts b/ui/src/app/multi-select/multi-select.component.ts
@@ -39,6 +39,7 @@ interface Option {
 
 /** A multi select component. */
 @Component({
+  standalone: false,
   selector: 'app-multi-select',
   templateUrl: './multi-select.component.html',
   styleUrls: ['./multi-select.component.scss']

diff --git a/ui/src/app/single-select/single-select.component.ts b/ui/src/app/single-select/single-select.component.ts
@@ -24,6 +24,7 @@ import {map, startWith} from 'rxjs/operators';
 
 /** A single select component. */
 @Component({
+  standalone: false,
   selector: 'app-single-select',
   templateUrl: './single-select.component.html',
   styleUrls: ['./single-select.component.scss']

diff --git a/ui/src/app/snackbar/snackbar.component.ts b/ui/src/app/snackbar/snackbar.component.ts
@@ -19,6 +19,7 @@ import {Component, Inject, inject} from '@angular/core';
 import {MatSnackBarRef, MAT_SNACK_BAR_DATA} from '@angular/material/snack-bar';
 
 @Component({
+  standalone: false,
   selector: 'app-snackbar',
   templateUrl: './snackbar.component.html',
   styleUrls: ['./snackbar.component.scss']

diff --git a/ui/src/app/translation/translation.component.ts b/ui/src/app/translation/translation.component.ts
@@ -44,6 +44,7 @@ const SHORTEN_TRANSLATION_LANGUAGE_CODES = [
  * as there are other components that follow the same pattern/logic.
  */
 @Component({
+  standalone: false,
   selector: 'app-translation',
   templateUrl: './translation.component.html',
   styleUrls: ['./translation.component.scss']