CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-05-20 20:52:36 +12:00
Code Issues Projects Releases Wiki Activity

Converted network charts to MB

Browse source
This commit is contained in:
Eldad Fux 2020-05-12 23:18:34 +03:00
parent 47e71236de
commit db40609ead
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/projects.php
View file

@ -175,7 +175,7 @@ $utopia->get('/v1/projects/:projectId/usage')
],
'last30' => [
'start' => DateTime::createFromFormat('U', strtotime('-30 days')),
'end' => DateTime::createFromFormat('U', strtotime('today')),
'end' => DateTime::createFromFormat('U', strtotime('tomorrow')),
'group' => '1d',
],
'last90' => [
@ -272,7 +272,7 @@ $utopia->get('/v1/projects/:projectId/usage')
}, $requests)),
],
'network' => [
'data' => $network,
'data' => array_map(function ($value) {return ['value' => round($value['value'] / 1000000, 2), 'date' => $value['date']];}, $network), // convert bytes to mb
'total' => array_sum(array_map(function ($item) {
return $item['value'];
}, $network)),

2
app/views/console/home/index.phtml
View file

@ -36,7 +36,7 @@ $graph = $this->getParam('graph', false);
<div class="row responsive">
<div class="col span-9">
<div class="chart pull-end">
<div class="content" data-ls-ui-chart></div>
<div class="content" data-forms-chart="Requests=usage.requests.data"></div>
</div>
<div class="chart-metric">

4
src/Appwrite/Task/Validator/Cron.php
View file

@ -30,6 +30,10 @@ class Cron extends Validator
*/
public function isValid($value)
{
if(empty($value)) {
return true;
}
if (!CronExpression::isValidExpression($value)) {
return false;
}

1
tests/e2e/Services/Functions/FunctionsCustomClientTest.php
View file

@ -28,7 +28,6 @@ class FunctionsConsoleClientTest extends Scope
'key2' => 'value2',
'key3' => 'value3',
],
'trigger' => 'event',
'events' => [
'account.create',
'account.delete',

4
tests/e2e/Services/Functions/FunctionsCustomServerTest.php
View file

@ -28,7 +28,6 @@ class FunctionsConsoleServerTest extends Scope
'key2' => 'value2',
'key3' => 'value3',
],
'trigger' => 'event',
'events' => [
'account.create',
'account.delete',
@ -50,7 +49,6 @@ class FunctionsConsoleServerTest extends Scope
// 'key2' => 'value2',
// 'key3' => 'value3',
// ], $response1['body']['vars']);
$this->assertEquals('event', $response1['body']['trigger']);
$this->assertEquals([
'account.create',
'account.delete',
@ -136,7 +134,6 @@ class FunctionsConsoleServerTest extends Scope
'key5' => 'value5',
'key6' => 'value6',
],
'trigger' => 'scheudle',
'events' => [
'account.update.name',
'account.update.email',
@ -156,7 +153,6 @@ class FunctionsConsoleServerTest extends Scope
// 'key5' => 'value5',
// 'key6' => 'value6',
// ], $response1['body']['vars']);
$this->assertEquals('scheudle', $response1['body']['trigger']);
$this->assertEquals([
'account.update.name',
'account.update.email',