From b5f718647e33ad1d4a49aea5adbec57ef26cbb37 Mon Sep 17 00:00:00 2001
From: Naomi <naomirosenberguk@gmail.com>
Date: Mon, 17 Sep 2018 18:49:20 +0100
Subject: [PATCH] Using views for CRUDding saved reports.

---
 .../opencase_reporting.links.action.yml       |  8 +++---
 .../src/Entity/OpenCaseReport.php             | 27 ++-----------------
 .../src/Form/OpenCaseReportForm.php           |  2 +-
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/modules/opencase_reporting/opencase_reporting.links.action.yml b/modules/opencase_reporting/opencase_reporting.links.action.yml
index 65d20f0..19540de 100644
--- a/modules/opencase_reporting/opencase_reporting.links.action.yml
+++ b/modules/opencase_reporting/opencase_reporting.links.action.yml
@@ -1,5 +1,5 @@
-entity.opencase_report.add_form:
-  route_name: entity.opencase_report.add_form
-  title: 'Add OpenCase Report'
+entity.opencase_report.create_new:
+  route_name: view.reporting_actors.page_1 
+  title: 'Create a new report'
   appears_on:
-    - entity.opencase_report.collection
+    - view.opencase_saved_reports.page_1
diff --git a/modules/opencase_reporting/src/Entity/OpenCaseReport.php b/modules/opencase_reporting/src/Entity/OpenCaseReport.php
index 4ee158b..ac48666 100644
--- a/modules/opencase_reporting/src/Entity/OpenCaseReport.php
+++ b/modules/opencase_reporting/src/Entity/OpenCaseReport.php
@@ -157,24 +157,7 @@ class OpenCaseReport extends ContentEntityBase implements OpenCaseReportInterfac
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
       ->setSetting('handler', 'default')
-      ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', [
-        'label' => 'hidden',
-        'type' => 'author',
-        'weight' => 0,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'entity_reference_autocomplete',
-        'weight' => 5,
-        'settings' => [
-          'match_operator' => 'CONTAINS',
-          'size' => '60',
-          'autocomplete_type' => 'tags',
-          'placeholder' => '',
-        ],
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE);
+      ->setTranslatable(TRUE);
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
@@ -193,18 +176,12 @@ class OpenCaseReport extends ContentEntityBase implements OpenCaseReportInterfac
         'type' => 'string_textfield',
         'weight' => -4,
       ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE)
       ->setRequired(TRUE);
 
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))
       ->setDescription(t('A boolean indicating whether the OpenCase Report is published.'))
-      ->setDefaultValue(TRUE)
-      ->setDisplayOptions('form', [
-        'type' => 'boolean_checkbox',
-        'weight' => -3,
-      ]);
+      ->setDefaultValue(TRUE);
 
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Created'))
diff --git a/modules/opencase_reporting/src/Form/OpenCaseReportForm.php b/modules/opencase_reporting/src/Form/OpenCaseReportForm.php
index 446cb78..0b9569a 100644
--- a/modules/opencase_reporting/src/Form/OpenCaseReportForm.php
+++ b/modules/opencase_reporting/src/Form/OpenCaseReportForm.php
@@ -44,7 +44,7 @@ class OpenCaseReportForm extends ContentEntityForm {
           '%label' => $entity->label(),
         ]));
     }
-    $form_state->setRedirect('entity.opencase_report.canonical', ['opencase_report' => $entity->id()]);
+    $form_state->setRedirect('view.opencase_saved_reports.page_1');
   }
 
 }