Skip to content

Commit eb52081

Browse files
committed
TASK: ui fixes
1 parent dc838ad commit eb52081

4 files changed

Lines changed: 151970 additions & 266 deletions

File tree

Classes/PrepareContentRelease/Dto/ContentReleaseMetadata.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,17 @@ public function jsonSerialize()
9191

9292
public function withEndTime(\DateTimeInterface $endTime): self
9393
{
94-
return new self($this->prunnerJobId, $this->startTime, $endTime, $this->switchTime, $this->status);
94+
return new self($this->prunnerJobId, $this->startTime, $endTime, $this->switchTime, $this->status, $this->manualTransferJobIds);
9595
}
9696

9797
public function withSwitchTime(\DateTimeInterface $switchTime): self
9898
{
99-
return new self($this->prunnerJobId, $this->startTime, $this->endTime, $switchTime, $this->status);
99+
return new self($this->prunnerJobId, $this->startTime, $this->endTime, $switchTime, $this->status, $this->manualTransferJobIds);
100100
}
101101

102102
public function withStatus(NodeRenderingCompletionStatus $status): self
103103
{
104-
return new self($this->prunnerJobId, $this->startTime, $this->endTime, $this->switchTime, $status);
104+
return new self($this->prunnerJobId, $this->startTime, $this->endTime, $this->switchTime, $status, $this->manualTransferJobIds);
105105
}
106106

107107
public function withAdditionalManualTransferJobId(PrunnerJobId $prunnerJobId): self

Resources/Private/BackendFusion/Integration/Backend.Details.fusion

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,23 @@ Flowpack.DecoupledContentStore.BackendController.details = Neos.Fusion:Component
1717
/>
1818
</form>
1919
<Flowpack.DecoupledContentStore:Integration.StylesAndScripts/>
20-
<h1 class="text-3xl py-5" style="display: inline;">
20+
<h1 class="text-3xl py-5 inline">
2121
Content Release {detailsData.contentReleaseIdentifier.identifier}
2222
</h1>
2323
{" "}
2424
<span class="neos-badge" style="vertical-align: super;" title="content store" data-neos-toggle="tooltip">{contentStore}</span>
25-
<Flowpack.DecoupledContentStore:ContentReleaseSteps _taskResults={detailsData.job.taskResults} />
25+
<Flowpack.DecoupledContentStore:ContentReleaseSteps
26+
_taskResults={detailsData.job.taskResults}
27+
prunnerStart={detailsData.job.created}
28+
/>
2629
<Neos.Fusion:Loop items={detailsData.manualTransferJobs}>
27-
<Flowpack.DecoupledContentStore:ContentReleaseSteps _taskResults={item.taskResults} isManualTransferPipeline={true} prunnerJobId={item.id.id} />
30+
<Flowpack.DecoupledContentStore:ContentReleaseSteps
31+
_taskResults={item.taskResults}
32+
isManualTransferPipeline={true}
33+
prunnerJobId={item.id.id}
34+
prunnerStart={item.created}
35+
manualSwitchTarget={item.variables.redisInstanceId}
36+
/>
2837
</Neos.Fusion:Loop>
2938

3039
<h2 @if.isTrue={detailTaskName} class="text-3xl py-5">Log Output for {detailTaskName}</h2>
@@ -43,8 +52,12 @@ prototype(Flowpack.DecoupledContentStore:ContentReleaseSteps) < prototype(Neos.F
4352
_taskResults = null
4453
isManualTransferPipeline = false
4554
prunnerJobId = ''
55+
prunnerStart = ''
56+
prunnerStart.@process.date = ${value ? Date.format(value, 'd.m.Y H:i:s') : ''}
57+
manualSwitchTarget = ''
4658

4759
renderer = afx`
60+
<span class="inline-block mt-4" @if.isManualTransferPipeline={props.isManualTransferPipeline}>Start: {props.prunnerStart}, Transfer to: {props.manualSwitchTarget}</span>
4861
<ol class="border border-gray-300 rounded-md divide-y divide-gray-300 md:flex md:divide-y-0 bg-gray-700">
4962
<!-- Prepare -->
5063
<Flowpack.DecoupledContentStore:ContentReleaseSteps.Step
@@ -205,7 +218,9 @@ prototype(Flowpack.DecoupledContentStore:ContentReleaseSteps) < prototype(Neos.F
205218

206219

207220
<dl @if.isNotManualTransferPipeline={!props.isManualTransferPipeline} class="md:flex md:divide-y-0 divide-y">
208-
<Flowpack.DecoupledContentStore:ContentReleaseStats.StatsBox/>
221+
<Flowpack.DecoupledContentStore:ContentReleaseStats.StatsBox>
222+
<Flowpack.DecoupledContentStore:ContentReleaseStats.Stat title={"Start: " + props.prunnerStart} />
223+
</Flowpack.DecoupledContentStore:ContentReleaseStats.StatsBox>
209224
<Flowpack.DecoupledContentStore:ContentReleaseStats.StatsBox>
210225
<Flowpack.DecoupledContentStore:ContentReleaseStats.Stat title="Enumerated Pages">
211226
{detailsData.enumeratedDocumentNodesCount}
@@ -232,7 +247,7 @@ prototype(Flowpack.DecoupledContentStore:ContentReleaseSteps) < prototype(Neos.F
232247
</Flowpack.DecoupledContentStore:ContentReleaseStats.StatsBox>
233248
<Flowpack.DecoupledContentStore:ContentReleaseStats.StatsBox>
234249
<Flowpack.DecoupledContentStore:ContentReleaseStats.Stat title="Is currently live?">
235-
{detailsData.active}
250+
{detailsData.active ? detailsData.active : "-"}
236251
</Flowpack.DecoupledContentStore:ContentReleaseStats.Stat>
237252
</Flowpack.DecoupledContentStore:ContentReleaseStats.StatsBox>
238253
</dl>

Resources/Private/BackendFusion/Integration/Backend.Index.fusion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ prototype(Flowpack.DecoupledContentStore:ListFooter) < prototype(Neos.Fusion:Com
9595
<Neos.Fusion:Link.Action href.action="index" class="neos-button">
9696
<i class="fa fa-sync"></i> Reload
9797
</Neos.Fusion:Link.Action>
98-
<span style="font-size:14px; display: inline-block; vertical-align: middle; padding-right: 14px; padding-left: 60px;">Active Content Store:</span>
98+
<span class="align-middle inline-block text-sm pr-4 pl-16">Active Content Store:</span>
9999
<Neos.Fusion:Loop items={redisContentStores}>
100100
<Neos.Fusion:Link.Action href.action="index" href.arguments={{contentStore: item}} class={AtomicFusion.classNames('neos-button', {'neos-button-primary': item == contentStore})}>
101101
{item}

0 commit comments

Comments
 (0)