From d96353ee4ff9db64d3a1dc78b8a28cd5ba8c0a36 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 19 Aug 2022 13:02:25 +0200
Subject: [PATCH] chg: [APIRearrange] component tied into rest response

---
 src/Controller/Component/RestResponseComponent.php | 5 ++++-
 src/Model/Behavior/MetaFieldsBehavior.php          | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Controller/Component/RestResponseComponent.php b/src/Controller/Component/RestResponseComponent.php
index 50fb40c..d384ba2 100644
--- a/src/Controller/Component/RestResponseComponent.php
+++ b/src/Controller/Component/RestResponseComponent.php
@@ -8,7 +8,7 @@ use Cake\Utility\Inflector;
 
 class RestResponseComponent extends Component
 {
-    public $components = ['ACL'];
+    public $components = ['ACL', 'APIRearrange'];
 
     public $headers = [];
 
@@ -558,6 +558,9 @@ class RestResponseComponent extends Component
         if (!empty($errors)) {
             $data['errors'] = $errors;
         }
+        if (!$raw) {
+            $data = $this->APIRearrange->rearrange($data);
+        }
         return $this->__sendResponse($data, 200, $format, $raw, $download, $headers);
     }
 
diff --git a/src/Model/Behavior/MetaFieldsBehavior.php b/src/Model/Behavior/MetaFieldsBehavior.php
index 6f3a46e..173439d 100644
--- a/src/Model/Behavior/MetaFieldsBehavior.php
+++ b/src/Model/Behavior/MetaFieldsBehavior.php
@@ -111,7 +111,6 @@ class MetaFieldsBehavior extends Behavior
         $property = $this->getConfig('metaFieldsAssoc.propertyName');
         $options['accessibleFields'][$property] = true;
         $options['associated']['MetaFields']['accessibleFields']['id'] = true;
-
         if (isset($data[$property])) {
             if (!empty($data[$property])) {
                 $data[$property] = $this->normalizeMetafields($data[$property]);