From 0091b052d18dd8cdd05e02adf4e7bd99966b4e13 Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 16 Mar 2023 15:31:43 +0100 Subject: [PATCH 01/45] [#1249] Added headers to the logs, fixed requests hooks --- src/log_outgoing_requests/admin.py | 4 ++- src/log_outgoing_requests/formatters.py | 7 ++++ src/log_outgoing_requests/handlers.py | 2 ++ src/log_outgoing_requests/log_requests.py | 3 +- .../migrations/0002_auto_20230316_1459.py | 33 +++++++++++++++++++ src/log_outgoing_requests/models.py | 21 ++++++++++-- .../tests/test_logging.py | 11 +++++++ 7 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 src/log_outgoing_requests/migrations/0002_auto_20230316_1459.py diff --git a/src/log_outgoing_requests/admin.py b/src/log_outgoing_requests/admin.py index 8289caa55a..fdc9531548 100644 --- a/src/log_outgoing_requests/admin.py +++ b/src/log_outgoing_requests/admin.py @@ -17,6 +17,8 @@ class OutgoingRequestsLogAdmin(admin.ModelAdmin): "timestamp", "req_content_type", "res_content_type", + "req_headers", + "res_headers", "trace", ) readonly_fields = fields @@ -30,7 +32,7 @@ class OutgoingRequestsLogAdmin(admin.ModelAdmin): "timestamp", ) list_filter = ("method", "status_code", "hostname") - search_fields = ("params", "query_params", "hostname") + search_fields = ("url", "params", "hostname") date_hierarchy = "timestamp" show_full_result_count = False diff --git a/src/log_outgoing_requests/formatters.py b/src/log_outgoing_requests/formatters.py index de29e75486..b12eae1154 100644 --- a/src/log_outgoing_requests/formatters.py +++ b/src/log_outgoing_requests/formatters.py @@ -3,6 +3,9 @@ class HttpFormatter(logging.Formatter): + def _formatHeaders(self, d): + return "\n".join(f"{k}: {v}" for k, v in d.items()) + def formatMessage(self, record): result = super().formatMessage(record) if record.name == "requests": @@ -10,14 +13,18 @@ def formatMessage(self, record): """ ---------------- request ---------------- {req.method} {req.url} + {reqhdrs} ---------------- response ---------------- {res.status_code} {res.reason} {res.url} + {reshdrs} """ ).format( req=record.req, res=record.res, + reqhdrs=self._formatHeaders(record.req.headers), + reshdrs=self._formatHeaders(record.res.headers), ) return result diff --git a/src/log_outgoing_requests/handlers.py b/src/log_outgoing_requests/handlers.py index 9158307df7..0da03fff2e 100644 --- a/src/log_outgoing_requests/handlers.py +++ b/src/log_outgoing_requests/handlers.py @@ -29,6 +29,8 @@ def emit(self, record): "res_content_type": record.res.headers.get("Content-Type", ""), "timestamp": record.requested_at, "response_ms": int(record.res.elapsed.total_seconds() * 1000), + "req_headers": record.req.headers, + "res_headers": record.res.headers, "trace": trace, } diff --git a/src/log_outgoing_requests/log_requests.py b/src/log_outgoing_requests/log_requests.py index ea994ab9ae..84abd274db 100644 --- a/src/log_outgoing_requests/log_requests.py +++ b/src/log_outgoing_requests/log_requests.py @@ -12,6 +12,7 @@ def hook_requests_logging(response, *args, **kwargs): """ A hook for requests library in order to add extra data to the logs """ + response.request.headers.pop("Authorization", None) extra = {"requested_at": timezone.now(), "req": response.request, "res": response} logger.debug("Outgoing request", extra=extra) @@ -30,7 +31,7 @@ def install_outgoing_requests_logging(): Session._original_request = Session.request def new_request(self, *args, **kwargs): - kwargs.setdefault("hooks", {"response": hook_requests_logging}) + self.hooks["response"].append(hook_requests_logging) return self._original_request(*args, **kwargs) Session.request = new_request diff --git a/src/log_outgoing_requests/migrations/0002_auto_20230316_1459.py b/src/log_outgoing_requests/migrations/0002_auto_20230316_1459.py new file mode 100644 index 0000000000..b10b725e2f --- /dev/null +++ b/src/log_outgoing_requests/migrations/0002_auto_20230316_1459.py @@ -0,0 +1,33 @@ +# Generated by Django 3.2.15 on 2023-03-16 13:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("log_outgoing_requests", "0001_initial"), + ] + + operations = [ + migrations.AddField( + model_name="outgoingrequestslog", + name="req_headers", + field=models.TextField( + blank=True, + help_text="The request headers.", + null=True, + verbose_name="Request headers", + ), + ), + migrations.AddField( + model_name="outgoingrequestslog", + name="res_headers", + field=models.TextField( + blank=True, + help_text="The response headers.", + null=True, + verbose_name="Response headers", + ), + ), + ] diff --git a/src/log_outgoing_requests/models.py b/src/log_outgoing_requests/models.py index a9f1e658b5..215e481a5c 100644 --- a/src/log_outgoing_requests/models.py +++ b/src/log_outgoing_requests/models.py @@ -13,6 +13,8 @@ class OutgoingRequestsLog(models.Model): default="", help_text=_("The url of the outgoing request."), ) + + # hostname is added so we can filter on it in the admin page hostname = models.CharField( verbose_name=_("Hostname"), max_length=255, @@ -52,6 +54,18 @@ class OutgoingRequestsLog(models.Model): blank=True, help_text=_("The content type of the response."), ) + req_headers = models.TextField( + verbose_name=_("Request headers"), + blank=True, + null=True, + help_text=_("The request headers."), + ) + res_headers = models.TextField( + verbose_name=_("Response headers"), + blank=True, + null=True, + help_text=_("The response headers."), + ) response_ms = models.PositiveIntegerField( verbose_name=_("Response in ms"), default=0, @@ -79,6 +93,9 @@ def __str__(self): ) @cached_property + def url_parsed(self): + return urlparse(self.url) + + @property def query_params(self): - parsed_url = urlparse(self.url) - return parsed_url.query + return self.url_parsed.query diff --git a/src/log_outgoing_requests/tests/test_logging.py b/src/log_outgoing_requests/tests/test_logging.py index 368d6f0da2..c72a42aedf 100644 --- a/src/log_outgoing_requests/tests/test_logging.py +++ b/src/log_outgoing_requests/tests/test_logging.py @@ -69,6 +69,17 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): ) self.assertIsNone(request_log.trace) + def test_d(self, m): + self._setUpMocks(m) + + with self.assertLogs("requests", level="DEBUG") as logs: + requests.get( + "http://example.com/some-path?version=2.0", + headers={"Authorization": "test"}, + ) + + self.assertNotIn("Authorization", logs.records[0].req.headers) + def test_data_is_not_saved_when_saving_disabled(self, m): self._setUpMocks(m) From d35063908c94131399f853f70ff7ef36973984f3 Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 16 Mar 2023 16:16:37 +0100 Subject: [PATCH 02/45] [#1249] Fixed authorization header removal --- src/log_outgoing_requests/handlers.py | 2 ++ src/log_outgoing_requests/log_requests.py | 1 - src/log_outgoing_requests/tests/test_logging.py | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/log_outgoing_requests/handlers.py b/src/log_outgoing_requests/handlers.py index 0da03fff2e..ce8f6d2ba7 100644 --- a/src/log_outgoing_requests/handlers.py +++ b/src/log_outgoing_requests/handlers.py @@ -14,6 +14,8 @@ def emit(self, record): # save only the requests coming from the library requests if record and record.getMessage() == "Outgoing request": + record.req.headers.pop("Authorization", None) + if record.exc_info: trace = traceback.format_exc() diff --git a/src/log_outgoing_requests/log_requests.py b/src/log_outgoing_requests/log_requests.py index 84abd274db..bac831275e 100644 --- a/src/log_outgoing_requests/log_requests.py +++ b/src/log_outgoing_requests/log_requests.py @@ -12,7 +12,6 @@ def hook_requests_logging(response, *args, **kwargs): """ A hook for requests library in order to add extra data to the logs """ - response.request.headers.pop("Authorization", None) extra = {"requested_at": timezone.now(), "req": response.request, "res": response} logger.debug("Outgoing request", extra=extra) diff --git a/src/log_outgoing_requests/tests/test_logging.py b/src/log_outgoing_requests/tests/test_logging.py index c72a42aedf..6d646a20b9 100644 --- a/src/log_outgoing_requests/tests/test_logging.py +++ b/src/log_outgoing_requests/tests/test_logging.py @@ -72,13 +72,13 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): def test_d(self, m): self._setUpMocks(m) - with self.assertLogs("requests", level="DEBUG") as logs: - requests.get( - "http://example.com/some-path?version=2.0", - headers={"Authorization": "test"}, - ) + requests.get( + "http://example.com/some-path?version=2.0", + headers={"Authorization": "test"}, + ) + log = OutgoingRequestsLog.objects.get() - self.assertNotIn("Authorization", logs.records[0].req.headers) + self.assertNotIn("Authorization", eval(log.req_headers)) def test_data_is_not_saved_when_saving_disabled(self, m): self._setUpMocks(m) From 9640d6f1e8e0d7bf8eccd8f83a42e45e3a739ffd Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 16 Mar 2023 16:47:29 +0100 Subject: [PATCH 03/45] [#1249] Fixed test --- src/log_outgoing_requests/tests/test_logging.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/log_outgoing_requests/tests/test_logging.py b/src/log_outgoing_requests/tests/test_logging.py index 6d646a20b9..2937d0513d 100644 --- a/src/log_outgoing_requests/tests/test_logging.py +++ b/src/log_outgoing_requests/tests/test_logging.py @@ -69,7 +69,8 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): ) self.assertIsNone(request_log.trace) - def test_d(self, m): + @override_settings(LOG_OUTGOING_REQUESTS_DB_SAVE=True) + def test_authorization_header_is_not_saved(self, m): self._setUpMocks(m) requests.get( From 7d2861160f37bc1fe7d62fcf58448b66ca16ee0e Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 15 Mar 2023 16:42:32 +0100 Subject: [PATCH 04/45] [#1238] Started with adding cta button inside product content --- src/open_inwoner/js/admin/ckeditor/editor.js | 43 ++++++++++++++++++++ src/open_inwoner/pdc/admin/product.py | 12 ++++++ src/open_inwoner/utils/ckeditor.py | 24 +++++++++++ 3 files changed, 79 insertions(+) diff --git a/src/open_inwoner/js/admin/ckeditor/editor.js b/src/open_inwoner/js/admin/ckeditor/editor.js index 393f406ba3..ffded06353 100644 --- a/src/open_inwoner/js/admin/ckeditor/editor.js +++ b/src/open_inwoner/js/admin/ckeditor/editor.js @@ -19,8 +19,48 @@ import Table from '@ckeditor/ckeditor5-table/src/table' import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar' import FilerImageAdapterPlugin from './plugins/filer/plugin' +import Plugin from '@ckeditor/ckeditor5-core/src/plugin' +import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview' + export default class ClassicEditor extends ClassicEditorBase {} +class CTARequestButtonPlugin extends Plugin { + init() { + const editor = this.editor + + editor.ui.componentFactory.add('addRequest', () => { + // The button will be an instance of ButtonView. + const button = new ButtonView() + + button.set({ + label: 'Add request button', + withText: true, + }) + + //Execute a callback function when the button is clicked + button.on('execute', () => { + const formId = document.getElementById('id_form') + const linkId = document.getElementById('id_link') + let productSlug = '' + + if (formId) { + productSlug = formId.dataset.productSlug + } else if (linkId) { + productSlug = linkId.dataset.productSlug + } + + editor.model.change((writer) => { + const link = writer.createText(`[CTA/${productSlug}]`) + + editor.model.insertContent(link, editor.model.document.selection) + }) + }) + + return button + }) + } +} + // Plugins to include in the build. ClassicEditor.builtinPlugins = [ Markdown, @@ -42,6 +82,7 @@ ClassicEditor.builtinPlugins = [ FilerImageAdapterPlugin, Table, TableToolbar, + CTARequestButtonPlugin, ] // Editor configuration. @@ -66,6 +107,8 @@ ClassicEditor.defaultConfig = { '|', 'undo', 'redo', + '|', + 'addRequest', ], }, image: { diff --git a/src/open_inwoner/pdc/admin/product.py b/src/open_inwoner/pdc/admin/product.py index 76571498a2..0a2e05d872 100644 --- a/src/open_inwoner/pdc/admin/product.py +++ b/src/open_inwoner/pdc/admin/product.py @@ -93,6 +93,18 @@ def display_categories(self, obj): display_categories.short_description = "categories" + def get_form(self, request, obj=None, **kwargs): + form = super().get_form(request, obj, **kwargs) + + if obj: + form.base_fields["link"].widget.attrs.update( + {"data-product-slug": obj.slug} + ) + form.base_fields["form"].widget.attrs.update( + {"data-product-slug": obj.slug} + ) + return form + @admin.register(ProductContact) class ProductContactAdmin(admin.ModelAdmin): diff --git a/src/open_inwoner/utils/ckeditor.py b/src/open_inwoner/utils/ckeditor.py index 6fca70d73e..13d5cf6c34 100644 --- a/src/open_inwoner/utils/ckeditor.py +++ b/src/open_inwoner/utils/ckeditor.py @@ -1,6 +1,8 @@ import markdown from bs4 import BeautifulSoup +from open_inwoner.pdc.models.product import Product + def get_rendered_content(content): """ @@ -38,5 +40,27 @@ def get_rendered_content(content): ) icon.append("open_in_new") element.append(icon) + if element.text.startswith("[CTA/"): + product_slug = element.text.split("/")[1][:-1] + try: + product = Product.objects.get(slug=product_slug) + except Product.DoesNotExist: + element.decompose() + continue + + icon = soup.new_tag("span") + icon.attrs.update( + {"aria-label": "Aanvraag starten", "class": "material-icons"} + ) + icon.append("arrow_forward") + element.string.replace_with("Aanvraag starten") + element.attrs.update( + { + "class": "button button--textless button--icon button--icon-before button--primary", + "href": f"{product.get_absolute_url()}/formulier", + } + ) + element.attrs["title"] = "Aanvraag starten" + element.append(icon) return soup From f43cbb2234a875f877d175781d8469768a4a9cdb Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 15 Mar 2023 16:47:40 +0100 Subject: [PATCH 05/45] [#1238] Changed slug to id data attribute --- src/open_inwoner/js/admin/ckeditor/editor.js | 8 ++++---- src/open_inwoner/pdc/admin/product.py | 8 ++------ src/open_inwoner/utils/ckeditor.py | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/open_inwoner/js/admin/ckeditor/editor.js b/src/open_inwoner/js/admin/ckeditor/editor.js index ffded06353..85759c6f1f 100644 --- a/src/open_inwoner/js/admin/ckeditor/editor.js +++ b/src/open_inwoner/js/admin/ckeditor/editor.js @@ -41,16 +41,16 @@ class CTARequestButtonPlugin extends Plugin { button.on('execute', () => { const formId = document.getElementById('id_form') const linkId = document.getElementById('id_link') - let productSlug = '' + let productId = '' if (formId) { - productSlug = formId.dataset.productSlug + productId = formId.dataset.productId } else if (linkId) { - productSlug = linkId.dataset.productSlug + productId = linkId.dataset.productId } editor.model.change((writer) => { - const link = writer.createText(`[CTA/${productSlug}]`) + const link = writer.createText(`[CTA/${productId}]`) editor.model.insertContent(link, editor.model.document.selection) }) diff --git a/src/open_inwoner/pdc/admin/product.py b/src/open_inwoner/pdc/admin/product.py index 0a2e05d872..9cc207118b 100644 --- a/src/open_inwoner/pdc/admin/product.py +++ b/src/open_inwoner/pdc/admin/product.py @@ -97,12 +97,8 @@ def get_form(self, request, obj=None, **kwargs): form = super().get_form(request, obj, **kwargs) if obj: - form.base_fields["link"].widget.attrs.update( - {"data-product-slug": obj.slug} - ) - form.base_fields["form"].widget.attrs.update( - {"data-product-slug": obj.slug} - ) + form.base_fields["link"].widget.attrs.update({"data-product-id": obj.id}) + form.base_fields["form"].widget.attrs.update({"data-product-id": obj.id}) return form diff --git a/src/open_inwoner/utils/ckeditor.py b/src/open_inwoner/utils/ckeditor.py index 13d5cf6c34..071bed850f 100644 --- a/src/open_inwoner/utils/ckeditor.py +++ b/src/open_inwoner/utils/ckeditor.py @@ -41,6 +41,7 @@ def get_rendered_content(content): icon.append("open_in_new") element.append(icon) if element.text.startswith("[CTA/"): + breakpoint() product_slug = element.text.split("/")[1][:-1] try: product = Product.objects.get(slug=product_slug) From 8c273cc1e92ca3a0eef11ff91aea6989bb21bba4 Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 16 Mar 2023 12:47:36 +0100 Subject: [PATCH 06/45] [#1238] Fixed ckeditor for product detail content --- .../components/templatetags/product_tags.py | 18 +++ src/open_inwoner/js/admin/ckeditor/editor.js | 16 +-- .../templates/pages/product/detail.html | 4 +- src/open_inwoner/utils/ckeditor.py | 103 ++++++++++++------ 4 files changed, 96 insertions(+), 45 deletions(-) diff --git a/src/open_inwoner/components/templatetags/product_tags.py b/src/open_inwoner/components/templatetags/product_tags.py index 3885267787..a035693858 100644 --- a/src/open_inwoner/components/templatetags/product_tags.py +++ b/src/open_inwoner/components/templatetags/product_tags.py @@ -2,6 +2,8 @@ from django.urls import NoReverseMatch, reverse from django.utils.translation import gettext as _ +from open_inwoner.utils.ckeditor import get_product_rendered_content + register = template.Library() @@ -36,3 +38,19 @@ def product_finder( configurable_text=context["configurable_text"], ) return kwargs + + +@register.filter("product_ckeditor_content") +def product_ckeditor_content(product): + """ + Returns rendered content from ckeditor's textarea field specifically for a product. + + Usage: + {{ object|product_ckeditor_content }} + + Variables: + + product: Product | The product object + """ + rendered_content = get_product_rendered_content(product) + + return rendered_content diff --git a/src/open_inwoner/js/admin/ckeditor/editor.js b/src/open_inwoner/js/admin/ckeditor/editor.js index 85759c6f1f..3b109b6ffb 100644 --- a/src/open_inwoner/js/admin/ckeditor/editor.js +++ b/src/open_inwoner/js/admin/ckeditor/editor.js @@ -34,23 +34,17 @@ class CTARequestButtonPlugin extends Plugin { button.set({ label: 'Add request button', + class: 'cta_button_request', withText: true, }) //Execute a callback function when the button is clicked button.on('execute', () => { - const formId = document.getElementById('id_form') - const linkId = document.getElementById('id_link') - let productId = '' - - if (formId) { - productId = formId.dataset.productId - } else if (linkId) { - productId = linkId.dataset.productId - } - editor.model.change((writer) => { - const link = writer.createText(`[CTA/${productId}]`) + const link = writer.createText('[CTAREQUESTBUTTON]', { + //Temporary url for creating a link tag + linkHref: '/', + }) editor.model.insertContent(link, editor.model.document.selection) }) diff --git a/src/open_inwoner/templates/pages/product/detail.html b/src/open_inwoner/templates/pages/product/detail.html index 72196a4cf1..4d61227556 100644 --- a/src/open_inwoner/templates/pages/product/detail.html +++ b/src/open_inwoner/templates/pages/product/detail.html @@ -1,5 +1,5 @@ {% extends 'master.html' %} -{% load i18n l10n button_tags card_tags faq_tags file_tags grid_tags icon_tags link_tags map_tags notification_tags tag_tags utils condition_tags render_tags anchor_menu_tags %} +{% load i18n l10n button_tags card_tags faq_tags file_tags grid_tags icon_tags link_tags map_tags notification_tags tag_tags utils condition_tags render_tags anchor_menu_tags product_tags %} {% block header_image %} {% if object.image %} @@ -32,7 +32,7 @@

{% tag tags=object.tags.all %}

{{ object.summary }}

- {{ object.content|ckeditor_content|safe }} + {{ object|product_ckeditor_content|safe }} {% if product.form %} {% button_row mobile=True %} diff --git a/src/open_inwoner/utils/ckeditor.py b/src/open_inwoner/utils/ckeditor.py index 071bed850f..3992e231e4 100644 --- a/src/open_inwoner/utils/ckeditor.py +++ b/src/open_inwoner/utils/ckeditor.py @@ -30,38 +30,77 @@ def get_rendered_content(content): for element in soup.find_all(tag): element.attrs["class"] = class_name if element.name == "a" and element.attrs.get("href", "").startswith("http"): - icon = soup.new_tag("span") - icon.attrs.update( - { - "aria-hidden": "true", - "aria-label": "Opens in new window", - "class": "material-icons", - } - ) - icon.append("open_in_new") - element.append(icon) - if element.text.startswith("[CTA/"): - breakpoint() - product_slug = element.text.split("/")[1][:-1] - try: - product = Product.objects.get(slug=product_slug) - except Product.DoesNotExist: - element.decompose() - continue + element.attrs["target"] = "_blank" - icon = soup.new_tag("span") - icon.attrs.update( - {"aria-label": "Aanvraag starten", "class": "material-icons"} - ) - icon.append("arrow_forward") - element.string.replace_with("Aanvraag starten") - element.attrs.update( - { - "class": "button button--textless button--icon button--icon-before button--primary", - "href": f"{product.get_absolute_url()}/formulier", - } - ) - element.attrs["title"] = "Aanvraag starten" - element.append(icon) + return soup + + +def get_product_rendered_content(product): + """ + Takes product's content as an input and returns the rendered one. + """ + md = markdown.Markdown(extensions=["tables"]) + html = md.convert(product.content) + soup = BeautifulSoup(html, "html.parser") + class_adders = [ + ("h1", "h1"), + ("h2", "h2"), + ("h3", "h3"), + ("h4", "h4"), + ("h5", "h5"), + ("h6", "h6"), + ("img", "image"), + ("li", "li"), + ("p", "p"), + ("a", "link link--secondary"), + ("table", "table table--content"), + ("th", "table__header"), + ("td", "table__item"), + ] + for tag, class_name in class_adders: + for element in soup.find_all(tag): + element.attrs["class"] = class_name + if element.name == "a": + if "[CTAREQUESTBUTTON]" in element.text: + # decompose the element when product doesn't have either a link or a form + if not (product.link or product.form): + element.decompose() + continue + + # icon + icon = soup.new_tag("span") + icon.attrs.update( + {"aria-label": "Aanvraag starten", "class": "material-icons"} + ) + icon.append("arrow_forward") + + # button + element.string.replace_with("Aanvraag starten") + element.attrs.update( + { + "class": "start_request button button--textless button--icon button--icon-before button--primary", + "href": ( + product.link + if product.link + else f"{product.get_absolute_url()}formulier" + ), + "title": "Aanvraag starten", + } + ) + element.append(icon) + if product.link: + element.attrs.update({"target": "_blank"}) + + elif element.attrs.get("href", "").startswith("http"): + icon = soup.new_tag("span") + icon.attrs.update( + { + "aria-hidden": "true", + "aria-label": "Opens in new window", + "class": "material-icons", + } + ) + icon.append("open_in_new") + element.append(icon) return soup From 04816a96e26608ea8e4d8d3b3f078153c5748a98 Mon Sep 17 00:00:00 2001 From: vasileios Date: Fri, 17 Mar 2023 12:19:16 +0100 Subject: [PATCH 07/45] [#1238] Removed ckeditor button --- src/open_inwoner/js/admin/ckeditor/editor.js | 37 ----- src/open_inwoner/pdc/admin/product.py | 8 - .../migrations/0054_alter_product_content.py | 21 +++ src/open_inwoner/pdc/models/product.py | 4 +- src/open_inwoner/pdc/tests/test_product.py | 60 ++++++++ src/open_inwoner/utils/ckeditor.py | 142 +++++++++--------- 6 files changed, 151 insertions(+), 121 deletions(-) create mode 100644 src/open_inwoner/pdc/migrations/0054_alter_product_content.py diff --git a/src/open_inwoner/js/admin/ckeditor/editor.js b/src/open_inwoner/js/admin/ckeditor/editor.js index 3b109b6ffb..393f406ba3 100644 --- a/src/open_inwoner/js/admin/ckeditor/editor.js +++ b/src/open_inwoner/js/admin/ckeditor/editor.js @@ -19,42 +19,8 @@ import Table from '@ckeditor/ckeditor5-table/src/table' import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar' import FilerImageAdapterPlugin from './plugins/filer/plugin' -import Plugin from '@ckeditor/ckeditor5-core/src/plugin' -import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview' - export default class ClassicEditor extends ClassicEditorBase {} -class CTARequestButtonPlugin extends Plugin { - init() { - const editor = this.editor - - editor.ui.componentFactory.add('addRequest', () => { - // The button will be an instance of ButtonView. - const button = new ButtonView() - - button.set({ - label: 'Add request button', - class: 'cta_button_request', - withText: true, - }) - - //Execute a callback function when the button is clicked - button.on('execute', () => { - editor.model.change((writer) => { - const link = writer.createText('[CTAREQUESTBUTTON]', { - //Temporary url for creating a link tag - linkHref: '/', - }) - - editor.model.insertContent(link, editor.model.document.selection) - }) - }) - - return button - }) - } -} - // Plugins to include in the build. ClassicEditor.builtinPlugins = [ Markdown, @@ -76,7 +42,6 @@ ClassicEditor.builtinPlugins = [ FilerImageAdapterPlugin, Table, TableToolbar, - CTARequestButtonPlugin, ] // Editor configuration. @@ -101,8 +66,6 @@ ClassicEditor.defaultConfig = { '|', 'undo', 'redo', - '|', - 'addRequest', ], }, image: { diff --git a/src/open_inwoner/pdc/admin/product.py b/src/open_inwoner/pdc/admin/product.py index 9cc207118b..76571498a2 100644 --- a/src/open_inwoner/pdc/admin/product.py +++ b/src/open_inwoner/pdc/admin/product.py @@ -93,14 +93,6 @@ def display_categories(self, obj): display_categories.short_description = "categories" - def get_form(self, request, obj=None, **kwargs): - form = super().get_form(request, obj, **kwargs) - - if obj: - form.base_fields["link"].widget.attrs.update({"data-product-id": obj.id}) - form.base_fields["form"].widget.attrs.update({"data-product-id": obj.id}) - return form - @admin.register(ProductContact) class ProductContactAdmin(admin.ModelAdmin): diff --git a/src/open_inwoner/pdc/migrations/0054_alter_product_content.py b/src/open_inwoner/pdc/migrations/0054_alter_product_content.py new file mode 100644 index 0000000000..c379b70095 --- /dev/null +++ b/src/open_inwoner/pdc/migrations/0054_alter_product_content.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.15 on 2023-03-17 11:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("pdc", "0053_alter_product_summary"), + ] + + operations = [ + migrations.AlterField( + model_name="product", + name="content", + field=models.TextField( + help_text="Product content with build-in WYSIWYG editor. By adding '[CTABUTTON]' you can embed a cta-button for linking to the defined form or link", + verbose_name="Content", + ), + ), + ] diff --git a/src/open_inwoner/pdc/models/product.py b/src/open_inwoner/pdc/models/product.py index db031498bd..8d304ead94 100644 --- a/src/open_inwoner/pdc/models/product.py +++ b/src/open_inwoner/pdc/models/product.py @@ -88,7 +88,9 @@ class Product(models.Model): ) content = models.TextField( verbose_name=_("Content"), - help_text=_("Product content with build-in WYSIWYG editor"), + help_text=_( + "Product content with build-in WYSIWYG editor. By adding '[CTABUTTON]' you can embed a cta-button for linking to the defined form or link" + ), ) categories = models.ManyToManyField( "pdc.Category", diff --git a/src/open_inwoner/pdc/tests/test_product.py b/src/open_inwoner/pdc/tests/test_product.py index cc6f6c549d..2bf87361f8 100644 --- a/src/open_inwoner/pdc/tests/test_product.py +++ b/src/open_inwoner/pdc/tests/test_product.py @@ -147,3 +147,63 @@ def test_product_detail_shows_product_faq(self): self.assertTrue(response.pyquery('.anchor-menu a[href="#faq"]')) # check if the menu link target self.assertTrue(response.pyquery("#faq")) + + +class TestProductContent(WebTest): + def test_button_is_rendered_inside_content_when_link_and_cta_exist(self): + product = ProductFactory( + content="Some content [CTABUTTON]", link="http://www.example.com" + ) + + response = self.app.get( + reverse("pdc:product_detail", kwargs={"slug": product.slug}) + ) + cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") + + self.assertTrue(cta_button) + self.assertIn("http://www.example.com", cta_button[0].values()) + + def test_button_is_rendered_inside_content_when_form_and_cta_exist(self): + product = ProductFactory(content="Some content [CTABUTTON]", form=2) + url = reverse("pdc:product_detail", kwargs={"slug": product.slug}) + + response = self.app.get( + reverse("pdc:product_detail", kwargs={"slug": product.slug}) + ) + cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") + + self.assertTrue(cta_button) + self.assertIn(f"{url}formulier", cta_button[0].values()) + + def test_button_is_rendered_inside_content_when_form_and_link_and_cta_exist(self): + product = ProductFactory( + content="Some content [CTABUTTON]", link="http://www.example.com", form=2 + ) + + response = self.app.get( + reverse("pdc:product_detail", kwargs={"slug": product.slug}) + ) + cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") + + self.assertTrue(cta_button) + self.assertIn("http://www.example.com", cta_button[0].values()) + + def test_button_is_not_rendered_inside_content_when_no_cta(self): + product = ProductFactory(content="Some content", link="http://www.example.com") + + response = self.app.get( + reverse("pdc:product_detail", kwargs={"slug": product.slug}) + ) + cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") + + self.assertFalse(cta_button) + + def test_button_is_not_rendered_inside_content_when_no_form_or_link(self): + product = ProductFactory(content="Some content [CTABUTTON]") + + response = self.app.get( + reverse("pdc:product_detail", kwargs={"slug": product.slug}) + ) + cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") + + self.assertFalse(cta_button) diff --git a/src/open_inwoner/utils/ckeditor.py b/src/open_inwoner/utils/ckeditor.py index 3992e231e4..a695ed1159 100644 --- a/src/open_inwoner/utils/ckeditor.py +++ b/src/open_inwoner/utils/ckeditor.py @@ -1,7 +1,21 @@ import markdown from bs4 import BeautifulSoup -from open_inwoner.pdc.models.product import Product +CLASS_ADDERS = [ + ("h1", "h1"), + ("h2", "h2"), + ("h3", "h3"), + ("h4", "h4"), + ("h5", "h5"), + ("h6", "h6"), + ("img", "image"), + ("li", "li"), + ("p", "p"), + ("a", "link link--secondary"), + ("table", "table table--content"), + ("th", "table__header"), + ("td", "table__item"), +] def get_rendered_content(content): @@ -11,22 +25,8 @@ def get_rendered_content(content): md = markdown.Markdown(extensions=["tables"]) html = md.convert(content) soup = BeautifulSoup(html, "html.parser") - class_adders = [ - ("h1", "h1"), - ("h2", "h2"), - ("h3", "h3"), - ("h4", "h4"), - ("h5", "h5"), - ("h6", "h6"), - ("img", "image"), - ("li", "li"), - ("p", "p"), - ("a", "link link--secondary"), - ("table", "table table--content"), - ("th", "table__header"), - ("td", "table__item"), - ] - for tag, class_name in class_adders: + + for tag, class_name in CLASS_ADDERS: for element in soup.find_all(tag): element.attrs["class"] = class_name if element.name == "a" and element.attrs.get("href", "").startswith("http"): @@ -42,65 +42,57 @@ def get_product_rendered_content(product): md = markdown.Markdown(extensions=["tables"]) html = md.convert(product.content) soup = BeautifulSoup(html, "html.parser") - class_adders = [ - ("h1", "h1"), - ("h2", "h2"), - ("h3", "h3"), - ("h4", "h4"), - ("h5", "h5"), - ("h6", "h6"), - ("img", "image"), - ("li", "li"), - ("p", "p"), - ("a", "link link--secondary"), - ("table", "table table--content"), - ("th", "table__header"), - ("td", "table__item"), - ] - for tag, class_name in class_adders: + + for tag, class_name in CLASS_ADDERS: for element in soup.find_all(tag): + if element.attrs.get("class") and "cta-button" in element.attrs["class"]: + continue + element.attrs["class"] = class_name - if element.name == "a": - if "[CTAREQUESTBUTTON]" in element.text: - # decompose the element when product doesn't have either a link or a form - if not (product.link or product.form): - element.decompose() - continue - - # icon - icon = soup.new_tag("span") - icon.attrs.update( - {"aria-label": "Aanvraag starten", "class": "material-icons"} - ) - icon.append("arrow_forward") - - # button - element.string.replace_with("Aanvraag starten") - element.attrs.update( - { - "class": "start_request button button--textless button--icon button--icon-before button--primary", - "href": ( - product.link - if product.link - else f"{product.get_absolute_url()}formulier" - ), - "title": "Aanvraag starten", - } - ) - element.append(icon) - if product.link: - element.attrs.update({"target": "_blank"}) - - elif element.attrs.get("href", "").startswith("http"): - icon = soup.new_tag("span") - icon.attrs.update( - { - "aria-hidden": "true", - "aria-label": "Opens in new window", - "class": "material-icons", - } - ) - icon.append("open_in_new") - element.append(icon) + + if "[CTABUTTON]" in element.text: + # decompose the element when product doesn't have either a link or a form + if not (product.link or product.form): + element.decompose() + continue + + # icon + icon = soup.new_tag("span") + icon.attrs.update( + {"aria-label": "Aanvraag starten", "class": "material-icons"} + ) + icon.append("arrow_forward") + + # button + element.name = "a" + + element.string.replace_with("Aanvraag starten") + element.attrs.update( + { + "class": "button button--textless button--icon button--icon-before button--primary cta-button", + "href": ( + product.link + if product.link + else f"{product.get_absolute_url()}formulier" + ), + "title": "Aanvraag starten", + } + ) + element.append(icon) + + if product.link: + element.attrs.update({"target": "_blank"}) + + if element.name == "a" and element.attrs.get("href", "").startswith("http"): + icon = soup.new_tag("span") + icon.attrs.update( + { + "aria-hidden": "true", + "aria-label": "Opens in new window", + "class": "material-icons", + } + ) + icon.append("open_in_new") + element.append(icon) return soup From 029e965eb907dffd449422b94c3d30563ff92d13 Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 21 Mar 2023 08:42:40 +0100 Subject: [PATCH 08/45] [#1238] Fixed form links and button style --- src/open_inwoner/utils/ckeditor.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/open_inwoner/utils/ckeditor.py b/src/open_inwoner/utils/ckeditor.py index a695ed1159..5b6c7168cd 100644 --- a/src/open_inwoner/utils/ckeditor.py +++ b/src/open_inwoner/utils/ckeditor.py @@ -65,25 +65,23 @@ def get_product_rendered_content(product): # button element.name = "a" - - element.string.replace_with("Aanvraag starten") + element.string = "" element.attrs.update( { "class": "button button--textless button--icon button--icon-before button--primary cta-button", - "href": ( - product.link - if product.link - else f"{product.get_absolute_url()}formulier" - ), + "href": product.link if product.link else product.form_link, "title": "Aanvraag starten", } ) element.append(icon) + element.append("Aanvraag starten") if product.link: element.attrs.update({"target": "_blank"}) - if element.name == "a" and element.attrs.get("href", "").startswith("http"): + elif element.name == "a" and element.attrs.get("href", "").startswith( + "http" + ): icon = soup.new_tag("span") icon.attrs.update( { From ff5d1eb9253c063a96ab228604fbc243a0a4490c Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 21 Mar 2023 08:50:26 +0100 Subject: [PATCH 09/45] [#1238] Fixed conflict in migrations --- ...alter_product_content.py => 0055_alter_product_content.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/open_inwoner/pdc/migrations/{0054_alter_product_content.py => 0055_alter_product_content.py} (83%) diff --git a/src/open_inwoner/pdc/migrations/0054_alter_product_content.py b/src/open_inwoner/pdc/migrations/0055_alter_product_content.py similarity index 83% rename from src/open_inwoner/pdc/migrations/0054_alter_product_content.py rename to src/open_inwoner/pdc/migrations/0055_alter_product_content.py index c379b70095..db32a93935 100644 --- a/src/open_inwoner/pdc/migrations/0054_alter_product_content.py +++ b/src/open_inwoner/pdc/migrations/0055_alter_product_content.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.15 on 2023-03-17 11:08 +# Generated by Django 3.2.15 on 2023-03-21 07:49 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("pdc", "0053_alter_product_summary"), + ("pdc", "0054_alter_organization_logo"), ] operations = [ From f0437e6089e4d7f9244b823052119b5e08b42f1f Mon Sep 17 00:00:00 2001 From: Alex de Landgraaf Date: Tue, 21 Mar 2023 07:53:44 +0000 Subject: [PATCH 10/45] Splitting up configuration --- .../conf/fixtures/django-admin-index.json | 118 ++++++++++-------- 1 file changed, 68 insertions(+), 50 deletions(-) diff --git a/src/open_inwoner/conf/fixtures/django-admin-index.json b/src/open_inwoner/conf/fixtures/django-admin-index.json index bdf7f3fe52..86cf91a760 100644 --- a/src/open_inwoner/conf/fixtures/django-admin-index.json +++ b/src/open_inwoner/conf/fixtures/django-admin-index.json @@ -120,7 +120,7 @@ { "model": "admin_index.appgroup", "fields": { - "order": 7, + "order": 9, "name": "Overige / Diverse", "slug": "overige-diverse", "models": [ @@ -162,7 +162,7 @@ { "model": "admin_index.appgroup", "fields": { - "order": 6, + "order": 7, "name": "Configuratie", "slug": "configuratie", "models": [ @@ -182,61 +182,13 @@ "flatpages", "flatpage" ], - [ - "haalcentraal", - "haalcentraalconfig" - ], [ "mail_editor", "mailtemplate" ], - [ - "mozilla_django_oidc_db", - "openidconnectconfig" - ], - [ - "notifications_api_common", - "notificationsconfig" - ], - [ - "notifications_api_common", - "subscription" - ], - [ - "openformsclient", - "configuration" - ], - [ - "openzaak", - "catalogusconfig" - ], - [ - "openzaak", - "openzaakconfig" - ], - [ - "openzaak", - "usercasestatusnotification" - ], - [ - "openzaak", - "zaaktypeconfig" - ], - [ - "openzaak", - "zaaktypeinformatieobjecttypeconfig" - ], [ "sites", "site" - ], - [ - "zgw_consumers", - "nlxconfig" - ], - [ - "zgw_consumers", - "service" ] ] } @@ -333,6 +285,72 @@ ] } }, +{ + "model": "admin_index.appgroup", + "fields": { + "order": 6, + "name": "Koppelingen", + "slug": "koppelingen", + "models": [ + [ + "haalcentraal", + "haalcentraalconfig" + ], + [ + "mozilla_django_oidc_db", + "openidconnectconfig" + ], + [ + "notifications_api_common", + "notificationsconfig" + ], + [ + "notifications_api_common", + "subscription" + ], + [ + "openformsclient", + "configuration" + ], + [ + "openzaak", + "catalogusconfig" + ], + [ + "openzaak", + "openzaakconfig" + ], + [ + "openzaak", + "usercaseinfoobjectnotification" + ], + [ + "openzaak", + "usercasestatusnotification" + ], + [ + "openzaak", + "zaaktypeconfig" + ], + [ + "openzaak", + "zaaktypeinformatieobjecttypeconfig" + ], + [ + "zgw_consumers", + "certificate" + ], + [ + "zgw_consumers", + "nlxconfig" + ], + [ + "zgw_consumers", + "service" + ] + ] + } +}, { "model": "admin_index.applink", "fields": { From c1df53b9d5418df8fa367afb179abbd6527d76c8 Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 21 Mar 2023 09:26:48 +0100 Subject: [PATCH 11/45] [#1238] Fixed tests --- src/open_inwoner/pdc/tests/test_product.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/open_inwoner/pdc/tests/test_product.py b/src/open_inwoner/pdc/tests/test_product.py index 2bf87361f8..49b12de9a5 100644 --- a/src/open_inwoner/pdc/tests/test_product.py +++ b/src/open_inwoner/pdc/tests/test_product.py @@ -161,7 +161,7 @@ def test_button_is_rendered_inside_content_when_link_and_cta_exist(self): cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") self.assertTrue(cta_button) - self.assertIn("http://www.example.com", cta_button[0].values()) + self.assertIn(product.link, cta_button[0].values()) def test_button_is_rendered_inside_content_when_form_and_cta_exist(self): product = ProductFactory(content="Some content [CTABUTTON]", form=2) @@ -173,7 +173,7 @@ def test_button_is_rendered_inside_content_when_form_and_cta_exist(self): cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") self.assertTrue(cta_button) - self.assertIn(f"{url}formulier", cta_button[0].values()) + self.assertIn(product.form_link, cta_button[0].values()) def test_button_is_rendered_inside_content_when_form_and_link_and_cta_exist(self): product = ProductFactory( @@ -186,7 +186,7 @@ def test_button_is_rendered_inside_content_when_form_and_link_and_cta_exist(self cta_button = response.pyquery(".grid__main")[0].find_class("cta-button") self.assertTrue(cta_button) - self.assertIn("http://www.example.com", cta_button[0].values()) + self.assertIn(product.link, cta_button[0].values()) def test_button_is_not_rendered_inside_content_when_no_cta(self): product = ProductFactory(content="Some content", link="http://www.example.com") From 179464a53f0744f2028033dd1115f5963e7689c5 Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 21 Mar 2023 09:40:08 +0100 Subject: [PATCH 12/45] [#1249] Fixed tests and migrations --- ..._20230316_1459.py => 0003_auto_20230321_0724.py} | 4 ++-- src/log_outgoing_requests/tests/test_logging.py | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) rename src/log_outgoing_requests/migrations/{0002_auto_20230316_1459.py => 0003_auto_20230321_0724.py} (86%) diff --git a/src/log_outgoing_requests/migrations/0002_auto_20230316_1459.py b/src/log_outgoing_requests/migrations/0003_auto_20230321_0724.py similarity index 86% rename from src/log_outgoing_requests/migrations/0002_auto_20230316_1459.py rename to src/log_outgoing_requests/migrations/0003_auto_20230321_0724.py index b10b725e2f..673313a1e8 100644 --- a/src/log_outgoing_requests/migrations/0002_auto_20230316_1459.py +++ b/src/log_outgoing_requests/migrations/0003_auto_20230321_0724.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.15 on 2023-03-16 13:59 +# Generated by Django 3.2.15 on 2023-03-21 06:24 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("log_outgoing_requests", "0001_initial"), + ("log_outgoing_requests", "0002_alter_outgoingrequestslog_url"), ] operations = [ diff --git a/src/log_outgoing_requests/tests/test_logging.py b/src/log_outgoing_requests/tests/test_logging.py index 2937d0513d..e5dd85b200 100644 --- a/src/log_outgoing_requests/tests/test_logging.py +++ b/src/log_outgoing_requests/tests/test_logging.py @@ -30,8 +30,6 @@ def test_outgoing_requests_are_logged(self, m): @override_settings(LOG_OUTGOING_REQUESTS_DB_SAVE=True) def test_expected_data_is_saved_when_saving_enabled(self, m): - self._setUpMocks(m) - methods = [ ("POST", requests.post, m.post), ("PUT", requests.put, m.put), @@ -63,6 +61,15 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): self.assertEqual(request_log.req_content_type, "") self.assertEqual(request_log.res_content_type, "") self.assertEqual(request_log.response_ms, 0) + self.assertEqual( + request_log.req_headers, + ( + "{'User-Agent': 'python-requests/2.26.0', 'Accept-Encoding': 'gzip, deflate, br', 'Accept': '*/*', 'Connection': 'keep-alive'}" + if method == "HEAD" + else "{'User-Agent': 'python-requests/2.26.0', 'Accept-Encoding': 'gzip, deflate, br', 'Accept': '*/*', 'Connection': 'keep-alive', 'Content-Length': '0'}" + ), + ) + self.assertEqual(request_log.res_headers, "{}") self.assertEqual( request_log.timestamp.strftime("%Y-%m-%d %H:%M:%S"), "2021-10-18 13:00:00", @@ -79,7 +86,7 @@ def test_authorization_header_is_not_saved(self, m): ) log = OutgoingRequestsLog.objects.get() - self.assertNotIn("Authorization", eval(log.req_headers)) + self.assertNotIn("Authorization", log.req_headers) def test_data_is_not_saved_when_saving_disabled(self, m): self._setUpMocks(m) From f62301b9c78bb95bccf38ea2e9e3dba2c536e5a8 Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 21 Mar 2023 10:29:53 +0100 Subject: [PATCH 13/45] [#1249] Remove authorization without affecting the initial headers --- src/log_outgoing_requests/handlers.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/log_outgoing_requests/handlers.py b/src/log_outgoing_requests/handlers.py index ce8f6d2ba7..2418dc1608 100644 --- a/src/log_outgoing_requests/handlers.py +++ b/src/log_outgoing_requests/handlers.py @@ -14,13 +14,17 @@ def emit(self, record): # save only the requests coming from the library requests if record and record.getMessage() == "Outgoing request": - record.req.headers.pop("Authorization", None) + exclude_headers = ["Authorization"] + safe_req_headers = { + k: v + for k, v in record.req.headers.items() + if k not in exclude_headers + } if record.exc_info: trace = traceback.format_exc() parsed_url = urlparse(record.req.url) - kwargs = { "url": record.req.url, "hostname": parsed_url.hostname, @@ -31,7 +35,7 @@ def emit(self, record): "res_content_type": record.res.headers.get("Content-Type", ""), "timestamp": record.requested_at, "response_ms": int(record.res.elapsed.total_seconds() * 1000), - "req_headers": record.req.headers, + "req_headers": safe_req_headers, "res_headers": record.res.headers, "trace": trace, } From 0bb7974dc418203143a70662a706825c33cbef87 Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 21 Mar 2023 12:27:39 +0100 Subject: [PATCH 14/45] [#1248] Use next url after login --- src/open_inwoner/accounts/templates/registration/login.html | 6 +++--- src/open_inwoner/accounts/tests/test_auth.py | 6 ++++++ .../components/templates/components/Typography/Link.html | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/open_inwoner/accounts/templates/registration/login.html b/src/open_inwoner/accounts/templates/registration/login.html index d319bb6f6c..89c47a6863 100644 --- a/src/open_inwoner/accounts/templates/registration/login.html +++ b/src/open_inwoner/accounts/templates/registration/login.html @@ -21,7 +21,7 @@

{% trans 'Welkom' %}

- {% link href='digid:login' text=_('Inloggen met DigiD') secondary=True icon='arrow_forward' extra_classes="link--digid" %} + {% link href='digid:login' next=next text=_('Inloggen met DigiD') secondary=True icon='arrow_forward' extra_classes="link--digid" %} {% endrender_card %} {% endif %} @@ -36,7 +36,7 @@

{% trans 'Welkom' %}

{% else %}
{% endif %} - {% link text=site_config.openid_connect_login_text href='oidc_authentication_init' secondary=True icon='arrow_forward' icon_position="after" %} + {% link text=site_config.openid_connect_login_text href='oidc_authentication_init' next=next secondary=True icon='arrow_forward' icon_position="after" %} {% endrender_card %} {% endif %} @@ -46,7 +46,7 @@

{% trans 'Welkom' %}

{% csrf_token %} {% input form.username %} {% input form.password %} - {% button text=_('Wachtwoord vergeten?') href='password_reset' secondary=True transparent=True align='right' %} + {% button text=_('Wachtwoord vergeten?') href='password_reset' next=next secondary=True transparent=True align='right' %} {% form_actions primary_text=_("Inloggen") primary_icon="arrow_forward" secondary_href='django_registration_register' secondary_text=_('Registreer') secondary_icon='arrow_forward' single=True %} {% endrender_form %} {% endrender_card %} diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py index 71218d86f1..62e97e034c 100644 --- a/src/open_inwoner/accounts/tests/test_auth.py +++ b/src/open_inwoner/accounts/tests/test_auth.py @@ -819,6 +819,12 @@ def setUp(self): self.config.login_allow_registration = True self.config.save() + def test_login_page_has_next_url(self): + response = self.app.get( + f"{reverse('login')}?next={reverse('accounts:contact_list')}" + ) + self.assertIn(f"?next={reverse('accounts:contact_list')}", response) + def test_login(self): """Test that a user is successfully logged in.""" form = self.app.get(reverse("login")).forms["login-form"] diff --git a/src/open_inwoner/components/templates/components/Typography/Link.html b/src/open_inwoner/components/templates/components/Typography/Link.html index 2e3adc7213..3caa8931b3 100644 --- a/src/open_inwoner/components/templates/components/Typography/Link.html +++ b/src/open_inwoner/components/templates/components/Typography/Link.html @@ -1,7 +1,7 @@ {% load i18n helpers icon_tags %} Date: Tue, 21 Mar 2023 15:13:25 +0100 Subject: [PATCH 15/45] [#1238] Fixed translations and tests --- src/open_inwoner/pdc/tests/test_product.py | 7 ++++--- src/open_inwoner/utils/ckeditor.py | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/open_inwoner/pdc/tests/test_product.py b/src/open_inwoner/pdc/tests/test_product.py index 49b12de9a5..4dae1e41a1 100644 --- a/src/open_inwoner/pdc/tests/test_product.py +++ b/src/open_inwoner/pdc/tests/test_product.py @@ -164,8 +164,7 @@ def test_button_is_rendered_inside_content_when_link_and_cta_exist(self): self.assertIn(product.link, cta_button[0].values()) def test_button_is_rendered_inside_content_when_form_and_cta_exist(self): - product = ProductFactory(content="Some content [CTABUTTON]", form=2) - url = reverse("pdc:product_detail", kwargs={"slug": product.slug}) + product = ProductFactory(content="Some content [CTABUTTON]", form="demo") response = self.app.get( reverse("pdc:product_detail", kwargs={"slug": product.slug}) @@ -177,7 +176,9 @@ def test_button_is_rendered_inside_content_when_form_and_cta_exist(self): def test_button_is_rendered_inside_content_when_form_and_link_and_cta_exist(self): product = ProductFactory( - content="Some content [CTABUTTON]", link="http://www.example.com", form=2 + content="Some content [CTABUTTON]", + link="http://www.example.com", + form="demo", ) response = self.app.get( diff --git a/src/open_inwoner/utils/ckeditor.py b/src/open_inwoner/utils/ckeditor.py index 5b6c7168cd..2b0406bb97 100644 --- a/src/open_inwoner/utils/ckeditor.py +++ b/src/open_inwoner/utils/ckeditor.py @@ -1,3 +1,5 @@ +from django.utils.translation import gettext as _ + import markdown from bs4 import BeautifulSoup @@ -59,7 +61,7 @@ def get_product_rendered_content(product): # icon icon = soup.new_tag("span") icon.attrs.update( - {"aria-label": "Aanvraag starten", "class": "material-icons"} + {"aria-label": _("Aanvraag starten"), "class": "material-icons"} ) icon.append("arrow_forward") @@ -69,12 +71,12 @@ def get_product_rendered_content(product): element.attrs.update( { "class": "button button--textless button--icon button--icon-before button--primary cta-button", - "href": product.link if product.link else product.form_link, - "title": "Aanvraag starten", + "href": (product.link if product.link else product.form_link), + "title": _("Aanvraag starten"), } ) element.append(icon) - element.append("Aanvraag starten") + element.append(_("Aanvraag starten")) if product.link: element.attrs.update({"target": "_blank"}) @@ -86,7 +88,7 @@ def get_product_rendered_content(product): icon.attrs.update( { "aria-hidden": "true", - "aria-label": "Opens in new window", + "aria-label": _("Opens in new window"), "class": "material-icons", } ) From 815c4517f30121541362a10276fbb41870060357 Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 22 Mar 2023 11:04:03 +0100 Subject: [PATCH 16/45] [#1249] Fixed headers format and tests --- src/log_outgoing_requests/handlers.py | 19 ++++---- .../tests/test_logging.py | 48 +++++++++++++++---- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/src/log_outgoing_requests/handlers.py b/src/log_outgoing_requests/handlers.py index 2418dc1608..21e1ec77d9 100644 --- a/src/log_outgoing_requests/handlers.py +++ b/src/log_outgoing_requests/handlers.py @@ -1,4 +1,5 @@ import logging +import textwrap import traceback from urllib.parse import urlparse @@ -14,12 +15,10 @@ def emit(self, record): # save only the requests coming from the library requests if record and record.getMessage() == "Outgoing request": - exclude_headers = ["Authorization"] - safe_req_headers = { - k: v - for k, v in record.req.headers.items() - if k not in exclude_headers - } + safe_req_headers = record.req.headers.copy() + + if "Authorization" in safe_req_headers: + safe_req_headers["Authorization"] = "***hidden***" if record.exc_info: trace = traceback.format_exc() @@ -35,9 +34,13 @@ def emit(self, record): "res_content_type": record.res.headers.get("Content-Type", ""), "timestamp": record.requested_at, "response_ms": int(record.res.elapsed.total_seconds() * 1000), - "req_headers": safe_req_headers, - "res_headers": record.res.headers, + "req_headers": self.format_headers(safe_req_headers), + "res_headers": self.format_headers(record.res.headers), "trace": trace, } OutgoingRequestsLog.objects.create(**kwargs) + + def format_headers(self, headers): + result = textwrap.dedent("\n".join(f"{k}: {v}" for k, v in headers.items())) + return result diff --git a/src/log_outgoing_requests/tests/test_logging.py b/src/log_outgoing_requests/tests/test_logging.py index e5dd85b200..7b3b35c622 100644 --- a/src/log_outgoing_requests/tests/test_logging.py +++ b/src/log_outgoing_requests/tests/test_logging.py @@ -17,6 +17,7 @@ def _setUpMocks(self, m): content=b"some content", ) + @override_settings(LOG_OUTGOING_REQUESTS_DB_SAVE=True) def test_outgoing_requests_are_logged(self, m): self._setUpMocks(m) @@ -31,6 +32,7 @@ def test_outgoing_requests_are_logged(self, m): @override_settings(LOG_OUTGOING_REQUESTS_DB_SAVE=True) def test_expected_data_is_saved_when_saving_enabled(self, m): methods = [ + ("GET", requests.get, m.get), ("POST", requests.post, m.post), ("PUT", requests.put, m.put), ("PATCH", requests.patch, m.patch), @@ -43,10 +45,21 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): mocked( "http://example.com/some-path?version=2.0", status_code=200, - content=b"some content", + json={"test": "data"}, + request_headers={ + "Authorization": "test", + "Content-Type": "text/html", + }, + headers={ + "Date": "Tue, 21 Mar 2023 15:24:08 GMT", + "Content-Type": "application/json", + }, ) - response = func("http://example.com/some-path?version=2.0") + response = func( + "http://example.com/some-path?version=2.0", + headers={"Authorization": "test", "Content-Type": "text/html"}, + ) request_log = OutgoingRequestsLog.objects.last() @@ -58,18 +71,32 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): self.assertEqual(request_log.query_params, "version=2.0") self.assertEqual(response.status_code, 200) self.assertEqual(request_log.method, method) - self.assertEqual(request_log.req_content_type, "") - self.assertEqual(request_log.res_content_type, "") + self.assertEqual(request_log.req_content_type, "text/html") + self.assertEqual(request_log.res_content_type, "application/json") self.assertEqual(request_log.response_ms, 0) self.assertEqual( request_log.req_headers, ( - "{'User-Agent': 'python-requests/2.26.0', 'Accept-Encoding': 'gzip, deflate, br', 'Accept': '*/*', 'Connection': 'keep-alive'}" - if method == "HEAD" - else "{'User-Agent': 'python-requests/2.26.0', 'Accept-Encoding': 'gzip, deflate, br', 'Accept': '*/*', 'Connection': 'keep-alive', 'Content-Length': '0'}" + "User-Agent: python-requests/2.26.0\n" + "Accept-Encoding: gzip, deflate, br\n" + "Accept: */*" + "\nConnection: keep-alive\n" + "Authorization: ***hidden***\n" + "Content-Type: text/html" + if method in ["HEAD", "GET"] + else "User-Agent: python-requests/2.26.0\n" + "Accept-Encoding: gzip, deflate, br\n" + "Accept: */*\n" + "Connection: keep-alive\n" + "Authorization: ***hidden***\n" + "Content-Type: text/html\n" + "Content-Length: 0" ), ) - self.assertEqual(request_log.res_headers, "{}") + self.assertEqual( + request_log.res_headers, + "Date: Tue, 21 Mar 2023 15:24:08 GMT\nContent-Type: application/json", + ) self.assertEqual( request_log.timestamp.strftime("%Y-%m-%d %H:%M:%S"), "2021-10-18 13:00:00", @@ -77,7 +104,7 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): self.assertIsNone(request_log.trace) @override_settings(LOG_OUTGOING_REQUESTS_DB_SAVE=True) - def test_authorization_header_is_not_saved(self, m): + def test_authorization_header_is_hidden(self, m): self._setUpMocks(m) requests.get( @@ -86,8 +113,9 @@ def test_authorization_header_is_not_saved(self, m): ) log = OutgoingRequestsLog.objects.get() - self.assertNotIn("Authorization", log.req_headers) + self.assertIn("Authorization: ***hidden***", log.req_headers) + @override_settings(LOG_OUTGOING_REQUESTS_DB_SAVE=False) def test_data_is_not_saved_when_saving_disabled(self, m): self._setUpMocks(m) From 1eab24ad4fef7d3ad2a4b00dd9ef5ea80b813a56 Mon Sep 17 00:00:00 2001 From: vasileios Date: Wed, 22 Mar 2023 14:09:38 +0100 Subject: [PATCH 17/45] [#1270] Fixed image in contact approval --- .../accounts/tests/test_contact_views.py | 45 ++++++++++++++++++- .../scss/components/Contacts/Contacts.scss | 3 ++ .../pages/profile/contacts/list.html | 14 +++--- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/open_inwoner/accounts/tests/test_contact_views.py b/src/open_inwoner/accounts/tests/test_contact_views.py index 84ff2db128..9edd9241d9 100644 --- a/src/open_inwoner/accounts/tests/test_contact_views.py +++ b/src/open_inwoner/accounts/tests/test_contact_views.py @@ -1,9 +1,12 @@ +import io + from django.core import mail +from django.core.files.images import ImageFile from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from django_webtest import WebTest -from furl import furl +from PIL import Image from open_inwoner.accounts.models import User @@ -429,3 +432,43 @@ def test_notification_email_for_approval_is_not_sent_when_new_user(self): # Email should be the one for registration, not for approval self.assertEqual(email.subject, "Uitnodiging voor Open Inwoner Platform") + + def test_contacts_image_is_shown_in_contact_approval_section(self): + # prepare image + image = Image.new("RGB", (10, 10)) + byteIO = io.BytesIO() + image.save(byteIO, format="png") + img_bytes = byteIO.getvalue() + image = ImageFile(io.BytesIO(img_bytes), name="foo.jpg") + + # update user's type and image + existing_user = UserFactory( + email="ex@example.com", + contact_type=ContactTypeChoices.begeleider, + image=image, + ) + self.user.contact_type = ContactTypeChoices.begeleider + self.user.image = image + self.user.save() + self.user.contacts_for_approval.add(existing_user) + + # Receiver contact list page + response = self.app.get(self.list_url, user=existing_user) + avatar_class = response.pyquery(".avatar") + + self.assertIn(self.user.image.name, avatar_class[0].getchildren()[0].get("src")) + + def test_no_image_is_shown_in_contact_approval_section_when_no_image_set(self): + # update user's type + existing_user = UserFactory( + email="ex@example.com", contact_type=ContactTypeChoices.begeleider + ) + self.user.contact_type = ContactTypeChoices.begeleider + self.user.save() + self.user.contacts_for_approval.add(existing_user) + + # Receiver contact list page + response = self.app.get(self.list_url, user=existing_user) + avatar_class = response.pyquery(".avatar") + + self.assertFalse(avatar_class) diff --git a/src/open_inwoner/scss/components/Contacts/Contacts.scss b/src/open_inwoner/scss/components/Contacts/Contacts.scss index 7647e4fa59..727b4b855e 100644 --- a/src/open_inwoner/scss/components/Contacts/Contacts.scss +++ b/src/open_inwoner/scss/components/Contacts/Contacts.scss @@ -9,6 +9,9 @@ } .avatar { + display: flex; + justify-content: center; + align-items: center; padding: 15px 15px 10px; margin-top: var(--gutter-width); border: var(--border-width) solid var(--color-success-lighter); diff --git a/src/open_inwoner/templates/pages/profile/contacts/list.html b/src/open_inwoner/templates/pages/profile/contacts/list.html index 62182e1519..8892d61fc7 100644 --- a/src/open_inwoner/templates/pages/profile/contacts/list.html +++ b/src/open_inwoner/templates/pages/profile/contacts/list.html @@ -1,5 +1,5 @@ {% extends 'master.html' %} -{% load i18n button_tags link_tags icon_tags pagination_tags form_tags dropdown_tags messages_tags thumbnail %} +{% load i18n button_tags link_tags icon_tags pagination_tags form_tags dropdown_tags messages_tags thumbnail cropping %} {% block content %} @@ -51,10 +51,14 @@

{% trans "U bent toegevoegd als contactpersoon" %}

{% endif %} - {% if approvals_count == 1 and request.user.image %} -
- {{ image.default_alt_text }} -
+ {% if approvals_count == 1 %} + {% with pending_approvals.get as pending_approval %} + {% if pending_approval.image %} +
+ +
+ {% endif %} + {% endwith %} {% endif %} {% endwith %} From 9c64c4c798e2cd018c1201dfcc8f97f4ef939f95 Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 23 Mar 2023 09:58:06 +0100 Subject: [PATCH 18/45] [#1231] Fixed breadcrumbs in plans --- .../accounts/tests/test_action_views.py | 6 ++++ .../templates/components/Action/Actions.html | 7 ++++- .../components/templatetags/action_tags.py | 18 +++++++++++ src/open_inwoner/plans/tests/test_views.py | 11 +++++++ src/open_inwoner/plans/urls.py | 6 ++++ src/open_inwoner/plans/views.py | 31 +++++++++++++++++-- 6 files changed, 75 insertions(+), 4 deletions(-) diff --git a/src/open_inwoner/accounts/tests/test_action_views.py b/src/open_inwoner/accounts/tests/test_action_views.py index 4b8b7c4f41..ad090df9b9 100644 --- a/src/open_inwoner/accounts/tests/test_action_views.py +++ b/src/open_inwoner/accounts/tests/test_action_views.py @@ -227,6 +227,12 @@ def test_action_history(self): self.assertEqual(response.status_code, 200) self.assertContains(response, self.action.name) + def test_action_history_breadcrumbs(self): + response = self.app.get(self.history_url, user=self.user) + crumbs = response.pyquery(".breadcrumbs__list-item") + self.assertIn(_("Mijn profiel"), crumbs[1].text_content()) + self.assertIn(_("Mijn acties"), crumbs[2].text_content()) + def test_action_history_not_your_action(self): other_user = UserFactory() self.app.get(self.history_url, user=other_user, status=404) diff --git a/src/open_inwoner/components/templates/components/Action/Actions.html b/src/open_inwoner/components/templates/components/Action/Actions.html index d3489fa4b7..0a18055937 100644 --- a/src/open_inwoner/components/templates/components/Action/Actions.html +++ b/src/open_inwoner/components/templates/components/Action/Actions.html @@ -26,7 +26,12 @@ {% button icon="edit" text=_("Bewerken") href=action_url icon_outlined=True transparent=True %}
- {% button icon="history" text=_("History") href="accounts:action_history" uuid=action.uuid icon_outlined=True transparent=True %} + {% if plan %} + {% get_action_history_url action=action plan=plan as action_history_url %} + {% button icon="history" text=_("History") href=action_history_url uuid=action.uuid icon_outlined=True transparent=True %} + {% else %} + {% button icon="history" text=_("History") href="accounts:action_history" uuid=action.uuid icon_outlined=True transparent=True %} + {% endif %}
{% get_action_delete_url action=action plan=plan as action_url %} diff --git a/src/open_inwoner/components/templatetags/action_tags.py b/src/open_inwoner/components/templatetags/action_tags.py index 3245cc2624..17da1ab001 100644 --- a/src/open_inwoner/components/templatetags/action_tags.py +++ b/src/open_inwoner/components/templatetags/action_tags.py @@ -138,6 +138,24 @@ def get_action_delete_url(action, plan=None): return reverse("accounts:action_delete", kwargs={"uuid": action.uuid}) +@register.simple_tag() +def get_action_history_url(action, plan): + """ + Generates the correct action history url for plans. + + Usage: + {% get_action_history_url action=action plan=plan %} + + Variables: + + action: Action | The action the url should be generated from. + + plan: Plan | The plan the action history url should be generated for. + """ + return reverse( + "plans:plan_action_history", + kwargs={"plan_uuid": plan.uuid, "uuid": action.uuid}, + ) + + @register.filter() def is_connected(action, user): """ diff --git a/src/open_inwoner/plans/tests/test_views.py b/src/open_inwoner/plans/tests/test_views.py index 7ab3cb2b15..e594f46bbd 100644 --- a/src/open_inwoner/plans/tests/test_views.py +++ b/src/open_inwoner/plans/tests/test_views.py @@ -51,6 +51,10 @@ def setUp(self) -> None: "plans:plan_action_edit", kwargs={"plan_uuid": self.plan.uuid, "uuid": self.action.uuid}, ) + self.action_history_url = reverse( + "plans:plan_action_history", + kwargs={"plan_uuid": self.plan.uuid, "uuid": self.action.uuid}, + ) self.action_edit_status_url = reverse( "plans:plan_action_edit_status", kwargs={"plan_uuid": self.plan.uuid, "uuid": self.action.uuid}, @@ -484,6 +488,13 @@ def test_plan_action_edit_not_changed(self): # no notification is sent self.assertEqual(len(mail.outbox), 0) + def test_plan_actions_history_breadcrumbs(self): + response = self.app.get(self.action_history_url, user=self.user) + crumbs = response.pyquery(".breadcrumbs__list-item") + self.assertIn(_("Samenwerking"), crumbs[1].text_content()) + self.assertIn(self.plan.title, crumbs[2].text_content()) + self.assertIn(self.action.name, crumbs[3].text_content()) + def test_plan_action_delete_login_required_http_403(self): response = self.client.post(self.action_delete_url) self.assertEquals(response.status_code, 403) diff --git a/src/open_inwoner/plans/urls.py b/src/open_inwoner/plans/urls.py index 2669fe2a5a..7489532090 100644 --- a/src/open_inwoner/plans/urls.py +++ b/src/open_inwoner/plans/urls.py @@ -5,6 +5,7 @@ PlanActionDeleteView, PlanActionEditStatusTagView, PlanActionEditView, + PlanActionHistoryView, PlanCreateView, PlanDetailView, PlanEditView, @@ -42,5 +43,10 @@ PlanActionDeleteView.as_view(), name="plan_action_delete", ), + path( + "/actions//history/", + PlanActionHistoryView.as_view(), + name="plan_action_history", + ), path("/export/", PlanExportView.as_view(), name="plan_export"), ] diff --git a/src/open_inwoner/plans/views.py b/src/open_inwoner/plans/views.py index 968d743851..fe9fa182a4 100644 --- a/src/open_inwoner/plans/views.py +++ b/src/open_inwoner/plans/views.py @@ -17,6 +17,7 @@ from open_inwoner.accounts.views.actions import ( ActionCreateView, ActionDeleteView, + ActionHistoryView, ActionUpdateStatusTagView, ActionUpdateView, BaseActionFilter, @@ -178,7 +179,7 @@ class PlanDetailView( @cached_property def crumbs(self): return [ - (_("Samenwerkingsplannen"), reverse("plans:plan_list")), + (_("Samenwerken"), reverse("plans:plan_list")), (self.get_object().title, reverse("plans:plan_detail", kwargs=self.kwargs)), ] @@ -223,8 +224,8 @@ class PlanCreateView( @cached_property def crumbs(self): return [ - (_("Samenwerkingsplannen"), reverse("plans:plan_list")), - (_("Maak samenwerkingsplan aan"), reverse("plans:plan_create")), + (_("Samenwerken"), reverse("plans:plan_list")), + (_("Start nieuwe samenwerking"), reverse("plans:plan_create")), ] def get_form_kwargs(self): @@ -520,6 +521,30 @@ def on_delete_action(self, action): ) +class PlanActionHistoryView(ActionHistoryView): + @cached_property + def crumbs(self): + return [ + (_("Samenwerking"), reverse("plans:plan_list")), + ( + self.get_plan().title, + reverse("plans:plan_detail", kwargs={"uuid": self.get_plan().uuid}), + ), + ( + _("History of {}").format(self.object.name), + reverse("plans:plan_action_history", kwargs=self.kwargs), + ), + ] + + def get_plan(self): + try: + return Plan.objects.connected(self.request.user).get( + uuid=self.kwargs.get("plan_uuid") + ) + except ObjectDoesNotExist as e: + raise Http404 + + class PlanExportView( PlansEnabledMixin, LogMixin, LoginRequiredMixin, ExportMixin, DetailView ): From 5bc84648b33a3eeba343f084bf1e85c420bdc6f4 Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 23 Mar 2023 10:38:15 +0100 Subject: [PATCH 19/45] [#1249] Removed unnecessary function and fixed tests --- src/log_outgoing_requests/handlers.py | 4 +-- .../tests/test_logging.py | 30 +++++++------------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/log_outgoing_requests/handlers.py b/src/log_outgoing_requests/handlers.py index 21e1ec77d9..631f14761a 100644 --- a/src/log_outgoing_requests/handlers.py +++ b/src/log_outgoing_requests/handlers.py @@ -1,5 +1,4 @@ import logging -import textwrap import traceback from urllib.parse import urlparse @@ -42,5 +41,4 @@ def emit(self, record): OutgoingRequestsLog.objects.create(**kwargs) def format_headers(self, headers): - result = textwrap.dedent("\n".join(f"{k}: {v}" for k, v in headers.items())) - return result + return "\n".join(f"{k}: {v}" for k, v in headers.items()) diff --git a/src/log_outgoing_requests/tests/test_logging.py b/src/log_outgoing_requests/tests/test_logging.py index 7b3b35c622..2bd094b059 100644 --- a/src/log_outgoing_requests/tests/test_logging.py +++ b/src/log_outgoing_requests/tests/test_logging.py @@ -55,6 +55,16 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): "Content-Type": "application/json", }, ) + expected_req_headers = ( + "User-Agent: python-requests/2.26.0\n" + "Accept-Encoding: gzip, deflate, br\n" + "Accept: */*\n" + "Connection: keep-alive\n" + "Authorization: ***hidden***\n" + "Content-Type: text/html" + ) + if method not in ["HEAD", "GET"]: + expected_req_headers += "\nContent-Length: 0" response = func( "http://example.com/some-path?version=2.0", @@ -74,25 +84,7 @@ def test_expected_data_is_saved_when_saving_enabled(self, m): self.assertEqual(request_log.req_content_type, "text/html") self.assertEqual(request_log.res_content_type, "application/json") self.assertEqual(request_log.response_ms, 0) - self.assertEqual( - request_log.req_headers, - ( - "User-Agent: python-requests/2.26.0\n" - "Accept-Encoding: gzip, deflate, br\n" - "Accept: */*" - "\nConnection: keep-alive\n" - "Authorization: ***hidden***\n" - "Content-Type: text/html" - if method in ["HEAD", "GET"] - else "User-Agent: python-requests/2.26.0\n" - "Accept-Encoding: gzip, deflate, br\n" - "Accept: */*\n" - "Connection: keep-alive\n" - "Authorization: ***hidden***\n" - "Content-Type: text/html\n" - "Content-Length: 0" - ), - ) + self.assertEqual(request_log.req_headers, expected_req_headers) self.assertEqual( request_log.res_headers, "Date: Tue, 21 Mar 2023 15:24:08 GMT\nContent-Type: application/json", From 0c9c4ea73f29c36011a83c4cf39f594288a36a76 Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 23 Mar 2023 12:10:37 +0100 Subject: [PATCH 20/45] [#1248] Added template tag for next url --- .../accounts/templates/registration/login.html | 13 ++++++++++--- src/open_inwoner/accounts/tests/test_auth.py | 7 ++++--- .../templates/components/Typography/Link.html | 2 +- .../components/templatetags/link_tags.py | 12 ++++++++++++ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/open_inwoner/accounts/templates/registration/login.html b/src/open_inwoner/accounts/templates/registration/login.html index 89c47a6863..1aa10bcdd8 100644 --- a/src/open_inwoner/accounts/templates/registration/login.html +++ b/src/open_inwoner/accounts/templates/registration/login.html @@ -21,7 +21,10 @@

{% trans 'Welkom' %}

 - {% link href='digid:login' next=next text=_('Inloggen met DigiD') secondary=True icon='arrow_forward' extra_classes="link--digid" %} + {% url 'digid:login' as href %} + {% with href|addnexturl:next as href_with_next %} + {% link href=href_with_next text=_('Inloggen met DigiD') secondary=True icon='arrow_forward' extra_classes="link--digid" %} + {% endwith %} {% endrender_card %} {% endif %} @@ -36,7 +39,10 @@

{% trans 'Welkom' %}

{% else %}
{% endif %} - {% link text=site_config.openid_connect_login_text href='oidc_authentication_init' next=next secondary=True icon='arrow_forward' icon_position="after" %} + {% url 'oidc_authentication_init' as href %} + {% with href|addnexturl:next as href_with_next %} + {% link text=site_config.openid_connect_login_text href=href_with_next secondary=True icon='arrow_forward' icon_position="after" %} + {% endwith %} {% endrender_card %} {% endif %} @@ -44,9 +50,10 @@

{% trans 'Welkom' %}

{% render_card tinted=True %} {% render_form id="login-form" method="POST" form=form %} {% csrf_token %} + {% input form.username %} {% input form.password %} - {% button text=_('Wachtwoord vergeten?') href='password_reset' next=next secondary=True transparent=True align='right' %} + {% button text=_('Wachtwoord vergeten?') href='password_reset' secondary=True transparent=True align='right' %} {% form_actions primary_text=_("Inloggen") primary_icon="arrow_forward" secondary_href='django_registration_register' secondary_text=_('Registreer') secondary_icon='arrow_forward' single=True %} {% endrender_form %} {% endrender_card %} diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py index 62e97e034c..05458415de 100644 --- a/src/open_inwoner/accounts/tests/test_auth.py +++ b/src/open_inwoner/accounts/tests/test_auth.py @@ -820,10 +820,11 @@ def setUp(self): self.config.save() def test_login_page_has_next_url(self): - response = self.app.get( - f"{reverse('login')}?next={reverse('accounts:contact_list')}" + response = self.app.get(reverse("accounts:contact_list")) + self.assertRedirects( + response, f"{reverse('login')}?next={reverse('accounts:contact_list')}" ) - self.assertIn(f"?next={reverse('accounts:contact_list')}", response) + self.assertIn(f"?next={reverse('accounts:contact_list')}", response.follow()) def test_login(self): """Test that a user is successfully logged in.""" diff --git a/src/open_inwoner/components/templates/components/Typography/Link.html b/src/open_inwoner/components/templates/components/Typography/Link.html index 3caa8931b3..2e3adc7213 100644 --- a/src/open_inwoner/components/templates/components/Typography/Link.html +++ b/src/open_inwoner/components/templates/components/Typography/Link.html @@ -1,7 +1,7 @@ {% load i18n helpers icon_tags %} Date: Fri, 10 Mar 2023 16:19:46 +0100 Subject: [PATCH 21/45] :lipstick: [#1169] Make images/icons have static sizes in cards --- .../accounts/registration_necessary.html | 2 + .../registration_form.html | 2 + .../templates/registration/login.html | 4 +- src/open_inwoner/pdc/views.py | 4 +- .../CardContainer/CardContainer.scss | 9 +++ .../scss/components/Header/AnchorMenu.scss | 9 ++- src/open_inwoner/scss/views/Categories.scss | 24 +++++++ src/open_inwoner/scss/views/Home.scss | 11 ++++ src/open_inwoner/scss/views/_index.scss | 2 + .../templates/pages/category/detail.html | 64 ++++++++++--------- .../templates/pages/category/list.html | 8 ++- src/open_inwoner/templates/pages/home.html | 4 +- .../templates/pages/user-home.html | 2 +- 13 files changed, 104 insertions(+), 41 deletions(-) create mode 100644 src/open_inwoner/scss/views/Categories.scss create mode 100644 src/open_inwoner/scss/views/Home.scss diff --git a/src/open_inwoner/accounts/templates/accounts/registration_necessary.html b/src/open_inwoner/accounts/templates/accounts/registration_necessary.html index 704fe25203..7094d3ccc3 100644 --- a/src/open_inwoner/accounts/templates/accounts/registration_necessary.html +++ b/src/open_inwoner/accounts/templates/accounts/registration_necessary.html @@ -3,6 +3,7 @@ {% block content %} +
{% render_grid %} {% render_column span=9 %} {% render_card tinted=True %} @@ -11,5 +12,6 @@

{% trans "Registratie voltooien" %}


{% endrender_card %} {% endrender_column %} {% endrender_grid %} +
{% endblock content %} diff --git a/src/open_inwoner/accounts/templates/django_registration/registration_form.html b/src/open_inwoner/accounts/templates/django_registration/registration_form.html index deb2a21166..3cf607e0c5 100644 --- a/src/open_inwoner/accounts/templates/django_registration/registration_form.html +++ b/src/open_inwoner/accounts/templates/django_registration/registration_form.html @@ -3,6 +3,7 @@ {% block content %} +
{% render_grid %} {% render_column start=5 span=5 %} {% render_card direction='horizontal' tinted=True %} @@ -23,5 +24,6 @@

{% trans "Registreren met E-mail" %}


{% endif %} {% endrender_grid %} +
{% endblock content %} diff --git a/src/open_inwoner/accounts/templates/registration/login.html b/src/open_inwoner/accounts/templates/registration/login.html index d319bb6f6c..501d8d8b97 100644 --- a/src/open_inwoner/accounts/templates/registration/login.html +++ b/src/open_inwoner/accounts/templates/registration/login.html @@ -10,6 +10,7 @@ {% block content %} + {% endblock content %} diff --git a/src/open_inwoner/pdc/views.py b/src/open_inwoner/pdc/views.py index 68be083cd0..5ddcfef7e7 100644 --- a/src/open_inwoner/pdc/views.py +++ b/src/open_inwoner/pdc/views.py @@ -60,7 +60,7 @@ def page_title(self): def get_context_data(self, **kwargs): config = SiteConfiguration.get_solo() - limit = 3 if self.request.user.is_authenticated else 4 + limit = 4 kwargs.update(categories=Category.objects.published().order_by("name")[:limit]) kwargs.update(product_locations=ProductLocation.objects.all()[:1000]) kwargs.update( @@ -86,7 +86,7 @@ def get_context_data(self, **kwargs): and self.request.user.selected_themes.exists() ): kwargs.update( - categories=self.request.user.selected_themes.order_by("name")[:3] + categories=self.request.user.selected_themes.order_by("name")[:limit] ) elif highlighted_categories: kwargs.update(categories=highlighted_categories) diff --git a/src/open_inwoner/scss/components/CardContainer/CardContainer.scss b/src/open_inwoner/scss/components/CardContainer/CardContainer.scss index 5f556a6f3b..7afed236f1 100644 --- a/src/open_inwoner/scss/components/CardContainer/CardContainer.scss +++ b/src/open_inwoner/scss/components/CardContainer/CardContainer.scss @@ -31,3 +31,12 @@ .card-container + h2 { margin-top: var(--gutter-width); } + +/// Exceptions for forms inside cards + +.registration-grid, +.login-grid { + .card { + max-width: 100%; + } +} diff --git a/src/open_inwoner/scss/components/Header/AnchorMenu.scss b/src/open_inwoner/scss/components/Header/AnchorMenu.scss index 417d0b26ed..4ee3888b7f 100644 --- a/src/open_inwoner/scss/components/Header/AnchorMenu.scss +++ b/src/open_inwoner/scss/components/Header/AnchorMenu.scss @@ -17,7 +17,7 @@ width: 100%; list-style: none; margin: 0; - padding: 0; + padding: var(--spacing-extra-large); z-index: 1002; &--desktop { @@ -62,11 +62,13 @@ .link { box-sizing: border-box; - padding: var(--spacing-large); + padding: var(--spacing-medium) var(--spacing-large) var(--spacing-medium) + var(--spacing-large); @media (min-width: 768px) { border-left: var(--border-width) solid; border-color: var(--color-gray-light); + padding: var(--spacing-large); } } @@ -80,7 +82,8 @@ &--mobile__title { box-sizing: border-box; - padding: var(--spacing-large); + padding: var(--spacing-large) var(--spacing-large) var(--spacing-medium) + var(--spacing-large); &.h4 { color: var(--color-primary); diff --git a/src/open_inwoner/scss/views/Categories.scss b/src/open_inwoner/scss/views/Categories.scss new file mode 100644 index 0000000000..90f6391bc1 --- /dev/null +++ b/src/open_inwoner/scss/views/Categories.scss @@ -0,0 +1,24 @@ +.categories { + &__content { + .card-container { + grid-template-columns: repeat(auto-fit, 228px); + + .card { + max-width: 360px; + } + } + } + + &__products { + margin-top: var(--gutter-width); + + .card-container { + margin-top: var(--gutter-width); + grid-template-columns: repeat(var(--card-columns), 1fr); + + .card { + max-width: 100%; + } + } + } +} diff --git a/src/open_inwoner/scss/views/Home.scss b/src/open_inwoner/scss/views/Home.scss new file mode 100644 index 0000000000..4ae6361473 --- /dev/null +++ b/src/open_inwoner/scss/views/Home.scss @@ -0,0 +1,11 @@ +/// Cards on Home Page and Theme page + +.home { + .card-container { + grid-template-columns: repeat(auto-fit, 228px); + + .card { + max-width: 360px; + } + } +} diff --git a/src/open_inwoner/scss/views/_index.scss b/src/open_inwoner/scss/views/_index.scss index 51b490f1b6..15b4cba304 100644 --- a/src/open_inwoner/scss/views/_index.scss +++ b/src/open_inwoner/scss/views/_index.scss @@ -1,5 +1,7 @@ @import './App.scss'; @import './body'; +@import './Categories.scss'; +@import './Home.scss'; @import './Plans.scss'; @import './product_detail'; @import './view'; diff --git a/src/open_inwoner/templates/pages/category/detail.html b/src/open_inwoner/templates/pages/category/detail.html index d53218cc78..5404a6c932 100644 --- a/src/open_inwoner/templates/pages/category/detail.html +++ b/src/open_inwoner/templates/pages/category/detail.html @@ -10,39 +10,43 @@ {% endblock header_image %} {% block content %} -

- {{ object.name }} - {% if request.user.is_staff %} - {% button icon="edit" text=_("Open in admin") hide_text=True href="admin:pdc_category_change" object_id=object.pk %} - {% endif %} -

-

{{ object.description|linebreaksbr }}

+
+

+ {{ object.name }} + {% if request.user.is_staff %} + {% button icon="edit" text=_("Open in admin") hide_text=True href="admin:pdc_category_change" object_id=object.pk %} + {% endif %} +

+

{{ object.description|linebreaksbr }}

- {% if subcategories %} - {% card_container subcategories=subcategories parent_category=object %} - {% endif %} + {% if subcategories %} + {% card_container subcategories=subcategories parent_category=object %} + {% endif %} - {% if products %} - {% card_container products=products small=True parent=object %} - {% endif %} + {% if products %} +
+ {% card_container products=products small=True parent=object %} +
+ {% endif %} - {% if category.question_set.all %} - {% render_grid %} - {% render_column span=6 %} - {% faq category.question_set.all %} - {% endrender_column %} - {% endrender_grid %} - {% endif %} + {% if category.question_set.all %} + {% render_grid %} + {% render_column span=6 %} + {% faq category.question_set.all %} + {% endrender_column %} + {% endrender_grid %} + {% endif %} - {% if questionnaire_roots %} -
-
- + {% if questionnaire_roots %} +
+
+ +
-
- {% endif %} + {% endif %} +
{% endblock content %} diff --git a/src/open_inwoner/templates/pages/category/list.html b/src/open_inwoner/templates/pages/category/list.html index 212d9422e1..03f6d0f2ef 100644 --- a/src/open_inwoner/templates/pages/category/list.html +++ b/src/open_inwoner/templates/pages/category/list.html @@ -2,8 +2,10 @@ {% load card_tags %} {% block content %} -

{{configurable_text.theme_page.theme_title}}

-

{{configurable_text.theme_page.theme_intro|linebreaksbr}}

+
+

{{configurable_text.theme_page.theme_title}}

+

{{configurable_text.theme_page.theme_intro|linebreaksbr}}

-{% card_container categories=object_list %} + {% card_container categories=object_list %} +
{% endblock content %} diff --git a/src/open_inwoner/templates/pages/home.html b/src/open_inwoner/templates/pages/home.html index 8ab2a73d45..95c30efd82 100644 --- a/src/open_inwoner/templates/pages/home.html +++ b/src/open_inwoner/templates/pages/home.html @@ -8,6 +8,7 @@ {% endblock header_image %} {% block content %} +
{% block user_content %}

{{configurable_text.home_page.home_welcome_title}}

@@ -24,7 +25,7 @@

{{configurable_text.home_page.home_theme_intro|linebreaksbr}}

{% if request.user.is_authenticated %} - {% card_container categories=categories columns=3 image_object_fit="cover" %} + {% card_container categories=categories columns=4 image_object_fit="cover" %} {% else %} {% card_container categories=categories image_object_fit="cover" %} {% endif %} @@ -45,4 +46,5 @@

{{configurable_text.home_page.home_map_title}}

{% with centroid=product_locations.get_centroid %} {% map centroid.lat centroid.lng geojson_feature_collection=product_locations.get_geojson_feature_collection %} {% endwith %} +
{% endblock %} diff --git a/src/open_inwoner/templates/pages/user-home.html b/src/open_inwoner/templates/pages/user-home.html index c46d8c5b36..81fb35078b 100644 --- a/src/open_inwoner/templates/pages/user-home.html +++ b/src/open_inwoner/templates/pages/user-home.html @@ -14,7 +14,7 @@

{% if plans %} -
+
{% for plan in plans %} {% render_card image_object_fit="cover" %}

{{ plan.title }}

From 8c291417b6a6023db247da77494d7b31fb59251f Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 23 Mar 2023 12:43:20 +0100 Subject: [PATCH 22/45] [#1268] Disabled button in case document upload when form is being submitted --- src/open_inwoner/js/components/cases/index.js | 16 ++++++++++++++++ src/open_inwoner/js/components/index.js | 1 + 2 files changed, 17 insertions(+) create mode 100644 src/open_inwoner/js/components/cases/index.js diff --git a/src/open_inwoner/js/components/cases/index.js b/src/open_inwoner/js/components/cases/index.js new file mode 100644 index 0000000000..967811e34d --- /dev/null +++ b/src/open_inwoner/js/components/cases/index.js @@ -0,0 +1,16 @@ +class DisableSubmitButton { + constructor(form) { + this.form = form + this.form.addEventListener('submit', this.disableButton.bind(this)) + } + + disableButton() { + const submitButton = this.form.querySelector('button[type="submit"]') + submitButton.setAttribute('disabled', 'true') + } +} + +const caseDocumentForms = document.querySelectorAll('#document-upload') +;[...caseDocumentForms].forEach( + (caseDocumentForm) => new DisableSubmitButton(caseDocumentForm) +) diff --git a/src/open_inwoner/js/components/index.js b/src/open_inwoner/js/components/index.js index fa7a189e71..833ac6a9cd 100644 --- a/src/open_inwoner/js/components/index.js +++ b/src/open_inwoner/js/components/index.js @@ -6,6 +6,7 @@ import './anchor-menu' import './autocomplete-search' import './autocomplete' import './autosumbit' +import './cases' import './confirmation' import './contacts' import './datepicker' From 13c09730f5766cb1d68ca9f0016f6e163f67d30c Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 23 Mar 2023 16:28:28 +0100 Subject: [PATCH 23/45] [#1248] Fixed template tag and tests --- src/open_inwoner/accounts/tests/test_auth.py | 8 ++++++-- src/open_inwoner/components/templatetags/link_tags.py | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py index 05458415de..24b26fb049 100644 --- a/src/open_inwoner/accounts/tests/test_auth.py +++ b/src/open_inwoner/accounts/tests/test_auth.py @@ -822,9 +822,13 @@ def setUp(self): def test_login_page_has_next_url(self): response = self.app.get(reverse("accounts:contact_list")) self.assertRedirects( - response, f"{reverse('login')}?next={reverse('accounts:contact_list')}" + response, + furl(reverse("login")).add({"next": reverse("accounts:contact_list")}).url, + ) + self.assertIn( + furl("").add({"next": reverse("accounts:contact_list")}).url, + response.follow(), ) - self.assertIn(f"?next={reverse('accounts:contact_list')}", response.follow()) def test_login(self): """Test that a user is successfully logged in.""" diff --git a/src/open_inwoner/components/templatetags/link_tags.py b/src/open_inwoner/components/templatetags/link_tags.py index a3cbb18481..e8b53329b9 100644 --- a/src/open_inwoner/components/templatetags/link_tags.py +++ b/src/open_inwoner/components/templatetags/link_tags.py @@ -2,6 +2,8 @@ from django.urls import NoReverseMatch, reverse from django.utils.html import format_html +from furl import furl + register = template.Library() @@ -119,8 +121,6 @@ def addnexturl(href, next_url): """ Concatenates href & next_url. """ - if "?" in href: - href += f"&next={next_url}" - return href - - return href + f"?next={next_url}" + f = furl(href) + f.args["next"] = next_url + return f.url From 39c85e850120cc52686ad18fa16bd8e88982d001 Mon Sep 17 00:00:00 2001 From: vasileios Date: Thu, 23 Mar 2023 16:46:31 +0100 Subject: [PATCH 24/45] [#1231] Removed unnecessary template tag --- .../templates/components/Action/Actions.html | 2 +- .../components/templatetags/action_tags.py | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/open_inwoner/components/templates/components/Action/Actions.html b/src/open_inwoner/components/templates/components/Action/Actions.html index 0a18055937..435d94e00b 100644 --- a/src/open_inwoner/components/templates/components/Action/Actions.html +++ b/src/open_inwoner/components/templates/components/Action/Actions.html @@ -27,7 +27,7 @@
{% if plan %} - {% get_action_history_url action=action plan=plan as action_history_url %} + {% url 'plans:plan_action_history' plan_uuid=plan.uuid uuid=action.uuid as action_history_url %} {% button icon="history" text=_("History") href=action_history_url uuid=action.uuid icon_outlined=True transparent=True %} {% else %} {% button icon="history" text=_("History") href="accounts:action_history" uuid=action.uuid icon_outlined=True transparent=True %} diff --git a/src/open_inwoner/components/templatetags/action_tags.py b/src/open_inwoner/components/templatetags/action_tags.py index 17da1ab001..3245cc2624 100644 --- a/src/open_inwoner/components/templatetags/action_tags.py +++ b/src/open_inwoner/components/templatetags/action_tags.py @@ -138,24 +138,6 @@ def get_action_delete_url(action, plan=None): return reverse("accounts:action_delete", kwargs={"uuid": action.uuid}) -@register.simple_tag() -def get_action_history_url(action, plan): - """ - Generates the correct action history url for plans. - - Usage: - {% get_action_history_url action=action plan=plan %} - - Variables: - + action: Action | The action the url should be generated from. - + plan: Plan | The plan the action history url should be generated for. - """ - return reverse( - "plans:plan_action_history", - kwargs={"plan_uuid": plan.uuid, "uuid": action.uuid}, - ) - - @register.filter() def is_connected(action, user): """ From a752ebf8183ce559cbc57fb2b052d8906968d6b9 Mon Sep 17 00:00:00 2001 From: vasileios Date: Fri, 24 Mar 2023 11:10:38 +0100 Subject: [PATCH 25/45] [#1253] Remove case result if none --- src/open_inwoner/accounts/views/cases.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/open_inwoner/accounts/views/cases.py b/src/open_inwoner/accounts/views/cases.py index e55e6ff134..ad38d8586b 100644 --- a/src/open_inwoner/accounts/views/cases.py +++ b/src/open_inwoner/accounts/views/cases.py @@ -397,7 +397,7 @@ def get_result_display(self, case: Zaak) -> str: result = fetch_single_result(case.resultaat) if result: return result.toelichting - return _("Onbekend") + return None def get_initiator_display(self, case: Zaak) -> str: roles = fetch_case_roles(case.url, RolOmschrijving.initiator) From c01369ed7ec83cc061990d5ee02550f8b882de88 Mon Sep 17 00:00:00 2001 From: vasileios Date: Fri, 24 Mar 2023 13:00:39 +0100 Subject: [PATCH 26/45] [#1258] Fixed order of phonenumber and email and added tel,email links --- src/open_inwoner/js/components/map/index.js | 49 +++++++++++++------ .../templates/pages/product/detail.html | 4 +- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/open_inwoner/js/components/map/index.js b/src/open_inwoner/js/components/map/index.js index dd3108593c..5126192556 100644 --- a/src/open_inwoner/js/components/map/index.js +++ b/src/open_inwoner/js/components/map/index.js @@ -74,31 +74,50 @@ class Map { * @return {string} */ featureToHTML(feature) { - const { name, location_url, ...properties } = feature.properties + const { + name, + location_url, + address_line_1, + address_line_2, + phonenumber, + email, + ...properties + } = feature.properties + const displayName = name ? escapeHTML(name) : '' const locationDetailView = location_url ? escapeHTML(location_url) : '' + const displayAddress1 = address_line_1 ? escapeHTML(address_line_1) : '' + const displayAddress2 = address_line_2 ? escapeHTML(address_line_2) : '' + const displayPhonenumber = phonenumber ? escapeHTML(phonenumber) : '' + const displayEmail = email ? escapeHTML(email) : '' let title = '' - let finalHTML = `` if (locationDetailView) { - title = `${displayName}` + title = ` + + ${displayName} + + ` } else { title = displayName } - Object.entries(properties).forEach((property) => { - finalHTML += `

${escapeHTML(property[1])}

` - }) - return ` -
-

- ${title} -

-
-
- ${finalHTML} -
+
+

+ ${title} +

+
+
+

${displayAddress1}

+

${displayAddress2}

+ + ${displayPhonenumber} + + + ${displayEmail} + +
` } } diff --git a/src/open_inwoner/templates/pages/product/detail.html b/src/open_inwoner/templates/pages/product/detail.html index 4d61227556..f76207238e 100644 --- a/src/open_inwoner/templates/pages/product/detail.html +++ b/src/open_inwoner/templates/pages/product/detail.html @@ -86,10 +86,10 @@

{% trans "U komt niet in aanmerking" %}

{{ location.address_line_1 }}

{{ location.address_line_2 }}

{% if location.phonenumber %} -

{{ location.phonenumber }}

+ {% link href='tel:{{location.phonenumber}}' primary=True text=location.phonenumber %} {% endif %} {% if location.email %} -

{{ location.email }}

+ {% link href='mailto:{{location.email}}' primary=True text=location.email %} {% endif %}
{% endrender_card %} From 8ee7a9c8354a433b3a7096e88913b8889f29de4a Mon Sep 17 00:00:00 2001 From: vasileios Date: Fri, 24 Mar 2023 14:56:48 +0100 Subject: [PATCH 27/45] [#1027] Disabled applications dropdown in 2factor admin --- src/open_inwoner/conf/base.py | 3 +++ .../utils/django_two_factor_auth.py | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/open_inwoner/utils/django_two_factor_auth.py diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py index a8fc580ff0..bb448075a9 100644 --- a/src/open_inwoner/conf/base.py +++ b/src/open_inwoner/conf/base.py @@ -1027,6 +1027,9 @@ # TWO_FACTOR_FORCE_OTP_ADMIN = config("TWO_FACTOR_FORCE_OTP_ADMIN", default=not DEBUG) TWO_FACTOR_PATCH_ADMIN = config("TWO_FACTOR_PATCH_ADMIN", default=True) +ADMIN_INDEX_DISPLAY_DROP_DOWN_MENU_CONDITION_FUNCTION = ( + "open_inwoner.utils.django_two_factor_auth.should_display_dropdown_menu" +) # file upload limits MIN_UPLOAD_SIZE = 1 # in bytes diff --git a/src/open_inwoner/utils/django_two_factor_auth.py b/src/open_inwoner/utils/django_two_factor_auth.py new file mode 100644 index 0000000000..1e3dc9688b --- /dev/null +++ b/src/open_inwoner/utils/django_two_factor_auth.py @@ -0,0 +1,19 @@ +from django.conf import settings + +from django_admin_index.utils import ( + should_display_dropdown_menu as default_should_display_dropdown_menu, +) + + +def should_display_dropdown_menu(request) -> bool: + default = default_should_display_dropdown_menu(request) + + two_factor_enabled = settings.TWO_FACTOR_PATCH_ADMIN + if not two_factor_enabled: + return default + + # never display the dropdown in two-factor admin views + if request.resolver_match.view_name.startswith("admin:two_factor:"): + return False + + return default and request.user.is_verified() From 44ee2578f3fcf076e3c018390aa9950711945fda Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Mon, 13 Mar 2023 11:12:54 +0100 Subject: [PATCH 28/45] [#1177] Added through model for Plan.plan_contact m2m --- .../migrations/0013_auto_20230223_1115.py | 1 + .../migrations/0014_auto_20230306_1017.py | 70 +++++++++++++++++++ .../migrations/0015_plancontact_notify_new.py | 18 +++++ src/open_inwoner/plans/models.py | 11 +++ .../plans/tests/test_data_migrations.py | 35 ++++++++++ 5 files changed, 135 insertions(+) create mode 100644 src/open_inwoner/plans/migrations/0014_auto_20230306_1017.py create mode 100644 src/open_inwoner/plans/migrations/0015_plancontact_notify_new.py diff --git a/src/open_inwoner/plans/migrations/0013_auto_20230223_1115.py b/src/open_inwoner/plans/migrations/0013_auto_20230223_1115.py index 7a756d545e..b14a9a0440 100644 --- a/src/open_inwoner/plans/migrations/0013_auto_20230223_1115.py +++ b/src/open_inwoner/plans/migrations/0013_auto_20230223_1115.py @@ -6,6 +6,7 @@ class Migration(migrations.Migration): dependencies = [ + ("accounts", "0055_user_image"), ("plans", "0012_remove_actiontemplate_goal"), ] diff --git a/src/open_inwoner/plans/migrations/0014_auto_20230306_1017.py b/src/open_inwoner/plans/migrations/0014_auto_20230306_1017.py new file mode 100644 index 0000000000..cf2a98785f --- /dev/null +++ b/src/open_inwoner/plans/migrations/0014_auto_20230306_1017.py @@ -0,0 +1,70 @@ +# Generated by Django 3.2.15 on 2023-03-06 09:17 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("accounts", "0055_user_image"), + ("plans", "0013_auto_20230223_1115"), + ] + + # https://docs.djangoproject.com/en/3.2/howto/writing-migrations/#changing-a-manytomanyfield-to-use-a-through-model + + operations = [ + migrations.SeparateDatabaseAndState( + database_operations=[ + migrations.RunSQL( + sql="ALTER TABLE plans_plan_plan_contacts RENAME TO plans_plancontact", + reverse_sql="ALTER TABLE plans_plancontact RENAME TO plans_plan_plan_contacts", + ), + ], + state_operations=[ + migrations.CreateModel( + name="PlanContact", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "user", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + verbose_name="Contact", + ), + ), + ( + "plan", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="plans.plan", + verbose_name="Plan", + ), + ), + ], + ), + migrations.AlterField( + model_name="plan", + name="plan_contacts", + field=models.ManyToManyField( + blank=True, + help_text="The contact that will help you with this plan.", + related_name="plans", + through="plans.PlanContact", + to=settings.AUTH_USER_MODEL, + verbose_name="Contacts", + ), + ), + ], + ), + ] diff --git a/src/open_inwoner/plans/migrations/0015_plancontact_notify_new.py b/src/open_inwoner/plans/migrations/0015_plancontact_notify_new.py new file mode 100644 index 0000000000..7785dd23a3 --- /dev/null +++ b/src/open_inwoner/plans/migrations/0015_plancontact_notify_new.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.15 on 2023-03-06 09:34 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("plans", "0014_auto_20230306_1017"), + ] + + operations = [ + migrations.AddField( + model_name="plancontact", + name="notify_new", + field=models.BooleanField(default=False, verbose_name="Notify contact"), + ), + ] diff --git a/src/open_inwoner/plans/models.py b/src/open_inwoner/plans/models.py index ca6a75fb48..c38678912c 100644 --- a/src/open_inwoner/plans/models.py +++ b/src/open_inwoner/plans/models.py @@ -90,6 +90,16 @@ class ActionTemplate(models.Model): ) +class PlanContact(models.Model): + plan = models.ForeignKey( + "plans.Plan", verbose_name=_("Plan"), on_delete=models.CASCADE + ) + user = models.ForeignKey( + "accounts.User", verbose_name=_("Contact"), on_delete=models.CASCADE + ) + notify_new = models.BooleanField(verbose_name=_("Notify contact"), default=False) + + class Plan(models.Model): uuid = models.UUIDField(verbose_name=_("UUID"), default=uuid4, unique=True) title = models.CharField( @@ -116,6 +126,7 @@ class Plan(models.Model): related_name="plans", blank=True, help_text=_("The contact that will help you with this plan."), + through=PlanContact, ) created_by = models.ForeignKey( "accounts.User", verbose_name=_("Created by"), on_delete=models.CASCADE diff --git a/src/open_inwoner/plans/tests/test_data_migrations.py b/src/open_inwoner/plans/tests/test_data_migrations.py index 752f393e77..0ba17dfc47 100644 --- a/src/open_inwoner/plans/tests/test_data_migrations.py +++ b/src/open_inwoner/plans/tests/test_data_migrations.py @@ -1,3 +1,4 @@ +from open_inwoner.accounts.models import User from open_inwoner.utils.tests.test_migrations import TestMigrations @@ -44,3 +45,37 @@ def setUpBeforeMigration(self, apps): def test_plan_contacts_is_updated_with_existing_contact(self): self.plan.refresh_from_db() self.assertEqual(list(self.plan.plan_contacts.all()), [self.contact_user]) + + +class PlanContactThroughModelMigrationTests(TestMigrations): + app = "plans" + migrate_from = "0013_auto_20230223_1115" + migrate_to = "0015_plancontact_notify_new" + + def setUpBeforeMigration(self, apps): + UserModel = apps.get_model("accounts", "User") + self.user = UserModel.objects.create( + email="user@example.com", + ) + self.other_user = UserModel.objects.create( + email="other_user@example.com", + ) + + PlanModel = apps.get_model("plans", "Plan") + self.plan = PlanModel.objects.create( + title="A title", + end_date="2021-01-10", + created_by=self.user, + ) + self.plan.plan_contacts.add(self.other_user) + + def test_plan_contacts_still_exist(self): + # user real models for actual test + from ..models import Plan, PlanContact + + contacts = list(PlanContact.objects.all()) + self.assertEqual(len(contacts), 1) + + plan = Plan.objects.get(id=self.plan.id) + other_user = User.objects.get(id=self.other_user.id) + self.assertEqual(list(plan.plan_contacts.all()), [other_user]) From d57f997a510273a149645e12ee1d60e8708f1da1 Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Mon, 13 Mar 2023 11:49:34 +0100 Subject: [PATCH 29/45] [#1177] Show new plan contact count in menu --- src/open_inwoner/accounts/models.py | 7 +++++++ src/open_inwoner/accounts/tests/test_user.py | 18 ++++++++++++++++++ .../components/Header/PrimaryNavigation.html | 9 ++++++++- .../0016_alter_plancontact_notify_new.py | 18 ++++++++++++++++++ src/open_inwoner/plans/models.py | 2 +- .../plans/tests/test_data_migrations.py | 7 ++++--- src/open_inwoner/plans/tests/test_views.py | 6 +++++- 7 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 src/open_inwoner/plans/migrations/0016_alter_plancontact_notify_new.py diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py index 38a0eabd06..8cf5d4e155 100644 --- a/src/open_inwoner/accounts/models.py +++ b/src/open_inwoner/accounts/models.py @@ -22,6 +22,7 @@ validate_phone_number, ) +from ..plans.models import PlanContact from .choices import ContactTypeChoices, LoginTypeChoices, StatusChoices, TypeChoices from .managers import ActionQueryset, DigidManager, UserManager, eHerkenningManager from .query import InviteQuerySet, MessageQuerySet @@ -284,6 +285,12 @@ def is_email_of_contact(self, email): or self.contacts_for_approval.filter(email=email).exists() ) + def get_plan_contact_new_count(self): + return PlanContact.objects.filter(user=self, notify_new=True).count() + + def clear_plan_contact_new_count(self): + PlanContact.objects.filter(user=self).update(notify_new=False) + def is_digid_and_brp(self) -> bool: """ Returns whether user is logged in with digid and data has diff --git a/src/open_inwoner/accounts/tests/test_user.py b/src/open_inwoner/accounts/tests/test_user.py index dede3fc7c4..cf14320d86 100644 --- a/src/open_inwoner/accounts/tests/test_user.py +++ b/src/open_inwoner/accounts/tests/test_user.py @@ -7,6 +7,7 @@ from open_inwoner.accounts.choices import LoginTypeChoices from open_inwoner.utils.hash import generate_email_from_string +from ...plans.tests.factories import PlanFactory from ..models import User from .factories import UserFactory @@ -73,3 +74,20 @@ def test_require_necessary_fields_oidc_openinwoner_email(self): login_type=LoginTypeChoices.oidc, email="test@example.org", oidc_id="test" ) self.assertTrue(user.require_necessary_fields()) + + def test_plan_contact_new_count_methods(self): + owner = UserFactory() + plan_1 = PlanFactory(created_by=owner) + plan_2 = PlanFactory(created_by=owner) + + user = UserFactory() + self.assertEqual(0, user.get_plan_contact_new_count()) + + plan_1.plan_contacts.add(user) + self.assertEqual(1, user.get_plan_contact_new_count()) + + plan_2.plan_contacts.add(user) + self.assertEqual(2, user.get_plan_contact_new_count()) + + user.clear_plan_contact_new_count() + self.assertEqual(0, user.get_plan_contact_new_count()) diff --git a/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html b/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html index 36667f6204..49e739f26f 100644 --- a/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html +++ b/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html @@ -46,7 +46,14 @@ {% endif %} {% if show_plans %}
  • - {% link text=_('Samenwerken') href='plans:plan_list' icon="people" icon_outlined=True icon_position="before" %} + {% link text=_('Samenwerken') href='plans:plan_list' icon="people" icon_outlined=True icon_position="before" %} + {% with request.user.get_plan_contact_new_count as plan_count %} + {% if plan_count %} + {% with "("|addstr:plan_count|addstr:")" as plan_count %} + {% link text=plan_count href='plans:plan_list' secondary=True %} + {% endwith %} + {% endif %} + {% endwith %}
    • {% endif %} {% endif %} diff --git a/src/open_inwoner/plans/migrations/0016_alter_plancontact_notify_new.py b/src/open_inwoner/plans/migrations/0016_alter_plancontact_notify_new.py new file mode 100644 index 0000000000..71faed0d75 --- /dev/null +++ b/src/open_inwoner/plans/migrations/0016_alter_plancontact_notify_new.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.15 on 2023-03-13 10:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("plans", "0015_plancontact_notify_new"), + ] + + operations = [ + migrations.AlterField( + model_name="plancontact", + name="notify_new", + field=models.BooleanField(default=True, verbose_name="Notify contact"), + ), + ] diff --git a/src/open_inwoner/plans/models.py b/src/open_inwoner/plans/models.py index c38678912c..c0d01b03f2 100644 --- a/src/open_inwoner/plans/models.py +++ b/src/open_inwoner/plans/models.py @@ -97,7 +97,7 @@ class PlanContact(models.Model): user = models.ForeignKey( "accounts.User", verbose_name=_("Contact"), on_delete=models.CASCADE ) - notify_new = models.BooleanField(verbose_name=_("Notify contact"), default=False) + notify_new = models.BooleanField(verbose_name=_("Notify contact"), default=True) class Plan(models.Model): diff --git a/src/open_inwoner/plans/tests/test_data_migrations.py b/src/open_inwoner/plans/tests/test_data_migrations.py index 0ba17dfc47..c2bde86553 100644 --- a/src/open_inwoner/plans/tests/test_data_migrations.py +++ b/src/open_inwoner/plans/tests/test_data_migrations.py @@ -73,9 +73,10 @@ def test_plan_contacts_still_exist(self): # user real models for actual test from ..models import Plan, PlanContact - contacts = list(PlanContact.objects.all()) - self.assertEqual(len(contacts), 1) - plan = Plan.objects.get(id=self.plan.id) other_user = User.objects.get(id=self.other_user.id) self.assertEqual(list(plan.plan_contacts.all()), [other_user]) + + # check we don't notify existing contacts + contact = PlanContact.objects.get() + self.assertEqual(contact.notify_new, False) diff --git a/src/open_inwoner/plans/tests/test_views.py b/src/open_inwoner/plans/tests/test_views.py index 7ab3cb2b15..0ee4ce4648 100644 --- a/src/open_inwoner/plans/tests/test_views.py +++ b/src/open_inwoner/plans/tests/test_views.py @@ -15,7 +15,7 @@ from open_inwoner.accounts.tests.test_action_views import ActionsPlaywrightTests from open_inwoner.utils.tests.playwright import multi_browser -from ..models import Plan +from ..models import Plan, PlanContact from .factories import ActionTemplateFactory, PlanFactory, PlanTemplateFactory @@ -77,6 +77,10 @@ def test_creator_is_added_when_create_plan(self): self.assertEqual(created_plan.plan_contacts.get(), self.user) self.assertEqual(created_plan.created_by, self.user) + contact = PlanContact.objects.get(plan=created_plan) + self.assertEqual(contact.user, self.user) + self.assertEqual(contact.notify_new, True) + def test_plan_list_filled(self): response = self.app.get(self.list_url, user=self.user) self.assertEqual(response.status_code, 200) From 04c448e54cc6d21aa73ac05d40a08d7e12f1b77b Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Mon, 13 Mar 2023 12:29:57 +0100 Subject: [PATCH 30/45] [#1177] Reset the counter when viewing plans list view --- src/open_inwoner/plans/tests/test_views.py | 41 ++++++++++++++++++++++ src/open_inwoner/plans/views.py | 4 +++ 2 files changed, 45 insertions(+) diff --git a/src/open_inwoner/plans/tests/test_views.py b/src/open_inwoner/plans/tests/test_views.py index 0ee4ce4648..7c83815633 100644 --- a/src/open_inwoner/plans/tests/test_views.py +++ b/src/open_inwoner/plans/tests/test_views.py @@ -1004,6 +1004,47 @@ def test_search_returns_expected_plans_when_matched_with_plan_title(self): ) +class NewPlanContactCounterTest(WebTest): + def test_plan_contact_new_count(self): + owner = UserFactory() + plan_1 = PlanFactory(created_by=owner) + plan_2 = PlanFactory(created_by=owner) + + user = UserFactory() + + root_url = reverse("root") + list_url = reverse("plans:plan_list") + + # check no number shows by default + response = self.app.get(root_url, user=user) + links = response.pyquery( + f".header__container > .primary-navigation a[href='{list_url}']" + ) + self.assertEqual(len(links), 1) + self.assertEqual(links.text(), _("Samenwerken") + " people") + + # check if the number shows up in the menu + plan_1.plan_contacts.add(user) + plan_2.plan_contacts.add(user) + self.assertEqual(2, user.get_plan_contact_new_count()) + + response = self.app.get(root_url, user=user) + links = response.pyquery( + f".header__container > .primary-navigation a[href='{list_url}']" + ) + # second link appears + self.assertEqual(len(links), 2) + self.assertIn("(2)", links.text()) + + # access the list page to reset + response = self.app.get(list_url, user=user) + links = response.pyquery( + f".header__container > .primary-navigation a[href='{list_url}']" + ) + self.assertEqual(len(links), 1) + self.assertEqual(links.text(), _("Samenwerken") + " people") + + @multi_browser() class PlanActionStatusPlaywrightTests(ActionsPlaywrightTests): def setUp(self) -> None: diff --git a/src/open_inwoner/plans/views.py b/src/open_inwoner/plans/views.py index 968d743851..25a4b10c22 100644 --- a/src/open_inwoner/plans/views.py +++ b/src/open_inwoner/plans/views.py @@ -95,6 +95,10 @@ def get_queryset(self): .order_by("end_date") ) + def get(self, request, *args, **kwargs): + self.request.user.clear_plan_contact_new_count() + return super().get(request, *args, **kwargs) + def get_available_contacts_for_filtering(self, plans): """ Return all available contacts for filtering for all the plans. From 68b4ae3a150caefa6c475e511f1b5312b7e12d06 Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Mon, 20 Mar 2023 10:17:28 +0100 Subject: [PATCH 31/45] [#1177] Fix plan counter visibility issue for owner --- src/open_inwoner/accounts/models.py | 6 +++++- src/open_inwoner/plans/tests/test_views.py | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py index 8cf5d4e155..61a00c1a22 100644 --- a/src/open_inwoner/accounts/models.py +++ b/src/open_inwoner/accounts/models.py @@ -286,7 +286,11 @@ def is_email_of_contact(self, email): ) def get_plan_contact_new_count(self): - return PlanContact.objects.filter(user=self, notify_new=True).count() + return ( + PlanContact.objects.filter(user=self, notify_new=True) + .exclude(plan__created_by=self) + .count() + ) def clear_plan_contact_new_count(self): PlanContact.objects.filter(user=self).update(notify_new=False) diff --git a/src/open_inwoner/plans/tests/test_views.py b/src/open_inwoner/plans/tests/test_views.py index 7c83815633..096b06b245 100644 --- a/src/open_inwoner/plans/tests/test_views.py +++ b/src/open_inwoner/plans/tests/test_views.py @@ -1044,6 +1044,13 @@ def test_plan_contact_new_count(self): self.assertEqual(len(links), 1) self.assertEqual(links.text(), _("Samenwerken") + " people") + # check this doesn't appear for owner + response = self.app.get(root_url, user=owner) + links = response.pyquery( + f".header__container > .primary-navigation a[href='{list_url}']" + ) + self.assertEqual(len(links), 1) + @multi_browser() class PlanActionStatusPlaywrightTests(ActionsPlaywrightTests): From 5d0683a96fd202a44951d2f20db77c0a73f9241d Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Mon, 20 Mar 2023 11:06:37 +0100 Subject: [PATCH 32/45] [#1177] Fixed problem with TestMigrations and related (historical) models --- src/open_inwoner/plans/tests/test_data_migrations.py | 12 +++++++----- src/open_inwoner/utils/tests/test_migrations.py | 9 +++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/open_inwoner/plans/tests/test_data_migrations.py b/src/open_inwoner/plans/tests/test_data_migrations.py index c2bde86553..8dab873a67 100644 --- a/src/open_inwoner/plans/tests/test_data_migrations.py +++ b/src/open_inwoner/plans/tests/test_data_migrations.py @@ -1,4 +1,3 @@ -from open_inwoner.accounts.models import User from open_inwoner.utils.tests.test_migrations import TestMigrations @@ -52,6 +51,8 @@ class PlanContactThroughModelMigrationTests(TestMigrations): migrate_from = "0013_auto_20230223_1115" migrate_to = "0015_plancontact_notify_new" + extra_migrate_from = [("accounts", "0055_user_image")] + def setUpBeforeMigration(self, apps): UserModel = apps.get_model("accounts", "User") self.user = UserModel.objects.create( @@ -70,11 +71,12 @@ def setUpBeforeMigration(self, apps): self.plan.plan_contacts.add(self.other_user) def test_plan_contacts_still_exist(self): - # user real models for actual test - from ..models import Plan, PlanContact + UserModel = self.apps.get_model("accounts", "User") + PlanModel = self.apps.get_model("plans", "Plan") + PlanContact = self.apps.get_model("plans", "PlanContact") - plan = Plan.objects.get(id=self.plan.id) - other_user = User.objects.get(id=self.other_user.id) + other_user = UserModel.objects.get(id=self.other_user.id) + plan = PlanModel.objects.get(id=self.plan.id) self.assertEqual(list(plan.plan_contacts.all()), [other_user]) # check we don't notify existing contacts diff --git a/src/open_inwoner/utils/tests/test_migrations.py b/src/open_inwoner/utils/tests/test_migrations.py index 7b884cb39c..e5b73d5b6c 100644 --- a/src/open_inwoner/utils/tests/test_migrations.py +++ b/src/open_inwoner/utils/tests/test_migrations.py @@ -1,3 +1,5 @@ +from typing import List, Tuple + from django.db import connection from django.db.migrations.executor import MigrationExecutor from django.test import TestCase @@ -13,12 +15,19 @@ class TestMigrations(TestCase): migrate_from = None migrate_to = None + extra_migrate_from: List[Tuple[str, str]] = None + def setUp(self): assert self.migrate_from and self.migrate_to and self.app, ( "TestCase '%s' must define migrate_from, migrate_to and app properties" % type(self).__name__ ) self.migrate_from = [(self.app, self.migrate_from)] + + # hack to fix issues where related models aren't in the correct state + if self.extra_migrate_from: + self.migrate_from += self.extra_migrate_from + self.migrate_to = [(self.app, self.migrate_to)] executor = MigrationExecutor(connection) old_apps = executor.loader.project_state(self.migrate_from).apps From 90627e27031331e0c3c4d904da2a5b7641496b1b Mon Sep 17 00:00:00 2001 From: vasileios Date: Mon, 27 Mar 2023 10:24:37 +0200 Subject: [PATCH 33/45] [#1258] Add function for escaping characters --- src/open_inwoner/js/components/map/index.js | 25 ++++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/open_inwoner/js/components/map/index.js b/src/open_inwoner/js/components/map/index.js index 5126192556..0e122dddcd 100644 --- a/src/open_inwoner/js/components/map/index.js +++ b/src/open_inwoner/js/components/map/index.js @@ -3,6 +3,19 @@ import 'leaflet' import { RD_CRS } from './rd' import { isMobile } from '../../lib/device/is-mobile' +/** + * Returns an escaped variable. + * @param {string} textVariable + * @return {string} + */ +function escapeVariableText(textVariable) { + if (textVariable) { + return escapeHTML(textVariable) + } else { + return '' + } +} + /** @type {NodeListOf} All the leaflet maps. */ const LEAFLET_MAPS = document.querySelectorAll('.map__leaflet') @@ -84,12 +97,12 @@ class Map { ...properties } = feature.properties - const displayName = name ? escapeHTML(name) : '' - const locationDetailView = location_url ? escapeHTML(location_url) : '' - const displayAddress1 = address_line_1 ? escapeHTML(address_line_1) : '' - const displayAddress2 = address_line_2 ? escapeHTML(address_line_2) : '' - const displayPhonenumber = phonenumber ? escapeHTML(phonenumber) : '' - const displayEmail = email ? escapeHTML(email) : '' + const displayName = escapeVariableText(name) + const locationDetailView = escapeVariableText(location_url) + const displayAddress1 = escapeVariableText(address_line_1) + const displayAddress2 = escapeVariableText(address_line_1) + const displayPhonenumber = escapeVariableText(phonenumber) + const displayEmail = escapeVariableText(email) let title = '' if (locationDetailView) { From 78db5ce97a3369c827207c5a0da44e0bba2e4b41 Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Mon, 27 Mar 2023 12:17:20 +0200 Subject: [PATCH 34/45] [#1274] Downgraded ZGW role-retrieval's error-level in notification handler for less Sentry spam --- src/open_inwoner/openzaak/notifications.py | 3 ++- .../openzaak/tests/test_notification_zaak_infoobject.py | 2 +- .../openzaak/tests/test_notification_zaak_status.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/open_inwoner/openzaak/notifications.py b/src/open_inwoner/openzaak/notifications.py index 613d43891e..4dcbe9ea29 100644 --- a/src/open_inwoner/openzaak/notifications.py +++ b/src/open_inwoner/openzaak/notifications.py @@ -83,7 +83,8 @@ def handle_zaken_notification(notification: Notification): if not roles: log_system_action( f"ignored {r} notification: cannot retrieve rollen for case {case_url}", - log_level=logging.ERROR, + # NOTE this used to be logging.ERROR, but as this is also our first call we get a lot of 403 "Niet geautoriseerd voor zaaktype" + log_level=logging.INFO, ) return diff --git a/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py b/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py index 4f0283dea1..6edfea7c77 100644 --- a/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py +++ b/src/open_inwoner/openzaak/tests/test_notification_zaak_infoobject.py @@ -98,7 +98,7 @@ def test_zio_bails_when_no_roles_found_for_case(self, m, mock_handle: Mock): self.assertTimelineLog( "ignored zaakinformatieobject notification: cannot retrieve rollen for case https://", lookup=Lookups.startswith, - level=logging.ERROR, + level=logging.INFO, ) def test_zio_bails_when_no_emailable_users_are_found_for_roles( diff --git a/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py b/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py index 5f882eee50..aec3e39357 100644 --- a/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py +++ b/src/open_inwoner/openzaak/tests/test_notification_zaak_status.py @@ -94,7 +94,7 @@ def test_status_bails_when_no_roles_found_for_case(self, m, mock_handle: Mock): self.assertTimelineLog( "ignored status notification: cannot retrieve rollen for case https://", lookup=Lookups.startswith, - level=logging.ERROR, + level=logging.INFO, ) def test_status_bails_when_no_emailable_users_are_found_for_roles( From 1c851d764209b79288b01e8f5c90da19527ba24c Mon Sep 17 00:00:00 2001 From: vasileios Date: Mon, 27 Mar 2023 15:37:51 +0200 Subject: [PATCH 35/45] [#1258] Fixed duplicate variable --- src/open_inwoner/js/components/map/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/open_inwoner/js/components/map/index.js b/src/open_inwoner/js/components/map/index.js index 0e122dddcd..0ccfb1e0b0 100644 --- a/src/open_inwoner/js/components/map/index.js +++ b/src/open_inwoner/js/components/map/index.js @@ -100,7 +100,7 @@ class Map { const displayName = escapeVariableText(name) const locationDetailView = escapeVariableText(location_url) const displayAddress1 = escapeVariableText(address_line_1) - const displayAddress2 = escapeVariableText(address_line_1) + const displayAddress2 = escapeVariableText(address_line_2) const displayPhonenumber = escapeVariableText(phonenumber) const displayEmail = escapeVariableText(email) let title = '' From 66a56a275b49a3a6e62819bc61b95ed63ce9b25e Mon Sep 17 00:00:00 2001 From: vasileios Date: Mon, 27 Mar 2023 16:33:52 +0200 Subject: [PATCH 36/45] [#1259] Changed axes and oidc cache to the default one --- src/open_inwoner/conf/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py index bb448075a9..9258cbe413 100644 --- a/src/open_inwoner/conf/base.py +++ b/src/open_inwoner/conf/base.py @@ -78,7 +78,7 @@ }, "axes": { "BACKEND": "django_redis.cache.RedisCache", - "LOCATION": f"redis://{config('CACHE_AXES', 'localhost:6379/0')}", + "LOCATION": f"redis://{config('CACHE_DEFAULT', 'localhost:6379/0')}", "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", "IGNORE_EXCEPTIONS": True, @@ -86,7 +86,7 @@ }, "oidc": { "BACKEND": "django_redis.cache.RedisCache", - "LOCATION": f"redis://{config('CACHE_OIDC', 'localhost:6379/0')}", + "LOCATION": f"redis://{config('CACHE_DEFAULT', 'localhost:6379/0')}", "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", "IGNORE_EXCEPTIONS": True, From 7f4462fae4b983b255232820057c1bf83e5252a1 Mon Sep 17 00:00:00 2001 From: Jiro Ghianni Date: Thu, 23 Mar 2023 15:56:52 +0100 Subject: [PATCH 37/45] :art: [#1021] Split cards with images off to new template, make cards clickable --- .../components/Card/CardContainer.html | 2 +- .../components/Card/DescriptionCard.html | 22 ++++++------- .../components/Card/ProductCard.html | 31 +++++++++++++++++++ .../templates/components/Card/RenderCard.html | 4 ++- .../components/templatetags/card_tags.py | 19 ++++++++++++ .../scss/components/Card/Card.scss | 8 ++++- .../scss/components/List/_List.scss | 4 +++ .../templates/pages/cases/list.html | 2 ++ .../templates/pages/user-home.html | 4 +-- 9 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 src/open_inwoner/components/templates/components/Card/ProductCard.html diff --git a/src/open_inwoner/components/templates/components/Card/CardContainer.html b/src/open_inwoner/components/templates/components/Card/CardContainer.html index d9f09bbf09..32e0dbd182 100644 --- a/src/open_inwoner/components/templates/components/Card/CardContainer.html +++ b/src/open_inwoner/components/templates/components/Card/CardContainer.html @@ -20,7 +20,7 @@ {% if products %} {% for product in products %} {% get_product_url product as product_url %} - {% description_card title=product.name description=product.summary url=product_url image=product.icon image_object_fit=image_object_fit %} + {% product_card title=product.name description=product.summary url=product_url image=product.icon image_object_fit=image_object_fit %} {% endfor %} {% endif %} diff --git a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html index 593f97a601..37870e91c3 100644 --- a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html +++ b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html @@ -1,13 +1,8 @@ -{% load card_tags icon_tags link_tags i18n grid_tags thumbnail %} +{% load card_tags icon_tags link_tags button_tags i18n grid_tags thumbnail %} -{% render_card grid=image %} - {% if image %} - - {{ image.default_alt_text }} - -
    - {% endif %} -

    {% link url text=title %}

    +{# template for plans cards without any images #} +{% render_card href=url grid=image title=title%} +

    {{ title }}

    {{ description }}

    {% if object.end_date %}
    @@ -17,8 +12,9 @@

    {% link url text=title %}

    {{ object.created_by.get_full_name }}
    {% endif %} - {% link url text=title hide_text=True icon='arrow_forward' button=True transparent=True %} - {% if image %} -
    - {% endif %} + + + {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %} + + {% endrender_card %} diff --git a/src/open_inwoner/components/templates/components/Card/ProductCard.html b/src/open_inwoner/components/templates/components/Card/ProductCard.html new file mode 100644 index 0000000000..30167aa7d7 --- /dev/null +++ b/src/open_inwoner/components/templates/components/Card/ProductCard.html @@ -0,0 +1,31 @@ +{% load card_tags icon_tags link_tags button_tags i18n grid_tags thumbnail %} + +{# template for product cards with images #} +{% render_card href=url grid=image title=title %} + {% if image %} +
    + {{ image.default_alt_text }} +
    +
    +

    {{ title }}

    + {% else %} +
    +

    {{ title }}

    + {% endif %} +

    {{ description }}

    + {% if object.end_date %} +
    +
    {% trans "Einddatum" %}:
    +
    {{ object.end_date }}
    +
    {% trans "Created by" %}:
    +
    {{ object.created_by.get_full_name }}
    +
    + {% endif %} + + + {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %} + + +
    + {# end of card__content #} +{% endrender_card %} diff --git a/src/open_inwoner/components/templates/components/Card/RenderCard.html b/src/open_inwoner/components/templates/components/Card/RenderCard.html index a1e8b87f45..1e23115644 100644 --- a/src/open_inwoner/components/templates/components/Card/RenderCard.html +++ b/src/open_inwoner/components/templates/components/Card/RenderCard.html @@ -12,9 +12,11 @@
    {% if title %} -

    + {% if compact %} +

    {{ title }}

    + {% endif %} {% endif %} {{ contents }}
    diff --git a/src/open_inwoner/components/templatetags/card_tags.py b/src/open_inwoner/components/templatetags/card_tags.py index 4d1caa32cf..3ddfe5fd20 100644 --- a/src/open_inwoner/components/templatetags/card_tags.py +++ b/src/open_inwoner/components/templatetags/card_tags.py @@ -90,6 +90,25 @@ def description_card(title, description, url, **kwargs): return kwargs +@register.inclusion_tag("components/Card/ProductCard.html") +def product_card(description, url, **kwargs): + """ + Renders a card with or without an image prepopulated based on `product`. + + Usage: + {% product_card title=product.title description=product.intro url=product.get_absolute_url %} + + Available options: + + description: string | The description that needs to be displayed. + + url: string | The url that the card should point to. + - title: string | The title of the card that may be displayed if there is no image. + - object: any | The object that needs to render aditional data. + - image: FilerImageField | an image that should be used. + """ + kwargs.update(description=description, url=url) + return kwargs + + @register.inclusion_tag("components/Card/CardContainer.html") def card_container(categories=[], subcategories=[], products=[], plans=[], **kwargs): """ diff --git a/src/open_inwoner/scss/components/Card/Card.scss b/src/open_inwoner/scss/components/Card/Card.scss index cbd162a6a9..750fad316c 100644 --- a/src/open_inwoner/scss/components/Card/Card.scss +++ b/src/open_inwoner/scss/components/Card/Card.scss @@ -73,6 +73,11 @@ } &__body { padding: var(--card-spacing); + + /// clickable plans on home page after authenticated + .plan-list { + text-decoration: none; + } } &__body--grid { @@ -159,7 +164,8 @@ } /// Arrow button on product cards. - a.button:last-child { + a.button:last-child, + span.button:last-child { float: right; } diff --git a/src/open_inwoner/scss/components/List/_List.scss b/src/open_inwoner/scss/components/List/_List.scss index 3bb15b1468..5af1bfa451 100644 --- a/src/open_inwoner/scss/components/List/_List.scss +++ b/src/open_inwoner/scss/components/List/_List.scss @@ -4,6 +4,10 @@ padding: 0; width: 100%; overflow-y: auto; + + .case-list { + text-decoration: none; + } } .search + .list { diff --git a/src/open_inwoner/templates/pages/cases/list.html b/src/open_inwoner/templates/pages/cases/list.html index b7cf5bcdd5..8901bfbc61 100644 --- a/src/open_inwoner/templates/pages/cases/list.html +++ b/src/open_inwoner/templates/pages/cases/list.html @@ -15,9 +15,11 @@

    {{ page_title }} ({{ paginator.count }})

    {% render_column start=forloop.counter_0|multiply:4 span=4 %} {% render_card compact=True stretch=True title=case.identificatie %} {% render_list %} + {% list_item case.current_status caption=_("Status") compact=True strong=False %} {% list_item case.start_date caption=_("Ontvangstdatum") compact=True strong=False %} {% list_item case.description caption=_("Omschrijving") compact=True strong=False %} + {% endrender_list %} {% link href="accounts:case_status" object_id=case.uuid icon="arrow_forward" primary=True text=_("Bekijk aanvraag") %} diff --git a/src/open_inwoner/templates/pages/user-home.html b/src/open_inwoner/templates/pages/user-home.html index 81fb35078b..b61a44275e 100644 --- a/src/open_inwoner/templates/pages/user-home.html +++ b/src/open_inwoner/templates/pages/user-home.html @@ -17,9 +17,9 @@

    {% for plan in plans %} {% render_card image_object_fit="cover" %} -

    {{ plan.title }}

    +

    {{ plan.title }}

    {{ plan.goal|truncatewords:20 }}

    -

    {{ plan.description|truncatewords:20 }}

    +

    {{ plan.description|truncatewords:20 }}

     Date: Mon, 27 Mar 2023 13:59:20 +0200 Subject: [PATCH 38/45] :art: [#1021] Refactored card templates --- .../components/Card/CategoryCard.html | 5 ++- .../components/Card/DescriptionCard.html | 40 +++++++++++-------- .../components/Card/ProductCard.html | 29 ++++++++------ .../templates/components/Card/RenderCard.html | 4 +- .../templates/pages/cases/list.html | 2 +- 5 files changed, 45 insertions(+), 35 deletions(-) diff --git a/src/open_inwoner/components/templates/components/Card/CategoryCard.html b/src/open_inwoner/components/templates/components/Card/CategoryCard.html index ed42ea404f..54b88a6165 100644 --- a/src/open_inwoner/components/templates/components/Card/CategoryCard.html +++ b/src/open_inwoner/components/templates/components/Card/CategoryCard.html @@ -1,12 +1,13 @@ {% load card_tags icon_tags link_tags helpers utils %} +{# template for subcategory cards #} {# create tag for anchor around card - never use anchors within anchors for valid HTML. #} {% if category.products.published %}
    {% if category %}

    - {{ category }} + {{ category }} cat1

    {% endif %} {% for product in category.products.published %} @@ -25,7 +26,7 @@
    {% if category %}

    - {{ category }} + {{ category }} cat2

    {% endif %}
    diff --git a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html index 37870e91c3..4281b798c3 100644 --- a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html +++ b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html @@ -1,20 +1,26 @@ -{% load card_tags icon_tags link_tags button_tags i18n grid_tags thumbnail %} +{% load card_tags icon_tags link_tags i18n grid_tags thumbnail %} -{# template for plans cards without any images #} -{% render_card href=url grid=image title=title%} -

    {{ title }}

    -

    {{ description }}

    - {% if object.end_date %} -
    -
    {% trans "Einddatum" %}:
    -
    {{ object.end_date }}
    -
    {% trans "Created by" %}:
    -
    {{ object.created_by.get_full_name }}
    -
    - {% endif %} +{# template for plans cards and product cards without any images #} + +
    + {% if title %} +

    + {{ title }} +

    + {% endif %} +

    {{ description }}

    + {% if object.end_date %} +
    +
    {% trans "Einddatum" %}:
    +
    {{ object.end_date }}
    +
    {% trans "Created by" %}:
    +
    {{ object.created_by.get_full_name }}
    +
    + {% endif %} - - {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %} - + + {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %} + -{% endrender_card %} +
    +     diff --git a/src/open_inwoner/components/templates/components/Card/ProductCard.html b/src/open_inwoner/components/templates/components/Card/ProductCard.html index 30167aa7d7..66b63cdcf0 100644 --- a/src/open_inwoner/components/templates/components/Card/ProductCard.html +++ b/src/open_inwoner/components/templates/components/Card/ProductCard.html @@ -1,31 +1,36 @@ -{% load card_tags icon_tags link_tags button_tags i18n grid_tags thumbnail %} +{% load card_tags icon_tags link_tags i18n grid_tags thumbnail %} {# template for product cards with images #} -{% render_card href=url grid=image title=title %} + + {% if image %} +
    {{ image.default_alt_text }}

    {{ title }}

    - {% else %} -
    -

    {{ title }}

    - {% endif %} -

    {{ description }}

    - {% if object.end_date %} + {% else %} +
    +
    +

    {{ title }}

    + {% endif %} +

    {{ description }}

    + {% if object.end_date %}
    {% trans "Einddatum" %}:
    {{ object.end_date }}
    {% trans "Created by" %}:
    {{ object.created_by.get_full_name }}
    - {% endif %} + {% endif %} - + {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %} - +
    {# end of card__content #} -{% endrender_card %} +
    + +     diff --git a/src/open_inwoner/components/templates/components/Card/RenderCard.html b/src/open_inwoner/components/templates/components/Card/RenderCard.html index 1e23115644..a1e8b87f45 100644 --- a/src/open_inwoner/components/templates/components/Card/RenderCard.html +++ b/src/open_inwoner/components/templates/components/Card/RenderCard.html @@ -12,11 +12,9 @@
    {% if title %} - {% if compact %} -

    +

    {{ title }}

    - {% endif %} {% endif %} {{ contents }}
    diff --git a/src/open_inwoner/templates/pages/cases/list.html b/src/open_inwoner/templates/pages/cases/list.html index 8901bfbc61..55cdf07a29 100644 --- a/src/open_inwoner/templates/pages/cases/list.html +++ b/src/open_inwoner/templates/pages/cases/list.html @@ -15,7 +15,7 @@

    {{ page_title }} ({{ paginator.count }})

    {% render_column start=forloop.counter_0|multiply:4 span=4 %} {% render_card compact=True stretch=True title=case.identificatie %} {% render_list %} - + {% list_item case.current_status caption=_("Status") compact=True strong=False %} {% list_item case.start_date caption=_("Ontvangstdatum") compact=True strong=False %} {% list_item case.description caption=_("Omschrijving") compact=True strong=False %} From 6806072d080f5f064dc9fa32e38e78ada2dcccc9 Mon Sep 17 00:00:00 2001 From: Alex de Landgraaf Date: Mon, 27 Mar 2023 17:53:23 +0200 Subject: [PATCH 39/45] :green_heart: Making test deterministic --- src/open_inwoner/accounts/tests/test_user_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/open_inwoner/accounts/tests/test_user_manager.py b/src/open_inwoner/accounts/tests/test_user_manager.py index 68e2527850..1ff629400b 100644 --- a/src/open_inwoner/accounts/tests/test_user_manager.py +++ b/src/open_inwoner/accounts/tests/test_user_manager.py @@ -34,4 +34,4 @@ def test_having_usable_email(self): UserFactory(first_name="empty", email="") actual = User.objects.having_usable_email() - self.assertEqual(list(actual), expected) + self.assertEqual(set(list(actual)), set(expected)) From 0435f72749489060162efd447a4db47db29d3c9b Mon Sep 17 00:00:00 2001 From: vasileios Date: Tue, 28 Mar 2023 10:18:13 +0200 Subject: [PATCH 40/45] [#1268] Added style for disabled document upload button --- src/open_inwoner/scss/components/Cases/Cases.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/open_inwoner/scss/components/Cases/Cases.scss b/src/open_inwoner/scss/components/Cases/Cases.scss index 05171f8f2e..53807089ce 100644 --- a/src/open_inwoner/scss/components/Cases/Cases.scss +++ b/src/open_inwoner/scss/components/Cases/Cases.scss @@ -1,3 +1,10 @@ .cases { margin-top: var(--spacing-giant); } + +#document-upload .button[type='submit']:disabled { + border-color: var(--color-gray) !important; + color: var(--color-gray-light); + pointer-events: none; + cursor: default; +} From 39e7dc972a065cea55a064d8aa4d9002bce484d6 Mon Sep 17 00:00:00 2001 From: Jiro Ghianni Date: Tue, 28 Mar 2023 11:38:12 +0200 Subject: [PATCH 41/45] :art: [#1021] Refactored card templates to become more static --- .../components/Card/CategoryCard.html | 8 ++--- .../components/Card/DescriptionCard.html | 3 +- .../components/Card/ProductCard.html | 2 +- .../scss/components/Cases/Cases.scss | 7 ++++ .../templates/pages/cases/list.html | 32 ++++++++++++------- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/open_inwoner/components/templates/components/Card/CategoryCard.html b/src/open_inwoner/components/templates/components/Card/CategoryCard.html index 54b88a6165..56b0e23df6 100644 --- a/src/open_inwoner/components/templates/components/Card/CategoryCard.html +++ b/src/open_inwoner/components/templates/components/Card/CategoryCard.html @@ -1,13 +1,13 @@ -{% load card_tags icon_tags link_tags helpers utils %} +{% load icon_tags link_tags helpers utils %} -{# template for subcategory cards #} +{# template for subcategory cards with or without product-links #} {# create tag for anchor around card - never use anchors within anchors for valid HTML. #} {% if category.products.published %}
    {% if category %}

    - {{ category }} cat1 + {{ category }}

    {% endif %} {% for product in category.products.published %} @@ -26,7 +26,7 @@
    {% if category %}

    - {{ category }} cat2 + {{ category }}

    {% endif %}
    diff --git a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html index 4281b798c3..ea65033601 100644 --- a/src/open_inwoner/components/templates/components/Card/DescriptionCard.html +++ b/src/open_inwoner/components/templates/components/Card/DescriptionCard.html @@ -1,4 +1,4 @@ -{% load card_tags icon_tags link_tags i18n grid_tags thumbnail %} +{% load icon_tags link_tags i18n grid_tags thumbnail %} {# template for plans cards and product cards without any images #} @@ -21,6 +21,5 @@ {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %} -
    diff --git a/src/open_inwoner/components/templates/components/Card/ProductCard.html b/src/open_inwoner/components/templates/components/Card/ProductCard.html index 66b63cdcf0..7d6de8c0df 100644 --- a/src/open_inwoner/components/templates/components/Card/ProductCard.html +++ b/src/open_inwoner/components/templates/components/Card/ProductCard.html @@ -1,4 +1,4 @@ -{% load card_tags icon_tags link_tags i18n grid_tags thumbnail %} +{% load icon_tags link_tags i18n grid_tags thumbnail %} {# template for product cards with images #} diff --git a/src/open_inwoner/scss/components/Cases/Cases.scss b/src/open_inwoner/scss/components/Cases/Cases.scss index 05171f8f2e..33c707df16 100644 --- a/src/open_inwoner/scss/components/Cases/Cases.scss +++ b/src/open_inwoner/scss/components/Cases/Cases.scss @@ -1,3 +1,10 @@ .cases { margin-top: var(--spacing-giant); + + /// cards on cases page + .card { + .cases__link { + text-decoration: none; + } + } } diff --git a/src/open_inwoner/templates/pages/cases/list.html b/src/open_inwoner/templates/pages/cases/list.html index 55cdf07a29..2d490fa27b 100644 --- a/src/open_inwoner/templates/pages/cases/list.html +++ b/src/open_inwoner/templates/pages/cases/list.html @@ -1,5 +1,5 @@ {% extends 'master.html' %} -{% load i18n anchor_menu_tags card_tags grid_tags icon_tags link_tags list_tags pagination_tags utils %} +{% load i18n anchor_menu_tags grid_tags icon_tags link_tags list_tags pagination_tags utils %} {% block sidebar_content %} {% anchor_menu anchors=anchors desktop=True %} @@ -13,17 +13,27 @@

    {{ page_title }} ({{ paginator.count }})

    {% render_grid %} {% for case in cases %} {% render_column start=forloop.counter_0|multiply:4 span=4 %} - {% render_card compact=True stretch=True title=case.identificatie %} - {% render_list %} -     - {% list_item case.current_status caption=_("Status") compact=True strong=False %} - {% list_item case.start_date caption=_("Ontvangstdatum") compact=True strong=False %} - {% list_item case.description caption=_("Omschrijving") compact=True strong=False %} - - {% endrender_list %} +
    +
    + +

    + {{ case.identificatie }} +

    + {% render_list %} + + {% list_item case.current_status caption=_("Status") compact=True strong=False %} + {% list_item case.start_date caption=_("Ontvangstdatum") compact=True strong=False %} + {% list_item case.description caption=_("Omschrijving") compact=True strong=False %} + + {% endrender_list %} - {% link href="accounts:case_status" object_id=case.uuid icon="arrow_forward" primary=True text=_("Bekijk aanvraag") %} - {% endrender_card %} + + {% trans "Bekijk aanvraag" %} + {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %} + +     +
    +
    {% endrender_column %} {% endfor %} {% endrender_grid %} From 06eb6bb59753c5c04345bdb3cf21619fe0151d2c Mon Sep 17 00:00:00 2001 From: Alex de Landgraaf Date: Wed, 29 Mar 2023 23:11:36 +0200 Subject: [PATCH 42/45] :alien: [#1301] Modifying HC BRP HTTP header due to v2.0-beta vs v2.0 differences --- src/open_inwoner/haalcentraal/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/open_inwoner/haalcentraal/utils.py b/src/open_inwoner/haalcentraal/utils.py index e4099e0da5..165fb2f101 100644 --- a/src/open_inwoner/haalcentraal/utils.py +++ b/src/open_inwoner/haalcentraal/utils.py @@ -36,7 +36,7 @@ def fetch_brp_data(instance, brp_version): "burgerservicenummer": [instance.bsn], }, request_kwargs=dict( - headers={"Accept": "application/hal+json"}, verify=False + headers={"Accept": "application/json"}, verify=False ), ) except RequestException as e: From 880a7b9fd35d44baf7d3364b1d6544ddba39eeed Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Thu, 30 Mar 2023 12:45:49 +0200 Subject: [PATCH 43/45] Simplified error handling codestyle in ZGW fetch-functions --- src/open_inwoner/openzaak/cases.py | 55 ++++++-------------------- src/open_inwoner/openzaak/catalog.py | 40 ++++--------------- src/open_inwoner/openzaak/documents.py | 15 ++----- src/open_inwoner/openzaak/formapi.py | 5 +-- 4 files changed, 23 insertions(+), 92 deletions(-) diff --git a/src/open_inwoner/openzaak/cases.py b/src/open_inwoner/openzaak/cases.py index 91a78486b3..64c68ae1ca 100644 --- a/src/open_inwoner/openzaak/cases.py +++ b/src/open_inwoner/openzaak/cases.py @@ -44,10 +44,7 @@ def fetch_cases(user_bsn: str, max_cases: Optional[int] = 100) -> List[Zaak]: }, }, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -65,10 +62,7 @@ def fetch_single_case(case_uuid: str) -> Optional[Zaak]: try: response = client.retrieve("zaak", uuid=case_uuid) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -88,10 +82,7 @@ def fetch_single_case_information_object(url: str) -> Optional[ZaakInformatieObj try: response = client.retrieve("zaakinformatieobject", url=url) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -104,10 +95,7 @@ def fetch_case_by_url_no_cache(case_url: str) -> Optional[Zaak]: client = build_client("zaak") try: response = client.retrieve("zaak", url=case_url) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -130,10 +118,7 @@ def fetch_case_information_objects(case_url: str) -> List[ZaakInformatieObject]: "params": {"zaak": case_url}, }, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -155,10 +140,7 @@ def fetch_status_history_no_cache(case_url: str) -> List[Status]: try: response = client.list("status", request_kwargs={"params": {"zaak": case_url}}) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -176,10 +158,7 @@ def fetch_single_status(status_url: str) -> Optional[Status]: try: response = client.retrieve("status", url=status_url) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -213,10 +192,7 @@ def fetch_case_roles( "rol", request_kwargs={"params": params}, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -270,10 +246,7 @@ def fetch_case_information_objects_for_case_and_info( }, }, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -291,10 +264,7 @@ def fetch_single_result(result_url: str) -> Optional[Resultaat]: try: response = client.retrieve("result", url=result_url) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -313,10 +283,7 @@ def connect_case_with_document(case_url: str, document_url: str) -> Optional[dic response = client.create( "zaakinformatieobject", {"zaak": case_url, "informatieobject": document_url} ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return diff --git a/src/open_inwoner/openzaak/catalog.py b/src/open_inwoner/openzaak/catalog.py index 55922642e2..0685fc984e 100644 --- a/src/open_inwoner/openzaak/catalog.py +++ b/src/open_inwoner/openzaak/catalog.py @@ -30,10 +30,7 @@ def fetch_status_types_no_cache(case_type_url: str) -> List[StatusType]: "statustype", request_kwargs={"params": {"zaaktype": case_type_url}}, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -56,10 +53,7 @@ def fetch_result_types_no_cache(case_type_url: str) -> List[ResultaatType]: "resultaattype", request_kwargs={"params": {"zaaktype": case_type_url}}, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -79,10 +73,7 @@ def fetch_single_status_type(status_type_url: str) -> Optional[StatusType]: try: response = client.retrieve("statustype", url=status_type_url) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -104,10 +95,7 @@ def fetch_zaaktypes_no_cache() -> List[ZaakType]: try: response = get_paginated_results(client, "zaaktype") - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -138,10 +126,7 @@ def fetch_case_types_by_identification_no_cache( "zaaktype", request_kwargs={"params": params}, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -174,10 +159,7 @@ def fetch_single_case_type(case_type_url: str) -> Optional[ZaakType]: try: response = client.retrieve("zaaktype", url=case_type_url) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -200,10 +182,7 @@ def fetch_catalogs_no_cache() -> List[Catalogus]: client, "catalogus", ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] @@ -228,10 +207,7 @@ def fetch_single_information_object_type( response = client.retrieve( "informatieobjecttype", url=information_object_type_url ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return diff --git a/src/open_inwoner/openzaak/documents.py b/src/open_inwoner/openzaak/documents.py index 2cab4e507d..7e5e6c5c9a 100644 --- a/src/open_inwoner/openzaak/documents.py +++ b/src/open_inwoner/openzaak/documents.py @@ -14,10 +14,7 @@ from open_inwoner.openzaak.api_models import InformatieObject from open_inwoner.openzaak.clients import build_client -from open_inwoner.openzaak.models import ( - OpenZaakConfig, - ZaakTypeInformatieObjectTypeConfig, -) +from open_inwoner.openzaak.models import OpenZaakConfig from .utils import cache as cache_result @@ -50,10 +47,7 @@ def _fetch_single_information_object( response = client.retrieve("enkelvoudiginformatieobject", url=url) else: response = client.retrieve("enkelvoudiginformatieobject", uuid=uuid) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return @@ -125,10 +119,7 @@ def upload_document( try: response = client.create("enkelvoudiginformatieobject", document_body) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return diff --git a/src/open_inwoner/openzaak/formapi.py b/src/open_inwoner/openzaak/formapi.py index 2afe0ae6a9..755249de8a 100644 --- a/src/open_inwoner/openzaak/formapi.py +++ b/src/open_inwoner/openzaak/formapi.py @@ -38,10 +38,7 @@ def fetch_open_submissions(bsn: str) -> List[OpenSubmission]: "opensubmission", request_kwargs={"params": {"bsn": bsn}}, ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return [] - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return [] From 7ef810e37f595c3509d7c55726700ab3a308142d Mon Sep 17 00:00:00 2001 From: Bart van der Schoor Date: Thu, 30 Mar 2023 15:30:09 +0200 Subject: [PATCH 44/45] Simplified error handling codestyle in Haalcentraal fetch-functions --- src/open_inwoner/haalcentraal/utils.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/open_inwoner/haalcentraal/utils.py b/src/open_inwoner/haalcentraal/utils.py index e4099e0da5..f17a7dca4e 100644 --- a/src/open_inwoner/haalcentraal/utils.py +++ b/src/open_inwoner/haalcentraal/utils.py @@ -39,10 +39,7 @@ def fetch_brp_data(instance, brp_version): headers={"Accept": "application/hal+json"}, verify=False ), ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return {} - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return {} @@ -68,10 +65,7 @@ def fetch_brp_data(instance, brp_version): verify=False, ), ) - except RequestException as e: - logger.exception("exception while making request", exc_info=e) - return {} - except ClientError as e: + except (RequestException, ClientError) as e: logger.exception("exception while making request", exc_info=e) return {} From 89e0c58f9feeb7dbf736ac7fa8faff6828e1cb0a Mon Sep 17 00:00:00 2001 From: Alex de Landgraaf Date: Sun, 2 Apr 2023 22:06:08 +0200 Subject: [PATCH 45/45] Create SECURITY.md --- SECURITY.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000000..e1f53f12f4 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,20 @@ +# Security Policy + +## Reporting a Vulnerability + +**Short version: please report security issues by emailing security@maykinmedia.nl.** + +If you discover security issues in Open Inwoner or related projects under the same +organization, we request you to disclose these in a *responsible* way by e-mailing to +security@maykinmedia.nl. + +It is extremely useful if you have a reproducible test case and/or clear steps on how to +reproduce the vulnerability. + +Please do not report security issues on the public Github issue tracker, as this makes +it visible which exploits exist before a fix is available, potentially comprising a lot +of unprotected instances. + +Once you’ve submitted an issue via email, you should receive an acknowledgment from a +member of the security team as soon as possible, and depending on the action to be taken, +you may receive further followup emails.