Restructured:

Heartbeat (Entity representing the instance of recording an event)
HeartbeatType (Configuration entity representing the structure of a Heartbeat)
HeartbeatStream (Configuration entity representing a stream of one or more HeartbeatTypes)

config/schema/heartbeat_stream.schema.yml

@@ -1,6 +1,6 @@
 heartbeat8.heartbeat_stream.*:
   type: config_entity
-  label: 'Heartbeat Stream config'
+  label: 'Heartbeat stream config'
   mapping:
     id:
       type: string
@@ -10,33 +10,27 @@ heartbeat8.heartbeat_stream.*:
       label: 'Label'
     uuid:
       type: string
-    hid:
-      type: serial
-      label: 'hid'
-    message_id:
+    class:
       type: string
-      label: 'message_id'
-    description:
+      label: 'class'
+    real_class:
       type: string
-      label: 'description'
-    message:
+      label: 'real class'
+    name:
       type: string
-      label: 'message'
-    message_concat:
+      label: 'name'
+    module:
       type: string
-      label: 'message_concat'
-    perms:
-      type: integer
-      label: 'perms'
-    group_type:
+      label: 'module'
+    title:
       type: string
-      label: 'group_type'
-    concat_args:
+      label: 'string'
+    path:
+      type: string
+      label: 'path'
+    settings:
       type: blob
-      label: 'concat_args'
+      label: 'settings'
     variables:
       type: blob
       label: 'variables'
-    attachments:
-      type: blob
-      label: 'attachments'

config/schema/heartbeat_type.schema.yml

@@ -0,0 +1,42 @@
+heartbeat8.heartbeat_type.*:
+  type: config_entity
+  label: 'Heartbeat type config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    uuid:
+      type: string
+    hid:
+      type: serial
+      label: 'hid'
+    message_id:
+      type: string
+      label: 'message_id'
+    description:
+      type: string
+      label: 'description'
+    message:
+      type: string
+      label: 'message'
+    message_concat:
+      type: string
+      label: 'message_concat'
+    perms:
+      type: integer
+      label: 'perms'
+    group_type:
+      type: string
+      label: 'group_type'
+    concat_args:
+      type: blob
+      label: 'concat_args'
+    variables:
+      type: blob
+      label: 'variables'
+    attachments:
+      type: blob
+      label: 'attachments'

heartbeat.page.inc

@@ -8,8 +8,6 @@
  */
 
 use Drupal\Core\Render\Element;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
 
 /**
  * Prepares variables for Heartbeat templates.

heartbeat8.info.yml

@@ -1,5 +1,5 @@
 name: heartbeat8
 type: module
-description: Heartbeat 8
+description: Heartbeat for Drupal 8
 core: 8.x
 package: Heartbeat

heartbeat8.links.action.yml

@@ -1,11 +1,17 @@
 entity.heartbeat.add_form:
-  route_name: entity.heartbeat.add_form
+  route_name: 'entity.heartbeat.add_page'
   title: 'Add Heartbeat'
   appears_on:
     - entity.heartbeat.collection
+entity.heartbeat_type.add_form:
+  route_name: 'entity.heartbeat_type.add_form'
+  title: 'Add Heartbeat type'
+  appears_on:
+    - entity.heartbeat_type.collection
+
 entity.heartbeat_stream.add_form:
   route_name: 'entity.heartbeat_stream.add_form'
-  title: 'Add Heartbeat Stream'
+  title: 'Add Heartbeat stream'
   appears_on:
     - entity.heartbeat_stream.collection
 

heartbeat8.links.menu.yml

@@ -1,3 +1,4 @@
+
 # Heartbeat menu items definition
 entity.heartbeat.collection:
   title: 'Heartbeat list'
@@ -6,16 +7,21 @@ entity.heartbeat.collection:
   parent: system.admin_structure
   weight: 100
 
-heartbeat.admin.structure.settings:
-  title: Heartbeat settings
-  description: 'Configure Heartbeat entities'
-  route_name: heartbeat.settings
+
+# Heartbeat type menu items definition
+entity.heartbeat_type.collection:
+  title: 'Heartbeat type'
+  route_name: entity.heartbeat_type.collection
+  description: 'List Heartbeat type (bundles)'
   parent: system.admin_structure
-# Heartbeat Stream menu items definition
+  weight: 99
+
+
+# Heartbeat stream menu items definition
 entity.heartbeat_stream.collection:
-  title: 'Heartbeat Stream'
+  title: 'Heartbeat stream'
   route_name: entity.heartbeat_stream.collection
-  description: 'List Heartbeat Stream (bundles)'
+  description: 'List Heartbeat stream (bundles)'
   parent: system.admin_structure
   weight: 99
 

heartbeat8.links.task.yml

@@ -1,8 +1,5 @@
 # Heartbeat routing definition
-heartbeat.settings_tab:
-  route_name: heartbeat.settings
-  title: 'Settings'
-  base_route: heartbeat.settings
+
 entity.heartbeat.canonical:
   route_name: entity.heartbeat.canonical
   base_route: entity.heartbeat.canonical
@@ -11,7 +8,12 @@ entity.heartbeat.canonical:
 entity.heartbeat.edit_form:
   route_name: entity.heartbeat.edit_form
   base_route: entity.heartbeat.canonical
-  title: Edit
+  title: 'Edit'
+
+entity.heartbeat.version_history:
+  route_name: entity.heartbeat.version_history
+  base_route: entity.heartbeat.canonical
+  title: 'Revisions'
 
 entity.heartbeat.delete_form:
   route_name:  entity.heartbeat.delete_form

heartbeat8.module

@@ -2,10 +2,15 @@
 
 /**
  * @file
- * Contains heartbeat8.module..
+ * Contains heartbeat8.module.
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Heartbeat8\Entity\Heartbeat;
+use Drupal\Heartbeat8\Entity\HeartbeatType;
+
+//TODO add constants (HEARTBEAT_NONE, HEARTBEAT_PRIVATE, HEARTBEAT_PUBLIC_TO_ADDRESSEE, HEARTBEAT_PUBLIC_TO_ALL_CONNECTED, HEARTBEAT_PUBLIC_TO_ALL)
+//TODO include Streams (Entities already added with use statements on lines 9-10)
 
 /**
  * Implements hook_help().
@@ -16,9 +21,50 @@ function heartbeat8_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.heartbeat8':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('Heartbeat 8') . '</p>';
+      $output .= '<p>' . t('Heartbeat for Drupal 8') . '</p>';
       return $output;
 
     default:
   }
 }
+
+
+/**
+ * Implements hook_theme().
+ */
+function heartbeat8_theme() {
+  $theme = [];
+  $theme['heartbeat'] = array(
+    'render element' => 'elements',
+    'file' => 'heartbeat.page.inc',
+    'template' => 'heartbeat',
+  );
+  $theme['heartbeat_content_add_list'] = [
+    'render element' => 'content',
+    'variables' => ['content' => NULL],
+    'file' => 'heartbeat.page.inc',
+  ];
+  return $theme;
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK().
+ */
+function heartbeat8_theme_suggestions_heartbeat(array $variables) {
+  $suggestions = array();
+  $entity = $variables['elements']['#heartbeat'];
+  $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
+
+  $suggestions[] = 'heartbeat__' . $sanitized_view_mode;
+  $suggestions[] = 'heartbeat__' . $entity->bundle();
+  $suggestions[] = 'heartbeat__' . $entity->bundle() . '__' . $sanitized_view_mode;
+  $suggestions[] = 'heartbeat__' . $entity->id();
+  $suggestions[] = 'heartbeat__' . $entity->id() . '__' . $sanitized_view_mode;
+  return $suggestions;
+}
+
+
+
+//TODO Add heartbeat language to Javascript
+//TODO Determine necessity of polling
+//Add

heartbeat8.permissions.yml

@@ -12,8 +12,22 @@ delete heartbeat entities:
 edit heartbeat entities:
   title: 'Edit Heartbeat entities'
 
+access heartbeat overview:
+  title: 'Access the Heartbeat overview page'
+
 view published heartbeat entities:
   title: 'View published Heartbeat entities'
 
 view unpublished heartbeat entities:
   title: 'View unpublished Heartbeat entities'
+
+view all heartbeat revisions:
+  title: 'View all Heartbeat revisions'
+
+revert all heartbeat revisions:
+  title: 'Revert all Heartbeat revisions'
+  description: 'Role requires permission <em>view Heartbeat revisions</em> and <em>edit rights</em> for heartbeat entities in question or <em>administer heartbeat entities</em>.'
+
+delete all heartbeat revisions:
+  title: 'Delete all revisions'
+  description: 'Role requires permission to <em>view Heartbeat revisions</em> and <em>delete rights</em> for heartbeat entities in question or <em>administer heartbeat entities</em>.'

src/Controller/HeartbeatController.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace Drupal\heartbeat8\Controller;
+
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Url;
+use Drupal\heartbeat8\Entity\HeartbeatInterface;
+
+/**
+ * Class HeartbeatController.
+ *
+ *  Returns responses for Heartbeat routes.
+ *
+ * @package Drupal\heartbeat8\Controller
+ */
+class HeartbeatController extends ControllerBase implements ContainerInjectionInterface {
+
+  /**
+   * Displays a Heartbeat  revision.
+   *
+   * @param int $heartbeat_revision
+   *   The Heartbeat  revision ID.
+   *
+   * @return array
+   *   An array suitable for drupal_render().
+   */
+  public function revisionShow($heartbeat_revision) {
+    $heartbeat = $this->entityManager()->getStorage('heartbeat')->loadRevision($heartbeat_revision);
+    $view_builder = $this->entityManager()->getViewBuilder('heartbeat');
+
+    return $view_builder->view($heartbeat);
+  }
+
+  /**
+   * Page title callback for a Heartbeat  revision.
+   *
+   * @param int $heartbeat_revision
+   *   The Heartbeat  revision ID.
+   *
+   * @return string
+   *   The page title.
+   */
+  public function revisionPageTitle($heartbeat_revision) {
+    $heartbeat = $this->entityManager()->getStorage('heartbeat')->loadRevision($heartbeat_revision);
+    return $this->t('Revision of %title from %date', array('%title' => $heartbeat->label(), '%date' => format_date($heartbeat->getRevisionCreationTime())));
+  }
+
+  /**
+   * Generates an overview table of older revisions of a Heartbeat .
+   *
+   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $heartbeat
+   *   A Heartbeat  object.
+   *
+   * @return array
+   *   An array as expected by drupal_render().
+   */
+  public function revisionOverview(HeartbeatInterface $heartbeat) {
+    $account = $this->currentUser();
+    $langcode = $heartbeat->language()->getId();
+    $langname = $heartbeat->language()->getName();
+    $languages = $heartbeat->getTranslationLanguages();
+    $has_translations = (count($languages) > 1);
+    $heartbeat_storage = $this->entityManager()->getStorage('heartbeat');
+
+    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $heartbeat->label()]) : $this->t('Revisions for %title', ['%title' => $heartbeat->label()]);
+    $header = array($this->t('Revision'), $this->t('Operations'));
+
+    $revert_permission = (($account->hasPermission("revert all heartbeat revisions") || $account->hasPermission('administer heartbeat entities')));
+    $delete_permission = (($account->hasPermission("delete all heartbeat revisions") || $account->hasPermission('administer heartbeat entities')));
+
+    $rows = array();
+
+    $vids = $heartbeat_storage->revisionIds($heartbeat);
+
+    $latest_revision = TRUE;
+
+    foreach (array_reverse($vids) as $vid) {
+      /** @var \Drupal\heartbeat8\HeartbeatInterface $revision */
+      $revision = $heartbeat_storage->loadRevision($vid);
+      // Only show revisions that are affected by the language that is being
+      // displayed.
+      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
+        $username = [
+          '#theme' => 'username',
+          '#account' => $revision->getRevisionUser(),
+        ];
+
+        // Use revision link to link to revisions that are not active.
+        $date = \Drupal::service('date.formatter')->format($revision->revision_timestamp->value, 'short');
+        if ($vid != $heartbeat->getRevisionId()) {
+          $link = $this->l($date, new Url('entity.heartbeat.revision', ['heartbeat' => $heartbeat->id(), 'heartbeat_revision' => $vid]));
+        }
+        else {
+          $link = $heartbeat->link($date);
+        }
+
+        $row = [];
+        $column = [
+          'data' => [
+            '#type' => 'inline_template',
+            '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}<p class="revision-log">{{ message }}</p>{% endif %}',
+            '#context' => [
+              'date' => $link,
+              'username' => \Drupal::service('renderer')->renderPlain($username),
+              'message' => ['#markup' => $revision->revision_log_message->value, '#allowed_tags' => Xss::getHtmlTagList()],
+            ],
+          ],
+        ];
+        $row[] = $column;
+
+        if ($latest_revision) {
+          $row[] = [
+            'data' => [
+              '#prefix' => '<em>',
+              '#markup' => $this->t('Current revision'),
+              '#suffix' => '</em>',
+            ],
+          ];
+          foreach ($row as &$current) {
+            $current['class'] = ['revision-current'];
+          }
+          $latest_revision = FALSE;
+        }
+        else {
+          $links = [];
+          if ($revert_permission) {
+            $links['revert'] = [
+              'title' => $this->t('Revert'),
+              'url' => $has_translations ?
+              Url::fromRoute('entity.heartbeat.translation_revert', ['heartbeat' => $heartbeat->id(), 'heartbeat_revision' => $vid, 'langcode' => $langcode]) :
+              Url::fromRoute('entity.heartbeat.revision_revert', ['heartbeat' => $heartbeat->id(), 'heartbeat_revision' => $vid]),
+            ];
+          }
+
+          if ($delete_permission) {
+            $links['delete'] = [
+              'title' => $this->t('Delete'),
+              'url' => Url::fromRoute('entity.heartbeat.revision_delete', ['heartbeat' => $heartbeat->id(), 'heartbeat_revision' => $vid]),
+            ];
+          }
+
+          $row[] = [
+            'data' => [
+              '#type' => 'operations',
+              '#links' => $links,
+            ],
+          ];
+        }
+
+        $rows[] = $row;
+      }
+    }
+
+    $build['heartbeat_revisions_table'] = array(
+      '#theme' => 'table',
+      '#rows' => $rows,
+      '#header' => $header,
+    );
+
+    return $build;
+  }
+
+}

src/Entity/Heartbeat.php

@@ -4,10 +4,9 @@ namespace Drupal\heartbeat8\Entity;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\RevisionableContentEntityBase;
 use Drupal\Core\Entity\EntityChangedTrait;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\heartbeat8\HeartbeatInterface;
 use Drupal\user\UserInterface;
 
 /**
@@ -18,10 +17,13 @@ use Drupal\user\UserInterface;
  * @ContentEntityType(
  *   id = "heartbeat",
  *   label = @Translation("Heartbeat"),
+ *   bundle_label = @Translation("Heartbeat type"),
  *   handlers = {
+ *     "storage" = "Drupal\heartbeat8\HeartbeatStorage",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\heartbeat8\HeartbeatListBuilder",
  *     "views_data" = "Drupal\heartbeat8\Entity\HeartbeatViewsData",
+ *     "translation" = "Drupal\heartbeat8\HeartbeatTranslationHandler",
  *
  *     "form" = {
  *       "default" = "Drupal\heartbeat8\Form\HeartbeatForm",
@@ -35,9 +37,15 @@ use Drupal\user\UserInterface;
  *     },
  *   },
  *   base_table = "heartbeat",
+ *   data_table = "heartbeat_field_data",
+ *   revision_table = "heartbeat_revision",
+ *   revision_data_table = "heartbeat_field_revision",
+ *   translatable = TRUE,
  *   admin_permission = "administer heartbeat entities",
  *   entity_keys = {
  *     "id" = "id",
+ *     "revision" = "vid",
+ *     "bundle" = "type",
  *     "label" = "name",
  *     "uuid" = "uuid",
  *     "uid" = "user_id",
@@ -46,16 +54,25 @@ use Drupal\user\UserInterface;
  *   },
  *   links = {
  *     "canonical" = "/admin/structure/heartbeat/{heartbeat}",
- *     "add-form" = "/admin/structure/heartbeat/add",
+ *     "add-page" = "/admin/structure/heartbeat/add",
+ *     "add-form" = "/admin/structure/heartbeat/add/{heartbeat_type}",
  *     "edit-form" = "/admin/structure/heartbeat/{heartbeat}/edit",
  *     "delete-form" = "/admin/structure/heartbeat/{heartbeat}/delete",
+ *     "version-history" = "/admin/structure/heartbeat/{heartbeat}/revisions",
+ *     "revision" = "/admin/structure/heartbeat/{heartbeat}/revisions/{heartbeat_revision}/view",
+ *     "revision_revert" = "/admin/structure/heartbeat/{heartbeat}/revisions/{heartbeat_revision}/revert",
+ *     "translation_revert" = "/admin/structure/heartbeat/{heartbeat}/revisions/{heartbeat_revision}/revert/{langcode}",
+ *     "revision_delete" = "/admin/structure/heartbeat/{heartbeat}/revisions/{heartbeat_revision}/delete",
  *     "collection" = "/admin/structure/heartbeat",
  *   },
- *   field_ui_base_route = "heartbeat.settings"
+ *   bundle_entity_type = "heartbeat_type",
+ *   field_ui_base_route = "entity.heartbeat_type.edit_form"
  * )
  */
-class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
+class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterface {
+
   use EntityChangedTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -66,6 +83,35 @@ class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    foreach (array_keys($this->getTranslationLanguages()) as $langcode) {
+      $translation = $this->getTranslation($langcode);
+
+      // If no owner has been set explicitly, make the anonymous user the owner.
+      if (!$translation->getOwner()) {
+        $translation->setOwnerId(0);
+      }
+    }
+
+    // If no revision author has been set explicitly, make the heartbeat owner the
+    // revision author.
+    if (!$this->getRevisionUser()) {
+      $this->setRevisionUserId($this->getOwnerId());
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getType() {
+    return $this->bundle();
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -137,7 +183,37 @@ class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
    * {@inheritdoc}
    */
   public function setPublished($published) {
-    $this->set('status', $published ? NODE_PUBLISHED : NODE_NOT_PUBLISHED);
+    $this->set('status', $published ? TRUE : FALSE);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRevisionCreationTime() {
+    return $this->get('revision_timestamp')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setRevisionCreationTime($timestamp) {
+    $this->set('revision_timestamp', $timestamp);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRevisionUser() {
+    return $this->get('revision_uid')->entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setRevisionUserId($uid) {
+    $this->set('revision_uid', $uid);
     return $this;
   }
 
@@ -145,14 +221,7 @@ class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
    * {@inheritdoc}
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields['id'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('ID'))
-      ->setDescription(t('The ID of the Heartbeat entity.'))
-      ->setReadOnly(TRUE);
-    $fields['uuid'] = BaseFieldDefinition::create('uuid')
-      ->setLabel(t('UUID'))
-      ->setDescription(t('The UUID of the Heartbeat entity.'))
-      ->setReadOnly(TRUE);
+    $fields = parent::baseFieldDefinitions($entity_type);
 
     $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Authored by'))
@@ -160,7 +229,6 @@ class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
       ->setSetting('handler', 'default')
-      ->setDefaultValueCallback('Drupal\node\Entity\Node::getCurrentUserId')
       ->setTranslatable(TRUE)
       ->setDisplayOptions('view', array(
         'label' => 'hidden',
@@ -183,6 +251,7 @@ class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
       ->setDescription(t('The name of the Heartbeat entity.'))
+      ->setRevisionable(TRUE)
       ->setSettings(array(
         'max_length' => 50,
         'text_processing' => 0,
@@ -203,17 +272,9 @@ class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))
       ->setDescription(t('A boolean indicating whether the Heartbeat is published.'))
+      ->setRevisionable(TRUE)
       ->setDefaultValue(TRUE);
 
-    $fields['langcode'] = BaseFieldDefinition::create('language')
-      ->setLabel(t('Language code'))
-      ->setDescription(t('The language code for the Heartbeat entity.'))
-      ->setDisplayOptions('form', array(
-        'type' => 'language_select',
-        'weight' => 10,
-      ))
-      ->setDisplayConfigurable('form', TRUE);
-
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Created'))
       ->setDescription(t('The time that the entity was created.'));
@@ -222,6 +283,26 @@ class Heartbeat extends ContentEntityBase implements HeartbeatInterface {
       ->setLabel(t('Changed'))
       ->setDescription(t('The time that the entity was last edited.'));
 
+    $fields['revision_timestamp'] = BaseFieldDefinition::create('created')
+      ->setLabel(t('Revision timestamp'))
+      ->setDescription(t('The time that the current revision was created.'))
+      ->setQueryable(FALSE)
+      ->setRevisionable(TRUE);
+
+    $fields['revision_uid'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Revision user ID'))
+      ->setDescription(t('The user ID of the author of the current revision.'))
+      ->setSetting('target_type', 'user')
+      ->setQueryable(FALSE)
+      ->setRevisionable(TRUE);
+
+    $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Revision translation affected'))
+      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
+      ->setReadOnly(TRUE)
+      ->setRevisionable(TRUE)
+      ->setTranslatable(TRUE);
+
     return $fields;
   }
 

src/Entity/HeartbeatInterface.php

@@ -0,0 +1,126 @@
+<?php
+
+namespace Drupal\heartbeat8\Entity;
+
+use Drupal\Core\Entity\RevisionLogInterface;
+use Drupal\Core\Entity\RevisionableInterface;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Url;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\user\EntityOwnerInterface;
+
+/**
+ * Provides an interface for defining Heartbeat entities.
+ *
+ * @ingroup heartbeat8
+ */
+interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface, EntityChangedInterface, EntityOwnerInterface {
+
+  // Add get/set methods for your configuration properties here.
+
+  /**
+   * Gets the Heartbeat type.
+   *
+   * @return string
+   *   The Heartbeat type.
+   */
+  public function getType();
+
+  /**
+   * Gets the Heartbeat name.
+   *
+   * @return string
+   *   Name of the Heartbeat.
+   */
+  public function getName();
+
+  /**
+   * Sets the Heartbeat name.
+   *
+   * @param string $name
+   *   The Heartbeat name.
+   *
+   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   *   The called Heartbeat entity.
+   */
+  public function setName($name);
+
+  /**
+   * Gets the Heartbeat creation timestamp.
+   *
+   * @return int
+   *   Creation timestamp of the Heartbeat.
+   */
+  public function getCreatedTime();
+
+  /**
+   * Sets the Heartbeat creation timestamp.
+   *
+   * @param int $timestamp
+   *   The Heartbeat creation timestamp.
+   *
+   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   *   The called Heartbeat entity.
+   */
+  public function setCreatedTime($timestamp);
+
+  /**
+   * Returns the Heartbeat published status indicator.
+   *
+   * Unpublished Heartbeat are only visible to restricted users.
+   *
+   * @return bool
+   *   TRUE if the Heartbeat is published.
+   */
+  public function isPublished();
+
+  /**
+   * Sets the published status of a Heartbeat.
+   *
+   * @param bool $published
+   *   TRUE to set this Heartbeat to published, FALSE to set it to unpublished.
+   *
+   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   *   The called Heartbeat entity.
+   */
+  public function setPublished($published);
+
+  /**
+   * Gets the Heartbeat revision creation timestamp.
+   *
+   * @return int
+   *   The UNIX timestamp of when this revision was created.
+   */
+  public function getRevisionCreationTime();
+
+  /**
+   * Sets the Heartbeat revision creation timestamp.
+   *
+   * @param int $timestamp
+   *   The UNIX timestamp of when this revision was created.
+   *
+   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   *   The called Heartbeat entity.
+   */
+  public function setRevisionCreationTime($timestamp);
+
+  /**
+   * Gets the Heartbeat revision author.
+   *
+   * @return \Drupal\user\UserInterface
+   *   The user entity for the revision author.
+   */
+  public function getRevisionUser();
+
+  /**
+   * Sets the Heartbeat revision author.
+   *
+   * @param int $uid
+   *   The user ID of the revision author.
+   *
+   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   *   The called Heartbeat entity.
+   */
+  public function setRevisionUserId($uid);
+
+}

src/Entity/HeartbeatStream.php

@@ -3,14 +3,13 @@
 namespace Drupal\heartbeat8\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\heartbeat8\HeartbeatStreamInterface;
 
 /**
- * Defines the Heartbeat Stream entity.
+ * Defines the Heartbeat stream entity.
  *
  * @ConfigEntityType(
  *   id = "heartbeat_stream",
- *   label = @Translation("Heartbeat Stream"),
+ *   label = @Translation("Heartbeat stream"),
  *   handlers = {
  *     "list_builder" = "Drupal\heartbeat8\HeartbeatStreamListBuilder",
  *     "form" = {
@@ -30,204 +29,236 @@ use Drupal\heartbeat8\HeartbeatStreamInterface;
  *     "uuid" = "uuid"
  *   },
  *   links = {
- *     "canonical" = "/admin/structure/heartbeat/heartbeat_stream/{heartbeat_stream}",
- *     "add-form" = "/admin/structure/heartbeat/heartbeat_stream/add",
- *     "edit-form" = "/admin/structure/heartbeat/heartbeat_stream/{heartbeat_stream}/edit",
- *     "delete-form" = "/admin/structure/heartbeat/heartbeat_stream/{heartbeat_stream}/delete",
- *     "collection" = "/admin/structure/heartbeat/heartbeat_stream"
+ *     "canonical" = "/admin/structure/heartbeat_stream/{heartbeat_stream}",
+ *     "add-form" = "/admin/structure/heartbeat_stream/add",
+ *     "edit-form" = "/admin/structure/heartbeat_stream/{heartbeat_stream}/edit",
+ *     "delete-form" = "/admin/structure/heartbeat_stream/{heartbeat_stream}/delete",
+ *     "collection" = "/admin/structure/heartbeat_stream"
  *   }
  * )
  */
 class HeartbeatStream extends ConfigEntityBase implements HeartbeatStreamInterface {
+
   /**
-   * The Heartbeat Stream ID.
+   * The Heartbeat stream ID.
    *
    * @var string
    */
   protected $id;
-  protected $messageId;
-  protected $hid;
-  protected $description;
-  protected $perms;
-  protected $messageConcat;
-  protected $concatArgs;
-  protected $message;
-  protected $variables;
-  protected $attachments;
-  protected $groupType;
+
   /**
-   * The Heartbeat Stream label.
+   * The Heartbeat stream label.
    *
    * @var string
    */
   protected $label;
 
-  public function setMessageId($messageId) {
-    $this->messageId = $messageId;
-  }
 
-  public function getMessageId() {
-    return $this->messageId;
-  }
+  // Class name used.
+  protected $name;
+
+  // Class to variable for ease of read/write.
+  protected $class;
+
+  // Real class to load for cloned streams.
+  protected $real_class;
+
+  // The path to the class.
+  protected $path;
+
+  // Human readable name.
+  protected $title;
+
+  // Module where query builder is located.
+  protected $module;
+
+  // Extra variables.
+  //TODO variables might be put into config api
+  protected $variables;
+
+  // Indicates whether this stream has a block display or not.
+  protected $has_block = TRUE;
+
+  // Max number of items in block display.
+  protected $block_items_max = 25;
+
+  // Number to indicate how a block-pager should be shown.
+  protected $block_show_pager = 0;
+
+  // View mode for the block.
+  protected $block_view_mode = 'default';
+
+  // Maximum number of items in the page display.
+  protected $page_items_max = 50;
+
+  // Boolean to indicate of a page-pager should be shown.
+  protected $page_show_pager = 0;
+
+  // Boolean to indicate if the pager is ajax-driven.
+  protected $page_pager_ajax = 0;
+
+  // View mode for the page.
+  protected $page_view_mode = 'default';
+
+  // Setting for the number of grouped items maximum.
+  protected $show_message_times = 1;
+
+  // Setting for the number of grouped items maximum in a grouped message.
+  protected $show_message_times_grouped = 0;
+
+  // Denied message templates.
+  protected $messages_denied = array();
+
+  // Limit the number of messages by maximum messages to load.
+  protected $num_load_max = 100;
+
+  // Limit the timespan to group messages.
+  protected $grouping_seconds = 7200;
+
+  // Boolean for to skip the viewing user, defaults to false.
+  protected $skip_active_user = FALSE;
+
+  // Timestamp used to poll for newer messages.
+  protected $poll_messages = 0;
+
+  // How to notify there are newer messages.
+  protected $poll_messages_type = 0;
+
+  // Stream path is the path to the stream page (optional).
+  protected $stream_path;
+
+  // Stream user path is the path to a stream on the profile page (optional).
+  protected $stream_profile_path;
+
+  // Settings variable
+  protected $settings;
 
   /**
-   * Sets the description of the stream
-   *
-   * @param string $description
-   *  Describing streams of this type
+   * @return mixed
    */
-  public function setDescription($description) {
-    $this->description = $description;
+  public function getName()
+  {
+    return $this->name;
   }
 
   /**
-   * Gets the description of the stream
-   *
-   * @return string
-   *  The Stream's description
+   * @param mixed $name
    */
-  public function getDescription() {
-    return $this->description;
+  public function setName($name)
+  {
+    $this->name = $name;
   }
 
   /**
-   * Sets the translatable message
-   * This message creates the structure of each message
-   *
-   * @param string $message
-   *  The template message serving as the foundation of each message structure of this stream type
+   * @return mixed
    */
-  public function setMessage($message) {
-    $this->message = $message;
+  public function getClass()
+  {
+    return $this->class;
   }
 
   /**
-   * Gets the translatable message of the stream
-   *
-   * @return string
-   *  The Stream's message
+   * @param mixed $class
    */
-  public function getMessage() {
-    return $this->message;
+  public function setClass($class)
+  {
+    $this->class = $class;
   }
 
   /**
-   * Sets the translatable concatenated message
-   *
-   * @param string $messageConcat
-   *
+   * @return mixed
    */
-  public function setMessageConcat($messageConcat) {
-    $this->messageConcat = $messageConcat;
+  public function getRealClass()
+  {
+    return $this->real_class;
   }
 
   /**
-   * Gets the concatenated message of the stream
-   *
-   * @return string
-   *  The Stream's concatenated message
+   * @param mixed $real_class
    */
-  public function getMessageConcat() {
-    return $this->messageConcat;
+  public function setRealClass($real_class)
+  {
+    $this->real_class = $real_class;
   }
 
   /**
-   * Sets the Permissions for this message stream
-   *
-   * @param int $perms
-   *
+   * @return mixed
    */
-  public function setPerms($perms) {
-    $this->perms = $perms;
+  public function getPath()
+  {
+    return $this->path;
   }
 
   /**
-   * Gets the Permissions of this message stream
-   *
-   * @return int
-   *  The stream's permissions
+   * @param mixed $path
    */
-  public function getPerms() {
-    return $this->perms;
+  public function setPath($path)
+  {
+    $this->path = $path;
   }
 
   /**
-   * Sets the Group Type for this message stream
-   *
-   * @param string $groupType
-   *
+   * @return mixed
    */
-  public function setGroupType($groupType) {
-    $this->groupType = $groupType;
+  public function getTitle()
+  {
+    return $this->title;
   }
 
   /**
-   * Gets the Group Type of this message stream
-   *
-   * @return string
-   *  The stream's Group Type
+   * @param mixed $title
    */
-  public function getGroupType() {
-    return $this->groupType;
+  public function setTitle($title)
+  {
+    $this->title = $title;
   }
 
   /**
-   * Sets the arguments for the concatenated message
-   *
-   * @param string $concatArgs
-   *
+   * @return mixed
    */
-  public function setConcatArgs($concatArgs) {
-    $this->concatArgs = $concatArgs;
+  public function getModule()
+  {
+    return $this->module;
   }
 
   /**
-   * Gets the arguments for the concatenated message
-   *
-   * @return string
-   *  The stream's arguments for the concatenated message
+   * @param mixed $module
    */
-  public function getConcateArgs() {
-    return $this->concatArgs;
+  public function setModule($module)
+  {
+    $this->module = $module;
   }
 
   /**
-   * Sets the variables for this message stream
-   *
-   * @param string $variables
-   *
+   * @return mixed
    */
-  public function setVariables($variables) {
-    $this->variables = $variables;
+  public function getVariables()
+  {
+    return $this->variables;
   }
 
   /**
-   * Gets the variables of this message stream
-   *
-   * @return string
-   *  The stream's variables
+   * @param mixed $variables
    */
-  public function getVariables() {
-    return $this->variables;
+  public function setVariables($variables)
+  {
+    $this->variables = $variables;
   }
 
   /**
-   * Sets the attachments for this message stream
-   *
-   * @param string $attachments
-   *
+   * @return mixed
    */
-  public function setAttachments($attachments) {
-    $this->attachments = $attachments;
+  public function getSettings()
+  {
+    return $this->settings;
   }
 
   /**
-   * Gets the attachments of this message stream
-   *
-   * @return string
-   *  The stream's attachments
+   * @param mixed $settings
    */
-  public function getAttachments() {
-    return $this->attachments;
+  public function setSettings($settings)
+  {
+    $this->settings = $settings;
   }
+
 }

src/Entity/HeartbeatStreamInterface.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\heartbeat8\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface for defining Heartbeat stream entities.
+ */
+interface HeartbeatStreamInterface extends ConfigEntityInterface {
+
+  /**
+   * @return mixed
+   */
+
+  public function getName();
+
+  /**
+   * @param mixed $name
+   */
+
+  public function setName($name);
+
+  /**
+   * @return mixed
+   */
+
+  public function getClass();
+
+  /**
+   * @param mixed $class
+   */
+
+  public function setClass($class);
+
+  /**
+   * @return mixed
+   */
+
+  public function getRealClass();
+
+  /**
+   * @param mixed $real_class
+   */
+
+  public function setRealClass($real_class);
+
+  /**
+   * @return mixed
+   */
+
+  public function getPath();
+
+  /**
+   * @param mixed $path
+   */
+
+  public function setPath($path);
+
+  /**
+   * @return mixed
+   */
+
+  public function getTitle();
+
+  /**
+   * @param mixed $title
+   */
+
+  public function setTitle($title);
+
+  /**
+   * @return mixed
+   */
+
+  public function getModule();
+
+  /**
+   * @param mixed $module
+   */
+
+  public function setModule($module);
+
+  /**
+   * @return mixed
+   */
+
+  public function getVariables();
+
+  /**
+   * @param mixed $variables
+   */
+
+  public function setVariables($variables);
+
+  /**
+   * @return mixed
+   */
+
+  public function getSettings();
+
+  /**
+   * @param mixed $settings
+   */
+
+  public function setSettings($settings);
+
+}

src/Entity/HeartbeatType.php

@@ -0,0 +1,235 @@
+<?php
+
+namespace Drupal\heartbeat8\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
+
+/**
+ * Defines the Heartbeat type entity.
+ *
+ * @ConfigEntityType(
+ *   id = "heartbeat_type",
+ *   label = @Translation("Heartbeat type"),
+ *   handlers = {
+ *     "list_builder" = "Drupal\heartbeat8\HeartbeatTypeListBuilder",
+ *     "form" = {
+ *       "add" = "Drupal\heartbeat8\Form\HeartbeatTypeForm",
+ *       "edit" = "Drupal\heartbeat8\Form\HeartbeatTypeForm",
+ *       "delete" = "Drupal\heartbeat8\Form\HeartbeatTypeDeleteForm"
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\heartbeat8\HeartbeatTypeHtmlRouteProvider",
+ *     },
+ *   },
+ *   config_prefix = "heartbeat_type",
+ *   admin_permission = "administer site configuration",
+ *   bundle_of = "heartbeat",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label",
+ *     "uuid" = "uuid"
+ *   },
+ *   links = {
+ *     "canonical" = "/admin/structure/heartbeat_type/{heartbeat_type}",
+ *     "add-form" = "/admin/structure/heartbeat_type/add",
+ *     "edit-form" = "/admin/structure/heartbeat_type/{heartbeat_type}/edit",
+ *     "delete-form" = "/admin/structure/heartbeat_type/{heartbeat_type}/delete",
+ *     "collection" = "/admin/structure/heartbeat_type"
+ *   }
+ * )
+ */
+class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInterface {
+
+  /**
+   * The Heartbeat Stream ID.
+   *
+   * @var string
+   */
+  protected $id;
+  protected $messageId;
+  protected $hid;
+  protected $description;
+  protected $perms;
+  protected $messageConcat;
+  protected $concatArgs;
+  protected $message;
+  protected $variables;
+  protected $attachments;
+  protected $groupType;
+
+  /**
+   * The Heartbeat Stream label.
+   *
+   * @var string
+   */
+  protected $label;
+
+  public function setMessageId($messageId) {
+    $this->messageId = $messageId;
+  }
+
+  public function getMessageId() {
+    return $this->messageId;
+  }
+
+  /**
+   * Sets the description of the stream
+   *
+   * @param string $description
+   *  Describing streams of this type
+   */
+  public function setDescription($description) {
+    $this->description = $description;
+  }
+
+  /**
+   * Gets the description of the stream
+   *
+   * @return string
+   *  The Stream's description
+   */
+  public function getDescription() {
+    return $this->description;
+  }
+
+  /**
+   * Sets the translatable message
+   * This message creates the structure of each message
+   *
+   * @param string $message
+   *  The template message serving as the foundation of each message structure of this stream type
+   */
+  public function setMessage($message) {
+    $this->message = $message;
+  }
+
+  /**
+   * Gets the translatable message of the stream
+   *
+   * @return string
+   *  The Stream's message
+   */
+  public function getMessage() {
+    return $this->message;
+  }
+
+  /**
+   * Sets the translatable concatenated message
+   *
+   * @param string $messageConcat
+   *
+   */
+  public function setMessageConcat($messageConcat) {
+    $this->messageConcat = $messageConcat;
+  }
+
+  /**
+   * Gets the concatenated message of the stream
+   *
+   * @return string
+   *  The Stream's concatenated message
+   */
+  public function getMessageConcat() {
+    return $this->messageConcat;
+  }
+
+  /**
+   * Sets the Permissions for this message stream
+   *
+   * @param int $perms
+   *
+   */
+  public function setPerms($perms) {
+    $this->perms = $perms;
+  }
+
+  /**
+   * Gets the Permissions of this message stream
+   *
+   * @return int
+   *  The stream's permissions
+   */
+  public function getPerms() {
+    return $this->perms;
+  }
+
+  /**
+   * Sets the Group Type for this message stream
+   *
+   * @param string $groupType
+   *
+   */
+  public function setGroupType($groupType) {
+    $this->groupType = $groupType;
+  }
+
+  /**
+   * Gets the Group Type of this message stream
+   *
+   * @return string
+   *  The stream's Group Type
+   */
+  public function getGroupType() {
+    return $this->groupType;
+  }
+
+  /**
+   * Sets the arguments for the concatenated message
+   *
+   * @param string $concatArgs
+   *
+   */
+  public function setConcatArgs($concatArgs) {
+    $this->concatArgs = $concatArgs;
+  }
+
+  /**
+   * Gets the arguments for the concatenated message
+   *
+   * @return string
+   *  The stream's arguments for the concatenated message
+   */
+  public function getConcateArgs() {
+    return $this->concatArgs;
+  }
+
+  /**
+   * Sets the variables for this message stream
+   *
+   * @param string $variables
+   *
+   */
+  public function setVariables($variables) {
+    $this->variables = $variables;
+  }
+
+  /**
+   * Gets the variables of this message stream
+   *
+   * @return string
+   *  The stream's variables
+   */
+  public function getVariables() {
+    return $this->variables;
+  }
+
+  /**
+   * Sets the attachments for this message stream
+   *
+   * @param string $attachments
+   *
+   */
+  public function setAttachments($attachments) {
+    $this->attachments = $attachments;
+  }
+
+  /**
+   * Gets the attachments of this message stream
+   *
+   * @return string
+   *  The stream's attachments
+   */
+  public function getAttachments() {
+    return $this->attachments;
+  }
+}

src/HeartbeatStreamInterface.php → src/Entity/HeartbeatTypeInterface.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat8\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
 /**
- * Provides an interface for defining Heartbeat Stream entities.
+ * Provides an interface for defining Heartbeat type entities.
  */
-interface HeartbeatStreamInterface extends ConfigEntityInterface {
+interface HeartbeatTypeInterface extends ConfigEntityInterface {
 
 
 

src/Entity/HeartbeatViewsData.php

@@ -3,23 +3,20 @@
 namespace Drupal\heartbeat8\Entity;
 
 use Drupal\views\EntityViewsData;
-use Drupal\views\EntityViewsDataInterface;
 
 /**
  * Provides Views data for Heartbeat entities.
  */
-class HeartbeatViewsData extends EntityViewsData implements EntityViewsDataInterface {
+class HeartbeatViewsData extends EntityViewsData {
+
   /**
    * {@inheritdoc}
    */
   public function getViewsData() {
     $data = parent::getViewsData();
 
-    $data['heartbeat']['table']['base'] = array(
-      'field' => 'id',
-      'title' => $this->t('Heartbeat'),
-      'help' => $this->t('The Heartbeat ID.'),
-    );
+    // Additional information for Views integration, such as table joins, can be
+    // put here.
 
     return $data;
   }

src/Form/HeartbeatDeleteForm.php

@@ -11,4 +11,5 @@ use Drupal\Core\Entity\ContentEntityDeleteForm;
  */
 class HeartbeatDeleteForm extends ContentEntityDeleteForm {
 
+
 }

src/Form/HeartbeatForm.php

@@ -11,12 +11,23 @@ use Drupal\Core\Form\FormStateInterface;
  * @ingroup heartbeat8
  */
 class HeartbeatForm extends ContentEntityForm {
+
   /**
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     /* @var $entity \Drupal\heartbeat8\Entity\Heartbeat */
     $form = parent::buildForm($form, $form_state);
+
+    if (!$this->entity->isNew()) {
+      $form['new_revision'] = array(
+        '#type' => 'checkbox',
+        '#title' => $this->t('Create new revision'),
+        '#default_value' => FALSE,
+        '#weight' => 10,
+      );
+    }
+
     $entity = $this->entity;
 
     return $form;
@@ -26,7 +37,20 @@ class HeartbeatForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public function save(array $form, FormStateInterface $form_state) {
-    $entity = $this->entity;
+    $entity = &$this->entity;
+
+    // Save as a new revision if requested to do so.
+    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
+      $entity->setNewRevision();
+
+      // If a new revision is created, save the current user as revision author.
+      $entity->setRevisionCreationTime(REQUEST_TIME);
+      $entity->setRevisionUserId(\Drupal::currentUser()->id());
+    }
+    else {
+      $entity->setNewRevision(FALSE);
+    }
+
     $status = parent::save($form, $form_state);
 
     switch ($status) {

src/Form/HeartbeatRevisionDeleteForm.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace Drupal\heartbeat8\Form;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for deleting a Heartbeat revision.
+ *
+ * @ingroup heartbeat8
+ */
+class HeartbeatRevisionDeleteForm extends ConfirmFormBase {
+
+
+  /**
+   * The Heartbeat revision.
+   *
+   * @var \Drupal\heartbeat8\Entity\HeartbeatInterface
+   */
+  protected $revision;
+
+  /**
+   * The Heartbeat storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $HeartbeatStorage;
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $connection;
+
+  /**
+   * Constructs a new HeartbeatRevisionDeleteForm.
+   *
+   * @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
+   *   The entity storage.
+   * @param \Drupal\Core\Database\Connection $connection
+   *   The database connection.
+   */
+  public function __construct(EntityStorageInterface $entity_storage, Connection $connection) {
+    $this->HeartbeatStorage = $entity_storage;
+    $this->connection = $connection;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $entity_manager = $container->get('entity.manager');
+    return new static(
+      $entity_manager->getStorage('heartbeat'),
+      $container->get('database')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'heartbeat_revision_delete_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return t('Are you sure you want to delete the revision from %revision-date?', array('%revision-date' => format_date($this->revision->getRevisionCreationTime())));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.heartbeat.version_history', array('heartbeat' => $this->revision->id()));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $heartbeat_revision = NULL) {
+    $this->revision = $this->HeartbeatStorage->loadRevision($heartbeat_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->HeartbeatStorage->deleteRevision($this->revision->getRevisionId());
+
+    $this->logger('content')->notice('Heartbeat: deleted %title revision %revision.', array('%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()));
+    drupal_set_message(t('Revision from %revision-date of Heartbeat %title has been deleted.', array('%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label())));
+    $form_state->setRedirect(
+      'entity.heartbeat.canonical',
+       array('heartbeat' => $this->revision->id())
+    );
+    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {heartbeat_field_revision} WHERE id = :id', array(':id' => $this->revision->id()))->fetchField() > 1) {
+      $form_state->setRedirect(
+        'entity.heartbeat.version_history',
+         array('heartbeat' => $this->revision->id())
+      );
+    }
+  }
+
+}

src/Form/HeartbeatRevisionRevertForm.php

@@ -0,0 +1,149 @@
+<?php
+
+namespace Drupal\heartbeat8\Form;
+
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\heartbeat8\Entity\HeartbeatInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Heartbeat revision.
+ *
+ * @ingroup heartbeat8
+ */
+class HeartbeatRevisionRevertForm extends ConfirmFormBase {
+
+
+  /**
+   * The Heartbeat revision.
+   *
+   * @var \Drupal\heartbeat8\Entity\HeartbeatInterface
+   */
+  protected $revision;
+
+  /**
+   * The Heartbeat storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $HeartbeatStorage;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * Constructs a new HeartbeatRevisionRevertForm.
+   *
+   * @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
+   *   The Heartbeat storage.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   */
+  public function __construct(EntityStorageInterface $entity_storage, DateFormatterInterface $date_formatter) {
+    $this->HeartbeatStorage = $entity_storage;
+    $this->dateFormatter = $date_formatter;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity.manager')->getStorage('heartbeat'),
+      $container->get('date.formatter')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'heartbeat_revision_revert_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return t('Are you sure you want to revert to the revision from %revision-date?', ['%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime())]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.heartbeat.version_history', array('heartbeat' => $this->revision->id()));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return t('Revert');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $heartbeat_revision = NULL) {
+    $this->revision = $this->HeartbeatStorage->loadRevision($heartbeat_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // The revision timestamp will be updated when the revision is saved. Keep
+    // the original one for the confirmation message.
+    $original_revision_timestamp = $this->revision->getRevisionCreationTime();
+
+    $this->revision = $this->prepareRevertedRevision($this->revision, $form_state);
+    $this->revision->revision_log = t('Copy of the revision from %date.', ['%date' => $this->dateFormatter->format($original_revision_timestamp)]);
+    $this->revision->save();
+
+    $this->logger('content')->notice('Heartbeat: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    drupal_set_message(t('Heartbeat %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    $form_state->setRedirect(
+      'entity.heartbeat.version_history',
+      array('heartbeat' => $this->revision->id())
+    );
+  }
+
+  /**
+   * Prepares a revision to be reverted.
+   *
+   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $revision
+   *   The revision to be reverted.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   *   The prepared revision ready to be stored.
+   */
+  protected function prepareRevertedRevision(HeartbeatInterface $revision, FormStateInterface $form_state) {
+    $revision->setNewRevision();
+    $revision->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $revision;
+  }
+
+}

src/Form/HeartbeatRevisionRevertTranslationForm.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace Drupal\heartbeat8\Form;
+
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\heartbeat8\Entity\HeartbeatInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Heartbeat revision for a single translation.
+ *
+ * @ingroup heartbeat8
+ */
+class HeartbeatRevisionRevertTranslationForm extends HeartbeatRevisionRevertForm {
+
+
+  /**
+   * The language to be reverted.
+   *
+   * @var string
+   */
+  protected $langcode;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * Constructs a new HeartbeatRevisionRevertTranslationForm.
+   *
+   * @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
+   *   The Heartbeat storage.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
+   */
+  public function __construct(EntityStorageInterface $entity_storage, DateFormatterInterface $date_formatter, LanguageManagerInterface $language_manager) {
+    parent::__construct($entity_storage, $date_formatter);
+    $this->languageManager = $language_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity.manager')->getStorage('heartbeat'),
+      $container->get('date.formatter'),
+      $container->get('language_manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'heartbeat_revision_revert_translation_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return t('Are you sure you want to revert @language translation to the revision from %revision-date?', ['@language' => $this->languageManager->getLanguageName($this->langcode), '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime())]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $heartbeat_revision = NULL, $langcode = NULL) {
+    $this->langcode = $langcode;
+    $form = parent::buildForm($form, $form_state, $heartbeat_revision);
+
+    $form['revert_untranslated_fields'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Revert content shared among translations'),
+      '#default_value' => FALSE,
+    );
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function prepareRevertedRevision(HeartbeatInterface $revision, FormStateInterface $form_state) {
+    $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
+
+    /** @var \Drupal\heartbeat8\Entity\HeartbeatInterface $default_revision */
+    $latest_revision = $this->HeartbeatStorage->load($revision->id());
+    $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
+
+    $revision_translation = $revision->getTranslation($this->langcode);
+
+    foreach ($latest_revision_translation->getFieldDefinitions() as $field_name => $definition) {
+      if ($definition->isTranslatable() || $revert_untranslated_fields) {
+        $latest_revision_translation->set($field_name, $revision_translation->get($field_name)->getValue());
+      }
+    }
+
+    $latest_revision_translation->setNewRevision();
+    $latest_revision_translation->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $latest_revision_translation;
+  }
+
+}

src/Form/HeartbeatSettingsForm.php

@@ -13,6 +13,7 @@ use Drupal\Core\Form\FormStateInterface;
  * @ingroup heartbeat8
  */
 class HeartbeatSettingsForm extends FormBase {
+
   /**
    * Returns a unique string identifying the form.
    *
@@ -35,7 +36,6 @@ class HeartbeatSettingsForm extends FormBase {
     // Empty implementation of the abstract submit class.
   }
 
-
   /**
    * Defines the settings form for Heartbeat entities.
    *

src/Form/HeartbeatStreamDeleteForm.php

@@ -7,14 +7,15 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 
 /**
- * Builds the form to delete Heartbeat Stream entities.
+ * Builds the form to delete Heartbeat stream entities.
  */
 class HeartbeatStreamDeleteForm extends EntityConfirmFormBase {
+
   /**
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete %name?', array('%name' => $this->entity->label()));
+    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
   }
 
   /**

src/Form/HeartbeatStreamForm.php

@@ -11,6 +11,7 @@ use Drupal\Core\Form\FormStateInterface;
  * @package Drupal\heartbeat8\Form
  */
 class HeartbeatStreamForm extends EntityForm {
+
   /**
    * {@inheritdoc}
    */
@@ -18,55 +19,23 @@ class HeartbeatStreamForm extends EntityForm {
     $form = parent::form($form, $form_state);
 
     $heartbeat_stream = $this->entity;
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#maxlength' => 255,
       '#default_value' => $heartbeat_stream->label(),
-      '#description' => $this->t("Label for the Heartbeat Stream."),
-      '#required' => TRUE,
-    );
-
-
-    $form['message_id'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('messageId'),
-      '#maxlength' => 255,
-      '#default_value' => "New Message ID",
-      '#description' => $this->t("Message ID for the Heartbeat Stream."),
-      '#required' => TRUE,
-    );
-
-
-    $form['description'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('description'),
-      '#maxlength' => 255,
-      '#default_value' => "Description",
-      '#description' => $this->t("Description of the Heartbeat Stream"),
+      '#description' => $this->t("Label for the Heartbeat stream."),
       '#required' => TRUE,
-    );
-
-    $form['message'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('message'),
-      '#maxlength' => 255,
-      '#default_value' => "Message",
-      '#description' => $this->t("The structure for messages of this type. Use !exclamation marks before fields and entities"),
-      '#required' => TRUE,
-    );
-
-
-
+    ];
 
-    $form['id'] = array(
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $heartbeat_stream->id(),
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\heartbeat8\Entity\HeartbeatStream::load',
-      ),
+      ],
       '#disabled' => !$heartbeat_stream->isNew(),
-    );
+    ];
 
     /* You will need additional form elements for your custom properties. */
 
@@ -82,17 +51,17 @@ class HeartbeatStreamForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Heartbeat Stream.', [
+        drupal_set_message($this->t('Created the %label Heartbeat stream.', [
           '%label' => $heartbeat_stream->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Heartbeat Stream.', [
+        drupal_set_message($this->t('Saved the %label Heartbeat stream.', [
           '%label' => $heartbeat_stream->label(),
         ]));
     }
-    $form_state->setRedirectUrl($heartbeat_stream->urlInfo('collection'));
+    $form_state->setRedirectUrl($heartbeat_stream->toUrl('collection'));
   }
 
 }

src/Form/HeartbeatTypeDeleteForm.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\heartbeat8\Form;
+
+use Drupal\Core\Entity\EntityConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Builds the form to delete Heartbeat type entities.
+ */
+class HeartbeatTypeDeleteForm extends EntityConfirmFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.heartbeat_type.collection');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->entity->delete();
+
+    drupal_set_message(
+      $this->t('content @type: deleted @label.',
+        [
+          '@type' => $this->entity->bundle(),
+          '@label' => $this->entity->label(),
+        ]
+        )
+    );
+
+    $form_state->setRedirectUrl($this->getCancelUrl());
+  }
+
+}

src/Form/HeartbeatTypeForm.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\heartbeat8\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class HeartbeatTypeForm.
+ *
+ * @package Drupal\heartbeat8\Form
+ */
+class HeartbeatTypeForm extends EntityForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    $heartbeat_type = $this->entity;
+
+    $form['label'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $heartbeat_type->label(),
+      '#description' => $this->t("Label for the Heartbeat Type."),
+      '#required' => TRUE,
+    );
+
+
+    $form['message_id'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('messageId'),
+      '#maxlength' => 255,
+      '#default_value' => "New Message ID",
+      '#description' => $this->t("Message ID for the Heartbeat Type."),
+      '#required' => TRUE,
+    );
+
+
+    $form['description'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('description'),
+      '#maxlength' => 255,
+      '#default_value' => "Description",
+      '#description' => $this->t("Description of the Heartbeat Type"),
+      '#required' => TRUE,
+    );
+
+    $form['message'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('message'),
+      '#maxlength' => 255,
+      '#default_value' => "Message",
+      '#description' => $this->t("The structure for messages of this type. Use !exclamation marks before fields and entities"),
+      '#required' => TRUE,
+    );
+
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $heartbeat_type->id(),
+      '#machine_name' => [
+        'exists' => '\Drupal\heartbeat8\Entity\HeartbeatType::load',
+      ],
+      '#disabled' => !$heartbeat_type->isNew(),
+    ];
+
+    /* You will need additional form elements for your custom properties. */
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $heartbeat_type = $this->entity;
+    $status = $heartbeat_type->save();
+
+    switch ($status) {
+      case SAVED_NEW:
+        drupal_set_message($this->t('Created the %label Heartbeat type.', [
+          '%label' => $heartbeat_type->label(),
+        ]));
+        break;
+
+      default:
+        drupal_set_message($this->t('Saved the %label Heartbeat type.', [
+          '%label' => $heartbeat_type->label(),
+        ]));
+    }
+    $form_state->setRedirectUrl($heartbeat_type->toUrl('collection'));
+  }
+
+}

src/HeartbeatAccessControlHandler.php

@@ -13,11 +13,12 @@ use Drupal\Core\Access\AccessResult;
  * @see \Drupal\heartbeat8\Entity\Heartbeat.
  */
 class HeartbeatAccessControlHandler extends EntityAccessControlHandler {
+
   /**
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    /** @var \Drupal\heartbeat8\HeartbeatInterface $entity */
+    /** @var \Drupal\heartbeat8\Entity\HeartbeatInterface $entity */
     switch ($operation) {
       case 'view':
         if (!$entity->isPublished()) {

src/HeartbeatHtmlRouteProvider.php

@@ -13,6 +13,7 @@ use Symfony\Component\Routing\Route;
  * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
  */
 class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
+
   /**
    * {@inheritdoc}
    */
@@ -25,8 +26,24 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
       $collection->add("entity.{$entity_type_id}.collection", $collection_route);
     }
 
-    if ($add_form_route = $this->getAddFormRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.add_form", $add_form_route);
+    if ($history_route = $this->getHistoryRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.version_history", $history_route);
+    }
+
+    if ($revision_route = $this->getRevisionRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision", $revision_route);
+    }
+
+    if ($revert_route = $this->getRevisionRevertRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_revert", $revert_route);
+    }
+
+    if ($delete_route = $this->getRevisionDeleteRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_delete", $delete_route);
+    }
+
+    if ($translation_route = $this->getRevisionTranslationRevertRoute($entity_type)) {
+      $collection->add("{$entity_type_id}.revision_revert_translation_confirm", $translation_route);
     }
 
     if ($settings_form_route = $this->getSettingsFormRoute($entity_type)) {
@@ -54,7 +71,7 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
           '_entity_list' => $entity_type_id,
           '_title' => "{$entity_type->getLabel()} list",
         ])
-        ->setRequirement('_permission', 'view heartbeat entities')
+        ->setRequirement('_permission', 'access heartbeat overview')
         ->setOption('_admin_route', TRUE);
 
       return $route;
@@ -62,7 +79,7 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
   }
 
   /**
-   * Gets the add-form route.
+   * Gets the version history route.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type.
@@ -70,28 +87,111 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
    * @return \Symfony\Component\Routing\Route|null
    *   The generated route, if available.
    */
-  protected function getAddFormRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('add-form')) {
-      $entity_type_id = $entity_type->id();
-      $parameters = [
-        $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-      ];
-
-      $route = new Route($entity_type->getLinkTemplate('add-form'));
-      // Use the add form handler, if available, otherwise default.
-      $operation = 'default';
-      if ($entity_type->getFormClass('add')) {
-        $operation = 'add';
-      }
+  protected function getHistoryRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('version-history')) {
+      $route = new Route($entity_type->getLinkTemplate('version-history'));
+      $route
+        ->setDefaults([
+          '_title' => "{$entity_type->getLabel()} revisions",
+          '_controller' => '\Drupal\heartbeat8\Controller\HeartbeatController::revisionOverview',
+        ])
+        ->setRequirement('_permission', 'access heartbeat revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision')) {
+      $route = new Route($entity_type->getLinkTemplate('revision'));
+      $route
+        ->setDefaults([
+          '_controller' => '\Drupal\heartbeat8\Controller\HeartbeatController::revisionShow',
+          '_title_callback' => '\Drupal\heartbeat8\Controller\HeartbeatController::revisionPageTitle',
+        ])
+        ->setRequirement('_permission', 'access heartbeat revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_revert'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\heartbeat8\Form\HeartbeatRevisionRevertForm',
+          '_title' => 'Revert to earlier revision',
+        ])
+        ->setRequirement('_permission', 'revert all heartbeat revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision delete route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionDeleteRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_delete')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_delete'));
       $route
         ->setDefaults([
-          '_entity_form' => "{$entity_type_id}.{$operation}",
-          '_title' => "Add {$entity_type->getLabel()}",
+          '_form' => '\Drupal\heartbeat8\Form\HeartbeatRevisionDeleteForm',
+          '_title' => 'Delete earlier revision',
         ])
-        ->setRequirement('_entity_create_access', $entity_type_id);
+        ->setRequirement('_permission', 'delete all heartbeat revisions')
+        ->setOption('_admin_route', TRUE);
 
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision translation revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionTranslationRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('translation_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('translation_revert'));
       $route
-        ->setOption('parameters', $parameters)
+        ->setDefaults([
+          '_form' => '\Drupal\heartbeat8\Form\HeartbeatRevisionRevertTranslationForm',
+          '_title' => 'Revert to earlier revision of a translation',
+        ])
+        ->setRequirement('_permission', 'revert all heartbeat revisions')
         ->setOption('_admin_route', TRUE);
 
       return $route;

src/HeartbeatInterface.php

@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\heartbeat8;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityChangedInterface;
-use Drupal\user\EntityOwnerInterface;
-
-/**
- * Provides an interface for defining Heartbeat entities.
- *
- * @ingroup heartbeat8
- */
-interface HeartbeatInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface {
-  // Add get/set methods for your configuration properties here.
-  /**
-   * Gets the Heartbeat name.
-   *
-   * @return string
-   *   Name of the Heartbeat.
-   */
-  public function getName();
-
-  /**
-   * Sets the Heartbeat name.
-   *
-   * @param string $name
-   *   The Heartbeat name.
-   *
-   * @return \Drupal\heartbeat8\HeartbeatInterface
-   *   The called Heartbeat entity.
-   */
-  public function setName($name);
-
-  /**
-   * Gets the Heartbeat creation timestamp.
-   *
-   * @return int
-   *   Creation timestamp of the Heartbeat.
-   */
-  public function getCreatedTime();
-
-  /**
-   * Sets the Heartbeat creation timestamp.
-   *
-   * @param int $timestamp
-   *   The Heartbeat creation timestamp.
-   *
-   * @return \Drupal\heartbeat8\HeartbeatInterface
-   *   The called Heartbeat entity.
-   */
-  public function setCreatedTime($timestamp);
-
-  /**
-   * Returns the Heartbeat published status indicator.
-   *
-   * Unpublished Heartbeat are only visible to restricted users.
-   *
-   * @return bool
-   *   TRUE if the Heartbeat is published.
-   */
-  public function isPublished();
-
-  /**
-   * Sets the published status of a Heartbeat.
-   *
-   * @param bool $published
-   *   TRUE to set this Heartbeat to published, FALSE to set it to unpublished.
-   *
-   * @return \Drupal\heartbeat8\HeartbeatInterface
-   *   The called Heartbeat entity.
-   */
-  public function setPublished($published);
-
-}

src/HeartbeatListBuilder.php

@@ -13,7 +13,9 @@ use Drupal\Core\Url;
  * @ingroup heartbeat8
  */
 class HeartbeatListBuilder extends EntityListBuilder {
+
   use LinkGeneratorTrait;
+
   /**
    * {@inheritdoc}
    */

src/HeartbeatStorage.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\heartbeat8;
+
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\heartbeat8\Entity\HeartbeatInterface;
+
+/**
+ * Defines the storage handler class for Heartbeat entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Heartbeat entities.
+ *
+ * @ingroup heartbeat8
+ */
+class HeartbeatStorage extends SqlContentEntityStorage implements HeartbeatStorageInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function revisionIds(HeartbeatInterface $entity) {
+    return $this->database->query(
+      'SELECT vid FROM {heartbeat_revision} WHERE id=:id ORDER BY vid',
+      array(':id' => $entity->id())
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function userRevisionIds(AccountInterface $account) {
+    return $this->database->query(
+      'SELECT vid FROM {heartbeat_field_revision} WHERE uid = :uid ORDER BY vid',
+      array(':uid' => $account->id())
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function countDefaultLanguageRevisions(HeartbeatInterface $entity) {
+    return $this->database->query('SELECT COUNT(*) FROM {heartbeat_field_revision} WHERE id = :id AND default_langcode = 1', array(':id' => $entity->id()))
+      ->fetchField();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language) {
+    return $this->database->update('heartbeat_revision')
+      ->fields(array('langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED))
+      ->condition('langcode', $language->getId())
+      ->execute();
+  }
+
+}

src/HeartbeatStorageInterface.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\heartbeat8;
+
+use Drupal\Core\Entity\ContentEntityStorageInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\heartbeat8\Entity\HeartbeatInterface;
+
+/**
+ * Defines the storage handler class for Heartbeat entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Heartbeat entities.
+ *
+ * @ingroup heartbeat8
+ */
+interface HeartbeatStorageInterface extends ContentEntityStorageInterface {
+
+  /**
+   * Gets a list of Heartbeat revision IDs for a specific Heartbeat.
+   *
+   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $entity
+   *   The Heartbeat entity.
+   *
+   * @return int[]
+   *   Heartbeat revision IDs (in ascending order).
+   */
+  public function revisionIds(HeartbeatInterface $entity);
+
+  /**
+   * Gets a list of revision IDs having a given user as Heartbeat author.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user entity.
+   *
+   * @return int[]
+   *   Heartbeat revision IDs (in ascending order).
+   */
+  public function userRevisionIds(AccountInterface $account);
+
+  /**
+   * Counts the number of revisions in the default language.
+   *
+   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $entity
+   *   The Heartbeat entity.
+   *
+   * @return int
+   *   The number of revisions in the default language.
+   */
+  public function countDefaultLanguageRevisions(HeartbeatInterface $entity);
+
+  /**
+   * Unsets the language for all Heartbeat with the given language.
+   *
+   * @param \Drupal\Core\Language\LanguageInterface $language
+   *   The language object.
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language);
+
+}

src/HeartbeatStreamHtmlRouteProvider.php

@@ -7,12 +7,13 @@ use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
 use Symfony\Component\Routing\Route;
 
 /**
- * Provides routes for Heartbeat Stream entities.
+ * Provides routes for Heartbeat stream entities.
  *
  * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
  * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
  */
 class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
+
   /**
    * {@inheritdoc}
    */
@@ -25,10 +26,6 @@ class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
       $collection->add("entity.{$entity_type_id}.collection", $collection_route);
     }
 
-    if ($add_form_route = $this->getAddFormRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.add_form", $add_form_route);
-    }
-
     return $collection;
   }
 
@@ -59,37 +56,4 @@ class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
     }
   }
 
-  /**
-   * Gets the add-form route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getAddFormRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('add-form')) {
-      $entity_type_id = $entity_type->id();
-      $route = new Route($entity_type->getLinkTemplate('add-form'));
-      // Use the add form handler, if available, otherwise default.
-      $operation = 'default';
-      if ($entity_type->getFormClass('add')) {
-        $operation = 'add';
-      }
-      $route
-        ->setDefaults([
-          '_entity_form' => "{$entity_type_id}.{$operation}",
-          '_title' => "Add {$entity_type->getLabel()}",
-        ])
-        ->setRequirement('_entity_create_access', $entity_type_id)
-        ->setOption('parameters', [
-          $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-        ])
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
 }

src/HeartbeatStreamListBuilder.php

@@ -6,14 +6,15 @@ use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
 
 /**
- * Provides a listing of Heartbeat Stream entities.
+ * Provides a listing of Heartbeat stream entities.
  */
 class HeartbeatStreamListBuilder extends ConfigEntityListBuilder {
+
   /**
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['label'] = $this->t('Heartbeat Stream');
+    $header['label'] = $this->t('Heartbeat stream');
     $header['id'] = $this->t('Machine name');
     return $header + parent::buildHeader();
   }

src/HeartbeatTranslationHandler.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Drupal\heartbeat8;
+
+use Drupal\content_translation\ContentTranslationHandler;
+
+/**
+ * Defines the translation handler for heartbeat.
+ */
+class HeartbeatTranslationHandler extends ContentTranslationHandler {
+
+  // Override here the needed methods from ContentTranslationHandler.
+
+}

src/HeartbeatTypeHtmlRouteProvider.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\heartbeat8;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Provides routes for Heartbeat type entities.
+ *
+ * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class HeartbeatTypeHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+
+    $entity_type_id = $entity_type->id();
+
+    if ($collection_route = $this->getCollectionRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.collection", $collection_route);
+    }
+
+    return $collection;
+  }
+
+  /**
+   * Gets the collection route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getCollectionRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('collection') && $entity_type->hasListBuilderClass()) {
+      $entity_type_id = $entity_type->id();
+      $route = new Route($entity_type->getLinkTemplate('collection'));
+      $route
+        ->setDefaults([
+          '_entity_list' => $entity_type_id,
+          // Make sure this is not a TranslatableMarkup object as the
+          // TitleResolver translates this string again.
+          '_title' => (string) $entity_type->getLabel(),
+        ])
+        ->setRequirement('_permission', $entity_type->getAdminPermission())
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+}

src/HeartbeatTypeListBuilder.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\heartbeat8;
+
+use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Provides a listing of Heartbeat type entities.
+ */
+class HeartbeatTypeListBuilder extends ConfigEntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['label'] = $this->t('Heartbeat type');
+    $header['id'] = $this->t('Machine name');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    $row['label'] = $entity->label();
+    $row['id'] = $entity->id();
+    // You probably want a few more properties here...
+    return $row + parent::buildRow($entity);
+  }
+
+}

templates/heartbeat-content-add-list.html.twig

@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Default theme implementation to present a list of custom content entity types/bundles.
+ *
+ * Available variables:
+ * - types: A collection of all the available custom entity types/bundles.
+ *   Each type/bundle contains the following:
+ *   - link: A link to add a content entity of this type.
+ *   - description: A description of this content entity types/bundle.
+ *
+ * @see template_preprocess_heartbeat_content_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% spaceless %}
+  <dl>
+    {% for type in types %}
+      <dt>{{ type.link }}</dt>
+    {% endfor %}
+  </dl>
+{% endspaceless %}