chore(ia): clean up connections

Automattic · Jan 29, 2025 · ed4c44a · ed4c44a
1 parent b4b317c
commit ed4c44a
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 1,798 deletions.
diff --git a/includes/class-blocks.php b/includes/class-blocks.php
@@ -46,7 +46,7 @@ public static function enqueue_block_editor_assets() {
 				'reader_activation_terms' => Reader_Activation::get_setting( 'terms_text' ),
 				'reader_activation_url'   => Reader_Activation::get_setting( 'terms_url' ),
 				'has_recaptcha'           => Recaptcha::can_use_captcha(),
-				'recaptcha_url'           => admin_url( 'admin.php?page=newspack-connections-wizard' ),
+				'recaptcha_url'           => admin_url( 'admin.php?page=newspack-settings' ),
 			]
 		);
 		\wp_enqueue_style(

diff --git a/includes/class-newspack.php b/includes/class-newspack.php
@@ -174,7 +174,6 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-analytics-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-engagement-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-health-check-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-connections-wizard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-wizards.php';
 
 		include_once NEWSPACK_ABSPATH . 'includes/class-handoff-banner.php';

diff --git a/includes/class-wizards.php b/includes/class-wizards.php
@@ -34,7 +34,6 @@ public static function init() {
 			'seo'                     => new SEO_Wizard(),
 			'health-check'            => new Health_Check_Wizard(),
 			'engagement'              => new Engagement_Wizard(),
-			'connections'             => new Connections_Wizard(),
 			// v2 Information Architecture.
 			'newspack-dashboard'      => new Newspack_Dashboard(),
 			'setup'                   => new Setup_Wizard(),

diff --git a/includes/oauth/class-fivetran-connection.php b/includes/oauth/class-fivetran-connection.php
@@ -114,7 +114,7 @@ public static function api_create_connection( $request ) {
 			[
 				'service'        => $service,
 				'service_data'   => $service_data,
-				'redirect_after' => admin_url( 'admin.php?page=newspack-connections-wizard' ),
+				'redirect_after' => admin_url( 'admin.php?page=newspack-settings' ),
 			]
 		);
 		$response = self::process_proxy_response( \wp_safe_remote_post( $url, [ 'timeout' => 30 ] ) ); // phpcs:ignore WordPressVIPMinimum.Performance.RemoteRequestTimeout.timeout_timeout

diff --git a/includes/wizards/class-connections-wizard.php b/includes/wizards/class-connections-wizard.php
diff --git a/src/wizards/advertising/components/onboarding/index.js b/src/wizards/advertising/components/onboarding/index.js
@@ -11,7 +11,7 @@ import { useEffect, useState, useRef, Fragment } from '@wordpress/element';
  * Internal dependencies.
  */
 import { Card, ButtonCard, Notice, TextControl } from '../../../../components/src';
-import GoogleOAuth from '../../../connections/views/main/google';
+import GoogleOAuth from '../../../newspack/views/settings/connections/google-oauth';
 import { handleJSONFile } from '../utils';
 
 export default function AdsOnboarding( { onUpdate, onSuccess } ) {

diff --git a/src/wizards/connections/index.js b/src/wizards/connections/index.js
diff --git a/src/wizards/connections/style.scss b/src/wizards/connections/style.scss
diff --git a/src/wizards/connections/views/index.js b/src/wizards/connections/views/index.js