From e70654eabcd38e2609215360bbd75db848e506fd Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Thu, 19 Aug 2021 15:50:10 +0300
Subject: [PATCH] Work in progress

---
 app/config/collections2.php            | 84 ++++++++++++++++++++++++++
 app/views/console/comps/logs.phtml     |  3 +-
 app/views/console/database/index.phtml |  2 +-
 3 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/app/config/collections2.php b/app/config/collections2.php
index a0af4f396c..0e5f278577 100644
--- a/app/config/collections2.php
+++ b/app/config/collections2.php
@@ -114,6 +114,90 @@ $collections = [
         ],
     ],
 
+    'attributes' => [
+        '$collection' => Database::METADATA,
+        '$id' => 'attributes',
+        'name' => 'Attributes',
+        'attributes' => [
+            [
+                '$id' => 'type',
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 256,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => 'status',
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 256,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => 'size',
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => 'required',
+                'type' => Database::VAR_BOOLEAN,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => 'signed',
+                'type' => Database::VAR_BOOLEAN,
+                'size' => 64,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => 'array',
+                'type' => Database::VAR_BOOLEAN,
+                'size' => 64,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => true,
+                'filters' => [],
+            ],
+            [
+                '$id' => 'format',
+                'type' => Database::VAR_STRING,
+                'size' => 64,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => true,
+                'filters' => ['json'],
+            ],
+        ],
+        'indexes' => [
+        ],
+    ],
+
     'projects' => [
         '$collection' => Database::METADATA,
         '$id' => 'projects',
diff --git a/app/views/console/comps/logs.phtml b/app/views/console/comps/logs.phtml
index bfe3e2adc7..444782c384 100644
--- a/app/views/console/comps/logs.phtml
+++ b/app/views/console/comps/logs.phtml
@@ -32,7 +32,8 @@ $interval = floor((int)$this->getParam('interval', 0) / 86400);
                         <span data-ls-if="{{log.userName|escape}} !== '' && {{log.mode}} === ''"><i class="icon-user"></i>&nbsp; <a data-ls-attrs="href=/console/users/user?id={{log.userId}}&project={{router.params.project}}" data-ls-bind="{{log.userName}}"></a></span>
                         <span data-ls-if="{{log.userName|escape}} === '' && {{log.userEmail}} !== '' && {{log.mode}} !== 'key'"><i class="icon-user"></i>&nbsp; Unknown</span>
                         <span data-ls-if="{{log.userName|escape}} === '' && {{log.userEmail}} === '' && {{log.mode}} !== 'key'"><i class="icon-user"></i>&nbsp; Anonymous User</span>
-                        <span data-ls-if="{{log.mode}} === 'admin'"><i class="icon-user"></i>&nbsp; <span data-ls-bind="{{log.userName}} (Admin)"></span></span>
+                        <span data-ls-if="{{log.mode}} === 'admin'">
+                        <img src="" data-ls-attrs="src={{log.userName|avatar}}" data-size="45" alt="User Avatar" class="avatar xxs inline margin-end-small" loading="lazy" width="30" height="30" />&nbsp; <span data-ls-bind="{{log.userName}} (Admin)"></span></span>
                         <span data-ls-if="{{log.mode}} === 'key'"> <i class="icon-key"></i>&nbsp; API Key</span>
                     </td>
                     <td data-title="Event: "><span data-ls-bind="{{log.event}}"></span></td>
diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml
index dfef8d0315..4d65eeb66c 100644
--- a/app/views/console/database/index.phtml
+++ b/app/views/console/database/index.phtml
@@ -107,9 +107,9 @@
                         <label for="collection-name">Name</label>
                         <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
 
+                        <input type="hidden" id="collection-permission" name="permission" required value="document" />
                         <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
                         <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
-                        <input type="hidden" id="collection-rules" name="rules" required data-cast-to="json" value="{}" />
 
                         <hr />