From a00d849a724a9a26b401f5b692201c3ffeb9250b Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Fri, 4 Sep 2020 09:45:27 +0300
Subject: [PATCH] Updated response objects

---
 app/views/console/webhooks/index.phtml                    | 8 ++++----
 src/Appwrite/Utopia/Response/Model/Webhook.php            | 2 +-
 tests/e2e/Services/Projects/ProjectsConsoleClientTest.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml
index d2f8f42d03..1ac5dd5228 100644
--- a/app/views/console/webhooks/index.phtml
+++ b/app/views/console/webhooks/index.phtml
@@ -21,14 +21,14 @@ $events = array_keys($this->getParam('events', []));
     data-success="trigger"
     data-success-param-trigger-events="projects.listWebhooks">
 
-    <div data-ls-if="0 == {{console-webhooks.length}} || undefined == {{console-webhooks.length}}" class="box margin-top margin-bottom">
+    <div data-ls-if="0 == {{console-webhooks.sum}} || undefined == {{console-webhooks.sum}}" class="box margin-top margin-bottom">
         <h3 class="margin-bottom-small text-bold">No Webhooks Found</h3>
 
         <p class="margin-bottom-no">You haven't created any webhooks for your project yet.</p>
     </div>
 
-    <div class="box margin-bottom" data-ls-if="0 != {{console-webhooks.length}}">
-        <ul data-ls-loop="console-webhooks" data-ls-as="webhook" class="list">
+    <div class="box margin-bottom" data-ls-if="0 != {{console-webhooks.sum}}">
+        <ul data-ls-loop="console-webhooks.webhooks" data-ls-as="webhook" class="list">
             <li class="clear">
 
                 <div data-ui-modal class="modal close sticky-footer" data-button-text="Update" data-button-class="pull-end">
@@ -136,7 +136,7 @@ $events = array_keys($this->getParam('events', []));
                     <button class="danger reverse">Delete</button>
                 </form>
 
-                <span data-ls-bind="{{webhook.name}}"></span> &nbsp; (<span data-ls-bind="{{webhook.events.length}}"></span> events)
+                <span data-ls-bind="{{webhook.name}}"></span> &nbsp; (<span data-ls-bind="{{webhook.events.sum}}"></span> events)
                 <span data-ls-if="false === {{webhook.security}}">
                     &nbsp; <small class="text-danger">(SSL/TLS Disabled)</small>
                 </span>
diff --git a/src/Appwrite/Utopia/Response/Model/Webhook.php b/src/Appwrite/Utopia/Response/Model/Webhook.php
index dd2bd9adb6..e3fe565afb 100644
--- a/src/Appwrite/Utopia/Response/Model/Webhook.php
+++ b/src/Appwrite/Utopia/Response/Model/Webhook.php
@@ -27,7 +27,7 @@ class Webhook extends Model
             ])
             ->addRule('events', [
                 'type' => 'string',
-                'description' => 'Function trigger events.',
+                'description' => 'Webhook trigger events.',
                 'default' => [],
                 'example' => ['database.collections.update', 'database.collections.delete'],
                 'array' => true,
diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index 7e4e6c1e41..10b06fc43b 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -366,7 +366,7 @@ class ProjectsConsoleClientTest extends Scope
         ], $this->getHeaders()), []);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertCount(1, $response['body']);
+        $this->assertCount(1, $response['body']['sum']);
         
         /**
          * Test for FAILURE
@@ -589,7 +589,7 @@ class ProjectsConsoleClientTest extends Scope
         ], $this->getHeaders()), []);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertCount(1, $response['body']);
+        $this->assertCount(1, $response['body']['sum']);
         
         /**
          * Test for FAILURE
@@ -867,7 +867,7 @@ class ProjectsConsoleClientTest extends Scope
         ], $this->getHeaders()), []);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertCount(1, $response['body']);
+        $this->assertCount(1, $response['body']['sum']);
         
         /**
          * Test for FAILURE