feat: Back to conversations links (#75)

* feat: Back to conversations links * fix: Controller unit test
dvsa · Mar 5, 2024 · 9a81483 · 9a81483
1 parent 859fbe3
commit 9a81483
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/module/Olcs/src/Controller/ConversationsController.php b/module/Olcs/src/Controller/ConversationsController.php
@@ -103,6 +103,7 @@ public function addAction(): ViewModel
 
         $view = new ViewModel();
         $view->setVariable('form', $form);
+        $view->setVariable('backUrl', $this->url()->fromRoute('conversations'));
         $view->setTemplate('messages-new');
 
         return $view;
@@ -203,6 +204,7 @@ public function viewAction()
                 'openReply'      => false,
                 'canUploadFiles' => $canUploadFiles,
                 'subject'        => $subject,
+                'backUrl'        => $this->url()->fromRoute('conversations'),
             ],
         );
         $view->setTemplate('messages-view');

diff --git a/module/Olcs/view/messages-new.phtml b/module/Olcs/view/messages-new.phtml
@@ -20,6 +20,14 @@ echo $this->partial(
               ->setPartial('partials/tabs-nav');
     ?>
 
+    <div class="govuk-footer__heading">
+      <a href="<?php echo $this->backUrl; ?>" class="govuk-back-link">
+        <?php echo $this->translate('Back to conversations'); ?>
+      </a>
+    </div>
+
+    <h2><?php echo $this->translate('Start a new conversation'); ?></h2>
+
     <div>
       <?php
         echo $this->formErrors($this->form);

diff --git a/module/Olcs/view/messages-view.phtml b/module/Olcs/view/messages-view.phtml
@@ -20,6 +20,12 @@ echo $this->partial(
               ->setPartial('partials/tabs-nav');
     ?>
 
+    <div class="govuk-footer__heading">
+      <a href="<?php echo $this->backUrl; ?>" class="govuk-back-link">
+        <?php echo $this->translate('Back to conversations'); ?>
+      </a>
+    </div>
+
     <h3><?php echo $this->subject; ?></h3>
 
     <?php if ($this->canReply): ?>

diff --git a/test/Olcs/src/Controller/ConversationsControllerTest.php b/test/Olcs/src/Controller/ConversationsControllerTest.php
@@ -20,6 +20,7 @@
 use Laminas\Http\Response as HttpResponse;
 use Laminas\Mvc\Controller\Plugin\Params;
 use Dvsa\Olcs\Transfer\Command\Messaging\Message\Create as CreateMessageCommand;
+use Laminas\Mvc\Controller\Plugin\Url;
 use Laminas\Navigation\Navigation;
 use Laminas\View\Model\ViewModel;
 use Mockery as m;
@@ -136,14 +137,24 @@ public function testViewAction(): void
                      ],
                  );
 
+        $mockUrl = m::mock(Url::class);
+        $mockUrl->shouldReceive('fromRoute')
+                ->once()
+                ->with('conversations');
+
         $this->sut->shouldReceive('params')
                   ->andReturn($this->mockParams);
         $this->sut->shouldReceive('plugin')
                   ->with('handleQuery')
+                  ->once()
                   ->andReturn($mockHandleQuery);
         $this->sut->shouldReceive('plugin')
                   ->with('currentUser')
                   ->andReturn($mockUser);
+        $this->sut->shouldReceive('plugin')
+                  ->with('url')
+                  ->once()
+                  ->andReturn($mockUrl);
 
         $table = '<table/>';