Fix #351Server errors during the PWA generation not handled

uncatcrea · Jan 16, 2018 · a2a4a3a · a2a4a3a
1 parent c40d52f
commit a2a4a3a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/wp-appkit/lib/apps/apps.css b/wp-appkit/lib/apps/apps.css
@@ -42,9 +42,11 @@
     box-shadow: none;
     border-right: 4px solid #fff;
     border-left: none;
+    text-align: right;
 }
 
-div.updated.wpak_export_pwa_feedback {
+div.updated.wpak_export_pwa_feedback,
+div.error.wpak_export_pwa_feedback {
 	border-left: none;
 	box-shadow: none;
 }

diff --git a/wp-appkit/lib/apps/apps.php b/wp-appkit/lib/apps/apps.php
@@ -85,6 +85,7 @@ public static function admin_enqueue_scripts() {
 					'see_pwa' => __( 'View Progressive Web App', WpAppKit::i18n_domain ),
 					'pwa_icons_detected' => __( 'We detected the following icons in your theme (in %s). They will be automatically used by the PWA:', WpAppKit::i18n_domain ),
 					'pwa_no_icons' => __( 'We didn\'t detect any icons in your theme. You can add them in following <a href="#">our tutorial</a>. If you don\'t provide icons, default ones will be used.', WpAppKit::i18n_domain ),
+					'install_server_error' => __( 'A network or server error occured', WpAppKit::i18n_domain )
 				)
 			));
 		}

diff --git a/wp-appkit/lib/apps/pwa.js b/wp-appkit/lib/apps/pwa.js
@@ -26,9 +26,13 @@ jQuery().ready( function () {
 					'<a href="'+ response.export_uri +'" target="_blank">'+ wpak_pwa_export.messages['see_pwa'] +'</a>'
 				);
 			} else {
-				$feedback.removeClass('updated,error').addClass( 'error' ).html( response.msg );
+				$feedback.removeClass('updated error').addClass( 'error' ).html( response.msg );
 			}
-		} );
+
+		}).fail(function() {
+			$spinner.removeClass( 'is-active' );
+		    $feedback.removeClass('updated error').addClass( 'error' ).html( wpak_pwa_export.messages['install_server_error'] );
+		});
 
 	} );
 
@@ -62,7 +66,12 @@ jQuery().ready( function () {
 				html = $( '<div>' ).addClass( 'wpak-pwa-no-icons' ).html( wpak_pwa_export.messages.pwa_no_icons );
 			}
 			$icons_container.html( html );
+
+		}).fail(function() {
+			var html = $( '<div>' ).addClass( 'wpak-pwa-no-icons' ).html( wpak_pwa_export.messages['install_server_error'] );
+			$icons_container.html( html );
 		});
+
 	}).change();
 
 	$( '.color-field' ).wpColorPicker();

diff --git a/wp-appkit/wp-appkit.php b/wp-appkit/wp-appkit.php
@@ -20,7 +20,7 @@
 
 	class WpAppKit {
 
-		const resources_version = '1.0';
+		const resources_version = '1.5';
 		const i18n_domain = 'wp-appkit';
 
 		public static function hooks() {