Skip to content

Commit bb97068

Browse files
authored
Fill out jobResult more when total fallback happens (#4)
* response contains an array of JobResults * include uuid as id in fallback html * fill out jobResult with more fields when fallback happens
1 parent f5f3a88 commit bb97068

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/JobResult.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ class JobResult
3030
*/
3131
public $originalJob;
3232

33+
/**
34+
* @var array
35+
*/
36+
public $meta;
37+
38+
/**
39+
* @var float
40+
*/
41+
public $duration;
42+
3343
/**
3444
* @param $serverResult
3545
* @param \WF\Hypernova\Job $originalJob
@@ -47,6 +57,8 @@ public static function fromServerResult($serverResult, \WF\Hypernova\Job $origin
4757
$res->error = $serverResult['error'];
4858
$res->html = $serverResult['html'];
4959
$res->success = $serverResult['success'];
60+
$res->meta = isset($serverResult['meta']) ? $serverResult['meta'] : [];
61+
$res->duration = isset($serverResult['duration']) ? $serverResult['duration'] : null;
5062
$res->originalJob = $originalJob;
5163

5264
return $res;

src/Renderer.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,10 @@ protected function fallback($topLevelError, $jobs)
198198
$result->error = $topLevelError;
199199
$result->results = array_map(function (\WF\Hypernova\Job $job) {
200200
$jobResult = new JobResult();
201-
$jobResult->html = $this->getFallbackHTML($job->name, $job->data);
201+
$uuid = \Ramsey\Uuid\Uuid::uuid4();
202+
$jobResult->html = $this->getFallbackHTML($job->name, $job->data, $uuid);
203+
$jobResult->meta = ['uuid' => (string) $uuid];
204+
$jobResult->originalJob = $job;
202205

203206
return $jobResult;
204207
}, $jobs);
@@ -209,10 +212,11 @@ protected function fallback($topLevelError, $jobs)
209212
/**
210213
* @param string $moduleName
211214
* @param array $data
215+
* @param \Ramsey\Uuid\UuidInterface $uuid
212216
*
213217
* @return string
214218
*/
215-
protected function getFallbackHTML($moduleName, $data)
219+
protected function getFallbackHTML($moduleName, $data, $uuid)
216220
{
217221
$uuid = \Ramsey\Uuid\Uuid::uuid4();
218222
return sprintf(

0 commit comments

Comments
 (0)