show an error message on the method usage page if no results found

Author: shagtv

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 There are next changes:
 
+## 1.2.18
+
+There are next changes:
+
+- show an error message on the method usage page if no results found
+
 ## 1.2.17
 
 There are next changes:

src/Badoo/LiveProfilerUI/Pages/MethodUsagePage.php

@@ -62,32 +62,34 @@ public function getTemplateData() : array
             $error = 'Enter method name';
         }
 
-        $methods = [];
+        $method = [];
         if (!$error) {
             $this->data['method'] = ltrim($this->data['method'], '\\');
             $methods = $this->Method->findByName($this->data['method'], true);
 
             if (empty($methods)) {
                 $error = 'Method "' . $this->data['method'] . '" not found';
+            } else {
+                $method = current($methods);
             }
         }
 
         $fields = $this->FieldList->getFields();
         $field_descriptions = $this->FieldList->getFieldDescriptions();
 
         $results = [];
-        if (!empty($methods)) {
+        if (!empty($method)) {
             $start_snapshot_id = 0;
             if ($this->use_method_usage_optimisation) {
                 $last_two_days = \Badoo\LiveProfilerUI\DateGenerator::getDatesArray(date('Y-m-d'), 2, 2);
-                $start_snapshot_id = in_array(current($methods)['date'], $last_two_days, true)
+                $start_snapshot_id = in_array($method['date'], $last_two_days, true)
                     ? $this->Snapshot->getMinSnapshotIdByDates($last_two_days)
                     : 0;
             }
 
             $method_data = $this->MethodData->getDataByMethodIdsAndSnapshotIds(
                 [],
-                array_keys($methods),
+                [$method['id']],
                 200,
                 $start_snapshot_id
             );
@@ -113,10 +115,13 @@ public function getTemplateData() : array
                 $result['fields']['calls_count'] = $snapshots[$Row->getSnapshotId()]['calls_count'];
                 $results[] = $result;
             }
+
+            if (empty($results)) {
+                $error = 'There is no result for ' . $this->data['method'] . '. Last time it was called on ' . $method['date'] . '.';
+            }
         }
 
         return [
-            'methods' => $methods,
             'method' => $this->data['method'],
             'results' => $results,
             'field_descriptions' => $field_descriptions,

tests/unit/Badoo/LiveProfilerUI/Pages/MethodUsagePageTest.php

@@ -24,7 +24,6 @@ public function providerGetTemplateData()
                 'found_methods' => [],
                 'methods_data' => [],
                 'expected' => [
-                    'methods' => [],
                     'method' => 'test',
                     'results' => [],
                     'field_descriptions' => [],
@@ -33,22 +32,20 @@ public function providerGetTemplateData()
             ],
             'exists_method_no_snapshots' => [
                 'method_name' => 'test',
-                'found_methods' => [1 => ['name' => 'test']],
+                'found_methods' => [1 => ['id' => 1, 'name' => 'test', 'date' => '2019-01-01']],
                 'methods_data' => [],
                 'expected' => [
-                    'methods' => [1 => ['name' => 'test']],
                     'method' => 'test',
                     'results' => [],
                     'field_descriptions' => [],
-                    'error' => ''
+                    'error' => 'There is no result for test. Last time it was called on 2019-01-01.'
                 ]
             ],
             'exists_method' => [
                 'method_name' => 'test',
-                'found_methods' => [1 => ['name' => 'test']],
+                'found_methods' => [1 => ['id' => 1, 'name' => 'test', 'date' => '2019-01-01']],
                 'methods_data' => [$MethodDataMock],
                 'expected' => [
-                    'methods' => [1 => ['name' => 'test']],
                     'method' => 'test',
                     'results' => [
                         [