#17 display header in column #46

PetrS12 · 2020-10-17T20:56:26Z

closes #17

Merge develop from uma-tech parrot

# Conflicts: # templates/admin/http_stubs/change_form.html # templates/admin/http_stubs/includes/fieldset.html

codecov · 2020-10-17T20:58:05Z

Codecov Report

Merging #46 (18044bf) into develop (d780eec) will increase coverage by 0.35%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop      #46      +/-   ##
===========================================
+ Coverage    95.96%   96.32%   +0.35%     
===========================================
  Files            5        5              
  Lines          124      136      +12     
  Branches         5        6       +1     
===========================================
+ Hits           119      131      +12     
  Misses           4        4              
  Partials         1        1

Impacted Files	Coverage Δ
http_stubs/templatetags/stub_tags.py	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d780eec...18044bf. Read the comment docs.

http_stubs/templatetags/stub_tags.py

emorozov · 2020-10-19T08:46:30Z

templates/admin/http_stubs/includes/fieldset.html

@@ -16,7 +16,7 @@
                    {% else %}
                        {{ field.label_tag }}
                        {% if field.is_readonly %}
-                            <div class="readonly">{{ field.contents }}</div>
+                            {% if field.field.name == 'headers' %}<ul class="readonly">{% for header in field.contents|str_to_list:"', " %}<li>{{ header|cut:"'" }}</li>{% endfor %}</ul>{% else %}<div class="readonly">{{ field.contents }}</div>{% endif %}


This approach looks extremely clumsy. With every change we just lay over one more layer of unreadable template code.

I'd suggest trying something else.

For the forms in general, django-crispy-forms is excellent.

And just for this case, for example, we may try using a separate field type or something.

But just adding ad-hoc conditions for every field will soon make the source harder to understand and maintain.

Unfortunately, django-crispy-forms aren't not very good friends with simpleui, but if I used crispy I would make a template for this field.
I made custom change templates for every model. And set the attribute change_form_template in admin model.

Well, unfortunately, I never worked with simpleui, and it's a long time since I've last worked with Django forms.
I need some time to experiment myself with Django built-in functionality and/or crispy.
Crispy forms allow to use any custom template for any field as far as I remember, although this might also look a bit clumsy.

Decided to leave it as it is.

emorozov · 2020-11-04T20:14:06Z

http_stubs/templatetags/stub_tags.py

@@ -16,3 +18,15 @@ def get_absolute_url_tag(context: Dict, url: Url) -> Url:
    :returns: absolute url
    """
    return context.get('request').build_absolute_uri(url)
+
+
+@register.filter(name='headers_to_list')


Nit: if we call function headers_to_list, then we won't have to specify the name as the register argument. There's no need to give distinct names to the function and the filter.

Also, this will break if some header contains separator. I think this is highly probable for the text headers, maybe using json module for proper loading of the headers would be more robust?..

Changed. Thanks!

emorozov · 2020-11-04T20:16:53Z

http_stubs/templatetags/stub_tags.py

+@register.filter(name='headers_to_list')
+@stringfilter
+def get_headers_list(headers: AnyStr, separator: AnyStr) -> List:
+    """Filter that creates a list from a string of headers(dict).


I'd start from Python str.split description because it is more clear. E.g.:
Return a list of the lines in the string representation of the request headers, using sep as the delimiter string.

Changed. Thanks!

emorozov · 2020-11-04T20:17:24Z

http_stubs/templatetags/stub_tags.py

+def get_headers_list(headers: AnyStr, separator: AnyStr) -> List:
+    """Filter that creates a list from a string of headers(dict).
+
+    :param headers: string of headers


Suggested change

:param headers: string of headers

:param headers: string representation of the request headers

Changed. Thanks!

emorozov · 2020-11-04T20:18:22Z

http_stubs/templatetags/stub_tags.py

+    """Filter that creates a list from a string of headers(dict).
+
+    :param headers: string of headers
+    :param separator: separator to separate string


Suggested change

:param separator: separator to separate string

:param separator: delimiter string

(also from str.split docs)

Deleted this part of code.

emorozov · 2020-11-04T20:19:57Z

http_stubs/templatetags/stub_tags.py

+
+    :param headers: string of headers
+    :param separator: separator to separate string
+    :returns: list of headers


Suggested change

:returns: list of headers

:returns: list of individual headers string representation

(nit: unsure, but list of headers is too vague in my opinion).

Changed. Thanks!

emorozov · 2020-11-04T20:26:49Z

deploy/app/start-django-dev.sh

@@ -2,4 +2,4 @@

 wait-for-it "${PARROT_DB_HOST:-parrot-database}":5432 -s -t 180 \
 && python /app/src/manage.py migrate --noinput \
-&& python /app/src/manage.py runserver 0.0.0.0:8042
+&& python /app/src/manage.py runserver 127.0.0.1:8042


This looks like it should be in a separate PR or a debug change that made its way into production code. :)

Changed. Thanks!

emorozov · 2020-11-04T20:28:54Z

templates/admin/http_stubs/includes/fieldset_http_stub.html

+{% block writable_field %}
+    {{ field.field }}
+    {# added request url for path field(issue #35) #}
+    {% if field.field.name == 'path' %}<div class="readonly"><div id="full-path">{% absolute field.field.value %}</div><div id="path-copied-alert">Скопировано!</div></div>{% endif %}


Cyrillic characters still remain. Also, HTML doesn't impose the requirement to have everything in one extremely long line.
HTML can be broken at almost any boundary, this can greatly enhance readability of this line.

Changed. Thanks!

…elop

lowitea · 2020-12-12T18:44:43Z

@PetrS12 could you please rebase this branch

…elop

# Conflicts: # templates/admin/http_stubs/includes/fieldset.html

sonarcloud · 2020-12-13T10:30:20Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

PetrS12 and others added 7 commits October 11, 2020 18:17

added absolute templatetag

495c7e9

added request url to stub edit page

38225e4

added str_to_list filter for template

8779577

headers in column

11d0672

Merge pull request #3 from Uma-Tech/develop

b061787

Merge develop from uma-tech parrot

Merge branch 'develop' into Uma-Tech#17-display_header_in_column

b79e1a3

# Conflicts: # templates/admin/http_stubs/change_form.html # templates/admin/http_stubs/includes/fieldset.html

linted and added test for filter

629041a

lowitea added the hacktoberfest-accepted label Oct 17, 2020

emorozov reviewed Oct 19, 2020

View reviewed changes

http_stubs/templatetags/stub_tags.py Outdated Show resolved Hide resolved

emorozov reviewed Oct 19, 2020

View reviewed changes

lowitea self-requested a review October 19, 2020 19:11

PetrS12 added 4 commits November 2, 2020 00:32

added change_form_template for every Admin and refactor templates

f91a730

added change_form_template attribute

ddc7213

changed local host in .sh for dev

5be013d

str_to_list renamed to headers_to_list

867ae5e

emorozov reviewed Nov 4, 2020

View reviewed changes

PetrS12 added 10 commits November 22, 2020 23:06

Merge branch 'develop' of https://github.com/Uma-Tech/parrot into dev…

4d8413c

…elop

Merge branch 'develop' into Uma-Tech#17-display_header_in_column

1ad82e3

tranclate to copied

27bfe76

corrected start-django.dev

5427684

refactored headers_to_list: added json.loads

4a9c169

fixed tests and linted

61ab187

added test for ivalid headers

184b24c

corrected test

ab1aeae

Merge branch 'develop' of https://github.com/Uma-Tech/parrot into dev…

832fa68

…elop

Merge branch 'develop' of https://github.com/Uma-Tech/parrot into dev…

ca1945b

…elop

lowitea assigned PetrS12 Dec 7, 2020

lowitea added this to the 1.0.0 milestone Dec 7, 2020

lowitea approved these changes Dec 12, 2020

View reviewed changes

PetrS12 added 3 commits December 13, 2020 13:09

Merge branch 'develop' of https://github.com/Uma-Tech/parrot into dev…

e0bd386

…elop

Merge branch 'develop' into Uma-Tech#17-display_header_in_column

778fe34

# Conflicts: # templates/admin/http_stubs/includes/fieldset.html

replaced spike-nail for pretty_body to filedset_log_entry template

18044bf

lowitea merged commit e5d9672 into Uma-Tech:develop Dec 13, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#17 display header in column #46

#17 display header in column #46

PetrS12 commented Oct 17, 2020

codecov bot commented Oct 17, 2020 •

edited

emorozov Oct 19, 2020

PetrS12 Nov 4, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

emorozov Nov 4, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

emorozov Nov 4, 2020

PetrS12 Nov 28, 2020

lowitea commented Dec 12, 2020

sonarcloud bot commented Dec 13, 2020

	:param headers: string of headers
	:param headers: string representation of the request headers

	:param separator: separator to separate string
	:param separator: delimiter string

	:returns: list of headers
	:returns: list of individual headers string representation

#17 display header in column #46

#17 display header in column #46

Conversation

PetrS12 commented Oct 17, 2020

codecov bot commented Oct 17, 2020 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lowitea commented Dec 12, 2020

sonarcloud bot commented Dec 13, 2020

codecov bot commented Oct 17, 2020 •

edited