Major fixes

config/install/heartbeat.heartbeatupdatefeed.yml

@@ -0,0 +1 @@
+heartbeat:

css/heartbeat.css

@@ -61,17 +61,24 @@
     display: inline-block;
 }
 
+#heartbeat-feed-form .form-item-feedsearch,
+#heartbeat-feed-form #edit-submit {
+  display: none;
+}
+
 /*Heartbeat feed re-render block
 Temporarily hiding all irrelevant content */
 
-.heartbeat-stream a.visually-hidden,
-.heartbeat-stream #toolbar-administration,
-.heartbeat-stream header,
-.heartbeat-stream footer,
-.heartbeat-stream .highlighted,
-.heartbeat-stream .region-breadcrumb,
-.heartbeat-stream #sidebar-first,
-.heartbeat-stream .block-page-title-block { display: none}
+#block-heartbeatblock a.visually-hidden,
+#block-heartbeatblock #toolbar-administration,
+#block-heartbeatblock header,
+#block-heartbeatblock footer,
+#block-heartbeatblock .highlighted,
+#block-heartbeatblock .region-breadcrumb,
+#block-heartbeatblock #sidebar-first,
+#block-heartbeatblock .block-page-title-block,
+#block-heartbeatblock #block-kekistan-breadcrumbs,
+#block-heartbeatblock #block-kekistan-page-title { display: none}
 
 .heartbeat-stream #content {
   margin-left: 0;

heartbeat.module

@@ -8,12 +8,15 @@
 
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormState;
 use Drupal\node\NodeInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Entity;
 use Drupal\heartbeat\Entity\FILE_FIELD;
 use Drupal\heartbeat\Entity\Heartbeat;
+use GuzzleHttp\Exception\RequestException;
 use Drupal\heartbeat\Entity\HeartbeatType;
+use Drupal\heartbeat\Ajax\UpdateFeedCommand;
 
 
 
@@ -148,12 +151,12 @@ $bundleSaved = false;
 
               $heartbeatActivity->setMessage($heartbeatMessage);
               $heartbeatActivity->save();
-
             } else {
               continue;
             }
           }
         }
+        updateFeeds();
       }
       break;
     case $entity instanceof \Drupal\user\Entity\User:
@@ -246,10 +249,58 @@ function heartbeat_handle_entity($entity, $tokenService, $heartbeatTypeService,
       }
     }
   }
-  \Drupal::service('config.factory')->getEditable('heartbeat_update_feed.settings')->set('update', true)->save();
+  updateFeeds();
+
 }
 
+function updateFeeds() {
+  $configFactory = \Drupal::service('config.factory');
+  $updateFeedConfig = $configFactory->getEditable('heartbeat_update_feed.settings');
+  $feedConfig = $configFactory->get('heartbeat_feed.settings');
+
+//  $form = \Drupal::formBuilder()->getForm('\Drupal\heartbeat\Form\HeartbeatUpdateFeedForm');
+
+//  $form_state = new FormState();
+//  $form_state->set('timestamp', $updateFeedConfig->get('timestamp'));
+
+//  \Drupal::formBuilder()->submitForm('\Drupal\heartbeat\Form\HeartbeatUpdateFeedForm', $form_state);
+
+//  $errors = $form_state->getErrors();
+
+
+  //  $updateFeedConfig->set('update', true)->save();
+//  $feedUpdateConfig = new stdClass();
+//  $feedUpdateConfig->feed = $feedConfig->get('message');
+//  $feedUpdateConfig->update = true;
+//  $feedUpdateConfig->timestamp = $updateFeedConfig->get('timestamp');
+
+
+//  $curlQuery = '/heartbeat/update_feed/' . $updateFeedConfig->get('timestamp');
+  //Set options for the curl request
 
+//  try {
+//    $response = \Drupal::httpClient()->get($curlQuery, array('headers' => array('Accept' => 'text/plain')));
+//    $data = (string) $response->getBody();
+//    if (empty($data)) {
+//      $stophere = null;
+//
+//    }
+//  }
+//  catch (RequestException $e) {
+//    return FALSE;
+//  }
+
+
+//  $curlOptions = array(
+//    'headers' => array(
+//      'X-DataSource-Auth' => 'a',
+//      'method' => 'POST',
+//    ),
+//  );
+//  //Perform the request and decode the results
+//  $result = chr_curl_http_request($curlQuery, $curlOptions);
+
+}
 //public function saveHeartbeatMessage($entity, $tokenService, $preparsedMessageString, $entities, $entityTypeId, $media) {
 //  $heartbeatMessage = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $entity->getEntityTypeId(), $media);
 //
@@ -272,6 +323,15 @@ function heartbeat_handle_entity($entity, $tokenService, $heartbeatTypeService,
 function heartbeat_ajax_render_alter(array &$data) {
 
 }
+
+/**
+ * Implements hook_entity_bundle_create().
+ */
+function heartbeat_entity_bundle_create($entity_type_id, $bundle)
+{
+
+}
+
 //TODO Add heartbeat language to Javascript
 //TODO Determine necessity of polling
 //Add

heartbeat.routing.yml

@@ -74,3 +74,20 @@ heartbeat.render_feed:
     _title: 'Render Feed'
   requirements:
     _permission: 'access content'
+
+heartbeat.update_feed:
+  path: '/heartbeat/update_feed/{arg}'
+  defaults:
+    _controller: '\Drupal\heartbeat\Controller\HeartbeatController::updateFeed'
+    _title: 'Update Feed'
+  requirements:
+    _permission: 'access content'
+
+heartbeat.heartbeat_update_feed_form:
+  path: '/heartbeat/form/heartbeat_update_feed'
+  defaults:
+    _form: '\Drupal\heartbeat\Form\HeartbeatUpdateFeedForm'
+    _title: 'HeartbeatUpdateFeedForm'
+  requirements:
+    _access: 'TRUE'
+  

js/heartbeat.js

@@ -4,7 +4,16 @@
 (function($, Drupal, drupalSettings) {
     Drupal.behaviors.heartbeat = {
         attach: function (context, settings) {
+          console.dir(drupalSettings);
 
+          feedElement = document.querySelector('.heartbeat-stream');
+          console.dir(feedElement);
+
+          if (drupalSettings.feedUpdate == true) {
+            console.log('stop here man');
+
+            updateFeed();
+          }
 
             Drupal.AjaxCommands.prototype.selectFeed = function(ajax, response, status) {
                 console.log(response.feed);
@@ -18,21 +27,57 @@
                 success: function(response) {
                   // feedElement = document.getElementById('block-heartbeatblock');
                   feedElement = document.querySelector('.heartbeat-stream');
-                  feedElement.innerHTML = response;
+                  console.dir(feedElement);
+
+                  if (feedElement != null) {
+                    feedElement.innerHTML = response;
+                  } else {
+
+                    feedBlock = document.getElementById('block-heartbeatblock');
+                    insertNode = document.createElement('div');
+                    insertNode.innerHTML = response;
+                    feedBlock.appendChild(insertNode);
+
+                  }
                   console.dir(feedElement);
                   console.dir(response);
                 }
               });
               // #block-heartbeatblock
-            }
+            };
 
             Drupal.AjaxCommands.prototype.updateFeed = function(ajax, response, status) {
-              feed = response.feed;
-              timestamp = response.timestamp;
-
+              console.dir(response.timestamp);
+              if ($response.update) {
+                $.ajax({
+                  type: 'POST',
+                  url:'/heartbeat/update_feed/' + response.timestamp,
+                  success: function(response) {
+                    // feedElement = document.getElementById('block-heartbeatblock');
+                    // feedElement = document.querySelector('.heartbeat-stream');
+                    // feedElement.innerHTML = response;
+                    // console.dir(feedElement);
+                    console.dir(response);
+                  }
+                });
+              }
             }
-
-
         }
     }
+
+
+  function updateFeed() {
+
+    $.ajax({
+      type: 'POST',
+      url: '/heartbeat/form/heartbeat_update_feed',
+      success: function (response) {
+        console.dir(response);
+        console.log('We are succeed!');
+      }
+    })
+
+  }
+
 })(jQuery, Drupal, drupalSettings);
+

src/Ajax/UpdateFeedCommand.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace Drupal\heartbeat\Ajax;
+
 /**
  * Created by IntelliJ IDEA.
  * User: logicp
@@ -19,8 +21,10 @@ class UpdateFeedCommand implements CommandInterface {
     public function render() {
 
         return array(
-            'command' => 'selectFeed',
-            'feed' => $this->message
+            'command' => 'updateFeed',
+            'feed' => $this->message->feed,
+            'update' => $this->message->update,
+          'timestamp' => $this->message->timestamp,
         );
     }
 }

src/Controller/HeartbeatController.php

@@ -172,6 +172,7 @@ class HeartbeatController extends ControllerBase implements ContainerInjectionIn
 
 
   public function updateFeed($arg) {
+    \Drupal::logger('HeartbeatController::updater')->debug('Jigga what is %arg', ['%arg' => $arg]);
 
   }
 

src/Form/HeartbeatFeedForm.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\heartbeat\Form;
 
+use Drupal\Core\Form\FormAjaxException;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element\Ajax;
@@ -107,11 +108,6 @@ class HeartbeatFeedForm extends FormBase {
       '#type' => 'search',
     ];
 
-    $form['hidden-data'] = [
-        '#type' => 'textfield',
-        '#value' => $form_state->get('hidden-data')
-    ];
-
 
     $form['submit'] = [
         '#type' => 'submit',
@@ -149,6 +145,11 @@ class HeartbeatFeedForm extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // Display result.
+    $stophere = null;
+    $stopthere = null;
+
+    \Drupal::logger('HeartbeatFeedForm::submitForm')->debug('Jigga what is %arg', ['%arg' => $arg]);
+
     foreach ($form_state->getValues() as $key => $value) {
         drupal_set_message($key . ': ' . $value);
     }

src/Form/HeartbeatTypeForm.php

@@ -296,8 +296,6 @@ class HeartbeatTypeForm extends EntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $heartbeat_type = $this->entity;
-$bundleArray = $form_state->get('entity_bundles');
-$bundleChoice = $form_state->getValue('entity_bundles');
     $heartbeat_type->set('description', $form_state->getValue('description'));
     $heartbeat_type->set('message', $form_state->getValue('message'));
     $heartbeat_type->set('perms', $form_state->getValue('perms'));

src/Form/HeartbeatUpdateFeedForm.php

@@ -0,0 +1,172 @@
+<?php
+
+namespace Drupal\heartbeat\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Url;
+use Drupal\heartbeat\Controller\HeartbeatAjaxException;
+use Drupal\heartbeat\Ajax\UpdateFeedCommand;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Config\ConfigManager;
+use Drupal\Core\Render\Element\RenderElement;
+use Drupal\Core\Render\Element;
+
+/**
+ * Class HeartbeatUpdateFeedForm.
+ *
+ * @package Drupal\heartbeat\Form
+ */
+class HeartbeatUpdateFeedForm extends FormBase {
+
+  private $triggered;
+  /**
+   * Drupal\Core\Config\ConfigManager definition.
+   *
+   * @var \Drupal\Core\Config\ConfigManager
+   */
+  protected $configManager;
+  public function __construct(
+    ConfigManager $config_manager
+  ) {
+    $this->configManager = $config_manager;
+  }
+
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('config.manager')
+    );
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'heartbeat_update_feed_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   * @throws \Drupal\heartbeat\Controller\HeartbeatAjaxException
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+
+//    $request = \Drupal::request();
+//    if ($this->triggered) {
+//      $this->triggered = false;
+//      throw new \Drupal\heartbeat\Controller\HeartbeatAjaxException($this);
+//    }
+
+    $form['#attached']['libraries'][] = 'heartbeat/heartbeat';
+
+    $form['timestamp'] = [
+      '#type' => 'textfield',
+      '#value' => t('Update Feeds'),
+      '#ajax' => [
+        'url' => Url::fromUri('internal:/heartbeat/form/heartbeat_update_feed'),
+        'callback' => '::updateFeedCommand',
+        'options' => array(
+          'query' => array(
+            'callback' => 'updateFeedCommand',
+          ),
+        ),
+        'progress' => array(
+          'type' => 'none,'
+        )
+      ]
+    ];
+
+    $form['submit'] = [
+        '#type' => 'submit',
+        '#value' => $this->t('Submit'),
+        '#ajax' => [
+          'callback' => '::updateFeedCommand',
+          'url' => Url::fromUri('internal:/heartbeat/form/heartbeat_update_feed'),
+          'progress' => array(
+            'type' => 'none,'
+          ),
+          'options' => array(
+            'query' => array(
+              'callback' => 'updateFeedCommand',
+            ),
+          )
+        ]
+    ];
+
+//    $this->prepareAjaxForm($form);
+
+    return $form;
+  }
+
+  /**
+    * {@inheritdoc}
+    */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Display result.
+    foreach ($form_state->getValues() as $key => $value) {
+        drupal_set_message($key . ': ' . $value);
+    }
+
+    $form['#attached']['drupalSettings']['feedUpdate'] = 'timestamp';
+//    $this->updateFeed($form, $form_state);
+    $this->triggered = true;
+    $this->buildForm($form, $form_state);
+  }
+
+
+  public function updateFeed(array &$form, FormStateInterface $form_state) {
+    \Drupal::logger('HeartbeatUpdateFeedForm::updateFeed')->debug('update Feed is getting called');
+
+    $feedUpdateConfig = new \stdClass();
+    $feedUpdateConfig->feed = 'Node Activity';
+    $feedUpdateConfig->update = true;
+    $feedUpdateConfig->timestamp = 123456789;
+
+    $ajaxResponse = new AjaxResponse;
+    $updateCommand = new UpdateFeedCommand($feedUpdateConfig);
+
+    $ajaxResponse->addCommand($updateCommand);
+
+    return $ajaxResponse;
+
+  }
+
+
+  public function updateFeedCommand() {
+
+    $feedUpdateConfig = new \stdClass();
+    $feedUpdateConfig->feed = 'Node Activity';
+    $feedUpdateConfig->update = true;
+    $feedUpdateConfig->timestamp = 123456789;
+
+    $updateCommand = new UpdateFeedCommand($feedUpdateConfig);
+
+    return $updateCommand;
+  }
+
+
+  public function prepareAjaxForm(&$form) {
+    if (!isset($form['#value'])) {
+      $form['#value'] = isset($form['#default_value']) ? $form['#default_value'] : '';
+    }
+    if (isset($form['#type'])) {
+      if ($form['#type'] == 'submit') {
+        $form = RenderElement::preRenderAjaxForm($form);
+      }
+    }
+    foreach(Element::children($form) as $key) {
+      $element = &$form[$key];
+      $this->prepareAjaxForm($element);
+    }
+  }
+
+}

src/HeartbeatStreamServices.php

@@ -97,6 +97,16 @@ class HeartbeatStreamServices {
     return $this->entityQuery->get('heartbeat_stream')->condition('name', $type)->execute();
   }
 
+  public function loadAllStreams() {
+    $types = null;
+
+    foreach ($this->getAllStreams() as $stream) {
+      foreach ($stream->getTypes() as $type) {
+        $types[] = $type;
+      }
+    }
+    return $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', array_column($types, 'target_id'), 'IN')->sort('created', 'DESC')->execute());
+  }
 
   /*
    * Load all available HeartbeatStream entities
@@ -109,23 +119,57 @@ class HeartbeatStreamServices {
     return $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('uid', $uids, 'IN')->sort('created', 'DESC')->execute());
   }
 
-
-  public function createStreamForUidsByType($uids, $type) {
+  public function createStreamByType($type) {
     $stream = $this->entityTypeManager->getStorage('heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
     if ($stream !== null) {
-      $beats = $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', array_column($stream->getTypes(), 'target_id'), 'IN')->condition('uid', $uids, 'IN')->sort('created', 'DESC')->execute());
+      $types = array();
+      foreach ($stream->getTypes() as $heartbeatType) {
+        if (!empty($heartbeatType['target_id']) && $heartbeatType['target_id'] !== "0") {
+          $types[] = $heartbeatType['target_id'];
+        }
+      }
+      $beats = $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', $types, 'IN')->sort('created', 'DESC')->execute());
 
-      $this->lastId = call_user_func('end', array_keys($beats));
+      if (count($beats) > 0) {
+        $this->lastId = call_user_func('end', array_keys($beats));
 
-      $this->configFactory->getEditable('heartbeat_update_feed.settings')->set('lastId', $this->lastId)->set('update', false)->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())->save();
+        $this->configFactory->getEditable('heartbeat_update_feed.settings')->set('lastId', $this->lastId)->set('update', false)->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())->save();
 
-      return $beats;
+        return $beats;
+      }
     }
+    return null;
   }
 
-  public function updateStreamForUidsByType($uids, $type) {
+
+  public function createStreamForUidsByType($uids, $type) {
+    $currentUid = \Drupal::currentUser()->id();
     $stream = $this->entityTypeManager->getStorage('heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
+    if ($stream !== null) {
+      $types = array();
+      foreach ($stream->getTypes() as $heartbeatType) {
+        if (!empty($heartbeatType['target_id']) && $heartbeatType['target_id'] !== "0") {
+          $types[] = $heartbeatType['target_id'];
+        }
+      }
+      $uids[] = $currentUid;
+      $beats = $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', $types, 'IN')->condition('uid', $uids, 'IN')->sort('created', 'DESC')->execute());
+
+      if (count($beats) > 0) {
+        $this->lastId = call_user_func('end', array_keys($beats));
+
+        $this->configFactory->getEditable('heartbeat_update_feed.settings')->set('lastId', $this->lastId)->set('update', false)->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())->save();
+
+        return $beats;
+      }
+    }
+    return null;
+  }
 
+  public function updateStreamForUidsByType($uids, $type) {
+    $currentUid = \Drupal::currentUser()->id();
+    $stream = $this->entityTypeManager->getStorage('heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
+    $uids[] = $currentUid;
     return $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('revision_created', $this->latestTimestamp, '>')->condition('type', array_column($stream->getTypes(), 'target_id'), 'IN')->condition('uid', $uids, 'IN')->sort('created', 'DESC')->execute());
 
   }

src/Plugin/Block/HeartbeatBlock.php

@@ -97,12 +97,20 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
       foreach ($result as $uid) {
         $uids[] = $uid->uid_target;
       }
+    }
       if ($feed !== null) {
-        foreach ($this->heartbeatStreamServices->createStreamForUidsByType($uids, $feed) as $heartbeat) {
-          $messages[] = $heartbeat->getMessage()->getValue()[0]['value'];
+        if ($uids !== null && count($uids) > 0) {
+          foreach ($this->heartbeatStreamServices->createStreamForUidsByType($uids, $feed) as $heartbeat) {
+            $messages[] = $heartbeat->getMessage()->getValue()[0]['value'];
+          }
+        } else {
+          foreach ($this->heartbeatStreamServices->createStreamByType($feed) as $heartbeat) {
+            $messages[] = $heartbeat->getMessage()->getValue()[0]['value'];
+          }
         }
       } else {
-        foreach ($this->heartbeatStreamServices->createStreamForUids($uids) as $heartbeat) {
+//        foreach ($this->heartbeatStreamServices->createStreamForUids($uids) as $heartbeat) {
+        foreach ($this->heartbeatStreamServices->loadAllStreams() as $heartbeat) {
           $messages[] = $heartbeat->getMessage()->getValue()[0]['value'];
         }
       }
@@ -118,7 +126,4 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
       ];
 
     }
-
-  }
-
 }