Merge pull request #340 from ErikIDX/IMPB-1296-bugfixes

Various bugfixes

idx/admin/rest-controller.php

@@ -142,12 +142,13 @@ protected function convert_idx_api_error( $error ) {
 		$code    = $error->get_error_code();
 		$message = $error->get_error_message();
 		$data    = $error->get_error_data();
+		$status  = 'Generic' === $data['status'] ? 500 : $data['status'];
 		if ( 'idx_api_error' === $code ) {
 			return new \WP_Error(
 				$code,
 				$data['rest_error'],
 				[
-					'status' => $data['status'],
+					'status' => $status,
 				]
 			);
 		}

idx/idx-api.php

@@ -42,8 +42,9 @@ public function __construct() {
 	public function apiResponse( $response ) {
 		if ( ! $response || ! is_array( $response ) || ! isset( $response['response'] ) ) {
 			return array(
-				'code'  => 'Generic',
-				'error' => 'Unable to complete API call.',
+				'code'       => 'Generic',
+				'error'      => 'Unable to complete API call.',
+				'rest_error' => 'Unable to complete API call.',
 			);
 		}
 		$response_code = $response['response']['code'];

idx/register-blocks.php

@@ -819,9 +819,15 @@ public function get_widget_list_options() {
 		$idx_widgets = $this->idx_api->idx_api_get_widgetsrc();
 		$widget_list = [];
 
-		if ( $idx_widgets ) {
+		if ( $idx_widgets && ! is_wp_error( $idx_widgets ) ) {
 			foreach ( $idx_widgets as $widget ) {
-				array_push( $widget_list, [ 'label' => $widget->name, 'value' => $widget->uid ] );
+				array_push(
+					$widget_list,
+					[
+						'label' => $widget->name,
+						'value' => $widget->uid,
+					]
+				);
 			}
 		}
 		return $widget_list;

idx/social-pro.php

@@ -155,7 +155,7 @@ public function get_article() {
 			'PUT'
 		);
 
-		if ( ! is_wp_error( $article ) ) {
+		if ( is_wp_error( $article ) ) {
 			return $this->convert_idx_api_error( $article );
 		}