From 7224520fa8c7a701d57a734c650ca686781199af Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 26 Oct 2021 15:19:28 +0200 Subject: [PATCH] fix all usage ui --- app/controllers/api/database.php | 36 +++--- app/controllers/api/functions.php | 6 +- app/controllers/api/projects.php | 4 +- app/controllers/api/storage.php | 22 ++-- app/controllers/api/users.php | 16 +-- app/views/console/database/collection.phtml | 26 ++--- app/views/console/database/index.phtml | 103 +++++++++++++++++- app/views/console/functions/function.phtml | 12 +- app/views/console/home/index.phtml | 14 +-- app/views/console/index.phtml | 2 +- app/views/console/storage/index.phtml | 63 ++++++++++- public/dist/scripts/app-all.js | 5 +- public/dist/scripts/app.js | 5 +- public/scripts/filters.js | 13 ++- public/scripts/routes.js | 14 +++ .../Utopia/Response/Model/UsageBuckets.php | 10 +- .../Utopia/Response/Model/UsageCollection.php | 10 +- .../Utopia/Response/Model/UsageDatabase.php | 20 ++-- .../Utopia/Response/Model/UsageFunctions.php | 6 +- .../Utopia/Response/Model/UsageUsers.php | 16 +-- .../Database/DatabaseConsoleClientTest.php | 42 +++---- .../Functions/FunctionsConsoleClientTest.php | 19 ++-- .../Health/HealthCustomServerTest.php | 42 +++---- .../Storage/StorageConsoleClientTest.php | 14 +-- .../Services/Users/UsersConsoleClientTest.php | 38 +++---- 25 files changed, 369 insertions(+), 189 deletions(-) diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php index 3e3531cd25..c5723a80f8 100644 --- a/app/controllers/api/database.php +++ b/app/controllers/api/database.php @@ -323,7 +323,7 @@ App::get('/v1/database/usage') new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]), new Query('metric', Query::TYPE_EQUAL, [$metric]), ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]); - + $stats[$metric] = []; foreach ($requestDocs as $requestDoc) { $stats[$metric][] = [ @@ -332,21 +332,21 @@ App::get('/v1/database/usage') ]; } $stats[$metric] = array_reverse($stats[$metric]); - } + } }); $usage = new Document([ 'range' => $range, - 'documents.count' => $stats["database.documents.count"], - 'collections.count' => $stats["database.collections.count"], - 'documents.create' => $stats["database.documents.create"], - 'documents.read' => $stats["database.documents.read"], - 'documents.update' => $stats["database.documents.update"], - 'documents.delete' => $stats["database.documents.delete"], - 'collections.create' => $stats["database.collections.create"], - 'collections.read' => $stats["database.collections.read"], - 'collections.update' => $stats["database.collections.update"], - 'collections.delete' => $stats["database.collections.delete"], + 'documentsCount' => $stats["database.documents.count"], + 'collectionsCount' => $stats["database.collections.count"], + 'documentsCreate' => $stats["database.documents.create"], + 'documentsRead' => $stats["database.documents.read"], + 'documentsUpdate' => $stats["database.documents.update"], + 'documentsDelete' => $stats["database.documents.delete"], + 'collectionsCreate' => $stats["database.collections.create"], + 'collectionsRead' => $stats["database.collections.read"], + 'collectionsUpdate' => $stats["database.collections.update"], + 'collectionsDelete' => $stats["database.collections.delete"], ]); } @@ -417,7 +417,7 @@ App::get('/v1/database/:collectionId/usage') new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]), new Query('metric', Query::TYPE_EQUAL, [$metric]), ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]); - + $stats[$metric] = []; foreach ($requestDocs as $requestDoc) { $stats[$metric][] = [ @@ -431,11 +431,11 @@ App::get('/v1/database/:collectionId/usage') $usage = new Document([ 'range' => $range, - 'documents.count' => $stats["database.collections.$collectionId.documents.count"], - 'documents.create' => $stats["database.collections.$collectionId.documents.create"], - 'documents.read' => $stats["database.collections.$collectionId.documents.read"], - 'documents.update' => $stats["database.collections.$collectionId.documents.update"], - 'documents.delete' => $stats["database.collections.$collectionId.documents.delete"] + 'documentsCount' => $stats["database.collections.$collectionId.documents.count"], + 'documentsCreate' => $stats["database.collections.$collectionId.documents.create"], + 'documentsRead' => $stats["database.collections.$collectionId.documents.read"], + 'documentsUpdate' => $stats["database.collections.$collectionId.documents.update"], + 'documentsDelete' => $stats["database.collections.$collectionId.documents.delete"] ]); } diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index 926a22394c..4c6749d5d3 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -223,9 +223,9 @@ App::get('/v1/functions/:functionId/usage') $usage = new Document([ 'range' => $range, - 'functions.executions' => $stats["functions.$functionId.executions"], - 'functions.failures' => $stats["functions.$functionId.failures"], - 'functions.compute' => $stats["functions.$functionId.compute"] + 'functionsExecutions' => $stats["functions.$functionId.executions"], + 'functionsFailures' => $stats["functions.$functionId.failures"], + 'functionsCompute' => $stats["functions.$functionId.compute"] ]); } diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index f83f209aa4..c4d8c1053a 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -294,7 +294,7 @@ App::get('/v1/projects/:projectId/usage') new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]), new Query('metric', Query::TYPE_EQUAL, [$metric]), ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]); - + $stats[$metric] = []; foreach ($requestDocs as $requestDoc) { $stats[$metric][] = [ @@ -303,7 +303,7 @@ App::get('/v1/projects/:projectId/usage') ]; } $stats[$metric] = array_reverse($stats[$metric]); - } + } }); $usage = new Document([ diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 30b6ab21bb..e209e500a1 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -690,8 +690,8 @@ App::get('/v1/storage/usage') ]; $metrics = [ - "storage.total", - "storage.files.count" + 'storage.total', + 'storage.files.count' ]; $stats = []; @@ -702,7 +702,7 @@ App::get('/v1/storage/usage') new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]), new Query('metric', Query::TYPE_EQUAL, [$metric]), ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]); - + $stats[$metric] = []; foreach ($requestDocs as $requestDoc) { $stats[$metric][] = [ @@ -711,7 +711,7 @@ App::get('/v1/storage/usage') ]; } $stats[$metric] = array_reverse($stats[$metric]); - } + } }); $usage = new Document([ @@ -781,7 +781,7 @@ App::get('/v1/storage/:bucketId/usage') new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]), new Query('metric', Query::TYPE_EQUAL, [$metric]), ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]); - + $stats[$metric] = []; foreach ($requestDocs as $requestDoc) { $stats[$metric][] = [ @@ -790,16 +790,16 @@ App::get('/v1/storage/:bucketId/usage') ]; } $stats[$metric] = array_reverse($stats[$metric]); - } + } }); $usage = new Document([ 'range' => $range, - 'files.count' => $stats["storage.buckets.$bucketId.files.count"], - 'files.create' => $stats["storage.buckets.$bucketId.files.create"], - 'files.read' => $stats["storage.buckets.$bucketId.files.read"], - 'files.update' => $stats["storage.buckets.$bucketId.files.update"], - 'files.delete' => $stats["storage.buckets.$bucketId.files.delete"] + 'filesCount' => $stats["storage.buckets.$bucketId.files.count"], + 'filesCreate' => $stats["storage.buckets.$bucketId.files.create"], + 'filesRead' => $stats["storage.buckets.$bucketId.files.read"], + 'filesUpdate' => $stats["storage.buckets.$bucketId.files.update"], + 'filesDelete' => $stats["storage.buckets.$bucketId.files.delete"] ]); } diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index d6c9f1212f..050ef34e89 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -832,14 +832,14 @@ App::get('/v1/users/usage') $usage = new Document([ 'range' => $range, - 'users.count' => $stats["users.count"], - 'users.create' => $stats["users.create"], - 'users.read' => $stats["users.read"], - 'users.update' => $stats["users.update"], - 'users.delete' => $stats["users.delete"], - 'sessions.create' => $stats["users.sessions.create"], - 'sessions.provider.create' => $stats["users.sessions.$provider.create"], - 'sessions.delete' => $stats["users.sessions.delete"] + 'usersCount' => $stats["users.count"], + 'usersCreate' => $stats["users.create"], + 'usersRead' => $stats["users.read"], + 'usersUpdate' => $stats["users.update"], + 'usersDelete' => $stats["users.delete"], + 'sessionsCreate' => $stats["users.sessions.create"], + 'sessionsProviderCreate' => $stats["users.sessions.$provider.create"], + 'sessionsDelete' => $stats["users.sessions.delete"] ]); } diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml index c6fc0710e6..c1ceccbc9a 100644 --- a/app/views/console/database/collection.phtml +++ b/app/views/console/database/collection.phtml @@ -74,10 +74,10 @@ $logs = $this->getParam('logs', null); - + - n/a + n/a @@ -371,65 +371,63 @@ $logs = $this->getParam('logs', null);
- +
- +
- +
- +
- +
- -

  • Settings

    diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml index 4d65eeb66c..f52ef6c4a9 100644 --- a/app/views/console/database/index.phtml +++ b/app/views/console/database/index.phtml @@ -118,9 +118,108 @@
    • - + +
    +
    +
    +
    + +
    +
    +
    + + + +
    +
    +
    + +
    +
    +
    + + + +
    +
    +
    + +
    +
    +
    + + + +
    +
    +
    + +
    +
    +
    + + + +
    +
    +
    + +
    +
    +
    + + +
    + diff --git a/app/views/console/functions/function.phtml b/app/views/console/functions/function.phtml index be92ab7938..b22684c20b 100644 --- a/app/views/console/functions/function.phtml +++ b/app/views/console/functions/function.phtml @@ -247,37 +247,37 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled', true);
    - +
    - +
    - +
    diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml index daaefbd32d..ea0f0605c4 100644 --- a/app/views/console/home/index.phtml +++ b/app/views/console/home/index.phtml @@ -93,11 +93,11 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled', true);
    - +
    -
    N/A
    +
    N/A
    Requests
    @@ -115,22 +115,22 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled', true);
    -
    0
    +
    0
    Documents
    - 0 - + 0 +
    Storage
    -
    0
    +
    0
    Users
    -
    0
    +
    0
    Executions
    diff --git a/app/views/console/index.phtml b/app/views/console/index.phtml index fc0ce3f155..643e276c37 100644 --- a/app/views/console/index.phtml +++ b/app/views/console/index.phtml @@ -39,7 +39,7 @@ $home = $this->getParam('home', '');
  •  
    - +

     

    diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml index 3fa89eb383..862f9f7b8f 100644 --- a/app/views/console/storage/index.phtml +++ b/app/views/console/storage/index.phtml @@ -14,7 +14,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
      -
    • +

    • Files

      getParam('fileLimitHuman', 0);
    • +
  • + + + + + + +
    + +
    + + + +
    + +
    + + + +

    Usage

    + +
    +
    +
    +
    + +
    +
    +
    + +
      +
    • Total Files
      • +
    + +
    +
    +
    + +
    +
    +
    + +
      +
    • Total Storage ( )
      • +
    +
    +
    • diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js index a21d0aa737..cea6e29e55 100644 --- a/public/dist/scripts/app-all.js +++ b/public/dist/scripts/app-all.js @@ -2383,7 +2383,7 @@ return slf.renderToken(tokens,idx,opts);} md.renderer.rules.strong_open=renderEm;md.renderer.rules.strong_close=renderEm;return md;},true);})(window);(function(window){"use strict";window.ls.container.set('rtl',function(){var rtlStock="^ا^ب^ت^ث^ج^ح^خ^د^ذ^ر^ز^س^ش^ص^ض^ط^ظ^ع^غ^ف^ق^ك^ل^م^ن^ه^و^ي^א^ב^ג^ד^ה^ו^ז^ח^ט^י^כ^ך^ל^מ^ם^נ^ן^ס^ע^פ^ף^צ^ץ^ק^ר^ש^ת^";var special=["\n"," "," ","״",'"',"_","'","!","@","#","$","^","&","%","*","(",")","+","=","-","[","]","\\","/","{","}","|",":","<",">","?",",",".","0","1","2","3","4","5","6","7","8","9"];var isRTL=function(value){for(var i=0;i{return{current:null,history:null,setCurrent:function(currentConnections){var scope=this;scope.current=currentConnections;return scope.current;},setHistory:function(history){var scope=this;scope.history=history;return scope.history;}};},true,true);})(window);window.ls.router.add("/auth/signin",{template:"/auth/signin?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/signup",{template:"/auth/signup?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery",{template:"/auth/recovery?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery/reset",{template:"/auth/recovery/reset?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/confirm",{template:"/auth/confirm?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/join",{template:"/auth/join?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/magic-url",{template:"/auth/magic-url?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/success",{template:"/auth/oauth2/success?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/failure",{template:"/auth/oauth2/failure?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/console",{template:"/console?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account/:tab",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/home",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/home/:tab",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/platforms/:platform",{template:function(window){return window.location.pathname+"?version="+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/notifications",{template:"/console/notifications?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/settings",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/settings/:tab",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks/:tab",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys/:tab",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks/:tab",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database",{template:"/console/database?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database/collection",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/collection/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/storage",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/storage/:tab",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user/:tab",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team/:tab",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/:tab",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function/:tab",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/:tab",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true});window.ls.filter.add("avatar",function($value,element){if(!$value){return"";} +return false;};return{isRTL:isRTL,};},true);})(window);(function(window){"use strict";window.ls.container.set('sdk',function(window,router){var sdk=new window.Appwrite();var endpoint=window.location.origin+'/v1';sdk.setEndpoint(endpoint).setProject(router.params.project||'').setLocale(APP_ENV.LOCALE).setMode('admin');return sdk;},false);})(window);(function(window){"use strict";window.ls.container.set('search',function(window){return{params:{},path:'',pointer:'',selected:'',};},true,true);})(window);(function(window){"use strict";window.ls.container.set('timezone',function(){return{convert:function(unixTime){var timezoneMinutes=new Date().getTimezoneOffset();timezoneMinutes=(timezoneMinutes===0)?0:-timezoneMinutes;return parseInt(unixTime)+(timezoneMinutes*60);}};},true);})(window);(function(window){"use strict";window.ls.container.set('realtime',()=>{return{current:null,history:null,setCurrent:function(currentConnections){var scope=this;scope.current=currentConnections;return scope.current;},setHistory:function(history){var scope=this;scope.history=history;return scope.history;}};},true,true);})(window);window.ls.router.add("/auth/signin",{template:"/auth/signin?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/signup",{template:"/auth/signup?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery",{template:"/auth/recovery?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery/reset",{template:"/auth/recovery/reset?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/confirm",{template:"/auth/confirm?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/join",{template:"/auth/join?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/magic-url",{template:"/auth/magic-url?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/success",{template:"/auth/oauth2/success?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/failure",{template:"/auth/oauth2/failure?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/console",{template:"/console?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account/:tab",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/home",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/home/:tab",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/platforms/:platform",{template:function(window){return window.location.pathname+"?version="+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/notifications",{template:"/console/notifications?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/settings",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/settings/:tab",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks/:tab",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys/:tab",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks/:tab",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database",{template:"/console/database?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database/usage",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/collection",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/collection/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/storage",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/storage/usage",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/storage/:tab",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user/:tab",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team/:tab",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/:tab",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function/:tab",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/:tab",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true});window.ls.filter.add("avatar",function($value,element){if(!$value){return"";} let size=element.dataset["size"]||80;let name=$value.name||$value||"";name=(typeof name!=='string')?'--':name;return def="/v1/avatars/initials?project=console"+"&name="+ encodeURIComponent(name)+"&width="+ size+"&height="+ @@ -2403,7 +2403,8 @@ let thresh=1000;if(Math.abs($value)=thresh&&u=thresh&&u","?",",",".","0","1","2","3","4","5","6","7","8","9"];var isRTL=function(value){for(var i=0;i{return{current:null,history:null,setCurrent:function(currentConnections){var scope=this;scope.current=currentConnections;return scope.current;},setHistory:function(history){var scope=this;scope.history=history;return scope.history;}};},true,true);})(window);window.ls.router.add("/auth/signin",{template:"/auth/signin?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/signup",{template:"/auth/signup?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery",{template:"/auth/recovery?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery/reset",{template:"/auth/recovery/reset?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/confirm",{template:"/auth/confirm?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/join",{template:"/auth/join?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/magic-url",{template:"/auth/magic-url?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/success",{template:"/auth/oauth2/success?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/failure",{template:"/auth/oauth2/failure?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/console",{template:"/console?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account/:tab",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/home",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/home/:tab",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/platforms/:platform",{template:function(window){return window.location.pathname+"?version="+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/notifications",{template:"/console/notifications?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/settings",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/settings/:tab",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks/:tab",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys/:tab",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks/:tab",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database",{template:"/console/database?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database/collection",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/collection/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/storage",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/storage/:tab",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user/:tab",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team/:tab",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/:tab",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function/:tab",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/:tab",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true});window.ls.filter.add("avatar",function($value,element){if(!$value){return"";} +return false;};return{isRTL:isRTL,};},true);})(window);(function(window){"use strict";window.ls.container.set('sdk',function(window,router){var sdk=new window.Appwrite();var endpoint=window.location.origin+'/v1';sdk.setEndpoint(endpoint).setProject(router.params.project||'').setLocale(APP_ENV.LOCALE).setMode('admin');return sdk;},false);})(window);(function(window){"use strict";window.ls.container.set('search',function(window){return{params:{},path:'',pointer:'',selected:'',};},true,true);})(window);(function(window){"use strict";window.ls.container.set('timezone',function(){return{convert:function(unixTime){var timezoneMinutes=new Date().getTimezoneOffset();timezoneMinutes=(timezoneMinutes===0)?0:-timezoneMinutes;return parseInt(unixTime)+(timezoneMinutes*60);}};},true);})(window);(function(window){"use strict";window.ls.container.set('realtime',()=>{return{current:null,history:null,setCurrent:function(currentConnections){var scope=this;scope.current=currentConnections;return scope.current;},setHistory:function(history){var scope=this;scope.history=history;return scope.history;}};},true,true);})(window);window.ls.router.add("/auth/signin",{template:"/auth/signin?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/signup",{template:"/auth/signup?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery",{template:"/auth/recovery?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/recovery/reset",{template:"/auth/recovery/reset?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/confirm",{template:"/auth/confirm?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/join",{template:"/auth/join?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/magic-url",{template:"/auth/magic-url?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/success",{template:"/auth/oauth2/success?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/auth/oauth2/failure",{template:"/auth/oauth2/failure?version="+APP_ENV.CACHEBUSTER,scope:"home"}).add("/console",{template:"/console?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/account/:tab",{template:"/console/account?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/home",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/home/:tab",{template:"/console/home?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/platforms/:platform",{template:function(window){return window.location.pathname+"?version="+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/notifications",{template:"/console/notifications?version="+APP_ENV.CACHEBUSTER,scope:"console"}).add("/console/settings",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/settings/:tab",{template:"/console/settings?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/webhooks/:tab",{template:"/console/webhooks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/keys/:tab",{template:"/console/keys?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/tasks/:tab",{template:"/console/tasks?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database",{template:"/console/database?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/database/usage",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/collection",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/collection/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/database/document/:tab",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/storage",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/storage/usage",{template:function(window){return window.location.pathname+window.location.search+'&version='+APP_ENV.CACHEBUSTER;},scope:"console",project:true}).add("/console/storage/:tab",{template:"/console/storage?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/user/:tab",{template:"/console/users/user?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/teams/team/:tab",{template:"/console/users/teams/team?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/users/:tab",{template:"/console/users?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/function/:tab",{template:"/console/functions/function?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true}).add("/console/functions/:tab",{template:"/console/functions?version="+APP_ENV.CACHEBUSTER,scope:"console",project:true});window.ls.filter.add("avatar",function($value,element){if(!$value){return"";} let size=element.dataset["size"]||80;let name=$value.name||$value||"";name=(typeof name!=='string')?'--':name;return def="/v1/avatars/initials?project=console"+"&name="+ encodeURIComponent(name)+"&width="+ size+"&height="+ @@ -309,7 +309,8 @@ let thresh=1000;if(Math.abs($value)=thresh&&u=thresh&&u '', 'example' => '30d', ]) - ->addRule('files.count', [ + ->addRule('filesCount', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for total number of files in this bucket.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('files.create', [ + ->addRule('filesCreate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for files created.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('files.read', [ + ->addRule('filesRead', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for files read.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('files.update', [ + ->addRule('filesUpdate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for files updated.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('files.delete', [ + ->addRule('filesDelete', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for files deleted.', 'default' => [], diff --git a/src/Appwrite/Utopia/Response/Model/UsageCollection.php b/src/Appwrite/Utopia/Response/Model/UsageCollection.php index cf9e3e4541..3a6acbaab3 100644 --- a/src/Appwrite/Utopia/Response/Model/UsageCollection.php +++ b/src/Appwrite/Utopia/Response/Model/UsageCollection.php @@ -16,35 +16,35 @@ class UsageCollection extends Model 'default' => '', 'example' => '30d', ]) - ->addRule('documents.count', [ + ->addRule('documentsCount', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for total number of documents.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.create', [ + ->addRule('documentsCreate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents created.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.read', [ + ->addRule('documentsRead', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents read.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.update', [ + ->addRule('documentsUpdate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents updated.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.delete', [ + ->addRule('documentsDelete', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents deleted.', 'default' => [], diff --git a/src/Appwrite/Utopia/Response/Model/UsageDatabase.php b/src/Appwrite/Utopia/Response/Model/UsageDatabase.php index eab025ba14..4d78381565 100644 --- a/src/Appwrite/Utopia/Response/Model/UsageDatabase.php +++ b/src/Appwrite/Utopia/Response/Model/UsageDatabase.php @@ -16,70 +16,70 @@ class UsageDatabase extends Model 'default' => '', 'example' => '30d', ]) - ->addRule('documents.count', [ + ->addRule('documentsCount', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for total number of documents.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('collections.count', [ + ->addRule('collectionsCount', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for total number of collections.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.create', [ + ->addRule('documentsCreate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents created.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.read', [ + ->addRule('documentsRead', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents read.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.update', [ + ->addRule('documentsUpdate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents updated.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('documents.delete', [ + ->addRule('documentsDelete', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for documents deleted.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('collections.create', [ + ->addRule('collectionsCreate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for collections created.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('collections.read', [ + ->addRule('collectionsRead', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for collections read.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('collections.update', [ + ->addRule('collectionsUpdate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for collections updated.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('collections.delete', [ + ->addRule('collectionsDelete', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for collections delete.', 'default' => [], diff --git a/src/Appwrite/Utopia/Response/Model/UsageFunctions.php b/src/Appwrite/Utopia/Response/Model/UsageFunctions.php index 6183b1aff8..15a7e4de7d 100644 --- a/src/Appwrite/Utopia/Response/Model/UsageFunctions.php +++ b/src/Appwrite/Utopia/Response/Model/UsageFunctions.php @@ -16,21 +16,21 @@ class UsageFunctions extends Model 'default' => '', 'example' => '30d', ]) - ->addRule('functions.executions', [ + ->addRule('functionsExecutions', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for function executions.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('functions.failures', [ + ->addRule('functionsFailures', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for function execution failures.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('functions.compute', [ + ->addRule('functionsCompute', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for function execution duration.', 'default' => [], diff --git a/src/Appwrite/Utopia/Response/Model/UsageUsers.php b/src/Appwrite/Utopia/Response/Model/UsageUsers.php index 3854fdec75..153a2d32d4 100644 --- a/src/Appwrite/Utopia/Response/Model/UsageUsers.php +++ b/src/Appwrite/Utopia/Response/Model/UsageUsers.php @@ -16,56 +16,56 @@ class UsageUsers extends Model 'default' => '', 'example' => '30d', ]) - ->addRule('users.count', [ + ->addRule('usersCount', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for total number of users.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('users.create', [ + ->addRule('usersCreate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for users created.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('users.read', [ + ->addRule('usersRead', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for users read.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('users.update', [ + ->addRule('usersUpdate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for users updated.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('users.delete', [ + ->addRule('usersDelete', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for users deleted.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('sessions.create', [ + ->addRule('sessionsCreate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for sessions created.', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('sessions.provider.create', [ + ->addRule('sessionsProviderCreate', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for sessions created for a provider ( email, anonymous or oauth2 ).', 'default' => [], 'example' => new \stdClass, 'array' => true ]) - ->addRule('sessions.delete', [ + ->addRule('sessionsDelete', [ 'type' => Response::MODEL_METRIC_LIST, 'description' => 'Aggregated stats for sessions deleted.', 'default' => [], diff --git a/tests/e2e/Services/Database/DatabaseConsoleClientTest.php b/tests/e2e/Services/Database/DatabaseConsoleClientTest.php index 625f26107b..9ba4746e77 100644 --- a/tests/e2e/Services/Database/DatabaseConsoleClientTest.php +++ b/tests/e2e/Services/Database/DatabaseConsoleClientTest.php @@ -12,7 +12,7 @@ class DatabaseConsoleClientTest extends Scope use ProjectCustom; use SideConsole; - public function testCreateCollection():array + public function testCreateCollection(): array { /** * Test for SUCCESS @@ -33,7 +33,7 @@ class DatabaseConsoleClientTest extends Scope return ['moviesId' => $movies['body']['$id']]; } - + public function testGetDatabaseUsage() { /** @@ -48,7 +48,7 @@ class DatabaseConsoleClientTest extends Scope ]); $this->assertEquals($response['headers']['status-code'], 400); - + /** * Test for SUCCESS */ @@ -63,16 +63,16 @@ class DatabaseConsoleClientTest extends Scope $this->assertEquals($response['headers']['status-code'], 200); $this->assertEquals(count($response['body']), 11); $this->assertEquals($response['body']['range'], '24h'); - $this->assertIsArray($response['body']['documents.count']); - $this->assertIsArray($response['body']['collections.count']); - $this->assertIsArray($response['body']['documents.create']); - $this->assertIsArray($response['body']['documents.read']); - $this->assertIsArray($response['body']['documents.update']); - $this->assertIsArray($response['body']['documents.delete']); - $this->assertIsArray($response['body']['collections.create']); - $this->assertIsArray($response['body']['collections.read']); - $this->assertIsArray($response['body']['collections.update']); - $this->assertIsArray($response['body']['collections.delete']); + $this->assertIsArray($response['body']['documentsCount']); + $this->assertIsArray($response['body']['collectionsCount']); + $this->assertIsArray($response['body']['documentsCreate']); + $this->assertIsArray($response['body']['documentsRead']); + $this->assertIsArray($response['body']['documentsUpdate']); + $this->assertIsArray($response['body']['documentsDelete']); + $this->assertIsArray($response['body']['collectionsCreate']); + $this->assertIsArray($response['body']['collectionsRead']); + $this->assertIsArray($response['body']['collectionsUpdate']); + $this->assertIsArray($response['body']['collectionsDelete']); } @@ -85,7 +85,7 @@ class DatabaseConsoleClientTest extends Scope * Test for FAILURE */ - $response = $this->client->call(Client::METHOD_GET, '/database/'.$data['moviesId'].'/usage', array_merge([ + $response = $this->client->call(Client::METHOD_GET, '/database/' . $data['moviesId'] . '/usage', array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'] ], $this->getHeaders()), [ @@ -106,7 +106,7 @@ class DatabaseConsoleClientTest extends Scope /** * Test for SUCCESS */ - $response = $this->client->call(Client::METHOD_GET, '/database/'.$data['moviesId'].'/usage', array_merge([ + $response = $this->client->call(Client::METHOD_GET, '/database/' . $data['moviesId'] . '/usage', array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'] ], $this->getHeaders()), [ @@ -116,10 +116,10 @@ class DatabaseConsoleClientTest extends Scope $this->assertEquals($response['headers']['status-code'], 200); $this->assertEquals(count($response['body']), 6); $this->assertEquals($response['body']['range'], '24h'); - $this->assertIsArray($response['body']['documents.count']); - $this->assertIsArray($response['body']['documents.create']); - $this->assertIsArray($response['body']['documents.read']); - $this->assertIsArray($response['body']['documents.update']); - $this->assertIsArray($response['body']['documents.delete']); + $this->assertIsArray($response['body']['documentsCount']); + $this->assertIsArray($response['body']['documentsCreate']); + $this->assertIsArray($response['body']['documentsRead']); + $this->assertIsArray($response['body']['documentsUpdate']); + $this->assertIsArray($response['body']['documentsDelete']); } -} \ No newline at end of file +} diff --git a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php index ee15a81dcb..a0f6cca5e6 100644 --- a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php +++ b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php @@ -12,7 +12,7 @@ class FunctionsConsoleClientTest extends Scope use ProjectCustom; use SideConsole; - public function testCreateFunction():array + public function testCreateFunction(): array { $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([ 'content-type' => 'application/json', @@ -20,7 +20,7 @@ class FunctionsConsoleClientTest extends Scope ], $this->getHeaders()), [ 'functionId' => 'unique()', 'name' => 'Test', - 'execute' => ['user:'.$this->getUser()['$id']], + 'execute' => ['user:' . $this->getUser()['$id']], 'runtime' => 'php-8.0', 'vars' => [ 'funcKey1' => 'funcValue1', @@ -41,7 +41,7 @@ class FunctionsConsoleClientTest extends Scope 'functionId' => $function['body']['$id'] ]; } - + /** * @depends testCreateFunction */ @@ -51,7 +51,7 @@ class FunctionsConsoleClientTest extends Scope * Test for FAILURE */ - $response = $this->client->call(Client::METHOD_GET, '/functions/'.$data['functionId'].'/usage', array_merge([ + $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/usage', array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'] ], $this->getHeaders()), [ @@ -73,7 +73,7 @@ class FunctionsConsoleClientTest extends Scope * Test for SUCCESS */ - $response = $this->client->call(Client::METHOD_GET, '/functions/'.$data['functionId'].'/usage', array_merge([ + $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/usage', array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'] ], $this->getHeaders()), [ @@ -83,9 +83,8 @@ class FunctionsConsoleClientTest extends Scope $this->assertEquals($response['headers']['status-code'], 200); $this->assertEquals(count($response['body']), 4); $this->assertEquals($response['body']['range'], '24h'); - $this->assertIsArray($response['body']['functions.executions']); - $this->assertIsArray($response['body']['functions.failures']); - $this->assertIsArray($response['body']['functions.compute']); + $this->assertIsArray($response['body']['functionsExecutions']); + $this->assertIsArray($response['body']['functionsFailures']); + $this->assertIsArray($response['body']['functionsCompute']); } - -} \ No newline at end of file +} diff --git a/tests/e2e/Services/Health/HealthCustomServerTest.php b/tests/e2e/Services/Health/HealthCustomServerTest.php index a058ce7978..d7989c6a59 100644 --- a/tests/e2e/Services/Health/HealthCustomServerTest.php +++ b/tests/e2e/Services/Health/HealthCustomServerTest.php @@ -14,7 +14,7 @@ class HealthCustomServerTest extends Scope use ProjectCustom; use SideServer; - public function testHTTPSuccess():array + public function testHTTPSuccess(): array { /** * Test for SUCCESS @@ -30,11 +30,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testDBSuccess():array + public function testDBSuccess(): array { /** * Test for SUCCESS @@ -50,11 +50,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testCacheSuccess():array + public function testCacheSuccess(): array { /** * Test for SUCCESS @@ -70,11 +70,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testTimeSuccess():array + public function testTimeSuccess(): array { /** * Test for SUCCESS @@ -94,11 +94,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testWebhooksSuccess():array + public function testWebhooksSuccess(): array { /** * Test for SUCCESS @@ -115,11 +115,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testLogsSuccess():array + public function testLogsSuccess(): array { /** * Test for SUCCESS @@ -136,11 +136,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testUsageSuccess():array + public function testUsageSuccess(): array { /** * Test for SUCCESS @@ -157,11 +157,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testCertificatesSuccess():array + public function testCertificatesSuccess(): array { /** * Test for SUCCESS @@ -178,11 +178,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testStorageLocalSuccess():array + public function testStorageLocalSuccess(): array { /** * Test for SUCCESS @@ -198,11 +198,11 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } - public function testStorageAntiVirusSuccess():array + public function testStorageAntiVirusSuccess(): array { /** * Test for SUCCESS @@ -220,7 +220,7 @@ class HealthCustomServerTest extends Scope /** * Test for FAILURE */ - + return []; } -} \ No newline at end of file +} diff --git a/tests/e2e/Services/Storage/StorageConsoleClientTest.php b/tests/e2e/Services/Storage/StorageConsoleClientTest.php index 4ec1a6ce9a..dfa33f1611 100644 --- a/tests/e2e/Services/Storage/StorageConsoleClientTest.php +++ b/tests/e2e/Services/Storage/StorageConsoleClientTest.php @@ -26,7 +26,7 @@ class StorageConsoleClientTest extends Scope ]); $this->assertEquals($response['headers']['status-code'], 400); - + /** * Test for SUCCESS */ @@ -83,10 +83,10 @@ class StorageConsoleClientTest extends Scope $this->assertEquals($response['headers']['status-code'], 200); $this->assertEquals(count($response['body']), 6); $this->assertEquals($response['body']['range'], '24h'); - $this->assertIsArray($response['body']['files.count']); - $this->assertIsArray($response['body']['files.create']); - $this->assertIsArray($response['body']['files.read']); - $this->assertIsArray($response['body']['files.update']); - $this->assertIsArray($response['body']['files.delete']); + $this->assertIsArray($response['body']['filesCount']); + $this->assertIsArray($response['body']['filesCreate']); + $this->assertIsArray($response['body']['filesRead']); + $this->assertIsArray($response['body']['filesUpdate']); + $this->assertIsArray($response['body']['filesDelete']); } -} \ No newline at end of file +} diff --git a/tests/e2e/Services/Users/UsersConsoleClientTest.php b/tests/e2e/Services/Users/UsersConsoleClientTest.php index 90a10a0c4f..9cc23e825a 100644 --- a/tests/e2e/Services/Users/UsersConsoleClientTest.php +++ b/tests/e2e/Services/Users/UsersConsoleClientTest.php @@ -37,7 +37,7 @@ class UsersConsoleClientTest extends Scope ]); $this->assertEquals($response['headers']['status-code'], 400); - + /** * Test for SUCCESS */ @@ -52,15 +52,15 @@ class UsersConsoleClientTest extends Scope $this->assertEquals($response['headers']['status-code'], 200); $this->assertEquals(count($response['body']), 9); $this->assertEquals($response['body']['range'], '24h'); - $this->assertIsArray($response['body']['users.count']); - $this->assertIsArray($response['body']['users.create']); - $this->assertIsArray($response['body']['users.read']); - $this->assertIsArray($response['body']['users.update']); - $this->assertIsArray($response['body']['users.delete']); - $this->assertIsArray($response['body']['sessions.create']); - $this->assertIsArray($response['body']['sessions.provider.create']); - $this->assertIsArray($response['body']['sessions.delete']); - + $this->assertIsArray($response['body']['usersCount']); + $this->assertIsArray($response['body']['usersCreate']); + $this->assertIsArray($response['body']['usersRead']); + $this->assertIsArray($response['body']['usersUpdate']); + $this->assertIsArray($response['body']['usersDelete']); + $this->assertIsArray($response['body']['sessionsCreate']); + $this->assertIsArray($response['body']['sessionsProviderCreate']); + $this->assertIsArray($response['body']['sessionsDelete']); + $response = $this->client->call(Client::METHOD_GET, '/users/usage', array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'] @@ -71,13 +71,13 @@ class UsersConsoleClientTest extends Scope $this->assertEquals($response['headers']['status-code'], 200); $this->assertEquals(count($response['body']), 9); $this->assertEquals($response['body']['range'], '24h'); - $this->assertIsArray($response['body']['users.count']); - $this->assertIsArray($response['body']['users.create']); - $this->assertIsArray($response['body']['users.read']); - $this->assertIsArray($response['body']['users.update']); - $this->assertIsArray($response['body']['users.delete']); - $this->assertIsArray($response['body']['sessions.create']); - $this->assertIsArray($response['body']['sessions.provider.create']); - $this->assertIsArray($response['body']['sessions.delete']); + $this->assertIsArray($response['body']['usersCount']); + $this->assertIsArray($response['body']['usersCreate']); + $this->assertIsArray($response['body']['usersRead']); + $this->assertIsArray($response['body']['usersUpdate']); + $this->assertIsArray($response['body']['usersDelete']); + $this->assertIsArray($response['body']['sessionsCreate']); + $this->assertIsArray($response['body']['sessionsProviderCreate']); + $this->assertIsArray($response['body']['sessionsDelete']); } -} \ No newline at end of file +}