From 656387518b6422843f6befa21a96d97160234508 Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Thu, 8 Aug 2019 08:09:49 +0300
Subject: [PATCH] Updates for service comp

---
 app/controllers/shared/web.php           |   6 +-
 app/views/console/account/index.phtml    | 100 ++++++++++++++++++++---
 app/views/console/home/index.phtml       |   7 +-
 app/views/console/keys/index.phtml       |  12 +--
 app/views/console/settings/index.phtml   |  40 ++++-----
 app/views/console/tasks/index.phtml      |  40 ++++++++-
 app/views/console/users/index.phtml      |  20 ++---
 app/views/console/users/view.phtml       |  16 ++--
 app/views/console/webhooks/index.phtml   |  12 +--
 app/views/home/auth/confirm.phtml        |   7 +-
 app/views/home/auth/join.phtml           |   6 +-
 app/views/home/auth/recovery.phtml       |   4 +-
 app/views/home/auth/recovery/reset.phtml |   4 +-
 app/views/home/auth/signin.phtml         |   4 +-
 app/views/home/auth/signup.phtml         |   4 +-
 app/views/layouts/default.phtml          |   2 +-
 public/dist/scripts/app-all.js           |   2 +-
 public/dist/scripts/app.js               |   2 +-
 public/scripts/init.js                   |   2 +-
 19 files changed, 202 insertions(+), 88 deletions(-)

diff --git a/app/controllers/shared/web.php b/app/controllers/shared/web.php
index e8d18be45..e3e803e10 100644
--- a/app/controllers/shared/web.php
+++ b/app/controllers/shared/web.php
@@ -6,9 +6,9 @@ use Utopia\Locale\Locale;
 Locale::$exceptions = false;
 
 $roles = [
-    'owner' => Locale::getText('general.roles.owner'),
-    'developer' => Locale::getText('general.roles.developer'),
-    'admin' => Locale::getText('general.roles.admin'),
+    ['type' => 'owner', 'label' => Locale::getText('general.roles.owner')],
+    ['type' => 'developer', 'label' => Locale::getText('general.roles.developer')],
+    ['type' => 'admin', 'label' => Locale::getText('general.roles.admin')],
 ];
 
 $layout = new View(__DIR__ . '/../../views/layouts/default.phtml');
diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml
index 1792674d7..c589c0d22 100644
--- a/app/views/console/account/index.phtml
+++ b/app/views/console/account/index.phtml
@@ -11,14 +11,28 @@ use Utopia\Locale\Locale;
 <div class="zone xl">
     <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
         <li data-state="/console/account">
-            <div class="" data-service="account.get" data-scope="console" data-name="account" data-event="load" data-success="render" data-error="trigger" data-error-triggers="logout">
+            <div
+                data-service="account.get"
+                data-scope="console"
+                data-name="account"
+                data-event="load"
+                data-failure="trigger"
+                data-failure-param-trigger-events="logout">
 
                 <h2><span class="number"><i class="icon-user"></i></span><?php echo Locale::getText('console.account.section.overview.title'); ?></h2>
                 <div class="row responsive">
                     <div class="col span-9">
                         <div class="box margin-bottom-xl">
                             <div>
-                                <form name="account.update" onsubmit="return false;" data-service="account.updateName" data-scope="console" data-event="submit" data-success="trigger,alert" data-success-alert="Your name was updated successfully" data-success-triggers="account.update,modal-close" data-error="alert" data-error-alert="Failed to update your name">
+                                <form name="account.update"
+                                    data-service="account.updateName"
+                                    data-scope="console"
+                                    data-event="submit"
+                                    data-success="trigger,alert"
+                                    data-success-param-alert-text="Your name was updated successfully"
+                                    data-success-param-trigger-events="account.update,modal-close"
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="Failed to update your name">
 
                                     <label for="name"><?php echo Locale::getText('console.account.section.overview.labels.name'); ?></label>
 
@@ -38,7 +52,15 @@ use Utopia\Locale\Locale;
 
                             <hr />
 
-                            <form name="update-email" data-service="account.updateEmail" data-scope="console" data-event="submit" data-success="trigger,alert" data-success-alert="Email address updated successfully" data-success-triggers="account.update,modal-close" data-error="alert" data-error-alert="Failed updating email address">
+                            <form name="update-email"
+                                data-service="account.updateEmail"
+                                data-scope="console"
+                                data-event="submit"
+                                data-success="trigger,alert"
+                                data-success-param-alert-text="Email address updated successfully"
+                                data-success-param-trigger-events="account-update,modal-close" 
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed updating email address">
 
                                 <label><?php echo Locale::getText('console.account.section.overview.labels.email'); ?></label>
                                 <div class="row">
@@ -63,7 +85,15 @@ use Utopia\Locale\Locale;
                             <div data-ui-modal class="modal close width-small" data-button-text="<?php echo $this->escape(Locale::getText('console.account.section.overview.actions.update-password')); ?>" data-button-class="reverse">
                                 <h1><?php echo Locale::getText('console.account.section.overview.actions.update-password'); ?></h1>
 
-                                <form name="update-password" data-service="account.updatePassword" data-scope="console" data-event="submit" data-success="trigger,alert" data-success-triggers="account.update,modal-close" data-success-alert="Password updated successfully" data-error="alert" data-error-alert="Failed updating password">
+                                <form name="update-password"
+                                    data-service="account.updatePassword"
+                                    data-scope="console"
+                                    data-event="submit"
+                                    data-success="trigger,alert"
+                                    data-success-param-trigger-events="account-update,modal-close"
+                                    data-success-param-alert-text="Password updated successfully"
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="Failed updating password">
 
                                     <label><?php echo Locale::getText('console.account.section.overview.labels.password1'); ?></label>
                                     <input name="oldPassword" type="password" class="full-width" autocomplete="off" placeholder="" required>
@@ -79,7 +109,14 @@ use Utopia\Locale\Locale;
 
                             <hr />
 
-                            <form class="margin-top" data-service="auth.logout" data-scope="console" data-event="submit" data-success="trigger" data-success-triggers="logout" data-error="alert" data-error-alert="Logout failed">
+                            <form class="margin-top"
+                                data-service="auth.logout"
+                                data-scope="console"
+                                data-event="submit"
+                                data-success="trigger"
+                                data-success-param-trigger-events="logout"
+                                data-failure="alert"
+                                data-failure-param-alert-text="Logout failed">
                                 <button class="fill danger icon fill"><i class="icon-login"></i> <?php echo Locale::getText('console.account.section.overview.actions.logout'); ?></button>
                             </form>
                         </div>
@@ -111,7 +148,15 @@ use Utopia\Locale\Locale;
 
                             <p><?php echo Locale::getText('console.account.section.overview.danger.note'); ?></p>
 
-                            <form class="inline" data-service="account.deactivate" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete your account?" data-success="trigger" data-success-triggers="deactivated" data-error="alert" data-error-alert="Account deactivation failed">
+                            <form class="inline"
+                                data-service="account.deactivate"
+                                data-scope="console"
+                                data-event="submit"
+                                data-confirm="Are you sure you want to delete your account?"
+                                data-success="trigger"
+                                data-success-param-trigger-events="deactivated"
+                                data-failure="alert"
+                                data-failure-param-alert-text="Account deactivation failed">
                                 <button class="danger reverse"><?php echo Locale::getText('console.account.section.overview.danger.action'); ?></button>
                             </form>
                         </div>
@@ -125,13 +170,25 @@ use Utopia\Locale\Locale;
 
             <h3><?php echo Locale::getText('console.account.section.security.devices.title'); ?></h3>
 
-            <div class="box margin-bottom" data-service="account.getSessions" data-scope="console" data-name="sessions" data-event="load">
+            <div class="box margin-bottom"
+                data-service="account.getSessions"
+                data-scope="console"
+                data-name="sessions"
+                data-event="load">
 
                 <ul data-ls-loop="sessions" data-ls-as="session" class="list">
                     <li class="clear">
                         <span data-ls-if="true != {{session.current}}" style="display: none;">
                             <!-- From remote session (-logout event) -->
-                            <form class="pull-end" data-service="auth.logoutBySession" data-scope="console" data-event="submit" data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>" data-success="trigger" data-success-triggers="account.update" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
+                            <form class="pull-end"
+                                data-service="auth.logoutBySession"
+                                data-scope="console"
+                                data-event="submit"
+                                data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>"
+                                data-success="trigger"
+                                data-success-param-trigger-events="account.update"
+                                data-failure="alert"
+                                data-failure-param-alert-text="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
                                 <input type="hidden" name="id" data-ls-bind="{{session.id}}">
                                 <button class="danger"><?php echo Locale::getText('console.account.section.security.devices.logout'); ?></button>
                             </form>
@@ -139,7 +196,16 @@ use Utopia\Locale\Locale;
 
                         <span data-ls-if="true == {{session.current}}" style="display: none;">
                             <!-- From current session (+logout event) -->
-                            <form class="pull-end" data-service="auth.logoutBySession" data-scope="console" data-event="submit" data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>" data-success="trigger,redirect" data-success-triggers="logout" data-success-redirect-url="/" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
+                            <form class="pull-end"
+                                data-service="auth.logoutBySession"
+                                data-scope="console"
+                                data-event="submit"
+                                data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>"
+                                data-success="trigger,redirect"
+                                data-success-param-trigger-events="logout"
+                                data-success-param-redirect-url="/"
+                                data-failure="alert"
+                                data-failure-param-alert-text="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
                                 <input type="hidden" name="id" data-ls-bind="{{session.id}}">
                                 <button class="danger"><?php echo Locale::getText('console.account.section.security.devices.logout'); ?></button>
                             </form>
@@ -161,12 +227,24 @@ use Utopia\Locale\Locale;
                 </ul>
             </div>
 
-            <form class="inline margin-bottom-large" data-service="auth.logoutBySession" data-scope="console" data-event="submit" data-success="trigger,redirect" data-success-triggers="account.update" data-success-redirect-url="/" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout-all')); ?>">
+            <form class="inline margin-bottom-large"
+                data-service="auth.logoutBySession"
+                data-scope="console"
+                data-event="submit"
+                data-success="trigger,redirect"
+                data-success-param-trigger-events="account-update"
+                data-success-redirect-url="/"
+                data-failure="alert"
+                data-failure-param-alert-text="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout-all')); ?>">
                 <input type="hidden" name="id" value="0">
                 <button class="danger"><?php echo Locale::getText('console.account.section.security.devices.logout-all'); ?></button>
             </form>
 
-            <div class="account" data-service="account.getSecurity" data-scope="console" data-name="securityLogs" data-event="load">
+            <div class="account"
+                data-service="account.getSecurity"
+                data-scope="console"
+                data-name="securityLogs"
+                data-event="load">
                 <span data-ls-bind="{{securityLogs}}"></span>
 
                 <h3><?php echo Locale::getText('console.account.section.security.recent-activity.title'); ?></h3>
diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index cacd9a5d4..7b6fd1f69 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -151,14 +151,15 @@ $graph = $this->getParam('graph', false);
 
     <h1>New Website</h1>
 
-    <form data-service="projects.createPlatform"
+    <form
+        data-service="projects.createPlatform"
         data-scope="console"
         data-event="submit"
         data-success="alert,trigger,reset"
         data-success-param-alert-text="Created new platform successfully"
         data-success-param-trigger-events="platform-create,modal-close"
-        data-error="alert"
-        data-error-param-alert-text="Failed to create platform">
+        data-failure="alert"
+        data-failure-param-alert-text="Failed to create platform">
 
         <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
         <input type="hidden" name="type" data-ls-bind="web">
diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml
index 6891fe71b..768602390 100644
--- a/app/views/console/keys/index.phtml
+++ b/app/views/console/keys/index.phtml
@@ -61,8 +61,8 @@ $scopes = [ // TODO sync with project list
                         data-success="alert,trigger"
                         data-success-param-alert-text="Updated API key successfully"
                         data-success-triggers="key-update,modal-close"
-                        data-error="alert"
-                        data-error-param-alert-text="Failed to update API key">
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to update API key">
 
                         <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                         <input type="hidden" name="keyId" data-ls-bind="{{key.$uid}}">
@@ -98,8 +98,8 @@ $scopes = [ // TODO sync with project list
                     data-success="alert,trigger"
                     data-success-param-alert-text="Deleted API key successfully"
                     data-success-param-trigger-events="key-delete"
-                    data-error="alert"
-                    data-error-param-alert-text="Failed to delete API key">
+                    data-failure="alert"
+                    data-failure-param-alert-text="Failed to delete API key">
 
                     <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                     <input type="hidden" name="keyId" data-ls-bind="{{key.$uid}}">
@@ -140,8 +140,8 @@ $scopes = [ // TODO sync with project list
                 data-success="alert,trigger,reset"
                 data-success-param-alert-text="Created API key successfully"
                 data-success-param-trigger-events="key-create,modal-close"
-                data-error="alert"
-                data-error-param-alert-text="Failed to create API key">
+                data-failure="alert"
+                data-failure-param-alert-text="Failed to create API key">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
 
diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index d96f3466e..e053efb2c 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -32,8 +32,8 @@ use Utopia\Locale\Locale;
                     data-success="alert,trigger"
                     data-success-param-alert-text="Saved project successfully"
                     data-success-param-trigger-events="project-update"
-                    data-error="alert"
-                    data-error-param-alert-text="Failed to update project">
+                    data-failure="alert"
+                    data-failure-param-alert-text="Failed to update project">
 
                     <input name="$uid" type="hidden" data-ls-bind="{{console-project.$uid}}" />
 
@@ -111,8 +111,8 @@ use Utopia\Locale\Locale;
                     data-success="alert,trigger"
                     data-success-param-alert-text="Saved project successfully"
                     data-success-param-trigger-events="project-update"
-                    data-error="alert"
-                    data-error-param-alert-text="Failed to update project">
+                    data-failure="alert"
+                    data-failure-param-alert-text="Failed to update project">
                     <h2>Privacy & Legal</h2>
 
                     <div class="box margin-bottom">
@@ -154,7 +154,7 @@ use Utopia\Locale\Locale;
                 <div class="zone xl"
                     data-service="teams.getTeamMembers"
                     data-scope="console"
-                    data-event="load,auth-invite,auth-leave"
+                    data-event="load,membership-create,membership-update,membership-delete"
                     data-name="members"
                     data-param-team-id="{{console-project.teamId}}"
                     data-success="trigger"
@@ -169,9 +169,9 @@ use Utopia\Locale\Locale;
                                     data-event="submit"
                                     data-success="alert,trigger"
                                     data-success-param-alert-text="<?php echo Locale::getText('console.settings.section.members.leave.success'); ?>"
-                                    data-success-param-trigger-events="auth-leave,project-update"
-                                    data-error="alert"
-                                    data-error-param-alert-text="<?php echo Locale::getText('console.settings.section.members.leave.failure'); ?>">
+                                    data-success-param-trigger-events="membership-delete"
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="<?php echo Locale::getText('console.settings.section.members.leave.failure'); ?>">
 
                                     <input name="teamId" id="teamId" type="hidden" data-ls-bind="{{console-project.teamId}}">
                                     <input name="inviteId" id="inviteId" type="hidden" data-ls-bind="{{member.inviteId}}">
@@ -181,14 +181,14 @@ use Utopia\Locale\Locale;
 
                                 <div data-ls-if="false === {{member.confirm}}" class="pull-end margin-end" style="display: none;">
                                     <form
-                                        data-service="auth.inviteResend"
+                                        data-service="teams.createTeamMembershipResend"
                                         data-scope="console"
                                         data-event="submit"
                                         data-success="alert,trigger"
                                         data-success-param-alert-text="<?php echo Locale::getText('console.settings.section.members.invite.success'); ?>"
-                                        data-success-param-trigger-events="auth-invite"
-                                        data-error="alert"
-                                        data-error-param-alert-text="<?php echo Locale::getText('console.settings.section.members.invite.failure'); ?>">
+                                        data-success-param-trigger-events="membership-resend"
+                                        data-failure="alert"
+                                        data-failure-param-alert-text="<?php echo Locale::getText('console.settings.section.members.invite.failure'); ?>">
 
                                         <input name="inviteId" id="inviteId" type="hidden" data-ls-bind="{{member.inviteId}}">
                                         <input name="redirect" type="hidden" data-ls-bind="https://{{env.DOMAIN}}/auth/join?project={{router.params.project}}" />
@@ -212,17 +212,17 @@ use Utopia\Locale\Locale;
 
                         <h1><?php echo Locale::getText('console.settings.section.members.labels.invite'); ?></h1>
 
-                        <form name="auth.invite"
-                            data-service="auth.invite"
+                        <form name="teams.createTeamMembership"
+                            data-service="teams.createTeamMembership"
                             data-scope="console"
                             data-event="submit"
                             data-success="alert,trigger,reset"
                             data-success-param-alert-text="<?php echo Locale::getText('console.settings.section.members.invite.success'); ?>"
-                            data-success-param-trigger-events="auth-invite,modal-close"
-                            data-error="alert"
-                            data-error-param-alert-text="<?php echo Locale::getText('console.settings.section.members.invite.failure'); ?>">
+                            data-success-param-trigger-events="membership-create,modal-close"
+                            data-failure="alert"
+                            data-failure-param-alert-text="<?php echo Locale::getText('console.settings.section.members.invite.failure'); ?>">
 
-                            <input name="team" id="team" type="hidden" data-ls-bind="{{console-project.teamId}}">
+                            <input name="teamId" id="teamId" type="hidden" data-ls-bind="{{console-project.teamId}}">
                             <input name="redirect" type="hidden" data-ls-bind="https://{{env.DOMAIN}}/auth/join?project={{router.params.project}}" />
 
                             <label for="name"><?php echo Locale::getText('console.settings.section.members.labels.name'); ?> <small>(<?php echo Locale::getText('general.optional'); ?>)</small></label>
@@ -232,7 +232,9 @@ use Utopia\Locale\Locale;
                             <input name="email" id="email" type="email" autocomplete="email" required>
 
                             <label for="roles"><?php echo Locale::getText('console.settings.section.members.labels.role'); ?></label>
-                            <select id="roles" name="roles" required data-ls-options="{{env.ROLES}}" data-cast-to="array"></select>
+                            <select id="roles" name="roles" required data-ls-loop="env.ROLES" data-ls-as="role" data-cast-to="array">
+                                <option data-ls-attrs="value={{role.type}}" data-ls-bind="{{role.label}}"></option>
+                            </select>
 
                             <div class="clear">
                                 <button><?php echo Locale::getText('console.settings.section.members.labels.send'); ?></button>
diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml
index 789b39be7..cc893dae0 100644
--- a/app/views/console/tasks/index.phtml
+++ b/app/views/console/tasks/index.phtml
@@ -8,7 +8,14 @@ use Utopia\Locale\Locale;
         <?php echo Locale::getText('console.tasks.title'); ?>
     </h1>
 </div>
-<div class="zone xl" data-service="projects.listTasks" data-scope="console" data-event="load,task-create,task-update,task-delete" data-name="console-tasks" data-param-project-id="{{router.params.project}}" data-success="trigger" data-success-param-trigger-events="project-load">
+<div class="zone xl"
+    data-service="projects.listTasks"
+    data-scope="console"
+    data-event="load,task-create,task-update,task-delete"
+    data-name="console-tasks"
+    data-param-project-id="{{router.params.project}}"
+    data-success="trigger"
+    data-success-param-trigger-events="project-load">
 
     <div data-ls-if="0 === {{console-tasks.length}} || undefined === {{console-tasks.length}}" class="box margin-top margin-bottom" style="display: none;">
         <h3 class="margin-bottom-small">No Tasks Found</h3>
@@ -72,7 +79,15 @@ use Utopia\Locale\Locale;
 
                             <h1>Update Task</h1>
 
-                            <form data-service="projects.updateTask" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Updated task successfully" data-success-param-trigger-events="task-update,modal-close" data-error="alert" data-error-param-alert-text="Failed to update task">
+                            <form
+                                data-service="projects.updateTask"
+                                data-scope="console"
+                                data-event="submit"
+                                data-success="alert,trigger"
+                                data-success-param-alert-text="Updated task successfully"
+                                data-success-param-trigger-events="task-update,modal-close"
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed to update task">
 
                                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                                 <input type="hidden" name="taskId" data-ls-bind="{{task.$uid}}">
@@ -168,7 +183,16 @@ use Utopia\Locale\Locale;
                                 </div>
                             </form>
 
-                            <form class="margin-top" data-service="projects.deleteTask" data-scope="console" data-event="submit" data-confirm="Are you sure you want to delete this task?" data-success="alert,trigger" data-success-param-alert-text="Deleted task successfully" data-success-param-trigger-events="task-delete,modal-close" data-error="alert" data-error-param-alert-text="Failed to delete task">
+                            <form class="margin-top"
+                                data-service="projects.deleteTask"
+                                data-scope="console"
+                                data-event="submit"
+                                data-confirm="Are you sure you want to delete this task?"
+                                data-success="alert,trigger"
+                                data-success-param-alert-text="Deleted task successfully"
+                                data-success-param-trigger-events="task-delete,modal-close"
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed to delete task">
 
                                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                                 <input type="hidden" name="taskId" data-ls-bind="{{task.$uid}}">
@@ -188,7 +212,15 @@ use Utopia\Locale\Locale;
 
             <h1>Add Task</h1>
 
-            <form data-service="projects.createTask" data-scope="console" data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Created task successfully" data-success-param-trigger-events="task-create,modal-close" data-error="alert" data-error-param-alert-text="Failed to create task">
+            <form
+                data-service="projects.createTask"
+                data-scope="console"
+                data-event="submit"
+                data-success="alert,trigger,reset"
+                data-success-param-alert-text="Created task successfully"
+                data-success-param-trigger-events="task-create,modal-close"
+                data-failure="alert"
+                data-failure-param-alert-text="Failed to create task">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
 
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index ba92aae49..5fabf9fbc 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -28,9 +28,9 @@ $providers = $this->getParam('providers', []);
                                     data-event="submit"
                                     data-success="alert,trigger,reset"
                                     data-success-param-alert-text="Created user successfully"
-                                    data-success-param-trigger-events="filter-users-changed,user-create,modal-close"
-                                    data-error="alert"
-                                    data-error-param-alert-text="Failed to create user">
+                                    data-success-param-trigger-events="user-create,modal-close"
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="Failed to create user">
 
                                     <label for="user-name">Name</label>
                                     <input type="text" class="full-width" id="user-name" name="name" required autocomplete="off" />
@@ -62,7 +62,7 @@ $providers = $this->getParam('providers', []);
 
                 <div
                     data-service="users.listUsers"
-                    data-event="load"
+                    data-event="load,user-create,user-update,user-delete"
                     data-param-search=""
                     data-param-limit="25"
                     data-param-offset="0"
@@ -156,8 +156,8 @@ $providers = $this->getParam('providers', []);
                                 data-success="alert,trigger,reset"
                                 data-success-param-alert-text="Created team successfully"
                                 data-success-param-trigger-events="filter-teams-changed,team-create,modal-close"
-                                data-error="alert"
-                                data-error-param-alert-text="Failed to create team">
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed to create team">
 
                                 <label for="team-name">Name</label>
                                 <input type="text" class="full-width" id="team-name" name="name" required autocomplete="off" />
@@ -219,8 +219,8 @@ $providers = $this->getParam('providers', []);
                                                     data-success="alert,trigger"
                                                     data-success-param-alert-text="Updated team successfully"
                                                     data-success-param-trigger-events="team-update,modal-close"
-                                                    data-error="alert"
-                                                    data-error-param-alert-text="Failed to update team">
+                                                    data-failure="alert"
+                                                    data-failure-param-alert-text="Failed to update team">
 
                                                     <label for="name">UID</label>
                                                     <div class="input-copy">
@@ -282,8 +282,8 @@ $providers = $this->getParam('providers', []);
                                     data-success="alert,trigger"
                                     data-success-param-alert-text="Updated project OAuth settings successfully"
                                     data-success-param-trigger-events="project-update,modal-close"
-                                    data-error="alert"
-                                    data-error-param-alert-text="Failed to update project OAuth settings">
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="Failed to update project OAuth settings">
                                     <input name="provider" id="provider<?php echo ucfirst($provider); ?>" type="hidden" autocomplete="off" value="<?php echo $provider; ?>">
 
                                     <label for="oauth<?php echo ucfirst($provider); ?>Appid">App ID</label>
diff --git a/app/views/console/users/view.phtml b/app/views/console/users/view.phtml
index 86c7cee41..fbb504da2 100644
--- a/app/views/console/users/view.phtml
+++ b/app/views/console/users/view.phtml
@@ -98,8 +98,8 @@ use Utopia\Locale\Locale;
                                 data-success="alert,trigger"
                                 data-success-param-alert-text="Blocked User Successfully"
                                 data-success-param-trigger-events="user-update"
-                                data-error="alert"
-                                data-error-param-alert-text="Failed to Block User">
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed to Block User">
 
                                 <button name="status" type="submit" class="danger fill" value="<?php echo \Auth\Auth::USER_STATUS_BLOCKED; ?>">Block Account</button>
                             </form>
@@ -113,8 +113,8 @@ use Utopia\Locale\Locale;
                                 data-success="alert,trigger"
                                 data-success-param-alert-text="Blocked Activated Successfully"
                                 data-success-param-trigger-events="user-update"
-                                data-error="alert"
-                                data-error-param-alert-text="Failed to Activate User">
+                                data-failure="alert"
+                                data-failure-param-alert-text="Failed to Activate User">
 
                                 <button name="status" type="submit" class="fill" value="<?php echo \Auth\Auth::USER_STATUS_ACTIVATED; ?>">Activate Account</button>
                             </form>
@@ -145,8 +145,8 @@ use Utopia\Locale\Locale;
                                         data-loading="Loading..."
                                         data-success="trigger"
                                         data-success-param-trigger-events="user-update"
-                                        data-error="alert"
-                                        data-error-param-alert-text="Failed to logout session">
+                                        data-failure="alert"
+                                        data-failure-param-alert-text="Failed to logout session">
                                         <input type="hidden" name="userId" data-ls-bind="{{router.params.id}}">
                                         <input type="hidden" name="sessionId" data-ls-bind="{{session.id}}">
                                         <button class="danger">Logout</button>
@@ -170,8 +170,8 @@ use Utopia\Locale\Locale;
                             data-event="submit"
                             data-success="trigger"
                             data-success-param-trigger-events="user-update"
-                            data-error="alert"
-                            data-error-param-alert-text="Failed to logout all sessions">
+                            data-failure="alert"
+                            data-failure-param-alert-text="Failed to logout all sessions">
                             <button class="danger">Logout from all devices</button>
                         </form>
                     </div>
diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml
index b4d0d81ac..ac5363ba0 100644
--- a/app/views/console/webhooks/index.phtml
+++ b/app/views/console/webhooks/index.phtml
@@ -53,8 +53,8 @@ $events = [
                         data-success="alert,trigger,reset"
                         data-success-param-alert-text="Updated webhook successfully"
                         data-success-param-trigger-events="webhook-update,modal-close"
-                        data-error="alert"
-                        data-error-param-alert-text="Failed to update webhook">
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to update webhook">
 
                         <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                         <input type="hidden" name="webhookId" data-ls-bind="{{webhook.$uid}}">
@@ -120,8 +120,8 @@ $events = [
                     data-success="alert,trigger"
                     data-success-param-alert-text="Deleted webhook successfully"
                     data-success-param-trigger-events="webhook-delete"
-                    data-error="alert"
-                    data-error-param-alert-text="Failed to delete webhook">
+                    data-failure="alert"
+                    data-failure-param-alert-text="Failed to delete webhook">
 
                     <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
                     <input type="hidden" name="webhookId" data-ls-bind="{{webhook.$uid}}">
@@ -151,8 +151,8 @@ $events = [
                 data-success="alert,trigger,reset"
                 data-success-param-alert-text="Created webhook successfully"
                 data-success-param-trigger-events="webhook-create,modal-close"
-                data-error="alert"
-                data-error-param-alert-text="Failed to create webhook">
+                data-failure="alert"
+                data-failure-param-alert-text="Failed to create webhook">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{console-project.$uid}}">
 
diff --git a/app/views/home/auth/confirm.phtml b/app/views/home/auth/confirm.phtml
index 7507e24c5..dccdee903 100644
--- a/app/views/home/auth/confirm.phtml
+++ b/app/views/home/auth/confirm.phtml
@@ -2,7 +2,8 @@
 use Utopia\Locale\Locale;
 ?>
 <section class="zone xl">
-    <form data-service="auth.confirm"
+    <form
+      data-service="auth.confirm"
       data-scope="console"
       data-event="load"
       data-param-token="{{router.params.token}}"
@@ -11,8 +12,8 @@ use Utopia\Locale\Locale;
       data-success-redirect-url="/console"
       data-success-alert="<?php echo $this->escape(Locale::getText('home.auth.confirm.success')); ?>"
       data-success-triggers="account.update"
-      data-error="alert"
-      data-error-alert="<?php echo $this->escape(Locale::getText('home.auth.confirm.failure')); ?>">
+      data-failure="alert"
+      data-failure-alert="<?php echo $this->escape(Locale::getText('home.auth.confirm.failure')); ?>">
 
         <h2 class="margin-bottom-small"><?php echo $this->escape(Locale::getText('home.auth.confirm.title')); ?></h2>
         <p class="note"><?php echo $this->escape(Locale::getText('home.auth.confirm.subtitle')); ?></p>
diff --git a/app/views/home/auth/join.phtml b/app/views/home/auth/join.phtml
index ac900095b..2d63e562d 100644
--- a/app/views/home/auth/join.phtml
+++ b/app/views/home/auth/join.phtml
@@ -13,8 +13,8 @@ use Utopia\Locale\Locale;
       data-success-redirect-url="/console?project={{router.params.project}}"
           data-success-alert="<?php echo $this->escape(Locale::getText('home.auth.join.success')); ?>"
           data-success-triggers="account.update"
-          data-error="alert"
-          data-error-alert="<?php echo $this->escape(Locale::getText('home.auth.join.failure')); ?>">
+          data-failure="alert"
+          data-failure-alert="<?php echo $this->escape(Locale::getText('home.auth.join.failure')); ?>">
 
         <div class="text-danger margin-bottom-large" style="display: none;" data-ls-if="{{router.params.failure}} == 1"><?php echo $this->escape(Locale::getText('home.auth.join.failure')); ?></div>
 
@@ -29,7 +29,7 @@ use Utopia\Locale\Locale;
              data-event="load"
              data-success="render,trigger"
              data-success-triggers="api-company.load"
-             data-error="render">
+             data-failure="render">
 
             <h2 class="margin-bottom-small"><?php echo $this->escape(Locale::getText('home.auth.join.title')); ?></h2>
 
diff --git a/app/views/home/auth/recovery.phtml b/app/views/home/auth/recovery.phtml
index d97ddcea9..a32565ea1 100644
--- a/app/views/home/auth/recovery.phtml
+++ b/app/views/home/auth/recovery.phtml
@@ -14,8 +14,8 @@ use Utopia\Locale\Locale;
           data-event="submit"
           data-success="alert"
           data-success-alert="<?php echo $this->escape(Locale::getText('home.auth.recovery.success')); ?>"
-          data-error="alert"
-          data-error-alert="<?php echo $this->escape(Locale::getText('home.auth.recovery.failure')); ?>">
+          data-failure="alert"
+          data-failure-alert="<?php echo $this->escape(Locale::getText('home.auth.recovery.failure')); ?>">
 
         <label><?php echo $this->escape(Locale::getText('home.auth.recovery.labels.email')); ?></label>
         <input name="email" type="email" class="full-width" autocomplete="email" placeholder="me@example.com" required>
diff --git a/app/views/home/auth/recovery/reset.phtml b/app/views/home/auth/recovery/reset.phtml
index 65300fff4..ea96568fd 100644
--- a/app/views/home/auth/recovery/reset.phtml
+++ b/app/views/home/auth/recovery/reset.phtml
@@ -18,8 +18,8 @@ use Utopia\Locale\Locale;
           data-success="alert,redirect"
           data-success-alert="<?php echo $this->escape(Locale::getText('home.auth.reset.success')); ?>"
           data-success-redirect-url="/auth/signin"
-          data-error="alert"
-          data-error-alert="<?php echo $this->escape(Locale::getText('home.auth.reset.failure')); ?>">
+          data-failure="alert"
+          data-failure-alert="<?php echo $this->escape(Locale::getText('home.auth.reset.failure')); ?>">
 
         <input type="hidden" name="userId" data-ls-bind="{{router.params.userId}}">
         <input type="hidden" name="token" data-ls-bind="{{router.params.token}}">
diff --git a/app/views/home/auth/signin.phtml b/app/views/home/auth/signin.phtml
index a35dc5e0c..564b0c217 100644
--- a/app/views/home/auth/signin.phtml
+++ b/app/views/home/auth/signin.phtml
@@ -30,8 +30,8 @@ use Utopia\Locale\Locale;
                 data-success="trigger,redirect"
                 data-success-param-trigger-events="login"
                 data-success-param-redirect-url="/console"
-                data-error="alert"
-                data-error-param-alert-text="<?php echo $this->escape(Locale::getText('home.auth.signin.failure')); ?>">
+                data-failure="alert"
+                data-failure-param-alert-text="<?php echo $this->escape(Locale::getText('home.auth.signin.failure')); ?>">
 
                 <input name="success" type="hidden" data-ls-bind="https://{{env.DOMAIN}}/console">
                 <input name="failure" type="hidden" data-ls-bind="https://{{env.DOMAIN}}/auth/signin?failure=1">
diff --git a/app/views/home/auth/signup.phtml b/app/views/home/auth/signup.phtml
index 3975f8377..b2045be15 100644
--- a/app/views/home/auth/signup.phtml
+++ b/app/views/home/auth/signup.phtml
@@ -20,8 +20,8 @@ use Utopia\Locale\Locale;
                 data-success="trigger,redirect"
                 data-success-param-trigger-events="auth-register"
                 data-success-redirect-url="/console/setup"
-                data-error="alert"
-                data-error-param-alert-text="<?php echo $this->escape(Locale::getText('home.auth.signup.failure')); ?>">
+                data-failure="alert"
+                data-failure-param-alert-text="<?php echo $this->escape(Locale::getText('home.auth.signup.failure')); ?>">
 
                 <input name="success" type="hidden" data-ls-bind="https://{{env.DOMAIN}}/console">
                 <input name="failure" type="hidden" data-ls-bind="https://{{env.DOMAIN}}/auth/signup?failure=1">
diff --git a/app/views/layouts/default.phtml b/app/views/layouts/default.phtml
index db04e893b..0d3db9644 100644
--- a/app/views/layouts/default.phtml
+++ b/app/views/layouts/default.phtml
@@ -91,7 +91,7 @@ $env        = $this->getParam('env', '');
                     <i class="icon-cancel" data-ls-ui-alerts-delete data-message="{{alert.id}}"></i>
                     <span data-ls-bind="{{alert.text}}"></span>
 
-                    <span data-ls-if="'undefined' !== {{alert.link}}" style="display: none;">
+                    <span data-ls-if="undefined !== {{alert.link}}" style="display: none;">
                         <a data-ls-attrs="href={{alert.link}}" data-ls-ui-alerts-delete data-message="{{alert.id}}"><?php echo Locale::getText('general.alerts.learn'); ?></a>
                     </span>
                 </div>
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 9342b3e99..7717453db 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2210,7 +2210,7 @@ children[prop]=template.cloneNode(true);element.appendChild(children[prop]);(ind
 container.set('$index',null,true,false,false);container.set('$prefix','',true,false,false);container.set('$as','',true,false,false);element.dispatchEvent(new Event('looped'));};let template=(element.children.length===1)?element.children[0]:window.document.createElement('li');echo();container.bind(element,expr+'.length',echo);}});window.ls.container.get('view').add({selector:'data-ls-template',template:false,repeat:true,controller:function(element,view,http,expression,document){let template=expression.parse(element.getAttribute('data-ls-template'));let type=element.getAttribute('data-type')||'url';element.innerHTML='';if('script'===type){let inlineTemplate=document.getElementById(template);if(inlineTemplate&&inlineTemplate.innerHTML){element.innerHTML=inlineTemplate.innerHTML;element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}
 else{element.innerHTML='<span style="color: red">Missing template "'+template+'"</span>';}
 return;}
-http.get(template).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});}});window.ls.error=function(){return function(error){alert(error);console.error('ERROR-APP',error);}};window.addEventListener('error',function(event){alert(event.error.message);console.error('ERROR-EVENT:',event.error.message,event.error.stack);});document.addEventListener('logout',function(){if(window.ls.router.getCurrent().view.scope==='console'){state.change('/auth/signin');}});document.addEventListener('http-get-401',function(){document.dispatchEvent(new CustomEvent('logout'));},true);(function(window){"use strict";window.ls.container.set('alerts',function(window){return{list:[],counter:0,add:function(message,time){var scope=this;message.id=this.counter++;scope.list.unshift(message);if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
+http.get(template).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});}});window.ls.error=function(){return function(error){alert(error);console.error('ERROR-APP',error);}};window.addEventListener('error',function(event){alert(event.error.message);console.error('ERROR-EVENT:',event.error.message,event.error.stack);});document.addEventListener('logout',function(){if(window.ls.router.getCurrent().view.scope==='console'){window.ls.router.change('/auth/signin');}});document.addEventListener('http-get-401',function(){document.dispatchEvent(new CustomEvent('logout'));},true);(function(window){"use strict";window.ls.container.set('alerts',function(window){return{list:[],counter:0,add:function(message,time){var scope=this;message.id=this.counter++;scope.list.unshift(message);if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
 return message.id;},remove:function(id){let scope=this;for(let index=0;index<scope.list.length;index++){let obj=scope.list[index];if(obj.id===parseInt(id)){if(typeof obj.callback==="function"){obj.callback();}
 scope.list.splice(index,1);};}}};},true,true);})(window);(function(window){"use strict";window.ls.container.set('console',function(window){var sdk=new window.Appwrite();sdk.setEndpoint(APP_ENV.API).setProject('console').setLocale(APP_ENV.LOCALE);return sdk;},true);})(window);(function(window){"use strict";window.ls.container.set('date',function(){function format(format,timestamp){var jsdate,f
 var txtWords=['Sun','Mon','Tues','Wednes','Thurs','Fri','Satur','January','February','March','April','May','June','July','August','September','October','November','December']
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index bf6ba76ae..350315ae9 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -117,7 +117,7 @@ children[prop]=template.cloneNode(true);element.appendChild(children[prop]);(ind
 container.set('$index',null,true,false,false);container.set('$prefix','',true,false,false);container.set('$as','',true,false,false);element.dispatchEvent(new Event('looped'));};let template=(element.children.length===1)?element.children[0]:window.document.createElement('li');echo();container.bind(element,expr+'.length',echo);}});window.ls.container.get('view').add({selector:'data-ls-template',template:false,repeat:true,controller:function(element,view,http,expression,document){let template=expression.parse(element.getAttribute('data-ls-template'));let type=element.getAttribute('data-type')||'url';element.innerHTML='';if('script'===type){let inlineTemplate=document.getElementById(template);if(inlineTemplate&&inlineTemplate.innerHTML){element.innerHTML=inlineTemplate.innerHTML;element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}
 else{element.innerHTML='<span style="color: red">Missing template "'+template+'"</span>';}
 return;}
-http.get(template).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});}});window.ls.error=function(){return function(error){alert(error);console.error('ERROR-APP',error);}};window.addEventListener('error',function(event){alert(event.error.message);console.error('ERROR-EVENT:',event.error.message,event.error.stack);});document.addEventListener('logout',function(){if(window.ls.router.getCurrent().view.scope==='console'){state.change('/auth/signin');}});document.addEventListener('http-get-401',function(){document.dispatchEvent(new CustomEvent('logout'));},true);(function(window){"use strict";window.ls.container.set('alerts',function(window){return{list:[],counter:0,add:function(message,time){var scope=this;message.id=this.counter++;scope.list.unshift(message);if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
+http.get(template).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});}});window.ls.error=function(){return function(error){alert(error);console.error('ERROR-APP',error);}};window.addEventListener('error',function(event){alert(event.error.message);console.error('ERROR-EVENT:',event.error.message,event.error.stack);});document.addEventListener('logout',function(){if(window.ls.router.getCurrent().view.scope==='console'){window.ls.router.change('/auth/signin');}});document.addEventListener('http-get-401',function(){document.dispatchEvent(new CustomEvent('logout'));},true);(function(window){"use strict";window.ls.container.set('alerts',function(window){return{list:[],counter:0,add:function(message,time){var scope=this;message.id=this.counter++;scope.list.unshift(message);if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
 return message.id;},remove:function(id){let scope=this;for(let index=0;index<scope.list.length;index++){let obj=scope.list[index];if(obj.id===parseInt(id)){if(typeof obj.callback==="function"){obj.callback();}
 scope.list.splice(index,1);};}}};},true,true);})(window);(function(window){"use strict";window.ls.container.set('console',function(window){var sdk=new window.Appwrite();sdk.setEndpoint(APP_ENV.API).setProject('console').setLocale(APP_ENV.LOCALE);return sdk;},true);})(window);(function(window){"use strict";window.ls.container.set('date',function(){function format(format,timestamp){var jsdate,f
 var txtWords=['Sun','Mon','Tues','Wednes','Thurs','Fri','Satur','January','February','March','April','May','June','July','August','September','October','November','December']
diff --git a/public/scripts/init.js b/public/scripts/init.js
index e4303731b..3e8d8ee06 100644
--- a/public/scripts/init.js
+++ b/public/scripts/init.js
@@ -14,7 +14,7 @@ window.addEventListener('error', function (event) {
 
 document.addEventListener('logout', function () {
     if(window.ls.router.getCurrent().view.scope === 'console') {
-        state.change('/auth/signin');
+        window.ls.router.change('/auth/signin');
     }
 });