Skip to content

Commit

Permalink
bug #1862 Disable the profiler panel when there's no data (javieregui…
Browse files Browse the repository at this point in the history 
…luz)

This PR was merged into the 1.16.x-dev branch.

Discussion
----------

Disable the profiler panel when there's no data

This is an alternative to #1861.

First, it correctly disables the menu option:

![menu](https://user-images.githubusercontent.com/73419/31683772-224e2522-b37e-11e7-89a1-b183c7183f59.png)

Second, it shows an empty panel:

![panel](https://user-images.githubusercontent.com/73419/31683796-2c83cac4-b37e-11e7-8397-766abaaad129.png)

-----

The GitHub diff looks awful, but I just added this and indented the existing code, so the changes are minimal:

```twig
{% if not collector.isEasyAdminAction %}
    <div class="empty">
        <p>No information available because this route is not related to EasyAdmin.</p>
    </div>
{% else %}
    ... existing code here ...
{% endif %}
```

Commits
-------

925d2fb Disable the profiler panel when there's no data
  • Loading branch information
@javiereguiluz
javiereguiluz committed Oct 18, 2017
2 parents fa5cdb4 + 925d2fb commit 7be7229
Showing 1 changed file with 74 additions and 64 deletions.
138 changes: 74 additions & 64 deletions src/Resources/views/data_collector/easyadmin.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{% endblock %}

{% block menu %}
<span class="label status-{{ not collector.isEasyAdminAction ? 'disabled' }}">
<span class="label {{ not collector.isEasyAdminAction ? 'disabled' }}">
<span class="icon">{{ include('@EasyAdmin/data_collector/icon.svg.twig', { height: 32 }) }}</span>
<strong>EasyAdmin</strong>
</span>
Expand All @@ -38,87 +38,97 @@

<h2>EasyAdmin <small>({{ constant('JavierEguiluz\\Bundle\\EasyAdminBundle\\EasyAdminBundle::VERSION') }})</small></h2>

{% if profiler_markup_version == 1 %}
{% if not collector.isEasyAdminAction %}

<h3>Request Parameters</h3>
{{ include('@WebProfiler/Profiler/table.html.twig', { data: collector.requestParameters }) }}
<div class="empty">
<p>No information available because this route is not related to EasyAdmin.</p>
</div>

{% else %}

{% if collector.requestParameters %}
<div class="metrics">
<div class="metric">
<span class="value">{{ collector.requestParameters.action|default('-') }}</span>
<span class="label">Action</span>
</div>
{% if profiler_markup_version == 1 %}

<div class="metric">
<span class="value">{{ collector.requestParameters.entity|default('-') }}</span>
<span class="label">Entity Name</span>
</div>
<h3>Request Parameters</h3>
{{ include('@WebProfiler/Profiler/table.html.twig', { data: collector.requestParameters }) }}

{% else %}

{% if collector.requestParameters.id %}
{% if collector.requestParameters %}
<div class="metrics">
<div class="metric">
<span class="value">{{ collector.requestParameters.id }}</span>
<span class="label">ID</span>
<span class="value">{{ collector.requestParameters.action|default('-') }}</span>
<span class="label">Action</span>
</div>
{% elseif collector.requestParameters.sort_field %}

<div class="metric">
<span class="value">{{ collector.requestParameters.sort_field }} <span class="unit">({{ collector.requestParameters.sort_direction }})</span></span>
<span class="label">Sorting</span>
<span class="value">{{ collector.requestParameters.entity|default('-') }}</span>
<span class="label">Entity Name</span>
</div>

{% if collector.requestParameters.id %}
<div class="metric">
<span class="value">{{ collector.requestParameters.id }}</span>
<span class="label">ID</span>
</div>
{% elseif collector.requestParameters.sort_field %}
<div class="metric">
<span class="value">{{ collector.requestParameters.sort_field }} <span class="unit">({{ collector.requestParameters.sort_direction }})</span></span>
<span class="label">Sorting</span>
</div>
{% endif %}
</div>
{% endif %}
</div>

{% endif %}

{% endif %}
<div class="sf-tabs">
<div class="tab">
<h3 class="tab-title">Current Entity Configuration</h3>
<div class="tab-content">
{{ collector.dump(collector.currentEntityConfig)|raw }}
</div>

<div class="sf-tabs">
<div class="tab">
<h3 class="tab-title">Current Entity Configuration</h3>
<div class="tab-content">
{{ collector.dump(collector.currentEntityConfig)|raw }}
<br>
</div>

<br>
</div>

<div class="tab">
<h3 class="tab-title">Full Backend Configuration</h3>
<div class="tab-content">

<h4>Basic Configuration</h4>
{{ collector.dump({
'site_name': collector.backendConfig['site_name'],
'formats': collector.backendConfig['formats']
})|raw }}

<h4>Design Configuration</h4>
{{ collector.dump({
'design': collector.backendConfig['design']
})|raw }}

<h4>Actions Configuration</h4>
{{ collector.dump({
'disabled_actions': collector.backendConfig['disabled_actions'],
'list': collector.backendConfig['list'],
'edit': collector.backendConfig['edit'],
'new': collector.backendConfig['new'],
'show': collector.backendConfig['show'],
})|raw }}

<h4>Entities Configuration</h4>
{{ collector.dump({
'entities': collector.backendConfig['entities']
})|raw }}

<h4>Full Backend Configuration</h4>
{{ collector.dump({
'easy_admin': collector.backendConfig
})|raw }}
<div class="tab">
<h3 class="tab-title">Full Backend Configuration</h3>
<div class="tab-content">

<h4>Basic Configuration</h4>
{{ collector.dump({
'site_name': collector.backendConfig['site_name'],
'formats': collector.backendConfig['formats']
})|raw }}

<h4>Design Configuration</h4>
{{ collector.dump({
'design': collector.backendConfig['design']
})|raw }}

<h4>Actions Configuration</h4>
{{ collector.dump({
'disabled_actions': collector.backendConfig['disabled_actions'],
'list': collector.backendConfig['list'],
'edit': collector.backendConfig['edit'],
'new': collector.backendConfig['new'],
'show': collector.backendConfig['show'],
})|raw }}

<h4>Entities Configuration</h4>
{{ collector.dump({
'entities': collector.backendConfig['entities']
})|raw }}

<h4>Full Backend Configuration</h4>
{{ collector.dump({
'easy_admin': collector.backendConfig
})|raw }}
</div>
</div>
</div>
</div>

{% endif %}

<h3>Additional Resources</h3>

Expand Down

0 comments on commit 7be7229

Please sign in to comment.