Merge remote-tracking branch 'origin/main' into TestRuns

Author: harunbleech

.github/workflows/main.yml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v3
     - name: Use Node.js v20
@@ -28,7 +28,7 @@ jobs:
         npm i
     - name: Install composer
       run: |
-        php7.4 $(which composer) install
+        php8.3 $(which composer) install
     - name: Run lint
       run: |
         npm run lint

.wordpress-org/banner-1544x500.png

@@ -68,6 +68,9 @@ if ( window.vrts_admin_vars.onboarding ) {
 		onCloseClick: () => {
 			onboarding.destroy();
 		},
+		onDestroyed: () => {
+			window.removeEventListener( 'keyup', onKeyup );
+		},
 		steps: window.vrts_admin_vars.onboarding.steps.map( ( step ) => {
 			return {
 				element: step.element,
@@ -81,6 +84,14 @@ if ( window.vrts_admin_vars.onboarding ) {
 		} ),
 	} );
 
+	const onKeyup = ( event ) => {
+		if ( event.key === 'Escape' ) {
+			onboarding.destroy();
+		}
+	};
+
+	window.addEventListener( 'keyup', onKeyup );
+
 	onboarding.drive();
 	saveOnboarding();
 }

.wordpress-org/banner-772x250.png

@@ -0,0 +1,23 @@
+<?php
+
+namespace Vrts\Features;
+
+use Vrts\Models\Test_Run;
+
+class Deactivate {
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		register_deactivation_hook( vrts()->get_plugin_file(), [ $this, 'deactivate' ] );
+	}
+
+	/**
+	 * Deactivate plugin.
+	 */
+	public function deactivate() {
+		Test_Run::delete_all_not_finished();
+		Service::disconnect_service();
+	}
+}

assets/scripts/onboarding.js

@@ -100,15 +100,16 @@ public function enqueue_block_editor_assets() {
 			wp_enqueue_script( 'vrts-editor' );
 
 			// Localize scripts.
-			$test = (object) Test::get_item_by_post_id( $post->ID );
+			$test_id = Test::get_item_id( $post->ID );
+			$test = (object) Test::get_item( $test_id );
 
 			wp_localize_script(
 				'vrts-editor',
 				'vrts_editor_vars',
 				[
 					'plugin_name' => vrts()->get_plugin_info( 'name' ),
 					'rest_url' => esc_url_raw( rest_url() ),
-					'has_post_alert' => Test::has_post_alert( $post->ID ),
+					'has_post_alert' => isset( $test->current_alert_id ) ? ! is_null( $test->current_alert_id ) : false,
 					'base_screenshot_url' => Image_Helpers::get_screenshot_url( $test, 'base' ),
 					'base_screenshot_date' => Date_Time_Helpers::get_formatted_date_time( $test->base_screenshot_date ?? null ),
 					'remaining_tests' => Subscription::get_remaining_tests(),

includes/features/class-deactivate.php

@@ -109,11 +109,15 @@ public function add_rest_actions() {
 	 */
 	public function render_metabox() {
 		global $post;
+
 		$post_id = $post->ID ? $post->ID : 0;
-		$run_tests_checked = ! empty( Test::get_item_id( $post_id ) );
+		$test_id = Test::get_item_id( $post_id );
+		$test = (object) Test::get_item( $test_id );
 
-		$alert_id = Test::get_alert_id( $post_id );
+		$run_tests_checked = ! is_null( $test_id );
+		$alert_id = $test->current_alert_id ?? null;
 		$testing_status_instructions = '';
+
 		if ( $alert_id ) {
 			$alert_link = Url_Helpers::get_alert_page( $alert_id );
 			$testing_status_instructions .= sprintf(
@@ -124,18 +128,15 @@ public function render_metabox() {
 			);
 		}
 
-		$test_id = Test::get_item_id( $post_id );
-		$test = (object) Test::get_item( $test_id );
-
 		vrts()->component('metabox-classic-editor', [
 			'post_id' => $post_id,
 			'nonce' => $this->nonce,
 			'plugin_url' => Url_Helpers::get_page_url( 'tests' ),
 			'run_tests_checked' => $run_tests_checked,
 			'field_test_status_key' => self::$field_test_status_key,
-			'has_post_alert' => Test::has_post_alert( $post_id ),
+			'has_post_alert' => isset( $test->current_alert_id ) ? ! is_null( $test->current_alert_id ) : false,
 			'base_screenshot_url' => Image_Helpers::get_screenshot_url( $test, 'base' ),
-			'base_screenshot_date' => Date_Time_Helpers::get_formatted_date_time( $test->base_screenshot_date ),
+			'base_screenshot_date' => Date_Time_Helpers::get_formatted_date_time( $test->base_screenshot_date ?? null ),
 			'testing_status_instructions' => $testing_status_instructions,
 			'is_new_test' => self::is_new_test( $post_id ),
 			'remaining_tests' => Subscription::get_remaining_tests(),

includes/features/class-enqueue-scripts.php

@@ -48,7 +48,7 @@ public static function retry_connection() {
 	 * @return bool
 	 */
 	private static function create_site() {
-		if ( ! empty( get_option( 'vrts_project_id' ) ) || ! empty( get_option( 'vrts_project_token' ) ) ) {
+		if ( static::is_connected() ) {
 			return;
 		}
 		$time = current_time( 'mysql' );
@@ -63,9 +63,17 @@ private static function create_site() {
 			'requested_at' => $time,
 		];
 
+		if ( ! empty( get_option( 'vrts_project_id' ) ) && ! empty( get_option( 'vrts_project_token' ) ) ) {
+			$parameters['project_id'] = get_option( 'vrts_project_id' );
+			$parameters['project_token'] = get_option( 'vrts_project_token' );
+			$parameters['project_secret'] = get_option( 'vrts_project_secret' );
+			$parameters['tests'] = Test::get_all_service_test_ids();
+		}
+
 		$service_request = self::rest_service_request( $service_api_route, $parameters, 'post' );
 
-		if ( 201 === $service_request['status_code'] ) {
+		delete_option( 'vrts_disconnected' );
+		if ( 201 === $service_request['status_code'] || 200 === $service_request['status_code'] ) {
 			$data = $service_request['response'];
 
 			update_option( 'vrts_project_id', $data['id'] );
@@ -77,6 +85,8 @@ private static function create_site() {
 			self::add_homepage_test();
 
 			return true;
+		} else {
+			update_option( 'vrts_disconnected', 1 );
 		}
 		return false;
 	}
@@ -204,6 +214,15 @@ public static function update_test( $service_test_id, $data ) {
 		return 200 === $response['status_code'];
 	}
 
+	/**
+	 * Send request to server to resume tests.
+	 */
+	public static function resume_tests() {
+		$service_project_id = get_option( 'vrts_project_id' );
+		$service_api_route = 'sites/' . $service_project_id;
+		self::rest_service_request( $service_api_route . '/resume', [], 'post' );
+	}
+
 	/**
 	 * Add homepage as a default test.
 	 */
@@ -296,13 +315,28 @@ public static function fetch_updates() {
 		return self::rest_service_request( $service_api_route, [], 'get' );
 	}
 
+	/**
+	 * Get test runs from the service.
+	 *
+	 * @param string[] $test_run_ids the test run ids.
+	 */
+	public static function fetch_test_runs( $test_run_ids ) {
+		$service_project_id = get_option( 'vrts_project_id' );
+		$service_api_route = 'sites/' . $service_project_id . '/runs';
+		$service_api_route = add_query_arg( 'ids', implode( ',', $test_run_ids ), $service_api_route );
+		return self::rest_service_request( $service_api_route, [], 'get' );
+	}
+
 	/**
 	 * Delete project from the service.
 	 */
 	public static function disconnect_service() {
 		$service_project_id = get_option( 'vrts_project_id' );
 		$service_api_route = 'sites/' . $service_project_id;
-		self::rest_service_request( $service_api_route, [], 'delete' );
+		$response = self::rest_service_request( $service_api_route, [], 'delete' );
+		if ( 200 === $response['status_code'] ) {
+			update_option( 'vrts_disconnected', 1 );
+		}
 	}
 
 	/**
@@ -324,7 +358,7 @@ public static function delete_option() {
 	 * Check if external service was able to connect
 	 */
 	public static function is_connected() {
-		return (bool) get_option( 'vrts_project_id' ) && (bool) get_option( 'vrts_project_token' );
+		return ! (bool) get_option( 'vrts_disconnected' ) && (bool) get_option( 'vrts_project_id' ) && (bool) get_option( 'vrts_project_token' );
 	}
 
 	/**

includes/features/class-metaboxes.php

@@ -5,6 +5,7 @@
 use Vrts\Core\Utilities\Sanitization;
 use Vrts\Core\Utilities\Url_Helpers;
 use Vrts\Features\Subscription;
+use Vrts\Services\Test_Service;
 
 class Settings_Page {
 	/**
@@ -18,6 +19,7 @@ class Settings_Page {
 	 * Constructor.
 	 */
 	public function __construct() {
+		add_action( 'init', [ $this, 'add_settings' ] );
 		add_action( 'admin_menu', [ $this, 'add_submenu_page' ] );
 		add_action( 'admin_init', [ $this, 'settings_migration' ] );
 		add_action( 'add_option_vrts_click_selectors', [ $this, 'do_after_update_click_selectors' ], 10, 2 );
@@ -26,8 +28,6 @@ public function __construct() {
 		add_action( 'pre_update_option_vrts_email_update_notification_address', [ $this, 'do_before_updating_email_address' ], 10 );
 		add_action( 'pre_update_option_vrts_email_api_notification_address', [ $this, 'do_before_updating_email_address' ], 10 );
 		add_action( 'update_option_vrts_automatic_comparison', [ $this, 'do_after_update_vrts_automatic_comparison' ], 10, 2 );
-
-		$this->add_settings();
 	}
 
 	/**
@@ -297,11 +297,14 @@ public function do_after_update_click_selectors( $old, $new ) {
 
 			$parameters = [
 				'screenshot_options' => [
-					'clickSelectors'   => $new,
+					'clickSelectors' => $new,
 				],
 			];
 
 			$response = Service::rest_service_request( $service_api_route, $parameters, 'put' );
+
+			$service = new Test_Service();
+			$service->resume_tests();
 		}
 	}
 

includes/features/class-service.php

@@ -93,9 +93,6 @@ public function render_page() {
 		$run = Test_Run::get_item( $run_id );
 
 		if ( $run ) {
-			$service = new Test_Run_Service();
-			$service->update_latest_alert_for_all_tests( $run );
-
 			$tests = $this->prepare_tests( maybe_unserialize( $run->tests ) );
 			$alerts = $this->prepare_alerts( $run_id, $tests );