Skip to content

Commit

Permalink
Merge branch 'main' into support/3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@dsuch
dsuch committed Nov 9, 2023
2 parents 1136983 + 2ea689e commit 20e78ec
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 129 deletions.
2 changes: 1 addition & 1 deletion code/zato-web-admin/src/zato/admin/templates/zato/service/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h2 class="zato">Services</h2>
<tr class="{% cycle 'odd' 'even' %}" id='tr_{{ item.id }}'>
<td class='numbering'>&nbsp;</td>
<td class="impexp"><input type="checkbox" /></td>
<td><a href="{% url "service-overview" item.name %}?cluster={{ cluster_id }}">{{ item.name }}</a></td>
<td><a href="{% url "service-invoker" item.name %}?cluster={{ cluster_id }}">{{ item.name }}</a></td>
<td>{{ item.is_active|yesno:'Yes,No' }}</td>
<td>{{ item.impl_name }}</td>
<td>{{ item.is_internal|yesno:'Yes,No' }}</td>
Expand Down
27 changes: 0 additions & 27 deletions code/zato-web-admin/src/zato/admin/templates/zato/service/invoker.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,6 @@ <h2 class="zato">Services : <a href="{% url "service" %}?cluster={{ cluster_id }
<textarea style="width:100%; height:130px" id="payload" name="payload"></textarea>
<br/><br/>

<table>
<tr>
<td>
Data format:
</td>
<td>
<select name="data_format" id="data_format">
<option value="" selected="selected">----------</option>
<option value="json">JSON</option>
<option value="xml">XML</option>
</select>
</td>
</tr>
<tr>
<td>
Transport:
</td>
<td>
<select name="transport" id="transport">
<option value="" selected="selected">----------</option>
<option value="plain_http">Plain HTTP</option>
<option value="soap">SOAP</option>
</select>
</td>
</tr>
</table>

<input type="hidden" id="name" name="name" value="{{ service.name }}" />
<input type="hidden" id="cluster_id" name="cluster_id" value="{{ cluster_id }}" />

Expand Down
101 changes: 0 additions & 101 deletions code/zato-web-admin/src/zato/admin/templates/zato/service/overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,107 +45,6 @@ <h2 class="zato">Services : <a href="{% url "service" %}?cluster={{ cluster_id }

<div id="markup">
<table id="data-table">
<tr>
<td class='inline_header'>Overview</td>
</tr>
<tr>
<td>
<div class="item-details-body">
<table style="width:100%">
<tr>

<td style="width:25%">
<table>
<tr>
<td class='inline_header' colspan="2">Statistics</td>
</tr>
<tr>

<tr>
<td style="width:35%">Usage</td>
<td>{{ service.usage }}</td>
</tr>
</tr>
<td>Last used</td>
<td>
{% if service.usage %}

<a
id="a_last_timestamp"
href="javascript:$.fn.zato.toggle_time('last_timestamp', '{{ service.last_timestamp }}', '{{ service.last_timestamp_utc }}')">{{ service.last_timestamp }}
</a>

{% else %}
<span class="form_hint">n/a</span>
{% endif %}
</td>
</tr>
<tr>
<td>Last response time</td>
<td>
{% if service.usage %}
{{ service.last_duration|format_float:1 }} ms
{% else %}
<span class="form_hint">n/a</span>
{% endif %}
</td>
</tr>

<tr>
<td>
Min/max/mean
<span class="form_hint">(ms)</span>
</td>
<td>
{% if service.usage %}
{{ service.usage_min|floatformat:1 }}
/
{{ service.usage_max|floatformat:1 }}
/
{{ service.usage_mean|floatformat:1 }}
{% else %}
<span class="form_hint">n/a</span>
{% endif %}
</td>
</tr>
</table>
</td>

<td style="width:65%">

{% if service.docs_full_md %}
<table style="width:100%;" id="docs-table">
<tr>
<td class='inline_header'>Documentation</td>
</tr>
<tr>
<td>
{{ service.docs_full_md|safe }}
</td>
</tr>
</table>
{% endif %}

<table style="width:100%">
<tr>
<td class='inline_header'>Channels and scheduler</td>
</tr>
<tr>
<td>
REST: {% if not service.plain_http_channels %}<span class="form_hint">(None)</span> {% endif %}{% for item in service.plain_http_channels %}<a class="common" href="{{ item.url }}">{{ item.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
AMQP: {% if not service.amqp_channels %}<span class="form_hint">(None)</span> {% endif %}{% for item in service.amqp_channels %}<a class="common" href="{{ item.url }}">{{ item.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
IBM MQ: {% if not service.wmq_channels %}<span class="form_hint">(None)</span> {% endif %}{% for item in service.wmq_channels %}<a class="common" href="{{ item.url }}">{{ item.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
Scheduler: {% if not service.scheduler_jobs %}<span class="form_hint">(None)</span> {% endif %}{% for item in service.scheduler_jobs %}<a class="common" href="{{ item.url }}">{{ item.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}<br/>
</td>
</tr>
</table>

</td>
</tr>
</table>
</div> <!-- class="item-details-body" -->
</td>
</tr>
<tr>
<td class='inline_header'>Deployment info</td>
</tr>
Expand Down

0 comments on commit 20e78ec

Please sign in to comment.