Merge branch 'develop' into main

libraries/default/OutboxProcessors/BroodsOutboxProcessor.php

@@ -110,6 +110,14 @@ class ResendFailedMessageProcessor extends BroodsOutboxProcessor implements Gene
             $dataSent = $outboxRequest->data['sent'];
             $response = $this->Broods->sendRequest($brood, $url, true, $dataSent);
             $jsonReply = $response->getJson();
+            if (is_null($jsonReply)) {
+                $jsonReply = [
+                    'success' => false,
+                    'errors' => [
+                        __('Brood returned an invalid JSON.')
+                    ]
+                ];
+            }
             $success = !empty($jsonReply['success']);
             $messageSuccess = __('Message successfully sent to `{0}`', $brood->name);
             $messageFail = __('Could not send message to `{0}`.', $brood->name);
@@ -126,7 +134,7 @@ class ResendFailedMessageProcessor extends BroodsOutboxProcessor implements Gene
             [],
             $success,
             $success ? $messageSuccess : $messageFail,
-            []
+            $jsonReply['errors'] ?? []
         );
     }
 

src/Controller/Component/CRUDComponent.php

@@ -88,7 +88,7 @@ class CRUDComponent extends Component
             $this->Controller->restResponsePayload = $this->RestResponse->viewData($data, 'json');
         } else {
             $this->Controller->loadComponent('Paginator');
-            $data = $this->Controller->Paginator->paginate($query);
+            $data = $this->Controller->Paginator->paginate($query, $this->Controller->paginate ?? []);
             if (isset($options['afterFind'])) {
                 $function = $options['afterFind'];
                 if (is_callable($options['afterFind'])) {

src/Controller/InboxController.php

@@ -20,6 +20,12 @@ class InboxController extends AppController
     public $quickFilterFields = ['scope', 'action', ['title' => true], ['comment' => true]];
     public $containFields = ['Users'];
 
+    public $paginate = [
+        'order' => [
+            'Inbox.created' => 'desc'
+        ]
+    ];
+
     public function beforeFilter(EventInterface $event)
     {
         parent::beforeFilter($event);

src/Controller/LocalToolsController.php

@@ -304,7 +304,17 @@ class LocalToolsController extends AppController
                 throw new MethodNotAllowedException(__('No local tool ID supplied.'));
             }
             $params['local_tool_id'] = $postParams['local_tool_id'];
+            try {
                 $encodingResult = $this->LocalTools->encodeConnection($params);
+            } catch (\Exception $e) {
+                $encodingResult = [
+                    'inboxResult' => [
+                        'success' => false,
+                        'message' => __('Error while trying to encode connection'),
+                        'errors' => [$e->getMessage()],
+                    ],
+                ];
+            }
             $inboxResult = $encodingResult['inboxResult'];
             if ($inboxResult['success']) {
                 if ($this->ParamHandler->isRest()) {

src/Model/Table/BroodsTable.php

@@ -9,6 +9,7 @@ use Cake\Core\Configure;
 use Cake\Http\Client;
 use Cake\Http\Client\Response;
 use Cake\Http\Exception\NotFoundException;
+use Cake\Http\Client\Exception\NetworkException;
 use Cake\ORM\TableRegistry;
 use Cake\Error\Debugger;
 
@@ -69,7 +70,14 @@ class BroodsTable extends AppTable
     {
         $brood = $this->find()->where(['id' => $id])->first();
         $start = microtime(true);
+        try {
             $response = $this->HTTPClientGET('/instance/status.json', $brood);
+        } catch (NetworkException $e) {
+            return [
+                'error' => __('Could not query status'),
+                'reason' => $e->getMessage(),
+            ];
+        }
         $ping = ((int)(100 * (microtime(true) - $start)));
         $errors = [
             403 => [

src/Model/Table/InboxTable.php

@@ -62,8 +62,11 @@ class InboxTable extends AppTable
         $this->Broods = \Cake\ORM\TableRegistry::getTableLocator()->get('Broods');
         $this->Individuals = \Cake\ORM\TableRegistry::getTableLocator()->get('Individuals');
         $errors = [];
+        $originUrl = trim($entryData['origin'], '/');
         $brood = $this->Broods->find()
-            ->where(['url' => $entryData['origin']])
+            ->where([
+                'url IN' => [$originUrl, "{$originUrl}/"]
+            ])
             ->first();
         if (empty($brood)) {
             $errors[] = __('Unkown brood `{0}`', $entryData['data']['cerebrateURL']);

templates/AuditLogs/index.php

@@ -52,7 +52,8 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'name' => __('Changed'),
                 'sort' => 'changed',
                 'data_path' => 'changed',
-                'element' => 'json'
+                'element' => 'json',
+                'class' => 'text-break'
             ],
         ],
         'title' => __('Logs'),

templates/Common/index.php

@@ -1,4 +1,3 @@
 <?php
     echo $this->element('genericElements/IndexTable/index_table', $data);
-    echo '</div>';
 ?>

templates/LocalTools/connection_request.php

@@ -29,4 +29,3 @@
         ]
     ]);
 ?>
-</div>

templates/element/genericElements/Form/Fields/tagsField.php

@@ -1,6 +1,6 @@
 <?php
     $tagsHtml = $this->Tag->tags($entity['tags'], [
-        'allTags' => [],
+        'allTags' => $allTags ?? [],
         'picker' => true,
         'editable' => true,
     ]);

webroot/js/main.js

@@ -55,8 +55,10 @@ function attachTestConnectionResultHtml(result, $container) {
         $testResultDiv.append(getKVHtml('Internal error', result, ['text-danger fw-bold']))
     } else {
         if (result['error']) {
+            if (result['ping']) {
+                $testResultDiv.append('Status', 'OK', ['text-danger'], `${result['ping']} ms`);
+            }
             $testResultDiv.append(
-                getKVHtml('Status', 'OK', ['text-danger'], `${result['ping']} ms`),
                 getKVHtml('Status', `Error: ${result['error']}`, ['text-danger']),
                 getKVHtml('Reason', result['reason'], ['text-danger'])
             )