Update Edge cache (#214)

* Show input for hidden input

* update edge cache settings

* update single site template

add edge cache settings

Author: jhnstn

plugin/blocks/src/components/form-input/edit.js

@@ -133,7 +133,7 @@ function InputFieldBlock( { attributes, setAttributes, className, context, clien
 							/>
 						</>
 					)}
-					{'checkbox' == type && (
+					{'checkbox' === type && (
 						<ToggleControl
 							label={__('Display as Toggle')}
 							checked={displayAsToggle}
@@ -144,6 +144,15 @@ function InputFieldBlock( { attributes, setAttributes, className, context, clien
 							}}
 						/>
 					)}
+					{'hidden' === type && (
+						<TextControl
+							label={__('Value')}
+							value={attributes.value}
+							onChange={(newValue) => {
+								setAttributes({ value: newValue });
+							}}
+						/>
+					)}
 					<ToggleControl
 						label={ __( 'Limit to Admins' ) }
 						checked={ adminOnly }

plugin/includes/class-wpcloud-site.php

@@ -104,7 +104,7 @@ public static function create( array $options, WP_Post $post = null ): WP_Post|W
 	 *
 	 * @param int $wpcloud_site_id The site ID.
 	 */
-	public static function get_by_id( int $wpcloud_site_id ): null|WP_Post {
+	public static function get_by_id( ?int $wpcloud_site_id ): null|WP_Post {
 		$site = get_posts(
 			array(
 				'post_type'   => 'wpcloud_site',
@@ -387,21 +387,21 @@ public static function get_mutable_options(): array {
 				'default' => false,
 				'hint'    => __( 'Site access is via SFTP by default. Enabling allows access via SSH' ),
 			),
-			'edge_cache'           => array(
-				'label'          => __( 'Edge Cache' ),
-				'type'           => 'select',
-				'options'        => array(
-					'on'    => __( 'On' ),
-					'off'   => __( 'Off' ),
-					'purge' => __( 'Purge' ),
-				),
-				'option_aliases' => array(
-					'on'  => __( 'Enabled', 'wpcloud' ),
-					'off' => __( 'Disabled', 'wpcloud' ),
-				),
-				'default'        => '',
-				'hint'           => __( 'Change the edge cache status. Either `on`, `off` or `purge`' ),
+
+			'edge_cache_toggle'    => array(
+				'label'   => __( 'Edge Cache Toggle' ),
+				'type'    => 'checkbox',
+				'default' => '',
+				'hint'    => __( 'Enable edge cache. Either `on`, `off`' ),
 			),
+
+			'edge_cache_purge'     => array(
+				'label'   => __( 'Edge Cache Purge' ),
+				'type'    => 'hidden',
+				'default' => '',
+				'hint'    => __( 'Purge edge cache' ),
+			),
+
 			'defensive_mode'       => array(
 				'label'   => __( 'Defensive Mode' ),
 				'type'    => 'text',
@@ -580,23 +580,13 @@ public static function get_detail( int|WP_Post $post, string $key, ): mixed {
 				// @TODO: Confirm that this is always the case, it appears that the port will be 2223 for ssh and 2221 for sftp
 				return 2223 === $ssh_port;
 
-			case 'edge_cache':
+			case 'edge_cache_toggle':
 				$result = wpcloud_client_edge_cache_status( $wpcloud_site_id );
 				if ( is_wp_error( $result ) ) {
 					error_log( $result->get_error_message() );
 					return '';
 				}
-				switch ( $result->status ) {
-					case 0:
-						return __( 'Disabled', 'wpcloud' );
-					case 1:
-						return __( 'Enabled', 'wpcloud' );
-					case 2:
-						return __( 'DDoS', 'wpcloud' );
-					default:
-						return __( 'Unknown', 'wpcloud' );
-				}
-				return '';
+				return (bool) $result->status;
 
 			case 'defensive_mode':
 				$result = wpcloud_client_edge_cache_status( $wpcloud_site_id );
@@ -678,7 +668,10 @@ function ( $value, $key ) use ( $mutable_fields ) {
 					$value = intval( $value ) . 'G';
 					break;
 
-				case 'edge_cache':
+				case 'edge_cache_toggle':
+					$value = $value ? 'on' : 'off';
+					// Fallthrough intentional to make edge cache call.
+				case 'edge_cache_purge':
 					$result = wpcloud_client_edge_cache_update( $wpcloud_site_id, $value );
 					break;
 			}