From 95f14fd66a01b591ed4fc9b8cb98dd48910c930a Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <gproly@gmail.com>
Date: Tue, 10 Aug 2021 22:48:28 -0400
Subject: [PATCH] PMCORE-3206 Improve the endpoint
 api/1.0/workflow/caseList/report-tables

---
 .../src/ProcessMaker/Model/CaseList.php       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Model/CaseList.php b/workflow/engine/src/ProcessMaker/Model/CaseList.php
index b5c572564..690307326 100644
--- a/workflow/engine/src/ProcessMaker/Model/CaseList.php
+++ b/workflow/engine/src/ProcessMaker/Model/CaseList.php
@@ -426,12 +426,20 @@ class CaseList extends Model
         $result = [];
         foreach ($default as &$column) {
             foreach ($storedColumns as $storedColumn) {
-                if (!is_array($storedColumn) || !isset($storedColumn['field'])) {
+                if (!is_object($storedColumn)) {
                     continue;
                 }
-                if ($storedColumn['field'] === $column['field']) {
-                    $column['enableFilter'] = $storedColumn['enableFilter'];
-                    $column['set'] = $storedColumn['set'];
+                $storedColumn = (array) $storedColumn;
+                if (!isset($storedColumn['field'])) {
+                    continue;
+                }
+                if ($column['field'] === $storedColumn['field']) {
+                    if (isset($storedColumn['enableFilter'])) {
+                        $column['enableFilter'] = $storedColumn['enableFilter'];
+                    }
+                    if (isset($storedColumn['set'])) {
+                        $column['set'] = $storedColumn['set'];
+                    }
                     break;
                 }
             }
@@ -472,11 +480,13 @@ class CaseList extends Model
                     ];
                 }
             }
-            return [
-            'name' => $result['rep_tab_name'],
-            'description' => $result['rep_tab_description'],
-            'fields' => $fields
+            $format = [
+                'uid' => $result['rep_uid'],
+                'name' => $result['rep_tab_name'],
+                'description' => $result['rep_tab_description'],
+                'fields' => $fields
             ];
+            return $format;
         });
         $result = $additionalTables->toArray();