tweak form

benniledl · Feb 2, 2024 · 9e7d9df · 9e7d9df
1 parent ea70fe6
commit 9e7d9df
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/includes/advanced-form/advanced-form-ajax.php b/includes/advanced-form/advanced-form-ajax.php
@@ -592,7 +592,7 @@ private function get_form( $post_id ) {
 		$blocks    = '';
 
 		$post_data = get_post( absint( $post_id ) );
-		if ( is_object( $post_data ) && 'kadence_form' === $post_data->post_type && is_post_publicly_viewable( $post_data ) ) {
+		if ( is_object( $post_data ) && 'kadence_form' === $post_data->post_type && 'publish' === $post_data->post_status && empty( $post_data->post_password ) ) {
 			$blocks = parse_blocks( $post_data->post_content );
 		}
 

diff --git a/includes/advanced-form/getresponse-rest-api.php b/includes/advanced-form/getresponse-rest-api.php
@@ -81,21 +81,21 @@ public function get_items( $request ) {
 			'headers' => array(
 				'X-Auth-Token' => 'api-key ' . $api_key,
 			),
+			'timeout' => 10,
 		);
-
 		$response = wp_safe_remote_get( $request_url, $request_args );
 
 		if ( is_wp_error( $response ) || 200 != (int) wp_remote_retrieve_response_code( $response ) ) {
-			return array();
+			return new WP_Error( 'getresponse_error', __( 'Error fetching data from GetResponse', 'kadence-blocks' ) );
 		}
 
 		$body = json_decode( wp_remote_retrieve_body( $response ), true );
 
 		if ( ! is_array( $body ) ) {
-			return array();
+			return new WP_Error( 'getresponse_error', __( 'Empty data from GetResponse', 'kadence-blocks' ) );
 		}
 
-		return $body;
+		return rest_ensure_response( $body );
 	}
 
 	/**

diff --git a/src/blocks/advanced-form/components/submit-actions/get-response/index.js b/src/blocks/advanced-form/components/submit-actions/get-response/index.js
@@ -82,14 +82,14 @@ function GetResponseOptions( { formInnerBlocks, parentClientId, settings, save }
 	};
 
 	const getLists = () => {
-		if ( !api ) {
+		if ( ! api ) {
 			setLists( [] );
 			setListsLoaded( true );
+			setIsFetching( false );
 			return;
 		}
 
 		setIsFetching( true );
-
 		apiFetch( {
 			path: addQueryArgs(
 				'/kb-getresponse/v1/get',
@@ -101,8 +101,7 @@ function GetResponseOptions( { formInnerBlocks, parentClientId, settings, save }
 				lists.map( ( item ) => {
 					theLists.push( { value: item.campaignId, label: item.name } );
 				} );
-
-				setLists( theLists );
+				setLists( theLists ? theLists : [] );
 				setListsLoaded( true );
 				setIsFetching( false );
 			} )
@@ -222,7 +221,12 @@ function GetResponseOptions( { formInnerBlocks, parentClientId, settings, save }
 	const hasAttr = Array.isArray( listAttr ) && listAttr.length > 0;
 	const hasTags = Array.isArray( tags ) && tags.length > 0;
 	const listValue = undefined !== settings.listMulti && settings.listMulti ? settings.listMulti : '';
-
+	useEffect( () => {
+		if ( apiBase && api ) {
+			getLists();
+			setTagsLoaded( false );
+		}
+	}, [ api, apiBase ] );
 	return (
 		<KadencePanelBody
 			title={__( 'GetResponse Settings', 'kadence-blocks' )}
@@ -252,7 +256,14 @@ function GetResponseOptions( { formInnerBlocks, parentClientId, settings, save }
 							{ value: 'https://api3.getresponse360.com/v3', label: 'https://api3.getresponse360.com/v3' },
 							{ value: 'https://api3.getresponse360.pl/v3', label: 'https://api3.getresponse360.pl/v3' },
 						] }
-						onChange={ value => saveAPIBase( value )}
+						onChange={ value => {
+							if ( value !== apiBase ) {
+								setIsSavedApiBase( false );
+								setLists( false );
+								setTags( false );
+							}
+							saveAPIBase( value );
+						}}
 					/>
 				</>
 			) }
@@ -264,8 +275,7 @@ function GetResponseOptions( { formInnerBlocks, parentClientId, settings, save }
 					{!isFetching && !hasLists && (
 						<>
 							<h2 className="kt-heading-size-title">{__( 'Select List', 'kadence-blocks' )}</h2>
-							{( !listsLoaded ? getLists() : '' )}
-							{!Array.isArray( lists ) ?
+							{ !Array.isArray( lists ) ?
 								<Spinner/> :
 								__( 'No Lists found.', 'kadence-blocks' )}
 						</>
@@ -278,7 +288,7 @@ function GetResponseOptions( { formInnerBlocks, parentClientId, settings, save }
 								<Select
 									value={listValue}
 									onChange={( value ) => {
-										save( { listMulti: ( value ? value : [] ) } );
+										save( { listMulti: ( value ? [value] : [] ) } );
 									}}
 									id={'mc-list-selection'}
 									isClearable={true}