From 59a50e4b0ec28d3036f1a411220944f44fdf5582 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Tue, 10 Dec 2019 11:56:22 +0100
Subject: [PATCH] templates: don't display param types as something important
 (#38276)

---
 passerelle/base/templatetags/passerelle.py    | 19 +++++++++++--------
 passerelle/static/css/style.css               |  4 ++++
 .../passerelle/manage/service_view.html       |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/passerelle/base/templatetags/passerelle.py b/passerelle/base/templatetags/passerelle.py
index cd65bd1f..6f186b2b 100644
--- a/passerelle/base/templatetags/passerelle.py
+++ b/passerelle/base/templatetags/passerelle.py
@@ -128,6 +128,9 @@ def render_json_schema(schema):
             s += ' [ ' + ' | '.join(parts) + ' ]'
         return mark_safe(s)
 
+    def html_type(s):
+        return '<i class="type">%s</i>' % s
+
     if 'anyOf' in schema:
         return many_of('anyOf', schema['anyOf'])
 
@@ -145,7 +148,7 @@ def render_json_schema(schema):
     description = schema.pop('description', None)
     typ = schema.pop('type', None)
     if typ == 'null':
-        return mark_safe('<b>null</b>')
+        return mark_safe(html_type('null'))
     if typ == 'string':
         enum = schema.pop('enum', [])
         min_length = schema.pop('minLength', '')
@@ -154,10 +157,10 @@ def render_json_schema(schema):
         if enum:
             enum = mark_safe(' | '.join(
                 [format_html('"<tt>{}</tt>"', el) for el in enum]))
-        s = '<b>string'
+        s = 'string'
         if max_length or min_length:
             s += format_html('[{0}:{1}]', min_length, max_length)
-        s += '</b>'
+        s = html_type(s)
         if enum:
             s += ' %s' % enum
         if pattern:
@@ -167,17 +170,17 @@ def render_json_schema(schema):
         return mark_safe(s)
     if typ == 'integer':
         if not schema:
-            return mark_safe('<b>integer</b>')
+            return mark_safe(html_type('integer'))
     if typ == 'number':
         if not schema:
-            return mark_safe('<b>number</b>')
+            return mark_safe(html_type('number'))
     if typ == 'array':
-        s = '<b>array</b> '
+        s = html_type('array') + ' '
         if 'items' in schema:
             s += render_json_schema(schema['items'])
         return mark_safe(s)
     if typ == 'object':
-        s = '<b>object</b>'
+        s = html_type('object')
         unflatten = schema.pop('unflatten', False)
         merge_extra = schema.pop('merge_extra', False)
         properties = schema.pop('properties', {})
@@ -224,7 +227,7 @@ def render_json_schema(schema):
         return mark_safe(s)
     if typ == 'boolean':
         if not schema:
-            return mark_safe('<b>boolean</b>')
+            return mark_safe(html_type('boolean'))
     return format_html('<em>{0} {1!r}</em>', _('unknown validation'), original_schema)
 
 
diff --git a/passerelle/static/css/style.css b/passerelle/static/css/style.css
index 7010eb77..2c2cd320 100644
--- a/passerelle/static/css/style.css
+++ b/passerelle/static/css/style.css
@@ -204,3 +204,7 @@ li.connector.status-down span.connector-name::after {
 .sftp-widget label {
 	display: block;
 }
+
+ul li .type {
+    color: grey;
+}
diff --git a/passerelle/templates/passerelle/manage/service_view.html b/passerelle/templates/passerelle/manage/service_view.html
index 57543d0b..36f10be0 100644
--- a/passerelle/templates/passerelle/manage/service_view.html
+++ b/passerelle/templates/passerelle/manage/service_view.html
@@ -74,7 +74,7 @@
                      {% if param.optional %}({% trans 'optional' %}{% if param.default_value %},
                        {% trans 'default value:' %} {{param.default_value}}{% endif %}){% endif %}
                        {% if param.description %}{% trans ':' %} {{param.description}}{% endif %}
-                       <b class="type">{% if param.type %}{{ param.type }}{% else %}string{% endif %}</b>
+                       <i class="type">({% if param.type %}{{ param.type }}{% else %}string{% endif %})</i>
                  </li>
                {% endfor %}
              </ul>
-- 
2.20.1