Improve filter detection and background sync

Author: stracker-phil

assets/js/wpcable.js

@@ -140,10 +140,15 @@ jQuery(document).ready(function () {
         if ( elProgress.is(':visible') ) {
             elProgress.hide();
 
-            // Reload the window, if user consents.
-            if ( confirm('Sync completed. Do you want to reload this page now?') ) {
+            if ( jQuery( '.wrap.wpcable_wrap.tasks' ).length ) {
+                // On the tasks-page silently refresh the task list without reload.
+                jQuery( document ).trigger( 'codeable-reload-tasks' );
+            } else if ( jQuery( '.wrap.cable_stats_wrap' ).length ) {
+                // On stats-page we can reload the whole window without a problem.
                 window.location.reload();
             }
+
+            // On any other page, the refresh has no effect and no action is needed.
         }
     }
 
@@ -208,6 +213,26 @@ jQuery(document).ready(function () {
     var currFilters = {};
     var currFlags = {};
 
+    function reloadData() {
+        jQuery.post(
+            window.ajaxurl,
+            {
+                action: 'wpcable_reload_tasks'
+            },
+            function ( res ) {
+                if (! res || ! Array.isArray( res ) ) {
+                    return;
+                }
+                window.wpcable.tasks = res;
+
+                initFilters();
+                updateFilters();
+                refreshList();
+            },
+            'json'
+        );
+    }
+
     function refreshList() {
         list.empty();
 
@@ -511,6 +536,8 @@ jQuery(document).ready(function () {
     });
 
     jQuery( window ).on( 'hashchange', updateFilters );
+    jQuery( document ).on( 'codeable-reload-tasks', reloadData );
+
     filterCb.on( 'click', function() { updateFilters(); initFilters(); } );
     flagCb.on( 'click', function() { updateFilters(); initFilters(); } );
 

classes/api_data.php

@@ -406,9 +406,15 @@ private function store_tasks( $filter, $page ) {
 					$new_task['last_activity_by'] = $task['last_event']['user']['full_name'];
 				}
 
-				if ( ! empty( $new_task['last_activity'] ) ) {
-					// Auto-change flags only for tasks that I have access to, i.e.
-					// when another expert was paid, the task should be "lost" for us.
+				// Some simple rules to automatically detect the correct flag for tasks.
+				if ( 'canceled' === $task['state'] ) {
+					// Tasks that were canceled by the client obviously are lost.
+					$new_task['flag'] = 'lost';
+				} elseif ( $new_task['hidden'] ) {
+					// Tasks that I hide from my Codeable list are "lost for us".
+					$new_task['flag'] = 'lost';
+				} elseif ( ! empty( $new_task['last_activity'] ) ) {
+					// This means that the workroom is public or private for me.
 					if ( 'completed' === $task['state'] ) {
 						$new_task['flag'] = 'completed';
 					}
@@ -418,16 +424,19 @@ private function store_tasks( $filter, $page ) {
 					if ( 'hired' === $task['state'] ) {
 						$new_task['flag'] = 'estimated';
 					}
-				} elseif ( 'canceled' === $task['state'] ) {
-					$new_task['flag'] = 'lost';
-				} else {
-					$new_task['flag'] = 'lost';
+				} elseif ( empty( $new_task['last_activity'] ) ) {
+					// This workroom is private for another expert = possibly lost.
+					if ( in_array( $task['state'], [ 'hired', 'completed', 'refunded' ], true ) ) {
+						$new_task['flag'] = 'lost';
+					}
 				}
 
 				// Flag open tasks as "canceled" after a given number of stale days.
 				if ( in_array( $task['state'], [ 'published', 'estimated', 'hired' ], true ) ) {
 					if ( ! empty( $new_task['last_activity'] ) ) {
-						$stale_hours = ( time() - $new_task['last_activity'] ) / HOUR_IN_SECONDS;
+						$stale_hours = floor(
+							( time() - $new_task['last_activity'] ) / HOUR_IN_SECONDS
+						);
 
 						if ( $stale_hours > $cancel_after_hours ) {
 							$new_task['flag'] = 'lost';

functions/admin-tasks.php

@@ -26,6 +26,9 @@ function wpcable_tasks_menu() {
 }
 add_action( 'admin_menu', 'wpcable_tasks_menu', 50 );
 
+/**
+ * Ajax hndler that updates a single task in the DB.
+ */
 function wpcable_ajax_update_task() {
 	if ( empty( $_POST['_wpnonce'] ) ) {
 		return;
@@ -50,14 +53,16 @@ function wpcable_ajax_update_task() {
 add_action( 'wp_ajax_wpcable_update_task', 'wpcable_ajax_update_task' );
 
 /**
- * Called when the settings page is loaded - process actions such as logout.
- *
- * @return void
+ * Ajax handler that returns a full task list in JSON format.
  */
-function codeable_load_tasks_page() {
-	$nonce = false;
+function wpcable_ajax_reload_tasks() {
+	$wpcable_tasks = new wpcable_tasks();
+
+	$task_list = $wpcable_tasks->get_tasks();
+	echo wp_json_encode( $task_list );
+	exit;
 }
-add_action( 'load-codeable-stats_page_codeable_tasks', 'codeable_load_tasks_page' );
+add_action( 'wp_ajax_wpcable_reload_tasks', 'wpcable_ajax_reload_tasks' );
 
 /**
  * Render the settings page.

functions/helpers.php

@@ -318,7 +318,7 @@ function codeable_last_fetch_info() {
 		<?php _e( 'Last refresh: ', 'wpcable' ); ?>
 		<?php echo wpcable_date( $last_fetch ); ?>
 		<span class="tooltip" tabindex="0">
-			<span class="tooltip-text"><?php _e( 'API details are fetched once per hour, or when you click the "Refresh" button on the right.', 'wpcable' ); ?></span>
+			<span class="tooltip-text"><?php _e( 'The plugin loads data from Codeable once per hour, or when you click the "Refresh" button on the right.', 'wpcable' ); ?></span>
 			<i class="dashicons dashicons-info"></i>
 		</span>
 		|