Skip to content

Commit d40ac79

Browse files
soyukasoyuka
committed
fix twig profiler issue
1 parent 930b545 commit d40ac79

File tree

2 files changed

+56
-63
lines changed

2 files changed

+56
-63
lines changed

‎src/Symfony/Bundle/Resources/views/DataCollector/request.html.twig‎

Lines changed: 53 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -139,67 +139,62 @@
139139
</div>
140140
</div>
141141
{% if dataCollected.resourceMetadataCollection is not empty %}
142-
<div class="sf-tabs">
143-
<div class="tab">
144-
<h3 class="tab-title metadata-tab-title">Metadata</h3>
145-
<h3>Resources</h3>
146-
<div class="tab-content metadata-tab-content">
147-
<div class="sf-tabs">
148-
{% for resourceMetadata in dataCollected.resourceMetadataCollection %}
149-
<div class="tab">
150-
<h3 class="tab-title">
151-
{{ resourceMetadata.resource.uriTemplate ?? resourceMetadata.resource.shortName }}
152-
</h3>
153-
<div class="tab-content">
154-
<table>
155-
<thead>
156-
<tr>
157-
<th scope="col" class="key">Resource</th>
158-
</tr>
159-
</thead>
160-
<tbody>
161-
<tr>
162-
<td>{{- profiler_dump(resourceMetadata.resource, 1) -}}</td>
163-
</tr>
164-
</tbody>
165-
</table>
166-
{{ apiPlatform.operationTable(resourceMetadata.operations, '', dataCollected.requestAttributes.operation_name|default('')) }}
167-
<table>
168-
<thead>
169-
<tr>
170-
<th scope="col" class="key">Filters</th>
171-
<th scope="col"></th>
172-
</tr>
173-
</thead>
174-
<tbody>
175-
{% if dataCollected.filters and loop.index0 in dataCollected.filters|keys %}
176-
{% for id, filter in dataCollected.filters[loop.index0] %}
177-
{% set ignored_filter = filter is same as(null) %}
178-
<tr{% if ignored_filter %} class="status-warning"{% endif %}>
179-
<td>
180-
{{ id }}
181-
{% if ignored_filter %}
182-
<span class="newline text-muted">ignored filter</span>
183-
{% else %}
184-
{{ dump(filter) }}
185-
{% endif %}
186-
</td>
187-
</tr>
188-
{% endfor %}
189-
{% else %}
190-
<tr>
191-
<td class="text-muted" colspan="2">
192-
No available filter declared for this resource.
142+
<h3>Resources</h3>
143+
<div class="tab-content metadata-tab-content">
144+
<div class="sf-tabs">
145+
{% for resourceMetadata in dataCollected.resourceMetadataCollection %}
146+
<div class="tab">
147+
<h3 class="tab-title">
148+
{{ resourceMetadata.resource.uriTemplate ?: resourceMetadata.resource.shortName }}
149+
</h3>
150+
<div class="tab-content">
151+
<table>
152+
<thead>
153+
<tr>
154+
<th scope="col" class="key">Resource</th>
155+
</tr>
156+
</thead>
157+
<tbody>
158+
<tr>
159+
<td>{{- profiler_dump(resourceMetadata.resource, 1) -}}</td>
160+
</tr>
161+
</tbody>
162+
</table>
163+
{{ apiPlatform.operationTable(resourceMetadata.operations, '', dataCollected.requestAttributes.operation_name|default('')) }}
164+
<table>
165+
<thead>
166+
<tr>
167+
<th scope="col" class="key">Filters</th>
168+
<th scope="col"></th>
169+
</tr>
170+
</thead>
171+
<tbody>
172+
{% if dataCollected.filters and loop.index0 in dataCollected.filters|keys %}
173+
{% for id, filter in dataCollected.filters[loop.index0] %}
174+
{% set ignored_filter = filter is same as(null) %}
175+
<tr{% if ignored_filter %} class="status-warning"{% endif %}>
176+
<td>
177+
{{ id }}
178+
{% if ignored_filter %}
179+
<span class="newline text-muted">ignored filter</span>
180+
{% else %}
181+
{{ dump(filter) }}
182+
{% endif %}
193183
</td>
194184
</tr>
195-
{% endif %}
196-
</tbody>
197-
</table>
198-
</div>
199-
</div>
200-
{% endfor %}
185+
{% endfor %}
186+
{% else %}
187+
<tr>
188+
<td class="text-muted" colspan="2">
189+
No available filter declared for this resource.
190+
</td>
191+
</tr>
192+
{% endif %}
193+
</tbody>
194+
</table>
195+
</div>
201196
</div>
202-
</div>
197+
{% endfor %}
203198
</div>
204199
</div>
205200
{% endif %}

‎tests/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,12 @@ public function testProfilerGeneralLayout(): void
147147
$this->assertCount(1, $metrics->filter('.metric'), 'The should be one metric displayed (resource class).');
148148
$this->assertSame('mongodb' === $this->env ? DocumentDummy::class : Dummy::class, $metrics->filter('span.value')->html());
149149

150-
$this->assertCount(4, $crawler->filter('.sf-tabs .tab-content'), 'Tabs must be presents on the panel.');
150+
$this->assertCount(3, $crawler->filter('.sf-tabs .tab-content'), 'Tabs must be presents on the panel.');
151151

152-
// Metadata tab
153-
$this->assertSame('Metadata', $crawler->filter('.tab:nth-of-type(1) .tab-title')->html());
154-
$tabContent = $crawler->filter('.tab:nth-of-type(1) .tab-content');
152+
$tabContent = $crawler->filter('.tab:nth-of-type(1)');
155153
$this->assertStringEndsWith('Dummy', trim($tabContent->filter('h3')->html()), 'the resource shortname should be displayed.');
156154

157-
$this->assertCount(9, $tabContent->filter('table'));
155+
$this->assertCount(3, $tabContent->filter('table'));
158156
$this->assertSame('Resource', $tabContent->filter('table:first-of-type thead th:first-of-type')->html());
159157
$this->assertSame('Operations', $tabContent->filter('table:nth-of-type(2) thead th:first-of-type')->html());
160158
$this->assertSame('Filters', $tabContent->filter('table:nth-of-type(3) thead th:first-of-type')->html());

0 commit comments

Comments
 (0)