From 0ae88ff80939758efdcf690ba38a4cbdf9c4cc78 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Thu, 1 Jun 2023 09:37:14 +0200
Subject: [PATCH 01/60] [#1448] Added some tests for banner plugins

---
 src/open_inwoner/cms/banner/tests/__init__.py |  0
 .../cms/banner/tests/test_plugin_banner.py    | 76 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 src/open_inwoner/cms/banner/tests/__init__.py
 create mode 100644 src/open_inwoner/cms/banner/tests/test_plugin_banner.py

diff --git a/src/open_inwoner/cms/banner/tests/__init__.py b/src/open_inwoner/cms/banner/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/open_inwoner/cms/banner/tests/test_plugin_banner.py b/src/open_inwoner/cms/banner/tests/test_plugin_banner.py
new file mode 100644
index 0000000000..32c8cfb6f2
--- /dev/null
+++ b/src/open_inwoner/cms/banner/tests/test_plugin_banner.py
@@ -0,0 +1,76 @@
+import os
+
+from django.conf import settings
+from django.core.files import File
+from django.test import TestCase
+
+from filer.models.imagemodels import Image as FilerImage
+from PIL import Image
+
+from open_inwoner.cms.tests import cms_tools
+from open_inwoner.utils.test import temp_media_root
+
+from ..cms_plugins import BannerImagePlugin, BannerTextPlugin
+
+
+@temp_media_root()
+class TestBannerImage(TestCase):
+    def test_banner_image_is_rendered_in_plugin(self):
+        pil_image = Image.new("RGB", (10, 10))
+        tmp_file_path = "{}/{}".format(settings.MEDIA_ROOT, "tmp.jpg")
+        pil_image.save(tmp_file_path, "JPEG")
+
+        tmp_image_file = open(tmp_file_path, "rb")
+        file_obj = File(tmp_image_file)
+        instance = FilerImage()
+        instance.file.save("image.jpg", file_obj)
+
+        html, context = cms_tools.render_plugin(
+            BannerImagePlugin, plugin_data={"image": instance}
+        )
+
+        self.assertIn(os.path.basename(instance.file.name), html)
+        self.assertIn('<aside class="banner"', html)
+
+    def test_banner_image_with_specific_height(self):
+        pil_image = Image.new("RGB", (10, 10))
+        tmp_file_path = "{}/{}".format(settings.MEDIA_ROOT, "tmp.jpg")
+        pil_image.save(tmp_file_path, "JPEG")
+
+        tmp_image_file = open(tmp_file_path, "rb")
+        file_obj = File(tmp_image_file)
+        instance = FilerImage()
+        instance.file.save("image.jpg", file_obj)
+
+        image_height = 40
+
+        html, context = cms_tools.render_plugin(
+            BannerImagePlugin,
+            plugin_data={"image": instance, "image_height": image_height},
+        )
+
+        self.assertIn(os.path.basename(instance.file.name), html)
+        self.assertIn(f'height="{image_height}"', html)
+        self.assertIn('<aside class="banner"', html)
+
+
+class TestBannerText(TestCase):
+    def test_banner_text_is_rendered_in_plugin(self):
+        title = "A title for the banner"
+
+        html, context = cms_tools.render_plugin(
+            BannerTextPlugin, plugin_data={"title": title}
+        )
+
+        self.assertIn(f'<h1 class="h1">{title} </h1>', html)
+
+    def test_banner_text_with_description_is_rendered_in_plugin(self):
+        title = "A title for the banner"
+        description = "Text for description"
+
+        html, context = cms_tools.render_plugin(
+            BannerTextPlugin, plugin_data={"title": title, "description": description}
+        )
+
+        self.assertIn(f'<h1 class="h1">{title} </h1>', html)
+        self.assertIn(f'<p class="p">{description}</p>', html)

From 5134b71a9128dcdd5daac16849ec85a5ebf8bed1 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Fri, 2 Jun 2023 11:05:37 +0200
Subject: [PATCH 02/60] [#1448] Added image factory

---
 .../cms/banner/tests/test_plugin_banner.py    | 38 ++++---------------
 src/open_inwoner/utils/tests/factories.py     | 19 ++++++++++
 2 files changed, 26 insertions(+), 31 deletions(-)
 create mode 100644 src/open_inwoner/utils/tests/factories.py

diff --git a/src/open_inwoner/cms/banner/tests/test_plugin_banner.py b/src/open_inwoner/cms/banner/tests/test_plugin_banner.py
index 32c8cfb6f2..bcee63c78c 100644
--- a/src/open_inwoner/cms/banner/tests/test_plugin_banner.py
+++ b/src/open_inwoner/cms/banner/tests/test_plugin_banner.py
@@ -1,14 +1,10 @@
 import os
 
-from django.conf import settings
-from django.core.files import File
 from django.test import TestCase
 
-from filer.models.imagemodels import Image as FilerImage
-from PIL import Image
-
 from open_inwoner.cms.tests import cms_tools
 from open_inwoner.utils.test import temp_media_root
+from open_inwoner.utils.tests.factories import FilerImageFactory
 
 from ..cms_plugins import BannerImagePlugin, BannerTextPlugin
 
@@ -16,40 +12,22 @@
 @temp_media_root()
 class TestBannerImage(TestCase):
     def test_banner_image_is_rendered_in_plugin(self):
-        pil_image = Image.new("RGB", (10, 10))
-        tmp_file_path = "{}/{}".format(settings.MEDIA_ROOT, "tmp.jpg")
-        pil_image.save(tmp_file_path, "JPEG")
-
-        tmp_image_file = open(tmp_file_path, "rb")
-        file_obj = File(tmp_image_file)
-        instance = FilerImage()
-        instance.file.save("image.jpg", file_obj)
-
+        image = FilerImageFactory()
         html, context = cms_tools.render_plugin(
-            BannerImagePlugin, plugin_data={"image": instance}
+            BannerImagePlugin, plugin_data={"image": image}
         )
-
-        self.assertIn(os.path.basename(instance.file.name), html)
+        self.assertIn(os.path.basename(image.file.name), html)
         self.assertIn('<aside class="banner"', html)
 
     def test_banner_image_with_specific_height(self):
-        pil_image = Image.new("RGB", (10, 10))
-        tmp_file_path = "{}/{}".format(settings.MEDIA_ROOT, "tmp.jpg")
-        pil_image.save(tmp_file_path, "JPEG")
-
-        tmp_image_file = open(tmp_file_path, "rb")
-        file_obj = File(tmp_image_file)
-        instance = FilerImage()
-        instance.file.save("image.jpg", file_obj)
-
+        image = FilerImageFactory()
         image_height = 40
-
         html, context = cms_tools.render_plugin(
             BannerImagePlugin,
-            plugin_data={"image": instance, "image_height": image_height},
+            plugin_data={"image": image, "image_height": image_height},
         )
 
-        self.assertIn(os.path.basename(instance.file.name), html)
+        self.assertIn(os.path.basename(image.file.name), html)
         self.assertIn(f'height="{image_height}"', html)
         self.assertIn('<aside class="banner"', html)
 
@@ -57,7 +35,6 @@ def test_banner_image_with_specific_height(self):
 class TestBannerText(TestCase):
     def test_banner_text_is_rendered_in_plugin(self):
         title = "A title for the banner"
-
         html, context = cms_tools.render_plugin(
             BannerTextPlugin, plugin_data={"title": title}
         )
@@ -67,7 +44,6 @@ def test_banner_text_is_rendered_in_plugin(self):
     def test_banner_text_with_description_is_rendered_in_plugin(self):
         title = "A title for the banner"
         description = "Text for description"
-
         html, context = cms_tools.render_plugin(
             BannerTextPlugin, plugin_data={"title": title, "description": description}
         )
diff --git a/src/open_inwoner/utils/tests/factories.py b/src/open_inwoner/utils/tests/factories.py
new file mode 100644
index 0000000000..ab69674d65
--- /dev/null
+++ b/src/open_inwoner/utils/tests/factories.py
@@ -0,0 +1,19 @@
+import factory
+from filer.models import Image as FilerImage
+
+from open_inwoner.accounts.tests.factories import UserFactory
+
+
+class FilerImageFactory(factory.django.DjangoModelFactory):
+    """
+    Can be used in combination with the temp_media_root decorator in order to
+    save the images in temp
+
+    from open_inwoner.utils.test import temp_media_root
+    """
+
+    file = factory.django.ImageField()
+    owner = factory.SubFactory(UserFactory)
+
+    class Meta:
+        model = FilerImage

From bb390877f6df599e353af35de64dcca32644e85a Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Thu, 1 Jun 2023 17:31:28 +0200
Subject: [PATCH 03/60] :lipstick: [#1436] Added scroll styles for tables on
 mobile and iOS

---
 .../scss/components/Table/Table.scss          | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/open_inwoner/scss/components/Table/Table.scss b/src/open_inwoner/scss/components/Table/Table.scss
index 5f0a458cf1..66d5a12143 100644
--- a/src/open_inwoner/scss/components/Table/Table.scss
+++ b/src/open_inwoner/scss/components/Table/Table.scss
@@ -1,9 +1,16 @@
 .table {
+  display: block;
+  box-sizing: border-box;
+  white-space: nowrap;
   margin-top: var(--row-height);
   width: 100%;
   font-family: var(--font-family-body);
   border-collapse: collapse;
   border-spacing: 0;
+  overflow-x: scroll;
+  scrollbar-width: thin;
+  scrollbar-color: var(--color-secondary) var(--color-gray-lightest);
+  -webkit-overflow-scrolling: touch;
 
   &--space-medium {
     margin-top: var(--spacing-medium);
@@ -147,4 +154,25 @@
       font-size: var(--font-size-body);
     }
   }
+
+  @media (min-width: 768px) {
+    display: table;
+  }
+}
+
+/// Scrollbar style for tables on mobile
+
+.table::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+.table::-webkit-scrollbar-track {
+  background: var(--color-gray-lightest);
+}
+
+.table::-webkit-scrollbar-thumb {
+  background-color: var(--color-secondary);
+  border-radius: 6px;
+  border: 2px solid var(--color-secondary);
 }

From 523132692d6845b41548cf97e2e277c51b144562 Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Mon, 5 Jun 2023 14:46:51 +0200
Subject: [PATCH 04/60] :lipstick: [#1516] Add secondary link styles to leaflet
 map

---
 src/open_inwoner/js/components/map/index.js           |  4 ++--
 src/open_inwoner/scss/components/Map/_leaflet.scss    |  8 ++++++--
 src/open_inwoner/scss/components/Typography/Link.scss | 11 +++++++++--
 src/open_inwoner/templates/pages/product/detail.html  |  4 ++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/open_inwoner/js/components/map/index.js b/src/open_inwoner/js/components/map/index.js
index 0ccfb1e0b0..c6be8d11b2 100644
--- a/src/open_inwoner/js/components/map/index.js
+++ b/src/open_inwoner/js/components/map/index.js
@@ -124,10 +124,10 @@ class Map {
       <div class="leaflet-content-details p--no-margin">
         <p class="p">${displayAddress1}</p>
         <p class="p">${displayAddress2}</p>
-        <a href="tel:${displayPhonenumber}" class="link link--primary" aria-label=${displayPhonenumber} title=${displayPhonenumber}>
+        <a href="tel:${displayPhonenumber}" class="link link--secondary" aria-label=${displayPhonenumber} title=${displayPhonenumber}>
           <span class="link__text">${displayPhonenumber}</span>
         </a>
-        <a href="mailto:${displayEmail}" class="link link--primary" aria-label=${displayEmail} title=${displayEmail}>
+        <a href="mailto:${displayEmail}" class="link link--secondary" aria-label=${displayEmail} title=${displayEmail}>
           <span class="link__text">${displayEmail}</span>
         </a>
       </div>
diff --git a/src/open_inwoner/scss/components/Map/_leaflet.scss b/src/open_inwoner/scss/components/Map/_leaflet.scss
index 606ca40381..d2c9de3f11 100644
--- a/src/open_inwoner/scss/components/Map/_leaflet.scss
+++ b/src/open_inwoner/scss/components/Map/_leaflet.scss
@@ -270,8 +270,12 @@ svg.leaflet-image-layer.leaflet-interactive path {
   background: #ddd;
   outline: 0;
 }
-.leaflet-container a {
-  color: #0078a8;
+.leaflet-container a,
+.leaflet-container .link--secondary {
+  color: var(--color-secondary);
+}
+.leaflet-container h4 .link--primary {
+  color: var(--color-black);
 }
 .leaflet-container a.leaflet-active {
   outline: 2px solid orange;
diff --git a/src/open_inwoner/scss/components/Typography/Link.scss b/src/open_inwoner/scss/components/Typography/Link.scss
index ca5c995245..eee948553d 100644
--- a/src/open_inwoner/scss/components/Typography/Link.scss
+++ b/src/open_inwoner/scss/components/Typography/Link.scss
@@ -35,11 +35,18 @@
     flex-direction: row-reverse;
   }
 
-  &--primary,
-  .leaflet-container &--primary {
+  &--primary {
     color: var(--color-primary);
   }
 
+  .leaflet-container &--secondary {
+    color: var(--color-secondary);
+  }
+
+  .leaflet-container .h4 &--primary {
+    color: var(--color-black);
+  }
+
   &--secondary {
     color: var(--color-secondary);
   }
diff --git a/src/open_inwoner/templates/pages/product/detail.html b/src/open_inwoner/templates/pages/product/detail.html
index ab12f8dcb7..8213f10bac 100644
--- a/src/open_inwoner/templates/pages/product/detail.html
+++ b/src/open_inwoner/templates/pages/product/detail.html
@@ -82,10 +82,10 @@ <h3 class="h3">{% trans "U komt niet in aanmerking" %}</h3>
                             <p class="p">{{ location.address_line_1 }}</p>
                             <p class="p">{{ location.address_line_2 }}</p>
                             {% if phonenumber %}
-                                {% link href='tel:'|addstr:phonenumber primary=True text=phonenumber %}
+                                {% link href='tel:'|addstr:phonenumber secondary=True text=phonenumber %}
                             {% endif %}
                             {% if email %}
-                                {% link href='mailto:'|addstr:email primary=True text=email %}
+                                {% link href='mailto:'|addstr:email secondary=True text=email %}
                             {% endif %}
                         </div>
                     </div>

From 3e8867e1a5d0483c5f124ea5edec6f286d0fc7f8 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Mon, 5 Jun 2023 20:12:59 +0200
Subject: [PATCH 05/60] [#1418] Exposing title/page_title and meta-description
 from Django CMS

---
 src/open_inwoner/templates/cms/fullwidth.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/open_inwoner/templates/cms/fullwidth.html b/src/open_inwoner/templates/cms/fullwidth.html
index a724a1d731..1d84550c29 100644
--- a/src/open_inwoner/templates/cms/fullwidth.html
+++ b/src/open_inwoner/templates/cms/fullwidth.html
@@ -1,6 +1,16 @@
 {% extends 'master.html' %}
 {% load i18n cms_tags sekizai_tags static %}
 
+
+{% block extra_head %}
+{% page_attribute "meta_description" as meta_description %}
+{{ block.super }}
+        <meta name="description" content="{{ meta_description }}" />
+{% endblock extra_head %}
+
+{% block title %}{% page_attribute "title" as title %}{% page_attribute "page_title" as page_title %}{% if page_title %}{{ page_title }}{% else %}{{ title }}{% endif %} - {{ site_name }}{% endblock title %}
+
+	
 {% block header_image %}
     {% if request.user.is_authenticated %}
         {% placeholder 'banner_image' %}

From e4b238960228bdf43c049b0d56dd180d8be2ad97 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Mon, 5 Jun 2023 20:55:29 +0200
Subject: [PATCH 06/60] [#1478] Showing message.success after a
 profile(-related) save

---
 src/open_inwoner/accounts/views/profile.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 48e1ee6d50..3eaef5dedf 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -129,6 +129,7 @@ def get_object(self):
     def form_valid(self, form):
         form.save()
 
+        messages.success(request, _("Uw wijzigingen zijn opgeslagen"))
         self.log_change(self.get_object(), _("profile was modified"))
         return HttpResponseRedirect(self.get_success_url())
 
@@ -164,7 +165,7 @@ def get_object(self):
 
     def form_valid(self, form):
         form.save()
-
+        messages.success(request, _("Uw wijzigingen zijn opgeslagen"))
         self.log_change(self.object, _("categories were modified"))
         return HttpResponseRedirect(self.get_success_url())
 
@@ -259,7 +260,7 @@ def get_form_kwargs(self):
 
     def form_valid(self, form):
         form.save()
-
+        messages.success(request, _("Uw wijzigingen zijn opgeslagen"))
         self.log_change(self.object, _("users notifications were modified"))
         return HttpResponseRedirect(self.get_success_url())
 

From 19104589af81f75d9a569d1223f41254b3a1989a Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Tue, 6 Jun 2023 09:54:45 +0200
Subject: [PATCH 07/60] [#1478] Correcting messages

---
 src/open_inwoner/accounts/views/profile.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 3eaef5dedf..e58c186a41 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -129,7 +129,7 @@ def get_object(self):
     def form_valid(self, form):
         form.save()
 
-        messages.success(request, _("Uw wijzigingen zijn opgeslagen"))
+        messages.success(self.request, _("Uw wijzigingen zijn opgeslagen"))
         self.log_change(self.get_object(), _("profile was modified"))
         return HttpResponseRedirect(self.get_success_url())
 
@@ -165,7 +165,7 @@ def get_object(self):
 
     def form_valid(self, form):
         form.save()
-        messages.success(request, _("Uw wijzigingen zijn opgeslagen"))
+        messages.success(self.request, _("Uw wijzigingen zijn opgeslagen"))
         self.log_change(self.object, _("categories were modified"))
         return HttpResponseRedirect(self.get_success_url())
 
@@ -260,7 +260,7 @@ def get_form_kwargs(self):
 
     def form_valid(self, form):
         form.save()
-        messages.success(request, _("Uw wijzigingen zijn opgeslagen"))
+        messages.success(self.request, _("Uw wijzigingen zijn opgeslagen"))
         self.log_change(self.object, _("users notifications were modified"))
         return HttpResponseRedirect(self.get_success_url())
 

From c415a981fec678fc4dee35b7c0ec92ae8b8cdbff Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Mon, 5 Jun 2023 16:00:46 +0200
Subject: [PATCH 08/60] :bug: [#1467] Fixed mobile navigation for older iOS
 devices

---
 .../templates/components/Header/Header.html   |  4 +-
 .../Header/NavigationAuthenticated.html       |  2 +-
 .../components/Header/PrimaryNavigation.html  |  2 +-
 .../js/components/header/header.js            | 94 ++++++++++---------
 .../scss/components/Header/Header.scss        |  5 +-
 .../components/Header/PrimaryNavigation.scss  |  5 +-
 src/open_inwoner/scss/views/App.scss          |  2 +-
 src/open_inwoner/scss/views/_body.scss        |  1 +
 8 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/src/open_inwoner/components/templates/components/Header/Header.html b/src/open_inwoner/components/templates/components/Header/Header.html
index 04b59f68f8..57cca6908e 100644
--- a/src/open_inwoner/components/templates/components/Header/Header.html
+++ b/src/open_inwoner/components/templates/components/Header/Header.html
@@ -25,7 +25,7 @@
             </span>
         {% endif %}
 
-            <dialog class="header__submenu">
+            <div class="header__submenu">
 
             {% if cms_apps.products %}
             <nav class="header__actions" aria-label="Zoek navigatie mobiel">
@@ -96,7 +96,7 @@
                 </section>
 
 
-            </dialog>
+            </div>
         </div>
 {#end of mobile menu#}
 
diff --git a/src/open_inwoner/components/templates/components/Header/NavigationAuthenticated.html b/src/open_inwoner/components/templates/components/Header/NavigationAuthenticated.html
index 1aa9ec394a..4a3eac13be 100644
--- a/src/open_inwoner/components/templates/components/Header/NavigationAuthenticated.html
+++ b/src/open_inwoner/components/templates/components/Header/NavigationAuthenticated.html
@@ -7,7 +7,7 @@
     <nav class="primary-navigation primary-navigation__authenticated" aria-label="Navigatie na inloggen">
         <ul class="primary-navigation__list">
             <li class="primary-navigation__list-item">
-            {% button href="#" text=_('Welkom ')|addstr:request.user.get_short_name type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
+            {% button text=_('Welkom ')|addstr:request.user.get_short_name type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
 
                 <ul class="primary-navigation__list subpage-list">
                     {% show_menu_below_id "home" 0 100 100 100 "cms/menu/primary.html" %}
diff --git a/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html b/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html
index 2cad05ae26..53ede41b53 100644
--- a/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html
+++ b/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html
@@ -7,7 +7,7 @@
 
         {% if cms_apps.products and categories %}
         <li class="primary-navigation__list-item">
-            {% button href="#" text=_('Onderwerpen') type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
+            {% button text=_('Onderwerpen') type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
 
             {% if categories %}
                 <ul class="primary-navigation__list subpage-list">
diff --git a/src/open_inwoner/js/components/header/header.js b/src/open_inwoner/js/components/header/header.js
index 1f773a5c27..260eb5e2fe 100644
--- a/src/open_inwoner/js/components/header/header.js
+++ b/src/open_inwoner/js/components/header/header.js
@@ -2,93 +2,95 @@ import BEM from 'bem.js'
 import { Component } from '../abstract/component'
 
 /** @type {string} Header block name. */
-export const BLOCK_HEADER = 'header'
-
-/** @type {string} Button element name. */
-export const ELEMENT_BUTTON = 'button'
-
-/** @type {string} Menu element name. */
-export const ELEMENT_SUBMENU = 'submenu'
+export const BLOCK_HEADER = 'header__button'
 
 /** @type {string} Modifier describing open state. */
-export const MODIFIER_OPEN = 'open'
+export const MODIFIER_DISMISSED = 'dismissed'
 
-/** @type {NodeList<HTMLElement>} Button element name. */
+/** @type {NodeList<HTMLElement>} The primary navigation block name. */
 export const HEADERS = BEM.getBEMNodes(BLOCK_HEADER)
 
+/** Handler to bypass Safari bug */
+export const themesToggle = document.querySelectorAll('.dropdown-nav__toggle')
+
 /**
- * Controls the main header and interaction with the mobile menu.
+ * Controls the main header and interaction with the mobile menu and dismissing it using the escape key.
  */
 class Header extends Component {
   /**
    * Binds events to callbacks.
    * Callbacks should trigger `setState` which in turn triggers `render`.
+   * Focus is split to be handled in Safari
    */
   bindEvents() {
-    this.node.addEventListener('keyup', this.onKeyUp.bind(this))
     this.node.addEventListener('click', (e) => {
-      if (
-        e.target.matches('.header__button') ||
-        e.target.matches('.header__button *')
-      ) {
-        this.setState({ open: !this.state.open })
-        /**
-         * Remove focus from search in order to prevent native keyboard on mobile
-         */
-        const blurInput = document.querySelectorAll(
-          '.header__submenu .form .input'
-        )
-        blurInput.forEach((elem) => {
-          elem.blur()
-        })
-      }
+      /**
+       * Remove focus from search in order to prevent native keyboard on mobile
+       */
+      const blurInput = document.querySelectorAll(
+        '.header__submenu .form .input'
+      )
+      blurInput.forEach((elem) => {
+        elem.blur()
+      })
     })
+    this.node.addEventListener('click', this.toggleMobileNavOpen.bind(this))
+    this.node.addEventListener('focusout', this.onFocusMobileOut.bind(this))
+    window.addEventListener('keyup', this.onEscape.bind(this))
   }
 
   /**
-   * Return the menu button.
-   * @returns {HTMLButtonElement}
+   * Gets called when `node` receives focus -in or -out events.
+   * Clears the dismissed state, (prevents overriding focus/hover).
+   * Focusin and Focusout are used instead of Focus for Safari
    */
-  getButton() {
-    return BEM.getChildBEMNode(this.node, BLOCK_HEADER, ELEMENT_BUTTON)
+  onFocusMobileOut() {
+    // Safari specific
+    this.setState({ dismissed: true })
   }
+
   /**
-   * Returns the menu controlled by the button.
-   * @returns {HTMLDialogElement}
+   * Gets called when `node` is clicked.
+   * Clears the dismissed state, (prevents overriding focus/toggle).
    */
-  getSubMenu() {
-    return BEM.getChildBEMNode(this.node, BLOCK_HEADER, ELEMENT_SUBMENU)
+  toggleMobileNavOpen(event) {
+    document.body.classList.toggle('body--open')
+    // Safari specific - close all when main menu closes
+    themesToggle.forEach((elem) => {
+      elem.classList.remove('nav__list--open')
+    })
+    window.scrollTo(0, 0)
   }
+
   /**
    * Gets called when a key is released.
    * If key is escape key, explicitly close the mobile menu.
-   * @param {KeyboardEvent} event
+   //* @param {KeyboardEvent} event
    */
-  onKeyUp(event) {
+  onEscape(event) {
     if (event.key === 'Escape') {
-      this.setState({ open: false })
+      this.setState({ dismissed: true })
+      this.node.blur()
+      document.body.classList.remove('body--open')
     }
   }
 
   /**
    * Persists state to DOM.
    * Rendering should be one-way traffic and not inspect any current values in DOM.
-   * @param {Object} state State to render.
+   //* @param {Object} state State to render.
    */
   render(state) {
     document.body.classList.add('body')
-    BEM.toggleModifier(document.body, MODIFIER_OPEN, state.open)
-    BEM.toggleModifier(this.getButton(), MODIFIER_OPEN, state.open)
+    BEM.toggleModifier(this.node, MODIFIER_DISMISSED, state.dismissed)
 
-    if (matchMedia('(max-width: 767px)').matches) {
-      state.open ? this.getSubMenu().show() : this.getSubMenu().close()
-    }
+    if (state.dismissed) {
+      this.node.blur()
 
-    if (state.open) {
-      window.scrollTo({ x: 0, y: 0 })
+      return this.node.querySelector('.header__button')
     }
   }
 }
 
 // Start!
-;[...HEADERS].forEach((node) => new Header(node, { open: false }))
+;[...HEADERS].forEach((node) => new Header(node, { dismissed: false }))
diff --git a/src/open_inwoner/scss/components/Header/Header.scss b/src/open_inwoner/scss/components/Header/Header.scss
index 1c71397d42..de2d3030c3 100644
--- a/src/open_inwoner/scss/components/Header/Header.scss
+++ b/src/open_inwoner/scss/components/Header/Header.scss
@@ -218,6 +218,7 @@ $vm: var(--spacing-large);
     bottom: 0;
     background-color: var(--color-white);
     box-sizing: border-box;
+    display: none;
     height: 100%;
     left: 0;
     margin: 0;
@@ -228,6 +229,7 @@ $vm: var(--spacing-large);
       var(--spacing-large);
     position: fixed;
     right: 0;
+    text-align: left;
     top: calc(2 * var(--row-height));
     width: 100%;
     z-index: 2;
@@ -500,6 +502,7 @@ $vm: var(--spacing-large);
       .header {
         &__submenu {
           border-top: 1px solid var(--color-white);
+          display: block;
 
           .primary-navigation {
             border-bottom: 1px solid var(--color-gray-light);
@@ -560,7 +563,7 @@ $vm: var(--spacing-large);
         width: 100%;
         flex-direction: row-reverse;
         flex-wrap: nowrap;
-        justify-content: start;
+        justify-content: flex-end;
       }
     }
   }
diff --git a/src/open_inwoner/scss/components/Header/PrimaryNavigation.scss b/src/open_inwoner/scss/components/Header/PrimaryNavigation.scss
index d411685e12..681ceb539c 100644
--- a/src/open_inwoner/scss/components/Header/PrimaryNavigation.scss
+++ b/src/open_inwoner/scss/components/Header/PrimaryNavigation.scss
@@ -35,7 +35,7 @@
     display: flex;
     align-items: center;
     flex-direction: column;
-    justify-content: start;
+    justify-content: flex-start;
     min-height: var(--row-height);
     overflow: hidden;
     padding: 0;
@@ -266,9 +266,12 @@
     &:hover {
       transform: translateY(0);
     }
+
     &:focus,
     &:focus-visible,
     &:focus-within {
+      border-radius: var(--border-radius-large);
+      margin: 0 3px 0 0;
       transform: translateY(0);
     }
   }
diff --git a/src/open_inwoner/scss/views/App.scss b/src/open_inwoner/scss/views/App.scss
index a867a14fd1..7b2523d305 100644
--- a/src/open_inwoner/scss/views/App.scss
+++ b/src/open_inwoner/scss/views/App.scss
@@ -55,7 +55,7 @@
   --color-primary-lighter: hsl(
     var(--color-primary-h),
     var(--color-primary-s),
-    calc(var(--color-primary-l) + 10%)
+    calc(var(--color-primary-l) + 30%)
   );
   --color-secondary-h: 207;
   --color-secondary-s: 80%;
diff --git a/src/open_inwoner/scss/views/_body.scss b/src/open_inwoner/scss/views/_body.scss
index 40a62eb836..1ec4bf608b 100644
--- a/src/open_inwoner/scss/views/_body.scss
+++ b/src/open_inwoner/scss/views/_body.scss
@@ -1,5 +1,6 @@
 .body--open {
   overflow: hidden;
+  position: fixed;
 
   @media (min-width: 768px) {
     height: auto;

From a7cfe6a699f4274f53cc4e5cbbecc2ae866fdbac Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Mon, 5 Jun 2023 14:03:30 +0200
Subject: [PATCH 09/60] :lipstick: [#1518] Made contactmoment card clickable
 entirely

---
 .../Contactmomenten/Contactmomenten.scss      | 10 ++++++
 .../scss/components/List/_List.scss           |  3 +-
 src/open_inwoner/scss/components/_index.scss  |  1 +
 .../templates/pages/contactmoment/list.html   | 34 ++++++++++++-------
 4 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss

diff --git a/src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss b/src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss
new file mode 100644
index 0000000000..2aaa67d79e
--- /dev/null
+++ b/src/open_inwoner/scss/components/Contactmomenten/Contactmomenten.scss
@@ -0,0 +1,10 @@
+.contactmomenten {
+  margin-top: var(--spacing-giant);
+
+  /// cards on cases page
+  .card {
+    .contactmomenten__link {
+      text-decoration: none;
+    }
+  }
+}
diff --git a/src/open_inwoner/scss/components/List/_List.scss b/src/open_inwoner/scss/components/List/_List.scss
index 5af1bfa451..515138cab1 100644
--- a/src/open_inwoner/scss/components/List/_List.scss
+++ b/src/open_inwoner/scss/components/List/_List.scss
@@ -5,7 +5,8 @@
   width: 100%;
   overflow-y: auto;
 
-  .case-list {
+  .case-list,
+  .contactmomenten-list {
     text-decoration: none;
   }
 }
diff --git a/src/open_inwoner/scss/components/_index.scss b/src/open_inwoner/scss/components/_index.scss
index 2ce6859591..f96e7478c3 100644
--- a/src/open_inwoner/scss/components/_index.scss
+++ b/src/open_inwoner/scss/components/_index.scss
@@ -8,6 +8,7 @@
 @import './CardContainer/CardContainer.scss';
 @import './Cases/Cases.scss';
 @import './Condition/Condition.scss';
+@import './Contactmomenten/Contactmomenten.scss';
 @import './Contacts/Contacts.scss';
 @import './Container/Container.scss';
 @import './Dashboard/Dashboard.scss';
diff --git a/src/open_inwoner/templates/pages/contactmoment/list.html b/src/open_inwoner/templates/pages/contactmoment/list.html
index 1e43c1f169..dbfcdcd6c5 100644
--- a/src/open_inwoner/templates/pages/contactmoment/list.html
+++ b/src/open_inwoner/templates/pages/contactmoment/list.html
@@ -13,18 +13,28 @@ <h2 class="h2" id="contactmomenten">{{ page_title }} ({{ contactmomenten|length
         {% render_grid %}
             {% for contactmoment in contactmomenten %}
                 {% render_column start=forloop.counter_0|multiply:4 span=4 %}
-                    {% render_card compact=True stretch=True title=case.identificatie %}
-                        {% render_list %}
-                            {% list_item contactmoment.registered_date caption=_("Ontvangstdatum") compact=True strong=False %}
-                            {% list_item contactmoment.channel caption=_("Contactwijze") compact=True strong=False %}
-                            {% if contactmoment.onderwerp %}
-                                {% list_item contactmoment.onderwerp|truncatechars:25 caption=_("Onderwerp") compact=True strong=False %}
-                            {% else %}
-                                {% list_item contactmoment.text|truncatechars:25 caption=_("Bericht") compact=True strong=False %}
-                            {% endif %}
-                        {% endrender_list %}
-                        {% link href=contactmoment.url icon="arrow_forward" primary=True text=_("Bekijk vraag") %}
-                    {% endrender_card %}
+                <div class="card card--compact card--stretch">
+                    <div class="card__body">
+                        <a href="{{ contactmoment.url }}" class="contactmomenten__link">
+                            {% render_list %}
+                                <span class="contactmomenten-list">
+                                {% list_item contactmoment.registered_date caption=_("Ontvangstdatum") compact=True strong=False %}
+                                {% list_item contactmoment.channel caption=_("Contactwijze") compact=True strong=False %}
+                                {% if contactmoment.onderwerp %}
+                                    {% list_item contactmoment.onderwerp|truncatechars:25 caption=_("Onderwerp") compact=True strong=False %}
+                                {% else %}
+                                    {% list_item contactmoment.text|truncatechars:25 caption=_("Bericht") compact=True strong=False %}
+                                {% endif %}
+                                </span>
+                            {% endrender_list %}
+
+                            <span class="link link--icon link--primary" aria-label="{% trans "Bekijk vraag" %}" title="{% trans "Bekijk vraag" %}">
+                                <span class="link__text">{% trans "Bekijk vraag" %}</span>
+                                {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %}
+                            </span>
+                        </a>
+                    </div>
+                </div>
                 {% endrender_column %}
             {% endfor %}
         {% endrender_grid %}

From 8a02782668218d4721aa1eaee80131cd5310f2e3 Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Tue, 6 Jun 2023 15:48:52 +0200
Subject: [PATCH 10/60] :lipstick: [#1254] Made Help tips in admin always show,
 without needing to hover

---
 src/open_inwoner/scss/admin/_admin_theme.scss | 41 ++++---------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/open_inwoner/scss/admin/_admin_theme.scss b/src/open_inwoner/scss/admin/_admin_theme.scss
index 5b3f6e71cc..b1db0c2490 100644
--- a/src/open_inwoner/scss/admin/_admin_theme.scss
+++ b/src/open_inwoner/scss/admin/_admin_theme.scss
@@ -301,42 +301,20 @@ input[type='submit'].default:hover {
 }
 
 /**
- * Help text mouseover
+ * Help text
  */
-div.help:hover {
+
+div.help {
+  display: block;
   text-indent: inherit;
   width: auto;
-  background-image: none;
-  background-color: $color-tooltip-background;
-  border: 1px solid $color-tooltip-border;
+  height: auto;
   color: $color-tooltip-text;
-  padding: 5px 5px 3px 5px !important;
-  max-width: 300px;
-  height: auto !important;
-  margin-top: 2px !important;
-  z-index: 10;
 }
 
-div.help {
-  cursor: help;
-  width: 16px;
-  height: 16px;
-  background-image: url(../admin/img/icon-unknown.svg);
-  display: inline-block;
-  background-repeat: no-repeat;
-  background-size: 14px;
-  margin-left: 8px !important;
-  margin-top: 6px !important;
-  position: absolute;
-  text-indent: -9999px;
-}
-
-.related-widget-wrapper ~ div.help {
-  margin-top: 8px !important;
-
-  &:hover {
-    margin-top: 4px !important;
-  }
+div.help,
+form div.help {
+  font-size: 12px;
 }
 
 /* Overrides default Django CSS */
@@ -345,9 +323,6 @@ div.help {
   display: inline-block;
   margin-left: inherit !important;
 }
-.aligned label + div.help {
-  margin-left: 2px !important;
-}
 
 /* Additional components seem to need the same behaviour */
 /* TODO: TinyMCE is different... */

From edf74d89cf7a5d516271bc31a675b88b928be59f Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 7 Jun 2023 09:01:39 +0200
Subject: [PATCH 11/60] [#1459] Show readable name in the admin

---
 src/open_inwoner/cms/extensions/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/open_inwoner/cms/extensions/models.py b/src/open_inwoner/cms/extensions/models.py
index cda6507a1f..076cddf433 100644
--- a/src/open_inwoner/cms/extensions/models.py
+++ b/src/open_inwoner/cms/extensions/models.py
@@ -33,6 +33,9 @@ class CommonExtension(PageExtension):
         help_text=_("Icon in het menu"),
     )
 
+    def __str__(self):
+        return str(self.get_page())
+
     def save(self, *args, **kwargs):
         if self.requires_auth_bsn:
             self.requires_auth = True

From 2b708f7e003b64bfe7893056aee7735f8e72595a Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 7 Jun 2023 14:14:41 +0200
Subject: [PATCH 12/60] [#1399] Changed categories order to path

---
 .../migrations/0056_alter_category_options.py | 20 +++++++++++++++++++
 src/open_inwoner/pdc/models/category.py       |  2 +-
 .../pdc/tests/test_category_admin.py          |  6 +++---
 .../pdc/tests/test_data_migrations.py         |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 src/open_inwoner/pdc/migrations/0056_alter_category_options.py

diff --git a/src/open_inwoner/pdc/migrations/0056_alter_category_options.py b/src/open_inwoner/pdc/migrations/0056_alter_category_options.py
new file mode 100644
index 0000000000..726319335a
--- /dev/null
+++ b/src/open_inwoner/pdc/migrations/0056_alter_category_options.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2.15 on 2023-06-07 11:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pdc", "0055_alter_product_content"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="category",
+            options={
+                "ordering": ("path",),
+                "verbose_name": "Category",
+                "verbose_name_plural": "Categories",
+            },
+        ),
+    ]
diff --git a/src/open_inwoner/pdc/models/category.py b/src/open_inwoner/pdc/models/category.py
index 6de6614468..ebc2a7be22 100644
--- a/src/open_inwoner/pdc/models/category.py
+++ b/src/open_inwoner/pdc/models/category.py
@@ -61,12 +61,12 @@ class Category(MP_Node):
         help_text=_("Image of the category"),
     )
 
-    node_order_by = ["slug"]
     objects = CategoryPublishedQueryset.as_manager()
 
     class Meta:
         verbose_name = _("Category")
         verbose_name_plural = _("Categories")
+        ordering = ("path",)
 
     def __str__(self):
         return self.name
diff --git a/src/open_inwoner/pdc/tests/test_category_admin.py b/src/open_inwoner/pdc/tests/test_category_admin.py
index 4bb35860fa..26762178d4 100644
--- a/src/open_inwoner/pdc/tests/test_category_admin.py
+++ b/src/open_inwoner/pdc/tests/test_category_admin.py
@@ -19,7 +19,7 @@ def test_user_can_publish_root_category_on_add_form(self):
         form["name"] = "foo1"
         form["slug"] = "foo1"
         form["published"] = True
-        form["_position"] = "sorted-child"
+        form["_position"] = "first-child"
         form["_ref_node_id"] = 0
         form.submit()
         category = Category.objects.first()
@@ -34,7 +34,7 @@ def test_user_can_publish_child_category_with_root_published_on_add_form(self):
         form["name"] = "bar1"
         form["slug"] = "bar1"
         form["published"] = True
-        form["_position"] = "sorted-child"
+        form["_position"] = "first-child"
         form["_ref_node_id"] = root.id
         form.submit()
         updated_category = Category.objects.get(slug="bar1")
@@ -51,7 +51,7 @@ def test_user_cannot_publish_child_category_without_root_published_on_add_form(
         form["name"] = "bar2"
         form["slug"] = "bar2"
         form["published"] = True
-        form["_position"] = "sorted-child"
+        form["_position"] = "first-child"
         form["_ref_node_id"] = category.id
         form.submit()
         categories = Category.objects.filter(slug="bar2")
diff --git a/src/open_inwoner/pdc/tests/test_data_migrations.py b/src/open_inwoner/pdc/tests/test_data_migrations.py
index 3151f7a8da..87f42bed10 100644
--- a/src/open_inwoner/pdc/tests/test_data_migrations.py
+++ b/src/open_inwoner/pdc/tests/test_data_migrations.py
@@ -101,5 +101,5 @@ def test_products_still_have_category(self):
 
         self.assertEqual(
             list(product.categories.all()),
-            [category_initial, category_extra],
+            [category_extra, category_initial],
         )

From aeed4eaa41fced42a00cfb5a42c1e4259a44f7c6 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Wed, 7 Jun 2023 14:52:22 +0200
Subject: [PATCH 13/60] [#1519] remove files from profile sidebar if files are
 empty

---
 src/open_inwoner/accounts/views/profile.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 48e1ee6d50..8cb237f44a 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -52,8 +52,12 @@ def get_context_data(self, **kwargs):
         context["anchors"] = [
             ("#title", _("Persoonlijke gegevens")),
             ("#overview", _("Persoonlijk overzicht")),
-            ("#files", _("Bestanden")),
         ]
+
+        user_files = user.get_all_files()
+        if user_files:
+            context["anchors"].append(("#files", _("Bestanden")))
+
         # List of names of 'mentor' users that are a contact of me
         mentor_contacts = [
             c.get_full_name()
@@ -70,7 +74,7 @@ def get_context_data(self, **kwargs):
             .order_by("end_date")
             .first()
         )
-        context["files"] = user.get_all_files()
+        context["files"] = user_files
         context["category_text"] = user.get_interests()
         context["action_text"] = _(
             f"{Action.objects.visible().connected(self.request.user).filter(status=StatusChoices.open).count()} acties staan open."

From 420d5014b2ea5631849597536e1a56c865120df7 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Mon, 5 Jun 2023 12:28:47 +0200
Subject: [PATCH 14/60] [#1509] fix template 'form.html'

---
 src/open_inwoner/pdc/views.py                      | 11 -----------
 src/open_inwoner/templates/pages/product/form.html |  6 ++++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/open_inwoner/pdc/views.py b/src/open_inwoner/pdc/views.py
index 9e2e0f0c61..c64897f80a 100644
--- a/src/open_inwoner/pdc/views.py
+++ b/src/open_inwoner/pdc/views.py
@@ -228,17 +228,6 @@ def crumbs(self):
             (_("Formulier"), self.request.path),
         ]
 
-    def get_context_data(self, **kwargs):
-        product = self.get_object()
-        context = super().get_context_data(**kwargs)
-
-        anchors = [
-            ("#title", product.name),
-        ]
-
-        context["anchors"] = anchors
-        return context
-
 
 class ProductFinderView(CommonPageMixin, FormView):
     template_name = "pages/product/finder.html"
diff --git a/src/open_inwoner/templates/pages/product/form.html b/src/open_inwoner/templates/pages/product/form.html
index d33dac7cc7..aabe682aa1 100644
--- a/src/open_inwoner/templates/pages/product/form.html
+++ b/src/open_inwoner/templates/pages/product/form.html
@@ -8,6 +8,9 @@
 
 {% endblock %}
 
+{% block sidebar_content %}
+{% endblock %}
+
 {% block content %}
 
     <h1 class="h1" id="title">
@@ -17,10 +20,9 @@ <h1 class="h1" id="title">
         {% endif %}
     </h1>
     {% tag tags=object.tags.all %}
-    <p class="p">{{ object.summary }}</p>
 
     {% if object.form %}
         {% openforms_form object.form  csp_nonce=request.csp_nonce %}
     {% endif %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 28648907f0de87d52b3740af647c28ab719c499d Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Thu, 8 Jun 2023 12:18:23 +0200
Subject: [PATCH 15/60] [#1525] Hiding User BSN/RSIN, birth date and
 addressfields

---
 src/open_inwoner/accounts/admin.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/open_inwoner/accounts/admin.py b/src/open_inwoner/accounts/admin.py
index 7c187cf80d..4a8207951c 100644
--- a/src/open_inwoner/accounts/admin.py
+++ b/src/open_inwoner/accounts/admin.py
@@ -71,16 +71,9 @@ class _UserAdmin(ImageCroppingMixin, UserAdmin):
                     "infix",
                     "last_name",
                     "contact_type",
-                    "bsn",
-                    "rsin",
                     "oidc_id",
-                    "birthday",
                     "image",
                     "cropping",
-                    "street",
-                    "housenumber",
-                    "postcode",
-                    "city",
                     "phonenumber",
                     "selected_categories",
                 )

From b3ef4d97e9df89bd07a696418b86d9e019fcd92e Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Thu, 8 Jun 2023 15:15:48 +0200
Subject: [PATCH 16/60] [#1437 #1457] Enhanced contact-form to create/update
 Klant, or fallback to appending contact info

---
 src/open_inwoner/openklant/forms.py           |  35 ++-
 src/open_inwoner/openklant/models.py          |   8 +
 src/open_inwoner/openklant/tests/data.py      |  51 ++++-
 .../openklant/tests/test_contactform.py       | 214 ++++++++++++++++--
 .../openklant/views/contactform.py            |  77 ++++++-
 src/open_inwoner/openklant/wrap.py            |  22 +-
 src/open_inwoner/utils/tests/helpers.py       |  33 ++-
 7 files changed, 407 insertions(+), 33 deletions(-)

diff --git a/src/open_inwoner/openklant/forms.py b/src/open_inwoner/openklant/forms.py
index b643959513..b705cf5bfe 100644
--- a/src/open_inwoner/openklant/forms.py
+++ b/src/open_inwoner/openklant/forms.py
@@ -2,6 +2,7 @@
 from django.forms import Form
 from django.utils.translation import gettext_lazy as _
 
+from open_inwoner.accounts.models import User
 from open_inwoner.openklant.models import ContactFormSubject, OpenKlantConfig
 from open_inwoner.utils.validators import validate_phone_number
 
@@ -44,21 +45,47 @@ class ContactForm(Form):
         required=True,
     )
 
-    def __init__(self, *args, **kwargs):
+    user: User
+
+    def __init__(self, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.user = user
 
         config = OpenKlantConfig.get_solo()
         self.fields["subject"].queryset = config.contactformsubject_set.order_by(
             "subject"
         )
 
+        if self.user.is_authenticated:
+            del self.fields["first_name"]
+            del self.fields["last_name"]
+            del self.fields["infix"]
+            if self.user.email:
+                del self.fields["email"]
+            if self.user.phonenumber:
+                del self.fields["phonenumber"]
+
     def clean(self, *args, **kwargs):
         cleaned_data = super().clean(*args, **kwargs)
 
-        email = cleaned_data["email"]
-        phonenumber = cleaned_data["phonenumber"]
+        email = cleaned_data.get("email", "")
+        phonenumber = cleaned_data.get("phonenumber", "")
 
-        if not email and not phonenumber:
+        if ("email" in self.fields and not email) and (
+            "phonenumber" in self.fields and not phonenumber
+        ):
             msg = _("Vul een e-mailadres of telefoonnummer in.")
             self.add_error("email", msg)
             self.add_error("phonenumber", msg)
+
+        if self.user.is_authenticated:
+            if not email and self.user.get_contact_email():
+                cleaned_data["email"] = self.user.get_contact_email()
+            if not phonenumber and self.user.phonenumber:
+                cleaned_data["phonenumber"] = self.user.phonenumber
+
+            cleaned_data["first_name"] = self.user.first_name
+            cleaned_data["infix"] = self.user.infix
+            cleaned_data["last_name"] = self.user.last_name
+
+        return cleaned_data
diff --git a/src/open_inwoner/openklant/models.py b/src/open_inwoner/openklant/models.py
index 7961e9bfa0..391c539b5d 100644
--- a/src/open_inwoner/openklant/models.py
+++ b/src/open_inwoner/openklant/models.py
@@ -5,6 +5,12 @@
 from zgw_consumers.constants import APITypes
 
 
+class OpenKlantConfigManager(models.Manager):
+    def get_queryset(self):
+        qs = super().get_queryset()
+        return qs.select_related("klanten_service", "contactmomenten_service")
+
+
 class OpenKlantConfig(SingletonModel):
     """
     Global configuration and defaults for Klant & Contactmomenten APIs
@@ -67,6 +73,8 @@ class OpenKlantConfig(SingletonModel):
         "register_employee_id",
     )
 
+    objects = OpenKlantConfigManager()
+
     class Meta:
         verbose_name = _("Open Klant configuration")
 
diff --git a/src/open_inwoner/openklant/tests/data.py b/src/open_inwoner/openklant/tests/data.py
index 16792f733b..445159db11 100644
--- a/src/open_inwoner/openklant/tests/data.py
+++ b/src/open_inwoner/openklant/tests/data.py
@@ -100,6 +100,17 @@ def __init__(self):
             emailadres="foo@example.com",
             telefoonnummer="0612345678",
         )
+        self.klant_no_contact_info = generate_oas_component(
+            "kc",
+            "schemas/Klant",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            bronorganisatie="123456789",
+            voornaam="Foo",
+            achternaam="Bar",
+            emailadres="",
+            telefoonnummer="",
+        )
         self.contactmoment = generate_oas_component(
             "cmc",
             "schemas/ContactMoment",
@@ -123,7 +134,7 @@ def __init__(self):
 
         self.matchers = []
 
-    def install_mocks_anon(self, m) -> "MockAPICreateData":
+    def install_mocks_anon_with_klant(self, m) -> "MockAPICreateData":
         self.setUpOASMocks(m)
 
         self.matchers = [
@@ -141,6 +152,19 @@ def install_mocks_anon(self, m) -> "MockAPICreateData":
         ]
         return self
 
+    def install_mocks_anon_without_klant(self, m) -> "MockAPICreateData":
+        self.setUpOASMocks(m)
+
+        self.matchers = [
+            m.post(f"{KLANTEN_ROOT}klanten", json=self.klant, status_code=500),
+            m.post(
+                f"{CONTACTMOMENTEN_ROOT}contactmomenten",
+                json=self.contactmoment,
+                status_code=201,
+            ),
+        ]
+        return self
+
     def install_mocks_digid(self, m) -> "MockAPICreateData":
         self.setUpOASMocks(m)
 
@@ -161,3 +185,28 @@ def install_mocks_digid(self, m) -> "MockAPICreateData":
             ),
         ]
         return self
+
+    def install_mocks_digid_missing_contact_info(self, m) -> "MockAPICreateData":
+        self.setUpOASMocks(m)
+        self.matchers = [
+            m.get(
+                f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn={self.user.bsn}",
+                json=paginated_response([self.klant_no_contact_info]),
+            ),
+            m.patch(
+                f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+                json=self.klant,
+                status_code=200,
+            ),
+            m.post(
+                f"{CONTACTMOMENTEN_ROOT}contactmomenten",
+                json=self.contactmoment,
+                status_code=201,
+            ),
+            m.post(
+                f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten",
+                json=self.klant_contactmoment,
+                status_code=201,
+            ),
+        ]
+        return self
diff --git a/src/open_inwoner/openklant/tests/test_contactform.py b/src/open_inwoner/openklant/tests/test_contactform.py
index cefb15d77e..4fb040d8e3 100644
--- a/src/open_inwoner/openklant/tests/test_contactform.py
+++ b/src/open_inwoner/openklant/tests/test_contactform.py
@@ -1,3 +1,5 @@
+import inspect
+
 from django.contrib import messages
 from django.core import mail
 from django.urls import reverse
@@ -6,16 +8,23 @@
 import requests_mock
 from django_webtest import WebTest
 
-from open_inwoner.accounts.tests.factories import DigidUserFactory
-from open_inwoner.openklant.models import ContactFormSubject, OpenKlantConfig
+from open_inwoner.accounts.tests.factories import UserFactory
+from open_inwoner.openklant.models import OpenKlantConfig
 from open_inwoner.openklant.tests.data import MockAPICreateData
 from open_inwoner.openklant.tests.factories import ContactFormSubjectFactory
 from open_inwoner.openzaak.tests.factories import ServiceFactory
 from open_inwoner.utils.test import ClearCachesMixin, DisableRequestLogMixin
+from open_inwoner.utils.tests.helpers import AssertFormMixin, AssertTimelineLogMixin
 
 
 @requests_mock.Mocker()
-class ContactFormTestCase(ClearCachesMixin, DisableRequestLogMixin, WebTest):
+class ContactFormTestCase(
+    ClearCachesMixin,
+    AssertTimelineLogMixin,
+    AssertFormMixin,
+    DisableRequestLogMixin,
+    WebTest,
+):
     @classmethod
     def setUpTestData(cls):
         super().setUpTestData()
@@ -68,7 +77,7 @@ def test_no_form_shown_if_not_has_configuration(self, m):
         self.assertContains(response, _("Contact formulier niet geconfigureerd."))
         self.assertEqual(0, len(response.pyquery("#contactmoment-form")))
 
-    def test_form_requires_either_email_or_phonenumber(self, m):
+    def test_anon_form_requires_either_email_or_phonenumber(self, m):
         config = OpenKlantConfig.get_solo()
         config.register_email = "example@example.com"
         config.save()
@@ -76,6 +85,18 @@ def test_form_requires_either_email_or_phonenumber(self, m):
 
         response = self.app.get(self.url)
         form = response.forms["contactmoment-form"]
+        self.assertFormExactFields(
+            form,
+            (
+                "subject",
+                "first_name",
+                "infix",
+                "last_name",
+                "email",
+                "phonenumber",
+                "question",
+            ),
+        )
         form["subject"].select(text=subject.subject)
         form["first_name"] = "Foo"
         form["last_name"] = "Bar"
@@ -88,6 +109,28 @@ def test_form_requires_either_email_or_phonenumber(self, m):
             response.context["errors"], [_("Vul een e-mailadres of telefoonnummer in.")]
         )
 
+    def test_regular_auth_form_fills_email_and_phonenumber(self, m):
+        config = OpenKlantConfig.get_solo()
+        config.register_email = "example@example.com"
+        config.save()
+        subject = ContactFormSubjectFactory(config=config)
+
+        user = UserFactory()
+
+        response = self.app.get(self.url, user=user)
+        form = response.forms["contactmoment-form"]
+        self.assertFormExactFields(
+            form,
+            (
+                "subject",
+                "question",
+            ),
+        )
+        form["subject"].select(text=subject.subject)
+        form["question"] = "hey!\n\nwaddup?"
+
+        response = form.submit(status=302)
+
     def test_submit_and_register_via_email(self, m):
         config = OpenKlantConfig.get_solo()
         config.register_email = "example@example.com"
@@ -123,7 +166,9 @@ def test_submit_and_register_via_email(self, m):
         self.assertIn("0612345678", email.body)
         self.assertIn("hey!\n\nwaddup?", email.body)
 
-    def test_submit_and_register_anon_via_api(self, m):
+        self.assertTimelineLog("registered contactmoment by email")
+
+    def test_submit_and_register_anon_via_api_with_klant(self, m):
         MockAPICreateData.setUpServices()
 
         config = OpenKlantConfig.get_solo()
@@ -134,9 +179,9 @@ def test_submit_and_register_anon_via_api(self, m):
         config.save()
 
         data = MockAPICreateData()
-        data.install_mocks_anon(m)
+        data.install_mocks_anon_with_klant(m)
 
-        subject = ContactFormSubjectFactory(config=config, subject="Vraag")
+        subject = ContactFormSubjectFactory(config=config, subject="Aanvraag document")
 
         response = self.app.get(self.url)
         form = response.forms["contactmoment-form"]
@@ -178,7 +223,7 @@ def test_submit_and_register_anon_via_api(self, m):
             {
                 "medewerkerIdentificatie": {"identificatie": "FooVonBar"},
                 "bronorganisatie": "123456789",
-                "tekst": f"Vraag\n\nhey!\n\nwaddup?",
+                "tekst": f"Aanvraag document\n\nhey!\n\nwaddup?",
                 "type": "Melding",
                 "kanaal": "Internet",
             },
@@ -191,8 +236,10 @@ def test_submit_and_register_anon_via_api(self, m):
                 "klant": "https://klanten.nl/api/v1/klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
             },
         )
+        self.assertTimelineLog("created klant for anonymous user")
+        self.assertTimelineLog("registered contactmoment by API")
 
-    def test_submit_and_register_bsn_user_via_api(self, m):
+    def test_submit_and_register_anon_via_api_without_klant(self, m):
         MockAPICreateData.setUpServices()
 
         config = OpenKlantConfig.get_solo()
@@ -203,11 +250,11 @@ def test_submit_and_register_bsn_user_via_api(self, m):
         config.save()
 
         data = MockAPICreateData()
-        data.install_mocks_digid(m)
+        data.install_mocks_anon_without_klant(m)
 
-        subject = ContactFormSubjectFactory(config=config, subject="Vraag")
+        subject = ContactFormSubjectFactory(config=config, subject="Aanvraag document")
 
-        response = self.app.get(self.url, user=data.user)
+        response = self.app.get(self.url)
         form = response.forms["contactmoment-form"]
         form["subject"].select(text=subject.subject)
         form["first_name"] = "Foo"
@@ -226,6 +273,76 @@ def test_submit_and_register_bsn_user_via_api(self, m):
 
         self.assertEqual(len(mail.outbox), 0)
 
+        for m in data.matchers:
+            self.assertTrue(m.called_once, str(m))
+
+        contactmoment_create_data = data.matchers[1].request_history[0].json()
+
+        text = inspect.cleandoc(
+            """
+        Aanvraag document
+
+        hey!
+
+        waddup?
+
+        Naam: Foo de Bar
+        Email: foo@example.com
+        Telefoonnummer: 0612345678
+        """
+        )
+
+        self.assertEqual(
+            contactmoment_create_data,
+            {
+                "medewerkerIdentificatie": {"identificatie": "FooVonBar"},
+                "bronorganisatie": "123456789",
+                "tekst": text,
+                "type": "Melding",
+                "kanaal": "Internet",
+            },
+        )
+        self.assertTimelineLog(
+            "could not retrieve or create klant for user, appended info to message"
+        )
+        self.assertTimelineLog("registered contactmoment by API")
+
+    def test_submit_and_register_bsn_user_via_api(self, m):
+        MockAPICreateData.setUpServices()
+
+        config = OpenKlantConfig.get_solo()
+        config.register_contact_moment = True
+        config.register_bronorganisatie_rsin = "123456789"
+        config.register_type = "Melding"
+        config.register_employee_id = "FooVonBar"
+        config.save()
+
+        data = MockAPICreateData()
+        data.install_mocks_digid(m)
+
+        subject = ContactFormSubjectFactory(config=config, subject="Aanvraag document")
+
+        response = self.app.get(self.url, user=data.user)
+        form = response.forms["contactmoment-form"]
+        self.assertFormExactFields(
+            form,
+            (
+                "subject",
+                "question",
+            ),
+        )
+        form["subject"].select(text=subject.subject)
+        form["question"] = "hey!\n\nwaddup?"
+
+        response = form.submit().follow()
+
+        msgs = list(response.context["messages"])
+        self.assertEqual(len(msgs), 1)
+        self.assertEqual(str(msgs[0]), _("Vraag verstuurd!"))
+        self.assertEqual(msgs[0].level, messages.SUCCESS)
+
+        self.assertEqual(len(mail.outbox), 0)
+
         for m in data.matchers:
             self.assertTrue(m.called_once, str(m))
 
@@ -235,7 +352,7 @@ def test_submit_and_register_bsn_user_via_api(self, m):
             {
                 "medewerkerIdentificatie": {"identificatie": "FooVonBar"},
                 "bronorganisatie": "123456789",
-                "tekst": f"Vraag\n\nhey!\n\nwaddup?",
+                "tekst": f"Aanvraag document\n\nhey!\n\nwaddup?",
                 "type": "Melding",
                 "kanaal": "Internet",
             },
@@ -248,3 +365,74 @@ def test_submit_and_register_bsn_user_via_api(self, m):
                 "klant": "https://klanten.nl/api/v1/klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
             },
         )
+
+        self.assertTimelineLog("retrieved klant for BSN-user")
+        self.assertTimelineLog("registered contactmoment by API")
+
+    def test_submit_and_register_bsn_user_via_api_and_update_klant(self, m):
+        MockAPICreateData.setUpServices()
+
+        config = OpenKlantConfig.get_solo()
+        config.register_contact_moment = True
+        config.register_bronorganisatie_rsin = "123456789"
+        config.register_type = "Melding"
+        config.register_employee_id = "FooVonBar"
+        config.save()
+
+        data = MockAPICreateData()
+        data.install_mocks_digid_missing_contact_info(m)
+
+        subject = ContactFormSubjectFactory(config=config, subject="Aanvraag document")
+
+        response = self.app.get(self.url, user=data.user)
+        form = response.forms["contactmoment-form"]
+        self.assertFormExactFields(
+            form,
+            (
+                "subject",
+                "question",
+            ),
+        )
+        form["subject"].select(text=subject.subject)
+        form["question"] = "hey!\n\nwaddup?"
+
+        form.submit().follow()
+        # response tested in other cases
+
+        for m in data.matchers:
+            self.assertTrue(m.called_once, str(m))
+
+        klant_patch_data = data.matchers[1].request_history[0].json()
+        self.assertEqual(
+            klant_patch_data,
+            {
+                "emailadres": data.user.email,
+                "telefoonnummer": data.user.phonenumber,
+            },
+        )
+
+        contactmoment_create_data = data.matchers[2].request_history[0].json()
+        self.assertEqual(
+            contactmoment_create_data,
+            {
+                "medewerkerIdentificatie": {"identificatie": "FooVonBar"},
+                "bronorganisatie": "123456789",
+                "tekst": f"Aanvraag document\n\nhey!\n\nwaddup?",
+                "type": "Melding",
+                "kanaal": "Internet",
+            },
+        )
+        kcm_create_data = data.matchers[3].request_history[0].json()
+        self.assertEqual(
+            kcm_create_data,
+            {
+                "contactmoment": "https://contactmomenten.nl/api/v1/contactmoment/aaaaaaaa-aaaa-aaaa-aaaa-bbbbbbbbbbbb",
+                "klant": "https://klanten.nl/api/v1/klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            },
+        )
+
+        self.assertTimelineLog("retrieved klant for BSN-user")
+        self.assertTimelineLog(
+            "patched klant from user with missing fields: emailadres, telefoonnummer"
+        )
+        self.assertTimelineLog("registered contactmoment by API")
diff --git a/src/open_inwoner/openklant/views/contactform.py b/src/open_inwoner/openklant/views/contactform.py
index 44e95d8143..bb2da551db 100644
--- a/src/open_inwoner/openklant/views/contactform.py
+++ b/src/open_inwoner/openklant/views/contactform.py
@@ -1,6 +1,3 @@
-import re
-from typing import Tuple
-
 from django.contrib import messages
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
@@ -8,6 +5,7 @@
 
 from mail_editor.helpers import find_template
 from view_breadcrumbs import BaseBreadcrumbMixin
+from zds_client import ClientError
 
 from open_inwoner.openklant.forms import ContactForm
 from open_inwoner.openklant.models import OpenKlantConfig
@@ -15,11 +13,12 @@
     create_contactmoment,
     create_klant,
     fetch_klant_for_bsn,
+    patch_klant,
 )
-from open_inwoner.utils.views import CommonPageMixin
+from open_inwoner.utils.views import CommonPageMixin, LogMixin
 
 
-class ContactFormView(CommonPageMixin, BaseBreadcrumbMixin, FormView):
+class ContactFormView(CommonPageMixin, LogMixin, BaseBreadcrumbMixin, FormView):
     form_class = ContactForm
     template_name = "pages/contactform/form.html"
 
@@ -36,6 +35,15 @@ def page_title(self):
     def get_success_url(self):
         return self.request.path
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs.update(
+            {
+                "user": self.request.user,
+            }
+        )
+        return kwargs
+
     def get_initial(self):
         initial = super().get_initial()
         if self.request.user.is_authenticated:
@@ -44,7 +52,7 @@ def get_initial(self):
                     "first_name": self.request.user.first_name,
                     "infix": self.request.user.infix,
                     "last_name": self.request.user.last_name,
-                    "email": self.request.user.email,
+                    "email": self.request.user.get_contact_email(),
                     "phonenumber": self.request.user.phonenumber,
                 }
             )
@@ -84,20 +92,36 @@ def register_by_email(self, form, recipient_email):
 
         if success:
             messages.add_message(self.request, messages.SUCCESS, self.message_success)
+            self.log_system_action(f"registered contactmoment by email")
         else:
             messages.add_message(self.request, messages.ERROR, self.message_failure)
+            self.log_system_action(f"error while registering contactmoment by email")
 
     def register_by_api(self, form, config: OpenKlantConfig):
-        assert config.has_form_configuration()
+        assert config.has_api_configuration()
 
         # fetch/update/create klant
         if self.request.user.is_authenticated and self.request.user.bsn:
             klant = fetch_klant_for_bsn(self.request.user.bsn)
+            if klant:
+                self.log_system_action(f"retrieved klant for BSN-user")
+
+                # check if we have some data missing from the Klant
+                update_data = {}
+                if not klant.emailadres and form.cleaned_data["email"]:
+                    update_data["emailadres"] = form.cleaned_data["email"]
+                if not klant.telefoonnummer and form.cleaned_data["phonenumber"]:
+                    update_data["telefoonnummer"] = form.cleaned_data["phonenumber"]
+                if update_data:
+                    # TODO add audit log
+                    patch_klant(klant, update_data)
+                    self.log_system_action(
+                        f"patched klant from user with missing fields: {', '.join(sorted(update_data.keys()))}"
+                    )
+            else:
+                self.log_system_action(f"could not retrieve klant for BSN-user")
 
-            # TODO update klant phone/email? (other ticket)
         else:
-            # TODO according to taiga #1437 we should disable Klanten/Contacten API if Digid is not enabled
-            # TODO registering klanten won't work in e-Suite as it always pulls from BRP
             data = {
                 "bronorganisatie": config.register_bronorganisatie_rsin,
                 "voornaam": form.cleaned_data["first_name"],
@@ -106,15 +130,42 @@ def register_by_api(self, form, config: OpenKlantConfig):
                 "emailadres": form.cleaned_data["email"],
                 "telefoonnummer": form.cleaned_data["phonenumber"],
             }
+            # registering klanten won't work in e-Suite as it always pulls from BRP (but try anyway and fallback to appending details to tekst if fails)
             klant = create_klant(data)
+            if klant:
+                if self.request.user.is_authenticated:
+                    self.log_system_action(
+                        f"created klant for basic authenticated user"
+                    )
+                else:
+                    self.log_system_action(f"created klant for anonymous user")
 
         # create contact moment
         subject = form.cleaned_data["subject"].subject
-        body = form.cleaned_data["question"]
+        question = form.cleaned_data["question"]
+        text = f"{subject}\n\n{question}"
+
+        if not klant:
+            # TODO add audit log to note we didn't have a Klant and appended the info to the message
+
+            # if we don't have a BSN and can't create a Klant we'll add contact info to the tekst
+            parts = [form.cleaned_data[k] for k in ("first_name", "infix", "last_name")]
+            full_name = " ".join(p for p in parts if p)
+            text = f"{text}\n\nNaam: {full_name}"
+
+            if form.cleaned_data["email"]:
+                text = f"{text}\nEmail: {form.cleaned_data['email']}"
+
+            if form.cleaned_data["phonenumber"]:
+                text = f"{text}\nTelefoonnummer: {form.cleaned_data['phonenumber']}"
+
+            self.log_system_action(
+                f"could not retrieve or create klant for user, appended info to message"
+            )
 
         data = {
             "bronorganisatie": config.register_bronorganisatie_rsin,
-            "tekst": f"{subject}\n\n{body}",
+            "tekst": text,
             "type": config.register_type,
             "kanaal": "Internet",
             "medewerkerIdentificatie": {
@@ -125,5 +176,7 @@ def register_by_api(self, form, config: OpenKlantConfig):
 
         if contactmoment:
             messages.add_message(self.request, messages.SUCCESS, self.message_success)
+            self.log_system_action(f"registered contactmoment by API")
         else:
             messages.add_message(self.request, messages.ERROR, self.message_failure)
+            self.log_system_action(f"error while registering contactmoment by API")
diff --git a/src/open_inwoner/openklant/wrap.py b/src/open_inwoner/openklant/wrap.py
index 066e3cd0b6..96bb01606e 100644
--- a/src/open_inwoner/openklant/wrap.py
+++ b/src/open_inwoner/openklant/wrap.py
@@ -145,7 +145,7 @@ def _fetch_contactmoment(url, *, client=None) -> Optional[ContactMoment]:
     return contact_moment
 
 
-def create_klant(data: KlantCreateData):
+def create_klant(data: KlantCreateData) -> Optional[Klant]:
     client = build_client("klanten")
     if client is None:
         return
@@ -155,6 +155,26 @@ def create_klant(data: KlantCreateData):
     except (RequestException, ClientError) as e:
         logger.exception("exception while making request", exc_info=e)
         return
+    except ValueError as e:
+        # raised when 'Operation klant_create not found
+        # TODO make this optional?
+        return
+
+    klant = factory(Klant, response)
+
+    return klant
+
+
+def patch_klant(klant: Klant, update_data) -> Optional[Klant]:
+    client = build_client("klanten")
+    if client is None:
+        return
+
+    try:
+        response = client.partial_update("klant", url=klant.url, data=update_data)
+    except (RequestException, ClientError) as e:
+        logger.exception("exception while making request", exc_info=e)
+        return
 
     klant = factory(Klant, response)
 
diff --git a/src/open_inwoner/utils/tests/helpers.py b/src/open_inwoner/utils/tests/helpers.py
index 97bee1b8f9..957666b6d2 100644
--- a/src/open_inwoner/utils/tests/helpers.py
+++ b/src/open_inwoner/utils/tests/helpers.py
@@ -58,7 +58,11 @@ def getTimelineLogDump(self) -> str:
         ret = []
         qs = TimelineLog.objects.all()
         c = qs.count()
-        ret.append(f"total {c} timelinelogs")
+        if c:
+            ret.append(f"total {c} timelinelogs:")
+        else:
+            ret.append(f"total {c} timelinelogs")
+
         for log in qs:
             message = log.extra_data.get("message")
             log_level = log.extra_data.get("log_level")
@@ -66,7 +70,7 @@ def getTimelineLogDump(self) -> str:
                 log_level = logging.getLevelName(log_level)
             else:
                 log_level = "NO_LEVEL"
-            msg = f"{log_level}: {message}"
+            msg = f"  {log_level}: {message}"
             ret.append(msg)
         return "\n".join(ret)
 
@@ -74,6 +78,31 @@ def dumpTimelineLog(self):
         print(self.getTimelineLogDump())
 
 
+class AssertFormMixin:
+    def assertFormExactFields(
+        self, form, field_names, *, with_csrf=True, drop_no_name=True
+    ):
+        """
+        check if a form has expected fields, usually from WebTest
+
+        - with_csrf: auto-adds adds the csrfmiddlewaretoken
+        - drop_no_name: ignore the empty field created by the submit button
+        """
+        expect_names = set(field_names)
+        if with_csrf:
+            expect_names.add("csrfmiddlewaretoken")
+
+        have_names = set(form.fields.keys())
+        if drop_no_name:
+            have_names.discard("")
+
+        self.assertEqual(
+            have_names,
+            expect_names,
+            "-> first set is actual in form, second set is expected",
+        )
+
+
 class AssertRedirectsMixin:
     def assertRedirectsLogin(
         self, response, *, next: str = None, with_host: bool = False

From c0d3054c6273ab763f4cfba6e3c0bf5d793984d8 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Thu, 8 Jun 2023 21:01:16 +0200
Subject: [PATCH 17/60] [#1525] Disabling hijack

---
 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 423b16c717..0b58ed5cd0 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -161,13 +161,13 @@
     "sniplates",
     "digid_eherkenning",
     # "hijack.contrib.admin", # This should be imported but it causes an error. So now there are
-    "hijack",
+    # "hijack",
     "localflavor",
     "easy_thumbnails",  # used by filer
     "image_cropping",
     "filer",
     "mptt",
-    "hijack.contrib.admin",
+    # "hijack.contrib.admin",
     "django_elasticsearch_dsl",
     "import_export",
     "solo",

From 744dde65d77001b71f56b87052f4ed9769539dcb Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Fri, 9 Jun 2023 08:57:32 +0200
Subject: [PATCH 18/60] [#1437 #1457] Cleaned up some comments and todos

---
 src/open_inwoner/openklant/forms.py             | 1 +
 src/open_inwoner/openklant/views/contactform.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/open_inwoner/openklant/forms.py b/src/open_inwoner/openklant/forms.py
index b705cf5bfe..bdb4564736 100644
--- a/src/open_inwoner/openklant/forms.py
+++ b/src/open_inwoner/openklant/forms.py
@@ -79,6 +79,7 @@ def clean(self, *args, **kwargs):
             self.add_error("phonenumber", msg)
 
         if self.user.is_authenticated:
+            # we need to use get_contact_email() because we use dummy email for BSN users
             if not email and self.user.get_contact_email():
                 cleaned_data["email"] = self.user.get_contact_email()
             if not phonenumber and self.user.phonenumber:
diff --git a/src/open_inwoner/openklant/views/contactform.py b/src/open_inwoner/openklant/views/contactform.py
index bb2da551db..fd37e9bdf9 100644
--- a/src/open_inwoner/openklant/views/contactform.py
+++ b/src/open_inwoner/openklant/views/contactform.py
@@ -52,6 +52,7 @@ def get_initial(self):
                     "first_name": self.request.user.first_name,
                     "infix": self.request.user.infix,
                     "last_name": self.request.user.last_name,
+                    # we need to use get_contact_email() because we use dummy email for BSN users
                     "email": self.request.user.get_contact_email(),
                     "phonenumber": self.request.user.phonenumber,
                 }
@@ -113,7 +114,6 @@ def register_by_api(self, form, config: OpenKlantConfig):
                 if not klant.telefoonnummer and form.cleaned_data["phonenumber"]:
                     update_data["telefoonnummer"] = form.cleaned_data["phonenumber"]
                 if update_data:
-                    # TODO add audit log
                     patch_klant(klant, update_data)
                     self.log_system_action(
                         f"patched klant from user with missing fields: {', '.join(sorted(update_data.keys()))}"
@@ -146,8 +146,6 @@ def register_by_api(self, form, config: OpenKlantConfig):
         text = f"{subject}\n\n{question}"
 
         if not klant:
-            # TODO add audit log to note we didn't have a Klant and appended the info to the message
-
             # if we don't have a BSN and can't create a Klant we'll add contact info to the tekst
             parts = [form.cleaned_data[k] for k in ("first_name", "infix", "last_name")]
             full_name = " ".join(p for p in parts if p)

From 6d580c4f81eb4c46b51a4221a41924d0227cd2da Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Thu, 8 Jun 2023 12:38:49 +0200
Subject: [PATCH 19/60] :bug: [#1523] Set empty confirmation text if it is
 undefined for confirmation modals

---
 src/open_inwoner/js/components/confirmation/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/open_inwoner/js/components/confirmation/index.js b/src/open_inwoner/js/components/confirmation/index.js
index 3eb5e68b2d..2dd7b877a3 100644
--- a/src/open_inwoner/js/components/confirmation/index.js
+++ b/src/open_inwoner/js/components/confirmation/index.js
@@ -13,7 +13,8 @@ class Confirmation {
       const modalId = document.getElementById('modal')
       const modal = new Modal(modalId)
       modal.setTitle(this.form.dataset.confirmTitle)
-      modal.setText(this.form.dataset.confirmText)
+      // Only show confirmation if text is set
+      modal.setText(this.form.dataset.confirmText || '')
       modal.setClose(this.form.dataset.confirmCancel)
       modal.setConfirm(
         this.form.dataset.confirmDefault,

From 491c5dc04d4ae393cbfb4face738dc373fbe3a7b Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Thu, 8 Jun 2023 11:16:16 +0200
Subject: [PATCH 20/60] :lipstick: [#1498] Added missing icons to plan-edit
 actions and edit-plans view

---
 .../scss/components/Form/DocumentUpload.scss  |  17 ++-
 .../scss/components/Plan/PlanCreate.scss      |  12 ++
 .../scss/components/Plan/PlanEdit.scss        |  22 +++
 src/open_inwoner/scss/components/_index.scss  |   2 +
 .../templates/pages/plans/create.html         | 128 +++++++++---------
 .../templates/pages/profile/actions/edit.html |  44 +++---
 6 files changed, 137 insertions(+), 88 deletions(-)
 create mode 100644 src/open_inwoner/scss/components/Plan/PlanCreate.scss
 create mode 100644 src/open_inwoner/scss/components/Plan/PlanEdit.scss

diff --git a/src/open_inwoner/scss/components/Form/DocumentUpload.scss b/src/open_inwoner/scss/components/Form/DocumentUpload.scss
index ec028f6a48..e170de5eaf 100644
--- a/src/open_inwoner/scss/components/Form/DocumentUpload.scss
+++ b/src/open_inwoner/scss/components/Form/DocumentUpload.scss
@@ -43,13 +43,18 @@ input[type='file'] {
   color: var(--color-primary-lighter);
   border: 1px solid var(--color-mute);
   border-radius: var(--border-radius);
-  display: flex;
-  flex-direction: column;
-  min-width: var(--mobile-xs-width);
+  display: inline-block;
+  min-width: 100%;
   max-width: 500px;
   padding: 0;
   overflow: hidden;
   cursor: pointer;
+
+  @media (min-width: 768px) {
+    display: flex;
+    flex-direction: column;
+    min-width: 500px;
+  }
 }
 
 /// File-input button site wide
@@ -69,7 +74,11 @@ input[type='file']::file-selector-button {
   white-space: nowrap;
   padding: 0 12px 0 12px;
   margin: 0 12px 0 0;
-  width: 200px;
+  width: 150px;
+
+  @media (min-width: 768px) {
+    width: 200px;
+  }
 }
 
 .button-row .upload-button--disabled {
diff --git a/src/open_inwoner/scss/components/Plan/PlanCreate.scss b/src/open_inwoner/scss/components/Plan/PlanCreate.scss
new file mode 100644
index 0000000000..d2b7ed7f61
--- /dev/null
+++ b/src/open_inwoner/scss/components/Plan/PlanCreate.scss
@@ -0,0 +1,12 @@
+.plan-create {
+  .form__control {
+    .label {
+      position: relative;
+      max-width: 500px;
+    }
+
+    [class*='icon'] {
+      right: 10px;
+    }
+  }
+}
diff --git a/src/open_inwoner/scss/components/Plan/PlanEdit.scss b/src/open_inwoner/scss/components/Plan/PlanEdit.scss
new file mode 100644
index 0000000000..d62c3a9ed6
--- /dev/null
+++ b/src/open_inwoner/scss/components/Plan/PlanEdit.scss
@@ -0,0 +1,22 @@
+.plan-edit {
+  .form {
+    max-width: 500px;
+    .form__control [class*='icon'] {
+      transform: initial;
+    }
+  }
+
+  @media (min-width: 768px) {
+    .form {
+      max-width: 100%;
+      .form__control > .label {
+        input[type='file'] {
+          min-width: 100%;
+        }
+        .input {
+          max-width: 500px;
+        }
+      }
+    }
+  }
+}
diff --git a/src/open_inwoner/scss/components/_index.scss b/src/open_inwoner/scss/components/_index.scss
index 2ce6859591..651e005045 100644
--- a/src/open_inwoner/scss/components/_index.scss
+++ b/src/open_inwoner/scss/components/_index.scss
@@ -58,6 +58,8 @@
 @import './Notification/Notifications.scss';
 @import './Pagination/Pagination.scss';
 @import './Plan/PlanContact.scss';
+@import './Plan/PlanCreate.scss';
+@import './Plan/PlanEdit.scss';
 @import './Plan/PlanFile.scss';
 @import './Plan/PlanList.scss';
 @import './Product/product-filter.scss';
diff --git a/src/open_inwoner/templates/pages/plans/create.html b/src/open_inwoner/templates/pages/plans/create.html
index 5edf1cfd88..c1a8a877af 100644
--- a/src/open_inwoner/templates/pages/plans/create.html
+++ b/src/open_inwoner/templates/pages/plans/create.html
@@ -2,77 +2,79 @@
 {% load i18n button_tags card_tags map_tags form_tags grid_tags icon_tags string_tags link_tags %}
 
 {% block content %}
-    <h1 class="h1">{% trans "Samenwerken" %}</h1>
-    {% optional_paragraph configurable_text.plans_page.plans_intro %}
+    <div class="plan-create">
+        <h1 class="h1">{% trans "Start nieuwe samenwerking" %}</h1>
+        {% optional_paragraph configurable_text.plans_page.plans_intro %}
 
-    {% if request.user.get_active_contacts %}
-        {% render_form id="plan-form" form=form method="POST" %}
-        {% csrf_token %}
-        {% input form.title %}
-        {% input form.goal %}
-        {% input form.description %}
-        {% render_grid %}
-        {% checkboxes form.plan_contacts %}
-        {% date_field form.end_date %}
-        {% endrender_grid %}
+        {% if request.user.get_active_contacts %}
+            {% render_form id="plan-form" form=form method="POST" %}
+            {% csrf_token %}
+            {% input form.title %}
+            {% input form.goal %}
+            {% input form.description %}
+            {% render_grid %}
+            {% checkboxes form.plan_contacts %}
+            {% date_field form.end_date icon="today" icon_position="after" %}
+            {% endrender_grid %}
 
-        <div class="">
-            <div class="plan-template">
-                <div class="plan-template__header">
-                    <div>{% trans "Templates" %}</div>
-                    <div>{% trans "Doel" %}</div>
-                    <div></div>
-                </div>
-                <label class="plan-template__row radio">
-                    <div>
-                        <input class="radio__input" type="radio" name="template" value="" id="id_template_0" {% if not form.data.template %}checked{% endif %}>
-                        <label class="radio__label" for="id_template_0">Geen template</label>
+            <div class="">
+                <div class="plan-template">
+                    <div class="plan-template__header">
+                        <div>{% trans "Templates" %}</div>
+                        <div>{% trans "Doel" %}</div>
+                        <div></div>
                     </div>
-                    <div></div>
-                    <div></div>
-                </label>
-                {% for tpl_id, plan_template in form.template.field.choices %}
                     <label class="plan-template__row radio">
                         <div>
-                            <input class="radio__input" type="radio" name="template" value="{{ plan_template.id }}" id="id_template_{{ plan_template.id }}"
-                                   {% if tpl_id == form.data.template %}checked{% endif %}>
-                            <label class="radio__label" for="id_template_{{ plan_template.id }}">{{ plan_template.name }}</label>
-                        </div>
-                        <div>
-                            {{ plan_template.goal|truncatewords:8 }}
+                            <input class="radio__input" type="radio" name="template" value="" id="id_template_0" {% if not form.data.template %}checked{% endif %}>
+                            <label class="radio__label" for="id_template_0">Geen template</label>
                         </div>
-                        <div class="plan-template__icon">
-                            <div class="show-preview" data-id="template-{{ plan_template.id }}">
-                                {% icon icon="visibility" outlined=True %}
+                        <div></div>
+                        <div></div>
+                    </label>
+                    {% for tpl_id, plan_template in form.template.field.choices %}
+                        <label class="plan-template__row radio">
+                            <div>
+                                <input class="radio__input" type="radio" name="template" value="{{ plan_template.id }}" id="id_template_{{ plan_template.id }}"
+                                       {% if tpl_id == form.data.template %}checked{% endif %}>
+                                <label class="radio__label" for="id_template_{{ plan_template.id }}">{{ plan_template.name }}</label>
                             </div>
-                        </div>
-                        <div class="modal modal--no-reset" id="template-{{ plan_template.id }}">
-                            <div class="modal__container">
-                                <h2 class="h2 modal__title" id="modal__title">{{ plan_template.name }}
-                                    {% button text=_("Sluiten") hide_text=True icon="close" extra_classes="modal__button modal__close-title" %}
-                                </h2>
-                                <div class="modal__text" id="modal__text">{{ plan_template.string_preview }}</div>
-                                <div class="modal__actions modal__actions--align-right" id="modal__actions">
-                                    {% spaceless %}
-                                        {% button text=_("Sluiten") extra_classes="modal__button modal__close" primary=True %}
-                                    {% endspaceless %}
+                            <div>
+                                {{ plan_template.goal|truncatewords:8 }}
+                            </div>
+                            <div class="plan-template__icon">
+                                <div class="show-preview" data-id="template-{{ plan_template.id }}">
+                                    {% icon icon="visibility" outlined=True %}
                                 </div>
                             </div>
-                        </div>
-                    </label>
-                {% endfor %}
-            </div>
+                            <div class="modal modal--no-reset" id="template-{{ plan_template.id }}">
+                                <div class="modal__container">
+                                    <h2 class="h2 modal__title" id="modal__title">{{ plan_template.name }}
+                                        {% button text=_("Sluiten") hide_text=True icon="close" extra_classes="modal__button modal__close-title" %}
+                                    </h2>
+                                    <div class="modal__text" id="modal__text">{{ plan_template.string_preview }}</div>
+                                    <div class="modal__actions modal__actions--align-right" id="modal__actions">
+                                        {% spaceless %}
+                                            {% button text=_("Sluiten") extra_classes="modal__button modal__close" primary=True %}
+                                        {% endspaceless %}
+                                    </div>
+                                </div>
+                            </div>
+                        </label>
+                    {% endfor %}
+                </div>
 
-            {% if form.template.errors %}
-                {% errors errors=form.template.errors %}
-            {% endif %}
-        </div>
-        {% form_actions primary_text=_("Verzenden") primary_icon="arrow_forward" %}
-    {% endrender_form %}
-    {% else %}
-        <div class="p">
-            {% url 'profile:contact_create' as contact_create %}
-            {% link href=contact_create text=_("Maak je eerste contact aan voordat je een samenwerking start") icon="arrow_forward" icon_position="after" primary=True %}
-        </div>
-    {% endif %}
+                {% if form.template.errors %}
+                    {% errors errors=form.template.errors %}
+                {% endif %}
+            </div>
+            {% form_actions primary_text=_("Verzenden") primary_icon="arrow_forward" %}
+        {% endrender_form %}
+        {% else %}
+            <div class="p">
+                {% url 'profile:contact_create' as contact_create %}
+                {% link href=contact_create text=_("Maak je eerste contact aan voordat je een samenwerking start") icon="arrow_forward" icon_position="after" primary=True %}
+            </div>
+        {% endif %}
+    </div>
 {% endblock %}
diff --git a/src/open_inwoner/templates/pages/profile/actions/edit.html b/src/open_inwoner/templates/pages/profile/actions/edit.html
index 2a8abe1062..8cd061ebfd 100644
--- a/src/open_inwoner/templates/pages/profile/actions/edit.html
+++ b/src/open_inwoner/templates/pages/profile/actions/edit.html
@@ -3,27 +3,29 @@
 
 
 {% block content %}
-<h1 class="h1">
-    {% if object.pk %}
-        {% trans "Wijzig actie" %}
-    {% else %}
-        {% trans "Creeer actie" %}
-    {% endif %}
-</h1>
+    <div class="plan-edit">
+        <h1 class="h1">
+            {% if object.pk %}
+                {% trans "Wijzig actie" %}
+            {% else %}
+                {% trans "Creeer actie" %}
+            {% endif %}
+        </h1>
 
-{% render_form id="action-create" form=form method="POST" enctype="multipart/form-data" %}
-    {% csrf_token %}
-    {% input form.name no_help=True %}
-    {% input form.description no_help=True %}
-    {% render_grid %}
-        {% input form.status no_help=True %}
-        {% date_field form.end_date no_help=True %}
-    {% endrender_grid %}
-    {% render_grid %}
-        {% input form.is_for no_help=True %}
-        {% input form.file no_help=True %}
-    {% endrender_grid %}
+        {% render_form id="action-create" form=form method="POST" enctype="multipart/form-data" %}
+            {% csrf_token %}
+            {% input form.name no_help=True %}
+            {% input form.description no_help=True %}
+            {% render_grid %}
+                {% input form.status no_help=True icon="expand_more" icon_position="after" %}
+                {% date_field form.end_date no_help=True icon="today" icon_position="after" %}
+            {% endrender_grid %}
+            {% render_grid %}
+                {% input form.is_for no_help=True icon="person" icon_position="after" %}
+                {% input form.file no_help=True icon="file_upload" outlined=True icon_position="after" %}
+            {% endrender_grid %}
 
-    {% form_actions primary_text=_("Actie opslaan") %}
-{% endrender_form %}
+            {% form_actions primary_text=_("Actie opslaan") %}
+        {% endrender_form %}
+    </div>
 {% endblock content %}

From af598ecbfb796dbf1612d9a55fb721fabc112e8a Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Mon, 12 Jun 2023 17:44:14 +0200
Subject: [PATCH 21/60] :lipstick: [#1498] Added common width for forms

---
 src/open_inwoner/scss/components/Form/DocumentUpload.scss     | 4 ++--
 src/open_inwoner/scss/components/Form/Form.scss               | 2 +-
 .../scss/components/Notification/_Notifications.scss          | 2 +-
 src/open_inwoner/scss/components/Plan/PlanCreate.scss         | 2 +-
 src/open_inwoner/scss/components/Plan/PlanEdit.scss           | 4 ++--
 src/open_inwoner/scss/views/App.scss                          | 3 +++
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/open_inwoner/scss/components/Form/DocumentUpload.scss b/src/open_inwoner/scss/components/Form/DocumentUpload.scss
index e170de5eaf..946921ab3a 100644
--- a/src/open_inwoner/scss/components/Form/DocumentUpload.scss
+++ b/src/open_inwoner/scss/components/Form/DocumentUpload.scss
@@ -45,7 +45,7 @@ input[type='file'] {
   border-radius: var(--border-radius);
   display: inline-block;
   min-width: 100%;
-  max-width: 500px;
+  max-width: var(--form-width);
   padding: 0;
   overflow: hidden;
   cursor: pointer;
@@ -53,7 +53,7 @@ input[type='file'] {
   @media (min-width: 768px) {
     display: flex;
     flex-direction: column;
-    min-width: 500px;
+    min-width: var(--form-width);
   }
 }
 
diff --git a/src/open_inwoner/scss/components/Form/Form.scss b/src/open_inwoner/scss/components/Form/Form.scss
index c316eb05f3..c4aa4bbce2 100644
--- a/src/open_inwoner/scss/components/Form/Form.scss
+++ b/src/open_inwoner/scss/components/Form/Form.scss
@@ -103,7 +103,7 @@
   @media (min-width: 360px) {
     &__control > .label .input,
     &__control > .label .input[type='file'] {
-      max-width: 500px;
+      max-width: var(--form-width);
     }
   }
 
diff --git a/src/open_inwoner/scss/components/Notification/_Notifications.scss b/src/open_inwoner/scss/components/Notification/_Notifications.scss
index 1ee14e14cb..114bc1a600 100644
--- a/src/open_inwoner/scss/components/Notification/_Notifications.scss
+++ b/src/open_inwoner/scss/components/Notification/_Notifications.scss
@@ -13,7 +13,7 @@
     top: 0;
     gap: 0;
     width: 100%;
-    max-width: 500px;
+    max-width: var(--form-width);
     margin: -2px var(--spacing-small) 0 0;
     padding: 0 0 var(--spacing-small) 0;
     border: none;
diff --git a/src/open_inwoner/scss/components/Plan/PlanCreate.scss b/src/open_inwoner/scss/components/Plan/PlanCreate.scss
index d2b7ed7f61..a31d1ecc91 100644
--- a/src/open_inwoner/scss/components/Plan/PlanCreate.scss
+++ b/src/open_inwoner/scss/components/Plan/PlanCreate.scss
@@ -2,7 +2,7 @@
   .form__control {
     .label {
       position: relative;
-      max-width: 500px;
+      max-width: var(--form-width);
     }
 
     [class*='icon'] {
diff --git a/src/open_inwoner/scss/components/Plan/PlanEdit.scss b/src/open_inwoner/scss/components/Plan/PlanEdit.scss
index d62c3a9ed6..ba7aa65978 100644
--- a/src/open_inwoner/scss/components/Plan/PlanEdit.scss
+++ b/src/open_inwoner/scss/components/Plan/PlanEdit.scss
@@ -1,6 +1,6 @@
 .plan-edit {
   .form {
-    max-width: 500px;
+    max-width: var(--form-width);
     .form__control [class*='icon'] {
       transform: initial;
     }
@@ -14,7 +14,7 @@
           min-width: 100%;
         }
         .input {
-          max-width: 500px;
+          max-width: var(--form-width);
         }
       }
     }
diff --git a/src/open_inwoner/scss/views/App.scss b/src/open_inwoner/scss/views/App.scss
index a867a14fd1..ae8b13a67f 100644
--- a/src/open_inwoner/scss/views/App.scss
+++ b/src/open_inwoner/scss/views/App.scss
@@ -235,6 +235,9 @@
   --spacing-large: 16px;
   --spacing-extra-large: 24px;
   --spacing-giant: 32px;
+
+  /// Common widths
+  --form-width: 500px;
 }
 
 @font-face {

From a27c45dde294b5f5bae80c6d51745972a7e9c795 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Tue, 13 Jun 2023 06:58:03 +0200
Subject: [PATCH 22/60] [#1439] Added htmx to cases and moved the views to cms

---
 src/open_inwoner/accounts/forms.py            |  54 ---
 src/open_inwoner/cms/cases/forms.py           |  59 +++
 src/open_inwoner/cms/cases/tests/__init__.py  |   0
 src/open_inwoner/cms/cases/tests/test_htmx.py | 382 ++++++++++++++++++
 src/open_inwoner/cms/cases/urls.py            |  43 +-
 src/open_inwoner/cms/cases/views/__init__.py  |   8 +
 src/open_inwoner/cms/cases/views/cases.py     | 121 ++++++
 src/open_inwoner/cms/cases/views/mixins.py    | 184 +++++++++
 .../cases.py => cms/cases/views/status.py}    | 248 +-----------
 .../cms/cases/views/submissions.py            |  72 ++++
 .../templates/components/Form/FileInput.html  |   2 +-
 .../templates/components/Form/Form.html       |   3 +
 .../components/Pagination/Pagination.html     |  45 ++-
 .../templatetags/pagination_tags.py           |   4 +-
 .../anchor-menu/anchor-menu-mobile.js         |   6 +-
 .../js/components/anchor-menu/anchor-menu.js  |  17 +-
 .../js/components/cases/document_upload.js    |  20 +
 src/open_inwoner/js/components/cases/index.js |  18 +-
 .../js/components/cases/spinner.js            |  11 +
 src/open_inwoner/js/components/index.js       |  37 +-
 .../js/components/notifications/index.js      |  10 +-
 .../upload-document/file-input-errors.js      |  40 +-
 .../upload-document/show-file-info.js         | 171 ++++----
 src/open_inwoner/openzaak/notifications.py    |   2 +-
 .../openzaak/tests/test_case_detail.py        |  65 +--
 src/open_inwoner/openzaak/tests/test_cases.py |  98 +++--
 .../openzaak/tests/test_cases_cache.py        |  22 +-
 .../openzaak/tests/test_documents.py          |   2 +-
 .../openzaak/tests/test_formapi.py            |  18 +-
 .../scss/components/Cases/Cases.scss          |   4 +
 .../scss/components/Form/DocumentUpload.scss  |   8 +
 .../scss/components/Spinner/Spinner.scss      |  31 ++
 src/open_inwoner/scss/components/_index.scss  |   1 +
 src/open_inwoner/templates/master.html        |  12 +-
 .../templates/pages/cases/403.html            |   4 +
 .../templates/pages/cases/list.html           |  44 --
 .../templates/pages/cases/list_inner.html     |  37 ++
 .../templates/pages/cases/list_outer.html     |  19 +
 .../templates/pages/cases/status.html         | 104 -----
 .../templates/pages/cases/status_inner.html   | 108 +++++
 .../templates/pages/cases/status_outer.html   |  25 ++
 .../templates/pages/cases/submissions.html    |  40 --
 .../pages/cases/submissions_inner.html        |  36 ++
 .../pages/cases/submissions_outer.html        |  20 +
 src/open_inwoner/utils/tests/playwright.py    |  25 +-
 45 files changed, 1565 insertions(+), 715 deletions(-)
 create mode 100644 src/open_inwoner/cms/cases/forms.py
 create mode 100644 src/open_inwoner/cms/cases/tests/__init__.py
 create mode 100644 src/open_inwoner/cms/cases/tests/test_htmx.py
 create mode 100644 src/open_inwoner/cms/cases/views/__init__.py
 create mode 100644 src/open_inwoner/cms/cases/views/cases.py
 create mode 100644 src/open_inwoner/cms/cases/views/mixins.py
 rename src/open_inwoner/{accounts/views/cases.py => cms/cases/views/status.py} (62%)
 create mode 100644 src/open_inwoner/cms/cases/views/submissions.py
 create mode 100644 src/open_inwoner/js/components/cases/document_upload.js
 create mode 100644 src/open_inwoner/js/components/cases/spinner.js
 create mode 100644 src/open_inwoner/scss/components/Spinner/Spinner.scss
 create mode 100644 src/open_inwoner/templates/pages/cases/403.html
 delete mode 100644 src/open_inwoner/templates/pages/cases/list.html
 create mode 100644 src/open_inwoner/templates/pages/cases/list_inner.html
 create mode 100644 src/open_inwoner/templates/pages/cases/list_outer.html
 delete mode 100644 src/open_inwoner/templates/pages/cases/status.html
 create mode 100644 src/open_inwoner/templates/pages/cases/status_inner.html
 create mode 100644 src/open_inwoner/templates/pages/cases/status_outer.html
 delete mode 100644 src/open_inwoner/templates/pages/cases/submissions.html
 create mode 100644 src/open_inwoner/templates/pages/cases/submissions_inner.html
 create mode 100644 src/open_inwoner/templates/pages/cases/submissions_outer.html

diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py
index 31ba28ba04..007d855468 100644
--- a/src/open_inwoner/accounts/forms.py
+++ b/src/open_inwoner/accounts/forms.py
@@ -1,5 +1,3 @@
-import os
-
 from django import forms
 from django.conf import settings
 from django.contrib.auth import authenticate
@@ -12,10 +10,6 @@
 from django_registration.forms import RegistrationForm
 
 from open_inwoner.configurations.models import SiteConfiguration
-from open_inwoner.openzaak.models import (
-    OpenZaakConfig,
-    ZaakTypeInformatieObjectTypeConfig,
-)
 from open_inwoner.pdc.models.category import Category
 from open_inwoner.utils.forms import LimitedUploadFileField, PrivateFileWidget
 from open_inwoner.utils.validators import (
@@ -551,51 +545,3 @@ class Meta:
     def __init__(self, users, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["is_for"].queryset = User.objects.filter(pk__in=users)
-
-
-class CaseUploadForm(forms.Form):
-    title = forms.CharField(
-        label=_("Titel document"), max_length=255, validators=[validate_charfield_entry]
-    )
-    type = forms.ModelChoiceField(
-        ZaakTypeInformatieObjectTypeConfig.objects.none(),
-        empty_label=None,
-        label=_("Bestand type"),
-    )
-    file = forms.FileField(label=_("Bestand"))
-
-    def __init__(self, case, **kwargs):
-        super().__init__(**kwargs)
-
-        if case:
-            self.fields[
-                "type"
-            ].queryset = ZaakTypeInformatieObjectTypeConfig.objects.filter_enabled_for_case_type(
-                case.zaaktype
-            )
-
-        choices = self.fields["type"].choices
-
-        if choices and len(choices) == 1:
-            self.fields["type"].initial = list(choices)[0][0].value
-            self.fields["type"].widget = forms.HiddenInput()
-
-    def clean_file(self):
-        file = self.cleaned_data["file"]
-
-        config = OpenZaakConfig.get_solo()
-        max_allowed_size = 1024**2 * config.max_upload_size
-        allowed_extensions = sorted(config.allowed_file_extensions)
-        filename, file_extension = os.path.splitext(file.name)
-
-        if file.size > max_allowed_size:
-            raise ValidationError(
-                f"Een aangeleverd bestand dient maximaal {config.max_upload_size} MB te zijn, uw bestand is te groot."
-            )
-
-        if file_extension.lower().replace(".", "") not in allowed_extensions:
-            raise ValidationError(
-                f"Het type bestand dat u hebt geüpload is ongeldig. Geldige bestandstypen zijn: {', '.join(allowed_extensions)}"
-            )
-
-        return file
diff --git a/src/open_inwoner/cms/cases/forms.py b/src/open_inwoner/cms/cases/forms.py
new file mode 100644
index 0000000000..1aacd2b069
--- /dev/null
+++ b/src/open_inwoner/cms/cases/forms.py
@@ -0,0 +1,59 @@
+import os
+
+from django import forms
+from django.core.exceptions import ValidationError
+from django.utils.translation import gettext_lazy as _
+
+from open_inwoner.openzaak.models import (
+    OpenZaakConfig,
+    ZaakTypeInformatieObjectTypeConfig,
+)
+from open_inwoner.utils.validators import validate_charfield_entry
+
+
+class CaseUploadForm(forms.Form):
+    title = forms.CharField(
+        label=_("Titel bestand"), max_length=255, validators=[validate_charfield_entry]
+    )
+    type = forms.ModelChoiceField(
+        ZaakTypeInformatieObjectTypeConfig.objects.none(),
+        empty_label=None,
+        label=_("Bestand type"),
+    )
+    file = forms.FileField(label=_("Bestand"))
+
+    def __init__(self, case, **kwargs):
+        super().__init__(**kwargs)
+
+        if case:
+            self.fields[
+                "type"
+            ].queryset = ZaakTypeInformatieObjectTypeConfig.objects.filter_enabled_for_case_type(
+                case.zaaktype
+            )
+
+        choices = self.fields["type"].choices
+
+        if choices and len(choices) == 1:
+            self.fields["type"].initial = list(choices)[0][0].value
+            self.fields["type"].widget = forms.HiddenInput()
+
+    def clean_file(self):
+        file = self.cleaned_data["file"]
+
+        config = OpenZaakConfig.get_solo()
+        max_allowed_size = 1024**2 * config.max_upload_size
+        allowed_extensions = sorted(config.allowed_file_extensions)
+        filename, file_extension = os.path.splitext(file.name)
+
+        if file.size > max_allowed_size:
+            raise ValidationError(
+                f"Een aangeleverd bestand dient maximaal {config.max_upload_size} MB te zijn, uw bestand is te groot."
+            )
+
+        if file_extension.lower().replace(".", "") not in allowed_extensions:
+            raise ValidationError(
+                f"Het type bestand dat u hebt geüpload is ongeldig. Geldige bestandstypen zijn: {', '.join(allowed_extensions)}"
+            )
+
+        return file
diff --git a/src/open_inwoner/cms/cases/tests/__init__.py b/src/open_inwoner/cms/cases/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/open_inwoner/cms/cases/tests/test_htmx.py b/src/open_inwoner/cms/cases/tests/test_htmx.py
new file mode 100644
index 0000000000..bac356da3a
--- /dev/null
+++ b/src/open_inwoner/cms/cases/tests/test_htmx.py
@@ -0,0 +1,382 @@
+from django.test import override_settings
+from django.utils.translation import gettext as _
+
+import requests_mock
+from playwright.sync_api import expect
+from zgw_consumers.api_models.constants import (
+    RolOmschrijving,
+    RolTypes,
+    VertrouwelijkheidsAanduidingen,
+)
+from zgw_consumers.constants import APITypes
+from zgw_consumers.test import generate_oas_component, mock_service_oas_get
+
+from open_inwoner.accounts.tests.factories import DigidUserFactory
+from open_inwoner.openzaak.models import OpenZaakConfig
+from open_inwoner.openzaak.tests.factories import (
+    ServiceFactory,
+    ZaakTypeConfigFactory,
+    ZaakTypeInformatieObjectTypeConfigFactory,
+)
+from open_inwoner.openzaak.tests.shared import (
+    CATALOGI_ROOT,
+    DOCUMENTEN_ROOT,
+    ZAKEN_ROOT,
+)
+from open_inwoner.utils.test import ClearCachesMixin, paginated_response
+from open_inwoner.utils.tests.playwright import (
+    PlaywrightSyncLiveServerTestCase,
+    multi_browser,
+)
+
+
+@requests_mock.Mocker()
+@multi_browser()
+@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+class CasesPlaywrightTests(ClearCachesMixin, PlaywrightSyncLiveServerTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+        self.user = DigidUserFactory(bsn="900222086")
+        # let's reuse the login storage_state
+        self.user_login_state = self.get_user_bsn_login_state(self.user)
+
+        # services
+        self.zaak_service = ServiceFactory(api_root=ZAKEN_ROOT, api_type=APITypes.zrc)
+        self.catalogi_service = ServiceFactory(
+            api_root=CATALOGI_ROOT, api_type=APITypes.ztc
+        )
+        self.document_service = ServiceFactory(
+            api_root=DOCUMENTEN_ROOT, api_type=APITypes.drc
+        )
+        # openzaak config
+        self.config = OpenZaakConfig.get_solo()
+        self.config.zaak_service = self.zaak_service
+        self.config.catalogi_service = self.catalogi_service
+        self.config.document_service = self.document_service
+        self.config.document_max_confidentiality = (
+            VertrouwelijkheidsAanduidingen.beperkt_openbaar
+        )
+        self.config.zaak_max_confidentiality = (
+            VertrouwelijkheidsAanduidingen.beperkt_openbaar
+        )
+        self.config.save()
+
+        self.zaak = generate_oas_component(
+            "zrc",
+            "schemas/Zaak",
+            uuid="d8bbdeb7-770f-4ca9-b1ea-77b4730bf67d",
+            url=f"{ZAKEN_ROOT}zaken/d8bbdeb7-770f-4ca9-b1ea-77b4730bf67d",
+            zaaktype=f"{CATALOGI_ROOT}zaaktypen/0caa29cb-0167-426f-8dc1-88bebd7c8804",
+            identificatie="ZAAK-2022-0000000024",
+            omschrijving="Zaak naar aanleiding van ingezonden formulier",
+            startdatum="2022-01-02",
+            einddatum=None,
+            status=f"{ZAKEN_ROOT}statussen/3da89990-c7fc-476a-ad13-c9023450083c",
+            resultaat=f"{ZAKEN_ROOT}resultaten/a44153aa-ad2c-6a07-be75-15add5113",
+            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
+        )
+        self.zaaktype = generate_oas_component(
+            "ztc",
+            "schemas/ZaakType",
+            uuid="0caa29cb-0167-426f-8dc1-88bebd7c8804",
+            url=self.zaak["zaaktype"],
+            identificatie="ZAAKTYPE-2020-0000000001",
+            omschrijving="Coffee zaaktype",
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
+            indicatieInternOfExtern="extern",
+        )
+        self.status_finish = generate_oas_component(
+            "zrc",
+            "schemas/Status",
+            url=f"{ZAKEN_ROOT}statussen/3da89990-c7fc-476a-ad13-c9023450083c",
+            zaak=self.zaak["url"],
+            statustype=f"{CATALOGI_ROOT}statustypen/e3798107-ab27-4c3c-977d-744516671fe4",
+            datumStatusGezet="2021-03-12",
+            statustoelichting="",
+        )
+        self.status_type_finish = generate_oas_component(
+            "ztc",
+            "schemas/StatusType",
+            url=self.status_finish["statustype"],
+            zaaktype=self.zaaktype["url"],
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            omschrijving="Finish",
+            omschrijvingGeneriek="some content",
+        )
+        self.user_role = generate_oas_component(
+            "zrc",
+            "schemas/Rol",
+            url=f"{ZAKEN_ROOT}rollen/f33153aa-ad2c-4a07-ae75-15add5891",
+            omschrijvingGeneriek=RolOmschrijving.initiator,
+            betrokkeneType=RolTypes.natuurlijk_persoon,
+            betrokkeneIdentificatie={
+                "inpBsn": "900222086",
+                "voornamen": "Foo Bar",
+                "voorvoegselGeslachtsnaam": "van der",
+                "geslachtsnaam": "Bazz",
+            },
+        )
+        self.result = generate_oas_component(
+            "zrc",
+            "schemas/Resultaat",
+            uuid="a44153aa-ad2c-6a07-be75-15add5113",
+            url=self.zaak["resultaat"],
+            resultaattype=f"{CATALOGI_ROOT}resultaattypen/b1a268dd-4322-47bb-a930-b83066b4a32c",
+            zaak=self.zaak["url"],
+            toelichting="resultaat toelichting",
+        )
+        self.zaak_informatie_object = generate_oas_component(
+            "zrc",
+            "schemas/ZaakInformatieObject",
+            url=f"{ZAKEN_ROOT}zaakinformatieobjecten/e55153aa-ad2c-4a07-ae75-15add57d6",
+            informatieobject=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/014c38fe-b010-4412-881c-3000032fb812",
+            zaak=self.zaak["url"],
+        )
+        self.informatie_object_type = generate_oas_component(
+            "ztc",
+            "schemas/InformatieObjectType",
+            url=f"{CATALOGI_ROOT}informatieobjecttype/014c38fe-b010-4412-881c-3000032fb321",
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            omschrijving="Some content",
+        )
+        self.zaaktype_informatie_object_type = generate_oas_component(
+            "ztc",
+            "schemas/ZaakTypeInformatieObjectType",
+            uuid="3fb03882-f6f9-4e0d-ad92-f810e24b9abb",
+            url=f"{CATALOGI_ROOT}zaaktype-informatieobjecttypen/93250e6d-ef92-4474-acca-a6dbdcd61b7e",
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            zaaktype=self.zaaktype["url"],
+            informatieobjecttype=self.informatie_object_type["url"],
+            # volgnummer=1,
+            richting="inkomend",
+            statustype=self.status_type_finish,
+        )
+        self.informatie_object = generate_oas_component(
+            "drc",
+            "schemas/EnkelvoudigInformatieObject",
+            uuid="014c38fe-b010-4412-881c-3000032fb812",
+            url=self.zaak_informatie_object["informatieobject"],
+            inhoud=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/014c38fe-b010-4412-881c-3000032fb812/download",
+            informatieobjecttype=self.informatie_object_type["url"],
+            status="definitief",
+            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
+            bestandsnaam="uploaded_document.txt",
+            titel="uploaded_document_title.txt",
+            bestandsomvang=123,
+        )
+
+        # for upload testing
+        self.uploaded_zaak_informatie_object = generate_oas_component(
+            "zrc",
+            "schemas/ZaakInformatieObject",
+            url=f"{ZAKEN_ROOT}zaakinformatieobjecten/48599f76-b524-48e8-be5a-6fc47288c9bf",
+            informatieobject=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/48599f76-b524-48e8-be5a-6fc47288c9bf",
+            zaak=self.zaak["url"],
+        )
+        self.uploaded_zaak_informatie_object_content = "test56789".encode("utf8")
+        self.uploaded_informatie_object = generate_oas_component(
+            "drc",
+            "schemas/EnkelvoudigInformatieObject",
+            uuid="48599f76-b524-48e8-be5a-6fc47288c9bf",
+            url=self.uploaded_zaak_informatie_object["informatieobject"],
+            inhoud=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/85079ba3-554a-450f-b963-2ce20b176c90/download",
+            informatieobjecttype=self.informatie_object_type["url"],
+            status="definitief",
+            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
+            bestandsnaam="uploaded_test_file.txt",
+            titel="uploaded_test_file.txt",
+            bestandsomvang=len(self.uploaded_zaak_informatie_object_content),
+        )
+
+        # enable upload
+        zaak_type_config = ZaakTypeConfigFactory(
+            catalogus__url=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            identificatie=self.zaaktype["identificatie"],
+        )
+        ZaakTypeInformatieObjectTypeConfigFactory(
+            zaaktype_config=zaak_type_config,
+            informatieobjecttype_url=self.informatie_object["url"],
+            zaaktype_uuids=[self.zaaktype["uuid"]],
+            document_upload_enabled=True,
+        )
+
+    def _setUpMocks(self, m):
+        mock_service_oas_get(m, ZAKEN_ROOT, "zrc")
+        mock_service_oas_get(m, CATALOGI_ROOT, "ztc")
+        mock_service_oas_get(m, DOCUMENTEN_ROOT, "drc")
+
+        self.matchers = []
+
+        for resource in [
+            self.zaak,
+            self.result,
+            self.zaaktype,
+            # self.informatie_object_type,
+            self.informatie_object,
+            self.uploaded_informatie_object,
+            # self.zaaktype_informatie_object_type,
+            self.status_finish,
+            self.status_type_finish,
+        ]:
+            self.matchers.append(m.get(resource["url"], json=resource))
+
+        self.matchers += [
+            m.get(
+                f"{ZAKEN_ROOT}zaken?rol__betrokkeneIdentificatie__natuurlijkPersoon__inpBsn={self.user.bsn}&maximaleVertrouwelijkheidaanduiding=beperkt_openbaar",
+                json=paginated_response([self.zaak]),
+            ),
+            m.get(
+                f"{ZAKEN_ROOT}zaakinformatieobjecten?zaak={self.zaak['url']}",
+                [
+                    {
+                        "json": [
+                            self.zaak_informatie_object,
+                        ]
+                    },
+                    # after upload
+                    {
+                        "json": [
+                            self.zaak_informatie_object,
+                            self.uploaded_zaak_informatie_object,
+                        ]
+                    },
+                ],
+            ),
+            m.get(
+                f"{ZAKEN_ROOT}statussen?zaak={self.zaak['url']}",
+                json=paginated_response([self.status_finish]),
+            ),
+            m.get(
+                f"{ZAKEN_ROOT}rollen?zaak={self.zaak['url']}",
+                json=paginated_response([self.user_role]),
+            ),
+            m.get(
+                f"{ZAKEN_ROOT}rollen?zaak={self.zaak['url']}&omschrijvingGeneriek={RolOmschrijving.initiator}",
+                # Taiga #961 this is not an accurate OpenZaak response as it has a 'behandelaar' even when we filter on 'initiator'
+                # but eSuite doesn't filter the response in the API, so we use filtering in Python to remove the not-initiator
+                json=paginated_response([self.user_role]),
+            ),
+            # upload
+            m.post(
+                f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten",
+                status_code=201,
+                json=self.uploaded_informatie_object,
+            ),
+            m.post(
+                f"{ZAKEN_ROOT}zaakinformatieobjecten",
+                status_code=201,
+                json=self.uploaded_zaak_informatie_object,
+            ),
+            m.get(
+                self.uploaded_informatie_object["inhoud"],
+                content=self.uploaded_zaak_informatie_object_content,
+            ),
+        ]
+
+    def test_cases(self, m):
+        self._setUpMocks(m)
+
+        context = self.browser.new_context(storage_state=self.user_login_state)
+
+        page = context.new_page()
+        page.goto(self.live_reverse("cases:open_cases"))
+
+        # expected anchors
+        menu_items = page.get_by_role(
+            "complementary", name=_("Secundaire paginanavigatie")
+        ).get_by_role("listitem")
+
+        expect(menu_items.get_by_role("link", name=_("Open aanvragen"))).to_be_visible()
+        expect(
+            menu_items.get_by_role("link", name=_("Lopende aanvragen"))
+        ).to_be_visible()
+        expect(
+            menu_items.get_by_role("link", name=_("Afgeronde aanvragen"))
+        ).to_be_visible()
+
+        # case title
+        case_title = page.get_by_role("link", name=self.zaaktype["omschrijving"])
+        expect(case_title).to_be_visible()
+
+        # go to case-detail page
+        case_title.click()
+        page.wait_for_url(
+            self.live_reverse(
+                "cases:case_detail", kwargs={"object_id": self.zaak["uuid"]}, star=True
+            )
+        )
+
+        # check case is visible
+        expect(page.get_by_text(self.zaak["identificatie"])).to_be_visible()
+
+        # out-of-band anchor menu
+        menu_items = page.get_by_role(
+            "complementary", name=_("Secundaire paginanavigatie")
+        ).get_by_role("listitem")
+
+        expect(menu_items.get_by_role("link", name=_("Gegevens"))).to_be_visible()
+        expect(menu_items.get_by_role("link", name=_("Status"))).to_be_visible()
+        expect(menu_items.get_by_role("link", name=_("Documenten"))).to_be_visible()
+
+        # check documents show
+        documents = page.locator(".file-list").get_by_role("listitem")
+
+        expect(documents).to_have_count(1)
+        expect(documents).to_contain_text("uploaded_document_title")
+        expect(documents).to_contain_text("(txt, 123 bytes)")
+        expect(documents.get_by_role("link", name="Download")).to_be_visible()
+
+        # check upload form and submit file
+        upload_form = page.locator("#document-upload")
+        expect(upload_form).to_be_visible()
+
+        upload_form.get_by_label(_("Document selecteren")).set_input_files(
+            files=[
+                {
+                    "name": "uploaded_test_file.txt",
+                    "mimeType": "text/plain",
+                    "buffer": self.uploaded_zaak_informatie_object_content,
+                }
+            ],
+        )
+        submit_button = upload_form.get_by_role("button", name=_("Document uploaden"))
+        expect(submit_button).to_be_visible()
+
+        title_input = upload_form.get_by_label(_("Titel bestand"))
+        expect(title_input).to_be_visible()
+        title_input.fill("uploaded document")
+
+        submit_button.click()
+
+        # check for new file
+        expect(documents).to_have_count(2)
+        uploaded_doc = documents.nth(1)
+        expect(uploaded_doc).to_contain_text("uploaded_test_file")
+        expect(uploaded_doc).to_contain_text("(txt, 9 bytes)")
+
+        download_link = uploaded_doc.get_by_role("link", name="Download")
+        expect(download_link).to_be_visible()
+
+        with page.expect_download() as download_info:
+            download_link.click()
+        download = download_info.value
+
+        self.assertEqual(download.suggested_filename, "uploaded_test_file.txt")
+        with open(download.path(), "rb") as f:
+            self.assertEqual(f.read(), self.uploaded_zaak_informatie_object_content)
+
+        # finally check if our mock matchers are accurate
+        self.assertMockMatchersCalledAll(self.matchers)
+
+    def assertMockMatchersCalledAll(self, matchers):
+        def _match_str(m):
+            return f"  {m._method.ljust(5, ' ')} {m._url}"
+
+        missed = [m for m in matchers if not m.called]
+        if not missed:
+            return
+
+        out = "\n".join(_match_str(m) for m in missed)
+        self.fail(f"request mock matchers not called:\n{out}")
diff --git a/src/open_inwoner/cms/cases/urls.py b/src/open_inwoner/cms/cases/urls.py
index 64addfd348..e0fa427099 100644
--- a/src/open_inwoner/cms/cases/urls.py
+++ b/src/open_inwoner/cms/cases/urls.py
@@ -1,23 +1,38 @@
 from django.urls import path
 from django.views.generic import RedirectView
 
-from open_inwoner.accounts.views.cases import (
-    CaseDetailView,
-    CaseDocumentDownloadView,
-    ClosedCaseListView,
-    OpenCaseListView,
-    OpenSubmissionListView,
-)
 from open_inwoner.accounts.views.contactmoments import (
     KlantContactMomentDetailView,
     KlantContactMomentListView,
 )
 
+from .views import (
+    CaseDocumentDownloadView,
+    InnerCaseDetailView,
+    InnerClosedCaseListView,
+    InnerOpenCaseListView,
+    InnerOpenSubmissionListView,
+    OuterCaseDetailView,
+    OuterClosedCaseListView,
+    OuterOpenCaseListView,
+    OuterOpenSubmissionListView,
+)
+
 app_name = "cases"
 
 urlpatterns = [
-    path("closed/", ClosedCaseListView.as_view(), name="closed_cases"),
-    path("forms/", OpenSubmissionListView.as_view(), name="open_submissions"),
+    path(
+        "closed/content/",
+        InnerClosedCaseListView.as_view(),
+        name="closed_cases_content",
+    ),
+    path("closed/", OuterClosedCaseListView.as_view(), name="closed_cases"),
+    path("forms/", OuterOpenSubmissionListView.as_view(), name="open_submissions"),
+    path(
+        "forms/content/",
+        InnerOpenSubmissionListView.as_view(),
+        name="open_submissions_content",
+    ),
     path(
         "contactmomenten/",
         KlantContactMomentListView.as_view(),
@@ -33,11 +48,17 @@
         CaseDocumentDownloadView.as_view(),
         name="document_download",
     ),
+    path(
+        "<str:object_id>/status/content/",
+        InnerCaseDetailView.as_view(),
+        name="case_detail_content",
+    ),
     path(
         "<str:object_id>/status/",
-        CaseDetailView.as_view(),
+        OuterCaseDetailView.as_view(),
         name="case_detail",
     ),
     path("open/", RedirectView.as_view(pattern_name="cases:open_cases"), name="index"),
-    path("", OpenCaseListView.as_view(), name="open_cases"),
+    path("content/", InnerOpenCaseListView.as_view(), name="open_cases_content"),
+    path("", OuterOpenCaseListView.as_view(), name="open_cases"),
 ]
diff --git a/src/open_inwoner/cms/cases/views/__init__.py b/src/open_inwoner/cms/cases/views/__init__.py
new file mode 100644
index 0000000000..911c0a51df
--- /dev/null
+++ b/src/open_inwoner/cms/cases/views/__init__.py
@@ -0,0 +1,8 @@
+from .cases import (
+    InnerClosedCaseListView,
+    InnerOpenCaseListView,
+    OuterClosedCaseListView,
+    OuterOpenCaseListView,
+)
+from .status import CaseDocumentDownloadView, InnerCaseDetailView, OuterCaseDetailView
+from .submissions import InnerOpenSubmissionListView, OuterOpenSubmissionListView
diff --git a/src/open_inwoner/cms/cases/views/cases.py b/src/open_inwoner/cms/cases/views/cases.py
new file mode 100644
index 0000000000..3540198dc6
--- /dev/null
+++ b/src/open_inwoner/cms/cases/views/cases.py
@@ -0,0 +1,121 @@
+from django.urls import reverse
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import TemplateView
+
+from view_breadcrumbs import BaseBreadcrumbMixin
+
+from open_inwoner.htmx.mixins import RequiresHtmxMixin
+from open_inwoner.utils.views import CommonPageMixin
+
+from .mixins import CaseAccessMixin, CaseListMixin, OuterCaseAccessMixin
+
+
+class OuterOpenCaseListView(
+    OuterCaseAccessMixin, CommonPageMixin, BaseBreadcrumbMixin, TemplateView
+):
+    template_name = "pages/cases/list_outer.html"
+
+    @cached_property
+    def crumbs(self):
+        return [(_("Mijn aanvragen"), reverse("cases:open_cases"))]
+
+    def page_title(self):
+        return _("Lopende aanvragen")
+
+    def get_anchors(self) -> list:
+        return [
+            (reverse("cases:open_submissions"), _("Open aanvragen")),
+            ("#cases", _("Lopende aanvragen")),
+            (reverse("cases:closed_cases"), _("Afgeronde aanvragen")),
+        ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        # anchors are needed here as well for rendering the mobile ones
+        context["anchors"] = self.get_anchors()
+        context["hxget"] = reverse("cases:open_cases_content")
+        return context
+
+
+class InnerOpenCaseListView(
+    RequiresHtmxMixin, CommonPageMixin, CaseAccessMixin, CaseListMixin, TemplateView
+):
+    template_name = "pages/cases/list_inner.html"
+
+    def page_title(self):
+        return _("Lopende aanvragen")
+
+    def get_cases(self):
+        all_cases = super().get_cases()
+
+        cases = [case for case in all_cases if not case.einddatum]
+        cases.sort(key=lambda case: case.startdatum, reverse=True)
+        return cases
+
+    def get_anchors(self) -> list:
+        return [
+            (reverse("cases:open_submissions"), _("Open aanvragen")),
+            ("#cases", _("Lopende aanvragen")),
+            (reverse("cases:closed_cases"), _("Afgeronde aanvragen")),
+        ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["hxget"] = reverse("cases:open_cases_content")
+        return context
+
+
+class OuterClosedCaseListView(
+    OuterCaseAccessMixin, CommonPageMixin, BaseBreadcrumbMixin, TemplateView
+):
+    template_name = "pages/cases/list_outer.html"
+
+    @cached_property
+    def crumbs(self):
+        return [(_("Mijn aanvragen"), reverse("cases:closed_cases"))]
+
+    def page_title(self):
+        return _("Afgeronde aanvragen")
+
+    def get_anchors(self) -> list:
+        return [
+            (reverse("cases:open_submissions"), _("Open aanvragen")),
+            (reverse("cases:open_cases"), _("Lopende aanvragen")),
+            ("#cases", _("Afgeronde aanvragen")),
+        ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["hxget"] = reverse("cases:closed_cases_content")
+        context["anchors"] = self.get_anchors()
+        return context
+
+
+class InnerClosedCaseListView(
+    RequiresHtmxMixin, CommonPageMixin, CaseAccessMixin, CaseListMixin, TemplateView
+):
+    template_name = "pages/cases/list_inner.html"
+
+    def page_title(self):
+        return _("Afgeronde aanvragen")
+
+    def get_cases(self):
+        all_cases = super().get_cases()
+
+        cases = [case for case in all_cases if case.einddatum]
+        cases.sort(key=lambda case: case.einddatum, reverse=True)
+        return cases
+
+    def get_anchors(self) -> list:
+        return [
+            (reverse("cases:open_submissions"), _("Open aanvragen")),
+            (reverse("cases:open_cases"), _("Lopende aanvragen")),
+            ("#cases", _("Afgeronde aanvragen")),
+        ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["hxget"] = reverse("cases:closed_cases_content")
+        return context
diff --git a/src/open_inwoner/cms/cases/views/mixins.py b/src/open_inwoner/cms/cases/views/mixins.py
new file mode 100644
index 0000000000..8b6dd10132
--- /dev/null
+++ b/src/open_inwoner/cms/cases/views/mixins.py
@@ -0,0 +1,184 @@
+import logging
+from collections import defaultdict
+from typing import List, Optional
+
+from django.contrib.auth.mixins import AccessMixin, LoginRequiredMixin
+from django.template.response import TemplateResponse
+from django.utils.translation import gettext_lazy as _
+
+from glom import glom
+
+from open_inwoner.openzaak.api_models import Zaak
+from open_inwoner.openzaak.cases import (
+    fetch_cases,
+    fetch_roles_for_case_and_bsn,
+    fetch_single_case,
+    fetch_single_status,
+)
+from open_inwoner.openzaak.catalog import (
+    fetch_single_case_type,
+    fetch_single_status_type,
+)
+from open_inwoner.openzaak.models import OpenZaakConfig
+from open_inwoner.openzaak.utils import format_zaak_identificatie, is_zaak_visible
+from open_inwoner.utils.mixins import PaginationMixin
+from open_inwoner.utils.views import LogMixin
+
+logger = logging.getLogger(__name__)
+
+
+class CaseLogMixin(LogMixin):
+    def log_case_access(self, case_identificatie: str):
+        self.log_user_action(
+            self.request.user,
+            _("Zaak bekeken: {case}").format(case=case_identificatie),
+        )
+
+
+class CaseAccessMixin(AccessMixin):
+    """
+    Shared authorisation check
+
+    Base checks:
+    - user is authenticated
+    - user has a BSN
+
+    When retrieving a case :
+    - users BSN has a role for this case
+    - case confidentiality is not higher than globally configured
+    """
+
+    case: Zaak = None
+
+    def dispatch(self, request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            logger.debug("CaseAccessMixin - permission denied: user not authenticated")
+            return self.handle_no_permission()
+
+        if not request.user.bsn:
+            logger.debug(
+                "CaseAccessMixin - permission denied: user doesn't have a bsn "
+            )
+            return self.handle_no_permission()
+
+        self.case = self.get_case(kwargs)
+        if self.case:
+            # check if we have a role in this case
+            if not fetch_roles_for_case_and_bsn(self.case.url, request.user.bsn):
+                logger.debug(
+                    f"CaseAccessMixin - permission denied: no role for the case {self.case.url}"
+                )
+                return self.handle_no_permission()
+
+            # resolve case-type
+            self.case.zaaktype = fetch_single_case_type(self.case.zaaktype)
+            if not self.case.zaaktype:
+                logger.debug(
+                    "CaseAccessMixin - permission denied: no case type for case {self.case.url}"
+                )
+                return self.handle_no_permission()
+
+            # check if case + case-type are visible
+            if not is_zaak_visible(self.case):
+                logger.debug(
+                    "CaseAccessMixin - permission denied: case {self.case.url} is not visible"
+                )
+                return self.handle_no_permission()
+
+        return super().dispatch(request, *args, **kwargs)
+
+    def handle_no_permission(self):
+        if self.request.user.is_authenticated:
+            return TemplateResponse(self.request, "pages/cases/403.html")
+
+        return super().handle_no_permission()
+
+    def get_case(self, kwargs) -> Optional[Zaak]:
+        case_uuid = kwargs.get("object_id")
+        if not case_uuid:
+            return None
+
+        return fetch_single_case(case_uuid)
+
+
+class CaseListMixin(CaseLogMixin, PaginationMixin):
+    paginate_by = 9
+
+    def get_cases(self) -> List[Zaak]:
+        cases = fetch_cases(self.request.user.bsn)
+
+        case_types = {}
+        case_types_set = {case.zaaktype for case in cases}
+
+        # fetch unique case types
+        for case_type_url in case_types_set:
+            # todo parallel
+            case_types[case_type_url] = fetch_single_case_type(case_type_url)
+
+        # set resolved case types
+        for case in cases:
+            case.zaaktype = case_types[case.zaaktype]
+
+        # filter visibility
+        cases = [case for case in cases if is_zaak_visible(case)]
+
+        # fetch case status resources and attach resolved to case
+        status_types = defaultdict(list)
+        for case in cases:
+            if case.status:
+                # todo parallel
+                case.status = fetch_single_status(case.status)
+                status_types[case.status.statustype].append(case)
+
+        for status_type_url, _cases in status_types.items():
+            # todo parallel
+            status_type = fetch_single_status_type(status_type_url)
+            for case in _cases:
+                case.status.statustype = status_type
+
+        return cases
+
+    def process_cases(self, cases: List[Zaak]) -> List[dict]:
+        # Prepare data for frontend
+        config = OpenZaakConfig.get_solo()
+
+        updated_cases = []
+        for case in cases:
+            case_dict = {
+                "identificatie": format_zaak_identificatie(case.identificatie, config),
+                "uuid": str(case.uuid),
+                "start_date": case.startdatum,
+                "end_date": getattr(case, "einddatum", None),
+                "description": case.zaaktype.omschrijving,
+                "current_status": glom(
+                    case, "status.statustype.omschrijving", default=""
+                ),
+            }
+            updated_cases.append(case_dict)
+        return updated_cases
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        raw_cases = self.get_cases()
+        paginator_dict = self.paginate_with_context(raw_cases)
+        cases = self.process_cases(paginator_dict["object_list"])
+
+        context["cases"] = cases
+        context.update(paginator_dict)
+
+        for case in cases:
+            self.log_case_access(case["identificatie"])
+
+        context["anchors"] = self.get_anchors()
+        return context
+
+    def get_anchors(self) -> list:
+        return []
+
+
+class OuterCaseAccessMixin(LoginRequiredMixin):
+    def dispatch(self, request, *args, **kwargs):
+        if request.user.is_authenticated and not request.user.bsn:
+            return self.handle_no_permission()
+        return super().dispatch(request, *args, **kwargs)
diff --git a/src/open_inwoner/accounts/views/cases.py b/src/open_inwoner/cms/cases/views/status.py
similarity index 62%
rename from src/open_inwoner/accounts/views/cases.py
rename to src/open_inwoner/cms/cases/views/status.py
index 88fccc3386..ccbea2aaad 100644
--- a/src/open_inwoner/accounts/views/cases.py
+++ b/src/open_inwoner/cms/cases/views/status.py
@@ -1,12 +1,10 @@
 import dataclasses
 from collections import defaultdict
-from typing import List, Optional
+from typing import List
 
 from django.contrib import messages
-from django.contrib.auth.mixins import AccessMixin
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.http import Http404, HttpResponseRedirect, StreamingHttpResponse
-from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
@@ -23,17 +21,10 @@
     fetch_case_information_objects,
     fetch_case_information_objects_for_case_and_info,
     fetch_case_roles,
-    fetch_cases,
-    fetch_roles_for_case_and_bsn,
-    fetch_single_case,
     fetch_single_result,
-    fetch_single_status,
     fetch_status_history,
 )
-from open_inwoner.openzaak.catalog import (
-    fetch_single_case_type,
-    fetch_single_status_type,
-)
+from open_inwoner.openzaak.catalog import fetch_single_status_type
 from open_inwoner.openzaak.documents import (
     download_document,
     fetch_single_information_object_url,
@@ -49,244 +40,46 @@
     format_zaak_identificatie,
     get_role_name_display,
     is_info_object_visible,
-    is_zaak_visible,
 )
-from open_inwoner.utils.mixins import PaginationMixin
 from open_inwoner.utils.views import CommonPageMixin, LogMixin
 
-from ...openzaak.formapi import fetch_open_submissions
 from ..forms import CaseUploadForm
+from .mixins import CaseAccessMixin, CaseLogMixin, OuterCaseAccessMixin
 
 
-class CaseLogMixin(LogMixin):
-    def log_case_access(self, case_identificatie: str):
-        self.log_user_action(
-            self.request.user,
-            _("Zaak bekeken: {case}").format(case=case_identificatie),
-        )
-
-
-class CaseAccessMixin(AccessMixin):
-    """
-    Shared authorisation check
-
-    Base checks:
-    - user is authenticated
-    - user has a BSN
-
-    When retrieving a case :
-    - users BSN has a role for this case
-    - case confidentiality is not higher than globally configured
-    """
-
-    case: Zaak = None
-
-    def dispatch(self, request, *args, **kwargs):
-        if not request.user.is_authenticated:
-            return self.handle_no_permission()
-
-        if not request.user.bsn:
-            return self.handle_no_permission()
-
-        self.case = self.get_case(kwargs)
-        if self.case:
-            # check if we have a role in this case
-            if not fetch_roles_for_case_and_bsn(self.case.url, request.user.bsn):
-                return self.handle_no_permission()
-
-            # resolve case-type
-            self.case.zaaktype = fetch_single_case_type(self.case.zaaktype)
-            if not self.case.zaaktype:
-                return self.handle_no_permission()
-
-            # check if case + case-type are visible
-            if not is_zaak_visible(self.case):
-                return self.handle_no_permission()
-
-        return super().dispatch(request, *args, **kwargs)
-
-    def handle_no_permission(self):
-        if self.request.user.is_authenticated:
-            return redirect("/")
-
-        return super().handle_no_permission()
-
-    def get_case(self, kwargs) -> Optional[Zaak]:
-        case_uuid = kwargs.get("object_id")
-        if not case_uuid:
-            return None
-
-        return fetch_single_case(case_uuid)
-
-
-class CaseListMixin(CaseLogMixin, PaginationMixin):
-    paginate_by = 9
-    template_name = "pages/cases/list.html"
-
-    def get_cases(self) -> List[Zaak]:
-        cases = fetch_cases(self.request.user.bsn)
-
-        case_types = {}
-        case_types_set = {case.zaaktype for case in cases}
-
-        # fetch unique case types
-        for case_type_url in case_types_set:
-            # todo parallel
-            case_types[case_type_url] = fetch_single_case_type(case_type_url)
-
-        # set resolved case types
-        for case in cases:
-            case.zaaktype = case_types[case.zaaktype]
-
-        # filter visibility
-        cases = [case for case in cases if is_zaak_visible(case)]
-
-        # fetch case status resources and attach resolved to case
-        status_types = defaultdict(list)
-        for case in cases:
-            if case.status:
-                # todo parallel
-                case.status = fetch_single_status(case.status)
-                status_types[case.status.statustype].append(case)
-
-        for status_type_url, _cases in status_types.items():
-            # todo parallel
-            status_type = fetch_single_status_type(status_type_url)
-            for case in _cases:
-                case.status.statustype = status_type
-
-        return cases
-
-    def process_cases(self, cases: List[Zaak]) -> List[dict]:
-        # Prepare data for frontend
-        config = OpenZaakConfig.get_solo()
-
-        updated_cases = []
-        for case in cases:
-            case_dict = {
-                "identificatie": format_zaak_identificatie(case.identificatie, config),
-                "uuid": str(case.uuid),
-                "start_date": case.startdatum,
-                "end_date": getattr(case, "einddatum", None),
-                "description": case.zaaktype.omschrijving,
-                "current_status": glom(
-                    case, "status.statustype.omschrijving", default=""
-                ),
-            }
-            updated_cases.append(case_dict)
-        return updated_cases
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        raw_cases = self.get_cases()
-        paginator_dict = self.paginate_with_context(raw_cases)
-        cases = self.process_cases(paginator_dict["object_list"])
-
-        context["cases"] = cases
-        context.update(paginator_dict)
-
-        for case in cases:
-            self.log_case_access(case["identificatie"])
-
-        context["anchors"] = self.get_anchors()
-        return context
-
-    def get_anchors(self) -> list:
-        return []
+@dataclasses.dataclass
+class SimpleFile:
+    name: str
+    size: int
+    url: str
 
 
-class OpenCaseListView(
-    CommonPageMixin, BaseBreadcrumbMixin, CaseAccessMixin, CaseListMixin, TemplateView
+class OuterCaseDetailView(
+    OuterCaseAccessMixin, CommonPageMixin, BaseBreadcrumbMixin, TemplateView
 ):
-    @cached_property
-    def crumbs(self):
-        return [(_("Mijn aanvragen"), reverse("cases:open_cases"))]
-
-    def page_title(self):
-        return _("Lopende aanvragen")
-
-    def get_cases(self):
-        all_cases = super().get_cases()
-
-        cases = [case for case in all_cases if not case.einddatum]
-        cases.sort(key=lambda case: case.startdatum, reverse=True)
-        return cases
+    template_name = "pages/cases/status_outer.html"
 
-    def get_anchors(self) -> list:
-        return [
-            (reverse("cases:open_submissions"), _("Open aanvragen")),
-            ("#cases", _("Lopende aanvragen")),
-            (reverse("cases:closed_cases"), _("Afgeronde aanvragen")),
-        ]
-
-
-class ClosedCaseListView(
-    CommonPageMixin, BaseBreadcrumbMixin, CaseAccessMixin, CaseListMixin, TemplateView
-):
     @cached_property
     def crumbs(self):
-        return [(_("Mijn aanvragen"), reverse("cases:closed_cases"))]
-
-    def page_title(self):
-        return _("Afgeronde aanvragen")
-
-    def get_cases(self):
-        all_cases = super().get_cases()
-
-        cases = [case for case in all_cases if case.einddatum]
-        cases.sort(key=lambda case: case.einddatum, reverse=True)
-        return cases
-
-    def get_anchors(self) -> list:
         return [
-            (reverse("cases:open_submissions"), _("Open aanvragen")),
-            (reverse("cases:open_cases"), _("Lopende aanvragen")),
-            ("#cases", _("Afgeronde aanvragen")),
+            (_("Mijn aanvragen"), reverse("cases:open_cases")),
+            (
+                _("Status"),
+                reverse("cases:case_detail", kwargs=self.kwargs),
+            ),
         ]
 
-
-class OpenSubmissionListView(
-    CommonPageMixin, BaseBreadcrumbMixin, CaseAccessMixin, TemplateView
-):
-    template_name = "pages/cases/submissions.html"
-
-    @cached_property
-    def crumbs(self):
-        return [(_("Mijn aanvragen"), reverse("cases:open_submissions"))]
-
-    def page_title(self):
-        return _("Open aanvragen")
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["submissions"] = self.get_submissions()
-        context["anchors"] = self.get_anchors()
+        context["hxget"] = reverse("cases:case_detail_content", kwargs=self.kwargs)
+        context["custom_anchors"] = True
         return context
 
-    def get_submissions(self):
-        submissions = fetch_open_submissions(self.request.user.bsn)
-        return submissions
-
-    def get_anchors(self) -> list:
-        return [
-            ("#submissions", _("Open aanvragen")),
-            (reverse("cases:open_cases"), _("Lopende aanvragen")),
-            (reverse("cases:closed_cases"), _("Afgeronde aanvragen")),
-        ]
-
-
-@dataclasses.dataclass
-class SimpleFile:
-    name: str
-    size: int
-    url: str
-
 
-class CaseDetailView(
+class InnerCaseDetailView(
     CaseLogMixin, CommonPageMixin, BaseBreadcrumbMixin, CaseAccessMixin, FormView
 ):
-    template_name = "pages/cases/status.html"
+    template_name = "pages/cases/status_inner.html"
     form_class = CaseUploadForm
 
     @cached_property
@@ -358,6 +151,7 @@ def get_context_data(self, **kwargs):
             }
             context["case"].update(self.get_upload_info_context(self.case))
             context["anchors"] = self.get_anchors(statuses, documents)
+            context["hxpost"] = reverse("cases:case_detail_content", kwargs=self.kwargs)
         else:
             context["case"] = None
         return context
diff --git a/src/open_inwoner/cms/cases/views/submissions.py b/src/open_inwoner/cms/cases/views/submissions.py
new file mode 100644
index 0000000000..d0963652ff
--- /dev/null
+++ b/src/open_inwoner/cms/cases/views/submissions.py
@@ -0,0 +1,72 @@
+from django.urls import reverse
+from django.utils.functional import cached_property
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import TemplateView
+
+from view_breadcrumbs import BaseBreadcrumbMixin
+
+from open_inwoner.htmx.mixins import RequiresHtmxMixin
+from open_inwoner.openzaak.formapi import fetch_open_submissions
+from open_inwoner.utils.views import CommonPageMixin
+
+from .mixins import CaseAccessMixin, OuterCaseAccessMixin
+
+
+class OuterOpenSubmissionListView(
+    OuterCaseAccessMixin, CommonPageMixin, BaseBreadcrumbMixin, TemplateView
+):
+    template_name = "pages/cases/submissions_outer.html"
+
+    @cached_property
+    def crumbs(self):
+        return [(_("Mijn aanvragen"), reverse("cases:open_submissions"))]
+
+    def page_title(self):
+        return _("Open aanvragen")
+
+    def get_anchors(self) -> list:
+        return [
+            ("#submissions", _("Open aanvragen")),
+            (reverse("cases:open_cases"), _("Lopende aanvragen")),
+            (reverse("cases:closed_cases"), _("Afgeronde aanvragen")),
+        ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["hxget"] = reverse("cases:open_submissions_content")
+        context["anchors"] = self.get_anchors()
+        return context
+
+
+class InnerOpenSubmissionListView(
+    RequiresHtmxMixin,
+    CommonPageMixin,
+    BaseBreadcrumbMixin,
+    CaseAccessMixin,
+    TemplateView,
+):
+    template_name = "pages/cases/submissions_inner.html"
+
+    @cached_property
+    def crumbs(self):
+        return [(_("Mijn aanvragen"), reverse("cases:open_submissions"))]
+
+    def page_title(self):
+        return _("Open aanvragen")
+
+    def get_submissions(self):
+        submissions = fetch_open_submissions(self.request.user.bsn)
+        return submissions
+
+    def get_anchors(self) -> list:
+        return [
+            ("#submissions", _("Open aanvragen")),
+            (reverse("cases:open_cases"), _("Lopende aanvragen")),
+            (reverse("cases:closed_cases"), _("Afgeronde aanvragen")),
+        ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["submissions"] = self.get_submissions()
+        context["anchors"] = self.get_anchors()
+        return context
diff --git a/src/open_inwoner/components/templates/components/Form/FileInput.html b/src/open_inwoner/components/templates/components/Form/FileInput.html
index 671adf14a0..0092e77535 100644
--- a/src/open_inwoner/components/templates/components/Form/FileInput.html
+++ b/src/open_inwoner/components/templates/components/Form/FileInput.html
@@ -6,7 +6,7 @@
             <span class="input-file">
             {{ field|addclass:"inputfile" }}
 
-            <label class="label__label">
+            <label class="label__label" for="{{ field.auto_id }}">
             {% icon icon="cloud_upload" icon_position="before" outlined=True %}
                 {{ text }}
 
diff --git a/src/open_inwoner/components/templates/components/Form/Form.html b/src/open_inwoner/components/templates/components/Form/Form.html
index ba446f8c86..abfa884670 100644
--- a/src/open_inwoner/components/templates/components/Form/Form.html
+++ b/src/open_inwoner/components/templates/components/Form/Form.html
@@ -15,6 +15,9 @@
         hx-select="{{ async_selector }}"
         hx-target="{{ async_selector }}"
     {% endif %}
+    {% if hxencoding %}hx-encoding="{{ hxencoding }}"{% endif %}
+    {% if hxpost %}hx-post="{{ hxpost }}"{% endif %}
+    {% if hxtarget %}hx-target="{{ hxtarget }}"{% endif %}
 
 {#    HTML attribute to bypass browser defaults and show validation #}
     novalidate
diff --git a/src/open_inwoner/components/templates/components/Pagination/Pagination.html b/src/open_inwoner/components/templates/components/Pagination/Pagination.html
index a4c8a9ad9e..949a64f5f0 100644
--- a/src/open_inwoner/components/templates/components/Pagination/Pagination.html
+++ b/src/open_inwoner/components/templates/components/Pagination/Pagination.html
@@ -7,7 +7,12 @@
 
     <div class="pagination__pages">
         {% if page_obj.has_previous %}
-            <a class="pagination__link" href="?{% querystring key='page' value=page_obj.previous_page_number %}">
+            <a class="pagination__link"
+                {% if hxget %}
+                    hx-get="{{ hxget }}?{% querystring key='page' value=page_obj.previous_page_number %}" hx-trigger="click" hx-target="{{ hxtarget }}"
+                {% else %}
+                    href="?{% querystring key='page' value=page_obj.previous_page_number %}"
+                {% endif %}>
                 {% icon icon="chevron_left" %}
             </a>
         {% else %}
@@ -19,10 +24,26 @@
                 <span class="pagination__item pagination__item--active">{{ i }} <span class="sr-only">(current)</span></span>
             {% else %}
                 {% if i in page_numbers %}
-                    <a class="pagination__link" href="?{% querystring key='page' value=i %}">{{ i }}</a>
+                    <a class="pagination__link" 
+                        {% if hxget %}
+                            hx-get="{{ hxget }}?{% querystring key='page' value=i %}" hx-trigger="click" hx-target="{{ hxtarget }}"
+                        {% else %}
+                            href="?{% querystring key='page' value=i %}"
+                        {% endif %}
+                    >
+                        {{ i }}
+                    </a>
                 {% else %}
                     {% if i == 1 %}
-                        <a class="pagination__link" href="?{% querystring key='page' value=i %}">{{ i }}</a>
+                        <a class="pagination__link" 
+                            {% if hxget %}
+                                hx-get="{{ hxget }}?{% querystring key='page' value=i %}" hx-trigger="click" hx-target="{{ hxtarget }}"
+                            {% else %}
+                                href="?{% querystring key='page' value=i %}"
+                            {% endif %}
+                        >
+                            {{ i }}
+                        </a>
 
                         {% if 2 not in page_numbers %}
                             <span class="pagination__item">...</span>
@@ -34,14 +55,28 @@
                             <span class="pagination__item">...</span>
                         {% endif %}
 
-                        <a class="pagination__link" href="?{% querystring key='page' value=i %}">{{ i }}</a>
+                        <a class="pagination__link" 
+                            {% if hxget %}
+                                hx-get="{{ hxget }}?{% querystring key='page' value=i %}" hx-trigger="click" hx-target="{{ hxtarget }}"
+                            {% else %}
+                                href="?{% querystring key='page' value=i %}"
+                            {% endif %}
+                        >
+                            {{ i }}
+                        </a>
                     {% endif %}
                 {% endif %}
             {% endif %}
         {% endfor %}
 
         {% if page_obj.has_next %}
-            <a class="pagination__link" href="?{% querystring key='page' value=page_obj.next_page_number %}">
+            <a class="pagination__link" 
+                {% if hxget %}
+                    hx-get="{{ hxget }}?{% querystring key='page' value=page_obj.next_page_number %}" hx-trigger="click" hx-target="{{ hxtarget }}"
+                {% else %}
+                    href="?{% querystring key='page' value=page_obj.next_page_number %}"
+                {% endif %}
+            >
                 {% icon icon="chevron_right" %}
             </a>
         {% else %}
diff --git a/src/open_inwoner/components/templatetags/pagination_tags.py b/src/open_inwoner/components/templatetags/pagination_tags.py
index 1a8d80506b..5dbea16b99 100644
--- a/src/open_inwoner/components/templatetags/pagination_tags.py
+++ b/src/open_inwoner/components/templatetags/pagination_tags.py
@@ -9,7 +9,7 @@ def pagination(page_obj, paginator, request, lookaround=3, **kwargs):
     Describing information
 
     Usage:
-        {% pagination page_obj=page_obj paginator=paginator request=request %}
+        {% pagination page_obj=page_obj paginator=paginator request=request hxget="cases:open_cases" hxtarget="#cases_id" %}
 
     Variables:
         + page_obj: Default django page object
@@ -19,6 +19,8 @@ def pagination(page_obj, paginator, request, lookaround=3, **kwargs):
 
     Extra context:
         - page_numbers: int | The number of pages to show before showing the dots.
+        - hxget: str | The url we want to perform an htmx request to
+        - hxtarget: str | The target element we want to swap
     """
     page_numbers = [
         page_obj.number - lookaround + i
diff --git a/src/open_inwoner/js/components/anchor-menu/anchor-menu-mobile.js b/src/open_inwoner/js/components/anchor-menu/anchor-menu-mobile.js
index b251539afc..698e0cfc65 100644
--- a/src/open_inwoner/js/components/anchor-menu/anchor-menu-mobile.js
+++ b/src/open_inwoner/js/components/anchor-menu/anchor-menu-mobile.js
@@ -1,4 +1,6 @@
-class AnchorMobile {
+export class AnchorMobile {
+  static selector = '.anchor-menu__toggle'
+
   constructor(node) {
     this.node = node
     this.node.addEventListener('click', this.toggleOpen.bind(this))
@@ -20,5 +22,5 @@ class AnchorMobile {
 /**
  * Controls the toggling of anchor list
  */
-const anchorToggles = document.querySelectorAll('.anchor-menu__toggle')
+const anchorToggles = document.querySelectorAll(AnchorMobile.selector)
 ;[...anchorToggles].forEach((anchorToggle) => new AnchorMobile(anchorToggle))
diff --git a/src/open_inwoner/js/components/anchor-menu/anchor-menu.js b/src/open_inwoner/js/components/anchor-menu/anchor-menu.js
index 67109331cc..092abbace0 100644
--- a/src/open_inwoner/js/components/anchor-menu/anchor-menu.js
+++ b/src/open_inwoner/js/components/anchor-menu/anchor-menu.js
@@ -1,10 +1,15 @@
 import Gumshoe from 'gumshoejs'
 
-const anchors = document.querySelectorAll('.anchor-menu')
+export class CreateGumshoe {
+  static selector = '.anchor-menu--desktop a'
 
-if (anchors.length > 0) {
-  new Gumshoe('.anchor-menu--desktop a', {
-    navClass: 'anchor-menu__list-item--active',
-    offset: 30,
-  })
+  constructor(node) {
+    new Gumshoe(CreateGumshoe.selector, {
+      navClass: 'anchor-menu__list-item--active',
+      offset: 30,
+    })
+  }
 }
+
+const anchors = document.querySelectorAll(CreateGumshoe.selector)
+;[...anchors].forEach((anchor) => new CreateGumshoe(anchor))
diff --git a/src/open_inwoner/js/components/cases/document_upload.js b/src/open_inwoner/js/components/cases/document_upload.js
new file mode 100644
index 0000000000..5e34130107
--- /dev/null
+++ b/src/open_inwoner/js/components/cases/document_upload.js
@@ -0,0 +1,20 @@
+export class DisableSubmitButton {
+  static selector = '#document-upload'
+
+  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(
+  DisableSubmitButton.selector
+)
+;[...caseDocumentForms].forEach(
+  (caseDocumentForm) => new DisableSubmitButton(caseDocumentForm)
+)
diff --git a/src/open_inwoner/js/components/cases/index.js b/src/open_inwoner/js/components/cases/index.js
index 967811e34d..d17a392759 100644
--- a/src/open_inwoner/js/components/cases/index.js
+++ b/src/open_inwoner/js/components/cases/index.js
@@ -1,16 +1,2 @@
-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)
-)
+import './document_upload'
+import './spinner'
diff --git a/src/open_inwoner/js/components/cases/spinner.js b/src/open_inwoner/js/components/cases/spinner.js
new file mode 100644
index 0000000000..3854557dc1
--- /dev/null
+++ b/src/open_inwoner/js/components/cases/spinner.js
@@ -0,0 +1,11 @@
+const htmx = (window.htmx = require('htmx.org'))
+
+htmx.on('htmx:afterSwap', (e) => {
+  if (
+    e.detail.target.id === 'cases-content' ||
+    e.detail.target.id === 'submissions-content'
+  )
+    document
+      .getElementById('spinner-container')
+      .classList.add('loader-container--hide')
+})
diff --git a/src/open_inwoner/js/components/index.js b/src/open_inwoner/js/components/index.js
index e141c7edfa..5966b3b1af 100644
--- a/src/open_inwoner/js/components/index.js
+++ b/src/open_inwoner/js/components/index.js
@@ -3,10 +3,13 @@ import 'htmx.org'
 import './accessibility'
 import './actions'
 import './anchor-menu'
+import { AnchorMobile } from './anchor-menu/anchor-menu-mobile'
+import { CreateGumshoe } from './anchor-menu/anchor-menu'
 import './autocomplete-search'
 import './autocomplete'
 import './autosumbit'
 import './cases'
+import { DisableSubmitButton } from './cases/document_upload'
 import './confirmation'
 import './contacts'
 import './datepicker'
@@ -16,12 +19,15 @@ import './header'
 import './map'
 import './message-file'
 import './notifications'
+import { Notification } from './notifications'
 import './plans'
 import './preview'
 import './questionnaire'
 import './search'
 import './toggle'
 import './upload-document'
+import { ShowInfo } from './upload-document/show-file-info'
+import { FileInputError } from './upload-document/file-input-errors'
 import './session'
 import './twofactor-sms'
 
@@ -36,21 +42,38 @@ htmx.config.includeIndicatorStyles = false
 // define selectors and callables to apply after we loaded a html fragment
 const elementWrappers = [
   [Dropdown.selector, (elt) => new Dropdown(elt)],
+  [CreateGumshoe.selector, (elt) => new CreateGumshoe(elt)],
+  [DisableSubmitButton.selector, (elt) => new DisableSubmitButton(elt)],
+  [ShowInfo.selector, (elt) => new ShowInfo(elt)],
+  [FileInputError.selector, (elt) => new FileInputError(elt)],
+  [Notification.selector, (elt) => new Notification(elt)],
+  [AnchorMobile.selector, (elt) => new AnchorMobile(elt)],
   // add more when needed
 ]
 
+// harden against multiple events
+// should not be needed but protects against unforeseen issues
+let activeElements = []
+
 function wrapComponentsOf(targetElement) {
+  console.debug(['wrapComponentsOf', targetElement])
   // apply the javascript component wrappers
   for (const [selector, callable] of elementWrappers) {
     for (const elt of htmx.findAll(targetElement, selector)) {
-      callable(elt)
-      console.debug(['htmx re-activated component on: ' + selector, elt])
+      if (activeElements.indexOf(elt) < 0) {
+        callable(elt)
+        activeElements.push(elt)
+        console.log(['htmx re-activated component on: ' + selector, elt])
+      } else {
+        console.debug([
+          'htmx skipped duplicate re-activation of component: ' + selector,
+          elt,
+        ])
+      }
     }
   }
+  // clean-up removed elements
+  activeElements = activeElements.filter((elt) => elt.isConnected)
 }
 
-htmx.onLoad(() => {
-  document.body.addEventListener('htmx:afterSwap', (event) => {
-    wrapComponentsOf(event.target)
-  })
-})
+htmx.onLoad(wrapComponentsOf)
diff --git a/src/open_inwoner/js/components/notifications/index.js b/src/open_inwoner/js/components/notifications/index.js
index 78d14c2c52..fcfd065276 100644
--- a/src/open_inwoner/js/components/notifications/index.js
+++ b/src/open_inwoner/js/components/notifications/index.js
@@ -1,11 +1,10 @@
-/** @type {NodeListOf<Element>} */
-const NOTIFICATIONS = document.querySelectorAll('.notification')
-
 /**
  * Notification class.
  * @class
  */
-class Notification {
+export class Notification {
+  static selector = '.notification'
+
   /**
    * Constructor method.
    * @param {HTMLElement} node
@@ -44,4 +43,7 @@ class Notification {
 }
 
 // Start!
+
+/** @type {NodeListOf<Element>} */
+const NOTIFICATIONS = document.querySelectorAll(Notification.selector)
 ;[...NOTIFICATIONS].forEach((node) => new Notification(node))
diff --git a/src/open_inwoner/js/components/upload-document/file-input-errors.js b/src/open_inwoner/js/components/upload-document/file-input-errors.js
index f7646c5279..16e7e4c1d3 100644
--- a/src/open_inwoner/js/components/upload-document/file-input-errors.js
+++ b/src/open_inwoner/js/components/upload-document/file-input-errors.js
@@ -1,16 +1,28 @@
-const documentUpload = document.getElementById('form_upload')
-const uploadError = document.querySelectorAll('.notifications')
-// get info
-const getFormInfo = document.querySelectorAll('.form__control--info')
+export class FileInputError {
+  static selector = '.notifications__errors'
 
-// if errors are present, scroll and trigger opened state
-if (uploadError.length > 1) {
-  documentUpload.scrollIntoView({
-    block: 'center',
-    behavior: 'smooth',
-  })
-  // documentUpload.classList.add('upload--open')
-  getFormInfo.forEach((elem) => {
-    elem.style.display = 'block'
-  })
+  constructor(node) {
+    this.uploadError = node
+    this.showErrors()
+  }
+
+  showErrors() {
+    const documentUpload = document.getElementById('form_upload')
+    // get info
+    const getFormInfo = document.querySelectorAll('.form__control__info')
+
+    // if errors are present, scroll and trigger opened state
+    documentUpload.scrollIntoView({
+      block: 'center',
+      behavior: 'smooth',
+    })
+
+    getFormInfo.forEach((elem) => {
+      elem.classList.remove('form__control__info')
+      elem.classList.add('form__control__info--active')
+    })
+  }
 }
+
+const uploadErrors = document.querySelectorAll(FileInputError.selector)
+;[...uploadErrors].forEach((uploadError) => new FileInputError(uploadError))
diff --git a/src/open_inwoner/js/components/upload-document/show-file-info.js b/src/open_inwoner/js/components/upload-document/show-file-info.js
index 603b5765b1..b2eee1f362 100644
--- a/src/open_inwoner/js/components/upload-document/show-file-info.js
+++ b/src/open_inwoner/js/components/upload-document/show-file-info.js
@@ -1,95 +1,106 @@
-const fileUploadInput = document.getElementById('id_file')
-const sizeInfo = document.getElementById('upload_size')
-const nameInfo = document.getElementById('upload_name')
-const validationInfo = document.getElementById('upload_error')
-const closeButton = document.getElementById('close_upload')
-const submit_upload = document.getElementById('submit_upload')
-// show/hide after validation
-const iconDrive = document.querySelectorAll('.drive')
-// show info
-const formControlInfo = document.querySelectorAll('.form__control--info')
+export class ShowInfo {
+  static selector = '.upload'
 
-if (fileUploadInput) {
-  // Convert the file size to a readable format
-  const formatFileSize = function (bytes) {
-    const suffixes = ['B', 'kB', 'MB', 'GB', 'TB']
-    const i = Math.floor(Math.log(bytes) / Math.log(1024))
-    return `${(bytes / Math.pow(1024, i)).toFixed(2)} ${suffixes[i]}`
+  constructor(node) {
+    this.fileUploadInput = node
+    this.showData()
   }
-  // initial values
-  submit_upload.disabled = true
-  validationInfo.classList.add('error')
-  closeButton.classList.add('error')
-  iconDrive.forEach((elem) => {
-    elem.classList.add('error')
-  })
 
-  formControlInfo.forEach((elem) => {
-    elem.style.display = 'none'
-  })
+  showData() {
+    const sizeInfo = document.getElementById('upload_size')
+    const nameInfo = document.getElementById('upload_name')
+    const validationInfo = document.getElementById('upload_error')
+    const closeButton = document.getElementById('close_upload')
+    const submit_upload = document.getElementById('submit_upload')
+    // show/hide after validation
+    const iconDrive = document.querySelectorAll('.drive')
+    // show info
+    const formControlInfo = document.querySelectorAll('.form__control__info')
 
-  fileUploadInput.addEventListener('change', function (e) {
-    const files = e.target.files
+    // Convert the file size to a readable format
+    const formatFileSize = function (bytes) {
+      const suffixes = ['B', 'kB', 'MB', 'GB', 'TB']
+      const i = Math.floor(Math.log(bytes) / Math.log(1024))
+      return `${(bytes / Math.pow(1024, i)).toFixed(2)} ${suffixes[i]}`
+    }
+    // initial values
+    submit_upload.disabled = true
+    validationInfo.classList.add('error')
+    closeButton.classList.add('error')
+    iconDrive.forEach((elem) => {
+      elem.classList.add('error')
+    })
 
-    if ((files.length === 0) | (files === null) | (files === undefined)) {
-      submit_upload.disabled = true
-      validationInfo.classList.add('error')
-      closeButton.classList.add('error')
-      iconDrive.forEach((elem) => {
-        elem.classList.add('error')
-      })
+    this.fileUploadInput.addEventListener('change', function (e) {
+      const files = e.target.files
 
-      // Hide the size element if user doesn't choose any file
-      formControlInfo.forEach((elem) => {
-        elem.style.display = 'none'
-      })
-    } else {
-      submit_upload.disabled = false
-      validationInfo.classList.remove('error')
-      closeButton.classList.remove('error')
-      iconDrive.forEach((elem) => {
-        elem.classList.remove('error')
-      })
+      if ((files.length === 0) | (files === null) | (files === undefined)) {
+        submit_upload.disabled = true
+        validationInfo.classList.add('error')
+        closeButton.classList.add('error')
+        iconDrive.forEach((elem) => {
+          elem.classList.add('error')
+        })
+
+        // Hide the size element if user doesn't choose any file
+        formControlInfo.forEach((elem) => {
+          elem.style.display = 'none'
+        })
+      } else {
+        submit_upload.disabled = false
+        validationInfo.classList.remove('error')
+        closeButton.classList.remove('error')
+        iconDrive.forEach((elem) => {
+          elem.classList.remove('error')
+        })
+
+        // Display info
+        sizeInfo.textContent = formatFileSize(files[0].size)
+        nameInfo.textContent = `${files[0].name}`
+        // Display in DOM
+        formControlInfo.forEach((elem) => {
+          elem.classList.remove('form__control__info')
+          elem.classList.add('form__control__info--active')
+        })
+      }
+    })
 
-      // Display info
-      sizeInfo.textContent = formatFileSize(files[0].size)
-      nameInfo.textContent = `${files[0].name}`
-      // Display in DOM
-      formControlInfo.forEach((elem) => {
-        elem.style.display = 'block'
+    if (closeButton) {
+      closeButton.addEventListener('click', (event) => {
+        submit_upload.disabled = true
+        validationInfo.classList.remove('error')
+        closeButton.classList.remove('error')
+        iconDrive.forEach((elem) => {
+          elem.classList.remove('error')
+        })
+
+        formControlInfo.forEach((elem) => {
+          elem.classList.remove('form__control__info--active')
+          elem.classList.add('form__control__info')
+        })
       })
     }
-  })
 
-  if (closeButton) {
-    closeButton.addEventListener('click', (event) => {
-      submit_upload.disabled = true
-      validationInfo.classList.remove('error')
-      closeButton.classList.remove('error')
-      iconDrive.forEach((elem) => {
-        elem.classList.remove('error')
+    // if there is only 1 case-type, remove select and its surrounding label
+    document
+      .querySelectorAll('.file-type__select')
+      .forEach(function (selectType) {
+        if (selectType.querySelector('input[type="hidden"]')) {
+          selectType.style.display = 'none'
+        }
       })
 
-      formControlInfo.forEach((elem) => {
-        elem.style.display = 'none'
-      })
+    // Firefox focus bug fix
+    this.fileUploadInput.addEventListener('focus', function () {
+      this.fileUploadInput.classList.add('has-focus')
     })
-  }
-
-  // if there is only 1 case-type, remove select and its surrounding label
-  document
-    .querySelectorAll('.file-type__select')
-    .forEach(function (selectType) {
-      if (selectType.querySelector('input[type="hidden"]')) {
-        selectType.style.display = 'none'
-      }
+    this.fileUploadInput.addEventListener('blur', function () {
+      this.fileUploadInput.classList.remove('has-focus')
     })
-
-  // Firefox focus bug fix
-  fileUploadInput.addEventListener('focus', function () {
-    fileUploadInput.classList.add('has-focus')
-  })
-  fileUploadInput.addEventListener('blur', function () {
-    fileUploadInput.classList.remove('has-focus')
-  })
+  }
 }
+
+const fileUploadInputs = document.querySelectorAll(ShowInfo.selector)
+;[...fileUploadInputs].forEach(
+  (fileUploadInput) => new ShowInfo(fileUploadInput)
+)
diff --git a/src/open_inwoner/openzaak/notifications.py b/src/open_inwoner/openzaak/notifications.py
index 20119c9f74..6d1d37e6a7 100644
--- a/src/open_inwoner/openzaak/notifications.py
+++ b/src/open_inwoner/openzaak/notifications.py
@@ -336,7 +336,7 @@ def send_case_update_email(user: User, case: Zaak):
     send the actual mail
     """
     case_detail_url = build_absolute_url(
-        reverse("cases:case_detail", kwargs={"object_id": str(case.uuid)})
+        reverse("cases:case_detail_content", kwargs={"object_id": str(case.uuid)})
     )
 
     template = find_template("case_notification")
diff --git a/src/open_inwoner/openzaak/tests/test_case_detail.py b/src/open_inwoner/openzaak/tests/test_case_detail.py
index 98864978fe..7df501e778 100644
--- a/src/open_inwoner/openzaak/tests/test_case_detail.py
+++ b/src/open_inwoner/openzaak/tests/test_case_detail.py
@@ -22,7 +22,7 @@
 
 from open_inwoner.accounts.choices import LoginTypeChoices
 from open_inwoner.accounts.tests.factories import UserFactory
-from open_inwoner.accounts.views.cases import SimpleFile
+from open_inwoner.cms.cases.views.status import SimpleFile
 from open_inwoner.openzaak.tests.factories import (
     ZaakTypeConfigFactory,
     ZaakTypeInformatieObjectTypeConfigFactory,
@@ -69,7 +69,7 @@ def setUpTestData(cls):
         cls.config.save()
 
         cls.case_detail_url = reverse(
-            "cases:case_detail",
+            "cases:case_detail_content",
             kwargs={"object_id": "d8bbdeb7-770f-4ca9-b1ea-77b4730bf67d"},
         )
 
@@ -238,8 +238,8 @@ def setUpTestData(cls):
             informatieobjecttype=cls.informatie_object_type["url"],
             status="definitief",
             vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
-            bestandsnaam="document.txt",
-            titel="document_title.txt",
+            bestandsnaam="uploaded_document.txt",
+            titel="uploaded_document_title.txt",
             bestandsomvang=123,
         )
         cls.uploaded_informatie_object = generate_oas_component(
@@ -280,7 +280,7 @@ def setUpTestData(cls):
         )
 
         cls.informatie_object_file = SimpleFile(
-            name="document_title.txt",
+            name="uploaded_document_title.txt",
             size=123,
             url=reverse(
                 "cases:document_download",
@@ -389,9 +389,9 @@ def test_page_displays_expected_data(self, m):
         response = self.app.get(self.case_detail_url, user=self.user)
 
         self.assertContains(response, "ZAAK-2022-0000000024")
-        self.assertContains(response, "Zaak naar aanleiding van ingezonden formulier")
+        self.assertContains(response, "Coffee zaaktype")
         self.assertContains(response, "Finish")
-        self.assertContains(response, "document")
+        self.assertContains(response, "uploaded_document_title")
         self.assertContains(response, "Foo Bar van der Bazz")
         self.assertContains(response, "resultaat toelichting")
 
@@ -399,7 +399,7 @@ def test_page_reformats_zaak_identificatie(self, m):
         self._setUpMocks(m)
 
         with patch(
-            "open_inwoner.accounts.views.cases.format_zaak_identificatie",
+            "open_inwoner.cms.cases.views.status.format_zaak_identificatie",
             wraps=format_zaak_identificatie,
         ) as spy_format:
             self.app.get(self.case_detail_url, user=self.user)
@@ -445,7 +445,10 @@ def test_user_is_redirected_to_root_when_not_logged_in_via_digid(self, m):
         )
         response = self.app.get(self.case_detail_url, user=user)
 
-        self.assertRedirects(response, reverse("pages-root"))
+        self.assertTemplateUsed("pages/cases/403.html")
+        self.assertContains(
+            response, _("Sorry, you don't have access to this page (403)")
+        )
 
     def test_anonymous_user_has_no_access_to_status_page(self, m):
         self._setUpMocks(m)
@@ -454,7 +457,7 @@ def test_anonymous_user_has_no_access_to_status_page(self, m):
 
         self.assertRedirects(
             response,
-            f"{reverse('login')}?next={reverse('cases:case_detail', kwargs={'object_id': 'd8bbdeb7-770f-4ca9-b1ea-77b4730bf67d'})}",
+            f"{reverse('login')}?next={reverse('cases:case_detail_content', kwargs={'object_id': 'd8bbdeb7-770f-4ca9-b1ea-77b4730bf67d'})}",
         )
 
     def test_no_access_when_no_roles_are_found_for_user_bsn(self, m):
@@ -476,7 +479,11 @@ def test_no_access_when_no_roles_are_found_for_user_bsn(self, m):
         #     json=paginated_response([self.status_finish, self.status_new]),
         # )
         response = self.app.get(self.case_detail_url, user=self.user)
-        self.assertRedirects(response, reverse("pages-root"))
+
+        self.assertTemplateUsed("pages/cases/403.html")
+        self.assertContains(
+            response, _("Sorry, you don't have access to this page (403)")
+        )
 
     def test_no_data_is_retrieved_when_zaaktype_is_internal(self, m):
         self._setUpOASMocks(m)
@@ -528,12 +535,16 @@ def test_no_access_when_case_is_confidential(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak_invisible["uuid"]},
             ),
             user=self.user,
         )
-        self.assertRedirects(response, reverse("pages-root"))
+
+        self.assertTemplateUsed("pages/cases/403.html")
+        self.assertContains(
+            response, _("Sorry, you don't have access to this page (403)")
+        )
 
     def test_single_expected_information_object_type_is_available_in_upload_form(
         self, m
@@ -553,7 +564,7 @@ def test_single_expected_information_object_type_is_available_in_upload_form(
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -587,7 +598,7 @@ def test_expected_information_object_types_are_available_in_upload_form(self, m)
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -623,7 +634,7 @@ def test_case_type_config_description_is_rendered_when_internal_upload(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -653,7 +664,7 @@ def test_fixed_text_is_rendered_when_no_description_in_internal_upload(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -669,7 +680,7 @@ def test_upload_form_is_not_rendered_when_no_case_exists(self, m):
         m.get(self.zaak["url"], status_code=500)
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -685,7 +696,7 @@ def test_upload_form_is_not_rendered_when_no_information_object_types_exist(
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -771,7 +782,7 @@ def test_upload_file_flow_fails_with_invalid_file_extension(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -811,7 +822,7 @@ def test_upload_with_larger_file_size_fails(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -846,7 +857,7 @@ def test_external_upload_section_is_rendered(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -871,7 +882,7 @@ def test_case_type_config_description_is_rendered_when_external_upload(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -892,7 +903,7 @@ def test_fixed_text_is_rendered_when_no_description_in_external_upload(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -916,7 +927,7 @@ def test_external_upload_section_is_not_rendered_when_upload_disabled(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -939,7 +950,7 @@ def test_external_upload_section_is_not_rendered_when_no_url_specified(self, m):
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
@@ -962,7 +973,7 @@ def test_external_upload_section_is_not_rendered_when_upload_disabled_and_no_url
 
         response = self.app.get(
             reverse(
-                "cases:case_detail",
+                "cases:case_detail_content",
                 kwargs={"object_id": self.zaak["uuid"]},
             ),
             user=self.user,
diff --git a/src/open_inwoner/openzaak/tests/test_cases.py b/src/open_inwoner/openzaak/tests/test_cases.py
index ff13db9167..212e287d25 100644
--- a/src/open_inwoner/openzaak/tests/test_cases.py
+++ b/src/open_inwoner/openzaak/tests/test_cases.py
@@ -3,7 +3,7 @@
 
 from django.contrib.auth.models import AnonymousUser
 from django.test.utils import override_settings
-from django.urls import reverse, reverse_lazy
+from django.urls import reverse_lazy
 
 import requests_mock
 from django_webtest import WebTest
@@ -15,7 +15,7 @@
 
 from open_inwoner.accounts.choices import LoginTypeChoices
 from open_inwoner.accounts.tests.factories import UserFactory
-from open_inwoner.accounts.views.cases import CaseListMixin
+from open_inwoner.cms.cases.views.mixins import CaseListMixin
 from open_inwoner.utils.test import ClearCachesMixin, paginated_response
 
 from ...utils.tests.helpers import AssertRedirectsMixin
@@ -27,10 +27,14 @@
 
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
 class CaseListAccessTests(AssertRedirectsMixin, ClearCachesMixin, WebTest):
-    urls = [
+    outer_urls = [
         reverse_lazy("cases:open_cases"),
         reverse_lazy("cases:closed_cases"),
     ]
+    inner_urls = [
+        reverse_lazy("cases:open_cases_content"),
+        reverse_lazy("cases:closed_cases_content"),
+    ]
 
     @classmethod
     def setUpTestData(cls):
@@ -47,28 +51,37 @@ def setUpTestData(cls):
         cls.config.catalogi_service = cls.catalogi_service
         cls.config.save()
 
-    def test_user_is_redirected_to_root_when_not_logged_in_via_digid(self):
+    def test_user_access_is_forbidden_when_not_logged_in_via_digid(self):
         # User's bsn is None when logged in by email (default method)
         user = UserFactory(
             first_name="",
             last_name="",
             login_type=LoginTypeChoices.default,
         )
-        for url in self.urls:
+        for url in self.outer_urls:
             with self.subTest(url):
-                response = self.app.get(url, user=user)
-
-                self.assertRedirects(response, reverse("pages-root"))
+                self.app.get(url, user=user, status=403)
 
     def test_anonymous_user_has_no_access_to_cases_page(self):
         user = AnonymousUser()
 
-        for url in self.urls:
+        for url in self.outer_urls:
             with self.subTest(url):
                 response = self.app.get(url, user=user)
 
                 self.assertRedirectsLogin(response, next=url)
 
+    def test_bad_request_when_no_htmx_in_inner_urls(self):
+        user = UserFactory(
+            first_name="",
+            last_name="",
+            login_type=LoginTypeChoices.default,
+        )
+
+        for url in self.inner_urls:
+            with self.subTest(url):
+                self.app.get(url, user=user, status=400)
+
     def test_missing_zaak_client_returns_empty_list(self):
         user = UserFactory(
             login_type=LoginTypeChoices.digid, bsn="900222086", email="john@smith.nl"
@@ -76,11 +89,10 @@ def test_missing_zaak_client_returns_empty_list(self):
         self.config.zaak_service = None
         self.config.save()
 
-        for url in self.urls:
+        for url in self.inner_urls:
             with self.subTest(url):
-                response = self.app.get(url, user=user)
+                response = self.app.get(url, user=user, headers={"HX-Request": "true"})
 
-                self.assertEquals(response.status_code, 200)
                 self.assertListEqual(response.context.get("cases"), [])
 
     @requests_mock.Mocker()
@@ -94,11 +106,10 @@ def test_no_cases_are_retrieved_when_http_404(self, m):
             status_code=404,
         )
 
-        for url in self.urls:
+        for url in self.inner_urls:
             with self.subTest(url):
-                response = self.app.get(url, user=user)
+                response = self.app.get(url, user=user, headers={"HX-Request": "true"})
 
-                self.assertEquals(response.status_code, 200)
                 self.assertListEqual(response.context.get("cases"), [])
 
     @requests_mock.Mocker()
@@ -112,19 +123,18 @@ def test_no_cases_are_retrieved_when_http_500(self, m):
             status_code=500,
         )
 
-        for url in self.urls:
+        for url in self.inner_urls:
             with self.subTest(url):
-                response = self.app.get(url, user=user)
+                response = self.app.get(url, user=user, headers={"HX-Request": "true"})
 
-                self.assertEquals(response.status_code, 200)
                 self.assertListEqual(response.context.get("cases"), [])
 
 
 @requests_mock.Mocker()
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
 class CaseListViewTests(ClearCachesMixin, WebTest):
-    url_open = reverse_lazy("cases:open_cases")
-    url_closed = reverse_lazy("cases:closed_cases")
+    inner_url_open = reverse_lazy("cases:open_cases_content")
+    inner_url_closed = reverse_lazy("cases:closed_cases_content")
 
     @classmethod
     def setUpTestData(cls):
@@ -307,7 +317,9 @@ def _setUpMocks(self, m):
     def test_list_open_cases(self, m):
         self._setUpMocks(m)
 
-        response = self.app.get(self.url_open, user=self.user)
+        response = self.app.get(
+            self.inner_url_open, user=self.user, headers={"HX-Request": "true"}
+        )
 
         self.assertListEqual(
             response.context["cases"],
@@ -359,10 +371,12 @@ def test_list_open_cases_reformats_zaak_identificatie(self, m):
         self._setUpMocks(m)
 
         with patch(
-            "open_inwoner.accounts.views.cases.format_zaak_identificatie",
+            "open_inwoner.cms.cases.views.mixins.format_zaak_identificatie",
             wraps=format_zaak_identificatie,
         ) as spy_format:
-            self.app.get(self.url_open, user=self.user)
+            self.app.get(
+                self.inner_url_open, user=self.user, headers={"HX-Request": "true"}
+            )
 
         spy_format.assert_called()
         self.assertEqual(spy_format.call_count, 2)
@@ -370,7 +384,9 @@ def test_list_open_cases_reformats_zaak_identificatie(self, m):
     def test_list_open_cases_logs_displayed_case_ids(self, m):
         self._setUpMocks(m)
 
-        self.app.get(self.url_open, user=self.user)
+        self.app.get(
+            self.inner_url_open, user=self.user, headers={"HX-Request": "true"}
+        )
 
         # check access logs for displayed cases
         logs = list(TimelineLog.objects.all())
@@ -396,7 +412,9 @@ def test_list_open_cases_logs_displayed_case_ids(self, m):
     def test_list_closed_cases(self, m):
         self._setUpMocks(m)
 
-        response = self.app.get(self.url_closed, user=self.user)
+        response = self.app.get(
+            self.inner_url_closed, user=self.user, headers={"HX-Request": "true"}
+        )
 
         self.assertListEqual(
             response.context.get("cases"),
@@ -439,10 +457,12 @@ def test_list_closed_cases_reformats_zaak_identificatie(self, m):
         self._setUpMocks(m)
 
         with patch(
-            "open_inwoner.accounts.views.cases.format_zaak_identificatie",
+            "open_inwoner.cms.cases.views.mixins.format_zaak_identificatie",
             wraps=format_zaak_identificatie,
         ) as spy_format:
-            self.app.get(self.url_closed, user=self.user)
+            self.app.get(
+                self.inner_url_closed, user=self.user, headers={"HX-Request": "true"}
+            )
 
         spy_format.assert_called()
         self.assertEqual(spy_format.call_count, 1)
@@ -450,7 +470,9 @@ def test_list_closed_cases_reformats_zaak_identificatie(self, m):
     def test_list_closed_cases_logs_displayed_case_ids(self, m):
         self._setUpMocks(m)
 
-        self.app.get(self.url_closed, user=self.user)
+        self.app.get(
+            self.inner_url_closed, user=self.user, headers={"HX-Request": "true"}
+        )
 
         # check access logs for displayed cases
         logs = list(TimelineLog.objects.all())
@@ -475,7 +497,9 @@ def test_list_cases_paginated(self, m):
         self._setUpMocks(m)
 
         # 1. test first page
-        response_1 = self.app.get(self.url_open, user=self.user)
+        response_1 = self.app.get(
+            self.inner_url_open, user=self.user, headers={"HX-Request": "true"}
+        )
 
         self.assertListEqual(
             response_1.context.get("cases"),
@@ -494,8 +518,10 @@ def test_list_cases_paginated(self, m):
         self.assertContains(response_1, "?page=2")
 
         # 2. test next page
-        next_page = f"{self.url_open}?page=2"
-        response_2 = self.app.get(next_page, user=self.user)
+        next_page = f"{self.inner_url_open}?page=2"
+        response_2 = self.app.get(
+            next_page, user=self.user, headers={"HX-Request": "true"}
+        )
 
         self.assertListEqual(
             response_2.context.get("cases"),
@@ -518,7 +544,9 @@ def test_list_cases_paginated_logs_displayed_case_ids(self, m):
         self._setUpMocks(m)
 
         # 1. test first page
-        response = self.app.get(self.url_open, user=self.user)
+        response = self.app.get(
+            self.inner_url_open, user=self.user, headers={"HX-Request": "true"}
+        )
         self.assertEqual(response.context.get("cases")[0]["uuid"], self.zaak2["uuid"])
 
         # check access logs for displayed cases
@@ -540,8 +568,10 @@ def test_list_cases_paginated_logs_displayed_case_ids(self, m):
         TimelineLog.objects.all().delete()
 
         # 2. test next page
-        next_page = f"{self.url_open}?page=2"
-        response = self.app.get(next_page, user=self.user)
+        next_page = f"{self.inner_url_open}?page=2"
+        response = self.app.get(
+            next_page, user=self.user, headers={"HX-Request": "true"}
+        )
         self.assertEqual(response.context.get("cases")[0]["uuid"], self.zaak1["uuid"])
 
         # check access logs for displayed cases
diff --git a/src/open_inwoner/openzaak/tests/test_cases_cache.py b/src/open_inwoner/openzaak/tests/test_cases_cache.py
index 18e675b1a9..6ee80ad122 100644
--- a/src/open_inwoner/openzaak/tests/test_cases_cache.py
+++ b/src/open_inwoner/openzaak/tests/test_cases_cache.py
@@ -24,7 +24,7 @@
 @requests_mock.Mocker()
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
 class OpenCaseListCacheTests(ClearCachesMixin, WebTest):
-    url = reverse_lazy("cases:open_cases")
+    inner_url = reverse_lazy("cases:open_cases_content")
 
     @classmethod
     def setUpTestData(cls):
@@ -201,7 +201,7 @@ def test_case_types_are_cached(self, m):
         # Cache is empty before the request
         self.assertIsNone(cache.get(f"case_type:{self.zaaktype['url']}"))
 
-        self.app.get(self.url, user=self.user)
+        self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
         # Case type is cached after the request
         self.assertIsNotNone(cache.get(f"case_type:{self.zaaktype['url']}"))
@@ -210,7 +210,7 @@ def test_cached_case_types_are_deleted_after_one_day(self, m):
         self._setUpMocks(m)
 
         with freeze_time("2022-01-01 12:00") as frozen_time:
-            self.app.get(self.url, user=self.user)
+            self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
             # After one day the results should be deleted
             frozen_time.tick(delta=datetime.timedelta(days=1))
@@ -223,7 +223,7 @@ def test_cached_case_types_in_combination_with_new_ones(self, m):
             # First attempt
             self.assertIsNone(cache.get(f"case_type:{self.zaaktype['url']}"))
 
-            self.app.get(self.url, user=self.user)
+            self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
             self.assertIsNotNone(cache.get(f"case_type:{self.zaaktype['url']}"))
 
@@ -233,7 +233,7 @@ def test_cached_case_types_in_combination_with_new_ones(self, m):
             frozen_time.tick(delta=datetime.timedelta(minutes=3))
             self.assertIsNone(cache.get(f"case_type:{self.new_zaaktype['url']}"))
 
-            self.app.get(self.url, user=self.user)
+            self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
             self.assertIsNotNone(cache.get(f"case_type:{self.zaaktype['url']}"))
             self.assertIsNotNone(cache.get(f"case_type:{self.new_zaaktype['url']}"))
@@ -242,7 +242,7 @@ def test_cached_status_types_are_deleted_after_one_day(self, m):
         self._setUpMocks(m)
 
         with freeze_time("2022-01-01 12:00") as frozen_time:
-            self.app.get(self.url, user=self.user)
+            self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
             # After one day the results should be deleted
             frozen_time.tick(delta=datetime.timedelta(hours=24))
@@ -260,7 +260,7 @@ def test_statuses_are_cached(self, m):
         self.assertIsNone(cache.get(f"status:{self.status1['url']}"))
         self.assertIsNone(cache.get(f"status:{self.status2['url']}"))
 
-        self.app.get(self.url, user=self.user)
+        self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
         # Status is cached after the request
         self.assertIsNotNone(cache.get(f"status:{self.status1['url']}"))
@@ -270,7 +270,7 @@ def test_cached_statuses_are_deleted_after_one_hour(self, m):
         self._setUpMocks(m)
 
         with freeze_time("2022-01-01 12:00") as frozen_time:
-            self.app.get(self.url, user=self.user)
+            self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
             # After one hour the results should be deleted
             frozen_time.tick(delta=datetime.timedelta(hours=1))
@@ -285,7 +285,7 @@ def test_cached_statuses_in_combination_with_new_ones(self, m):
             self.assertIsNone(cache.get(f"status:{self.status1['url']}"))
             self.assertIsNone(cache.get(f"status:{self.status2['url']}"))
 
-            self.app.get(self.url, user=self.user)
+            self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
             self.assertIsNotNone(cache.get(f"status:{self.status1['url']}"))
             self.assertIsNotNone(cache.get(f"status:{self.status2['url']}"))
@@ -296,7 +296,7 @@ def test_cached_statuses_in_combination_with_new_ones(self, m):
             frozen_time.tick(delta=datetime.timedelta(minutes=3))
             self.assertIsNone(cache.get(f"status:{self.new_status['url']}"))
 
-            self.app.get(self.url, user=self.user)
+            self.app.get(self.inner_url, user=self.user, headers={"HX-Request": "true"})
 
             self.assertIsNotNone(cache.get(f"status:{self.new_status['url']}"))
             self.assertIsNotNone(cache.get(f"status:{self.status1['url']}"))
@@ -308,7 +308,7 @@ class ClosedCaseListCacheTests(OpenCaseListCacheTests):
     run the same tests as for open cases
     """
 
-    url = reverse_lazy("cases:closed_cases")
+    inner_url = reverse_lazy("cases:closed_cases_content")
 
     @classmethod
     def setUpTestData(cls):
diff --git a/src/open_inwoner/openzaak/tests/test_documents.py b/src/open_inwoner/openzaak/tests/test_documents.py
index ffe69eecc6..1e8ed20e45 100644
--- a/src/open_inwoner/openzaak/tests/test_documents.py
+++ b/src/open_inwoner/openzaak/tests/test_documents.py
@@ -21,7 +21,7 @@
 
 from open_inwoner.accounts.choices import LoginTypeChoices
 from open_inwoner.accounts.tests.factories import UserFactory
-from open_inwoner.accounts.views.cases import SimpleFile
+from open_inwoner.cms.cases.views.status import SimpleFile
 from open_inwoner.utils.test import ClearCachesMixin, paginated_response
 
 from ..cases import connect_case_with_document
diff --git a/src/open_inwoner/openzaak/tests/test_formapi.py b/src/open_inwoner/openzaak/tests/test_formapi.py
index b20d0b6931..fda1f53eec 100644
--- a/src/open_inwoner/openzaak/tests/test_formapi.py
+++ b/src/open_inwoner/openzaak/tests/test_formapi.py
@@ -71,7 +71,8 @@ def setUpTestData(cls):
         cls.config.save()
 
         cls.user = UserFactory(bsn="900222086")
-        cls.submissions_url = reverse("cases:open_submissions")
+        cls.outer_submissions_url = reverse("cases:open_submissions")
+        cls.inner_submissions_url = reverse("cases:open_submissions_content")
 
     def test_api_fetch(self, m):
         data = ESuiteData().install_mocks(m)
@@ -84,7 +85,9 @@ def test_api_fetch(self, m):
     def test_page_shows_open_submissions(self, m):
         data = ESuiteData().install_mocks(m)
 
-        response = self.app.get(self.submissions_url, user=self.user)
+        response = self.app.get(
+            self.inner_submissions_url, user=self.user, headers={"HX-Request": "true"}
+        )
 
         self.assertContains(response, data.submission_1["naam"])
         self.assertContains(response, data.submission_1["vervolgLink"])
@@ -98,14 +101,15 @@ def test_page_shows_zero_submissions(self, m):
         data.response["count"] = 0
         data.install_mocks(m)
 
-        response = self.app.get(self.submissions_url, user=self.user)
+        response = self.app.get(
+            self.inner_submissions_url, user=self.user, headers={"HX-Request": "true"}
+        )
 
         self.assertContains(response, _("Er zijn geen open aanvragen."))
 
     def test_requires_auth(self, m):
-        response = self.app.get(self.submissions_url)
-        self.assertRedirectsLogin(response, next=self.submissions_url)
+        response = self.app.get(self.outer_submissions_url)
+        self.assertRedirectsLogin(response, next=self.outer_submissions_url)
 
     def test_requires_bsn(self, m):
-        response = self.app.get(self.submissions_url, user=UserFactory(bsn=""))
-        self.assertRedirects(response, reverse("pages-root"))
+        self.app.get(self.outer_submissions_url, user=UserFactory(bsn=""), status=403)
diff --git a/src/open_inwoner/scss/components/Cases/Cases.scss b/src/open_inwoner/scss/components/Cases/Cases.scss
index 30fb762d7f..e0aa282ea1 100644
--- a/src/open_inwoner/scss/components/Cases/Cases.scss
+++ b/src/open_inwoner/scss/components/Cases/Cases.scss
@@ -7,6 +7,10 @@
       text-decoration: none;
     }
   }
+
+  a:hover {
+    cursor: pointer;
+  }
 }
 
 #document-upload {
diff --git a/src/open_inwoner/scss/components/Form/DocumentUpload.scss b/src/open_inwoner/scss/components/Form/DocumentUpload.scss
index ec028f6a48..34d76997d0 100644
--- a/src/open_inwoner/scss/components/Form/DocumentUpload.scss
+++ b/src/open_inwoner/scss/components/Form/DocumentUpload.scss
@@ -35,6 +35,14 @@
       }
     }
   }
+
+  .form__control__info {
+    display: none;
+
+    &--active {
+      display: block;
+    }
+  }
 }
 
 /// File-input site wide
diff --git a/src/open_inwoner/scss/components/Spinner/Spinner.scss b/src/open_inwoner/scss/components/Spinner/Spinner.scss
new file mode 100644
index 0000000000..3de2fd8246
--- /dev/null
+++ b/src/open_inwoner/scss/components/Spinner/Spinner.scss
@@ -0,0 +1,31 @@
+@keyframes spinner {
+  0% {
+    transform: translate3d(-50%, -50%, 0) rotate(0deg);
+  }
+  100% {
+    transform: translate3d(-50%, -50%, 0) rotate(360deg);
+  }
+}
+
+.loader-container {
+  &--hide {
+    display: none;
+  }
+
+  .rotate {
+    animation: rotate 2.5s linear infinite;
+  }
+  @keyframes rotate {
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .spinner-icon {
+    display: inline-block;
+    font-size: 50px;
+    color: var(--color-primary);
+    width: 50px;
+    height: 50px;
+  }
+}
diff --git a/src/open_inwoner/scss/components/_index.scss b/src/open_inwoner/scss/components/_index.scss
index 2ce6859591..7d5642596a 100644
--- a/src/open_inwoner/scss/components/_index.scss
+++ b/src/open_inwoner/scss/components/_index.scss
@@ -69,6 +69,7 @@
 @import './Questionnaire/Questionnaire.scss';
 @import './SearchResults/SearchResults.scss';
 @import './Social/Social.scss';
+@import './Spinner/Spinner.scss';
 @import './Status/StatusList.scss';
 @import './Step/StepIndicator.scss';
 @import './Sticky/Sticky.scss';
diff --git a/src/open_inwoner/templates/master.html b/src/open_inwoner/templates/master.html
index 2531031a3f..b4168c9174 100644
--- a/src/open_inwoner/templates/master.html
+++ b/src/open_inwoner/templates/master.html
@@ -38,11 +38,15 @@
         {% cms_toolbar %}
         {% header categories=menu_categories request=request breadcrumbs=breadcrumbs search_form=search_form has_general_faq_questions=has_general_faq_questions cms_apps=cms_apps %}
 
-        {% if anchors %}
-        {% anchor_menu anchors=anchors desktop=False %}
-            {% block extra_mobile_anchor %}{% endblock extra_mobile_anchor %}
-        {% endanchor_menu%}
+        {% if anchors and not custom_anchors %}
+            {% anchor_menu anchors=anchors desktop=False %}
+                {% block extra_mobile_anchor %}{% endblock extra_mobile_anchor %}
+            {% endanchor_menu%}
+        {% elif custom_anchors%}
+            {% block mobile_anchors %}
+            {% endblock mobile_anchors %}
         {% endif %}
+
         <div class="anchor__scroll" id="scroll-anchor">
             <div class="anchor__scroll-link">
                 {% button href="#top" text=_("Terug naar boven") icon="arrow_upward" pill=True %}
diff --git a/src/open_inwoner/templates/pages/cases/403.html b/src/open_inwoner/templates/pages/cases/403.html
new file mode 100644
index 0000000000..35ef944d04
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/403.html
@@ -0,0 +1,4 @@
+{% load i18n link_tags %}
+
+<h1 class="h1">{% trans "Sorry, you don't have access to this page (403)" %}</h1>
+<p class="p">{% link href="pages-root" text=_("Ga naar de home pagina") %}</p>
\ No newline at end of file
diff --git a/src/open_inwoner/templates/pages/cases/list.html b/src/open_inwoner/templates/pages/cases/list.html
deleted file mode 100644
index a578eda2b5..0000000000
--- a/src/open_inwoner/templates/pages/cases/list.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends 'master.html' %}
-{% 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 %}
-{% endblock sidebar_content %}
-
-{% block content %}
-    <h1 class="h1" id="title">{% trans "Mijn aanvragen" %}</h1>
-
-    <div class="cases">
-        <h2 class="h2" id="cases">{{ page_title }} ({{ paginator.count }})</h2>
-        {% render_grid %}
-            {% for case in cases %}
-                {% render_column start=forloop.counter_0|multiply:4 span=4 %}
-                <div class="card card--compact card--stretch">
-                    <div class="card__body">
-                    <a href="{% url 'cases:case_detail' object_id=case.uuid %}" class="cases__link">
-                            <h3 class="h3">
-                                <span class="link link__text">{{ case.description }}</span>
-                            </h3>
-                            {% render_list %}
-                                <span class="case-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.identificatie caption=_("Zaaknummer") compact=True strong=False %}
-                                </span>
-                            {% endrender_list %}
-
-                            <span class="link link--icon link--primary" aria-label="{% trans "Bekijk aanvraag" %}" title="{% trans "Bekijk aanvraag" %}">
-                                <span class="link__text">{% trans "Bekijk aanvraag" %}</span>
-                                {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %}
-                            </span>
-                    </a>
-                    </div>
-                </div>
-                {% endrender_column %}
-            {% endfor %}
-        {% endrender_grid %}
-
-        {% pagination page_obj=page_obj paginator=paginator request=request %}
-    </div>
-
-{% endblock content %}
diff --git a/src/open_inwoner/templates/pages/cases/list_inner.html b/src/open_inwoner/templates/pages/cases/list_inner.html
new file mode 100644
index 0000000000..dabb15f3fe
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/list_inner.html
@@ -0,0 +1,37 @@
+{% load i18n anchor_menu_tags grid_tags icon_tags list_tags pagination_tags utils %}
+
+<div id="cases-list-anchors-oob-desktop" hx-swap-oob="true">
+    {% anchor_menu anchors desktop=True %}
+</div>
+
+<h2 class="h2" id="cases">{{ page_title }} ({{ paginator.count }})</h2>
+{% render_grid %}
+    {% for case in cases %}
+        {% render_column start=forloop.counter_0|multiply:4 span=4 %}
+        <div class="card card--compact card--stretch">
+            <div class="card__body">
+                <a href="{% url 'cases:case_detail' object_id=case.uuid %}" class="cases__link">
+                    <p class="h4">
+                        <span class="link link__text">{{ case.description }}</span>
+                    </p>
+                    {% render_list %}
+                        <span class="case-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.identificatie caption=_("Zaaknummer") compact=True strong=False %}
+                        </span>
+                    {% endrender_list %}
+
+                    <span class="link link--icon link--primary" aria-label="{% trans "Bekijk aanvraag" %}" title="{% trans "Bekijk aanvraag" %}">
+                        <span class="link__text">{% trans "Bekijk aanvraag" %}</span>
+                        {% icon icon="arrow_forward" icon_position="after" primary=True outlined=True %}
+                    </span>
+                </a>
+            </div>
+        </div>
+        {% endrender_column %}
+    {% endfor %}
+{% endrender_grid %}
+
+{% pagination page_obj=page_obj paginator=paginator request=request hxget=hxget hxtarget='#cases-content' %}
+
diff --git a/src/open_inwoner/templates/pages/cases/list_outer.html b/src/open_inwoner/templates/pages/cases/list_outer.html
new file mode 100644
index 0000000000..7913b3b6ed
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/list_outer.html
@@ -0,0 +1,19 @@
+{% extends 'master.html' %}
+{% load i18n icon_tags %}
+
+{% block sidebar_content %}
+    <div id="cases-list-anchors-oob-desktop"></div>
+{% endblock sidebar_content %}
+
+
+{% block content %}
+    <h1 class="h1" id="title">{% trans "Mijn aanvragen" %}</h1>
+    
+    <div class="cases" id="cases-content"></div>
+    
+    <div class="loader-container" id="spinner-container">
+        <div class="spinner" id="spinner-id" hx-get="{{ hxget }}" hx-trigger="load" hx-target="#cases-content">
+            {% icon icon="autorenew" extra_classes="spinner-icon rotate" %}
+        </div>
+    </div>
+{% endblock content %}
diff --git a/src/open_inwoner/templates/pages/cases/status.html b/src/open_inwoner/templates/pages/cases/status.html
deleted file mode 100644
index 354c6799a7..0000000000
--- a/src/open_inwoner/templates/pages/cases/status.html
+++ /dev/null
@@ -1,104 +0,0 @@
-{% extends 'master.html' %}
-{% load i18n anchor_menu_tags card_tags dashboard_tags file_tags grid_tags status_tags table_tags solo_tags form_tags button_tags icon_tags %}
-
-{% block sidebar_content %}
-    {% if case %}
-        {% anchor_menu anchors desktop=True %}
-    {% endif %}
-{% endblock sidebar_content %}
-
-{% block content %}
-    {% get_solo 'openzaak.OpenZaakConfig' as openzaak_config %}
-
-    <div class="cases__detail">
-    {% if case %}
-        {% render_grid %}
-            {% render_column span=9 %}
-
-                {# Title/dashboard. #}
-                <h1 class="h1" id="title">{{ case.description }}</h1>
-                {% case_dashboard case %}
-                {% case_table case %}
-
-                {#  Status history. #}
-                {% if case.statuses %}
-                    <h2 class="h2" id="statuses">{% trans 'Status' %}</h2>
-                    {% status_list case.statuses %}
-                {% endif %}
-
-                {#  Documents. #}
-                {% if case.documents %}
-                    <h2 class="h2" id="documents">{% trans 'Documenten' %}</h2>
-                    {% case_document_list case.documents %}
-                {% endif %}
-
-                {% if case.internal_upload_enabled %}
-                    <h2 class="h2" id=>{% trans "Document uploaden" %}</h2>
-                    {% if case.case_type_config_description %}
-                        <p class="p">{{ case.case_type_config_description }}</p>
-                    {% else %}
-                        <p class="p">
-                            {% blocktranslate with max_filesize=openzaak_config.max_upload_size allowed_extensions=case.allowed_file_extensions|join:', ' %}
-                                Grootte max. {{ max_filesize }} MB, toegestane document formaten: {{ allowed_extensions }}.
-                            {% endblocktranslate %}
-                        </p>
-                    {% endif %}
-
-                    <section id="form_upload" class="form__open-upload">
-                        <div class="upload-interface">
-                        {#  if local upload is enabled #}
-                        {% render_form id="document-upload" form=form method="POST" submit_text=_("Bestand uploaden") enctype="multipart/form-data" show_required=True %}
-                            {% csrf_token %}
-                            <div id="info_container" class="info-container form__control--info">
-                                <div class="upload-interface__info">
-                                    <fieldset class="fieldset-container">
-                                        <div class="drive">{% icon icon="insert_drive_file" outlined=True icon_position="before" %}</div>
-                                        <div class="fieldset__content">
-                                            <div id="upload_error" class="upload-info upload-info__error">
-                                                <span>{% trans "Selecteer uw bestand opnieuw" %} {% icon icon="arrow_downward" outlined=True icon_position="before" %}</span></div>
-                                            <div id="upload_name" class="upload-info upload-info__name"></div>
-                                            <div id="upload_size" class="upload-info upload-info__size"></div>
-                                        </div>
-                                        <div class="close">{% button id="close_upload" icon="cancel" type='reset' text='' transparent=True icon_outlined=True icon_position="before" %}</div>
-                                    </fieldset>
-                                </div>
-                            </div>
-
-                            <div class="form__control--info">{% input form.title no_label=False no_help=True id="id_title" %}</div>
-
-                            <div class="form__control--info">{% input form.type no_label=False no_help=True icon="expand_more" icon_position="after" class="label input" id="id_type" extra_classes="file-type__select" %}</div>
-
-                            <div class="form__control upload">
-                                <div class="upload__container">
-                                    {% file_input form.file text=_("Document selecteren") no_label=False no_help=True extra_classes="file-upload" %}
-                                    <div class="form__submit">
-                                        {% button_row %}
-                                            {% button type="submit" text=_("Document uploaden") id="submit_upload" primary=True %}
-                                        {% endbutton_row %}
-                                    </div>
-                                </div>
-                            </div>
-                        {% endrender_form %}
-                        </div>
-                    </section>
-
-                {% elif case.external_upload_enabled %}
-                    <h2 class="h2">{% trans "Document toevoegen" %}</h2>
-                    {% if case.case_type_config_description %}
-                        <p class="p">{{ case.case_type_config_description }}</p>
-                    {% else %}
-                        <p class="p">{% trans "By clicking the button below you can upload a document. This is an external link and you will be redirected to a different system." %}</p>
-                    {% endif %}
-                    {% button_row %}
-                        {% button href=case.external_upload_url text=_("Document uploaden") title=_("Opens new window") primary=True icon="open_in_new" icon_position="after" %}
-                    {% endbutton_row %}
-                {% endif %}
-
-
-            {% endrender_column %}
-        {% endrender_grid %}
-    {% else %}
-        <h2 class="h2">{% trans 'There is no available data at the moment.' %}</h2>
-    {% endif %}
-    </div>
-{% endblock content %}
diff --git a/src/open_inwoner/templates/pages/cases/status_inner.html b/src/open_inwoner/templates/pages/cases/status_inner.html
new file mode 100644
index 0000000000..b41709fccc
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/status_inner.html
@@ -0,0 +1,108 @@
+{% load i18n anchor_menu_tags card_tags dashboard_tags file_tags grid_tags status_tags table_tags solo_tags form_tags button_tags icon_tags notification_tags %}
+
+{# Anchor menu-mobile #}
+<div id="cases-status-anchors-oob-mobile" hx-swap-oob="true">
+    {% anchor_menu anchors=anchors desktop=False %}
+</div>
+
+{# Messages #}
+<div class="container container--no-margin" id="cases-status-messages-oob" hx-swap-oob="true">
+    {% notifications messages %}
+</div>
+
+{# Anchor menu-desktop #}
+<div id="cases-status-anchors-oob" hx-swap-oob="true">
+    {% anchor_menu anchors desktop=True %}
+</div>
+
+{% get_solo 'openzaak.OpenZaakConfig' as openzaak_config %}
+
+{% if case %}
+    {% render_grid %}
+        {% render_column span=9 %}
+
+            {# Title/dashboard. #}
+            <h1 class="h1" id="title">{{ case.description }}</h1>
+            {% case_dashboard case %}
+            {% case_table case %}
+
+            {#  Status history. #}
+            {% if case.statuses %}
+                <h2 class="h2" id="statuses">{% trans 'Status' %}</h2>
+                {% status_list case.statuses %}
+            {% endif %}
+
+            {#  Documents. #}
+            {% if case.documents %}
+                <h2 class="h2" id="documents">{% trans 'Documenten' %}</h2>
+                {% case_document_list case.documents %}
+            {% endif %}
+
+            {% if case.internal_upload_enabled %}
+                <h2 class="h2" id=>{% trans "Document uploaden" %}</h2>
+                {% if case.case_type_config_description %}
+                    <p class="p">{{ case.case_type_config_description }}</p>
+                {% else %}
+                    <p class="p">
+                        {% blocktranslate with max_filesize=openzaak_config.max_upload_size allowed_extensions=case.allowed_file_extensions|join:', ' %}
+                            Grootte max. {{ max_filesize }} MB, toegestane document formaten: {{ allowed_extensions }}.
+                        {% endblocktranslate %}
+                    </p>
+                {% endif %}
+
+                <section id="form_upload" class="form__open-upload">
+                    <div class="upload-interface">
+                    {#  if local upload is enabled #}
+                    {% render_form id="document-upload" form=form method="POST" hxencoding="multipart/form-data" hxpost=hxpost hxtarget="#cases-detail-content" submit_text=_("Bestand uploaden") show_required=True %}
+                        {% csrf_token %}
+                        <div id="info_container" class="info-container form__control__info">
+                            <div class="upload-interface__info">
+                                <fieldset class="fieldset-container">
+                                    <div class="drive">{% icon icon="insert_drive_file" outlined=True icon_position="before" %}</div>
+                                    <div class="fieldset__content">
+                                        <div id="upload_error" class="upload-info upload-info__error">
+                                            <span>{% trans "Selecteer uw bestand opnieuw" %} {% icon icon="arrow_downward" outlined=True icon_position="before" %}</span></div>
+                                        <div id="upload_name" class="upload-info upload-info__name"></div>
+                                        <div id="upload_size" class="upload-info upload-info__size"></div>
+                                    </div>
+                                    <div class="close">{% button id="close_upload" icon="cancel" type='reset' text='' transparent=True icon_outlined=True icon_position="before" %}</div>
+                                </fieldset>
+                            </div>
+                        </div>
+
+                        <div class="form__control__info">{% input form.title no_label=False no_help=True id="id_title" %}</div>
+
+                        <div class="form__control__info">{% input form.type no_label=False no_help=True icon="expand_more" icon_position="after" class="label input" id="id_type" extra_classes="file-type__select" %}</div>
+
+                        <div class="form__control upload">
+                            <div class="upload__container">
+                                {% file_input form.file text=_("Document selecteren") no_label=False no_help=True extra_classes="file-upload" %}
+                                <div class="form__submit">
+                                    {% button_row %}
+                                        {% button type="submit" text=_("Document uploaden") id="submit_upload" primary=True %}
+                                    {% endbutton_row %}
+                                </div>
+                            </div>
+                        </div>
+                    {% endrender_form %}
+                    </div>
+                </section>
+
+            {% elif case.external_upload_enabled %}
+                <h2 class="h2">{% trans "Document toevoegen" %}</h2>
+                {% if case.case_type_config_description %}
+                    <p class="p">{{ case.case_type_config_description }}</p>
+                {% else %}
+                    <p class="p">{% trans "By clicking the button below you can upload a document. This is an external link and you will be redirected to a different system." %}</p>
+                {% endif %}
+                {% button_row %}
+                    {% button href=case.external_upload_url text=_("Document uploaden") title=_("Opens new window") primary=True icon="open_in_new" icon_position="after" %}
+                {% endbutton_row %}
+            {% endif %}
+
+
+        {% endrender_column %}
+    {% endrender_grid %}
+{% else %}
+    <h2 class="h2">{% trans 'There is no available data at the moment.' %}</h2>
+{% endif %}
diff --git a/src/open_inwoner/templates/pages/cases/status_outer.html b/src/open_inwoner/templates/pages/cases/status_outer.html
new file mode 100644
index 0000000000..9e33cfe095
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/status_outer.html
@@ -0,0 +1,25 @@
+{% extends 'master.html' %}
+{% load i18n icon_tags %}
+
+{% block mobile_anchors %}
+    <div id="cases-status-anchors-oob-mobile"></div>
+{% endblock mobile_anchors %}
+
+{% block notifications %}
+    <div id="cases-status-messages-oob"></div>
+{% endblock notifications %}
+
+{% block sidebar_content %}
+    <div id="cases-status-anchors-oob"></div>
+{% endblock sidebar_content %}
+
+{% block content %}
+    <div class="cases__detail" id="cases-detail-content"><div>
+    
+    <div class="loader-container" id="spinner-container">
+        <h1 class="h1" id="title">{% trans "Status" %}</h1>
+        <div class="spinner" id="spinner-id" hx-get="{{ hxget }}" hx-trigger="load" hx-target="#cases-detail-content">
+            {% icon icon="autorenew" extra_classes="spinner-icon rotate" %}
+        </div>
+    </div>
+{% endblock content %}
diff --git a/src/open_inwoner/templates/pages/cases/submissions.html b/src/open_inwoner/templates/pages/cases/submissions.html
deleted file mode 100644
index 6909dbcb7d..0000000000
--- a/src/open_inwoner/templates/pages/cases/submissions.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends 'master.html' %}
-{% load i18n button_tags anchor_menu_tags card_tags grid_tags icon_tags link_tags list_tags pagination_tags utils %}
-
-{% block sidebar_content %}
-    {% anchor_menu anchors=anchors desktop=True %}
-{% endblock sidebar_content %}
-
-{% block content %}
-    <h1 class="h1" id="title">{% trans "Mijn aanvragen" %}</h1>
-
-    <div class="cases">
-        <h2 class="h2" id="submissions">{{ page_title }} ({{ submissions|length }})</h2>
-
-         <table class="table">
-            <thead class="table__heading">
-                <tr>
-                    <td class="table__item">{% trans "Formulier" %}</td>
-                    <td class="table__item">{% trans "Laatste wijziging" %}</td>
-                    <td class="table__item">{% trans "Einde geldigheid" %}</td>
-                    <td class="table__item">&nbsp;</td>
-                </tr>
-            </thead>
-            <tbody>
-                {% for submission in submissions %}
-                    <tr>
-                        <th class="table__header">{% link href=submission.vervolg_link text=submission.naam blank=True %}</th>
-                        <td class="table__item table__item--no-lb">{{submission.datum_laatste_wijziging|date:"d-m-Y"}}</td>
-                        <td class="table__item table__item--no-lb">{{submission.eind_datum_geldigheid|date:"d-m-Y"}}</td>
-                        <td class="table__item">{% button text=submission.naam hide_text=True href=submission.vervolg_link icon="arrow_forward" icon_outlined=True transparent=True %}</td>
-                    </tr>
-                {% empty %}
-                    <tr>
-                        <td class="table__item" colspan="4" >{% trans "Er zijn geen open aanvragen." %}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-
-{% endblock content %}
diff --git a/src/open_inwoner/templates/pages/cases/submissions_inner.html b/src/open_inwoner/templates/pages/cases/submissions_inner.html
new file mode 100644
index 0000000000..610d190f68
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/submissions_inner.html
@@ -0,0 +1,36 @@
+{% load i18n anchor_menu_tags button_tags link_tags %}
+
+<div id="cases-submissions-anchors-oob-mobile" hx-swap-oob="true">
+    {% anchor_menu anchors=anchors desktop=False %}
+</div>
+
+<div id="cases-submissions-anchors-oob" hx-swap-oob="true">
+    {% anchor_menu anchors desktop=True %}
+</div>
+
+<h2 class="h2" id="submissions">{{ page_title }} ({{ submissions|length }})</h2>
+
+<table class="table">
+    <thead class="table__heading">
+        <tr>
+            <td class="table__item">{% trans "Formulier" %}</td>
+            <td class="table__item">{% trans "Laatste wijziging" %}</td>
+            <td class="table__item">{% trans "Einde geldigheid" %}</td>
+            <td class="table__item">&nbsp;</td>
+        </tr>
+    </thead>
+    <tbody>
+        {% for submission in submissions %}
+            <tr>
+                <th class="table__header">{% link href=submission.vervolg_link text=submission.naam blank=True %}</th>
+                <td class="table__item table__item--no-lb">{{submission.datum_laatste_wijziging|date:"d-m-Y"}}</td>
+                <td class="table__item table__item--no-lb">{{submission.eind_datum_geldigheid|date:"d-m-Y"}}</td>
+                <td class="table__item">{% button text=submission.naam hide_text=True href=submission.vervolg_link icon="arrow_forward" icon_outlined=True transparent=True %}</td>
+            </tr>
+        {% empty %}
+            <tr>
+                <td class="table__item" colspan="4" >{% trans "Er zijn geen open aanvragen." %}</td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
diff --git a/src/open_inwoner/templates/pages/cases/submissions_outer.html b/src/open_inwoner/templates/pages/cases/submissions_outer.html
new file mode 100644
index 0000000000..e191aea78a
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/submissions_outer.html
@@ -0,0 +1,20 @@
+{% extends 'master.html' %}
+{% load i18n icon_tags %}
+
+<div id="cases-submissions-anchors-oob-mobile"></div>
+
+{% block sidebar_content %}
+    <div id="cases-submissions-anchors-oob"></div>
+{% endblock sidebar_content %}
+
+{% block content %}
+    <h1 class="h1" id="title">{% trans "Mijn aanvragen" %}</h1>
+    
+    <div class="cases" id="submissions-content"></div>
+    
+    <div class="loader-container" id="spinner-container">
+        <div class="spinner" id="spinner-id" hx-get="{{ hxget }}" hx-trigger="load" hx-target="#submissions-content">
+            {% icon icon="autorenew" extra_classes="spinner-icon rotate" %}
+        </div>
+    </div>
+{% endblock content %}
diff --git a/src/open_inwoner/utils/tests/playwright.py b/src/open_inwoner/utils/tests/playwright.py
index fe9db2c46d..0b1b527fb2 100644
--- a/src/open_inwoner/utils/tests/playwright.py
+++ b/src/open_inwoner/utils/tests/playwright.py
@@ -94,7 +94,7 @@ def tearDownClass(cls):
     def live_url(cls, path="/", star=False):
         """
         prepend self.live_server_url to path
-        optionally append '*' wildcard matcher (useful for page.expect_navigation() etc)
+        optionally append '*' wildcard matcher (useful for page.wait_for_url() etc)
         """
         url = f"{cls.live_server_url}{path}"
         if star:
@@ -106,7 +106,7 @@ def live_reverse(cls, viewname, args=None, kwargs=None, params=None, star=False)
         """
         do a reverse() url, prepend self.live_server_url
         optionally add query params to url
-        optionally append '*' wildcard matcher (useful for page.expect_navigation() etc)
+        optionally append '*' wildcard matcher (useful for page.wait_for_url() etc)
         """
         path = reverse(viewname, args=args, kwargs=kwargs)
         assert not (params and star), "cannot combine params and star arguments (yet)"
@@ -137,20 +137,17 @@ def get_user_bsn_login_state(cls, user: User):
         context = cls.browser.new_context()
         page = context.new_page()
 
-        with page.expect_navigation(
-            url=cls.live_reverse("digid-mock:login", star=True)
-        ):
-            page.goto(cls.live_reverse("digid:login"))
+        page.goto(cls.live_reverse("digid:login"))
 
-        with page.expect_navigation(
-            url=cls.live_reverse("digid-mock:password", star=True)
-        ):
-            page.get_by_text("Met gebruikersnaam en wachtwoord").click()
+        page.get_by_text("Met gebruikersnaam en wachtwoord").click()
 
-        with page.expect_navigation(url=cls.live_reverse("pages-root")):
-            page.get_by_text("DigiD gebruikersnaam", exact=True).fill(user.bsn)
-            page.get_by_text("Wachtwoord", exact=True).fill("whatever")
-            page.get_by_role("button", name="Inloggen").click()
+        page.wait_for_url(cls.live_reverse("digid-mock:password", star=True))
+
+        page.get_by_text("DigiD gebruikersnaam", exact=True).fill(user.bsn)
+        page.get_by_text("Wachtwoord", exact=True).fill("whatever")
+        page.get_by_role("button", name="Inloggen").click()
+
+        page.wait_for_url(cls.live_reverse("pages-root"))
 
         page.close()
         login_state = context.storage_state()

From ecfc9fb9d36cdb5d8580fd474e280f10a9355583 Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Tue, 13 Jun 2023 12:20:08 +0200
Subject: [PATCH 23/60] [#1437 #1457] PR feedback, replaced
 .get_contact_email()

---
 src/open_inwoner/openklant/forms.py             |  5 ++---
 src/open_inwoner/openklant/views/contactform.py | 11 +++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/open_inwoner/openklant/forms.py b/src/open_inwoner/openklant/forms.py
index bdb4564736..b69e90d8fe 100644
--- a/src/open_inwoner/openklant/forms.py
+++ b/src/open_inwoner/openklant/forms.py
@@ -79,9 +79,8 @@ def clean(self, *args, **kwargs):
             self.add_error("phonenumber", msg)
 
         if self.user.is_authenticated:
-            # we need to use get_contact_email() because we use dummy email for BSN users
-            if not email and self.user.get_contact_email():
-                cleaned_data["email"] = self.user.get_contact_email()
+            if not email and self.user.email:
+                cleaned_data["email"] = self.user.email
             if not phonenumber and self.user.phonenumber:
                 cleaned_data["phonenumber"] = self.user.phonenumber
 
diff --git a/src/open_inwoner/openklant/views/contactform.py b/src/open_inwoner/openklant/views/contactform.py
index fd37e9bdf9..e4c080b20e 100644
--- a/src/open_inwoner/openklant/views/contactform.py
+++ b/src/open_inwoner/openklant/views/contactform.py
@@ -37,11 +37,7 @@ def get_success_url(self):
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs.update(
-            {
-                "user": self.request.user,
-            }
-        )
+        kwargs["user"] = self.request.user
         return kwargs
 
     def get_initial(self):
@@ -52,8 +48,7 @@ def get_initial(self):
                     "first_name": self.request.user.first_name,
                     "infix": self.request.user.infix,
                     "last_name": self.request.user.last_name,
-                    # we need to use get_contact_email() because we use dummy email for BSN users
-                    "email": self.request.user.get_contact_email(),
+                    "email": self.request.user.email,
                     "phonenumber": self.request.user.phonenumber,
                 }
             )
@@ -105,7 +100,7 @@ def register_by_api(self, form, config: OpenKlantConfig):
         if self.request.user.is_authenticated and self.request.user.bsn:
             klant = fetch_klant_for_bsn(self.request.user.bsn)
             if klant:
-                self.log_system_action(f"retrieved klant for BSN-user")
+                self.log_system_action("retrieved klant for BSN-user")
 
                 # check if we have some data missing from the Klant
                 update_data = {}

From 26c7a29473c1301f5884500f3612be9274d13ebb Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Tue, 13 Jun 2023 09:32:21 +0200
Subject: [PATCH 24/60] [#1458] Update klant from profile form data

---
 .../accounts/tests/test_profile_views.py      | 101 ++++++++++++++++--
 src/open_inwoner/accounts/views/profile.py    |  27 +++++
 src/open_inwoner/openklant/tests/data.py      |  40 +++++++
 3 files changed, 162 insertions(+), 6 deletions(-)

diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
index c13f662501..998fa031e6 100644
--- a/src/open_inwoner/accounts/tests/test_profile_views.py
+++ b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -1,12 +1,9 @@
-import io
-
 from django.test import override_settings
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 import requests_mock
 from django_webtest import WebTest
-from PIL import Image
 from timeline_logger.models import TimelineLog
 from webtest import Upload
 
@@ -15,14 +12,15 @@
 from open_inwoner.haalcentraal.tests.mixins import HaalCentraalMixin
 from open_inwoner.pdc.tests.factories import CategoryFactory
 from open_inwoner.utils.logentry import LOG_ACTIONS
-from open_inwoner.utils.tests.helpers import create_image_bytes
+from open_inwoner.utils.tests.helpers import AssertTimelineLogMixin, create_image_bytes
 
 from ...cms.profile.cms_apps import ProfileApphook
 from ...cms.tests import cms_tools
+from ...openklant.tests.data import MockAPIReadPatchData
 from ...questionnaire.tests.factories import QuestionnaireStepFactory
 from ..choices import ContactTypeChoices, LoginTypeChoices
 from ..forms import BrpUserForm, UserForm
-from .factories import ActionFactory, DocumentFactory, UserFactory
+from .factories import ActionFactory, DigidUserFactory, DocumentFactory, UserFactory
 
 
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
@@ -193,7 +191,7 @@ def test_expected_message_is_shown_when_all_notifications_disabled(self):
 
 
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
-class EditProfileTests(WebTest):
+class EditProfileTests(AssertTimelineLogMixin, WebTest):
     def setUp(self):
         self.url = reverse("profile:edit")
         self.return_url = reverse("profile:detail")
@@ -435,6 +433,97 @@ def test_image_field_is_not_rendered_when_begeleider_and_digid_login(self):
         self.assertNotIn("image", form.fields.keys())
         self.assertEqual(response.pyquery("#id_image"), [])
 
+    @requests_mock.Mocker()
+    def test_modify_phone_and_email_updates_klant_api(self, m):
+        MockAPIReadPatchData.setUpServices()
+        data = MockAPIReadPatchData().install_mocks(m)
+
+        response = self.app.get(self.url, user=data.user)
+        form = response.forms["profile-edit"]
+        form["email"] = "new@example.com"
+        form["phonenumber"] = "01234456789"
+        form.submit()
+
+        # user data tested in other cases
+
+        self.assertTrue(data.matchers[0].called)
+        klant_patch_data = data.matchers[1].request_history[0].json()
+        self.assertEqual(
+            klant_patch_data,
+            {
+                "emailadres": "new@example.com",
+                "telefoonnummer": "01234456789",
+            },
+        )
+        self.assertTimelineLog("retrieved klant for BSN-user")
+        self.assertTimelineLog(
+            "patched klant from user profile edit with fields: emailadres, telefoonnummer"
+        )
+
+    @requests_mock.Mocker()
+    def test_modify_phone_updates_klant_api_but_skips_unchanged(self, m):
+        MockAPIReadPatchData.setUpServices()
+        data = MockAPIReadPatchData().install_mocks(m)
+
+        response = self.app.get(self.url, user=data.user)
+        form = response.forms["profile-edit"]
+        form.submit()
+
+        # user data tested in other cases
+
+        self.assertFalse(data.matchers[0].called)
+        self.assertFalse(data.matchers[1].called)
+
+    @requests_mock.Mocker()
+    def test_modify_phone_updates_klant_api_but_skip_unchanged_email(self, m):
+        MockAPIReadPatchData.setUpServices()
+        data = MockAPIReadPatchData().install_mocks(m)
+
+        response = self.app.get(self.url, user=data.user)
+        form = response.forms["profile-edit"]
+        form["phonenumber"] = "01234456789"
+        form.submit()
+
+        # user data tested in other cases
+
+        self.assertTrue(data.matchers[0].called)
+        klant_patch_data = data.matchers[1].request_history[0].json()
+        self.assertEqual(
+            klant_patch_data,
+            {
+                "telefoonnummer": "01234456789",
+            },
+        )
+        self.assertTimelineLog("retrieved klant for BSN-user")
+        self.assertTimelineLog(
+            "patched klant from user profile edit with fields: telefoonnummer"
+        )
+
+    @requests_mock.Mocker()
+    def test_modify_phone_updates_klant_api_but_skip_unchanged_phone(self, m):
+        MockAPIReadPatchData.setUpServices()
+        data = MockAPIReadPatchData().install_mocks(m)
+
+        response = self.app.get(self.url, user=data.user)
+        form = response.forms["profile-edit"]
+        form["email"] = "new@example.com"
+        form.submit()
+
+        # user data tested in other cases
+
+        self.assertTrue(data.matchers[0].called)
+        klant_patch_data = data.matchers[1].request_history[0].json()
+        self.assertEqual(
+            klant_patch_data,
+            {
+                "emailadres": "new@example.com",
+            },
+        )
+        self.assertTimelineLog("retrieved klant for BSN-user")
+        self.assertTimelineLog(
+            "patched klant from user profile edit with fields: emailadres"
+        )
+
 
 @requests_mock.Mocker()
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 4403827160..15a38ac903 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -25,6 +25,7 @@
 from open_inwoner.utils.mixins import ExportMixin
 from open_inwoner.utils.views import CommonPageMixin, LogMixin
 
+from ...openklant.wrap import fetch_klant_for_bsn, patch_klant
 from ..forms import BrpUserForm, CategoriesForm, UserForm, UserNotificationsForm
 from ..models import Action, User
 
@@ -133,10 +134,36 @@ def get_object(self):
     def form_valid(self, form):
         form.save()
 
+        self.update_klant_api({k: form.cleaned_data[k] for k in form.changed_data})
+
         messages.success(self.request, _("Uw wijzigingen zijn opgeslagen"))
         self.log_change(self.get_object(), _("profile was modified"))
         return HttpResponseRedirect(self.get_success_url())
 
+    def update_klant_api(self, user_form_data: dict):
+        user: User = self.request.user
+        if not user.bsn or user.login_type != LoginTypeChoices.digid:
+            return
+        field_mapping = {
+            "emailadres": "email",
+            "telefoonnummer": "phonenumber",
+        }
+        update_data = {
+            api_name: user_form_data[local_name]
+            for api_name, local_name in field_mapping.items()
+            if user_form_data.get(local_name)
+        }
+        if update_data:
+            klant = fetch_klant_for_bsn(user.bsn)
+            if klant:
+                self.log_system_action("retrieved klant for BSN-user")
+
+                klant = patch_klant(klant, update_data)
+                if klant:
+                    self.log_system_action(
+                        f"patched klant from user profile edit with fields: {', '.join(sorted(update_data.keys()))}"
+                    )
+
     def get_form_class(self):
         user = self.request.user
         if user.is_digid_and_brp():
diff --git a/src/open_inwoner/openklant/tests/data.py b/src/open_inwoner/openklant/tests/data.py
index 445159db11..8ab37c1b9c 100644
--- a/src/open_inwoner/openklant/tests/data.py
+++ b/src/open_inwoner/openklant/tests/data.py
@@ -28,6 +28,46 @@ def setUpOASMocks(self, m):
         mock_service_oas_get(m, CONTACTMOMENTEN_ROOT, "cmc")
 
 
+class MockAPIReadPatchData(MockAPIData):
+    def __init__(self):
+        self.user = DigidUserFactory(
+            email="old@example.com",
+            phonenumber="0100000000",
+        )
+
+        self.klant_old = generate_oas_component(
+            "kc",
+            "schemas/Klant",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            emailadres="bad@example.com",
+            telefoonnummer="",
+        )
+        self.klant_updated = generate_oas_component(
+            "kc",
+            "schemas/Klant",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            emailadres="good@example.com",
+            telefoonnummer="0123456789",
+        )
+
+    def install_mocks(self, m) -> "MockAPIReadPatchData":
+        self.setUpOASMocks(m)
+        self.matchers = [
+            m.get(
+                f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn={self.user.bsn}",
+                json=paginated_response([self.klant_old]),
+            ),
+            m.patch(
+                f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+                json=self.klant_updated,
+                status_code=200,
+            ),
+        ]
+        return self
+
+
 class MockAPIReadData(MockAPIData):
     def __init__(self):
         self.user = DigidUserFactory(

From 5696895a83ac22d2856f7ea5bdf623ade23440df Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Thu, 8 Jun 2023 12:35:30 +0200
Subject: [PATCH 25/60] [#1505] upgrade django-digid-eherkenning

---
 requirements/base.txt | 12 ++++++++----
 requirements/ci.txt   |  6 ++++--
 requirements/dev.txt  |  6 ++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 046c8ca328..560e83a314 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -136,7 +136,6 @@ django-better-admin-arrayfield==1.4.2
 django-choices==1.7.2
     # via
     #   -r requirements/base.in
-    #   django-digid-eherkenning
     #   mail-editor
 django-ckeditor==6.2.0
     # via mail-editor
@@ -161,7 +160,7 @@ django-csp==3.7
     # via -r requirements/base.in
 django-csp-reports==1.8.1
     # via -r requirements/base.in
-django-digid-eherkenning==0.4.1
+django-digid-eherkenning==0.7.0
     # via -r requirements/base.in
 django-elasticsearch-dsl==7.2.1
     # via -r requirements/base.in
@@ -232,12 +231,15 @@ django-sessionprofile==1.0
     #   -r requirements/base.in
     #   django-digid-eherkenning
 django-simple-certmanager==1.3.0
-    # via zgw-consumers
+    # via
+    #   django-digid-eherkenning
+    #   zgw-consumers
 django-sniplates==0.7.0
     # via -r requirements/base.in
 django-solo==1.2.0
     # via
     #   -r requirements/base.in
+    #   django-digid-eherkenning
     #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -357,7 +359,9 @@ markuppy==1.14
 maykin-django-two-factor-auth==2.0.4
     # via -r requirements/base.in
 maykin-python3-saml==1.14.0.post0
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   django-digid-eherkenning
 messagebird==2.1.0
     # via -r requirements/base.in
 mozilla-django-oidc==2.0.0
diff --git a/requirements/ci.txt b/requirements/ci.txt
index 766c37d50d..706f351604 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -210,7 +210,6 @@ django-choices==1.7.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-    #   django-digid-eherkenning
     #   mail-editor
 django-ckeditor==6.2.0
     # via
@@ -249,7 +248,7 @@ django-csp-reports==1.8.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-digid-eherkenning==0.4.1
+django-digid-eherkenning==0.7.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -383,6 +382,7 @@ django-simple-certmanager==1.3.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-digid-eherkenning
     #   zgw-consumers
 django-sniplates==0.7.0
     # via
@@ -392,6 +392,7 @@ django-solo==1.2.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-digid-eherkenning
     #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -628,6 +629,7 @@ maykin-python3-saml==1.14.0.post0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-digid-eherkenning
 mccabe==0.6.1
     # via pylint
 messagebird==2.1.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 7d23cc33bd..885018112b 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -235,7 +235,6 @@ django-choices==1.7.2
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-    #   django-digid-eherkenning
     #   mail-editor
 django-ckeditor==6.2.0
     # via
@@ -276,7 +275,7 @@ django-csp-reports==1.8.1
     #   -r requirements/ci.txt
 django-debug-toolbar==3.2.2
     # via -r requirements/dev.in
-django-digid-eherkenning==0.4.1
+django-digid-eherkenning==0.7.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -412,6 +411,7 @@ django-simple-certmanager==1.3.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-digid-eherkenning
     #   zgw-consumers
 django-sniplates==0.7.0
     # via
@@ -421,6 +421,7 @@ django-solo==1.2.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-digid-eherkenning
     #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -686,6 +687,7 @@ maykin-python3-saml==1.14.0.post0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-digid-eherkenning
 mccabe==0.6.1
     # via
     #   -c requirements/ci.txt

From 0d2388b26cf52df36f6d694eebe6bfc9b80369b8 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 14 Jun 2023 08:52:51 +0200
Subject: [PATCH 26/60] [#1439] Fixed js selectors and spinner wait time

---
 .../upload-document/file-input-errors.js      |  5 +++--
 .../upload-document/show-file-info.js         | 19 ++++++++++++-------
 .../scss/components/Spinner/Spinner.scss      |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/open_inwoner/js/components/upload-document/file-input-errors.js b/src/open_inwoner/js/components/upload-document/file-input-errors.js
index 16e7e4c1d3..7f14d18db0 100644
--- a/src/open_inwoner/js/components/upload-document/file-input-errors.js
+++ b/src/open_inwoner/js/components/upload-document/file-input-errors.js
@@ -7,9 +7,10 @@ export class FileInputError {
   }
 
   showErrors() {
-    const documentUpload = document.getElementById('form_upload')
+    // get the closest parent element (the form section element)
+    const documentUpload = this.uploadError.closest('#form_upload')
     // get info
-    const getFormInfo = document.querySelectorAll('.form__control__info')
+    const getFormInfo = documentUpload.querySelectorAll('.form__control__info')
 
     // if errors are present, scroll and trigger opened state
     documentUpload.scrollIntoView({
diff --git a/src/open_inwoner/js/components/upload-document/show-file-info.js b/src/open_inwoner/js/components/upload-document/show-file-info.js
index b2eee1f362..2eafcbef99 100644
--- a/src/open_inwoner/js/components/upload-document/show-file-info.js
+++ b/src/open_inwoner/js/components/upload-document/show-file-info.js
@@ -7,15 +7,20 @@ export class ShowInfo {
   }
 
   showData() {
-    const sizeInfo = document.getElementById('upload_size')
-    const nameInfo = document.getElementById('upload_name')
-    const validationInfo = document.getElementById('upload_error')
-    const closeButton = document.getElementById('close_upload')
-    const submit_upload = document.getElementById('submit_upload')
+    // get the closest parent element (the form section element)
+    const documentUpload = this.fileUploadInput.closest('#form_upload')
+
+    const sizeInfo = documentUpload.querySelector('#upload_size')
+    const nameInfo = documentUpload.querySelector('#upload_name')
+    const validationInfo = documentUpload.querySelector('#upload_error')
+    const closeButton = documentUpload.querySelector('#close_upload')
+    const submit_upload = documentUpload.querySelector('#submit_upload')
     // show/hide after validation
-    const iconDrive = document.querySelectorAll('.drive')
+    const iconDrive = documentUpload.querySelectorAll('.drive')
     // show info
-    const formControlInfo = document.querySelectorAll('.form__control__info')
+    const formControlInfo = documentUpload.querySelectorAll(
+      '.form__control__info'
+    )
 
     // Convert the file size to a readable format
     const formatFileSize = function (bytes) {
diff --git a/src/open_inwoner/scss/components/Spinner/Spinner.scss b/src/open_inwoner/scss/components/Spinner/Spinner.scss
index 3de2fd8246..4a28d8213b 100644
--- a/src/open_inwoner/scss/components/Spinner/Spinner.scss
+++ b/src/open_inwoner/scss/components/Spinner/Spinner.scss
@@ -13,7 +13,7 @@
   }
 
   .rotate {
-    animation: rotate 2.5s linear infinite;
+    animation: rotate 1.5s linear infinite;
   }
   @keyframes rotate {
     to {

From 965f09d41d2d1274d05fe9f3ff75c56179062d1b Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Tue, 13 Jun 2023 15:00:20 +0200
Subject: [PATCH 27/60] [#1483] Update profile email/phone from klant on login

---
 src/open_inwoner/accounts/signals.py          |  13 ++-
 .../accounts/tests/test_profile_views.py      |  20 ++++
 src/open_inwoner/accounts/views/profile.py    |   8 +-
 src/open_inwoner/openklant/services.py        |  30 +++++
 src/open_inwoner/openklant/tests/data.py      |   3 +
 .../openklant/tests/test_contactform.py       |  14 ++-
 .../openklant/tests/test_signal.py            | 105 ++++++++++++++++++
 .../openklant/views/contactform.py            |  36 ++++--
 src/open_inwoner/ssd/__init__.py              |   0
 src/open_inwoner/utils/logentry.py            |   2 +-
 src/open_inwoner/utils/tests/helpers.py       |  12 +-
 src/open_inwoner/utils/tests/test_helpers.py  |   4 +-
 src/open_inwoner/utils/views.py               |   4 +-
 13 files changed, 227 insertions(+), 24 deletions(-)
 create mode 100644 src/open_inwoner/openklant/services.py
 create mode 100644 src/open_inwoner/openklant/tests/test_signal.py
 create mode 100644 src/open_inwoner/ssd/__init__.py

diff --git a/src/open_inwoner/accounts/signals.py b/src/open_inwoner/accounts/signals.py
index 0f9cb96f10..2bd7693802 100644
--- a/src/open_inwoner/accounts/signals.py
+++ b/src/open_inwoner/accounts/signals.py
@@ -8,6 +8,8 @@
 from open_inwoner.haalcentraal.utils import update_brp_data_in_db
 from open_inwoner.utils.logentry import user_action
 
+from ..openklant.models import OpenKlantConfig
+from ..openklant.services import update_user_from_klant
 from .choices import LoginTypeChoices
 
 MESSAGE_TYPE = {
@@ -39,10 +41,15 @@ def log_user_login(sender, user, request, *args, **kwargs):
 
     # update brp fields when login with digid and brp is configured
     brp_config = HaalCentraalConfig.get_solo()
-    brp_version = settings.BRP_VERSION
 
-    if user.login_type == LoginTypeChoices.digid and brp_config.service:
-        update_brp_data_in_db(user, brp_version, initial=False)
+    oc_config = OpenKlantConfig.get_solo()
+
+    if user.login_type == LoginTypeChoices.digid:
+        if brp_config.service:
+            update_brp_data_in_db(user, settings.BRP_VERSION, initial=False)
+
+        if oc_config.klanten_service:
+            update_user_from_klant(user)
 
 
 @receiver(user_logged_out)
diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
index 998fa031e6..f33dd0f9e4 100644
--- a/src/open_inwoner/accounts/tests/test_profile_views.py
+++ b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -439,6 +439,11 @@ def test_modify_phone_and_email_updates_klant_api(self, m):
         data = MockAPIReadPatchData().install_mocks(m)
 
         response = self.app.get(self.url, user=data.user)
+
+        # reset noise from signals
+        m.reset_mock()
+        self.resetTimelineLogs()
+
         form = response.forms["profile-edit"]
         form["email"] = "new@example.com"
         form["phonenumber"] = "01234456789"
@@ -466,6 +471,11 @@ def test_modify_phone_updates_klant_api_but_skips_unchanged(self, m):
         data = MockAPIReadPatchData().install_mocks(m)
 
         response = self.app.get(self.url, user=data.user)
+
+        # reset noise from signals
+        m.reset_mock()
+        self.resetTimelineLogs()
+
         form = response.forms["profile-edit"]
         form.submit()
 
@@ -480,6 +490,11 @@ def test_modify_phone_updates_klant_api_but_skip_unchanged_email(self, m):
         data = MockAPIReadPatchData().install_mocks(m)
 
         response = self.app.get(self.url, user=data.user)
+
+        # reset noise from signals
+        m.reset_mock()
+        self.resetTimelineLogs()
+
         form = response.forms["profile-edit"]
         form["phonenumber"] = "01234456789"
         form.submit()
@@ -505,6 +520,11 @@ def test_modify_phone_updates_klant_api_but_skip_unchanged_phone(self, m):
         data = MockAPIReadPatchData().install_mocks(m)
 
         response = self.app.get(self.url, user=data.user)
+
+        # reset noise from signals
+        m.reset_mock()
+        self.resetTimelineLogs()
+
         form = response.forms["profile-edit"]
         form["email"] = "new@example.com"
         form.submit()
diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 15a38ac903..312f327b68 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -156,12 +156,14 @@ def update_klant_api(self, user_form_data: dict):
         if update_data:
             klant = fetch_klant_for_bsn(user.bsn)
             if klant:
-                self.log_system_action("retrieved klant for BSN-user")
-
+                self.log_system_action(
+                    "retrieved klant for BSN-user", user=self.request.user
+                )
                 klant = patch_klant(klant, update_data)
                 if klant:
                     self.log_system_action(
-                        f"patched klant from user profile edit with fields: {', '.join(sorted(update_data.keys()))}"
+                        f"patched klant from user profile edit with fields: {', '.join(sorted(update_data.keys()))}",
+                        user=self.request.user,
                     )
 
     def get_form_class(self):
diff --git a/src/open_inwoner/openklant/services.py b/src/open_inwoner/openklant/services.py
new file mode 100644
index 0000000000..bae68c38cc
--- /dev/null
+++ b/src/open_inwoner/openklant/services.py
@@ -0,0 +1,30 @@
+from open_inwoner.accounts.models import User
+from open_inwoner.openklant.wrap import fetch_klant_for_bsn
+from open_inwoner.utils.logentry import system_action
+
+
+def update_user_from_klant(user: User):
+    klant = fetch_klant_for_bsn(user.bsn)
+    if not klant:
+        return
+
+    system_action("retrieved klant for BSN-user", content_object=user)
+
+    update_data = {}
+
+    if klant.telefoonnummer and klant.telefoonnummer != user.phonenumber:
+        update_data["phonenumber"] = klant.telefoonnummer
+
+    if klant.emailadres and klant.emailadres != user.email:
+        if not User.objects.filter(email__iexact=klant.emailadres).exists():
+            update_data["email"] = klant.emailadres
+
+    if update_data:
+        for attr, value in update_data.items():
+            setattr(user, attr, value)
+        user.save(update_fields=update_data.keys())
+
+        system_action(
+            f"updated user from klant API with fields: {', '.join(sorted(update_data.keys()))}",
+            content_object=user,
+        )
diff --git a/src/open_inwoner/openklant/tests/data.py b/src/open_inwoner/openklant/tests/data.py
index 8ab37c1b9c..1b93ee228a 100644
--- a/src/open_inwoner/openklant/tests/data.py
+++ b/src/open_inwoner/openklant/tests/data.py
@@ -23,6 +23,7 @@ def setUpServices(cls):
         )
         config.save()
 
+    @classmethod
     def setUpOASMocks(self, m):
         mock_service_oas_get(m, KLANTEN_ROOT, "kc")
         mock_service_oas_get(m, CONTACTMOMENTEN_ROOT, "cmc")
@@ -79,6 +80,8 @@ def __init__(self):
             "schemas/Klant",
             uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
             url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            emailadres="foo@example.com",
+            telefoonnummer="0612345678",
         )
         self.contactmoment = generate_oas_component(
             "cmc",
diff --git a/src/open_inwoner/openklant/tests/test_contactform.py b/src/open_inwoner/openklant/tests/test_contactform.py
index 4fb040d8e3..dde8076005 100644
--- a/src/open_inwoner/openklant/tests/test_contactform.py
+++ b/src/open_inwoner/openklant/tests/test_contactform.py
@@ -323,6 +323,11 @@ def test_submit_and_register_bsn_user_via_api(self, m):
         subject = ContactFormSubjectFactory(config=config, subject="Aanvraag document")
 
         response = self.app.get(self.url, user=data.user)
+
+        # reset interference from signals
+        self.resetTimelineLogs()
+        m.reset_mock()
+
         form = response.forms["contactmoment-form"]
         self.assertFormExactFields(
             form,
@@ -344,7 +349,7 @@ def test_submit_and_register_bsn_user_via_api(self, m):
         self.assertEqual(len(mail.outbox), 0)
 
         for m in data.matchers:
-            self.assertTrue(m.called_once, str(m))
+            self.assertTrue(m.called_once, str(m._url))
 
         contactmoment_create_data = data.matchers[1].request_history[0].json()
         self.assertEqual(
@@ -385,6 +390,11 @@ def test_submit_and_register_bsn_user_via_api_and_update_klant(self, m):
         subject = ContactFormSubjectFactory(config=config, subject="Aanvraag document")
 
         response = self.app.get(self.url, user=data.user)
+
+        # reset interference from signals
+        self.resetTimelineLogs()
+        m.reset_mock()
+
         form = response.forms["contactmoment-form"]
         self.assertFormExactFields(
             form,
@@ -400,7 +410,7 @@ def test_submit_and_register_bsn_user_via_api_and_update_klant(self, m):
         # response tested in other cases
 
         for m in data.matchers:
-            self.assertTrue(m.called_once, str(m))
+            self.assertTrue(m.called_once, str(m._url))
 
         klant_patch_data = data.matchers[1].request_history[0].json()
         self.assertEqual(
diff --git a/src/open_inwoner/openklant/tests/test_signal.py b/src/open_inwoner/openklant/tests/test_signal.py
new file mode 100644
index 0000000000..1f67f11558
--- /dev/null
+++ b/src/open_inwoner/openklant/tests/test_signal.py
@@ -0,0 +1,105 @@
+from django.contrib.auth import user_logged_in
+from django.test import RequestFactory, override_settings
+
+import requests_mock
+from django_webtest import WebTest
+from zgw_consumers.test import generate_oas_component
+
+from open_inwoner.accounts.choices import LoginTypeChoices
+from open_inwoner.accounts.models import User
+from open_inwoner.accounts.tests.factories import UserFactory
+from open_inwoner.openklant.tests.data import KLANTEN_ROOT, MockAPIReadData
+from open_inwoner.utils.test import (
+    ClearCachesMixin,
+    DisableRequestLogMixin,
+    paginated_response,
+)
+from open_inwoner.utils.tests.helpers import AssertTimelineLogMixin
+
+
+@requests_mock.Mocker()
+class UpdateUserFromLoginSignalAPITestCase(
+    ClearCachesMixin, DisableRequestLogMixin, AssertTimelineLogMixin, WebTest
+):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        MockAPIReadData.setUpServices()
+
+    def test_update_user_after_login(self, m):
+        MockAPIReadData.setUpOASMocks(m)
+
+        self.klant = generate_oas_component(
+            "kc",
+            "schemas/Klant",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            emailadres="new@example.com",
+            telefoonnummer="0612345678",
+        )
+        m.get(
+            f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn=999993847",
+            json=paginated_response([self.klant]),
+        )
+
+        user = UserFactory(
+            phonenumber="0123456789",
+            email="old@example.com",
+            login_type=LoginTypeChoices.digid,
+            bsn="999993847",
+        )
+
+        request = RequestFactory().get("/dummy")
+        request.user = user
+        user_logged_in.send(User, user=user, request=request)
+
+        user.refresh_from_db()
+
+        self.assertEqual(user.email, "new@example.com")
+        self.assertEqual(user.phonenumber, "0612345678")
+
+        self.assertTimelineLog("retrieved klant for BSN-user")
+        self.assertTimelineLog(
+            "updated user from klant API with fields: email, phonenumber"
+        )
+
+    def test_update_user_after_login_skips_existing_email(self, m):
+        MockAPIReadData.setUpOASMocks(m)
+
+        self.klant = generate_oas_component(
+            "kc",
+            "schemas/Klant",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            emailadres="foo@example.com",
+            telefoonnummer="0612345678",
+        )
+        m.get(
+            f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn=999993847",
+            json=paginated_response([self.klant]),
+        )
+
+        user = UserFactory(
+            phonenumber="0123456789",
+            email="old@example.com",
+            login_type=LoginTypeChoices.digid,
+            bsn="999993847",
+        )
+        other_user = UserFactory(
+            phonenumber="0101010101",
+            # uses same email as klant resource
+            email="foo@example.com",
+        )
+
+        request = RequestFactory().get("/dummy")
+        request.user = user
+        user_logged_in.send(User, user=user, request=request)
+
+        user.refresh_from_db()
+
+        # email didn't change
+        self.assertEqual(user.email, "old@example.com")
+        self.assertEqual(user.phonenumber, "0612345678")
+
+        self.assertTimelineLog("retrieved klant for BSN-user")
+        self.assertTimelineLog("updated user from klant API with fields: phonenumber")
diff --git a/src/open_inwoner/openklant/views/contactform.py b/src/open_inwoner/openklant/views/contactform.py
index e4c080b20e..53d5afe94d 100644
--- a/src/open_inwoner/openklant/views/contactform.py
+++ b/src/open_inwoner/openklant/views/contactform.py
@@ -88,10 +88,15 @@ def register_by_email(self, form, recipient_email):
 
         if success:
             messages.add_message(self.request, messages.SUCCESS, self.message_success)
-            self.log_system_action(f"registered contactmoment by email")
+            self.log_system_action(
+                "registered contactmoment by email", user=self.request.user
+            )
         else:
             messages.add_message(self.request, messages.ERROR, self.message_failure)
-            self.log_system_action(f"error while registering contactmoment by email")
+            self.log_system_action(
+                "error while registering contactmoment by email",
+                user=self.request.user,
+            )
 
     def register_by_api(self, form, config: OpenKlantConfig):
         assert config.has_api_configuration()
@@ -100,7 +105,9 @@ def register_by_api(self, form, config: OpenKlantConfig):
         if self.request.user.is_authenticated and self.request.user.bsn:
             klant = fetch_klant_for_bsn(self.request.user.bsn)
             if klant:
-                self.log_system_action("retrieved klant for BSN-user")
+                self.log_system_action(
+                    "retrieved klant for BSN-user", user=self.request.user
+                )
 
                 # check if we have some data missing from the Klant
                 update_data = {}
@@ -111,10 +118,13 @@ def register_by_api(self, form, config: OpenKlantConfig):
                 if update_data:
                     patch_klant(klant, update_data)
                     self.log_system_action(
-                        f"patched klant from user with missing fields: {', '.join(sorted(update_data.keys()))}"
+                        f"patched klant from user with missing fields: {', '.join(sorted(update_data.keys()))}",
+                        user=self.request.user,
                     )
             else:
-                self.log_system_action(f"could not retrieve klant for BSN-user")
+                self.log_system_action(
+                    "could not retrieve klant for BSN-user", user=self.request.user
+                )
 
         else:
             data = {
@@ -130,10 +140,11 @@ def register_by_api(self, form, config: OpenKlantConfig):
             if klant:
                 if self.request.user.is_authenticated:
                     self.log_system_action(
-                        f"created klant for basic authenticated user"
+                        "created klant for basic authenticated user",
+                        user=self.request.user,
                     )
                 else:
-                    self.log_system_action(f"created klant for anonymous user")
+                    self.log_system_action("created klant for anonymous user")
 
         # create contact moment
         subject = form.cleaned_data["subject"].subject
@@ -153,7 +164,8 @@ def register_by_api(self, form, config: OpenKlantConfig):
                 text = f"{text}\nTelefoonnummer: {form.cleaned_data['phonenumber']}"
 
             self.log_system_action(
-                f"could not retrieve or create klant for user, appended info to message"
+                "could not retrieve or create klant for user, appended info to message",
+                user=self.request.user,
             )
 
         data = {
@@ -169,7 +181,11 @@ def register_by_api(self, form, config: OpenKlantConfig):
 
         if contactmoment:
             messages.add_message(self.request, messages.SUCCESS, self.message_success)
-            self.log_system_action(f"registered contactmoment by API")
+            self.log_system_action(
+                "registered contactmoment by API", user=self.request.user
+            )
         else:
             messages.add_message(self.request, messages.ERROR, self.message_failure)
-            self.log_system_action(f"error while registering contactmoment by API")
+            self.log_system_action(
+                "error while registering contactmoment by API", user=self.request.user
+            )
diff --git a/src/open_inwoner/ssd/__init__.py b/src/open_inwoner/ssd/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/open_inwoner/utils/logentry.py b/src/open_inwoner/utils/logentry.py
index 4476ba85c4..bd05df8ad7 100644
--- a/src/open_inwoner/utils/logentry.py
+++ b/src/open_inwoner/utils/logentry.py
@@ -157,7 +157,7 @@ def system_action(
     )
     TimelineLog.objects.create(
         content_object=content_object,
-        user=user,
+        user=(None if not user or user.is_anonymous else user),
         extra_data={
             "content_object_repr": object_text,
             "action_flag": LOG_ACTIONS[5],
diff --git a/src/open_inwoner/utils/tests/helpers.py b/src/open_inwoner/utils/tests/helpers.py
index 957666b6d2..57df1694a9 100644
--- a/src/open_inwoner/utils/tests/helpers.py
+++ b/src/open_inwoner/utils/tests/helpers.py
@@ -33,8 +33,13 @@ class Lookups:
 
 class AssertTimelineLogMixin:
     def assertTimelineLog(
-        self, message, *, level=None, lookup=Lookups.exact
+        self,
+        message,
+        *,
+        level=None,
+        lookup=Lookups.exact,
     ) -> TimelineLog:
+
         kwargs = {
             f"extra_data__message__{lookup}": force_str(message),
         }
@@ -49,7 +54,7 @@ def assertTimelineLog(
             )
         elif count > 1:
             self.fail(
-                f"found {count} TimelineLogs with {kwargs}, got:\n{self.getTimelineLogDump()}"
+                f"expected 1 but found {count} TimelineLogs with {kwargs}, got:\n{self.getTimelineLogDump()}"
             )
 
         return logs[0]
@@ -77,6 +82,9 @@ def getTimelineLogDump(self) -> str:
     def dumpTimelineLog(self):
         print(self.getTimelineLogDump())
 
+    def resetTimelineLogs(self):
+        TimelineLog.objects.all().delete()
+
 
 class AssertFormMixin:
     def assertFormExactFields(
diff --git a/src/open_inwoner/utils/tests/test_helpers.py b/src/open_inwoner/utils/tests/test_helpers.py
index df368302a7..8f4012caf3 100644
--- a/src/open_inwoner/utils/tests/test_helpers.py
+++ b/src/open_inwoner/utils/tests/test_helpers.py
@@ -34,5 +34,7 @@ def test_assertTimelineLog(self):
                 self.assertTimelineLog("foo bar", level=logging.INFO)
 
         with self.subTest("multiple"):
-            with self.assertRaisesRegex(AssertionError, r"^found 2 TimelineLogs with"):
+            with self.assertRaisesRegex(
+                AssertionError, r"^expected 1 but found 2 TimelineLogs with"
+            ):
                 self.assertTimelineLog("bazz buzz")
diff --git a/src/open_inwoner/utils/views.py b/src/open_inwoner/utils/views.py
index 369418410f..ab78d18b1c 100644
--- a/src/open_inwoner/utils/views.py
+++ b/src/open_inwoner/utils/views.py
@@ -100,8 +100,8 @@ def log_user_action(self, instance, message):
         """
         user_action(self.request, instance, message)
 
-    def log_system_action(self, message, instance=None):
+    def log_system_action(self, message, instance=None, user=None):
         """
         Log system events not related to a specific user.
         """
-        system_action(message, content_object=instance)
+        system_action(message, content_object=instance, user=user)

From fccf2465f1700d07682da6fdf4c55bf984a411e0 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Wed, 7 Jun 2023 12:06:12 +0200
Subject: [PATCH 28/60] [#1503] refactor name validation in user model

---
 .../migrations/0061_auto_20230612_1428.py     | 54 +++++++++++++++++
 src/open_inwoner/accounts/models.py           | 26 +++++---
 src/open_inwoner/accounts/tests/test_auth.py  | 28 +++++----
 .../accounts/tests/test_profile_views.py      | 60 ++++++-------------
 src/open_inwoner/utils/validators.py          |  9 +++
 5 files changed, 115 insertions(+), 62 deletions(-)
 create mode 100644 src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py

diff --git a/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py b/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
new file mode 100644
index 0000000000..c70619ac65
--- /dev/null
+++ b/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
@@ -0,0 +1,54 @@
+# Generated by Django 3.2.15 on 2023-06-12 12:28
+
+from django.db import migrations, models
+import open_inwoner.utils.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0060_user_infix'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invite',
+            name='invitee_first_name',
+            field=models.CharField(help_text='The first name of the invitee.', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='First name'),
+        ),
+        migrations.AlterField(
+            model_name='invite',
+            name='invitee_last_name',
+            field=models.CharField(help_text='The last name of the invitee', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Last name'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='city',
+            field=models.CharField(blank=True, default='', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='City'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='display_name',
+            field=models.CharField(blank=True, default='', max_length=255, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Display name'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(blank=True, default='', max_length=255, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='First name'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='infix',
+            field=models.CharField(blank=True, default='', max_length=64, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Infix'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(blank=True, default='', max_length=255, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Last name'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='street',
+            field=models.CharField(blank=True, default='', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Street'),
+        ),
+    ]
diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py
index 67040f7725..36da12929a 100644
--- a/src/open_inwoner/accounts/models.py
+++ b/src/open_inwoner/accounts/models.py
@@ -19,7 +19,7 @@
 
 from open_inwoner.utils.hash import create_sha256_hash
 from open_inwoner.utils.validators import (
-    validate_charfield_entry,
+    NameValidator,
     validate_phone_number,
 )
 
@@ -52,28 +52,28 @@ class User(AbstractBaseUser, PermissionsMixin):
         max_length=255,
         blank=True,
         default="",
-        validators=[validate_charfield_entry],
+        validators=[NameValidator()],
     )
     infix = models.CharField(
         verbose_name=_("Infix"),
         max_length=64,
         blank=True,
         default="",
-        validators=[validate_charfield_entry],
+        validators=[NameValidator()],
     )
     last_name = models.CharField(
         verbose_name=_("Last name"),
         max_length=255,
         blank=True,
         default="",
-        validators=[validate_charfield_entry],
+        validators=[NameValidator()],
     )
     display_name = models.CharField(
         verbose_name=_("Display name"),
         max_length=255,
         blank=True,
         default="",
-        validators=[validate_charfield_entry],
+        validators=[NameValidator()],
     )
     email = models.EmailField(verbose_name=_("Email address"), unique=True)
     phonenumber = models.CharField(
@@ -124,7 +124,11 @@ class User(AbstractBaseUser, PermissionsMixin):
     )
     birthday = models.DateField(verbose_name=_("Birthday"), null=True, blank=True)
     street = models.CharField(
-        verbose_name=_("Street"), default="", blank=True, max_length=250
+        verbose_name=_("Street"),
+        default="",
+        blank=True,
+        max_length=250,
+        validators=[NameValidator()],
     )
     housenumber = models.CharField(
         verbose_name=_("House number"), default="", blank=True, max_length=250
@@ -133,7 +137,11 @@ class User(AbstractBaseUser, PermissionsMixin):
         verbose_name=_("Postcode"), null=True, blank=True, max_length=250
     )
     city = models.CharField(
-        verbose_name=_("City"), default="", blank=True, max_length=250
+        verbose_name=_("City"),
+        default="",
+        blank=True,
+        max_length=250,
+        validators=[NameValidator()],
     )
     deactivated_on = models.DateField(
         verbose_name=_("Deactivated on"),
@@ -661,13 +669,13 @@ class Invite(models.Model):
         verbose_name=_("First name"),
         max_length=250,
         help_text=_("The first name of the invitee."),
-        validators=[validate_charfield_entry],
+        validators=[NameValidator()],
     )
     invitee_last_name = models.CharField(
         verbose_name=_("Last name"),
         max_length=250,
         help_text=_("The last name of the invitee"),
-        validators=[validate_charfield_entry],
+        validators=[NameValidator()],
     )
     invitee_email = models.EmailField(
         verbose_name=_("Invitee email"),
diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py
index f632af7d3d..266a63bdac 100644
--- a/src/open_inwoner/accounts/tests/test_auth.py
+++ b/src/open_inwoner/accounts/tests/test_auth.py
@@ -73,7 +73,7 @@ def test_registration_fails_without_filling_out_last_name(self):
         self.assertEqual(user_query.count(), 0)
 
     def test_registration_fails_with_invalid_first_name_characters(self):
-        invalid_characters = "/\"\\,.:;'"
+        invalid_characters = '<>#/"\\,.:;'
 
         for char in invalid_characters:
             with self.subTest(char=char):
@@ -87,15 +87,16 @@ def test_registration_fails_with_invalid_first_name_characters(self):
                 response = form.submit()
                 expected_errors = {
                     "first_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
+                        _(
+                            "Please make sure your input contains only valid characters "
+                            "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }
                 self.assertEqual(response.context["form"].errors, expected_errors)
 
     def test_registration_fails_with_invalid_last_name_characters(self):
-        invalid_characters = "/\"\\,.:;'"
+        invalid_characters = '<>#/"\\,.:;'
 
         for char in invalid_characters:
             with self.subTest(char=char):
@@ -109,8 +110,9 @@ def test_registration_fails_with_invalid_last_name_characters(self):
                 response = form.submit()
                 expected_errors = {
                     "last_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
+                        _(
+                            "Please make sure your input contains only valid characters "
+                            "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }
@@ -813,7 +815,7 @@ def test_submit_invalid_first_name_chars_fails(self):
             last_name="",
             login_type=LoginTypeChoices.digid,
         )
-        invalid_characters = "/\"\\,.:;'"
+        invalid_characters = '<>#/"\\,.:;'
 
         for char in invalid_characters:
             with self.subTest(char=char):
@@ -825,8 +827,9 @@ def test_submit_invalid_first_name_chars_fails(self):
                 response = form.submit()
                 expected_errors = {
                     "first_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
+                        _(
+                            "Please make sure your input contains only valid characters "
+                            "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }
@@ -839,7 +842,7 @@ def test_submit_invalid_last_name_chars_fails(self):
             last_name="",
             login_type=LoginTypeChoices.digid,
         )
-        invalid_characters = "/\"\\,.:;'"
+        invalid_characters = '<>#/"\\,.:;'
 
         for char in invalid_characters:
             with self.subTest(char=char):
@@ -851,8 +854,9 @@ def test_submit_invalid_last_name_chars_fails(self):
                 response = form.submit()
                 expected_errors = {
                     "last_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
+                        _(
+                            "Please make sure your input contains only valid characters "
+                            "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }
diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
index 998fa031e6..245ba07b3b 100644
--- a/src/open_inwoner/accounts/tests/test_profile_views.py
+++ b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -263,55 +263,33 @@ def test_save_filled_form(self):
         self.assertEquals(self.user.postcode, "1013 RM")
         self.assertEquals(self.user.city, "Amsterdam")
 
-    def test_save_with_invalid_first_name_chars_fails(self):
-        invalid_characters = "/\"\\,.:;'"
+    def test_name_validation(self):
+        invalid_characters = '<>#/"\\,.:;'
 
         for char in invalid_characters:
             with self.subTest(char=char):
                 response = self.app.get(self.url, user=self.user, status=200)
                 form = response.forms["profile-edit"]
-                form["first_name"] = char
-                form["last_name"] = "Last name"
-                form["display_name"] = "a nickname"
-                form["phonenumber"] = "06987878787"
-                form["birthday"] = "21-01-1992"
-                form["street"] = "Keizersgracht"
-                form["housenumber"] = "17 d"
-                form["postcode"] = "1013 RM"
-                form["city"] = "Amsterdam"
-                response = form.submit()
-                expected_errors = {
-                    "first_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
-                        )
-                    ]
-                }
-                self.assertEqual(response.context["form"].errors, expected_errors)
-
-    def test_save_with_invalid_last_name_chars_fails(self):
-        invalid_characters = "/\"\\,.:;'"
+                form["first_name"] = "test" + char
+                form["infix"] = char + "test"
+                form["last_name"] = "te" + char + "st"
+                form["display_name"] = "te" + char + "st"
+                form["city"] = "te" + char + "st"
+                form["street"] = "te" + char + "st"
 
-        for char in invalid_characters:
-            with self.subTest(char=char):
-                response = self.app.get(self.url, user=self.user, status=200)
-                form = response.forms["profile-edit"]
-                form["first_name"] = "John"
-                form["last_name"] = char
-                form["display_name"] = "a nickname"
-                form["phonenumber"] = "06987878787"
-                form["birthday"] = "21-01-1992"
-                form["street"] = "Keizersgracht"
-                form["housenumber"] = "17 d"
-                form["postcode"] = "1013 RM"
-                form["city"] = "Amsterdam"
                 response = form.submit()
+
+                error_msg = _(
+                    "Please make sure your input contains only valid characters "
+                    "(letters, numbers, apostrophe, space)."
+                )
                 expected_errors = {
-                    "last_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
-                        )
-                    ]
+                    "first_name": [error_msg],
+                    "infix": [error_msg],
+                    "last_name": [error_msg],
+                    "display_name": [error_msg],
+                    "city": [error_msg],
+                    "street": [error_msg],
                 }
                 self.assertEqual(response.context["form"].errors, expected_errors)
 
diff --git a/src/open_inwoner/utils/validators.py b/src/open_inwoner/utils/validators.py
index 9bd06ba437..7ec0ecb556 100644
--- a/src/open_inwoner/utils/validators.py
+++ b/src/open_inwoner/utils/validators.py
@@ -8,6 +8,15 @@
 from filer.models import Image
 
 
+@deconstructible
+class NameValidator(RegexValidator):
+    regex = r"^[\w'’ ]+\Z"
+    message = _(
+        "Please make sure your input contains only valid characters "
+        "(letters, numbers, apostrophe, space)."
+    )
+
+
 def validate_charfield_entry(value, allow_apostrophe=False):
     """
     Validates a charfield entry according with requirements.

From a31eee3ae1cd197f0cdba8fda3f4bfa25a71e349 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Mon, 12 Jun 2023 14:47:43 +0200
Subject: [PATCH 29/60] [#1503] refactor name validation in contact form

---
 src/open_inwoner/accounts/forms.py                   |  5 +++--
 .../accounts/tests/test_contact_views.py             | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py
index 007d855468..6ff7f14133 100644
--- a/src/open_inwoner/accounts/forms.py
+++ b/src/open_inwoner/accounts/forms.py
@@ -15,6 +15,7 @@
 from open_inwoner.utils.validators import (
     format_phone_number,
     validate_charfield_entry,
+    NameValidator,
     validate_phone_number,
 )
 
@@ -307,10 +308,10 @@ class ContactFilterForm(forms.Form):
 
 class ContactCreateForm(forms.Form):
     first_name = forms.CharField(
-        label=_("First name"), max_length=255, validators=[validate_charfield_entry]
+        label=_("First name"), max_length=255, validators=[NameValidator()]
     )
     last_name = forms.CharField(
-        label=_("Last name"), max_length=255, validators=[validate_charfield_entry]
+        label=_("Last name"), max_length=255, validators=[NameValidator()]
     )
     email = forms.EmailField(label=_("Email"))
 
diff --git a/src/open_inwoner/accounts/tests/test_contact_views.py b/src/open_inwoner/accounts/tests/test_contact_views.py
index 7d39a46d3c..5b705f041a 100644
--- a/src/open_inwoner/accounts/tests/test_contact_views.py
+++ b/src/open_inwoner/accounts/tests/test_contact_views.py
@@ -208,7 +208,7 @@ def test_adding_inactive_contact_fails(self):
         self.assertEqual(response.context["form"].errors, expected_errors)
 
     def test_adding_contact_with_invalid_first_name_chars_fails(self):
-        invalid_characters = "/\"\\,.:;'"
+        invalid_characters = '<>#/"\\,.:;'
 
         for char in invalid_characters:
             with self.subTest(char=char):
@@ -220,15 +220,15 @@ def test_adding_contact_with_invalid_first_name_chars_fails(self):
                 response = form.submit()
                 expected_errors = {
                     "first_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
+                        _("Please make sure your input contains only valid characters "
+                          "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }
                 self.assertEqual(response.context["form"].errors, expected_errors)
 
     def test_adding_contact_with_invalid_last_name_chars_fails(self):
-        invalid_characters = "/\"\\,.:;'"
+        invalid_characters = '<>#/"\\,.:;'
 
         for char in invalid_characters:
             with self.subTest(char=char):
@@ -240,8 +240,8 @@ def test_adding_contact_with_invalid_last_name_chars_fails(self):
                 response = form.submit()
                 expected_errors = {
                     "last_name": [
-                        _("Uw invoer bevat een ongeldig teken: {char}").format(
-                            char=char
+                        _("Please make sure your input contains only valid characters "
+                          "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }

From a61c4cf473839e9aabc17b9b18726b8495a6ca73 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Mon, 12 Jun 2023 14:53:14 +0200
Subject: [PATCH 30/60] [#1503] refactor name validation in CaseUploadForm

---
 src/open_inwoner/accounts/forms.py            |  5 ++---
 .../utils/tests/test_validators.py            | 22 -------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py
index 6ff7f14133..007d855468 100644
--- a/src/open_inwoner/accounts/forms.py
+++ b/src/open_inwoner/accounts/forms.py
@@ -15,7 +15,6 @@
 from open_inwoner.utils.validators import (
     format_phone_number,
     validate_charfield_entry,
-    NameValidator,
     validate_phone_number,
 )
 
@@ -308,10 +307,10 @@ class ContactFilterForm(forms.Form):
 
 class ContactCreateForm(forms.Form):
     first_name = forms.CharField(
-        label=_("First name"), max_length=255, validators=[NameValidator()]
+        label=_("First name"), max_length=255, validators=[validate_charfield_entry]
     )
     last_name = forms.CharField(
-        label=_("Last name"), max_length=255, validators=[NameValidator()]
+        label=_("Last name"), max_length=255, validators=[validate_charfield_entry]
     )
     email = forms.EmailField(label=_("Email"))
 
diff --git a/src/open_inwoner/utils/tests/test_validators.py b/src/open_inwoner/utils/tests/test_validators.py
index 8abd341094..17a6efb202 100644
--- a/src/open_inwoner/utils/tests/test_validators.py
+++ b/src/open_inwoner/utils/tests/test_validators.py
@@ -3,7 +3,6 @@
 
 from ..validators import (
     format_phone_number,
-    validate_charfield_entry,
     validate_phone_number,
     validate_postal_code,
 )
@@ -14,27 +13,6 @@ class ValidatorsTestCase(TestCase):
     Validates the functions defined in ``utils.validators`` module.
     """
 
-    def test_validate_charfield_entry_apostrophe_not_allowed(self):
-        """
-        Tests the ``validate_charfield_entry`` function when not explicitly
-        allowing apostrophe character.
-        """
-        self.assertRaisesMessage(
-            ValidationError,
-            "Uw invoer bevat een ongeldig teken: '",
-            validate_charfield_entry,
-            "let's fail",
-        )
-
-    def test_validate_charfield_entry_apostrophe_allowed(self):
-        """
-        Tests the ``validate_charfield_entry`` function when explicitly
-        allowing apostrophe character.
-        """
-        self.assertEqual(
-            validate_charfield_entry("let's pass", allow_apostrophe=True), "let's pass"
-        )
-
     def test_validate_postal_code(self):
         """
         Test all valid postal code and also test invalid values

From 88e8b7c56372b7dad307e3257296ca1960124d99 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Mon, 12 Jun 2023 15:02:32 +0200
Subject: [PATCH 31/60] [#1503] escape HTML in contact dropdown

---
 .../migrations/0061_auto_20230612_1428.py     | 96 ++++++++++++++-----
 src/open_inwoner/accounts/models.py           |  5 +-
 .../accounts/tests/test_contact_views.py      | 10 +-
 .../js/components/autocomplete/index.js       |  8 +-
 4 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py b/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
index c70619ac65..4a78a4d56d 100644
--- a/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
+++ b/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
@@ -7,48 +7,94 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounts', '0060_user_infix'),
+        ("accounts", "0060_user_infix"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='invite',
-            name='invitee_first_name',
-            field=models.CharField(help_text='The first name of the invitee.', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='First name'),
+            model_name="invite",
+            name="invitee_first_name",
+            field=models.CharField(
+                help_text="The first name of the invitee.",
+                max_length=250,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="First name",
+            ),
         ),
         migrations.AlterField(
-            model_name='invite',
-            name='invitee_last_name',
-            field=models.CharField(help_text='The last name of the invitee', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Last name'),
+            model_name="invite",
+            name="invitee_last_name",
+            field=models.CharField(
+                help_text="The last name of the invitee",
+                max_length=250,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="Last name",
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='city',
-            field=models.CharField(blank=True, default='', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='City'),
+            model_name="user",
+            name="city",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=250,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="City",
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='display_name',
-            field=models.CharField(blank=True, default='', max_length=255, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Display name'),
+            model_name="user",
+            name="display_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=255,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="Display name",
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='first_name',
-            field=models.CharField(blank=True, default='', max_length=255, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='First name'),
+            model_name="user",
+            name="first_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=255,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="First name",
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='infix',
-            field=models.CharField(blank=True, default='', max_length=64, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Infix'),
+            model_name="user",
+            name="infix",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=64,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="Infix",
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='last_name',
-            field=models.CharField(blank=True, default='', max_length=255, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Last name'),
+            model_name="user",
+            name="last_name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=255,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="Last name",
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='street',
-            field=models.CharField(blank=True, default='', max_length=250, validators=[open_inwoner.utils.validators.NameValidator()], verbose_name='Street'),
+            model_name="user",
+            name="street",
+            field=models.CharField(
+                blank=True,
+                default="",
+                max_length=250,
+                validators=[open_inwoner.utils.validators.NameValidator()],
+                verbose_name="Street",
+            ),
         ),
     ]
diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py
index 36da12929a..a5d42b15d1 100644
--- a/src/open_inwoner/accounts/models.py
+++ b/src/open_inwoner/accounts/models.py
@@ -18,10 +18,7 @@
 from timeline_logger.models import TimelineLog
 
 from open_inwoner.utils.hash import create_sha256_hash
-from open_inwoner.utils.validators import (
-    NameValidator,
-    validate_phone_number,
-)
+from open_inwoner.utils.validators import NameValidator, validate_phone_number
 
 from ..plans.models import PlanContact
 from .choices import ContactTypeChoices, LoginTypeChoices, StatusChoices, TypeChoices
diff --git a/src/open_inwoner/accounts/tests/test_contact_views.py b/src/open_inwoner/accounts/tests/test_contact_views.py
index 5b705f041a..4f4531d64c 100644
--- a/src/open_inwoner/accounts/tests/test_contact_views.py
+++ b/src/open_inwoner/accounts/tests/test_contact_views.py
@@ -220,8 +220,9 @@ def test_adding_contact_with_invalid_first_name_chars_fails(self):
                 response = form.submit()
                 expected_errors = {
                     "first_name": [
-                        _("Please make sure your input contains only valid characters "
-                          "(letters, numbers, apostrophe, space)."
+                        _(
+                            "Please make sure your input contains only valid characters "
+                            "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }
@@ -240,8 +241,9 @@ def test_adding_contact_with_invalid_last_name_chars_fails(self):
                 response = form.submit()
                 expected_errors = {
                     "last_name": [
-                        _("Please make sure your input contains only valid characters "
-                          "(letters, numbers, apostrophe, space)."
+                        _(
+                            "Please make sure your input contains only valid characters "
+                            "(letters, numbers, apostrophe, space)."
                         )
                     ]
                 }
diff --git a/src/open_inwoner/js/components/autocomplete/index.js b/src/open_inwoner/js/components/autocomplete/index.js
index 10a30f0db7..d79b6c124b 100644
--- a/src/open_inwoner/js/components/autocomplete/index.js
+++ b/src/open_inwoner/js/components/autocomplete/index.js
@@ -2,8 +2,14 @@ import autoComplete from '@tarekraafat/autocomplete.js/dist/autoComplete'
 
 const autocompleteField = (node) => {
   const choices = JSON.parse(
-    node.dataset.autocompleteChoices.replace(/'/g, '"')
+    node.dataset.autocompleteChoices
+      .replace(/'/g, '"')
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
   )
+  console.log('node', node)
+  console.log('dataset', node.dataset)
   const choiceLabels = choices.map((choice) => choice[1])
   const fieldId = node.dataset.fieldId
   const hidden = node.querySelector(`#${fieldId}`)

From 8cbda73ae945a00e2d4aebd2fc5c38da185930c7 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Tue, 13 Jun 2023 08:37:21 +0200
Subject: [PATCH 32/60] [#1503] process PR feedback

---
 src/open_inwoner/accounts/forms.py             |  6 +++---
 .../migrations/0061_auto_20230612_1428.py      | 16 ++++++++--------
 src/open_inwoner/accounts/models.py            | 18 +++++++++---------
 src/open_inwoner/accounts/tests/test_auth.py   |  8 ++++----
 .../accounts/tests/test_contact_views.py       |  4 ++--
 .../accounts/tests/test_profile_views.py       |  2 +-
 src/open_inwoner/cms/cases/forms.py            |  4 ++--
 .../components/Form/Autocomplete.html          |  8 ++++++--
 .../js/components/autocomplete/index.js        | 15 +++++++--------
 src/open_inwoner/utils/validators.py           |  7 ++++---
 10 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py
index 007d855468..5fe50d0ace 100644
--- a/src/open_inwoner/accounts/forms.py
+++ b/src/open_inwoner/accounts/forms.py
@@ -13,8 +13,8 @@
 from open_inwoner.pdc.models.category import Category
 from open_inwoner.utils.forms import LimitedUploadFileField, PrivateFileWidget
 from open_inwoner.utils.validators import (
+    CharFieldValidator,
     format_phone_number,
-    validate_charfield_entry,
     validate_phone_number,
 )
 
@@ -307,10 +307,10 @@ class ContactFilterForm(forms.Form):
 
 class ContactCreateForm(forms.Form):
     first_name = forms.CharField(
-        label=_("First name"), max_length=255, validators=[validate_charfield_entry]
+        label=_("First name"), max_length=255, validators=[CharFieldValidator()]
     )
     last_name = forms.CharField(
-        label=_("Last name"), max_length=255, validators=[validate_charfield_entry]
+        label=_("Last name"), max_length=255, validators=[CharFieldValidator()]
     )
     email = forms.EmailField(label=_("Email"))
 
diff --git a/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py b/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
index 4a78a4d56d..bdb1328d79 100644
--- a/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
+++ b/src/open_inwoner/accounts/migrations/0061_auto_20230612_1428.py
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
             field=models.CharField(
                 help_text="The first name of the invitee.",
                 max_length=250,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="First name",
             ),
         ),
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
             field=models.CharField(
                 help_text="The last name of the invitee",
                 max_length=250,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="Last name",
             ),
         ),
@@ -38,7 +38,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 default="",
                 max_length=250,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="City",
             ),
         ),
@@ -49,7 +49,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 default="",
                 max_length=255,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="Display name",
             ),
         ),
@@ -60,7 +60,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 default="",
                 max_length=255,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="First name",
             ),
         ),
@@ -71,7 +71,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 default="",
                 max_length=64,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="Infix",
             ),
         ),
@@ -82,7 +82,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 default="",
                 max_length=255,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="Last name",
             ),
         ),
@@ -93,7 +93,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 default="",
                 max_length=250,
-                validators=[open_inwoner.utils.validators.NameValidator()],
+                validators=[open_inwoner.utils.validators.CharFieldValidator()],
                 verbose_name="Street",
             ),
         ),
diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py
index a5d42b15d1..bc98b4ba8c 100644
--- a/src/open_inwoner/accounts/models.py
+++ b/src/open_inwoner/accounts/models.py
@@ -18,7 +18,7 @@
 from timeline_logger.models import TimelineLog
 
 from open_inwoner.utils.hash import create_sha256_hash
-from open_inwoner.utils.validators import NameValidator, validate_phone_number
+from open_inwoner.utils.validators import CharFieldValidator, validate_phone_number
 
 from ..plans.models import PlanContact
 from .choices import ContactTypeChoices, LoginTypeChoices, StatusChoices, TypeChoices
@@ -49,28 +49,28 @@ class User(AbstractBaseUser, PermissionsMixin):
         max_length=255,
         blank=True,
         default="",
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     infix = models.CharField(
         verbose_name=_("Infix"),
         max_length=64,
         blank=True,
         default="",
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     last_name = models.CharField(
         verbose_name=_("Last name"),
         max_length=255,
         blank=True,
         default="",
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     display_name = models.CharField(
         verbose_name=_("Display name"),
         max_length=255,
         blank=True,
         default="",
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     email = models.EmailField(verbose_name=_("Email address"), unique=True)
     phonenumber = models.CharField(
@@ -125,7 +125,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         default="",
         blank=True,
         max_length=250,
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     housenumber = models.CharField(
         verbose_name=_("House number"), default="", blank=True, max_length=250
@@ -138,7 +138,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         default="",
         blank=True,
         max_length=250,
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     deactivated_on = models.DateField(
         verbose_name=_("Deactivated on"),
@@ -666,13 +666,13 @@ class Invite(models.Model):
         verbose_name=_("First name"),
         max_length=250,
         help_text=_("The first name of the invitee."),
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     invitee_last_name = models.CharField(
         verbose_name=_("Last name"),
         max_length=250,
         help_text=_("The last name of the invitee"),
-        validators=[NameValidator()],
+        validators=[CharFieldValidator()],
     )
     invitee_email = models.EmailField(
         verbose_name=_("Invitee email"),
diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py
index 266a63bdac..cc1e3d1bdc 100644
--- a/src/open_inwoner/accounts/tests/test_auth.py
+++ b/src/open_inwoner/accounts/tests/test_auth.py
@@ -89,7 +89,7 @@ def test_registration_fails_with_invalid_first_name_characters(self):
                     "first_name": [
                         _(
                             "Please make sure your input contains only valid characters "
-                            "(letters, numbers, apostrophe, space)."
+                            "(letters, numbers, apostrophe, dash, space)."
                         )
                     ]
                 }
@@ -112,7 +112,7 @@ def test_registration_fails_with_invalid_last_name_characters(self):
                     "last_name": [
                         _(
                             "Please make sure your input contains only valid characters "
-                            "(letters, numbers, apostrophe, space)."
+                            "(letters, numbers, apostrophe, dash, space)."
                         )
                     ]
                 }
@@ -829,7 +829,7 @@ def test_submit_invalid_first_name_chars_fails(self):
                     "first_name": [
                         _(
                             "Please make sure your input contains only valid characters "
-                            "(letters, numbers, apostrophe, space)."
+                            "(letters, numbers, apostrophe, dash, space)."
                         )
                     ]
                 }
@@ -856,7 +856,7 @@ def test_submit_invalid_last_name_chars_fails(self):
                     "last_name": [
                         _(
                             "Please make sure your input contains only valid characters "
-                            "(letters, numbers, apostrophe, space)."
+                            "(letters, numbers, apostrophe, dash, space)."
                         )
                     ]
                 }
diff --git a/src/open_inwoner/accounts/tests/test_contact_views.py b/src/open_inwoner/accounts/tests/test_contact_views.py
index 4f4531d64c..4aa8f63de3 100644
--- a/src/open_inwoner/accounts/tests/test_contact_views.py
+++ b/src/open_inwoner/accounts/tests/test_contact_views.py
@@ -222,7 +222,7 @@ def test_adding_contact_with_invalid_first_name_chars_fails(self):
                     "first_name": [
                         _(
                             "Please make sure your input contains only valid characters "
-                            "(letters, numbers, apostrophe, space)."
+                            "(letters, numbers, apostrophe, dash, space)."
                         )
                     ]
                 }
@@ -243,7 +243,7 @@ def test_adding_contact_with_invalid_last_name_chars_fails(self):
                     "last_name": [
                         _(
                             "Please make sure your input contains only valid characters "
-                            "(letters, numbers, apostrophe, space)."
+                            "(letters, numbers, apostrophe, dash, space)."
                         )
                     ]
                 }
diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
index 245ba07b3b..a0466066c7 100644
--- a/src/open_inwoner/accounts/tests/test_profile_views.py
+++ b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -281,7 +281,7 @@ def test_name_validation(self):
 
                 error_msg = _(
                     "Please make sure your input contains only valid characters "
-                    "(letters, numbers, apostrophe, space)."
+                    "(letters, numbers, apostrophe, dash, space)."
                 )
                 expected_errors = {
                     "first_name": [error_msg],
diff --git a/src/open_inwoner/cms/cases/forms.py b/src/open_inwoner/cms/cases/forms.py
index 1aacd2b069..6d5ae29b29 100644
--- a/src/open_inwoner/cms/cases/forms.py
+++ b/src/open_inwoner/cms/cases/forms.py
@@ -8,12 +8,12 @@
     OpenZaakConfig,
     ZaakTypeInformatieObjectTypeConfig,
 )
-from open_inwoner.utils.validators import validate_charfield_entry
+from open_inwoner.utils.validators import CharFieldValidator
 
 
 class CaseUploadForm(forms.Form):
     title = forms.CharField(
-        label=_("Titel bestand"), max_length=255, validators=[validate_charfield_entry]
+        label=_("Titel bestand"), max_length=255, validators=[CharFieldValidator()]
     )
     type = forms.ModelChoiceField(
         ZaakTypeInformatieObjectTypeConfig.objects.none(),
diff --git a/src/open_inwoner/components/templates/components/Form/Autocomplete.html b/src/open_inwoner/components/templates/components/Form/Autocomplete.html
index 0c5743a460..0755f06a3f 100644
--- a/src/open_inwoner/components/templates/components/Form/Autocomplete.html
+++ b/src/open_inwoner/components/templates/components/Form/Autocomplete.html
@@ -1,6 +1,9 @@
-{% load form_tags %}
+{% load form_tags string_tags %}
 
-<div class="form__control autocomplete__input" data-autocomplete-choices="{{ field.field.choices }}" data-field-id="{{ field.auto_id }}">
+{% with field.auto_id|addstr:"_choices" as choices_id %}
+<div class="form__control autocomplete__input" data-choices-id={{ choices_id }} data-field-id="{{ field.auto_id }}">
+
+    {{ field.field.choices|json_script:choices_id }}
     <label class="label">
         {% if not no_label %}{{ field.label }}{% endif %}
 
@@ -17,3 +20,4 @@
 
     <input id="{{ field.auto_id }}" name="{{ field.name }}" type="hidden">
 </div>
+{% endwith %}
diff --git a/src/open_inwoner/js/components/autocomplete/index.js b/src/open_inwoner/js/components/autocomplete/index.js
index d79b6c124b..22ef7b3497 100644
--- a/src/open_inwoner/js/components/autocomplete/index.js
+++ b/src/open_inwoner/js/components/autocomplete/index.js
@@ -1,15 +1,14 @@
 import autoComplete from '@tarekraafat/autocomplete.js/dist/autoComplete'
+import escapeHTML from 'escape-html'
 
 const autocompleteField = (node) => {
-  const choices = JSON.parse(
-    node.dataset.autocompleteChoices
-      .replace(/'/g, '"')
-      .replace(/&/g, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
+  let choices = JSON.parse(
+    document.getElementById(node.dataset.choicesId).textContent
   )
-  console.log('node', node)
-  console.log('dataset', node.dataset)
+
+  // choices is an array of arrays of key/value pairs: two mappings needed to escape elements
+  choices = choices.map((choice) => choice.map((item) => escapeHTML(item)))
+
   const choiceLabels = choices.map((choice) => choice[1])
   const fieldId = node.dataset.fieldId
   const hidden = node.querySelector(`#${fieldId}`)
diff --git a/src/open_inwoner/utils/validators.py b/src/open_inwoner/utils/validators.py
index 7ec0ecb556..6b29729a72 100644
--- a/src/open_inwoner/utils/validators.py
+++ b/src/open_inwoner/utils/validators.py
@@ -9,14 +9,15 @@
 
 
 @deconstructible
-class NameValidator(RegexValidator):
-    regex = r"^[\w'’ ]+\Z"
+class CharFieldValidator(RegexValidator):
+    regex = r"^[\w'’\- ]+\Z"
     message = _(
         "Please make sure your input contains only valid characters "
-        "(letters, numbers, apostrophe, space)."
+        "(letters, numbers, apostrophe, dash, space)."
     )
 
 
+# deprecated
 def validate_charfield_entry(value, allow_apostrophe=False):
     """
     Validates a charfield entry according with requirements.

From d28363c822f93b4824360f608f63a4457416da28 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Thu, 15 Jun 2023 00:00:55 +0200
Subject: [PATCH 33/60] [#1399] Ensuring Onderwerpen are sorted based on the
 configured order in the admin

---
 src/open_inwoner/cms/products/cms_plugins.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/open_inwoner/cms/products/cms_plugins.py b/src/open_inwoner/cms/products/cms_plugins.py
index bdbd6fefda..7eb04ec939 100644
--- a/src/open_inwoner/cms/products/cms_plugins.py
+++ b/src/open_inwoner/cms/products/cms_plugins.py
@@ -29,14 +29,14 @@ def render(self, context, instance, placeholder):
 
         # Highlighted categories
         highlighted_categories = (
-            Category.objects.published().filter(highlighted=True).order_by("name")
+            Category.objects.published().filter(highlighted=True).order_by("path")
         )
         if request.user.is_authenticated and request.user.selected_categories.exists():
             categories = request.user.selected_categories.order_by("name")[: self.limit]
         elif highlighted_categories.exists():
             categories = highlighted_categories[: self.limit]
         else:
-            categories = Category.objects.published().order_by("name")[: self.limit]
+            categories = Category.objects.published().order_by("path")[: self.limit]
 
         context["categories"] = categories
 

From 4083622be17a8cd0be992599fcafb39c5e7da340 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Mon, 5 Jun 2023 16:57:10 +0200
Subject: [PATCH 34/60] [#1508] fix behavior of 'my messages'

---
 .../accounts/tests/test_contact_views.py      | 45 ++++++++++++++-----
 .../accounts/tests/test_profile_views.py      | 40 +++++++++++++++--
 src/open_inwoner/accounts/views/contacts.py   |  2 +
 src/open_inwoner/accounts/views/profile.py    |  2 +
 src/open_inwoner/cms/utils/page_display.py    | 45 +++++++++++++++++++
 .../pages/profile/contacts/list.html          | 17 ++++---
 .../templates/pages/profile/me.html           |  4 +-
 7 files changed, 135 insertions(+), 20 deletions(-)
 create mode 100644 src/open_inwoner/cms/utils/page_display.py

diff --git a/src/open_inwoner/accounts/tests/test_contact_views.py b/src/open_inwoner/accounts/tests/test_contact_views.py
index 7d39a46d3c..c99141749b 100644
--- a/src/open_inwoner/accounts/tests/test_contact_views.py
+++ b/src/open_inwoner/accounts/tests/test_contact_views.py
@@ -6,8 +6,8 @@
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
+from cms import api
 from django_webtest import WebTest
-from PIL import Image
 
 from open_inwoner.accounts.models import User
 from open_inwoner.utils.tests.helpers import create_image_bytes
@@ -85,10 +85,40 @@ def test_contact_filter_without_any_contacts(self):
             ),
         )
 
-    def test_contact_list_show_link_to_messages(self):
-        message_link = reverse("inbox:index", kwargs={"uuid": self.contact.uuid})
+    def test_messages_enabled_disabled(self):
+        """Assert that `Stuur Bericht` is displayed if and only if the message page is published"""
+
+        # case 1: no message page
         response = self.app.get(self.list_url, user=self.user)
-        self.assertContains(response, message_link)
+
+        # self.assertNotIn(_("Stuur bericht"), response)
+        self.assertNotContains(response, _("Stuur bericht"))
+
+        # case 2: unpublished message page
+        page = api.create_page(
+            "Mijn Berichten",
+            "cms/fullwidth.html",
+            "nl",
+            slug="berichten",
+        )
+        page.application_namespace = "inbox"
+        page.save()
+
+        response = self.app.get(self.list_url, user=self.user)
+
+        self.assertNotContains(response, _("Stuur bericht"))
+
+        # case 3: published message page
+        page.publish("nl")
+        page.save()
+
+        response = self.app.get(self.list_url, user=self.user)
+
+        icons = response.pyquery(".material-icons-outlined")
+        message_icon = next((icon for icon in icons if icon.text == "message"), None)
+        message_button_text = message_icon.tail.strip()
+
+        self.assertEqual(_("Stuur bericht"), message_button_text)
 
     def test_contact_list_show_reversed(self):
         other_contact = UserFactory(first_name="reverse_contact_user_should_be_found")
@@ -366,19 +396,12 @@ def test_accepted_contact_appears_in_both_contact_lists(self):
 
         self.assertContains(response, self.user.first_name)
         self.assertContains(response, self.user.last_name)
-        self.assertContains(
-            response, reverse("inbox:index", kwargs={"uuid": self.user.uuid})
-        )
 
         # Sender contact list page
         response = self.app.get(self.list_url, user=self.user)
 
         self.assertContains(response, existing_user.first_name)
         self.assertContains(response, existing_user.last_name)
-        self.assertContains(
-            response,
-            reverse("inbox:index", kwargs={"uuid": existing_user.uuid}),
-        )
 
     def test_post_with_no_params_in_contact_approval_returns_bad_request(self):
         existing_user = UserFactory(email="ex@example.com")
diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
index c13f662501..bffa27c023 100644
--- a/src/open_inwoner/accounts/tests/test_profile_views.py
+++ b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -1,12 +1,10 @@
-import io
-
 from django.test import override_settings
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 import requests_mock
+from cms import api
 from django_webtest import WebTest
-from PIL import Image
 from timeline_logger.models import TimelineLog
 from webtest import Upload
 
@@ -191,6 +189,42 @@ def test_expected_message_is_shown_when_all_notifications_disabled(self):
         response = self.app.get(self.url, user=self.user)
         self.assertContains(response, _("You do not have any notifications enabled."))
 
+    def test_messages_enabled_disabled(self):
+        """Assert that `Stuur een bericht` is displayed if and only if the message page is published"""
+
+        begeleider = UserFactory(contact_type=ContactTypeChoices.begeleider)
+        self.user.user_contacts.add(begeleider)
+
+        # case 1: no message page
+        response = self.app.get(self.url, user=self.user)
+
+        self.assertNotContains(response, _("Stuur een bericht"))
+
+        # case 2: unpublished message page
+        page = api.create_page(
+            "Mijn Berichten",
+            "cms/fullwidth.html",
+            "nl",
+            slug="berichten",
+        )
+        page.application_namespace = "inbox"
+        page.save()
+
+        response = self.app.get(self.url, user=self.user)
+
+        self.assertNotContains(response, _("Stuur een bericht"))
+
+        # case 3: published message page
+        page.publish("nl")
+        page.save()
+
+        response = self.app.get(self.url, user=self.user)
+
+        message_link = response.pyquery("[title='Stuur een bericht']")
+        link_text = message_link.find(".link__text").text
+
+        self.assertEqual(link_text(), _("Stuur een bericht"))
+
 
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
 class EditProfileTests(WebTest):
diff --git a/src/open_inwoner/accounts/views/contacts.py b/src/open_inwoner/accounts/views/contacts.py
index 1aefd684b7..2741879f1c 100644
--- a/src/open_inwoner/accounts/views/contacts.py
+++ b/src/open_inwoner/accounts/views/contacts.py
@@ -11,6 +11,7 @@
 from mail_editor.helpers import find_template
 from view_breadcrumbs import BaseBreadcrumbMixin
 
+from open_inwoner.cms.utils.page_display import inbox_page_is_published
 from open_inwoner.utils.views import CommonPageMixin, LogMixin
 
 from ..forms import ContactCreateForm, ContactFilterForm
@@ -48,6 +49,7 @@ def get_context_data(self, **kwargs):
         context["contacts_for_approval"] = user.get_contacts_for_approval()
         context["pending_invitations"] = user.get_pending_invitations()
         context["form"] = ContactFilterForm(data=self.request.GET)
+        context["inbox_page_is_published"] = inbox_page_is_published()
         return context
 
 
diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 4403827160..3c18dd829c 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -20,6 +20,7 @@
     LoginTypeChoices,
     StatusChoices,
 )
+from open_inwoner.cms.utils.page_display import inbox_page_is_published
 from open_inwoner.haalcentraal.utils import fetch_brp_data
 from open_inwoner.questionnaire.models import QuestionnaireStep
 from open_inwoner.utils.mixins import ExportMixin
@@ -97,6 +98,7 @@ def get_context_data(self, **kwargs):
             published=True
         ).exists()
         context["can_change_password"] = user.login_type != LoginTypeChoices.digid
+        context["inbox_page_is_published"] = inbox_page_is_published()
 
         return context
 
diff --git a/src/open_inwoner/cms/utils/page_display.py b/src/open_inwoner/cms/utils/page_display.py
new file mode 100644
index 0000000000..2a18b3abc5
--- /dev/null
+++ b/src/open_inwoner/cms/utils/page_display.py
@@ -0,0 +1,45 @@
+"""Utilities for determining whether CMS pages are published"""
+
+
+from cms.models import Page
+
+from open_inwoner.cms.cases.cms_apps import CasesApphook
+from open_inwoner.cms.collaborate.cms_apps import CollaborateApphook
+from open_inwoner.cms.inbox.cms_apps import InboxApphook
+
+cms_apps = {
+    "inbox": InboxApphook,
+    "collaborate": CollaborateApphook,
+    "cases": CasesApphook,
+}
+
+
+def _is_published(page_name: str) -> bool:
+    """
+    Determine whether the page associated with a specific CMS app is published
+    """
+    page = Page.objects.filter(
+        application_namespace=cms_apps[page_name].app_name, publisher_is_draft=False
+    ).first()
+    return page and page.is_published(page.languages)
+
+
+def inbox_page_is_published() -> bool:
+    """
+    :returns: True if the inbox/message page is published, False otherwise
+    """
+    return _is_published("inbox")
+
+
+def case_page_is_published() -> bool:
+    """
+    :returns: True if the case page is published, False otherwise
+    """
+    return _is_published("cases")
+
+
+def collaborate_page_is_published() -> bool:
+    """
+    :returns: True if the collaborate page published, False otherwise
+    """
+    return _is_published("collaborate")
diff --git a/src/open_inwoner/templates/pages/profile/contacts/list.html b/src/open_inwoner/templates/pages/profile/contacts/list.html
index 77325da0af..1fa1f9fe65 100644
--- a/src/open_inwoner/templates/pages/profile/contacts/list.html
+++ b/src/open_inwoner/templates/pages/profile/contacts/list.html
@@ -84,7 +84,7 @@ <h2 class="h2">{% trans "U bent toegevoegd als contactpersoon" %}</h2>
                 <td class="table__item">{% trans "Soort contact" %}</td>
                 <td class="table__item">{% trans "E-mailadres" %}</td>
                 <td class="table__item">{% trans "Telefoonnummer" %}</td>
-                <td class="table__item" colspan="2">{% trans "Actief" %}&nbsp;</td>
+		<td class="table__item" {% if inbox_page_is_published %}colspan="2" {% else %}colspan="1"{% endif %}{% trans "Actief" %}&nbsp;</td>
                 <td class="table__item">&nbsp;</td>
             </tr>
         </thead>
@@ -103,8 +103,10 @@ <h2 class="h2">{% trans "U bent toegevoegd als contactpersoon" %}</h2>
                         <td class="table__item">{{invite.invitee_email}}</td>
                         <td class="table__item"></td>
                         <td class="table__item">{% icon "close" extra_classes="icon icon--danger" %}</td>
-                        <td class="table__item">{% button text=_('Stuur bericht') icon="message" icon_position="before" icon_outlined=True transparent=True disabled=True %}</td>
-                        <td class="table__item">{% button icon="settings" icon_position="before" text="" hide_text=True transparent=True disabled=True %}<td>
+			{% if inbox_page_is_published %}
+			    <td class="table__item">{% button text=_('Stuur bericht') icon="message" icon_position="before" icon_outlined=True transparent=True disabled=True %}</td>
+			{% endif %}
+			<td class="table__item">{% button icon="settings" icon_position="before" text="" hide_text=True transparent=True disabled=True %}<td>
                     </tr>
                 {% endfor %}
 
@@ -116,7 +118,9 @@ <h2 class="h2">{% trans "U bent toegevoegd als contactpersoon" %}</h2>
                         <td class="table__item">{{contact.email}}</td>
                         <td class="table__item"></td>
                         <td class="table__item">{% icon "close" extra_classes="icon icon--danger" %}</td>
-                        <td class="table__item">{% button text=_('Stuur bericht') icon="message" icon_position="before" icon_outlined=True transparent=True disabled=True %}</td>
+			{% if inbox_page_is_published %}
+			    <td class="table__item">{% button text=_('Stuur bericht') icon="message" icon_position="before" icon_outlined=True transparent=True disabled=True %}</td>
+			{% endif %}
                         <td class="table__item">{% button icon="settings" icon_position="before" text="" hide_text=True transparent=True disabled=True %}<td>
                     </tr>
                 {% endfor %}
@@ -126,10 +130,13 @@ <h2 class="h2">{% trans "U bent toegevoegd als contactpersoon" %}</h2>
                     <tr>
                         <th class="table__header">{{ contact.get_full_name }}</th>
                         <td class="table__item">{% if contact.contact_type == "contact" %}Contactpersoon{% elif contact.contact_type == "begeleider" %}Begeleider{% elif contact.contact_type == "organization" %}Organisatie{% endif %}</td>
+
                         <td class="table__item">{{ contact.get_contact_email|default:"" }}</td>
                         <td class="table__item">{{ contact.phonenumber }}</td>
                         <td class="table__item">{% if contact.is_not_active %}{% icon "close" extra_classes="icon icon--danger" %}{% else %}{% icon "check" %}{% endif %}</td>
-                        <td class="table__item">{% button text=_('Stuur bericht') icon="message" icon_position="before" href=contact.get_contact_message_url icon_outlined=True transparent=True disabled=contact.is_not_active %}</td>
+			{% if inbox_page_is_published %}
+                            <td class="table__item">{% button text=_('Stuur bericht') icon="message" icon_position="before" href=contact.get_contact_message_url icon_outlined=True transparent=True disabled=contact.is_not_active %}</td>
+			{% endif %}
                         <td class="table__item">
                             {% dropdown icon="settings" disabled=contact.is_not_active %}
                                 <div class="dropdown__item">
diff --git a/src/open_inwoner/templates/pages/profile/me.html b/src/open_inwoner/templates/pages/profile/me.html
index ec444ba209..1401501529 100644
--- a/src/open_inwoner/templates/pages/profile/me.html
+++ b/src/open_inwoner/templates/pages/profile/me.html
@@ -74,7 +74,9 @@ <h1 class="h1" id="overview">{% trans "Persoonlijk overzicht" %}</h1>
             {% if mentor_contacts %}
                 <div class="tabled__item">{{ mentor_contacts|join:", " }}</div>
                 {% url 'profile:contact_list' as mentor_url %}
-                <div class="tabled__item tabled__item--force-right tabled__item--mobile-big">{% link href=mentor_url|add:"?type=begeleider" text="Stuur een bericht" icon="arrow_forward" icon_position="after" primary=True %}</div>
+		{% if inbox_page_is_published %}
+		    <div class="tabled__item tabled__item--force-right tabled__item--mobile-big">{% link href=mentor_url|add:"?type=begeleider" text="Stuur een bericht" icon="arrow_forward" icon_position="after" primary=True %}</div>
+		{% endif %}
             {% else %}
                 <div class="tabled__item">{% trans "U heeft (nog) geen gemeentelijke begeleider." %}</div>
                 <div class="tabled__item tabled__item--force-right tabled__item--mobile-big"></div>

From 88307ab4e85287c8643f269a2be25f66a4cf16ee Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Thu, 15 Jun 2023 10:42:17 +0200
Subject: [PATCH 35/60] [#1545] Disable Django CMS Page/Plugin/Placeholder
 cache, and disable cache explicitly on the banner plugin

---
 src/open_inwoner/cms/banner/cms_plugins.py   | 2 ++
 src/open_inwoner/cms/products/cms_plugins.py | 3 +++
 src/open_inwoner/conf/base.py                | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/src/open_inwoner/cms/banner/cms_plugins.py b/src/open_inwoner/cms/banner/cms_plugins.py
index cc6a9d602c..406aa25cf9 100644
--- a/src/open_inwoner/cms/banner/cms_plugins.py
+++ b/src/open_inwoner/cms/banner/cms_plugins.py
@@ -13,6 +13,7 @@ class BannerImagePlugin(CMSPluginBase):
     form = BannerImageForm
     name = _("Banner Image Plugin")
     render_template = "cms/banner/banner_image_plugin.html"
+    cache = False
 
 
 @plugin_pool.register_plugin
@@ -21,3 +22,4 @@ class BannerTextPlugin(CMSPluginBase):
     form = BannerTextForm
     name = _("Banner Text Plugin")
     render_template = "cms/banner/banner_text_plugin.html"
+    cache = False
diff --git a/src/open_inwoner/cms/products/cms_plugins.py b/src/open_inwoner/cms/products/cms_plugins.py
index bdbd6fefda..8f816e14d3 100644
--- a/src/open_inwoner/cms/products/cms_plugins.py
+++ b/src/open_inwoner/cms/products/cms_plugins.py
@@ -49,6 +49,7 @@ class QuestionnairePlugin(CMSActiveAppMixin, CMSPluginBase):
     name = _("Questionnaire Plugin")
     render_template = "cms/questionnaire/questionnaire_plugin.html"
     app_hook = "ProductsApphook"
+    cache = False
 
     def render(self, context, instance, placeholder):
         context["questionnaire_roots"] = QuestionnaireStep.get_root_nodes().filter(
@@ -63,6 +64,7 @@ class ProductFinderPlugin(CMSActiveAppMixin, CMSPluginBase):
     name = _("Product Finder Plugin")
     render_template = "cms/products/product_finder_plugin.html"
     app_hook = "ProductsApphook"
+    cache = False
 
     def render(self, context, instance, placeholder):
         context["condition"] = ProductCondition.objects.first()
@@ -76,6 +78,7 @@ class ProductLocationPlugin(CMSActiveAppMixin, CMSPluginBase):
     name = _("Product Location Plugin")
     render_template = "cms/products/product_location_plugin.html"
     app_hook = "ProductsApphook"
+    cache = False
 
     def render(self, context, instance, placeholder):
         context["product_locations"] = ProductLocation.objects.all()[:1000]
diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index 0b58ed5cd0..d10448b653 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -130,6 +130,7 @@
     "menus",
     "treebeard",
     "sekizai",
+    "django_timed_tests",
     # "djangocms_admin_style",
     "djangocms_text_ckeditor",
     "djangocms_link",
@@ -507,6 +508,11 @@
 #
 # Django CMS
 #
+
+CMS_PAGE_CACHE = False
+CMS_PLACEHOLDER_CACHE = False
+CMS_PLUGIN_CACHE = False
+
 CMS_TEMPLATES = [
     ("cms/fullwidth.html", "Home page template"),
 ]

From b475bd9e9e1f5b2ccc81b3f1142b3398bfa66c15 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Thu, 15 Jun 2023 10:43:47 +0200
Subject: [PATCH 36/60] [#1545] Disabling timed test

---
 src/open_inwoner/conf/base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index d10448b653..f9557e137d 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -130,7 +130,6 @@
     "menus",
     "treebeard",
     "sekizai",
-    "django_timed_tests",
     # "djangocms_admin_style",
     "djangocms_text_ckeditor",
     "djangocms_link",

From c93401c94f666f7d7d1fd1ef51ce093ad0359940 Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Mon, 12 Jun 2023 11:49:55 +0200
Subject: [PATCH 37/60] :lipstick: [#1528] Made cards responsive for very large
 desktop screens

---
 .../components/CardContainer/CardContainer.scss    | 12 +++++++++++-
 src/open_inwoner/scss/views/Categories.scss        | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/open_inwoner/scss/components/CardContainer/CardContainer.scss b/src/open_inwoner/scss/components/CardContainer/CardContainer.scss
index 8cdb88f071..d0404f1ea9 100644
--- a/src/open_inwoner/scss/components/CardContainer/CardContainer.scss
+++ b/src/open_inwoner/scss/components/CardContainer/CardContainer.scss
@@ -18,7 +18,17 @@
     }
 
     &--columns-4 {
-      grid-template-columns: repeat(auto-fit, 228px);
+      grid-template-columns: repeat(
+        auto-fit,
+        calc(230px - var(--spacing-small))
+      );
+
+      @media (min-width: 1600px) {
+        grid-template-columns: repeat(
+          auto-fit,
+          calc(25% - var(--gutter-width))
+        );
+      }
     }
   }
 
diff --git a/src/open_inwoner/scss/views/Categories.scss b/src/open_inwoner/scss/views/Categories.scss
index 90f6391bc1..1e2c90bd9c 100644
--- a/src/open_inwoner/scss/views/Categories.scss
+++ b/src/open_inwoner/scss/views/Categories.scss
@@ -1,10 +1,20 @@
 .categories {
   &__content {
     .card-container {
-      grid-template-columns: repeat(auto-fit, 228px);
+      grid-template-columns: repeat(
+        auto-fit,
+        calc(230px - var(--spacing-small))
+      );
+
+      @media (min-width: 1600px) {
+        grid-template-columns: repeat(
+          auto-fit,
+          calc(25% - var(--gutter-width))
+        );
+      }
 
       .card {
-        max-width: 360px;
+        max-width: var(--mobile-xs-width);
       }
     }
   }

From d967a8e50a4bd9432dec11c352e5839f8dcf8613 Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Tue, 13 Jun 2023 20:51:09 +0200
Subject: [PATCH 38/60] :lipstick: [#1543] Fixed margins for heading in edit
 mode and cta-button

---
 src/open_inwoner/scss/components/Button/Button.scss | 4 ++++
 src/open_inwoner/scss/components/Typography/H2.scss | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/open_inwoner/scss/components/Button/Button.scss b/src/open_inwoner/scss/components/Button/Button.scss
index 06afd84150..52e8461f0d 100644
--- a/src/open_inwoner/scss/components/Button/Button.scss
+++ b/src/open_inwoner/scss/components/Button/Button.scss
@@ -168,3 +168,7 @@
 .p + .button {
   margin-top: var(--spacing-large);
 }
+
+.cta-button {
+  margin-bottom: var(--spacing-large);
+}
diff --git a/src/open_inwoner/scss/components/Typography/H2.scss b/src/open_inwoner/scss/components/Typography/H2.scss
index 9d6bfac23b..d079dc4ee3 100644
--- a/src/open_inwoner/scss/components/Typography/H2.scss
+++ b/src/open_inwoner/scss/components/Typography/H2.scss
@@ -18,6 +18,11 @@
     word-break: normal;
     overflow-wrap: break-word;
   }
+
+  // when CMS is in edit mode
+  &.cms-plugin {
+    margin-top: var(--gutter-width);
+  }
 }
 
 ///

From 10d4b65e423796e28fba1369b29e6ec60c5a7345 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Thu, 15 Jun 2023 16:59:53 +0200
Subject: [PATCH 39/60] :wrench: Ensure admin session is limited to 1 hour
 (except when developing)

---
 src/open_inwoner/conf/base.py | 3 ++-
 src/open_inwoner/conf/dev.py  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index 0b58ed5cd0..41c374bc80 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -463,7 +463,8 @@
 
 SESSION_COOKIE_NAME = "open_inwoner_sessionid"
 SESSION_ENGINE = "django.contrib.sessions.backends.cache"
-ADMIN_SESSION_COOKIE_AGE = 86400
+
+ADMIN_SESSION_COOKIE_AGE = 3600  # Set to 1 hour max session duration for admins
 SESSION_WARN_DELTA = 60  # Warn 1 minute before end of session.
 SESSION_COOKIE_AGE = 900  # Set to 15 minutes
 
diff --git a/src/open_inwoner/conf/dev.py b/src/open_inwoner/conf/dev.py
index b5c649b34e..12addb74bc 100644
--- a/src/open_inwoner/conf/dev.py
+++ b/src/open_inwoner/conf/dev.py
@@ -30,6 +30,10 @@
 # This is commented out because it causes tests in the CI to fail. It can be enabled in the local.py settings.
 # SESSION_COOKIE_DOMAIN = ".localhost"
 
+ADMIN_SESSION_COOKIE_AGE = (
+    86400  # Avoid having to relogin when in the admin in dev-environments
+)
+
 LOGGING["loggers"].update(
     {
         "open_inwoner": {

From dbdc0c3c9cf3abfccc3df3aee57d09dbfddbea0d Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Fri, 16 Jun 2023 12:52:37 +0200
Subject: [PATCH 40/60] [#1546] Hotfixed broken anchor menu

---
 src/open_inwoner/js/components/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/open_inwoner/js/components/index.js b/src/open_inwoner/js/components/index.js
index 5966b3b1af..cd869d0fea 100644
--- a/src/open_inwoner/js/components/index.js
+++ b/src/open_inwoner/js/components/index.js
@@ -57,6 +57,13 @@ let activeElements = []
 
 function wrapComponentsOf(targetElement) {
   console.debug(['wrapComponentsOf', targetElement])
+  if (targetElement === document.body) {
+    // htmx:load also triggers for regular window onload (although the language in the document doesn't mention it)
+    // so components get multiple initialisations if they also self-initialize in their own file, and
+    // this is not caught by the activeElements check because the initial initialisation is not visible here
+    // taiga #1511 and #1544 should clean this up
+    return
+  }
   // apply the javascript component wrappers
   for (const [selector, callable] of elementWrappers) {
     for (const elt of htmx.findAll(targetElement, selector)) {

From 365cada29ff5354e88ddd95f01a8beb08d4a443a Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Mon, 19 Jun 2023 16:58:23 +0200
Subject: [PATCH 41/60] Hotfixed eSuite klant-contact-moment detail page by
 using list resources

---
 src/open_inwoner/openklant/wrap.py | 32 ++++++++++--------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/open_inwoner/openklant/wrap.py b/src/open_inwoner/openklant/wrap.py
index 96bb01606e..b5c4e3282e 100644
--- a/src/open_inwoner/openklant/wrap.py
+++ b/src/open_inwoner/openklant/wrap.py
@@ -45,28 +45,16 @@ def fetch_klantcontactmoment_for_bsn(
     if cm_client is None or k_client is None:
         return
 
-    try:
-        response = cm_client.retrieve("klantcontactmoment", uuid=kcm_uuid)
-    except (RequestException, ClientError) as e:
-        logger.exception("exception while making request", exc_info=e)
-        return
-
-    kcm = factory(KlantContactMoment, response)
-
-    # let's make sure our BSN has access to this
-    klanten = _fetch_klanten_for_bsn(user_bsn, client=k_client)
-    if not klanten:
-        return
-
-    klanten_url_map = {k.url: k for k in klanten}
-    if kcm.klant not in klanten_url_map:
-        # this was not a klantcontactmoment for our BSN
-        return
-
-    kcm.klant = klanten_url_map[kcm.klant]
-
-    # resolve
-    kcm.contactmoment = _fetch_contactmoment(kcm.contactmoment, client=cm_client)
+    # use the list query because eSuite doesn't have all proper resources
+    # see git history before this change for the original single resource version
+    kcms = fetch_klantcontactmomenten_for_bsn(user_bsn)
+
+    kcm = None
+    # try to grab the specific KCM
+    for k in kcms:
+        if kcm_uuid == str(k.uuid):
+            kcm = k
+            break
 
     return kcm
 

From 77cb4ae3363807842b9cdeec3bf229c02a8147b1 Mon Sep 17 00:00:00 2001
From: Jiro Ghianni <jiro@maykinmedia.nl>
Date: Mon, 12 Jun 2023 11:37:26 +0200
Subject: [PATCH 42/60] :lipstick: [#1529] Improved contactform, textarea and
 select styles

---
 .../components/Contact/ContactForm.html       | 42 +++++++++++++++----
 .../components/templatetags/contact_tags.py   |  2 +-
 src/open_inwoner/openklant/forms.py           |  1 +
 .../components/ContactForm/ContactForm.scss   | 22 ++++++++++
 .../scss/components/Form/Input.scss           |  4 --
 .../scss/components/Form/Select.scss          | 28 ++++++++++++-
 .../scss/components/Form/Textarea.scss        | 13 ++++++
 src/open_inwoner/scss/components/_index.scss  |  1 +
 .../templates/pages/contactform/form.html     |  5 ++-
 9 files changed, 102 insertions(+), 16 deletions(-)
 create mode 100644 src/open_inwoner/scss/components/ContactForm/ContactForm.scss

diff --git a/src/open_inwoner/components/templates/components/Contact/ContactForm.html b/src/open_inwoner/components/templates/components/Contact/ContactForm.html
index cacea08a34..7a7c542283 100644
--- a/src/open_inwoner/components/templates/components/Contact/ContactForm.html
+++ b/src/open_inwoner/components/templates/components/Contact/ContactForm.html
@@ -1,9 +1,35 @@
-{% load i18n form_tags %}
+{% load i18n form_tags grid_tags %}
 
-<div class="contactform__content">
-    {% if has_form_configuration %}
-        {% form form_object=form_object method="POST" id="contactmoment-form" submit_text=_('Verzenden') %}
-    {% else %}
-        <p class="p">{% trans "Contact formulier niet geconfigureerd." %}</p>
-    {% endif %}
-</div>
+{% render_grid %}
+    {% render_column start=1 span=6 %}
+        <div class="contactform__content">
+        {% if has_form_configuration %}
+
+            {% render_form form=form_object method="POST" id="contactmoment-form" show_required=True submit_text=_('Verzenden') %}
+                {% csrf_token %}
+                {% input form_object.subject icon="expand_more" icon_position="after" icon_outlined=True %}
+                {% if form_object.first_name %}
+                    {% input form_object.first_name %}
+                {% endif %}
+                {% if form_object.infix %}
+                    {% input form_object.infix %}
+                {% endif %}
+                {% if form_object.last_name %}
+                    {% input form_object.last_name %}
+                {% endif %}
+                {% if form_object.email %}
+                    {% input form_object.email %}
+                {% endif %}
+                {% if form_object.phonenumber %}
+                    {% input form_object.phonenumber %}
+                {% endif %}
+                {% input form_object.question %}
+                {% form_actions primary_text=_("Verzenden") primary_icon="arrow_forward" %}
+            {% endrender_form %}
+
+        {% else %}
+            <p class="p">{% trans "Contact formulier niet geconfigureerd." %}</p>
+        {% endif %}
+        </div>
+    {% endrender_column %}
+{% endrender_grid %}
diff --git a/src/open_inwoner/components/templatetags/contact_tags.py b/src/open_inwoner/components/templatetags/contact_tags.py
index ca955c06a8..9234a0eb1d 100644
--- a/src/open_inwoner/components/templatetags/contact_tags.py
+++ b/src/open_inwoner/components/templatetags/contact_tags.py
@@ -14,7 +14,7 @@ def contact_form(form_object, **kwargs):
         {% contact_form form_object %}
 
     Variables:
-        + form_object: Form | the form that need to be rendered.
+        + form_object: Form | the form that needs to be rendered.
     """
     config = OpenKlantConfig.get_solo()
     return {
diff --git a/src/open_inwoner/openklant/forms.py b/src/open_inwoner/openklant/forms.py
index b69e90d8fe..a598476c32 100644
--- a/src/open_inwoner/openklant/forms.py
+++ b/src/open_inwoner/openklant/forms.py
@@ -12,6 +12,7 @@ class ContactForm(Form):
         label=_("Onderwerp"),
         required=True,
         queryset=ContactFormSubject.objects.none(),
+        empty_label=_("Selecteren"),
     )
     first_name = forms.CharField(
         label=_("Voornaam"),
diff --git a/src/open_inwoner/scss/components/ContactForm/ContactForm.scss b/src/open_inwoner/scss/components/ContactForm/ContactForm.scss
new file mode 100644
index 0000000000..66028023b6
--- /dev/null
+++ b/src/open_inwoner/scss/components/ContactForm/ContactForm.scss
@@ -0,0 +1,22 @@
+.contactform__content {
+  .form {
+    /// Make required asterisk visible for this component
+    .label__label--required {
+      color: var(--color-red);
+      padding-left: var(--spacing-tiny);
+      //make asterisks invisible by default, only make them visible if component has the caption
+      display: inline;
+    }
+
+    .form__control [class*='icon'] {
+      transform: translateY(0);
+    }
+
+    // tablet sizes
+    @media screen and (min-width: 360px) and (max-width: 768px) {
+      &__control > .label .input {
+        max-width: 100%;
+      }
+    }
+  }
+}
diff --git a/src/open_inwoner/scss/components/Form/Input.scss b/src/open_inwoner/scss/components/Form/Input.scss
index 7bdc773bbd..9910ea4bd0 100644
--- a/src/open_inwoner/scss/components/Form/Input.scss
+++ b/src/open_inwoner/scss/components/Form/Input.scss
@@ -29,7 +29,3 @@
     color: var(--color-gray-lighter);
   }
 }
-
-textarea.input {
-  height: auto;
-}
diff --git a/src/open_inwoner/scss/components/Form/Select.scss b/src/open_inwoner/scss/components/Form/Select.scss
index f4aa0cbc95..aca9fc46d7 100644
--- a/src/open_inwoner/scss/components/Form/Select.scss
+++ b/src/open_inwoner/scss/components/Form/Select.scss
@@ -1,6 +1,6 @@
 .select {
   /// Resets.
-  /// TODO: RESET AND SET CHEVRON BACKGROUND IMAGE
+  /// RESET AND SET CHEVRON BACKGROUND IMAGE
   //appearance: none;
   //-moz-appearance: none;
   //-webkit-appearance: none;
@@ -16,7 +16,31 @@
   padding: var(--spacing-medium) var(--spacing-large);
 
   /// font.
-  color: var(--font-color-body);
   font-family: var(--font-family-body);
   font-size: var(--font-size-body);
+
+  &,
+  &.input {
+    // cross-browser styling
+    &:required:invalid {
+      color: var(--color-mute);
+    }
+    // Windows only
+    option,
+    option:checked {
+      color: var(--font-color-body);
+    }
+  }
+}
+
+// add defaults
+select {
+  &:required:invalid {
+    color: var(--color-mute);
+  }
+  // Windows only
+  option,
+  option:checked {
+    color: var(--font-color-body);
+  }
 }
diff --git a/src/open_inwoner/scss/components/Form/Textarea.scss b/src/open_inwoner/scss/components/Form/Textarea.scss
index 242aa75154..fcf615b333 100644
--- a/src/open_inwoner/scss/components/Form/Textarea.scss
+++ b/src/open_inwoner/scss/components/Form/Textarea.scss
@@ -18,4 +18,17 @@
   color: var(--font-color-body);
   font-family: var(--font-family-body);
   font-size: var(--font-size-body);
+
+  &.input {
+    height: auto;
+  }
+}
+
+// add defaults
+textarea {
+  &.input {
+    max-width: var(--form-width);
+    width: 100%;
+    height: auto;
+  }
 }
diff --git a/src/open_inwoner/scss/components/_index.scss b/src/open_inwoner/scss/components/_index.scss
index 63bb7e26b5..aa7addc692 100644
--- a/src/open_inwoner/scss/components/_index.scss
+++ b/src/open_inwoner/scss/components/_index.scss
@@ -8,6 +8,7 @@
 @import './CardContainer/CardContainer.scss';
 @import './Cases/Cases.scss';
 @import './Condition/Condition.scss';
+@import './ContactForm/ContactForm.scss';
 @import './Contactmomenten/Contactmomenten.scss';
 @import './Contacts/Contacts.scss';
 @import './Container/Container.scss';
diff --git a/src/open_inwoner/templates/pages/contactform/form.html b/src/open_inwoner/templates/pages/contactform/form.html
index 77d6c65443..4d799b2a7e 100644
--- a/src/open_inwoner/templates/pages/contactform/form.html
+++ b/src/open_inwoner/templates/pages/contactform/form.html
@@ -1,6 +1,9 @@
 {% extends 'master.html' %}
-{% load contact_tags %}
+{% load i18n contact_tags %}
 
 {% block content %}
+    <h1 class="h1">
+        {% trans "Contactformulier" %}
+    </h1>
 {% contact_form form_object=form %}
 {% endblock content %}

From bf898b8c475c0c6fd9832ab356a768bb7d7b8dba Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Tue, 20 Jun 2023 16:04:09 +0200
Subject: [PATCH 43/60] [#1455] Added contact form to the case detail view

---
 src/open_inwoner/cms/cases/forms.py           |   9 +
 .../cms/cases/tests/test_contactform.py       | 287 ++++++++++++++++++
 src/open_inwoner/cms/cases/tests/test_htmx.py | 111 ++++++-
 src/open_inwoner/cms/cases/urls.py            |  12 +
 src/open_inwoner/cms/cases/views/__init__.py  |   8 +-
 src/open_inwoner/cms/cases/views/status.py    | 256 ++++++++++++----
 .../js/components/cases/document_upload.js    |  12 +-
 src/open_inwoner/js/components/index.js       |   3 +-
 .../upload-document/file-input-errors.js      |  27 +-
 src/open_inwoner/openzaak/admin.py            |   1 +
 src/open_inwoner/openzaak/managers.py         |   9 +
 ..._zaaktypeconfig_contact_moments_enabled.py |  19 ++
 src/open_inwoner/openzaak/models.py           |   6 +
 .../openzaak/tests/test_case_detail.py        |  44 ++-
 .../scss/components/Form/ContactForm.scss     |   9 +
 src/open_inwoner/scss/components/_index.scss  |   1 +
 .../templates/pages/cases/contact_form.html   |  20 ++
 .../templates/pages/cases/document_form.html  |  37 +++
 .../templates/pages/cases/status_inner.html   |  51 +---
 19 files changed, 790 insertions(+), 132 deletions(-)
 create mode 100644 src/open_inwoner/cms/cases/tests/test_contactform.py
 create mode 100644 src/open_inwoner/openzaak/migrations/0019_zaaktypeconfig_contact_moments_enabled.py
 create mode 100644 src/open_inwoner/scss/components/Form/ContactForm.scss
 create mode 100644 src/open_inwoner/templates/pages/cases/contact_form.html
 create mode 100644 src/open_inwoner/templates/pages/cases/document_form.html

diff --git a/src/open_inwoner/cms/cases/forms.py b/src/open_inwoner/cms/cases/forms.py
index 6d5ae29b29..9c0b845019 100644
--- a/src/open_inwoner/cms/cases/forms.py
+++ b/src/open_inwoner/cms/cases/forms.py
@@ -57,3 +57,12 @@ def clean_file(self):
             )
 
         return file
+
+
+class CaseContactForm(forms.Form):
+    contact_moment = forms.CharField(
+        label=_("Vraag"),
+        max_length=1024,
+        widget=forms.Textarea(attrs={"rows": "5"}),
+        required=True,
+    )
diff --git a/src/open_inwoner/cms/cases/tests/test_contactform.py b/src/open_inwoner/cms/cases/tests/test_contactform.py
new file mode 100644
index 0000000000..afc725c32b
--- /dev/null
+++ b/src/open_inwoner/cms/cases/tests/test_contactform.py
@@ -0,0 +1,287 @@
+from django.test import override_settings
+from django.urls import reverse
+from django.utils.translation import gettext as _
+
+import requests_mock
+from django_webtest import WebTest
+from zgw_consumers.api_models.constants import (
+    RolOmschrijving,
+    RolTypes,
+    VertrouwelijkheidsAanduidingen,
+)
+from zgw_consumers.constants import APITypes
+from zgw_consumers.test import generate_oas_component, mock_service_oas_get
+
+from open_inwoner.accounts.tests.factories import DigidUserFactory
+from open_inwoner.openklant.constants import Status
+from open_inwoner.openklant.models import OpenKlantConfig
+from open_inwoner.openklant.tests.data import (
+    CONTACTMOMENTEN_ROOT,
+    KLANTEN_ROOT,
+    MockAPIData,
+)
+from open_inwoner.openzaak.models import OpenZaakConfig
+from open_inwoner.openzaak.tests.factories import (
+    ServiceFactory,
+    ZaakTypeConfigFactory,
+    ZaakTypeInformatieObjectTypeConfigFactory,
+)
+from open_inwoner.openzaak.tests.shared import (
+    CATALOGI_ROOT,
+    DOCUMENTEN_ROOT,
+    ZAKEN_ROOT,
+)
+from open_inwoner.utils.test import ClearCachesMixin, paginated_response
+
+
+@requests_mock.Mocker()
+@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+class ContactFormTestCase(ClearCachesMixin, WebTest):
+    def setUp(self):
+        super().setUp()
+
+        self.user = DigidUserFactory(bsn="900222086")
+
+        # services
+        self.zaak_service = ServiceFactory(api_root=ZAKEN_ROOT, api_type=APITypes.zrc)
+        self.catalogi_service = ServiceFactory(
+            api_root=CATALOGI_ROOT, api_type=APITypes.ztc
+        )
+        self.document_service = ServiceFactory(
+            api_root=DOCUMENTEN_ROOT, api_type=APITypes.drc
+        )
+        # openzaak config
+        self.oz_config = OpenZaakConfig.get_solo()
+        self.oz_config.zaak_service = self.zaak_service
+        self.oz_config.catalogi_service = self.catalogi_service
+        self.oz_config.document_service = self.document_service
+        self.oz_config.document_max_confidentiality = (
+            VertrouwelijkheidsAanduidingen.beperkt_openbaar
+        )
+        self.oz_config.zaak_max_confidentiality = (
+            VertrouwelijkheidsAanduidingen.beperkt_openbaar
+        )
+        self.oz_config.save()
+
+        # openklant config
+        self.ok_config = OpenKlantConfig.get_solo()
+        self.ok_config.register_contact_moment = True
+        self.ok_config.register_bronorganisatie_rsin = "123456788"
+        self.ok_config.register_type = "Melding"
+        self.ok_config.register_employee_id = "FooVonBar"
+        self.ok_config.klanten_service = ServiceFactory(
+            api_root=KLANTEN_ROOT, api_type=APITypes.kc
+        )
+        self.ok_config.contactmomenten_service = ServiceFactory(
+            api_root=CONTACTMOMENTEN_ROOT, api_type=APITypes.cmc
+        )
+        self.ok_config.save()
+
+        self.zaak = generate_oas_component(
+            "zrc",
+            "schemas/Zaak",
+            uuid="d8bbdeb7-770f-4ca9-b1ea-77b4730bf67d",
+            url=f"{ZAKEN_ROOT}zaken/d8bbdeb7-770f-4ca9-b1ea-77b4730bf67d",
+            zaaktype=f"{CATALOGI_ROOT}zaaktypen/0caa29cb-0167-426f-8dc1-88bebd7c8804",
+            identificatie="ZAAK-2022-0000000024",
+            omschrijving="Zaak naar aanleiding van ingezonden formulier",
+            startdatum="2022-01-02",
+            einddatum=None,
+            status=f"{ZAKEN_ROOT}statussen/3da89990-c7fc-476a-ad13-c9023450083c",
+            resultaat=f"{ZAKEN_ROOT}resultaten/a44153aa-ad2c-6a07-be75-15add5113",
+            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
+        )
+        self.user_role = generate_oas_component(
+            "zrc",
+            "schemas/Rol",
+            url=f"{ZAKEN_ROOT}rollen/f33153aa-ad2c-4a07-ae75-15add5891",
+            omschrijvingGeneriek=RolOmschrijving.initiator,
+            betrokkeneType=RolTypes.natuurlijk_persoon,
+            betrokkeneIdentificatie={
+                "inpBsn": "900222086",
+                "voornamen": "Foo Bar",
+                "voorvoegselGeslachtsnaam": "van der",
+                "geslachtsnaam": "Bazz",
+            },
+        )
+        self.zaaktype = generate_oas_component(
+            "ztc",
+            "schemas/ZaakType",
+            uuid="0caa29cb-0167-426f-8dc1-88bebd7c8804",
+            url=self.zaak["zaaktype"],
+            identificatie="ZAAKTYPE-2020-0000000001",
+            omschrijving="Coffee zaaktype",
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
+            indicatieInternOfExtern="extern",
+        )
+        self.zaak_informatie_object = generate_oas_component(
+            "zrc",
+            "schemas/ZaakInformatieObject",
+            url=f"{ZAKEN_ROOT}zaakinformatieobjecten/e55153aa-ad2c-4a07-ae75-15add57d6",
+            informatieobject=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/014c38fe-b010-4412-881c-3000032fb812",
+            zaak=self.zaak["url"],
+        )
+        self.uploaded_zaak_informatie_object = generate_oas_component(
+            "zrc",
+            "schemas/ZaakInformatieObject",
+            url=f"{ZAKEN_ROOT}zaakinformatieobjecten/48599f76-b524-48e8-be5a-6fc47288c9bf",
+            informatieobject=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/48599f76-b524-48e8-be5a-6fc47288c9bf",
+            zaak=self.zaak["url"],
+        )
+        self.informatie_object_type = generate_oas_component(
+            "ztc",
+            "schemas/InformatieObjectType",
+            url=f"{CATALOGI_ROOT}informatieobjecttype/014c38fe-b010-4412-881c-3000032fb321",
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            omschrijving="Some content",
+        )
+        self.informatie_object = generate_oas_component(
+            "drc",
+            "schemas/EnkelvoudigInformatieObject",
+            uuid="014c38fe-b010-4412-881c-3000032fb812",
+            url=self.zaak_informatie_object["informatieobject"],
+            inhoud=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/014c38fe-b010-4412-881c-3000032fb812/download",
+            informatieobjecttype=self.informatie_object_type["url"],
+            status="definitief",
+            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
+            bestandsnaam="uploaded_document.txt",
+            titel="uploaded_document_title.txt",
+            bestandsomvang=123,
+        )
+        self.status_finish = generate_oas_component(
+            "zrc",
+            "schemas/Status",
+            url=f"{ZAKEN_ROOT}statussen/3da89990-c7fc-476a-ad13-c9023450083c",
+            zaak=self.zaak["url"],
+            statustype=f"{CATALOGI_ROOT}statustypen/e3798107-ab27-4c3c-977d-744516671fe4",
+            datumStatusGezet="2021-03-12",
+            statustoelichting="",
+        )
+        self.status_type_finish = generate_oas_component(
+            "ztc",
+            "schemas/StatusType",
+            url=self.status_finish["statustype"],
+            zaaktype=self.zaaktype["url"],
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            omschrijving="Finish",
+            omschrijvingGeneriek="some content",
+        )
+        self.result = generate_oas_component(
+            "zrc",
+            "schemas/Resultaat",
+            uuid="a44153aa-ad2c-6a07-be75-15add5113",
+            url=self.zaak["resultaat"],
+            resultaattype=f"{CATALOGI_ROOT}resultaattypen/b1a268dd-4322-47bb-a930-b83066b4a32c",
+            zaak=self.zaak["url"],
+            toelichting="resultaat toelichting",
+        )
+        self.klant = generate_oas_component(
+            "kc",
+            "schemas/Klant",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            bronorganisatie="123456789",
+            voornaam="Foo",
+            achternaam="Bar",
+            emailadres="foo@example.com",
+            telefoonnummer="0612345678",
+        )
+
+        # enable upload and contact moments
+        zaak_type_config = ZaakTypeConfigFactory(
+            catalogus__url=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            identificatie=self.zaaktype["identificatie"],
+            contact_moments_enabled=True,
+        )
+        ZaakTypeInformatieObjectTypeConfigFactory(
+            zaaktype_config=zaak_type_config,
+            informatieobjecttype_url=self.informatie_object["url"],
+            zaaktype_uuids=[self.zaaktype["uuid"]],
+            document_upload_enabled=True,
+        )
+
+        self.case_detail_url = reverse(
+            "cases:case_detail_content", kwargs={"object_id": self.zaak["uuid"]}
+        )
+
+    def _setUpMocks(self, m):
+        mock_service_oas_get(m, ZAKEN_ROOT, "zrc")
+        mock_service_oas_get(m, CATALOGI_ROOT, "ztc")
+        mock_service_oas_get(m, DOCUMENTEN_ROOT, "drc")
+        MockAPIData.setUpOASMocks(m)
+
+        self.matchers = []
+
+        for resource in [
+            self.zaak,
+            self.result,
+            self.zaaktype,
+            self.informatie_object,
+            self.status_finish,
+            self.status_type_finish,
+        ]:
+            self.matchers.append(m.get(resource["url"], json=resource))
+
+        self.matchers += [
+            m.get(
+                f"{ZAKEN_ROOT}rollen?zaak={self.zaak['url']}",
+                json=paginated_response([self.user_role]),
+            ),
+            m.get(
+                f"{ZAKEN_ROOT}zaakinformatieobjecten?zaak={self.zaak['url']}",
+                [
+                    {
+                        "json": [
+                            self.zaak_informatie_object,
+                        ]
+                    },
+                    # after upload
+                    {
+                        "json": [
+                            self.zaak_informatie_object,
+                            self.uploaded_zaak_informatie_object,
+                        ]
+                    },
+                ],
+            ),
+            m.get(
+                f"{ZAKEN_ROOT}statussen?zaak={self.zaak['url']}",
+                json=paginated_response([self.status_finish]),
+            ),
+            m.get(
+                f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn=900222086",
+                json=paginated_response([self.klant]),
+            ),
+        ]
+
+    def test_form_is_shown_if_open_klant_configured(self, m):
+        self._setUpMocks(m)
+
+        self.assertTrue(self.ok_config.has_api_configuration())
+
+        response = self.app.get(self.case_detail_url, user=self.user)
+        contact_form = response.pyquery("#contact-form")
+
+        self.assertTrue(response.context["case"]["contact_moments_enabled"])
+        self.assertTrue(contact_form)
+
+    def test_no_form_shown_if_open_klant_not_configured(self, m):
+        self._setUpMocks(m)
+
+        # reset
+        self.ok_config.klanten_service = None
+        self.ok_config.contactmomenten_service = None
+        self.ok_config.register_email = ""
+        self.ok_config.register_contact_moment = False
+        self.ok_config.register_bronorganisatie_rsin = ""
+        self.ok_config.register_type = ""
+        self.ok_config.register_employee_id = ""
+        self.ok_config.save()
+        self.assertFalse(self.ok_config.has_api_configuration())
+
+        response = self.app.get(self.case_detail_url, user=self.user)
+        contact_form = response.pyquery("#contact-form")
+
+        self.assertFalse(response.context["case"]["contact_moments_enabled"])
+        self.assertFalse(contact_form)
diff --git a/src/open_inwoner/cms/cases/tests/test_htmx.py b/src/open_inwoner/cms/cases/tests/test_htmx.py
index bac356da3a..d4f6f210e1 100644
--- a/src/open_inwoner/cms/cases/tests/test_htmx.py
+++ b/src/open_inwoner/cms/cases/tests/test_htmx.py
@@ -12,6 +12,13 @@
 from zgw_consumers.test import generate_oas_component, mock_service_oas_get
 
 from open_inwoner.accounts.tests.factories import DigidUserFactory
+from open_inwoner.openklant.constants import Status
+from open_inwoner.openklant.models import OpenKlantConfig
+from open_inwoner.openklant.tests.data import (
+    CONTACTMOMENTEN_ROOT,
+    KLANTEN_ROOT,
+    MockAPIData,
+)
 from open_inwoner.openzaak.models import OpenZaakConfig
 from open_inwoner.openzaak.tests.factories import (
     ServiceFactory,
@@ -35,10 +42,7 @@
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
 class CasesPlaywrightTests(ClearCachesMixin, PlaywrightSyncLiveServerTestCase):
     def setUp(self) -> None:
-        super().setUp()
-
         self.user = DigidUserFactory(bsn="900222086")
-        # let's reuse the login storage_state
         self.user_login_state = self.get_user_bsn_login_state(self.user)
 
         # services
@@ -50,17 +54,31 @@ def setUp(self) -> None:
             api_root=DOCUMENTEN_ROOT, api_type=APITypes.drc
         )
         # openzaak config
-        self.config = OpenZaakConfig.get_solo()
-        self.config.zaak_service = self.zaak_service
-        self.config.catalogi_service = self.catalogi_service
-        self.config.document_service = self.document_service
-        self.config.document_max_confidentiality = (
+        self.oz_config = OpenZaakConfig.get_solo()
+        self.oz_config.zaak_service = self.zaak_service
+        self.oz_config.catalogi_service = self.catalogi_service
+        self.oz_config.document_service = self.document_service
+        self.oz_config.document_max_confidentiality = (
             VertrouwelijkheidsAanduidingen.beperkt_openbaar
         )
-        self.config.zaak_max_confidentiality = (
+        self.oz_config.zaak_max_confidentiality = (
             VertrouwelijkheidsAanduidingen.beperkt_openbaar
         )
-        self.config.save()
+        self.oz_config.save()
+
+        # openklant config
+        self.ok_config = OpenKlantConfig.get_solo()
+        self.ok_config.register_contact_moment = True
+        self.ok_config.register_bronorganisatie_rsin = "123456788"
+        self.ok_config.register_type = "Melding"
+        self.ok_config.register_employee_id = "FooVonBar"
+        self.ok_config.klanten_service = ServiceFactory(
+            api_root=KLANTEN_ROOT, api_type=APITypes.kc
+        )
+        self.ok_config.contactmomenten_service = ServiceFactory(
+            api_root=CONTACTMOMENTEN_ROOT, api_type=APITypes.cmc
+        )
+        self.ok_config.save()
 
         self.zaak = generate_oas_component(
             "zrc",
@@ -189,11 +207,40 @@ def setUp(self) -> None:
             titel="uploaded_test_file.txt",
             bestandsomvang=len(self.uploaded_zaak_informatie_object_content),
         )
+        self.klant = generate_oas_component(
+            "kc",
+            "schemas/Klant",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            url=f"{KLANTEN_ROOT}klant/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            bronorganisatie="123456789",
+            voornaam="Foo",
+            achternaam="Bar",
+            emailadres="foo@example.com",
+            telefoonnummer="0612345678",
+        )
+        self.contactmoment = generate_oas_component(
+            "cmc",
+            "schemas/ContactMoment",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-bbbbbbbbbbbb",
+            url=f"{CONTACTMOMENTEN_ROOT}contactmoment/aaaaaaaa-aaaa-aaaa-aaaa-bbbbbbbbbbbb",
+            status=Status.nieuw,
+            antwoord="",
+            text="hey!\n\nwaddup?",
+        )
+        self.klant_contactmoment = generate_oas_component(
+            "cmc",
+            "schemas/KlantContactMoment",
+            uuid="aaaaaaaa-aaaa-aaaa-aaaa-cccccccccccc",
+            url=f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten/aaaaaaaa-aaaa-aaaa-aaaa-cccccccccccc",
+            klant=self.klant["url"],
+            contactmoment=self.contactmoment["url"],
+        )
 
-        # enable upload
+        # enable upload and contact moments
         zaak_type_config = ZaakTypeConfigFactory(
             catalogus__url=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
             identificatie=self.zaaktype["identificatie"],
+            contact_moments_enabled=True,
         )
         ZaakTypeInformatieObjectTypeConfigFactory(
             zaaktype_config=zaak_type_config,
@@ -206,6 +253,7 @@ def _setUpMocks(self, m):
         mock_service_oas_get(m, ZAKEN_ROOT, "zrc")
         mock_service_oas_get(m, CATALOGI_ROOT, "ztc")
         mock_service_oas_get(m, DOCUMENTEN_ROOT, "drc")
+        MockAPIData.setUpOASMocks(m)
 
         self.matchers = []
 
@@ -213,15 +261,30 @@ def _setUpMocks(self, m):
             self.zaak,
             self.result,
             self.zaaktype,
-            # self.informatie_object_type,
             self.informatie_object,
             self.uploaded_informatie_object,
-            # self.zaaktype_informatie_object_type,
             self.status_finish,
             self.status_type_finish,
         ]:
             self.matchers.append(m.get(resource["url"], json=resource))
 
+        self.contact_moment_matchers = [
+            m.get(
+                f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn=900222086",
+                json=paginated_response([self.klant]),
+            ),
+            m.post(
+                f"{CONTACTMOMENTEN_ROOT}contactmomenten",
+                json=self.contactmoment,
+                status_code=201,
+            ),
+            m.post(
+                f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten",
+                json=self.klant_contactmoment,
+                status_code=201,
+            ),
+        ]
+
         self.matchers += [
             m.get(
                 f"{ZAKEN_ROOT}zaken?rol__betrokkeneIdentificatie__natuurlijkPersoon__inpBsn={self.user.bsn}&maximaleVertrouwelijkheidaanduiding=beperkt_openbaar",
@@ -370,6 +433,28 @@ def test_cases(self, m):
         # finally check if our mock matchers are accurate
         self.assertMockMatchersCalledAll(self.matchers)
 
+        # contact form
+        contact_form = page.locator("#contact-form")
+        expect(contact_form).to_be_visible()
+
+        question_text_area = page.get_by_label(_("Vraag"))
+        expect(question_text_area).to_be_visible()
+
+        question_text_area.fill("a question")
+        contact_submit_button = contact_form.get_by_role(
+            "button", name=_("Vraag versturen")
+        )
+        expect(contact_submit_button).to_be_visible()
+
+        contact_submit_button.click()
+
+        notification = page.locator(".notification__content")
+        expect(notification).to_be_visible()
+        expect(notification.get_by_text(_("Vraag verstuurd!"))).to_be_visible()
+
+        # finally check if our mock matchers are accurate
+        self.assertMockMatchersCalledAll(self.contact_moment_matchers)
+
     def assertMockMatchersCalledAll(self, matchers):
         def _match_str(m):
             return f"  {m._method.ljust(5, ' ')} {m._url}"
diff --git a/src/open_inwoner/cms/cases/urls.py b/src/open_inwoner/cms/cases/urls.py
index e0fa427099..41030809d6 100644
--- a/src/open_inwoner/cms/cases/urls.py
+++ b/src/open_inwoner/cms/cases/urls.py
@@ -7,7 +7,9 @@
 )
 
 from .views import (
+    CaseContactFormView,
     CaseDocumentDownloadView,
+    CaseDocumentUploadFormView,
     InnerCaseDetailView,
     InnerClosedCaseListView,
     InnerOpenCaseListView,
@@ -58,6 +60,16 @@
         OuterCaseDetailView.as_view(),
         name="case_detail",
     ),
+    path(
+        "<str:object_id>/status/contact-form/",
+        CaseContactFormView.as_view(),
+        name="case_detail_contact_form",
+    ),
+    path(
+        "<str:object_id>/status/document-form/",
+        CaseDocumentUploadFormView.as_view(),
+        name="case_detail_document_form",
+    ),
     path("open/", RedirectView.as_view(pattern_name="cases:open_cases"), name="index"),
     path("content/", InnerOpenCaseListView.as_view(), name="open_cases_content"),
     path("", OuterOpenCaseListView.as_view(), name="open_cases"),
diff --git a/src/open_inwoner/cms/cases/views/__init__.py b/src/open_inwoner/cms/cases/views/__init__.py
index 911c0a51df..05d357737a 100644
--- a/src/open_inwoner/cms/cases/views/__init__.py
+++ b/src/open_inwoner/cms/cases/views/__init__.py
@@ -4,5 +4,11 @@
     OuterClosedCaseListView,
     OuterOpenCaseListView,
 )
-from .status import CaseDocumentDownloadView, InnerCaseDetailView, OuterCaseDetailView
+from .status import (
+    CaseContactFormView,
+    CaseDocumentDownloadView,
+    CaseDocumentUploadFormView,
+    InnerCaseDetailView,
+    OuterCaseDetailView,
+)
 from .submissions import InnerOpenSubmissionListView, OuterOpenSubmissionListView
diff --git a/src/open_inwoner/cms/cases/views/status.py b/src/open_inwoner/cms/cases/views/status.py
index ccbea2aaad..620ffb4be4 100644
--- a/src/open_inwoner/cms/cases/views/status.py
+++ b/src/open_inwoner/cms/cases/views/status.py
@@ -4,17 +4,25 @@
 
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
-from django.http import Http404, HttpResponseRedirect, StreamingHttpResponse
-from django.urls import reverse
+from django.http import Http404, StreamingHttpResponse
+from django.shortcuts import redirect
+from django.urls import reverse, reverse_lazy
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.generic import FormView, TemplateView
 
+from django_htmx.http import HttpResponseClientRedirect
 from glom import glom
 from view_breadcrumbs import BaseBreadcrumbMixin
 from zgw_consumers.api_models.constants import RolOmschrijving
 
+from open_inwoner.openklant.models import OpenKlantConfig
+from open_inwoner.openklant.wrap import (
+    create_contactmoment,
+    create_klant,
+    fetch_klant_for_bsn,
+)
 from open_inwoner.openzaak.api_models import Zaak
 from open_inwoner.openzaak.cases import (
     connect_case_with_document,
@@ -43,7 +51,7 @@
 )
 from open_inwoner.utils.views import CommonPageMixin, LogMixin
 
-from ..forms import CaseUploadForm
+from ..forms import CaseContactForm, CaseUploadForm
 from .mixins import CaseAccessMixin, CaseLogMixin, OuterCaseAccessMixin
 
 
@@ -81,6 +89,7 @@ class InnerCaseDetailView(
 ):
     template_name = "pages/cases/status_inner.html"
     form_class = CaseUploadForm
+    contact_form_class = CaseContactForm
 
     @cached_property
     def crumbs(self):
@@ -128,6 +137,7 @@ def get_context_data(self, **kwargs):
                     status.statustype = status_type
 
             context["case"] = {
+                "id": str(self.case.uuid),
                 "identification": format_zaak_identificatie(
                     self.case.identificatie, config
                 ),
@@ -151,7 +161,13 @@ def get_context_data(self, **kwargs):
             }
             context["case"].update(self.get_upload_info_context(self.case))
             context["anchors"] = self.get_anchors(statuses, documents)
-            context["hxpost"] = reverse("cases:case_detail_content", kwargs=self.kwargs)
+            context["contact_form"] = self.contact_form_class()
+            context["hxpost_contact_form"] = reverse(
+                "cases:case_detail_contact_form", kwargs=self.kwargs
+            )
+            context["hxpost_document_form"] = reverse(
+                "cases:case_detail_document_form", kwargs=self.kwargs
+            )
         else:
             context["case"] = None
         return context
@@ -160,6 +176,8 @@ def get_upload_info_context(self, case: Zaak):
         if not case:
             return {}
 
+        open_klant_config = OpenKlantConfig.get_solo()
+
         internal_upload_enabled = (
             ZaakTypeInformatieObjectTypeConfig.objects.filter_enabled_for_case_type(
                 case.zaaktype
@@ -169,6 +187,7 @@ def get_upload_info_context(self, case: Zaak):
         case_type_config_description = ""
         external_upload_enabled = False
         external_upload_url = ""
+        contact_moments_enabled = False
 
         try:
             ztc = ZaakTypeConfig.objects.filter_case_type(case.zaaktype).get()
@@ -176,6 +195,7 @@ def get_upload_info_context(self, case: Zaak):
             pass
         else:
             case_type_config_description = ztc.description
+            contact_moments_enabled = ztc.contact_moments_enabled
             if ztc.document_upload_enabled and ztc.external_document_upload_url != "":
                 external_upload_url = ztc.external_document_upload_url
                 external_upload_enabled = True
@@ -185,6 +205,9 @@ def get_upload_info_context(self, case: Zaak):
             "internal_upload_enabled": internal_upload_enabled,
             "external_upload_enabled": external_upload_enabled,
             "external_upload_url": external_upload_url,
+            "contact_moments_enabled": (
+                contact_moments_enabled and open_klant_config.has_api_configuration()
+            ),
         }
 
     def get_result_display(self, case: Zaak) -> str:
@@ -246,6 +269,76 @@ def get_form_kwargs(self):
         kwargs["case"] = self.case
         return kwargs
 
+    def get_anchors(self, statuses, documents):
+        anchors = [["#title", _("Gegevens")]]
+
+        if statuses:
+            anchors.append(["#statuses", _("Status")])
+
+        if documents:
+            anchors.append(["#documents", _("Documenten")])
+
+        return anchors
+
+
+class CaseDocumentDownloadView(LogMixin, CaseAccessMixin, View):
+    def get(self, request, *args, **kwargs):
+        if not self.case:
+            raise Http404
+
+        info_object_uuid = kwargs["info_id"]
+        info_object = fetch_single_information_object_uuid(info_object_uuid)
+        if not info_object:
+            raise Http404
+
+        # check if this info_object belongs to this case
+        if not fetch_case_information_objects_for_case_and_info(
+            self.case.url, info_object.url
+        ):
+            raise PermissionDenied()
+
+        # check if this info_object should be visible
+        config = OpenZaakConfig.get_solo()
+        if not is_info_object_visible(info_object, config.document_max_confidentiality):
+            raise PermissionDenied()
+
+        # retrieve and stream content
+        content_stream = download_document(info_object.inhoud)
+        if not content_stream:
+            raise Http404
+
+        self.log_user_action(
+            self.request.user,
+            _("Document van zaak gedownload {case}: {filename}").format(
+                case=self.case.identificatie,
+                filename=info_object.bestandsnaam,
+            ),
+        )
+
+        headers = {
+            "Content-Disposition": f'attachment; filename="{info_object.bestandsnaam}"',
+            "Content-Type": info_object.formaat,
+            "Content-Length": info_object.bestandsomvang,
+        }
+        response = StreamingHttpResponse(content_stream, headers=headers)
+        return response
+
+    def handle_no_permission(self):
+        # plain error and no redirect
+        raise PermissionDenied()
+
+
+class CaseDocumentUploadFormView(CaseAccessMixin, CaseLogMixin, FormView):
+    template_name = "pages/cases/document_form.html"
+    form_class = CaseUploadForm
+
+    def post(self, request, *args, **kwargs):
+        form = self.get_form()
+
+        if form.is_valid():
+            return self.handle_document_upload(request, form)
+        return self.form_invalid(form)
+
     def handle_document_upload(self, request, form):
         cleaned_data = form.cleaned_data
 
@@ -280,7 +373,12 @@ def handle_document_upload(self, request, form):
                         filename=file.name
                     ),
                 )
-                return HttpResponseRedirect(self.get_success_url())
+
+                return HttpResponseClientRedirect(
+                    reverse(
+                        "cases:case_detail", kwargs={"object_id": str(self.case.uuid)}
+                    )
+                )
 
         # fail uploading the document or connecting it to the zaak
         messages.add_message(
@@ -290,74 +388,112 @@ def handle_document_upload(self, request, form):
                 filename=file.name
             ),
         )
-        return self.form_invalid(form)
 
-    def get_success_url(self) -> str:
-        return self.request.get_full_path()
+        return HttpResponseClientRedirect(
+            reverse("cases:case_detail", kwargs={"object_id": str(self.case.uuid)})
+        )
 
-    def post(self, request, *args, **kwargs):
-        form_class = self.get_form_class()
-        form = self.get_form(form_class)
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["case"] = self.case
+        return kwargs
 
-        if form.is_valid():
-            return self.handle_document_upload(request, form)
-        else:
-            return self.form_invalid(form)
+    def get_success_url(self):
+        return reverse(
+            "cases:case_detail_document_form", kwargs={"object_id": str(self.case.uuid)}
+        )
 
-    def get_anchors(self, statuses, documents):
-        anchors = [["#title", _("Gegevens")]]
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["hxpost_document_form"] = reverse(
+            "cases:case_detail_document_form", kwargs=self.kwargs
+        )
+        return context
 
-        if statuses:
-            anchors.append(["#statuses", _("Status")])
 
-        if documents:
-            anchors.append(["#documents", _("Documenten")])
+class CaseContactFormView(CaseAccessMixin, LogMixin, FormView):
+    template_name = "pages/cases/contact_form.html"
+    form_class = CaseContactForm
 
-        return anchors
+    def post(self, request, *args, **kwargs):
+        form = self.get_form()
+        if form.is_valid():
+            form.cleaned_data[
+                "contact_moment"
+            ] += f"\n\nCase number: {self.case.identificatie}"
+            return self.register_by_api(form)
+        else:
+            return self.form_invalid(form)
 
+    def get_success_url(self):
+        return reverse(
+            "cases:case_detail_contact_form", kwargs={"object_id": str(self.case.uuid)}
+        )
 
-class CaseDocumentDownloadView(LogMixin, CaseAccessMixin, View):
-    def get(self, request, *args, **kwargs):
-        if not self.case:
-            raise Http404
+    def register_by_api(self, form):
+        config = OpenKlantConfig.get_solo()
+        assert config.has_api_configuration()
 
-        info_object_uuid = kwargs["info_id"]
-        info_object = fetch_single_information_object_uuid(info_object_uuid)
-        if not info_object:
-            raise Http404
+        klant = fetch_klant_for_bsn(self.request.user.bsn)
+        if klant:
+            self.log_system_action(
+                "retrieved klant for BSN-user", user=self.request.user
+            )
+        else:
+            self.log_system_action(
+                "could not retrieve klant for BSN-user", user=self.request.user
+            )
+            data = {
+                "bronorganisatie": config.register_bronorganisatie_rsin,
+                "voornaam": self.request.user.first_name,
+                "voorvoegselAchternaam": self.request.user.infix,
+                "achternaam": self.request.user.last_name,
+                "emailadres": self.request.user.email,
+                "telefoonnummer": self.request.user.phonenumber,
+            }
+            # registering klanten won't work in e-Suite as it always pulls from BRP (but try anyway and fallback to appending details to tekst if fails)
+            klant = create_klant(data)
+            if klant:
+                self.log_system_action(
+                    "created klant for basic authenticated user",
+                    user=self.request.user,
+                )
+            else:
+                self.log_system_action(
+                    "could not create klant for BSN-user", user=self.request.user
+                )
 
-        # check if this info_object belongs to this case
-        if not fetch_case_information_objects_for_case_and_info(
-            self.case.url, info_object.url
-        ):
-            raise PermissionDenied()
+        # create contact moment
+        contact_moment = form.cleaned_data["contact_moment"]
+        data = {
+            "bronorganisatie": config.register_bronorganisatie_rsin,
+            "tekst": contact_moment,
+            "type": config.register_type,
+            "kanaal": "Internet",
+            "medewerkerIdentificatie": {
+                "identificatie": config.register_employee_id,
+            },
+        }
 
-        # check if this info_object should be visible
-        config = OpenZaakConfig.get_solo()
-        if not is_info_object_visible(info_object, config.document_max_confidentiality):
-            raise PermissionDenied()
+        contactmoment = create_contactmoment(data, klant=klant)
 
-        # retrieve and stream content
-        content_stream = download_document(info_object.inhoud)
-        if not content_stream:
-            raise Http404
+        if contactmoment:
+            messages.add_message(self.request, messages.SUCCESS, _("Vraag verstuurd!"))
+            self.log_system_action(f"registered contactmoment by API")
+        else:
+            messages.add_message(
+                self.request, messages.ERROR, _("Probleem bij versturen van de vraag.")
+            )
+            self.log_system_action(f"error while registering contactmoment by API")
 
-        self.log_user_action(
-            self.request.user,
-            _("Document van zaak gedownload {case}: {filename}").format(
-                case=self.case.identificatie,
-                filename=info_object.bestandsnaam,
-            ),
+        return HttpResponseClientRedirect(
+            reverse("cases:case_detail", kwargs={"object_id": str(self.case.uuid)})
         )
 
-        headers = {
-            "Content-Disposition": f'attachment; filename="{info_object.bestandsnaam}"',
-            "Content-Type": info_object.formaat,
-            "Content-Length": info_object.bestandsomvang,
-        }
-        response = StreamingHttpResponse(content_stream, headers=headers)
-        return response
-
-    def handle_no_permission(self):
-        # plain error and no redirect
-        raise PermissionDenied()
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["contact_form"] = self.get_form()
+        context["hxpost_contact_form"] = reverse(
+            "cases:case_detail_contact_form", kwargs=self.kwargs
+        )
+        return context
diff --git a/src/open_inwoner/js/components/cases/document_upload.js b/src/open_inwoner/js/components/cases/document_upload.js
index 5e34130107..382756ec1e 100644
--- a/src/open_inwoner/js/components/cases/document_upload.js
+++ b/src/open_inwoner/js/components/cases/document_upload.js
@@ -1,5 +1,6 @@
 export class DisableSubmitButton {
-  static selector = '#document-upload'
+  static documentSelector = '#document-upload'
+  static contactSelector = '#contact-form'
 
   constructor(form) {
     this.form = form
@@ -13,8 +14,15 @@ export class DisableSubmitButton {
 }
 
 const caseDocumentForms = document.querySelectorAll(
-  DisableSubmitButton.selector
+  DisableSubmitButton.documentSelector
 )
 ;[...caseDocumentForms].forEach(
   (caseDocumentForm) => new DisableSubmitButton(caseDocumentForm)
 )
+
+const caseContactForms = document.querySelectorAll(
+  DisableSubmitButton.contactSelector
+)
+;[...caseContactForms].forEach(
+  (caseContactForm) => new DisableSubmitButton(caseContactForm)
+)
diff --git a/src/open_inwoner/js/components/index.js b/src/open_inwoner/js/components/index.js
index cd869d0fea..4c6975fbca 100644
--- a/src/open_inwoner/js/components/index.js
+++ b/src/open_inwoner/js/components/index.js
@@ -43,7 +43,8 @@ htmx.config.includeIndicatorStyles = false
 const elementWrappers = [
   [Dropdown.selector, (elt) => new Dropdown(elt)],
   [CreateGumshoe.selector, (elt) => new CreateGumshoe(elt)],
-  [DisableSubmitButton.selector, (elt) => new DisableSubmitButton(elt)],
+  [DisableSubmitButton.documentSelector, (elt) => new DisableSubmitButton(elt)],
+  [DisableSubmitButton.contactSelector, (elt) => new DisableSubmitButton(elt)],
   [ShowInfo.selector, (elt) => new ShowInfo(elt)],
   [FileInputError.selector, (elt) => new FileInputError(elt)],
   [Notification.selector, (elt) => new Notification(elt)],
diff --git a/src/open_inwoner/js/components/upload-document/file-input-errors.js b/src/open_inwoner/js/components/upload-document/file-input-errors.js
index 7f14d18db0..48659910dc 100644
--- a/src/open_inwoner/js/components/upload-document/file-input-errors.js
+++ b/src/open_inwoner/js/components/upload-document/file-input-errors.js
@@ -9,19 +9,24 @@ export class FileInputError {
   showErrors() {
     // get the closest parent element (the form section element)
     const documentUpload = this.uploadError.closest('#form_upload')
-    // get info
-    const getFormInfo = documentUpload.querySelectorAll('.form__control__info')
 
-    // if errors are present, scroll and trigger opened state
-    documentUpload.scrollIntoView({
-      block: 'center',
-      behavior: 'smooth',
-    })
+    if (documentUpload) {
+      // get info
+      const getFormInfo = documentUpload.querySelectorAll(
+        '.form__control__info'
+      )
 
-    getFormInfo.forEach((elem) => {
-      elem.classList.remove('form__control__info')
-      elem.classList.add('form__control__info--active')
-    })
+      // if errors are present, scroll and trigger opened state
+      documentUpload.scrollIntoView({
+        block: 'center',
+        behavior: 'smooth',
+      })
+
+      getFormInfo.forEach((elem) => {
+        elem.classList.remove('form__control__info')
+        elem.classList.add('form__control__info--active')
+      })
+    }
   }
 }
 
diff --git a/src/open_inwoner/openzaak/admin.py b/src/open_inwoner/openzaak/admin.py
index d1ff534668..72795f8e68 100644
--- a/src/open_inwoner/openzaak/admin.py
+++ b/src/open_inwoner/openzaak/admin.py
@@ -166,6 +166,7 @@ class ZaakTypeConfigAdmin(admin.ModelAdmin):
         "catalogus",
         "identificatie",
         "omschrijving",
+        "contact_moments_enabled",
         "notify_status_changes",
         "document_upload_enabled",
         "external_document_upload_url",
diff --git a/src/open_inwoner/openzaak/managers.py b/src/open_inwoner/openzaak/managers.py
index 030d8fd8cc..e604c33330 100644
--- a/src/open_inwoner/openzaak/managers.py
+++ b/src/open_inwoner/openzaak/managers.py
@@ -139,3 +139,12 @@ def filter_enabled_for_case_type(self, case_type: ZaakType):
             )
             .exclude(external_document_upload_url="")
         )
+
+    def filter_questions_enabled_for_case_type(self, case_type: ZaakType):
+        """
+        Returns all ZaakTypeConfig instances which allow questions via OpenKlant API.
+        """
+        if not case_type:
+            return self.none()
+
+        return self.filter_case_type(case_type).filter(questions_enabled=True)
diff --git a/src/open_inwoner/openzaak/migrations/0019_zaaktypeconfig_contact_moments_enabled.py b/src/open_inwoner/openzaak/migrations/0019_zaaktypeconfig_contact_moments_enabled.py
new file mode 100644
index 0000000000..15a613c651
--- /dev/null
+++ b/src/open_inwoner/openzaak/migrations/0019_zaaktypeconfig_contact_moments_enabled.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.15 on 2023-06-16 13:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("openzaak", "0018_zaaktypeconfig_description"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="zaaktypeconfig",
+            name="contact_moments_enabled",
+            field=models.BooleanField(
+                default=False, verbose_name="Enable sending questions via OpenKlant API"
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/openzaak/models.py b/src/open_inwoner/openzaak/models.py
index 321816304c..37f5fdb0d1 100644
--- a/src/open_inwoner/openzaak/models.py
+++ b/src/open_inwoner/openzaak/models.py
@@ -191,6 +191,12 @@ class ZaakTypeConfig(models.Model):
         default=False,
     )
 
+    # contact moments
+    contact_moments_enabled = models.BooleanField(
+        verbose_name=_("Enable sending questions via OpenKlant API"),
+        default=False,
+    )
+
     objects = ZaakTypeConfigQueryset.as_manager()
 
     class Meta:
diff --git a/src/open_inwoner/openzaak/tests/test_case_detail.py b/src/open_inwoner/openzaak/tests/test_case_detail.py
index 7df501e778..27478a4a9d 100644
--- a/src/open_inwoner/openzaak/tests/test_case_detail.py
+++ b/src/open_inwoner/openzaak/tests/test_case_detail.py
@@ -363,6 +363,7 @@ def test_status_is_retrieved_when_user_logged_in_via_digid(self, m):
         self.assertEqual(
             response.context.get("case"),
             {
+                "id": self.zaak["uuid"],
                 "identification": "ZAAK-2022-0000000024",
                 "start_date": datetime.date(2022, 1, 2),
                 "end_date": datetime.date(2022, 1, 3),
@@ -380,6 +381,7 @@ def test_status_is_retrieved_when_user_logged_in_via_digid(self, m):
                 "external_upload_enabled": False,
                 "external_upload_url": "",
                 "allowed_file_extensions": sorted(self.config.allowed_file_extensions),
+                "contact_moments_enabled": False,
             },
         )
 
@@ -720,15 +722,23 @@ def test_successful_document_upload_flow(self, m):
 
         response = self.app.get(self.case_detail_url, user=self.user)
         form = response.forms["document-upload"]
+        form.action = reverse(
+            "cases:case_detail_document_form", kwargs={"object_id": self.zaak["uuid"]}
+        )
         form["title"] = "uploaded file"
         form["type"] = zaak_type_iotc.id
         form["file"] = Upload("upload.txt", b"data", "text/plain")
         form_response = form.submit()
 
-        redirect = form_response.follow()
+        # make sure the client-side-redirect is done with the expected url
+        self.assertEqual(
+            form_response.headers["HX-Redirect"],
+            reverse("cases:case_detail", kwargs={"object_id": str(self.zaak["uuid"])}),
+        )
+
+        redirect = self.app.get(form_response.headers["HX-Redirect"])
         redirect_messages = list(redirect.context["messages"])
 
-        self.assertRedirects(form_response, self.case_detail_url)
         self.assertEqual(
             redirect_messages[0].message,
             _(
@@ -752,15 +762,23 @@ def test_successful_document_upload_flow_with_uppercase_extension(self, m):
 
         response = self.app.get(self.case_detail_url, user=self.user)
         form = response.forms["document-upload"]
+        form.action = reverse(
+            "cases:case_detail_document_form", kwargs={"object_id": self.zaak["uuid"]}
+        )
         form["title"] = "uploaded file"
         form["type"] = zaak_type_iotc.id
         form["file"] = Upload("upload.TXT", b"data", "text/plain")
         form_response = form.submit()
 
-        redirect = form_response.follow()
+        # make sure the client-side-redirect is done with the expected url
+        self.assertEqual(
+            form_response.headers["HX-Redirect"],
+            reverse("cases:case_detail", kwargs={"object_id": str(self.zaak["uuid"])}),
+        )
+
+        redirect = self.app.get(form_response.headers["HX-Redirect"])
         redirect_messages = list(redirect.context["messages"])
 
-        self.assertRedirects(form_response, self.case_detail_url)
         self.assertEqual(
             redirect_messages[0].message,
             _("upload.TXT is succesvol geüpload"),
@@ -1001,11 +1019,21 @@ def test_request_error_in_uploading_document_shows_proper_message(self, m):
 
         response = self.app.get(self.case_detail_url, user=self.user)
         form = response.forms["document-upload"]
+        form.action = reverse(
+            "cases:case_detail_document_form", kwargs={"object_id": self.zaak["uuid"]}
+        )
         form["title"] = "uploaded file"
         form["file"] = Upload("upload.txt", b"data", "text/plain")
         form_response = form.submit()
 
-        form_response_messages = list(form_response.context["messages"])
+        # make sure the client-side-redirect is done with the expected url
+        self.assertEqual(
+            form_response.headers["HX-Redirect"],
+            reverse("cases:case_detail", kwargs={"object_id": str(self.zaak["uuid"])}),
+        )
+
+        redirect = self.app.get(form_response.headers["HX-Redirect"])
+        form_response_messages = list(redirect.context["messages"])
 
         self.assertEqual(
             form_response_messages[0].message,
@@ -1032,11 +1060,15 @@ def test_request_error_in_connecting_doc_with_zaak_shows_proper_message(self, m)
 
         response = self.app.get(self.case_detail_url, user=self.user)
         form = response.forms["document-upload"]
+        form.action = reverse(
+            "cases:case_detail_document_form", kwargs={"object_id": self.zaak["uuid"]}
+        )
         form["title"] = "A title"
         form["file"] = Upload("upload.txt", b"data", "text/plain")
         form_response = form.submit()
 
-        form_response_messages = list(form_response.context["messages"])
+        redirect = self.app.get(form_response.headers["HX-Redirect"])
+        form_response_messages = list(redirect.context["messages"])
 
         self.assertEqual(
             form_response_messages[0].message,
diff --git a/src/open_inwoner/scss/components/Form/ContactForm.scss b/src/open_inwoner/scss/components/Form/ContactForm.scss
new file mode 100644
index 0000000000..5e9bcf7848
--- /dev/null
+++ b/src/open_inwoner/scss/components/Form/ContactForm.scss
@@ -0,0 +1,9 @@
+#contact-form {
+  .button[type='submit']:disabled {
+    background-color: var(--color-gray) !important;
+    border-color: var(--color-gray) !important;
+    color: var(--color-white);
+    pointer-events: none;
+    cursor: default;
+  }
+}
diff --git a/src/open_inwoner/scss/components/_index.scss b/src/open_inwoner/scss/components/_index.scss
index 63bb7e26b5..f458a58a76 100644
--- a/src/open_inwoner/scss/components/_index.scss
+++ b/src/open_inwoner/scss/components/_index.scss
@@ -23,6 +23,7 @@
 @import './Form/ButtonRadio.scss';
 @import './Form/ButtonRadio.scss';
 @import './Form/Checkbox.scss';
+@import './Form/ContactForm.scss';
 @import './Form/Date.scss';
 @import './Form/DocumentUpload.scss';
 @import './Form/Error.scss';
diff --git a/src/open_inwoner/templates/pages/cases/contact_form.html b/src/open_inwoner/templates/pages/cases/contact_form.html
new file mode 100644
index 0000000000..7bc035ed23
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/contact_form.html
@@ -0,0 +1,20 @@
+{% load i18n form_tags button_tags icon_tags %}
+
+<h2 class="h2" id="contact">{% trans 'Contact' %}</h2>
+<p class="p">
+    {% blocktrans trimmed %}
+    Door middel van dit formulier kunt u een vraag stellen over deze zaak.
+    U dient ten minste uw telefoonnummer of uw e-mailadres in te vullen.
+    Indien u uw e-mailadres invult krijgt u een bevestiging per mail.
+    {% endblocktrans %}
+</p>
+
+{% render_form form=contact_form method="POST" id="contact-form" hxpost=hxpost_contact_form hxtarget="#cases-contact-form" %}
+    {% csrf_token %}
+    {% textarea contact_form.contact_moment %}
+    <div class="form__submit">
+        {% button_row %}
+            {% button text=_("Vraag versturen") id="submit_contact" type="submit" primary=True name="contact_form_submit" %}
+        {% endbutton_row %}
+    </div>
+{% endrender_form %}
diff --git a/src/open_inwoner/templates/pages/cases/document_form.html b/src/open_inwoner/templates/pages/cases/document_form.html
new file mode 100644
index 0000000000..2d0c3596c6
--- /dev/null
+++ b/src/open_inwoner/templates/pages/cases/document_form.html
@@ -0,0 +1,37 @@
+{% load i18n form_tags button_tags icon_tags %}
+
+<div class="upload-interface">
+    {#  if local upload is enabled #}
+    {% render_form id="document-upload" form=form method="POST" hxencoding="multipart/form-data" hxpost=hxpost_document_form hxtarget="#form_upload" submit_text=_("Bestand uploaden") show_required=True %}
+        {% csrf_token %}
+        <div id="info_container" class="info-container form__control__info">
+            <div class="upload-interface__info">
+                <fieldset class="fieldset-container">
+                    <div class="drive">{% icon icon="insert_drive_file" outlined=True icon_position="before" %}</div>
+                    <div class="fieldset__content">
+                        <div id="upload_error" class="upload-info upload-info__error">
+                            <span>{% trans "Selecteer uw bestand opnieuw" %} {% icon icon="arrow_downward" outlined=True icon_position="before" %}</span></div>
+                        <div id="upload_name" class="upload-info upload-info__name"></div>
+                        <div id="upload_size" class="upload-info upload-info__size"></div>
+                    </div>
+                    <div class="close">{% button id="close_upload" icon="cancel" type='reset' text='' transparent=True icon_outlined=True icon_position="before" %}</div>
+                </fieldset>
+            </div>
+        </div>
+
+        <div class="form__control__info">{% input form.title no_label=False no_help=True id="id_title" %}</div>
+
+        <div class="form__control__info">{% input form.type no_label=False no_help=True icon="expand_more" icon_position="after" class="label input" id="id_type" extra_classes="file-type__select" %}</div>
+
+        <div class="form__control upload">
+            <div class="upload__container">
+                {% file_input form.file text=_("Document selecteren") no_label=False no_help=True extra_classes="file-upload" %}
+                <div class="form__submit">
+                    {% button_row %}
+                        {% button type="submit" text=_("Document uploaden") id="submit_upload" primary=True %}
+                    {% endbutton_row %}
+                </div>
+            </div>
+        </div>
+    {% endrender_form %}
+</div>
diff --git a/src/open_inwoner/templates/pages/cases/status_inner.html b/src/open_inwoner/templates/pages/cases/status_inner.html
index b41709fccc..8cac39c6b6 100644
--- a/src/open_inwoner/templates/pages/cases/status_inner.html
+++ b/src/open_inwoner/templates/pages/cases/status_inner.html
@@ -1,4 +1,4 @@
-{% load i18n anchor_menu_tags card_tags dashboard_tags file_tags grid_tags status_tags table_tags solo_tags form_tags button_tags icon_tags notification_tags %}
+{% load i18n anchor_menu_tags card_tags dashboard_tags file_tags grid_tags status_tags table_tags solo_tags button_tags icon_tags notification_tags %}
 
 {# Anchor menu-mobile #}
 <div id="cases-status-anchors-oob-mobile" hx-swap-oob="true">
@@ -49,43 +49,10 @@ <h2 class="h2" id=>{% trans "Document uploaden" %}</h2>
                         {% endblocktranslate %}
                     </p>
                 {% endif %}
-
+                
+                {#  Upload document form. #}
                 <section id="form_upload" class="form__open-upload">
-                    <div class="upload-interface">
-                    {#  if local upload is enabled #}
-                    {% render_form id="document-upload" form=form method="POST" hxencoding="multipart/form-data" hxpost=hxpost hxtarget="#cases-detail-content" submit_text=_("Bestand uploaden") show_required=True %}
-                        {% csrf_token %}
-                        <div id="info_container" class="info-container form__control__info">
-                            <div class="upload-interface__info">
-                                <fieldset class="fieldset-container">
-                                    <div class="drive">{% icon icon="insert_drive_file" outlined=True icon_position="before" %}</div>
-                                    <div class="fieldset__content">
-                                        <div id="upload_error" class="upload-info upload-info__error">
-                                            <span>{% trans "Selecteer uw bestand opnieuw" %} {% icon icon="arrow_downward" outlined=True icon_position="before" %}</span></div>
-                                        <div id="upload_name" class="upload-info upload-info__name"></div>
-                                        <div id="upload_size" class="upload-info upload-info__size"></div>
-                                    </div>
-                                    <div class="close">{% button id="close_upload" icon="cancel" type='reset' text='' transparent=True icon_outlined=True icon_position="before" %}</div>
-                                </fieldset>
-                            </div>
-                        </div>
-
-                        <div class="form__control__info">{% input form.title no_label=False no_help=True id="id_title" %}</div>
-
-                        <div class="form__control__info">{% input form.type no_label=False no_help=True icon="expand_more" icon_position="after" class="label input" id="id_type" extra_classes="file-type__select" %}</div>
-
-                        <div class="form__control upload">
-                            <div class="upload__container">
-                                {% file_input form.file text=_("Document selecteren") no_label=False no_help=True extra_classes="file-upload" %}
-                                <div class="form__submit">
-                                    {% button_row %}
-                                        {% button type="submit" text=_("Document uploaden") id="submit_upload" primary=True %}
-                                    {% endbutton_row %}
-                                </div>
-                            </div>
-                        </div>
-                    {% endrender_form %}
-                    </div>
+                    {% include 'pages/cases/document_form.html' %}
                 </section>
 
             {% elif case.external_upload_enabled %}
@@ -98,8 +65,16 @@ <h2 class="h2">{% trans "Document toevoegen" %}</h2>
                 {% button_row %}
                     {% button href=case.external_upload_url text=_("Document uploaden") title=_("Opens new window") primary=True icon="open_in_new" icon_position="after" %}
                 {% endbutton_row %}
-            {% endif %}
+            {% endif %}            
 
+            {#  Contact moment form #}
+            {% if case.contact_moments_enabled %}
+                <section id="cases-contact-form" class="form_contact">
+                    <div id="cases-contact-form-content">
+                        {% include 'pages/cases/contact_form.html' %}
+                    </div>
+                </section>
+            {% endif %}
 
         {% endrender_column %}
     {% endrender_grid %}

From afabdc1b967a6e3447806f3b9f001c8ce01b6283 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Tue, 20 Jun 2023 16:58:12 +0200
Subject: [PATCH 44/60] [#1455] Investigating failing tests

---
 src/open_inwoner/cms/cases/tests/test_htmx.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/open_inwoner/cms/cases/tests/test_htmx.py b/src/open_inwoner/cms/cases/tests/test_htmx.py
index d4f6f210e1..19dfa75141 100644
--- a/src/open_inwoner/cms/cases/tests/test_htmx.py
+++ b/src/open_inwoner/cms/cases/tests/test_htmx.py
@@ -430,9 +430,6 @@ def test_cases(self, m):
         with open(download.path(), "rb") as f:
             self.assertEqual(f.read(), self.uploaded_zaak_informatie_object_content)
 
-        # finally check if our mock matchers are accurate
-        self.assertMockMatchersCalledAll(self.matchers)
-
         # contact form
         contact_form = page.locator("#contact-form")
         expect(contact_form).to_be_visible()
@@ -451,17 +448,3 @@ def test_cases(self, m):
         notification = page.locator(".notification__content")
         expect(notification).to_be_visible()
         expect(notification.get_by_text(_("Vraag verstuurd!"))).to_be_visible()
-
-        # finally check if our mock matchers are accurate
-        self.assertMockMatchersCalledAll(self.contact_moment_matchers)
-
-    def assertMockMatchersCalledAll(self, matchers):
-        def _match_str(m):
-            return f"  {m._method.ljust(5, ' ')} {m._url}"
-
-        missed = [m for m in matchers if not m.called]
-        if not missed:
-            return
-
-        out = "\n".join(_match_str(m) for m in missed)
-        self.fail(f"request mock matchers not called:\n{out}")

From efa337dde832d81c8a25b4180c563275dc97221d Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 21 Jun 2023 11:45:47 +0200
Subject: [PATCH 45/60] [#1524] Made contact form subjects orerable

---
 src/open_inwoner/openklant/admin.py           | 11 +++---
 src/open_inwoner/openklant/forms.py           |  4 +--
 .../migrations/0004_auto_20230621_1142.py     | 27 ++++++++++++++
 .../migrations/0005_auto_20230621_1143.py     | 22 ++++++++++++
 .../0006_alter_contactformsubject_order.py    | 19 ++++++++++
 src/open_inwoner/openklant/models.py          | 11 ++++--
 .../openklant/tests/test_contactform.py       | 36 +++++++++++++++++++
 7 files changed, 119 insertions(+), 11 deletions(-)
 create mode 100644 src/open_inwoner/openklant/migrations/0004_auto_20230621_1142.py
 create mode 100644 src/open_inwoner/openklant/migrations/0005_auto_20230621_1143.py
 create mode 100644 src/open_inwoner/openklant/migrations/0006_alter_contactformsubject_order.py

diff --git a/src/open_inwoner/openklant/admin.py b/src/open_inwoner/openklant/admin.py
index 62574c9434..555a44339c 100644
--- a/src/open_inwoner/openklant/admin.py
+++ b/src/open_inwoner/openklant/admin.py
@@ -2,16 +2,17 @@
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 
+from ordered_model.admin import OrderedInlineModelAdminMixin, OrderedTabularInline
 from solo.admin import SingletonModelAdmin
 
 from .models import ContactFormSubject, OpenKlantConfig
 
 
-class ContactFormSubjectInlineAdmin(admin.TabularInline):
+class ContactFormSubjectInlineAdmin(OrderedTabularInline):
     model = ContactFormSubject
-    fields = [
-        "subject",
-    ]
+    fields = ("subject", "order", "move_up_down_links")
+    readonly_fields = ("order", "move_up_down_links")
+    ordering = ("order",)
     extra = 0
 
 
@@ -33,7 +34,7 @@ def clean(self, *args, **kwargs):
 
 
 @admin.register(OpenKlantConfig)
-class OpenKlantConfigAdmin(SingletonModelAdmin):
+class OpenKlantConfigAdmin(OrderedInlineModelAdminMixin, SingletonModelAdmin):
     form = OpenKlantConfigAdminForm
     inlines = [
         ContactFormSubjectInlineAdmin,
diff --git a/src/open_inwoner/openklant/forms.py b/src/open_inwoner/openklant/forms.py
index b69e90d8fe..678078e77f 100644
--- a/src/open_inwoner/openklant/forms.py
+++ b/src/open_inwoner/openklant/forms.py
@@ -52,9 +52,7 @@ def __init__(self, user, *args, **kwargs):
         self.user = user
 
         config = OpenKlantConfig.get_solo()
-        self.fields["subject"].queryset = config.contactformsubject_set.order_by(
-            "subject"
-        )
+        self.fields["subject"].queryset = config.contactformsubject_set.all()
 
         if self.user.is_authenticated:
             del self.fields["first_name"]
diff --git a/src/open_inwoner/openklant/migrations/0004_auto_20230621_1142.py b/src/open_inwoner/openklant/migrations/0004_auto_20230621_1142.py
new file mode 100644
index 0000000000..3b1f91f279
--- /dev/null
+++ b/src/open_inwoner/openklant/migrations/0004_auto_20230621_1142.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.2.15 on 2023-06-21 09:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("openklant", "0003_auto_20230526_1013"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="contactformsubject",
+            options={
+                "ordering": ("order",),
+                "verbose_name": "Contact formulier onderwerp",
+                "verbose_name_plural": "Contact formulier onderwerpen",
+            },
+        ),
+        migrations.AddField(
+            model_name="contactformsubject",
+            name="order",
+            field=models.PositiveIntegerField(
+                db_index=True, editable=False, null=True, verbose_name="order"
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/openklant/migrations/0005_auto_20230621_1143.py b/src/open_inwoner/openklant/migrations/0005_auto_20230621_1143.py
new file mode 100644
index 0000000000..9263088222
--- /dev/null
+++ b/src/open_inwoner/openklant/migrations/0005_auto_20230621_1143.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.15 on 2023-06-21 09:43
+
+from django.db import migrations
+
+
+def populate_order_of_subjects(apps, schema_editor):
+    Subject = apps.get_model("openklant", "ContactFormSubject")
+    for subject in Subject.objects.all():
+        subject.order = subject.pk
+        subject.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("openklant", "0004_auto_20230621_1142"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            populate_order_of_subjects, reverse_code=migrations.RunPython.noop
+        ),
+    ]
diff --git a/src/open_inwoner/openklant/migrations/0006_alter_contactformsubject_order.py b/src/open_inwoner/openklant/migrations/0006_alter_contactformsubject_order.py
new file mode 100644
index 0000000000..f87f248320
--- /dev/null
+++ b/src/open_inwoner/openklant/migrations/0006_alter_contactformsubject_order.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.15 on 2023-06-21 09:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("openklant", "0005_auto_20230621_1143"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contactformsubject",
+            name="order",
+            field=models.PositiveIntegerField(
+                db_index=True, editable=False, verbose_name="order"
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/openklant/models.py b/src/open_inwoner/openklant/models.py
index 391c539b5d..03d98691d3 100644
--- a/src/open_inwoner/openklant/models.py
+++ b/src/open_inwoner/openklant/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from ordered_model.models import OrderedModel, OrderedModelManager
 from solo.models import SingletonModel
 from zgw_consumers.constants import APITypes
 
@@ -86,7 +87,7 @@ def has_api_configuration(self):
         return all(getattr(self, f, "") for f in self.register_api_required_fields)
 
 
-class ContactFormSubject(models.Model):
+class ContactFormSubject(OrderedModel):
     subject = models.CharField(
         verbose_name=_("Onderwerp"),
         max_length=255,
@@ -97,10 +98,14 @@ class ContactFormSubject(models.Model):
         on_delete=models.CASCADE,
     )
 
-    class Meta:
+    order_with_respect_to = "config"
+
+    objects = OrderedModelManager()
+
+    class Meta(OrderedModel.Meta):
         verbose_name = _("Contact formulier onderwerp")
         verbose_name_plural = _("Contact formulier onderwerpen")
-        ordering = ("subject",)
+        ordering = ("order",)
 
     def __str__(self):
         return self.subject
diff --git a/src/open_inwoner/openklant/tests/test_contactform.py b/src/open_inwoner/openklant/tests/test_contactform.py
index dde8076005..c649091fe9 100644
--- a/src/open_inwoner/openklant/tests/test_contactform.py
+++ b/src/open_inwoner/openklant/tests/test_contactform.py
@@ -131,6 +131,42 @@ def test_regular_auth_form_fills_email_and_phonenumber(self, m):
 
         response = form.submit(status=302)
 
+    def test_expected_ordered_subjects_are_shown(self, m):
+        config = OpenKlantConfig.get_solo()
+        config.register_email = "example@example.com"
+        config.save()
+        subject_1 = ContactFormSubjectFactory(config=config)
+        subject_2 = ContactFormSubjectFactory(config=config)
+
+        response = self.app.get(self.url)
+        form = response.forms["contactmoment-form"]
+        sub_options = form["subject"].options
+
+        self.assertEqual(
+            sub_options,
+            [
+                ("", True, "---------"),
+                (str(subject_1.pk), False, subject_1.subject),
+                (str(subject_2.pk), False, subject_2.subject),
+            ],
+        )
+
+        # swap positions and test the updated order
+        subject_1.swap(subject_2)
+
+        response = self.app.get(self.url)
+        form = response.forms["contactmoment-form"]
+        sub_options = form["subject"].options
+
+        self.assertEqual(
+            sub_options,
+            [
+                ("", True, "---------"),
+                (str(subject_2.pk), False, subject_2.subject),
+                (str(subject_1.pk), False, subject_1.subject),
+            ],
+        )
+
     def test_submit_and_register_via_email(self, m):
         config = OpenKlantConfig.get_solo()
         config.register_email = "example@example.com"

From 5450923e4277efcfdeb02db2bbf95208780deabf Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 21 Jun 2023 13:21:16 +0200
Subject: [PATCH 46/60] [#1542] Made footer contactform link conditional

---
 .../templates/components/Footer/Footer.html   |  9 +++--
 .../openklant/tests/test_contactform.py       | 36 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/open_inwoner/components/templates/components/Footer/Footer.html b/src/open_inwoner/components/templates/components/Footer/Footer.html
index 515868d902..947e122f1f 100644
--- a/src/open_inwoner/components/templates/components/Footer/Footer.html
+++ b/src/open_inwoner/components/templates/components/Footer/Footer.html
@@ -1,6 +1,7 @@
 {% load i18n link_tags button_tags logo_tags footer_tags solo_tags thumbnail %}
 
 {% get_solo "configurations.SiteConfiguration" as config %}
+{% get_solo "openklant.OpenKlantConfig" as ok_config %}
 
 <footer class='footer'>
     {% firstof config.logo.default_alt_text config.name as logo_alt_text %}
@@ -35,9 +36,11 @@ <h2 class="h2">{{footer_texts.footer_mailing_title}}</h2>
 
     <nav class="footer__links" aria-label="Footer navigatie">
         <ul class="footer__list">
-            <li class="footer__list-item">
-                {% link text=_("Contact formulier") secondary=True href="contactform" %}
-            </li>
+            {% if ok_config.has_form_configuration %}
+                <li class="footer__list-item">
+                    {% link text=_("Contact formulier") secondary=True href="contactform" %}
+                </li>
+            {% endif %}
             {% for flatpage in footer_texts.flatpages.all %}
                 <li class="footer__list-item">
                     {% link text=flatpage.title secondary=True href=flatpage.get_absolute_url %}
diff --git a/src/open_inwoner/openklant/tests/test_contactform.py b/src/open_inwoner/openklant/tests/test_contactform.py
index dde8076005..fb7a88bd73 100644
--- a/src/open_inwoner/openklant/tests/test_contactform.py
+++ b/src/open_inwoner/openklant/tests/test_contactform.py
@@ -2,13 +2,15 @@
 
 from django.contrib import messages
 from django.core import mail
+from django.test import override_settings
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 import requests_mock
 from django_webtest import WebTest
 
 from open_inwoner.accounts.tests.factories import UserFactory
+from open_inwoner.cms.tests import cms_tools
 from open_inwoner.openklant.models import OpenKlantConfig
 from open_inwoner.openklant.tests.data import MockAPICreateData
 from open_inwoner.openklant.tests.factories import ContactFormSubjectFactory
@@ -77,6 +79,38 @@ def test_no_form_shown_if_not_has_configuration(self, m):
         self.assertContains(response, _("Contact formulier niet geconfigureerd."))
         self.assertEqual(0, len(response.pyquery("#contactmoment-form")))
 
+    @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+    def test_no_form_link_shown_in_footer_if_not_has_configuration(self, m):
+        # set nothing
+        config = OpenKlantConfig.get_solo()
+        self.assertFalse(config.has_form_configuration())
+
+        cms_tools.create_homepage()
+
+        response = self.app.get(reverse("pages-root"))
+        links = response.pyquery(".footer__list-item")
+
+        self.assertEqual(len(links), 0)
+
+    @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+    def test_form_link_is_shown_in_footer_when_has_configuration(self, m):
+        ok_config = OpenKlantConfig.get_solo()
+        self.assertFalse(ok_config.has_form_configuration())
+
+        ContactFormSubjectFactory(config=ok_config)
+
+        ok_config.register_email = "example@example.com"
+        ok_config.save()
+
+        self.assertTrue(ok_config.has_form_configuration())
+
+        cms_tools.create_homepage()
+
+        response = self.app.get(reverse("pages-root"))
+        links = response.pyquery(".footer__list-item")
+
+        self.assertIn(_("Contact formulier"), links[0].text_content())
+
     def test_anon_form_requires_either_email_or_phonenumber(self, m):
         config = OpenKlantConfig.get_solo()
         config.register_email = "example@example.com"

From 35971110cdca236e624a5117595cbcbe76b7ef6e Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 21 Jun 2023 13:42:34 +0200
Subject: [PATCH 47/60] [#1560] Added linebreaks to contactmoment detail view

---
 .../components/templates/components/table/table.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/open_inwoner/components/templates/components/table/table.html b/src/open_inwoner/components/templates/components/table/table.html
index f7865301d9..00c62fc375 100644
--- a/src/open_inwoner/components/templates/components/table/table.html
+++ b/src/open_inwoner/components/templates/components/table/table.html
@@ -9,7 +9,7 @@
                     <th class="table__header table__header--status">{{ header.text }}</th>
                 {% endfor %}
                 {% for cell in row.cells %}
-                    <td class="table__item table__item--status">{{ cell.text }}</td>
+                    <td class="table__item table__item--status">{{ cell.text|linebreaksbr }}</td>
                 {% endfor %}
             </tr>
         {% endfor %}

From 9cfb93446095c73ccd4a4db24d69aa216e8e8424 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Wed, 21 Jun 2023 16:55:56 +0200
Subject: [PATCH 48/60] [#1553] Fixed duplicate messages in form valid

---
 .../openklant/views/contactform.py            | 49 +++++++++++++++----
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/open_inwoner/openklant/views/contactform.py b/src/open_inwoner/openklant/views/contactform.py
index 53d5afe94d..53e918f478 100644
--- a/src/open_inwoner/openklant/views/contactform.py
+++ b/src/open_inwoner/openklant/views/contactform.py
@@ -5,7 +5,6 @@
 
 from mail_editor.helpers import find_template
 from view_breadcrumbs import BaseBreadcrumbMixin
-from zds_client import ClientError
 
 from open_inwoner.openklant.forms import ContactForm
 from open_inwoner.openklant.models import OpenKlantConfig
@@ -22,9 +21,6 @@ class ContactFormView(CommonPageMixin, LogMixin, BaseBreadcrumbMixin, FormView):
     form_class = ContactForm
     template_name = "pages/contactform/form.html"
 
-    message_success = _("Vraag verstuurd!")
-    message_failure = _("Probleem bij versturen van de vraag.")
-
     @cached_property
     def crumbs(self):
         return [(_("Contact formulier"), self.request.path)]
@@ -60,12 +56,45 @@ def get_context_data(self, **kwargs):
         context["has_configuration"] = config.has_form_configuration()
         return context
 
+    def get_result_message(self, success=False):
+        if success:
+            return messages.add_message(
+                self.request, messages.SUCCESS, _("Vraag verstuurd!")
+            )
+        return messages.add_message(
+            self.request,
+            messages.ERROR,
+            _("Probleem bij versturen van de vraag."),
+        )
+
     def form_valid(self, form):
         config = OpenKlantConfig.get_solo()
         if config.register_email:
-            self.register_by_email(form, config.register_email)
+            registered_by_email = self.register_by_email(form, config.register_email)
         if config.register_contact_moment:
-            self.register_by_api(form, config)
+            registered_by_api = self.register_by_api(form, config)
+
+        # email setup
+        if config.register_email and not config.register_contact_moment:
+            if registered_by_email:
+                self.get_result_message(success=True)
+            else:
+                self.get_result_message(success=False)
+
+        # api setup
+        elif config.register_contact_moment and not config.register_email:
+            if registered_by_api:
+                self.get_result_message(success=True)
+            else:
+                self.get_result_message(success=False)
+
+        # both
+        elif config.register_email and config.register_contact_moment:
+            if registered_by_email and registered_by_api:
+                self.get_result_message(success=True)
+            else:
+                self.get_result_message(success=False)
+
         return super().form_valid(form)
 
     def register_by_email(self, form, recipient_email):
@@ -87,16 +116,16 @@ def register_by_email(self, form, recipient_email):
         success = template.send_email([recipient_email], context)
 
         if success:
-            messages.add_message(self.request, messages.SUCCESS, self.message_success)
             self.log_system_action(
                 "registered contactmoment by email", user=self.request.user
             )
+            return True
         else:
-            messages.add_message(self.request, messages.ERROR, self.message_failure)
             self.log_system_action(
                 "error while registering contactmoment by email",
                 user=self.request.user,
             )
+            return False
 
     def register_by_api(self, form, config: OpenKlantConfig):
         assert config.has_api_configuration()
@@ -180,12 +209,12 @@ def register_by_api(self, form, config: OpenKlantConfig):
         contactmoment = create_contactmoment(data, klant=klant)
 
         if contactmoment:
-            messages.add_message(self.request, messages.SUCCESS, self.message_success)
             self.log_system_action(
                 "registered contactmoment by API", user=self.request.user
             )
+            return True
         else:
-            messages.add_message(self.request, messages.ERROR, self.message_failure)
             self.log_system_action(
                 "error while registering contactmoment by API", user=self.request.user
             )
+            return False

From bf790afaf4d555755aca09bc1d2c61322575a3c9 Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Thu, 22 Jun 2023 11:46:07 +0200
Subject: [PATCH 49/60] [#1553] Made conditional form result message simpler

---
 .../openklant/views/contactform.py            | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/src/open_inwoner/openklant/views/contactform.py b/src/open_inwoner/openklant/views/contactform.py
index 53e918f478..2fb4cae768 100644
--- a/src/open_inwoner/openklant/views/contactform.py
+++ b/src/open_inwoner/openklant/views/contactform.py
@@ -61,39 +61,23 @@ def get_result_message(self, success=False):
             return messages.add_message(
                 self.request, messages.SUCCESS, _("Vraag verstuurd!")
             )
-        return messages.add_message(
-            self.request,
-            messages.ERROR,
-            _("Probleem bij versturen van de vraag."),
-        )
+        else:
+            return messages.add_message(
+                self.request,
+                messages.ERROR,
+                _("Probleem bij versturen van de vraag."),
+            )
 
     def form_valid(self, form):
         config = OpenKlantConfig.get_solo()
+
+        success = True
         if config.register_email:
-            registered_by_email = self.register_by_email(form, config.register_email)
+            success = self.register_by_email(form, config.register_email) and success
         if config.register_contact_moment:
-            registered_by_api = self.register_by_api(form, config)
+            success = self.register_by_api(form, config) and success
 
-        # email setup
-        if config.register_email and not config.register_contact_moment:
-            if registered_by_email:
-                self.get_result_message(success=True)
-            else:
-                self.get_result_message(success=False)
-
-        # api setup
-        elif config.register_contact_moment and not config.register_email:
-            if registered_by_api:
-                self.get_result_message(success=True)
-            else:
-                self.get_result_message(success=False)
-
-        # both
-        elif config.register_email and config.register_contact_moment:
-            if registered_by_email and registered_by_api:
-                self.get_result_message(success=True)
-            else:
-                self.get_result_message(success=False)
+        self.get_result_message(success=success)
 
         return super().form_valid(form)
 

From 53adff01a0fd4f36010417514dc793ee99abe7f9 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Thu, 22 Jun 2023 12:05:54 +0200
Subject: [PATCH 50/60] Removal of case description from statuspage HTML title

---
 src/open_inwoner/cms/cases/views/status.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/open_inwoner/cms/cases/views/status.py b/src/open_inwoner/cms/cases/views/status.py
index 620ffb4be4..718f23d347 100644
--- a/src/open_inwoner/cms/cases/views/status.py
+++ b/src/open_inwoner/cms/cases/views/status.py
@@ -102,10 +102,7 @@ def crumbs(self):
         ]
 
     def page_title(self):
-        if self.case:
-            return _("Status van {case}").format(case=self.case.omschrijving)
-        else:
-            return _("Status")
+        return _("Status")
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)

From bb4eeb74b31622bdd3613f944cb802138101b23a Mon Sep 17 00:00:00 2001
From: Bart van der Schoor <bart@maykinmedia.nl>
Date: Fri, 23 Jun 2023 09:50:00 +0200
Subject: [PATCH 51/60] Fixed weird test issue that slipped in from
 branching/merges/rebase

---
 src/open_inwoner/openklant/tests/test_contactform.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/open_inwoner/openklant/tests/test_contactform.py b/src/open_inwoner/openklant/tests/test_contactform.py
index a6bde8db00..c3fa9a6fd8 100644
--- a/src/open_inwoner/openklant/tests/test_contactform.py
+++ b/src/open_inwoner/openklant/tests/test_contactform.py
@@ -179,7 +179,7 @@ def test_expected_ordered_subjects_are_shown(self, m):
         self.assertEqual(
             sub_options,
             [
-                ("", True, "---------"),
+                ("", True, _("Selecteren")),
                 (str(subject_1.pk), False, subject_1.subject),
                 (str(subject_2.pk), False, subject_2.subject),
             ],
@@ -195,7 +195,7 @@ def test_expected_ordered_subjects_are_shown(self, m):
         self.assertEqual(
             sub_options,
             [
-                ("", True, "---------"),
+                ("", True, _("Selecteren")),
                 (str(subject_2.pk), False, subject_2.subject),
                 (str(subject_1.pk), False, subject_1.subject),
             ],

From 190a9d117261849528b4d067a840f7fc79008489 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Mon, 19 Jun 2023 12:18:35 +0200
Subject: [PATCH 52/60] [#1548] refactor profile deletion

---
 src/open_inwoner/accounts/models.py        | 5 -----
 src/open_inwoner/accounts/views/profile.py | 7 +++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py
index bc98b4ba8c..b1467b6970 100644
--- a/src/open_inwoner/accounts/models.py
+++ b/src/open_inwoner/accounts/models.py
@@ -250,11 +250,6 @@ def get_address(self):
             return f"{self.street} {self.housenumber}, {self.city}"
         return ""
 
-    def deactivate(self):
-        self.is_active = False
-        self.deactivated_on = date.today()
-        self.save()
-
     def get_new_messages_total(self) -> int:
         return self.received_messages.filter(seen=False).count()
 
diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 5da5620a21..7fcbb930f2 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -106,10 +106,13 @@ def get_context_data(self, **kwargs):
     def post(self, request, *args, **kwargs):
         if request.user.is_authenticated and not request.user.is_staff:
             instance = User.objects.get(id=request.user.id)
-            self.request.user.deactivate()
 
             self.log_user_action(instance, _("user was deactivated via frontend"))
-            return redirect(instance.get_logout_url())
+
+            instance.delete()
+            request.session.flush()
+
+            return redirect(reverse("logout"))
         else:
             messages.warning(request, _("Uw account kon niet worden gedeactiveerd"))
             return redirect("profile:detail")

From 668b383d1324175c582953566aa266721a7c3ece Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Mon, 19 Jun 2023 16:41:01 +0200
Subject: [PATCH 53/60] [#1548] add and regroup tests for profile deletion
 refactor

---
 .../commands/deleteinactiveusers.py           |  31 ----
 .../tests/test_deleteinactiveusers.py         |  92 ------------
 .../accounts/tests/test_logging.py            |   1 -
 .../accounts/tests/test_profile_views.py      | 135 ++++++++++++------
 src/open_inwoner/accounts/views/profile.py    |  14 +-
 5 files changed, 105 insertions(+), 168 deletions(-)
 delete mode 100644 src/open_inwoner/accounts/management/commands/deleteinactiveusers.py
 delete mode 100644 src/open_inwoner/accounts/tests/test_deleteinactiveusers.py

diff --git a/src/open_inwoner/accounts/management/commands/deleteinactiveusers.py b/src/open_inwoner/accounts/management/commands/deleteinactiveusers.py
deleted file mode 100644
index 7d87cc12e4..0000000000
--- a/src/open_inwoner/accounts/management/commands/deleteinactiveusers.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import logging
-from datetime import date, timedelta
-
-from django.conf import settings
-from django.contrib.auth import get_user_model
-from django.core.management.base import BaseCommand
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = "Deletes a regular user(not staff) after X days"
-
-    def handle(self, *args, **options):
-        User = get_user_model()
-        interval = date.today() - timedelta(
-            days=settings.DELETE_USER_AFTER_X_DAYS_INACTIVE
-        )
-        users_to_be_deleted = User.objects.filter(
-            is_active=False,
-            is_staff=False,
-            deactivated_on__lte=interval,
-        )
-
-        if users_to_be_deleted:
-            logger.info(f"\nDeleting users from before {interval}.")
-            results = users_to_be_deleted.delete()
-            num_of_deleted_users = results[1].get("accounts.User")
-            logger.info(f"\n{num_of_deleted_users} users were successfully deleted.")
-        else:
-            logger.info(f"\nNo users were deleted from before {interval}.")
diff --git a/src/open_inwoner/accounts/tests/test_deleteinactiveusers.py b/src/open_inwoner/accounts/tests/test_deleteinactiveusers.py
deleted file mode 100644
index 5fb1215d1a..0000000000
--- a/src/open_inwoner/accounts/tests/test_deleteinactiveusers.py
+++ /dev/null
@@ -1,92 +0,0 @@
-from django.core.management import call_command
-from django.test import TestCase
-
-from freezegun import freeze_time
-
-from ..models import User
-from .factories import UserFactory
-
-
-class TestCommand(TestCase):
-    @freeze_time("2021-10-01")
-    def test_command_deletes_inactive_regular_user_when_X_days_have_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-17", is_active=False, is_staff=False)
-
-        with self.assertLogs() as captured:
-            call_command("deleteinactiveusers")
-
-        self.assertEqual(
-            captured.records[1].getMessage(), "\n1 users were successfully deleted."
-        )
-        self.assertFalse(User.objects.filter(id=user.id).exists())
-
-    @freeze_time("2021-10-01")
-    def test_command_does_not_delete_active_staff_user_when_X_days_have_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-17", is_active=True, is_staff=True)
-
-        with self.assertLogs() as captured:
-            call_command("deleteinactiveusers")
-
-        self.assertEqual(
-            captured.records[0].getMessage(),
-            "\nNo users were deleted from before 2021-09-17.",
-        )
-        self.assertTrue(User.objects.filter(id=user.id).exists())
-
-    @freeze_time("2021-10-01")
-    def test_command_does_not_delete_active_staff_user_when_X_days_have_not_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-25", is_active=True, is_staff=True)
-        call_command("deleteinactiveusers")
-
-        self.assertTrue(User.objects.filter(id=user.id).exists())
-
-    @freeze_time("2021-10-01")
-    def test_command_does_not_delete_active_regular_user_when_X_days_have_not_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-25", is_active=True, is_staff=False)
-        call_command("deleteinactiveusers")
-
-        self.assertTrue(User.objects.filter(id=user.id).exists())
-
-    @freeze_time("2021-10-01")
-    def test_command_does_not_delete_inactive_regular_user_when_X_days_have_not_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-25", is_active=False, is_staff=False)
-        call_command("deleteinactiveusers")
-
-        self.assertTrue(User.objects.filter(id=user.id).exists())
-
-    @freeze_time("2021-10-01")
-    def test_command_does_not_delete_inactive_staff_user_when_X_days_have_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-17", is_active=False, is_staff=True)
-        call_command("deleteinactiveusers")
-
-        self.assertTrue(User.objects.filter(id=user.id).exists())
-
-    @freeze_time("2021-10-01")
-    def test_command_does_not_delete_active_regular_user_when_X_days_have_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-17", is_active=True, is_staff=False)
-        call_command("deleteinactiveusers")
-
-        self.assertTrue(User.objects.filter(id=user.id).exists())
-
-    @freeze_time("2021-10-01")
-    def test_command_does_not_delete_inactive_staff_user_when_X_days_have_not_passed(
-        self,
-    ):
-        user = UserFactory(deactivated_on="2021-09-25", is_active=False, is_staff=True)
-        call_command("deleteinactiveusers")
-
-        self.assertTrue(User.objects.filter(id=user.id).exists())
diff --git a/src/open_inwoner/accounts/tests/test_logging.py b/src/open_inwoner/accounts/tests/test_logging.py
index 29db1ab98b..93ebecacbc 100644
--- a/src/open_inwoner/accounts/tests/test_logging.py
+++ b/src/open_inwoner/accounts/tests/test_logging.py
@@ -215,7 +215,6 @@ def test_users_deactivation_is_logged(self):
         self.assertEqual(
             log_entry.timestamp.strftime("%m/%d/%Y, %H:%M:%S"), "10/18/2021, 13:00:00"
         )
-        self.assertEqual(log_entry.content_object.id, self.user.id)
         self.assertEqual(
             log_entry.extra_data,
             {
diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
index afe519350d..85a22e26c7 100644
--- a/src/open_inwoner/accounts/tests/test_profile_views.py
+++ b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -12,6 +12,7 @@
 from open_inwoner.cms.profile.cms_appconfig import ProfileConfig
 from open_inwoner.haalcentraal.tests.mixins import HaalCentraalMixin
 from open_inwoner.pdc.tests.factories import CategoryFactory
+from open_inwoner.plans.tests.factories import PlanFactory
 from open_inwoner.utils.logentry import LOG_ACTIONS
 from open_inwoner.utils.tests.helpers import AssertTimelineLogMixin, create_image_bytes
 
@@ -21,6 +22,7 @@
 from ...questionnaire.tests.factories import QuestionnaireStepFactory
 from ..choices import ContactTypeChoices, LoginTypeChoices
 from ..forms import BrpUserForm, UserForm
+from ..models import User
 from .factories import ActionFactory, DigidUserFactory, DocumentFactory, UserFactory
 
 
@@ -92,49 +94,6 @@ def test_only_open_actions(self):
         self.assertEquals(response.status_code, 200)
         self.assertContains(response, "0 acties staan open.")
 
-    def test_deactivate_account(self):
-        response = self.app.get(self.url, user=self.user)
-        self.assertEquals(response.status_code, 200)
-        form = response.forms["deactivate-form"]
-        base_response = form.submit()
-        self.assertEquals(base_response.url, self.return_url)
-        followed_response = base_response.follow().follow()
-        self.assertEquals(followed_response.status_code, 200)
-        self.user.refresh_from_db()
-        self.assertFalse(self.user.is_active)
-        self.assertIsNotNone(self.user.deactivated_on)
-
-    def test_deactivate_account_staff(self):
-        self.user.is_staff = True
-        self.user.save()
-        response = self.app.get(self.url, user=self.user)
-        self.assertEquals(response.status_code, 200)
-        form = response.forms["deactivate-form"]
-        base_response = form.submit()
-        self.assertEquals(base_response.url, self.url)
-        followed_response = base_response.follow()
-        self.assertEquals(followed_response.status_code, 200)
-        self.user.refresh_from_db()
-        self.assertTrue(self.user.is_active)
-        self.assertIsNone(self.user.deactivated_on)
-
-    def test_deactivate_account_digid(self):
-        """
-        check that user is redirected to digid:logout
-        """
-        user = UserFactory.create(
-            login_type=LoginTypeChoices.digid, email="john@smith.nl"
-        )
-
-        response = self.app.get(self.url, user=user)
-        self.assertEquals(response.status_code, 200)
-        form = response.forms["deactivate-form"]
-
-        response = form.submit()
-
-        self.assertEquals(response.status_code, 302)
-        self.assertEquals(response.url, reverse("digid:logout"))
-
     def test_get_documents_sorted(self):
         """
         check that the new document is shown first
@@ -560,6 +519,96 @@ def test_modify_phone_updates_klant_api_but_skip_unchanged_phone(self, m):
         )
 
 
+@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+class ProfileDeleteTest(WebTest):
+    csrf_checks = False
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.url = reverse("profile:detail")
+
+    def test_delete_regular_user_success(self):
+        user = UserFactory()
+
+        # get profile page
+        response = self.app.get(self.url, user=user)
+        self.assertEqual(response.status_code, 200)
+
+        # check delete
+        response = response.forms["deactivate-form"].submit()
+        self.assertIsNone(User.objects.first())
+
+        # check redirect
+        self.assertRedirects(
+            self.app.get(response.url),
+            reverse("pages-root"),
+            status_code=302,
+            target_status_code=200,
+            fetch_redirect_response=True,
+        )
+
+    def test_delete_user_with_digid_login_success(self):
+        user = DigidUserFactory()
+
+        # get profile page
+        response = self.app.get(self.url, user=user)
+        self.assertEqual(response.status_code, 200)
+
+        # check user deleted
+        response = response.forms["deactivate-form"].submit()
+        self.assertIsNone(User.objects.first())
+
+        # check redirect
+        self.assertRedirects(
+            self.app.get(response.url),
+            reverse("pages-root"),
+            status_code=302,
+            target_status_code=200,
+            fetch_redirect_response=True,
+        )
+
+    def test_delete_regular_with_existing_plans_fail(self):
+        user = UserFactory()
+        PlanFactory.create(created_by=user)
+
+        # get profile page
+        response = self.app.get(self.url, user=user)
+        self.assertEqual(response.status_code, 200)
+
+        # check user not deleted
+        response = response.forms["deactivate-form"].submit()
+        self.assertEqual(User.objects.first(), user)
+
+        # check redirect
+        self.assertRedirects(
+            response,
+            reverse("profile:detail"),
+            status_code=302,
+            target_status_code=200,
+            fetch_redirect_response=True,
+        )
+
+    def test_delete_staff_user_via_frontend_does_not_work(self):
+        user = UserFactory(is_staff=True)
+
+        # get profile page
+        response = self.app.get(self.url, user=user)
+        self.assertEqual(response.status_code, 200)
+
+        # check staff user not deleted
+        response = response.forms["deactivate-form"].submit()
+        self.assertEqual(User.objects.first(), user)
+
+        # check redirect
+        self.assertRedirects(
+            response,
+            reverse("profile:detail"),
+            status_code=302,
+            target_status_code=200,
+            fetch_redirect_response=True,
+        )
+
+
 @requests_mock.Mocker()
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
 class MyDataTests(HaalCentraalMixin, WebTest):
diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 7fcbb930f2..2b00756a68 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -22,6 +22,7 @@
 )
 from open_inwoner.cms.utils.page_display import inbox_page_is_published
 from open_inwoner.haalcentraal.utils import fetch_brp_data
+from open_inwoner.plans.models import Plan
 from open_inwoner.questionnaire.models import QuestionnaireStep
 from open_inwoner.utils.mixins import ExportMixin
 from open_inwoner.utils.views import CommonPageMixin, LogMixin
@@ -107,8 +108,19 @@ def post(self, request, *args, **kwargs):
         if request.user.is_authenticated and not request.user.is_staff:
             instance = User.objects.get(id=request.user.id)
 
-            self.log_user_action(instance, _("user was deactivated via frontend"))
+            # check if there are still plans associated witht the user
+            if Plan.objects.filter(created_by=instance).exists():
+                messages.warning(
+                    request,
+                    _(
+                        "You still have plans associated with your profile. "
+                        "Please delete those plans before deleting your profile."
+                    ),
+                )
+                return redirect("profile:detail")
 
+            # continue with delete
+            self.log_user_action(instance, _("user was deactivated via frontend"))
             instance.delete()
             request.session.flush()
 

From 253b06feca83a529b227421958545d8a3775a6e3 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Fri, 23 Jun 2023 09:08:41 +0200
Subject: [PATCH 54/60] [#1562] add password validator to ensure diverse
 password

---
 src/open_inwoner/conf/base.py        |  1 +
 src/open_inwoner/utils/validators.py | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index e09ef15678..51cd7eb85e 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -449,6 +449,7 @@
     {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
     {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
     {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
+    {"NAME": "open_inwoner.utils.validators.DiversityValidator"},
 ]
 
 
diff --git a/src/open_inwoner/utils/validators.py b/src/open_inwoner/utils/validators.py
index 6b29729a72..f30932d73f 100644
--- a/src/open_inwoner/utils/validators.py
+++ b/src/open_inwoner/utils/validators.py
@@ -94,3 +94,20 @@ def __call__(self, image_id):
 
     def __eq__(self, other):
         return self.width == other.width and self.height == other.height
+
+
+class DiversityValidator:
+    def validate(self, password, user=None):
+        if password.isalpha or password.isupper() or password.islower():
+            raise ValidationError(
+                _(
+                    "Your password must contain at least 1 upper-case letter, "
+                    "1 lower-case letter, 1 digit."
+                )
+            )
+
+    def get_help_text(self):
+        return _(
+            "Your password must contain at least 1 upper-case letter, "
+            "1 lower-case letter, 1 digit."
+        )

From 2b7b4b4cf6f1e4cbef1d2215e5ec9aa01d05f3ce Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Wed, 21 Jun 2023 15:29:29 +0200
Subject: [PATCH 55/60] [#1547] fix digid logout

---
 src/open_inwoner/accounts/middleware.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/open_inwoner/accounts/middleware.py b/src/open_inwoner/accounts/middleware.py
index a0ba9f61b3..24ce918f9b 100644
--- a/src/open_inwoner/accounts/middleware.py
+++ b/src/open_inwoner/accounts/middleware.py
@@ -29,15 +29,21 @@ def __call__(self, request):
             # If the user is currently not editing their information, but it is required
             # redirect to that view.
 
-            # DigiD can be disabled, in which case the digid app isn't available
-            digid_logout = "/digid/logout/"
             try:
                 digid_logout = reverse("digid:logout")
-            except:  # nosec
-                pass
+                digid_slo_redirect = reverse("digid:slo-redirect")
+            except NoReverseMatch:
+                # temporary fix to make tests pass in case reverse fails
+                digid_logout = "/digid/logout/"
+                digid_slo_redirect = "/digid/slo/redirect/"
             if (
                 not request.path.startswith(
-                    (necessary_fields_url, reverse("logout"), digid_logout)
+                    (
+                        necessary_fields_url,
+                        reverse("logout"),
+                        digid_logout,
+                        digid_slo_redirect,
+                    )
                 )
                 and request.user.require_necessary_fields()
             ):

From 680dadc5c4640db27bb99a97a61f5d62e200079e Mon Sep 17 00:00:00 2001
From: vasileios <zigras00@gmail.com>
Date: Fri, 23 Jun 2023 11:16:06 +0200
Subject: [PATCH 56/60] [#1568] Process pr feedback of #1455

---
 src/open_inwoner/cms/cases/forms.py           |  2 +-
 .../cms/cases/tests/test_contactform.py       | 94 ++++++-------------
 src/open_inwoner/cms/cases/tests/test_htmx.py | 35 ++++---
 src/open_inwoner/cms/cases/views/status.py    | 24 ++---
 .../js/components/cases/document_upload.js    | 18 +---
 src/open_inwoner/js/components/index.js       |  3 +-
 src/open_inwoner/openzaak/admin.py            |  2 +-
 ...led_zaaktypeconfig_contact_form_enabled.py | 17 ++++
 src/open_inwoner/openzaak/models.py           |  2 +-
 .../openzaak/tests/test_case_detail.py        |  2 +-
 .../templates/pages/cases/contact_form.html   |  4 +-
 .../templates/pages/cases/document_form.html  |  2 +-
 .../templates/pages/cases/status_inner.html   |  2 +-
 13 files changed, 85 insertions(+), 122 deletions(-)
 create mode 100644 src/open_inwoner/openzaak/migrations/0020_rename_contact_moments_enabled_zaaktypeconfig_contact_form_enabled.py

diff --git a/src/open_inwoner/cms/cases/forms.py b/src/open_inwoner/cms/cases/forms.py
index 9c0b845019..8db8e84767 100644
--- a/src/open_inwoner/cms/cases/forms.py
+++ b/src/open_inwoner/cms/cases/forms.py
@@ -60,7 +60,7 @@ def clean_file(self):
 
 
 class CaseContactForm(forms.Form):
-    contact_moment = forms.CharField(
+    question = forms.CharField(
         label=_("Vraag"),
         max_length=1024,
         widget=forms.Textarea(attrs={"rows": "5"}),
diff --git a/src/open_inwoner/cms/cases/tests/test_contactform.py b/src/open_inwoner/cms/cases/tests/test_contactform.py
index afc725c32b..1650f64414 100644
--- a/src/open_inwoner/cms/cases/tests/test_contactform.py
+++ b/src/open_inwoner/cms/cases/tests/test_contactform.py
@@ -20,12 +20,8 @@
     KLANTEN_ROOT,
     MockAPIData,
 )
-from open_inwoner.openzaak.models import OpenZaakConfig
-from open_inwoner.openzaak.tests.factories import (
-    ServiceFactory,
-    ZaakTypeConfigFactory,
-    ZaakTypeInformatieObjectTypeConfigFactory,
-)
+from open_inwoner.openzaak.models import CatalogusConfig, OpenZaakConfig
+from open_inwoner.openzaak.tests.factories import ServiceFactory, ZaakTypeConfigFactory
 from open_inwoner.openzaak.tests.shared import (
     CATALOGI_ROOT,
     DOCUMENTEN_ROOT,
@@ -36,7 +32,7 @@
 
 @requests_mock.Mocker()
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
-class ContactFormTestCase(ClearCachesMixin, WebTest):
+class CasesContactFormTestCase(ClearCachesMixin, WebTest):
     def setUp(self):
         super().setUp()
 
@@ -115,40 +111,6 @@ def setUp(self):
             vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
             indicatieInternOfExtern="extern",
         )
-        self.zaak_informatie_object = generate_oas_component(
-            "zrc",
-            "schemas/ZaakInformatieObject",
-            url=f"{ZAKEN_ROOT}zaakinformatieobjecten/e55153aa-ad2c-4a07-ae75-15add57d6",
-            informatieobject=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/014c38fe-b010-4412-881c-3000032fb812",
-            zaak=self.zaak["url"],
-        )
-        self.uploaded_zaak_informatie_object = generate_oas_component(
-            "zrc",
-            "schemas/ZaakInformatieObject",
-            url=f"{ZAKEN_ROOT}zaakinformatieobjecten/48599f76-b524-48e8-be5a-6fc47288c9bf",
-            informatieobject=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/48599f76-b524-48e8-be5a-6fc47288c9bf",
-            zaak=self.zaak["url"],
-        )
-        self.informatie_object_type = generate_oas_component(
-            "ztc",
-            "schemas/InformatieObjectType",
-            url=f"{CATALOGI_ROOT}informatieobjecttype/014c38fe-b010-4412-881c-3000032fb321",
-            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
-            omschrijving="Some content",
-        )
-        self.informatie_object = generate_oas_component(
-            "drc",
-            "schemas/EnkelvoudigInformatieObject",
-            uuid="014c38fe-b010-4412-881c-3000032fb812",
-            url=self.zaak_informatie_object["informatieobject"],
-            inhoud=f"{DOCUMENTEN_ROOT}enkelvoudiginformatieobjecten/014c38fe-b010-4412-881c-3000032fb812/download",
-            informatieobjecttype=self.informatie_object_type["url"],
-            status="definitief",
-            vertrouwelijkheidaanduiding=VertrouwelijkheidsAanduidingen.openbaar,
-            bestandsnaam="uploaded_document.txt",
-            titel="uploaded_document_title.txt",
-            bestandsomvang=123,
-        )
         self.status_finish = generate_oas_component(
             "zrc",
             "schemas/Status",
@@ -188,17 +150,11 @@ def setUp(self):
             telefoonnummer="0612345678",
         )
 
-        # enable upload and contact moments
-        zaak_type_config = ZaakTypeConfigFactory(
+        # contact form
+        self.zaak_type_config = ZaakTypeConfigFactory(
             catalogus__url=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
             identificatie=self.zaaktype["identificatie"],
-            contact_moments_enabled=True,
-        )
-        ZaakTypeInformatieObjectTypeConfigFactory(
-            zaaktype_config=zaak_type_config,
-            informatieobjecttype_url=self.informatie_object["url"],
-            zaaktype_uuids=[self.zaaktype["uuid"]],
-            document_upload_enabled=True,
+            contact_form_enabled=True,
         )
 
         self.case_detail_url = reverse(
@@ -217,7 +173,6 @@ def _setUpMocks(self, m):
             self.zaak,
             self.result,
             self.zaaktype,
-            self.informatie_object,
             self.status_finish,
             self.status_type_finish,
         ]:
@@ -230,20 +185,7 @@ def _setUpMocks(self, m):
             ),
             m.get(
                 f"{ZAKEN_ROOT}zaakinformatieobjecten?zaak={self.zaak['url']}",
-                [
-                    {
-                        "json": [
-                            self.zaak_informatie_object,
-                        ]
-                    },
-                    # after upload
-                    {
-                        "json": [
-                            self.zaak_informatie_object,
-                            self.uploaded_zaak_informatie_object,
-                        ]
-                    },
-                ],
+                [{"json": []}],
             ),
             m.get(
                 f"{ZAKEN_ROOT}statussen?zaak={self.zaak['url']}",
@@ -263,7 +205,7 @@ def test_form_is_shown_if_open_klant_configured(self, m):
         response = self.app.get(self.case_detail_url, user=self.user)
         contact_form = response.pyquery("#contact-form")
 
-        self.assertTrue(response.context["case"]["contact_moments_enabled"])
+        self.assertTrue(response.context["case"]["contact_form_enabled"])
         self.assertTrue(contact_form)
 
     def test_no_form_shown_if_open_klant_not_configured(self, m):
@@ -283,5 +225,23 @@ def test_no_form_shown_if_open_klant_not_configured(self, m):
         response = self.app.get(self.case_detail_url, user=self.user)
         contact_form = response.pyquery("#contact-form")
 
-        self.assertFalse(response.context["case"]["contact_moments_enabled"])
+        self.assertFalse(response.context["case"]["contact_form_enabled"])
+        self.assertFalse(contact_form)
+
+    def test_no_form_shown_if_contact_form_disabled(self, m):
+        self._setUpMocks(m)
+
+        CatalogusConfig.objects.all().delete()
+        self.zaak_type_config.delete()
+
+        ZaakTypeConfigFactory(
+            catalogus__url=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            identificatie=self.zaaktype["identificatie"],
+            contact_form_enabled=False,
+        )
+
+        response = self.app.get(self.case_detail_url, user=self.user)
+        contact_form = response.pyquery("#contact-form")
+
+        self.assertFalse(response.context["case"]["contact_form_enabled"])
         self.assertFalse(contact_form)
diff --git a/src/open_inwoner/cms/cases/tests/test_htmx.py b/src/open_inwoner/cms/cases/tests/test_htmx.py
index 19dfa75141..3a58e80a09 100644
--- a/src/open_inwoner/cms/cases/tests/test_htmx.py
+++ b/src/open_inwoner/cms/cases/tests/test_htmx.py
@@ -236,11 +236,11 @@ def setUp(self) -> None:
             contactmoment=self.contactmoment["url"],
         )
 
-        # enable upload and contact moments
+        # enable upload and contact form
         zaak_type_config = ZaakTypeConfigFactory(
             catalogus__url=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
             identificatie=self.zaaktype["identificatie"],
-            contact_moments_enabled=True,
+            contact_form_enabled=True,
         )
         ZaakTypeInformatieObjectTypeConfigFactory(
             zaaktype_config=zaak_type_config,
@@ -268,23 +268,6 @@ def _setUpMocks(self, m):
         ]:
             self.matchers.append(m.get(resource["url"], json=resource))
 
-        self.contact_moment_matchers = [
-            m.get(
-                f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn=900222086",
-                json=paginated_response([self.klant]),
-            ),
-            m.post(
-                f"{CONTACTMOMENTEN_ROOT}contactmomenten",
-                json=self.contactmoment,
-                status_code=201,
-            ),
-            m.post(
-                f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten",
-                json=self.klant_contactmoment,
-                status_code=201,
-            ),
-        ]
-
         self.matchers += [
             m.get(
                 f"{ZAKEN_ROOT}zaken?rol__betrokkeneIdentificatie__natuurlijkPersoon__inpBsn={self.user.bsn}&maximaleVertrouwelijkheidaanduiding=beperkt_openbaar",
@@ -336,6 +319,20 @@ def _setUpMocks(self, m):
                 self.uploaded_informatie_object["inhoud"],
                 content=self.uploaded_zaak_informatie_object_content,
             ),
+            m.get(
+                f"{KLANTEN_ROOT}klanten?subjectNatuurlijkPersoon__inpBsn=900222086",
+                json=paginated_response([self.klant]),
+            ),
+            m.post(
+                f"{CONTACTMOMENTEN_ROOT}contactmomenten",
+                json=self.contactmoment,
+                status_code=201,
+            ),
+            m.post(
+                f"{CONTACTMOMENTEN_ROOT}klantcontactmomenten",
+                json=self.klant_contactmoment,
+                status_code=201,
+            ),
         ]
 
     def test_cases(self, m):
diff --git a/src/open_inwoner/cms/cases/views/status.py b/src/open_inwoner/cms/cases/views/status.py
index 718f23d347..ef15e99695 100644
--- a/src/open_inwoner/cms/cases/views/status.py
+++ b/src/open_inwoner/cms/cases/views/status.py
@@ -159,10 +159,10 @@ def get_context_data(self, **kwargs):
             context["case"].update(self.get_upload_info_context(self.case))
             context["anchors"] = self.get_anchors(statuses, documents)
             context["contact_form"] = self.contact_form_class()
-            context["hxpost_contact_form"] = reverse(
+            context["hxpost_contact_action"] = reverse(
                 "cases:case_detail_contact_form", kwargs=self.kwargs
             )
-            context["hxpost_document_form"] = reverse(
+            context["hxpost_document_action"] = reverse(
                 "cases:case_detail_document_form", kwargs=self.kwargs
             )
         else:
@@ -184,7 +184,7 @@ def get_upload_info_context(self, case: Zaak):
         case_type_config_description = ""
         external_upload_enabled = False
         external_upload_url = ""
-        contact_moments_enabled = False
+        contact_form_enabled = False
 
         try:
             ztc = ZaakTypeConfig.objects.filter_case_type(case.zaaktype).get()
@@ -192,7 +192,7 @@ def get_upload_info_context(self, case: Zaak):
             pass
         else:
             case_type_config_description = ztc.description
-            contact_moments_enabled = ztc.contact_moments_enabled
+            contact_form_enabled = ztc.contact_form_enabled
             if ztc.document_upload_enabled and ztc.external_document_upload_url != "":
                 external_upload_url = ztc.external_document_upload_url
                 external_upload_enabled = True
@@ -202,8 +202,8 @@ def get_upload_info_context(self, case: Zaak):
             "internal_upload_enabled": internal_upload_enabled,
             "external_upload_enabled": external_upload_enabled,
             "external_upload_url": external_upload_url,
-            "contact_moments_enabled": (
-                contact_moments_enabled and open_klant_config.has_api_configuration()
+            "contact_form_enabled": (
+                contact_form_enabled and open_klant_config.has_api_configuration()
             ),
         }
 
@@ -402,13 +402,13 @@ def get_success_url(self):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["hxpost_document_form"] = reverse(
+        context["hxpost_document_action"] = reverse(
             "cases:case_detail_document_form", kwargs=self.kwargs
         )
         return context
 
 
-class CaseContactFormView(CaseAccessMixin, LogMixin, FormView):
+class CaseContactFormView(CaseAccessMixin, CaseLogMixin, FormView):
     template_name = "pages/cases/contact_form.html"
     form_class = CaseContactForm
 
@@ -416,7 +416,7 @@ def post(self, request, *args, **kwargs):
         form = self.get_form()
         if form.is_valid():
             form.cleaned_data[
-                "contact_moment"
+                "question"
             ] += f"\n\nCase number: {self.case.identificatie}"
             return self.register_by_api(form)
         else:
@@ -461,10 +461,10 @@ def register_by_api(self, form):
                 )
 
         # create contact moment
-        contact_moment = form.cleaned_data["contact_moment"]
+        question = form.cleaned_data["question"]
         data = {
             "bronorganisatie": config.register_bronorganisatie_rsin,
-            "tekst": contact_moment,
+            "tekst": question,
             "type": config.register_type,
             "kanaal": "Internet",
             "medewerkerIdentificatie": {
@@ -490,7 +490,7 @@ def register_by_api(self, form):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["contact_form"] = self.get_form()
-        context["hxpost_contact_form"] = reverse(
+        context["hxpost_contact_action"] = reverse(
             "cases:case_detail_contact_form", kwargs=self.kwargs
         )
         return context
diff --git a/src/open_inwoner/js/components/cases/document_upload.js b/src/open_inwoner/js/components/cases/document_upload.js
index 382756ec1e..ac2d4c98d5 100644
--- a/src/open_inwoner/js/components/cases/document_upload.js
+++ b/src/open_inwoner/js/components/cases/document_upload.js
@@ -1,6 +1,5 @@
 export class DisableSubmitButton {
-  static documentSelector = '#document-upload'
-  static contactSelector = '#contact-form'
+  static selector = '.case-detail-form'
 
   constructor(form) {
     this.form = form
@@ -13,16 +12,7 @@ export class DisableSubmitButton {
   }
 }
 
-const caseDocumentForms = document.querySelectorAll(
-  DisableSubmitButton.documentSelector
-)
-;[...caseDocumentForms].forEach(
-  (caseDocumentForm) => new DisableSubmitButton(caseDocumentForm)
-)
-
-const caseContactForms = document.querySelectorAll(
-  DisableSubmitButton.contactSelector
-)
-;[...caseContactForms].forEach(
-  (caseContactForm) => new DisableSubmitButton(caseContactForm)
+const caseDetailForms = document.querySelectorAll(DisableSubmitButton.selector)
+;[...caseDetailForms].forEach(
+  (caseDetailForm) => new DisableSubmitButton(caseDetailForm)
 )
diff --git a/src/open_inwoner/js/components/index.js b/src/open_inwoner/js/components/index.js
index 4c6975fbca..cd869d0fea 100644
--- a/src/open_inwoner/js/components/index.js
+++ b/src/open_inwoner/js/components/index.js
@@ -43,8 +43,7 @@ htmx.config.includeIndicatorStyles = false
 const elementWrappers = [
   [Dropdown.selector, (elt) => new Dropdown(elt)],
   [CreateGumshoe.selector, (elt) => new CreateGumshoe(elt)],
-  [DisableSubmitButton.documentSelector, (elt) => new DisableSubmitButton(elt)],
-  [DisableSubmitButton.contactSelector, (elt) => new DisableSubmitButton(elt)],
+  [DisableSubmitButton.selector, (elt) => new DisableSubmitButton(elt)],
   [ShowInfo.selector, (elt) => new ShowInfo(elt)],
   [FileInputError.selector, (elt) => new FileInputError(elt)],
   [Notification.selector, (elt) => new Notification(elt)],
diff --git a/src/open_inwoner/openzaak/admin.py b/src/open_inwoner/openzaak/admin.py
index 72795f8e68..6670415215 100644
--- a/src/open_inwoner/openzaak/admin.py
+++ b/src/open_inwoner/openzaak/admin.py
@@ -166,7 +166,7 @@ class ZaakTypeConfigAdmin(admin.ModelAdmin):
         "catalogus",
         "identificatie",
         "omschrijving",
-        "contact_moments_enabled",
+        "contact_form_enabled",
         "notify_status_changes",
         "document_upload_enabled",
         "external_document_upload_url",
diff --git a/src/open_inwoner/openzaak/migrations/0020_rename_contact_moments_enabled_zaaktypeconfig_contact_form_enabled.py b/src/open_inwoner/openzaak/migrations/0020_rename_contact_moments_enabled_zaaktypeconfig_contact_form_enabled.py
new file mode 100644
index 0000000000..ad70176945
--- /dev/null
+++ b/src/open_inwoner/openzaak/migrations/0020_rename_contact_moments_enabled_zaaktypeconfig_contact_form_enabled.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.15 on 2023-06-23 07:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("openzaak", "0019_zaaktypeconfig_contact_moments_enabled"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="zaaktypeconfig",
+            old_name="contact_moments_enabled",
+            new_name="contact_form_enabled",
+        ),
+    ]
diff --git a/src/open_inwoner/openzaak/models.py b/src/open_inwoner/openzaak/models.py
index 37f5fdb0d1..9a0b3a6a50 100644
--- a/src/open_inwoner/openzaak/models.py
+++ b/src/open_inwoner/openzaak/models.py
@@ -192,7 +192,7 @@ class ZaakTypeConfig(models.Model):
     )
 
     # contact moments
-    contact_moments_enabled = models.BooleanField(
+    contact_form_enabled = models.BooleanField(
         verbose_name=_("Enable sending questions via OpenKlant API"),
         default=False,
     )
diff --git a/src/open_inwoner/openzaak/tests/test_case_detail.py b/src/open_inwoner/openzaak/tests/test_case_detail.py
index 27478a4a9d..0220311a1e 100644
--- a/src/open_inwoner/openzaak/tests/test_case_detail.py
+++ b/src/open_inwoner/openzaak/tests/test_case_detail.py
@@ -381,7 +381,7 @@ def test_status_is_retrieved_when_user_logged_in_via_digid(self, m):
                 "external_upload_enabled": False,
                 "external_upload_url": "",
                 "allowed_file_extensions": sorted(self.config.allowed_file_extensions),
-                "contact_moments_enabled": False,
+                "contact_form_enabled": False,
             },
         )
 
diff --git a/src/open_inwoner/templates/pages/cases/contact_form.html b/src/open_inwoner/templates/pages/cases/contact_form.html
index 7bc035ed23..cdb0f1c825 100644
--- a/src/open_inwoner/templates/pages/cases/contact_form.html
+++ b/src/open_inwoner/templates/pages/cases/contact_form.html
@@ -9,9 +9,9 @@ <h2 class="h2" id="contact">{% trans 'Contact' %}</h2>
     {% endblocktrans %}
 </p>
 
-{% render_form form=contact_form method="POST" id="contact-form" hxpost=hxpost_contact_form hxtarget="#cases-contact-form" %}
+{% render_form form=contact_form method="POST" id="contact-form" hxpost=hxpost_contact_action hxtarget="#cases-contact-form" extra_classes="case-detail-form" %}
     {% csrf_token %}
-    {% textarea contact_form.contact_moment %}
+    {% textarea contact_form.question %}
     <div class="form__submit">
         {% button_row %}
             {% button text=_("Vraag versturen") id="submit_contact" type="submit" primary=True name="contact_form_submit" %}
diff --git a/src/open_inwoner/templates/pages/cases/document_form.html b/src/open_inwoner/templates/pages/cases/document_form.html
index 2d0c3596c6..49ba5ef658 100644
--- a/src/open_inwoner/templates/pages/cases/document_form.html
+++ b/src/open_inwoner/templates/pages/cases/document_form.html
@@ -2,7 +2,7 @@
 
 <div class="upload-interface">
     {#  if local upload is enabled #}
-    {% render_form id="document-upload" form=form method="POST" hxencoding="multipart/form-data" hxpost=hxpost_document_form hxtarget="#form_upload" submit_text=_("Bestand uploaden") show_required=True %}
+    {% render_form id="document-upload" form=form method="POST" hxencoding="multipart/form-data" hxpost=hxpost_document_action hxtarget="#form_upload" submit_text=_("Bestand uploaden") show_required=True extra_classes="case-detail-form" %}
         {% csrf_token %}
         <div id="info_container" class="info-container form__control__info">
             <div class="upload-interface__info">
diff --git a/src/open_inwoner/templates/pages/cases/status_inner.html b/src/open_inwoner/templates/pages/cases/status_inner.html
index 8cac39c6b6..8c1b4adec9 100644
--- a/src/open_inwoner/templates/pages/cases/status_inner.html
+++ b/src/open_inwoner/templates/pages/cases/status_inner.html
@@ -68,7 +68,7 @@ <h2 class="h2">{% trans "Document toevoegen" %}</h2>
             {% endif %}            
 
             {#  Contact moment form #}
-            {% if case.contact_moments_enabled %}
+            {% if case.contact_form_enabled %}
                 <section id="cases-contact-form" class="form_contact">
                     <div id="cases-contact-form-content">
                         {% include 'pages/cases/contact_form.html' %}

From 63d23fac62b01ab8560059ff2723b9bbfd7bff3b Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Wed, 21 Jun 2023 16:40:51 +0200
Subject: [PATCH 57/60] [#1548] process PR feedback

---
 .../0062_alter_user_deactivated_on.py         | 23 +++++++++++++++++++
 src/open_inwoner/accounts/models.py           |  6 ++++-
 .../accounts/tests/test_logging.py            |  6 ++---
 .../accounts/tests/test_profile_views.py      | 16 +++++--------
 src/open_inwoner/accounts/views/profile.py    | 13 ++++++-----
 src/open_inwoner/conf/base.py                 |  2 --
 .../templates/pages/profile/me.html           |  4 ++--
 7 files changed, 46 insertions(+), 24 deletions(-)
 create mode 100644 src/open_inwoner/accounts/migrations/0062_alter_user_deactivated_on.py

diff --git a/src/open_inwoner/accounts/migrations/0062_alter_user_deactivated_on.py b/src/open_inwoner/accounts/migrations/0062_alter_user_deactivated_on.py
new file mode 100644
index 0000000000..39ea9c1c51
--- /dev/null
+++ b/src/open_inwoner/accounts/migrations/0062_alter_user_deactivated_on.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.15 on 2023-06-23 08:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0061_auto_20230612_1428"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="deactivated_on",
+            field=models.DateField(
+                blank=True,
+                help_text="This is the date the user decided to deactivate their account. This field is deprecated since user profiles are now immediately deleted.",
+                null=True,
+                verbose_name="Deactivated on",
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py
index b1467b6970..342fe0aa8e 100644
--- a/src/open_inwoner/accounts/models.py
+++ b/src/open_inwoner/accounts/models.py
@@ -144,7 +144,11 @@ class User(AbstractBaseUser, PermissionsMixin):
         verbose_name=_("Deactivated on"),
         null=True,
         blank=True,
-        help_text=_("This is the date the user decided to deactivate their account."),
+        help_text=_(
+            "This is the date the user decided to deactivate their account. "
+            "This field is deprecated since user profiles are now immediately "
+            "deleted."
+        ),
     )
     is_prepopulated = models.BooleanField(
         verbose_name=_("Prepopulated"),
diff --git a/src/open_inwoner/accounts/tests/test_logging.py b/src/open_inwoner/accounts/tests/test_logging.py
index 93ebecacbc..a2fae8f1c6 100644
--- a/src/open_inwoner/accounts/tests/test_logging.py
+++ b/src/open_inwoner/accounts/tests/test_logging.py
@@ -205,9 +205,9 @@ def test_logout_is_logged(self):
             },
         )
 
-    def test_users_deactivation_is_logged(self):
+    def test_users_deletion_is_logged(self):
         form = self.app.get(reverse("profile:detail"), user=self.user).forms[
-            "deactivate-form"
+            "delete-form"
         ]
         form.submit()
         log_entry = TimelineLog.objects.last()
@@ -218,7 +218,7 @@ def test_users_deactivation_is_logged(self):
         self.assertEqual(
             log_entry.extra_data,
             {
-                "message": _("user was deactivated via frontend"),
+                "message": _("user was deleted via frontend"),
                 "action_flag": list(LOG_ACTIONS[4]),
                 "content_object_repr": self.user.email,
             },
diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
index 85a22e26c7..3962c9a8f2 100644
--- a/src/open_inwoner/accounts/tests/test_profile_views.py
+++ b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -532,10 +532,9 @@ def test_delete_regular_user_success(self):
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check delete
-        response = response.forms["deactivate-form"].submit()
+        response = response.forms["delete-form"].submit()
         self.assertIsNone(User.objects.first())
 
         # check redirect
@@ -552,10 +551,9 @@ def test_delete_user_with_digid_login_success(self):
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check user deleted
-        response = response.forms["deactivate-form"].submit()
+        response = response.forms["delete-form"].submit()
         self.assertIsNone(User.objects.first())
 
         # check redirect
@@ -567,16 +565,15 @@ def test_delete_user_with_digid_login_success(self):
             fetch_redirect_response=True,
         )
 
-    def test_delete_regular_with_existing_plans_fail(self):
+    def test_delete_regular_user_as_plan_contact_fail(self):
         user = UserFactory()
-        PlanFactory.create(created_by=user)
+        PlanFactory.create(plan_contacts=[user])
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check user not deleted
-        response = response.forms["deactivate-form"].submit()
+        response = response.forms["delete-form"].submit()
         self.assertEqual(User.objects.first(), user)
 
         # check redirect
@@ -593,10 +590,9 @@ def test_delete_staff_user_via_frontend_does_not_work(self):
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check staff user not deleted
-        response = response.forms["deactivate-form"].submit()
+        response = response.forms["delete-form"].submit()
         self.assertEqual(User.objects.first(), user)
 
         # check redirect
diff --git a/src/open_inwoner/accounts/views/profile.py b/src/open_inwoner/accounts/views/profile.py
index 2b00756a68..d3752b9746 100644
--- a/src/open_inwoner/accounts/views/profile.py
+++ b/src/open_inwoner/accounts/views/profile.py
@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.db.models import Q
 from django.forms.forms import Form
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
@@ -108,25 +109,25 @@ def post(self, request, *args, **kwargs):
         if request.user.is_authenticated and not request.user.is_staff:
             instance = User.objects.get(id=request.user.id)
 
-            # check if there are still plans associated witht the user
-            if Plan.objects.filter(created_by=instance).exists():
+            # check if there are still plans created by or associated witht the user
+            if Plan.objects.connected(instance):
                 messages.warning(
                     request,
                     _(
-                        "You still have plans associated with your profile. "
-                        "Please delete those plans before deleting your profile."
+                        "Your profile could not be deleted because you still "
+                        "have plans associated with it."
                     ),
                 )
                 return redirect("profile:detail")
 
             # continue with delete
-            self.log_user_action(instance, _("user was deactivated via frontend"))
+            self.log_user_action(instance, _("user was deleted via frontend"))
             instance.delete()
             request.session.flush()
 
             return redirect(reverse("logout"))
         else:
-            messages.warning(request, _("Uw account kon niet worden gedeactiveerd"))
+            messages.warning(request, _("Uw account kon niet worden verwijderd"))
             return redirect("profile:detail")
 
 
diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index e09ef15678..7cd53642d7 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -734,8 +734,6 @@
 ES_MAX_SIZE = 10000
 ES_SUGGEST_SIZE = 5
 
-# Delete user after x days of inactivity
-DELETE_USER_AFTER_X_DAYS_INACTIVE = 14
 
 # django import-export
 IMPORT_EXPORT_USE_TRANSACTIONS = True
diff --git a/src/open_inwoner/templates/pages/profile/me.html b/src/open_inwoner/templates/pages/profile/me.html
index 1401501529..3406b770cd 100644
--- a/src/open_inwoner/templates/pages/profile/me.html
+++ b/src/open_inwoner/templates/pages/profile/me.html
@@ -129,9 +129,9 @@ <h1 class="h1" id="overview">{% trans "Persoonlijk overzicht" %}</h1>
     </div> {% endcomment %}
 </div>
 
-{% render_form form=form method="POST" id="deactivate-form" extra_classes="confirm" spaceless=True data_confirm_title=_("Weet u zeker dat u uw account wilt verwijderen?") data_confirm_text=_("Hiermee worden alleen uw persoonlijke voorkeuren verwijderd. U krijgt dan bijvoorbeeld geen e-mail meer van ons over wijzigingen van uw lopende zaken. Uw persoonsgegevens en uw lopende zaken zelf worden hiermee niet verwijderd.") data_confirm_cancel=_("Nee") data_confirm_default=_("Ja") %}
+{% render_form form=form method="POST" id="delete-form" extra_classes="confirm" spaceless=True data_confirm_title=_("Weet u zeker dat u uw account wilt verwijderen?") data_confirm_text=_("Hiermee worden alleen uw persoonlijke voorkeuren verwijderd. U krijgt dan bijvoorbeeld geen e-mail meer van ons over wijzigingen van uw lopende zaken. Uw persoonsgegevens en uw lopende zaken zelf worden hiermee niet verwijderd.") data_confirm_cancel=_("Nee") data_confirm_default=_("Ja") %}
     {% csrf_token %}
-    {% form_actions primary_text=_("Profiel deactiveren") primary_icon="close" transparent=True %}
+    {% form_actions primary_text=_("Profiel verwijderen") primary_icon="close" transparent=True %}
 {% endrender_form %}
 
 {% if files %}

From 4774edb570000086325f89931dbe5395a1d662f0 Mon Sep 17 00:00:00 2001
From: Paul Schilling <mail@paulschilling.de>
Date: Fri, 23 Jun 2023 09:18:45 +0200
Subject: [PATCH 58/60] [#1562] add tests for password diversity validator

---
 src/open_inwoner/accounts/tests/test_auth.py | 83 +++++++++++++++++---
 src/open_inwoner/conf/base.py                |  1 -
 src/open_inwoner/utils/validators.py         |  7 +-
 3 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/src/open_inwoner/accounts/tests/test_auth.py b/src/open_inwoner/accounts/tests/test_auth.py
index cc1e3d1bdc..ed5b5ea3f9 100644
--- a/src/open_inwoner/accounts/tests/test_auth.py
+++ b/src/open_inwoner/accounts/tests/test_auth.py
@@ -74,11 +74,11 @@ def test_registration_fails_without_filling_out_last_name(self):
 
     def test_registration_fails_with_invalid_first_name_characters(self):
         invalid_characters = '<>#/"\\,.:;'
+        register_page = self.app.get(reverse("django_registration_register"))
+        form = register_page.forms["registration-form"]
 
         for char in invalid_characters:
             with self.subTest(char=char):
-                register_page = self.app.get(reverse("django_registration_register"))
-                form = register_page.forms["registration-form"]
                 form["email"] = self.user.email
                 form["first_name"] = char
                 form["last_name"] = self.user.last_name
@@ -97,11 +97,11 @@ def test_registration_fails_with_invalid_first_name_characters(self):
 
     def test_registration_fails_with_invalid_last_name_characters(self):
         invalid_characters = '<>#/"\\,.:;'
+        register_page = self.app.get(reverse("django_registration_register"))
+        form = register_page.forms["registration-form"]
 
         for char in invalid_characters:
             with self.subTest(char=char):
-                register_page = self.app.get(reverse("django_registration_register"))
-                form = register_page.forms["registration-form"]
                 form["email"] = self.user.email
                 form["first_name"] = self.user.first_name
                 form["last_name"] = char
@@ -118,6 +118,65 @@ def test_registration_fails_with_invalid_last_name_characters(self):
                 }
                 self.assertEqual(response.context["form"].errors, expected_errors)
 
+    def test_registration_fails_uniform_password(self):
+        passwords = [
+            "lowercase123",
+            "UPPERCASE123",
+            "NODIGITS",
+            "nodigits",
+            "NoDigits",
+            "1238327879",
+        ]
+        register_page = self.app.get(reverse("django_registration_register"))
+        form = register_page.forms["registration-form"]
+
+        for password in passwords:
+            with self.subTest(password=password):
+                form["email"] = self.user.email
+                form["first_name"] = self.user.first_name
+                form["last_name"] = self.user.last_name
+                form["password1"] = password
+                form["password2"] = password
+                response = form.submit()
+                expected_errors = {
+                    "password2": [
+                        _(
+                            "Your password must contain at least 1 upper-case letter, "
+                            "1 lower-case letter, 1 digit."
+                        ),
+                    ]
+                }
+                self.assertEqual(response.context["form"].errors, expected_errors)
+
+    def test_registration_fails_with_non_diverse_password(self):
+        passwords = [
+            "pass_word-123",
+            "PASS_WORD-123",
+            "NoDigits",
+            "UPPERCASE123",
+            "lowercase123",
+        ]
+        register_page = self.app.get(reverse("django_registration_register"))
+        form = register_page.forms["registration-form"]
+
+        for password in passwords:
+            with self.subTest(password=password):
+                form["email"] = self.user.email
+                form["first_name"] = self.user.first_name
+                form["last_name"] = self.user.last_name
+                form["password1"] = password
+                form["password2"] = password
+                response = form.submit()
+                expected_errors = {
+                    "password2": [
+                        _(
+                            "Your password must contain at least 1 upper-case letter, "
+                            "1 lower-case letter, 1 digit."
+                        )
+                    ]
+                }
+                self.assertEqual(response.context["form"].errors, expected_errors)
+
     def test_registration_fails_with_case_sensitive_email(self):
         register_page = self.app.get(reverse("django_registration_register"))
         form = register_page.forms["registration-form"]
@@ -141,8 +200,8 @@ def test_registration_inactive_user(self):
         form["email"] = inactive_user.email
         form["first_name"] = "John"
         form["last_name"] = "Smith"
-        form["password1"] = "somepassword"
-        form["password2"] = "somepassword"
+        form["password1"] = "SomePassword123"
+        form["password2"] = "SomePassword123"
 
         response = form.submit()
 
@@ -170,8 +229,8 @@ def test_registration_with_invite(self):
         self.assertEqual(form["first_name"].value, contact.first_name)
         self.assertEqual(form["last_name"].value, contact.last_name)
 
-        form["password1"] = "somepassword"
-        form["password2"] = "somepassword"
+        form["password1"] = "SomePassword123"
+        form["password2"] = "SomePassword123"
 
         response = form.submit()
 
@@ -212,8 +271,8 @@ def test_invite_url_not_in_session_after_successful_registration(self):
         register_page = self.app.get(f"{self.url}?invite={invite.key}")
         form = register_page.forms["registration-form"]
 
-        form["password1"] = "somepassword"
-        form["password2"] = "somepassword"
+        form["password1"] = "SomePassword123"
+        form["password2"] = "SomePassword123"
 
         response = form.submit()
 
@@ -237,8 +296,8 @@ def test_registration_non_unique_email_different_case(self):
         form["email"] = "John@smith.com"
         form["first_name"] = "John"
         form["last_name"] = "Smith"
-        form["password1"] = "somepassword"
-        form["password2"] = "somepassword"
+        form["password1"] = "SomePassword123"
+        form["password2"] = "SomePassword123"
 
         response = form.submit()
 
diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index 51cd7eb85e..c8c64656a6 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -448,7 +448,6 @@
     },
     {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
     {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
-    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
     {"NAME": "open_inwoner.utils.validators.DiversityValidator"},
 ]
 
diff --git a/src/open_inwoner/utils/validators.py b/src/open_inwoner/utils/validators.py
index f30932d73f..7fa930049b 100644
--- a/src/open_inwoner/utils/validators.py
+++ b/src/open_inwoner/utils/validators.py
@@ -98,7 +98,12 @@ def __eq__(self, other):
 
 class DiversityValidator:
     def validate(self, password, user=None):
-        if password.isalpha or password.isupper() or password.islower():
+        if (
+            password.isupper()
+            or password.islower()
+            or password.isalpha()
+            or password.isdigit()
+        ):
             raise ValidationError(
                 _(
                     "Your password must contain at least 1 upper-case letter, "

From 6dc905a4622cce4ee3f82799916af9f4169f3c11 Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Fri, 23 Jun 2023 18:00:10 +0200
Subject: [PATCH 59/60] Bumping version

---
 README.rst                    | 2 +-
 src/open_inwoner/conf/base.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 4438021841..0e1235ba24 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ Open Inwoner
 ==================
 
 
-:Version: 1.7
+:Version: 1.8
 :Source: https://github.com/maykinmedia/open-inwoner
 :Keywords: inwoner
 :PythonVersion: 3.9
diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index 12b6c41191..89e516f5b3 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -608,7 +608,7 @@
 # SENTRY - error monitoring
 #
 SENTRY_DSN = config("SENTRY_DSN", None)
-RELEASE = "v1.7"  # get_current_version()
+RELEASE = "v1.8"  # get_current_version()
 
 PRIVATE_MEDIA_ROOT = os.path.join(BASE_DIR, "private_media")
 FILER_ROOT = os.path.join(BASE_DIR, "media", "filer")

From 5c84541331d9812940f6133c5baef77eab4b8eea Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Fri, 23 Jun 2023 18:18:48 +0200
Subject: [PATCH 60/60] Updating translations

---
 .../conf/locale/nl/LC_MESSAGES/django.mo      |  Bin 88723 -> 91445 bytes
 .../conf/locale/nl/LC_MESSAGES/django.po      | 1211 ++++++++---------
 2 files changed, 602 insertions(+), 609 deletions(-)

diff --git a/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.mo b/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.mo
index 3b2fe4d5d015b4946d35348658f92ab2b9e8aeef..066cd8b35144213969b757244463b86c459df422 100644
GIT binary patch
delta 25698
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
Pc=iJ-dvZ@_LErxcULXNQ

delta 23433
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
TeAv!a<ns+k4C>^{;Qjvqhw_=i

diff --git a/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.po b/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.po
index 33eea1d97a..61ac681150 100644
--- a/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.po
+++ b/src/open_inwoner/conf/locale/nl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-02 20:40+0200\n"
+"POT-Creation-Date: 2023-06-23 18:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,45 +30,45 @@ msgstr "Een gebruiker met dit e-mailadres bestaat al"
 msgid "Personal info"
 msgstr "Persoonlijke informatie"
 
-#: accounts/admin.py:90
+#: accounts/admin.py:83
 msgid "Permissions"
 msgstr "Permissies"
 
-#: accounts/admin.py:105
+#: accounts/admin.py:98
 msgid "Notifications"
 msgstr "Notificaties"
 
-#: accounts/admin.py:116
+#: accounts/admin.py:109
 msgid "Contacts - invites"
 msgstr "Contacten - uitnodigingen"
 
-#: accounts/admin.py:119
+#: accounts/admin.py:112
 msgid "Important dates"
 msgstr "Belangrijke datums"
 
-#: accounts/admin.py:168
+#: accounts/admin.py:161
 msgid "Mark selected actions as soft-deleted by user."
 msgstr "Markeer geselecteerde acties als soft-deleted."
 
-#: accounts/admin.py:174
+#: accounts/admin.py:167
 #, python-format
 msgid "%d actions was successfully marked as deleted."
 msgid_plural "%d stories were successfully marked as deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: accounts/admin.py:182
+#: accounts/admin.py:175
 msgid "Restore selected soft-deleted actions"
 msgstr "Herstel geselecteerde soft-deleted acties"
 
-#: accounts/admin.py:188
+#: accounts/admin.py:181
 #, python-format
 msgid "%d actions was successfully restored."
 msgid_plural "%d stories were successfully restored."
 msgstr[0] "%d actie is hersteld"
 msgstr[1] "%d acties zijn hersteld"
 
-#: accounts/admin.py:206
+#: accounts/admin.py:199
 #, python-brace-format
 msgid "<a href='{url}'>{text}</a>"
 msgstr "<a href='{url}'>{text}</a>"
@@ -93,7 +93,7 @@ msgstr "OpenId connect"
 msgid "Alle"
 msgstr "Alle"
 
-#: accounts/choices.py:19 accounts/forms.py:471 plans/forms.py:165
+#: accounts/choices.py:19 accounts/forms.py:465 plans/forms.py:165
 msgid "Contactpersoon"
 msgstr "Contactpersoon"
 
@@ -105,14 +105,18 @@ msgstr "Begeleider"
 msgid "Organisatie"
 msgstr "Organisatie"
 
-#: accounts/choices.py:30 accounts/models.py:469 accounts/views/cases.py:297
-#: accounts/views/cases.py:306 accounts/views/cases.py:517
+#: accounts/choices.py:30 accounts/models.py:473
+#: cms/cases/tests/test_htmx.py:380 cms/cases/views/status.py:75
+#: cms/cases/views/status.py:99 cms/cases/views/status.py:105
+#: cms/cases/views/status.py:273
 #: components/templates/components/Action/Actions.html:82
 #: components/templatetags/dashboard_tags.py:49
 #: components/templatetags/dashboard_tags.py:94 plans/choices.py:7
 #: plans/forms.py:141 templates/export/include/actions.html:7
 #: templates/export/profile/action_export.html:20
-#: templates/pages/cases/list.html:24 templates/pages/cases/status.html:25
+#: templates/pages/cases/list_inner.html:19
+#: templates/pages/cases/status_inner.html:31
+#: templates/pages/cases/status_outer.html:20
 #: templates/pages/plans/list.html:40
 msgid "Status"
 msgstr "Status"
@@ -139,79 +143,73 @@ msgstr "Eenmalig"
 msgid "Terugkerend"
 msgstr "Terugkerend"
 
-#: accounts/forms.py:38
+#: accounts/forms.py:32
 msgid "Code"
 msgstr ""
 
-#: accounts/forms.py:54 accounts/tests/test_auth_2fa_sms.py:98
+#: accounts/forms.py:48 accounts/tests/test_auth_2fa_sms.py:98
 msgid "De opgegeven code is ongeldig of is verlopen."
 msgstr ""
 
-#: accounts/forms.py:63
-#, fuzzy
-#| msgid "Deze account is inactief."
+#: accounts/forms.py:57
 msgid "This account is inactive."
 msgstr "Deze account is inactief."
 
-#: accounts/forms.py:70
-#, fuzzy
-#| msgid "Telefoonnummer"
+#: accounts/forms.py:64
 msgid "Mobiele telefoonnummer"
-msgstr "Telefoonnummer"
+msgstr "Mobiele telefoonnummer"
 
-#: accounts/forms.py:73
+#: accounts/forms.py:67
 msgid ""
 "Vermeld bij niet-nederlandse telefoonnummers de landcode (bijvoorbeeld: +32 "
 "1234567890)"
 msgstr ""
 
-#: accounts/forms.py:80
-#, fuzzy
-#| msgid "Het opgegeven mobiele telefoonnummer is ongeldig."
+#: accounts/forms.py:74
 msgid "Mobiele telefoonnummer bevestigen"
-msgstr "Het opgegeven mobiele telefoonnummer is ongeldig."
+msgstr "Mobiele telefoonnummer bevestigen"
 
-#: accounts/forms.py:99 accounts/tests/test_auth_2fa_sms.py:450
+#: accounts/forms.py:93 accounts/tests/test_auth_2fa_sms.py:450
 msgid "De telefoonnummers komen niet overeen."
 msgstr ""
 
-#: accounts/forms.py:105 accounts/forms.py:316 accounts/models.py:51
-#: accounts/models.py:661 pdc/models/product.py:240
+#: accounts/forms.py:99 accounts/forms.py:310 accounts/models.py:48
+#: accounts/models.py:665 pdc/models/product.py:240
 msgid "First name"
 msgstr "Voornaam"
 
-#: accounts/forms.py:106 accounts/models.py:58
+#: accounts/forms.py:100 accounts/models.py:55
 msgid "Infix"
 msgstr "Tussenvoegsel"
 
-#: accounts/forms.py:107 accounts/forms.py:319 accounts/models.py:65
-#: accounts/models.py:667 pdc/models/product.py:245
+#: accounts/forms.py:101 accounts/forms.py:313 accounts/models.py:62
+#: accounts/models.py:671 pdc/models/product.py:245
 msgid "Last name"
 msgstr "Achternaam"
 
-#: accounts/forms.py:149 accounts/forms.py:240 accounts/tests/test_auth.py:129
-#: accounts/tests/test_auth.py:782
+#: accounts/forms.py:143 accounts/forms.py:234 accounts/tests/test_auth.py:190
+#: accounts/tests/test_auth.py:843
 msgid "The user with this email already exists"
 msgstr "Een gebruiker met dit e-mailadres bestaat al"
 
-#: accounts/forms.py:151
+#: accounts/forms.py:145
 msgid "This user has been deactivated"
 msgstr "Deze gebruiker is gedeactiveerd"
 
-#: accounts/forms.py:310
+#: accounts/forms.py:304
 msgid "Type contact"
 msgstr "Soort contactpersoon"
 
-#: accounts/forms.py:321 templates/export/include/contacts.html:8
+#: accounts/forms.py:315 templates/export/include/contacts.html:8
 #: templates/export/profile/profile_export.html:10
 msgid "Email"
 msgstr "E-mail"
 
-#: accounts/forms.py:334 accounts/tests/test_contact_views.py:190
+#: accounts/forms.py:328 accounts/tests/test_contact_views.py:220
 msgid "Please enter a valid email address of a contact."
 msgstr "Vul een geldig e-mailadres in van een contactpersoon."
 
-#: accounts/forms.py:340 accounts/tests/test_contact_views.py:174
+#: accounts/forms.py:334 accounts/tests/test_contact_views.py:204
 msgid ""
 "Het ingevoerde e-mailadres komt al voor in uw contactpersonen. Pas de "
 "gegevens aan en probeer het opnieuw."
@@ -219,217 +217,205 @@ msgstr ""
 "Het ingevoerde e-mailadres komt al voor in uw contactpersonen. Pas de "
 "gegevens aan en probeer het opnieuw."
 
-#: accounts/forms.py:347 accounts/tests/test_contact_views.py:205
+#: accounts/forms.py:341 accounts/tests/test_contact_views.py:235
 msgid "The user cannot be added, their account has been deleted."
 msgstr "De gebruiker kan niet worden toegevoegd, het account is verwijderd."
 
-#: accounts/forms.py:370
+#: accounts/forms.py:364
 msgid "Is voor"
 msgstr "Is voor"
 
-#: accounts/forms.py:372
+#: accounts/forms.py:366
 msgid "Myself"
 msgstr "Mezelf"
 
-#: accounts/forms.py:409
+#: accounts/forms.py:403
 msgid "The action can not end after the plan end date"
 msgstr "De actie kan niet later eindigen dan de einddatum van het plan"
 
-#: accounts/forms.py:475
+#: accounts/forms.py:469
 msgid "Voer de naam in van uw contactpersoon"
 msgstr "Voer de naam in van uw contactpersoon"
 
-#: accounts/forms.py:481
+#: accounts/forms.py:475
 msgid "Schrijf een bericht..."
 msgstr "Schrijf een bericht..."
 
-#: accounts/forms.py:516
+#: accounts/forms.py:510
 msgid "Either message content or file should be filled in"
 msgstr "Of een bericht of een bestand moet ingevuld zijn"
 
-#: accounts/forms.py:520 accounts/tests/test_inbox_page.py:138
+#: accounts/forms.py:514 accounts/tests/test_inbox_page.py:138
 #: accounts/tests/test_inbox_start_page.py:164
-#, fuzzy
-#| msgid "Either message content or file should be filled in"
 msgid "Content should be filled in"
-msgstr "Of een bericht of een bestand moet ingevuld zijn"
+msgstr "Het berichtveld was leeg, vul een bericht in"
 
-#: accounts/forms.py:543
+#: accounts/forms.py:537
 msgid "Deadline"
 msgstr "Einddatum"
 
-#: accounts/forms.py:558
-#, fuzzy
-#| msgid "Voeg document toe"
-msgid "Titel document"
-msgstr "Voeg document toe"
-
-#: accounts/forms.py:563
-msgid "Bestand type"
-msgstr "Bestand type"
-
-#: accounts/forms.py:565 components/templates/components/File/File.html:3
-msgid "Bestand"
-msgstr "Bestand"
-
-#: accounts/models.py:45 accounts/models.py:356 accounts/models.py:408
-#: accounts/models.py:451 accounts/models.py:582 pdc/models/product.py:316
+#: accounts/models.py:42 accounts/models.py:360 accounts/models.py:412
+#: accounts/models.py:455 accounts/models.py:586 pdc/models/product.py:316
 #: plans/models.py:104
 msgid "UUID"
 msgstr "UUID"
 
-#: accounts/models.py:48
+#: accounts/models.py:45
 msgid "Unique identifier."
 msgstr "Unieke identificatie"
 
-#: accounts/models.py:72
+#: accounts/models.py:69
 msgid "Display name"
 msgstr "Roepnaam"
 
-#: accounts/models.py:78 pdc/models/organization.py:37
+#: accounts/models.py:75 pdc/models/organization.py:37
 #: pdc/models/product.py:250 pdc/models/product.py:325
 msgid "Email address"
 msgstr "E-mailadres"
 
-#: accounts/models.py:80 pdc/models/organization.py:42
+#: accounts/models.py:77 pdc/models/organization.py:42
 #: pdc/models/product.py:255 pdc/models/product.py:330
 msgid "Phonenumber"
 msgstr "Telefoonnummer"
 
-#: accounts/models.py:87 accounts/models.py:91 pdc/models/category.py:56
+#: accounts/models.py:84 accounts/models.py:88 pdc/models/category.py:56
 #: pdc/models/product.py:69
 msgid "Image"
 msgstr "Afbeelding"
 
-#: accounts/models.py:95
+#: accounts/models.py:92
 msgid "Staff status"
 msgstr "Beheerder status"
 
-#: accounts/models.py:97
+#: accounts/models.py:94
 msgid "Designates whether the user can log into this admin site."
 msgstr "Bepaalt of de gebruiker mag inloggen op de beheeromgeving."
 
-#: accounts/models.py:100 templates/export/include/contacts.html:10
+#: accounts/models.py:97 templates/export/include/contacts.html:10
 msgid "Active"
 msgstr "Actief"
 
-#: accounts/models.py:103
+#: accounts/models.py:100
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr "Bepaalt of deze gebruiker een actief account heeft."
 
-#: accounts/models.py:108
+#: accounts/models.py:105
 msgid "Contact type"
 msgstr "Contact type"
 
-#: accounts/models.py:112
+#: accounts/models.py:109
 msgid "The type of contact"
 msgstr "Soort contactpersoon"
 
-#: accounts/models.py:115
+#: accounts/models.py:112
 msgid "Date joined"
 msgstr "Datum aangemeld"
 
-#: accounts/models.py:117
+#: accounts/models.py:114
 msgid "Rsin"
 msgstr "RSIN"
 
-#: accounts/models.py:118
+#: accounts/models.py:115
 msgid "Bsn"
 msgstr "BSN"
 
-#: accounts/models.py:120
+#: accounts/models.py:117
 msgid "Login type"
 msgstr "Logintype"
 
-#: accounts/models.py:125 templates/export/profile/profile_export.html:14
+#: accounts/models.py:122 templates/export/profile/profile_export.html:14
 msgid "Birthday"
 msgstr "Geboortedatum"
 
-#: accounts/models.py:127
+#: accounts/models.py:124
 msgid "Street"
 msgstr "Straat"
 
-#: accounts/models.py:130
+#: accounts/models.py:131
 msgid "House number"
 msgstr "Huisnummer"
 
-#: accounts/models.py:133 templates/pages/profile/mydata.html:69
+#: accounts/models.py:134 templates/pages/profile/mydata.html:69
 msgid "Postcode"
 msgstr "Postcode"
 
-#: accounts/models.py:136
+#: accounts/models.py:137
 msgid "City"
 msgstr "Stad"
 
-#: accounts/models.py:139
+#: accounts/models.py:144
 msgid "Deactivated on"
 msgstr "Gedeactiveerd op"
 
-#: accounts/models.py:142
-msgid "This is the date the user decided to deactivate their account."
+#: accounts/models.py:148
+#, fuzzy
+#| msgid "This is the date the user decided to deactivate their account."
+msgid ""
+"This is the date the user decided to deactivate their account. This field is "
+"deprecated since user profiles are now immediately deleted."
 msgstr "Op deze datum is dit account gedeactiveerd."
 
-#: accounts/models.py:145
+#: accounts/models.py:154
 msgid "Prepopulated"
 msgstr "Vooringevuld"
 
-#: accounts/models.py:147
+#: accounts/models.py:156
 msgid "Indicates if fields have been prepopulated by Haal Central API."
 msgstr ""
 "Bepaalt of de velden automatisch ingevuld zijn via de Haal Centraal API"
 
-#: accounts/models.py:151
+#: accounts/models.py:160
 msgid "Selected categories"
 msgstr "Geselecteerde onderwerpen"
 
-#: accounts/models.py:156
+#: accounts/models.py:165
 msgid "OpenId Connect id"
 msgstr "OpenID Connect ID"
 
-#: accounts/models.py:163
+#: accounts/models.py:172
 msgid "Cases notifications"
 msgstr "Zaaknotificaties"
 
-#: accounts/models.py:166
+#: accounts/models.py:175
 msgid ""
 "Indicates if the user wants to receive notifications for updates concerning "
 "cases."
 msgstr "Krijg e-mailnotificaties naar aanleiding van zaakwijzigingen."
 
-#: accounts/models.py:170
+#: accounts/models.py:179
 msgid "Messages notifications"
 msgstr "Berichtnotificaties"
 
-#: accounts/models.py:173
+#: accounts/models.py:182
 msgid "Indicates if the user wants to receive notifications for new messages."
 msgstr "Krijg e-mailnotificaties bij nieuwe berichten."
 
-#: accounts/models.py:177
+#: accounts/models.py:186
 msgid "Plans notifications"
 msgstr "Samenwerkingnotificaties"
 
-#: accounts/models.py:180
+#: accounts/models.py:189
 msgid ""
 "Indicates if the user wants to receive notifications for updates concerning "
 "plans and actions."
 msgstr "Krijg e-mailnotificaties bij wijzigingen binnen een samenwerking."
 
-#: accounts/models.py:185 plans/models.py:125
+#: accounts/models.py:194 plans/models.py:125
 #: templates/export/plans/plan_export.html:26
 msgid "Contacts"
 msgstr "Contacten"
 
-#: accounts/models.py:187
+#: accounts/models.py:196
 msgid "The contacts of the specific user"
 msgstr "De contacten van deze gebruiker"
 
-#: accounts/models.py:191
+#: accounts/models.py:200
 msgid "Contacts for approval"
 msgstr "Contacten voor goedkeuring"
 
-#: accounts/models.py:195
+#: accounts/models.py:204
 msgid ""
 "User's contacts waiting for approval. This field is used for existing users "
 "in the application"
@@ -437,39 +423,39 @@ msgstr ""
 "De contactpersonen die wachten voor goedkeuring. Dit veld wordt gebruikt "
 "voor bestaande gebruikers in de applicatie."
 
-#: accounts/models.py:207
+#: accounts/models.py:216
 msgid "User"
 msgstr "Gebruiker"
 
-#: accounts/models.py:208
+#: accounts/models.py:217
 msgid "Users"
 msgstr "Gebruikers"
 
-#: accounts/models.py:261 accounts/tests/test_profile_views.py:66
+#: accounts/models.py:265 accounts/tests/test_profile_views.py:67
 msgid "U heeft geen interessegebieden aangegeven."
 msgstr "U heeft geen interessegebieden aangegeven."
 
-#: accounts/models.py:268
+#: accounts/models.py:272
 msgid "cases"
 msgstr "Mijn Aanvragen"
 
-#: accounts/models.py:270
+#: accounts/models.py:274
 msgid "messages"
 msgstr "Mijn Berichten"
 
-#: accounts/models.py:272
+#: accounts/models.py:276
 msgid "plans"
 msgstr "Samenwerken"
 
-#: accounts/models.py:274 accounts/tests/test_profile_views.py:192
+#: accounts/models.py:278 accounts/tests/test_profile_views.py:150
 msgid "You do not have any notifications enabled."
 msgstr "U heeft geen notificaties geactiveerd"
 
-#: accounts/models.py:359
+#: accounts/models.py:363
 msgid "Used as a reference in the documents api."
 msgstr "Wordt gebruikt als referentie in de documenten API."
 
-#: accounts/models.py:362 accounts/models.py:414 accounts/models.py:457
+#: accounts/models.py:366 accounts/models.py:418 accounts/models.py:461
 #: configurations/models.py:22 pdc/models/category.py:23
 #: pdc/models/neighbourhood.py:7 pdc/models/organization.py:13
 #: pdc/models/organization.py:68 pdc/models/product.py:36
@@ -482,90 +468,90 @@ msgstr "Wordt gebruikt als referentie in de documenten API."
 msgid "Name"
 msgstr "Naam"
 
-#: accounts/models.py:365
+#: accounts/models.py:369
 msgid "The name of the document"
 msgstr "De naam van het document"
 
-#: accounts/models.py:368 accounts/models.py:489 accounts/models.py:624
+#: accounts/models.py:372 accounts/models.py:493 accounts/models.py:628
 #: pdc/models/product.py:214 plans/models.py:26
 #: templates/export/include/actions.html:11
 #: templates/export/profile/action_export.html:36
 msgid "File"
 msgstr "Bestand"
 
-#: accounts/models.py:372 accounts/models.py:424 accounts/models.py:507
-#: accounts/models.py:602 accounts/models.py:679 openzaak/models.py:301
-#: openzaak/models.py:329 pdc/models/product.py:123 search/models.py:61
+#: accounts/models.py:376 accounts/models.py:428 accounts/models.py:511
+#: accounts/models.py:606 accounts/models.py:683 openzaak/models.py:307
+#: openzaak/models.py:335 pdc/models/product.py:123 search/models.py:61
 #: templates/export/plans/plan_export.html:34
 #: templates/export/profile/action_export.html:40
 msgid "Created on"
 msgstr "Aangemaakt op"
 
-#: accounts/models.py:374
+#: accounts/models.py:378
 msgid "This is the date the document was created"
 msgstr "Datum dat het bestand is aangemaakt"
 
-#: accounts/models.py:377 accounts/models.py:429 accounts/models.py:512
+#: accounts/models.py:381 accounts/models.py:433 accounts/models.py:516
 #: pdc/models/product.py:130 templates/export/plans/plan_export.html:38
 #: templates/export/profile/action_export.html:44
 msgid "Updated on"
 msgstr "Bijgewerkt op"
 
-#: accounts/models.py:379
+#: accounts/models.py:383
 msgid "This is the date when the document was last changed"
 msgstr "Datum dat het bestand is aangepast"
 
-#: accounts/models.py:383
+#: accounts/models.py:387
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: accounts/models.py:386
+#: accounts/models.py:390
 msgid "This is the user that created the document."
 msgstr "Door deze gebruiker is het document aangemaakt"
 
-#: accounts/models.py:390 accounts/models.py:525 plans/models.py:95
+#: accounts/models.py:394 accounts/models.py:529 plans/models.py:95
 #: plans/models.py:140 templates/export/plans/plan_export.html:6
 msgid "Plan"
 msgstr "Plan"
 
-#: accounts/models.py:395
+#: accounts/models.py:399
 msgid "The plan that the document belongs to. This can be left empty."
 msgstr "Het plan waar het document bij hoort. Dit veld mag leeggelaten worden."
 
-#: accounts/models.py:399
+#: accounts/models.py:403
 #: components/templates/components/Action/Actions.html:68
 msgid "Document"
 msgstr "Document"
 
-#: accounts/models.py:400
+#: accounts/models.py:404
 msgid "Documents"
 msgstr "Documenten"
 
-#: accounts/models.py:411
+#: accounts/models.py:415
 msgid "Used as a reference in the appointments api."
 msgstr "Wordt gebruikt als referentie in de afspraken API."
 
-#: accounts/models.py:417
+#: accounts/models.py:421
 msgid "The name of the appointment."
 msgstr "Naam van de afspraak"
 
-#: accounts/models.py:420
+#: accounts/models.py:424
 msgid "Appointment time"
 msgstr "Afspraaktijd"
 
-#: accounts/models.py:421
+#: accounts/models.py:425
 msgid "This is the time that the appointment is at."
 msgstr "Tijdstip van de afspraak"
 
-#: accounts/models.py:426
+#: accounts/models.py:430
 msgid "This is the date the appointment was created"
 msgstr "Datum van de afspraak"
 
-#: accounts/models.py:431
+#: accounts/models.py:435
 msgid "This is the date when the appointment was last changed"
 msgstr "Datum wanner deze afspraak voor het laatst is gewijzigd"
 
-#: accounts/models.py:435 accounts/models.py:518
+#: accounts/models.py:439 accounts/models.py:522
 #: components/templates/components/Card/DescriptionCard.html:16
 #: components/templates/components/Card/ProductCard.html:23 plans/models.py:132
 #: templates/export/plans/plan_export.html:30
@@ -574,232 +560,232 @@ msgstr "Datum wanner deze afspraak voor het laatst is gewijzigd"
 msgid "Created by"
 msgstr "Aangemaakt door"
 
-#: accounts/models.py:438
+#: accounts/models.py:442
 msgid "The person that created the appointment."
 msgstr "De persoon die de afspraak heeft aangemaakt."
 
-#: accounts/models.py:442
+#: accounts/models.py:446
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: accounts/models.py:443
+#: accounts/models.py:447
 msgid "Appointments"
 msgstr "Afspraken"
 
-#: accounts/models.py:454
+#: accounts/models.py:458
 msgid "Used as a reference in the actions api."
 msgstr "Wordt gebruikt als referentie in de acties API"
 
-#: accounts/models.py:460
+#: accounts/models.py:464
 msgid "The name of the action"
 msgstr "De naam van de actie"
 
-#: accounts/models.py:463 cms/banner/models.py:38 openzaak/models.py:178
+#: accounts/models.py:467 cms/banner/models.py:38 openzaak/models.py:178
 #: pdc/models/category.py:42 templates/export/plans/plan_export.html:18
 #: templates/export/profile/action_export.html:16
 #: templates/pages/plans/detail.html:62
 msgid "Description"
 msgstr "Omschrijving"
 
-#: accounts/models.py:466
+#: accounts/models.py:470
 msgid "The description of the action"
 msgstr "Omschrijving van de actie"
 
-#: accounts/models.py:473
+#: accounts/models.py:477
 msgid "The current status of the action"
 msgstr "Huidige status van de actie"
 
-#: accounts/models.py:476 components/templatetags/table_tags.py:102
+#: accounts/models.py:480 components/templatetags/table_tags.py:102
 #: pdc/models/organization.py:31 pdc/models/tag.py:29 plans/models.py:79
 #: templates/export/include/actions.html:8
 #: templates/export/include/contacts.html:7
 msgid "Type"
 msgstr "Type"
 
-#: accounts/models.py:480
+#: accounts/models.py:484
 msgid "The type of action that it is"
 msgstr "Type actie"
 
-#: accounts/models.py:483
+#: accounts/models.py:487
 msgid "Action end date"
 msgstr "Einddatum actie"
 
-#: accounts/models.py:484
+#: accounts/models.py:488
 msgid "This is the date that the action should be done."
 msgstr "De actie dient voor deze datum te zijn uitgevoerd"
 
-#: accounts/models.py:494
+#: accounts/models.py:498
 msgid "The document that is uploaded to the file"
 msgstr "Het document waarbij het bestand is geupload"
 
-#: accounts/models.py:501 templates/export/include/actions.html:9
+#: accounts/models.py:505 templates/export/include/actions.html:9
 #: templates/export/profile/action_export.html:28
 msgid "Is for"
 msgstr "Is voor"
 
-#: accounts/models.py:504
+#: accounts/models.py:508
 msgid "The person that needs to do this action."
 msgstr "Wie deze actie dient uit te voeren"
 
-#: accounts/models.py:509
+#: accounts/models.py:513
 msgid "This is the date the action was created"
 msgstr "Aanmaakdatum van de actie"
 
-#: accounts/models.py:514
+#: accounts/models.py:518
 msgid "This is the date when the action was last changed"
 msgstr "Wijzigingsdatum van de actie"
 
-#: accounts/models.py:521
+#: accounts/models.py:525
 msgid "The person that created the action."
 msgstr "Door deze gebruiker is de actie aangemaakt"
 
-#: accounts/models.py:530
+#: accounts/models.py:534
 msgid "The plan that the action belongs to. This can be left empty."
 msgstr "Het plan waar de actie bij hoort. Dit veld mag leeggelaten worden."
 
-#: accounts/models.py:533
+#: accounts/models.py:537
 msgid "Is soft-deleted"
 msgstr "Is soft-deleted"
 
-#: accounts/models.py:536
+#: accounts/models.py:540
 msgid "This indicates a soft-delete where an admin can restore the record."
 msgstr ""
 "Geeft aan of de record door een gebruiker als verwijderd is gemarkeerd (geen "
 "permanente verwijdering)"
 
-#: accounts/models.py:545 templates/export/profile/action_export.html:6
+#: accounts/models.py:549 templates/export/profile/action_export.html:6
 msgid "Action"
 msgstr "Actie"
 
-#: accounts/models.py:546
+#: accounts/models.py:550
 msgid "Actions"
 msgstr "Acties"
 
-#: accounts/models.py:585
+#: accounts/models.py:589
 msgid "Unique identifier"
 msgstr "Unieke identificatie"
 
-#: accounts/models.py:589
+#: accounts/models.py:593
 msgid "Sender"
 msgstr "Afzender"
 
-#: accounts/models.py:592
+#: accounts/models.py:596
 msgid "The sender of the message"
 msgstr "De afzender van het bericht"
 
-#: accounts/models.py:596
+#: accounts/models.py:600
 msgid "Receiver"
 msgstr "Ontvanger"
 
-#: accounts/models.py:599
+#: accounts/models.py:603
 msgid "The receiver of the message"
 msgstr "De ontvanger van het bericht"
 
-#: accounts/models.py:604 accounts/models.py:681
+#: accounts/models.py:608 accounts/models.py:685
 msgid "This is the date the message was created"
 msgstr "Datum dat het bericht is aangemaakt"
 
-#: accounts/models.py:607 conf/base.py:530 pdc/models/product.py:90
+#: accounts/models.py:611 conf/base.py:536 pdc/models/product.py:90
 msgid "Content"
 msgstr "Content"
 
-#: accounts/models.py:609
+#: accounts/models.py:613
 msgid "Text content of the message"
 msgstr "Tekstuele inhoud van het bericht"
 
-#: accounts/models.py:612
+#: accounts/models.py:616
 msgid "Seen"
 msgstr "Gezien"
 
-#: accounts/models.py:614
+#: accounts/models.py:618
 msgid "Boolean shows if the message was seen by the receiver"
 msgstr "Geeft aan of de ontvanger het bericht heeft gezien"
 
-#: accounts/models.py:617
+#: accounts/models.py:621
 msgid "Sent"
 msgstr "Verzonden"
 
-#: accounts/models.py:620
+#: accounts/models.py:624
 msgid "Boolean shows if the email was sent to the receiver about this message"
 msgstr "Geeft aan of de ontvanger het bericht heeft gezien"
 
-#: accounts/models.py:629
+#: accounts/models.py:633
 msgid "The file that is attached to the message"
 msgstr "Bestand wat aan het bericht is toegevoegd"
 
-#: accounts/models.py:636
+#: accounts/models.py:640
 msgid "Message"
 msgstr "Bericht"
 
-#: accounts/models.py:637
+#: accounts/models.py:641
 msgid "Messages"
 msgstr "Berichten"
 
-#: accounts/models.py:646
+#: accounts/models.py:650
 msgid "Inviter"
 msgstr "Uitnodiger"
 
-#: accounts/models.py:649
+#: accounts/models.py:653
 msgid "User who created the invite"
 msgstr "Gebruiker die de uitnodiging heeft aangemaakt"
 
-#: accounts/models.py:653
+#: accounts/models.py:657
 msgid "Invitee"
 msgstr "Uitgenodigde"
 
-#: accounts/models.py:658
+#: accounts/models.py:662
 msgid "User who received the invite"
 msgstr "Ontvanger van de uitnodiging"
 
-#: accounts/models.py:663
+#: accounts/models.py:667
 msgid "The first name of the invitee."
 msgstr "Voornaam van wie uitgenodigd wordt."
 
-#: accounts/models.py:669
+#: accounts/models.py:673
 msgid "The last name of the invitee"
 msgstr "Achternaam van wie uitgenodigd wordt."
 
-#: accounts/models.py:673
+#: accounts/models.py:677
 msgid "Invitee email"
 msgstr "E-mailadres uitgenodigde"
 
-#: accounts/models.py:674
+#: accounts/models.py:678
 msgid "The email used to send the invite"
 msgstr "Het e-mailadres waar de uitnodiging naar toe is gestuurd"
 
-#: accounts/models.py:676
+#: accounts/models.py:680
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: accounts/models.py:677
+#: accounts/models.py:681
 msgid "Key"
 msgstr "Sleutel"
 
-#: accounts/models.py:687
+#: accounts/models.py:691
 msgid "Invitation"
 msgstr "Uitnodiging"
 
-#: accounts/models.py:688
+#: accounts/models.py:692
 msgid "Invitations"
 msgstr "Uitnodigingen"
 
-#: accounts/signals.py:14 accounts/tests/test_logging.py:150
+#: accounts/signals.py:16 accounts/tests/test_logging.py:150
 msgid "user was logged in via admin page"
 msgstr "gebruiker is ingelogd via de admin pagina"
 
-#: accounts/signals.py:15 accounts/tests/test_logging.py:167
+#: accounts/signals.py:17 accounts/tests/test_logging.py:167
 msgid "user was logged in via frontend using email"
 msgstr "gebruiker is ingelogd via de voorkant met e-mailadres en wachtwoord"
 
-#: accounts/signals.py:16 accounts/tests/test_logging.py:185
+#: accounts/signals.py:18 accounts/tests/test_logging.py:185
 msgid "user was logged in via frontend using digid"
 msgstr "gebruiker is ingelogd via de voorkant met DigiD"
 
-#: accounts/signals.py:17
+#: accounts/signals.py:19
 msgid "user was logged in via frontend using OpenIdConnect"
 msgstr "gebruiker is ingelogd via de voorkant met gehulp van OpenId Connect"
 
-#: accounts/signals.py:18 accounts/tests/test_logging.py:202
+#: accounts/signals.py:20 accounts/tests/test_logging.py:202
 msgid "user was logged out"
 msgstr "gebruiker is uitgelogd"
 
@@ -871,8 +857,8 @@ msgid ""
 "Het nummer van uw mobiele telefoon is nog niet bij de Open Inwoner Platform "
 "bekend en is nodig voor toegang tot deze website."
 msgstr ""
-"Het nummer van uw mobiele telefoon is nog niet bij ons "
-"bekend en is nodig voor toegang tot deze website."
+"Het nummer van uw mobiele telefoon is nog niet bij ons bekend en is nodig "
+"voor toegang tot deze website."
 
 #: accounts/templates/registration/add_phone_number_1.html:12
 msgid "Vul alstublieft het nummer van uw mobiele telefoon in. "
@@ -886,9 +872,7 @@ msgstr ""
 "U ontvangt nadat u op <em>bevestigen</em> klikt een SMS bericht met daarin "
 "een code."
 
-
 #: accounts/templates/registration/add_phone_number_1.html:22
-#| msgid "Configuration"
 msgid "Confirm"
 msgstr "Bevestig"
 
@@ -965,7 +949,7 @@ msgstr "Account verificatie"
 #: accounts/templates/registration/verify_token.html:7
 msgid ""
 "U ontvangt binnen 1 minuut een sms-bericht op uw mobiele telefoon. Vul de "
-"code die in het bericht staat hieronder in en klik op <em>Inloggen</em>. De "
+"code die in het bericht staat hieronder in en klik op <em>Log in</em>. De "
 "code is maximaal 5 minuten geldig. Mocht het niet lukken om de code binnen "
 "deze tijd in te voeren, klik dan op <em>Verstuur nieuwe SMS</em>."
 msgstr ""
@@ -982,10 +966,10 @@ msgstr "Actie '{action}' is verwijdered."
 
 #: accounts/tests/test_action_views.py:235 accounts/views/actions.py:75
 #: accounts/views/actions.py:125 accounts/views/actions.py:240
-#: accounts/views/actions.py:331 accounts/views/contacts.py:30
-#: accounts/views/contacts.py:64 accounts/views/profile.py:45
-#: accounts/views/profile.py:122 accounts/views/profile.py:158
-#: accounts/views/profile.py:180 accounts/views/profile.py:248
+#: accounts/views/actions.py:331 accounts/views/contacts.py:31
+#: accounts/views/contacts.py:66 accounts/views/profile.py:49
+#: accounts/views/profile.py:145 accounts/views/profile.py:210
+#: accounts/views/profile.py:232 accounts/views/profile.py:300
 #: questionnaire/views.py:52 questionnaire/views.py:148
 msgid "Mijn profiel"
 msgstr "Mijn profiel"
@@ -1002,17 +986,24 @@ msgstr "Mijn acties"
 msgid "Voer een geldig e-mailadres in."
 msgstr "Voer een geldig e-mailadres in."
 
-#: accounts/tests/test_auth.py:90 accounts/tests/test_auth.py:112
-#: accounts/tests/test_auth.py:828 accounts/tests/test_auth.py:854
-#: accounts/tests/test_contact_views.py:223
-#: accounts/tests/test_contact_views.py:243
-#: accounts/tests/test_profile_views.py:287
-#: accounts/tests/test_profile_views.py:313
-#, python-brace-format
-msgid "Uw invoer bevat een ongeldig teken: {char}"
-msgstr "Uw invoer bevat een ongeldig teken: {char}"
+#: accounts/tests/test_auth.py:91 accounts/tests/test_auth.py:114
+#: accounts/tests/test_auth.py:890 accounts/tests/test_auth.py:917
+#: accounts/tests/test_contact_views.py:254
+#: accounts/tests/test_contact_views.py:275
+#: accounts/tests/test_profile_views.py:279 utils/validators.py:15
+msgid ""
+"Please make sure your input contains only valid characters (letters, "
+"numbers, apostrophe, dash, space)."
+msgstr ""
 
-#: accounts/tests/test_auth.py:282 accounts/tests/test_profile_views.py:237
+#: accounts/tests/test_auth.py:144 accounts/tests/test_auth.py:173
+#: utils/validators.py:109 utils/validators.py:116
+msgid ""
+"Your password must contain at least 1 upper-case letter, 1 lower-case "
+"letter, 1 digit."
+msgstr ""
+
+#: accounts/tests/test_auth.py:343 accounts/tests/test_profile_views.py:231
 #: pdc/tests/test_organization_location.py:31
 #: pdc/tests/test_organization_location.py:32
 #: pdc/tests/test_product_location.py:237
@@ -1020,11 +1011,11 @@ msgstr "Uw invoer bevat een ongeldig teken: {char}"
 msgid "Dit veld is vereist."
 msgstr "Dit veld is vereist."
 
-#: accounts/tests/test_auth.py:903
+#: accounts/tests/test_auth.py:966
 msgid "Deze account is inactief."
 msgstr "Deze account is inactief."
 
-#: accounts/tests/test_auth.py:915
+#: accounts/tests/test_auth.py:978
 msgid ""
 "Voer een juiste E-mailadres en wachtwoord in. Let op dat beide velden "
 "hoofdlettergevoelig zijn."
@@ -1032,18 +1023,18 @@ msgstr ""
 "Voer een juiste E-mailadres en wachtwoord in. Let op dat beide velden "
 "hoofdlettergevoelig zijn."
 
-#: accounts/tests/test_auth.py:937
+#: accounts/tests/test_auth.py:1000
 #: templates/registration/password_reset_form.html:5
 #: templates/registration/password_reset_form.html:12
 msgid "Wachtwoord opnieuw instellen"
 msgstr "Wachtwoord opnieuw instellen"
 
-#: accounts/tests/test_auth.py:947
+#: accounts/tests/test_auth.py:1010
 #, python-brace-format
 msgid "Wachtwoordherinitialisatie voor {domain}"
 msgstr "Wachtwoordherinitialisatie voor {domain}"
 
-#: accounts/tests/test_auth.py:954
+#: accounts/tests/test_auth.py:1017
 #, python-brace-format
 msgid ""
 "U ontvangt deze e-mail, omdat u een aanvraag voor opnieuw instellen van het "
@@ -1052,28 +1043,28 @@ msgstr ""
 "U ontvangt deze e-mail, omdat u een aanvraag voor opnieuw instellen van het "
 "wachtwoord voor uw account op {domain} hebt gedaan."
 
-#: accounts/tests/test_auth.py:959
+#: accounts/tests/test_auth.py:1022
 #, python-brace-format
 msgid "Uw gebruikersnaam, mocht u deze vergeten zijn: {user_email}"
 msgstr "Uw gebruikersnaam, mocht u deze vergeten zijn: {user_email}"
 
-#: accounts/tests/test_auth.py:972
+#: accounts/tests/test_auth.py:1035
 #: templates/registration/password_change_form.html:13
 #: templates/registration/password_reset_confirm.html:8
 msgid "Mijn wachtwoord wijzigen"
 msgstr "Mijn wachtwoord wijzigen"
 
-#: accounts/tests/test_auth.py:993
+#: accounts/tests/test_auth.py:1056
 #: templates/registration/password_change_form.html:5
 msgid "Wachtwoordwijziging"
 msgstr "Wachtwoordwijziging"
 
-#: accounts/tests/test_auth.py:997
+#: accounts/tests/test_auth.py:1060
 #: templates/registration/password_change_done.html:6
 msgid "Uw wachtwoord is gewijzigd."
 msgstr "Uw wachtwoord is gewijzigd."
 
-#: accounts/tests/test_auth.py:1001 accounts/tests/test_auth.py:1008
+#: accounts/tests/test_auth.py:1064 accounts/tests/test_auth.py:1071
 #: templates/pages/profile/me.html:19
 msgid "Wijzig wachtwoord"
 msgstr "Wijzig wachtwoord"
@@ -1110,6 +1101,15 @@ msgstr ""
 "er zijn geen contacten gevonden met deze filter, of u heeft nog geen "
 "contacten."
 
+#: accounts/tests/test_contact_views.py:95
+#: accounts/tests/test_contact_views.py:109
+#: accounts/tests/test_contact_views.py:121
+#: templates/pages/profile/contacts/list.html:107
+#: templates/pages/profile/contacts/list.html:122
+#: templates/pages/profile/contacts/list.html:138
+msgid "Stuur bericht"
+msgstr "Stuur bericht"
+
 #: accounts/tests/test_file_upload.py:41 accounts/tests/test_file_upload.py:119
 #: utils/forms.py:38
 msgid ""
@@ -1145,142 +1145,148 @@ msgstr "Het verstuurde bestand is leeg."
 msgid "user was created"
 msgstr "gebruikersaccount is aangemaakt"
 
-#: accounts/tests/test_logging.py:88 accounts/views/profile.py:132
+#: accounts/tests/test_logging.py:88 accounts/views/profile.py:158
 msgid "profile was modified"
 msgstr "profiel is gewijzigd"
 
-#: accounts/tests/test_logging.py:112 accounts/views/profile.py:168
+#: accounts/tests/test_logging.py:112 accounts/views/profile.py:220
 msgid "categories were modified"
 msgstr "categorieen zijn gewijzigd"
 
-#: accounts/tests/test_logging.py:133 accounts/views/profile.py:263
+#: accounts/tests/test_logging.py:133 accounts/views/profile.py:315
 msgid "users notifications were modified"
 msgstr "gebruikersnotificaties zijn gewijzigd"
 
-#: accounts/tests/test_logging.py:222 accounts/views/profile.py:104
-msgid "user was deactivated via frontend"
-msgstr "gebruikersaccount is op eigen verzoek gedeactiveerd"
+#: accounts/tests/test_logging.py:221 accounts/views/profile.py:124
+msgid "user was deleted via frontend"
+msgstr "gebruikersaccount is op eigen verzoek verwijderd"
 
-#: accounts/tests/test_logging.py:239 accounts/tests/test_logging.py:249
+#: accounts/tests/test_logging.py:238 accounts/tests/test_logging.py:248
 #: accounts/views/auth.py:33
 msgid "password was changed"
 msgstr "wachtwoord is gewijzigd"
 
-#: accounts/tests/test_logging.py:267 accounts/views/auth.py:41
+#: accounts/tests/test_logging.py:266 accounts/views/auth.py:41
 msgid "password reset was accessed"
 msgstr "wachtwoord reset is uitgevoerd"
 
-#: accounts/tests/test_logging.py:297 accounts/views/auth.py:50
+#: accounts/tests/test_logging.py:296 accounts/views/auth.py:50
 msgid "password reset was completed"
 msgstr "wachtwoordreset is uitgevoerd"
 
-#: accounts/tests/test_logging.py:326 accounts/views/invite.py:34
+#: accounts/tests/test_logging.py:325 accounts/views/invite.py:34
 msgid "invitation accepted"
 msgstr "uitnodiging is geaccepteerd"
 
-#: accounts/tests/test_logging.py:329
+#: accounts/tests/test_logging.py:328
 #, python-brace-format
 msgid "For: {invitee} (2021-10-18)"
 msgstr ""
 
-#: accounts/tests/test_logging.py:352 accounts/views/invite.py:41
+#: accounts/tests/test_logging.py:351 accounts/views/invite.py:41
 msgid "invitation expired"
 msgstr "uitnodiging verlopen"
 
-#: accounts/tests/test_logging.py:355
+#: accounts/tests/test_logging.py:354
 #, python-brace-format
 msgid "For: {invitee} (2021-09-18)"
 msgstr ""
 
-#: accounts/tests/test_logging.py:390 accounts/views/contacts.py:98
+#: accounts/tests/test_logging.py:389 accounts/views/contacts.py:100
 msgid "invite was created"
 msgstr "uitnodiging is aangemaakt"
 
-#: accounts/tests/test_logging.py:414 accounts/views/contacts.py:86
+#: accounts/tests/test_logging.py:413 accounts/views/contacts.py:88
 msgid "contact was added, pending approval"
 msgstr "contact is toegevoegd, wacht op goedkeuring"
 
-#: accounts/tests/test_logging.py:434 accounts/views/contacts.py:149
+#: accounts/tests/test_logging.py:433 accounts/views/contacts.py:151
 msgid "contact relationship was removed"
 msgstr "contact-relatie is verwijderd"
 
-#: accounts/tests/test_logging.py:464 accounts/tests/test_logging.py:694
+#: accounts/tests/test_logging.py:463 accounts/tests/test_logging.py:693
 #: accounts/views/actions.py:310 accounts/views/document.py:28
 #: accounts/views/inbox.py:266 plans/tests/test_logging.py:153
 msgid "file was downloaded"
 msgstr "bestand is gedownload"
 
-#: accounts/tests/test_logging.py:485 accounts/views/documents.py:27
+#: accounts/tests/test_logging.py:484 accounts/views/documents.py:27
 msgid "file was deleted"
 msgstr "bestand is verwijderd"
 
-#: accounts/tests/test_logging.py:515 accounts/views/actions.py:256
+#: accounts/tests/test_logging.py:514 accounts/views/actions.py:256
 msgid "action was created"
 msgstr "actie is aangemaakt"
 
-#: accounts/tests/test_logging.py:541 utils/logentry.py:52 utils/logentry.py:60
+#: accounts/tests/test_logging.py:540 utils/logentry.py:52 utils/logentry.py:60
 #, python-brace-format
 msgid "{label} changed to {updated_data}."
 msgstr "{label} aangepast naar {updated_data}."
 
-#: accounts/tests/test_logging.py:572
+#: accounts/tests/test_logging.py:571
 #, python-brace-format
 msgid "{name_label} changed to {updated_name}."
 msgstr "{name_label} aangepast naar {updated_name}."
 
-#: accounts/tests/test_logging.py:575 accounts/tests/test_logging.py:608
+#: accounts/tests/test_logging.py:574 accounts/tests/test_logging.py:607
 #, python-brace-format
 msgid "{status_label} changed to {updated_status}."
 msgstr "{status_label} aangepast naar {updated_status}."
 
-#: accounts/tests/test_logging.py:645 accounts/tests/test_logging.py:670
+#: accounts/tests/test_logging.py:644 accounts/tests/test_logging.py:669
 #: accounts/views/inbox.py:167 accounts/views/inbox.py:218
 msgid "message was created"
 msgstr "bericht is aangemaakt"
 
-#: accounts/tests/test_logging.py:647 accounts/tests/test_logging.py:672
+#: accounts/tests/test_logging.py:646 accounts/tests/test_logging.py:671
 #, python-brace-format
 msgid "From: {me}, To: {other} (2021-10-18)"
 msgstr ""
 
-#: accounts/tests/test_logging.py:697
+#: accounts/tests/test_logging.py:696
 #, python-brace-format
 msgid "From: {sender}, To: {receiver} (2021-10-18)"
 msgstr ""
 
-#: accounts/tests/test_logging.py:722
+#: accounts/tests/test_logging.py:721
 msgid "file profile.pdf was exported"
 msgstr ""
 
-#: accounts/tests/test_logging.py:742
+#: accounts/tests/test_logging.py:741
 #, python-brace-format
 msgid "file action_{action_uuid}.pdf was exported"
 msgstr ""
 
-#: accounts/tests/test_logging.py:764
+#: accounts/tests/test_logging.py:763
 msgid "file actions.pdf was exported"
 msgstr "file actions.pdf was exported"
 
-#: accounts/tests/test_profile_views.py:67 accounts/views/profile.py:90
+#: accounts/tests/test_profile_views.py:68 accounts/views/profile.py:98
 msgid "U heeft nog geen contacten."
 msgstr "U heeft nog geen contacten."
 
-#: accounts/tests/test_profile_views.py:70
-#: accounts/tests/test_profile_views.py:184
+#: accounts/tests/test_profile_views.py:71
+#: accounts/tests/test_profile_views.py:142
 msgid "messages, plans"
 msgstr "Berichten, Samenwerken"
 
-#: accounts/tests/test_profile_views.py:165
-#: accounts/tests/test_profile_views.py:176
-#: accounts/tests/test_profile_views.py:180 accounts/views/profile.py:181
+#: accounts/tests/test_profile_views.py:123
+#: accounts/tests/test_profile_views.py:134
+#: accounts/tests/test_profile_views.py:138 accounts/views/profile.py:233
 #: cms/profile/cms_appconfig.py:9 templates/pages/profile/me.html:57
 #: templates/pages/profile/mydata.html:6
 msgid "Mijn gegevens"
 msgstr "Mijn Gegevens"
 
-#: accounts/tests/test_profile_views.py:480
-#: accounts/tests/test_profile_views.py:501
-#: accounts/tests/test_profile_views.py:534 accounts/views/profile.py:211
+#: accounts/tests/test_profile_views.py:161
+#: accounts/tests/test_profile_views.py:175
+#: accounts/tests/test_profile_views.py:186
+msgid "Stuur een bericht"
+msgstr "Stuur een bericht"
+
+#: accounts/tests/test_profile_views.py:649
+#: accounts/tests/test_profile_views.py:670
+#: accounts/tests/test_profile_views.py:703 accounts/views/profile.py:263
 msgid "user requests for brp data"
 msgstr "gebruiker vraagt BRP data op"
 
@@ -1301,70 +1307,6 @@ msgstr "Maak actie aan"
 msgid "History of {}"
 msgstr "Geschiedenis van {}"
 
-#: accounts/views/cases.py:65
-#, python-brace-format
-msgid "Zaak bekeken: {case}"
-msgstr "Zaak bekeken: {case}"
-
-#: accounts/views/cases.py:204 accounts/views/cases.py:229
-#: accounts/views/cases.py:256 accounts/views/cases.py:295
-#: templates/pages/cases/list.html:9 templates/pages/cases/submissions.html:9
-msgid "Mijn aanvragen"
-msgstr "Mijn aanvragen"
-
-#: accounts/views/cases.py:207 accounts/views/cases.py:219
-#: accounts/views/cases.py:244 accounts/views/cases.py:274
-msgid "Lopende aanvragen"
-msgstr "Lopende aanvragen"
-
-#: accounts/views/cases.py:218 accounts/views/cases.py:243
-#: accounts/views/cases.py:259 accounts/views/cases.py:273
-msgid "Open aanvragen"
-msgstr "Open aanvragen"
-
-#: accounts/views/cases.py:220 accounts/views/cases.py:232
-#: accounts/views/cases.py:245 accounts/views/cases.py:275
-msgid "Afgeronde aanvragen"
-msgstr "Afgeronde aanvragen"
-
-#: accounts/views/cases.py:304
-#, python-brace-format
-msgid "Status van {case}"
-msgstr "Status van {case}"
-
-#: accounts/views/cases.py:353
-msgid "No data available"
-msgstr "Geen data beschikbaar"
-
-#: accounts/views/cases.py:477
-#, python-brace-format
-msgid "Document was uploaded for {case}: {filename}"
-msgstr "Document {filename} is geupload voor {case}"
-
-#: accounts/views/cases.py:485
-#, python-brace-format
-msgid "{filename} has been successfully uploaded"
-msgstr "{filename} is succesvol geüpload"
-
-#: accounts/views/cases.py:495
-#, python-brace-format
-msgid "An error occured while uploading file {filename}"
-msgstr "Een fout is opgetreden bij het uploaden van {filename}"
-
-#: accounts/views/cases.py:514
-msgid "Gegevens"
-msgstr "Gegevens"
-
-#: accounts/views/cases.py:520 components/templatetags/dashboard_tags.py:54
-#: templates/pages/cases/status.html:31
-msgid "Documenten"
-msgstr "Documenten"
-
-#: accounts/views/cases.py:553 openzaak/tests/test_documents.py:243
-#, python-brace-format
-msgid "Document van zaak gedownload {case}: {filename}"
-msgstr "Document van zaak gedownload {case}: {filename}"
-
 #: accounts/views/contactmoments.py:79
 msgid "Onbekend"
 msgstr "Onbekend"
@@ -1372,7 +1314,7 @@ msgstr "Onbekend"
 #: accounts/views/contactmoments.py:95 accounts/views/contactmoments.py:98
 #: accounts/views/contactmoments.py:102 accounts/views/contactmoments.py:117
 #: cms/profile/cms_appconfig.py:51 templates/pages/contactmoment/list.html:9
-#: templates/pages/profile/me.html:118
+#: templates/pages/profile/me.html:120
 msgid "Mijn vragen"
 msgstr "Mijn vragen"
 
@@ -1384,32 +1326,32 @@ msgstr "Mijn vraag"
 msgid "Details"
 msgstr "Details"
 
-#: accounts/views/contactmoments.py:125
-#: components/templatetags/table_tags.py:104 conf/parts/maileditor.py:413
-#: openklant/forms.py:41 pdc/models/faq.py:26 pdc/models/faq.py:34
-#: questionnaire/admin.py:63 questionnaire/models.py:41
+#: accounts/views/contactmoments.py:125 cms/cases/forms.py:64
+#: cms/cases/tests/test_htmx.py:434 components/templatetags/table_tags.py:104
+#: conf/parts/maileditor.py:413 openklant/forms.py:43 pdc/models/faq.py:26
+#: pdc/models/faq.py:34 questionnaire/admin.py:63 questionnaire/models.py:41
 msgid "Vraag"
 msgstr "Vraag"
 
-#: accounts/views/contacts.py:31 accounts/views/contacts.py:65
+#: accounts/views/contacts.py:32 accounts/views/contacts.py:67
 #: templates/pages/profile/contacts/list.html:7
 msgid "Mijn contacten"
 msgstr "Mijn contacten"
 
-#: accounts/views/contacts.py:67
+#: accounts/views/contacts.py:69
 msgid "Maak contact aan"
 msgstr "Maak contact aan"
 
-#: accounts/views/contacts.py:106
+#: accounts/views/contacts.py:108
 #, python-brace-format
 msgid "{contact} is toegevoegd aan uw contactpersonen."
 msgstr "{contact} is toegevoegd aan uw contactpersonen."
 
-#: accounts/views/contacts.py:180
+#: accounts/views/contacts.py:182
 msgid "contact was approved"
 msgstr "contact is goedgekeurd"
 
-#: accounts/views/contacts.py:184
+#: accounts/views/contacts.py:186
 msgid "contact was rejected"
 msgstr "contact is geweigerd"
 
@@ -1449,24 +1391,24 @@ msgstr ""
 "Probeer het nogmaals. Mocht het inloggen na meerdere pogingen niet werken, "
 "neem dan contact met ons op."
 
-#: accounts/views/profile.py:53 templates/pages/profile/me.html:10
+#: accounts/views/profile.py:57 templates/pages/profile/me.html:10
 msgid "Persoonlijke gegevens"
 msgstr "Persoonlijke gegevens"
 
-#: accounts/views/profile.py:54 templates/pages/profile/me.html:52
+#: accounts/views/profile.py:58 templates/pages/profile/me.html:52
 msgid "Persoonlijk overzicht"
 msgstr "Persoonlijk overzicht"
 
-#: accounts/views/profile.py:55 pdc/views.py:194 plans/views.py:219
+#: accounts/views/profile.py:63 pdc/views.py:194 plans/views.py:219
 #: templates/export/plans/plan_export.html:44
 #: templates/export/profile/profile_export.html:52
 #: templates/pages/plans/detail.html:68 templates/pages/product/detail.html:46
-#: templates/pages/profile/me.html:137
+#: templates/pages/profile/me.html:139
 #: templates/pages/questionnaire/questionnaire-step.html:49
 msgid "Bestanden"
 msgstr "Bestanden"
 
-#: accounts/views/profile.py:76
+#: accounts/views/profile.py:84
 msgid ""
 "{Action.objects.visible().connected(self.request.user)."
 "filter(status=StatusChoices.open).count()} acties staan open."
@@ -1474,21 +1416,32 @@ msgstr ""
 "{Action.objects.connected(self.request.user).filter(status=StatusChoices."
 "open).count()} acties staan open."
 
-#: accounts/views/profile.py:107
-msgid "Uw account kon niet worden gedeactiveerd"
-msgstr "Uw account kon niet worden gedeactiveerd."
+#: accounts/views/profile.py:117
+msgid ""
+"Your profile could not be deleted because you still have plans associated "
+"with it."
+msgstr ""
+
+#: accounts/views/profile.py:130
+msgid "Uw account kon niet worden verwijderd"
+msgstr "Uw account kon niet worden verwijderd"
 
-#: accounts/views/profile.py:123
+#: accounts/views/profile.py:146
 msgid "Bewerk profiel"
 msgstr "Bewerk profiel"
 
-#: accounts/views/profile.py:159
+#: accounts/views/profile.py:157 accounts/views/profile.py:219
+#: accounts/views/profile.py:314
+msgid "Uw wijzigingen zijn opgeslagen"
+msgstr "Uw wijzigingen zijn opgeslagen"
+
+#: accounts/views/profile.py:211
 msgid "Mijn onderwerpen"
 msgstr "Mijn onderwerpen"
 
-#: accounts/views/profile.py:249 cms/profile/cms_appconfig.py:46
+#: accounts/views/profile.py:301 cms/profile/cms_appconfig.py:46
 #: templates/export/profile/profile_export.html:38
-#: templates/pages/profile/me.html:111
+#: templates/pages/profile/me.html:113
 #: templates/pages/profile/notifications.html:6
 msgid "Communicatievoorkeuren"
 msgstr "Communicatievoorkeuren"
@@ -1510,16 +1463,12 @@ msgid "List of available options"
 msgstr "Lijst van beschikbare opties"
 
 #: cms/banner/cms_plugins.py:14
-#, fuzzy
-#| msgid "Banner image"
 msgid "Banner Image Plugin"
-msgstr "Bannerafbeelding"
+msgstr "Bannerafbeelding plugin"
 
-#: cms/banner/cms_plugins.py:22
-#, fuzzy
-#| msgid "Categories Plugin"
+#: cms/banner/cms_plugins.py:23
 msgid "Banner Text Plugin"
-msgstr "Onderwerpen Plugin"
+msgstr "Bannertext plugin"
 
 #: cms/banner/models.py:12 cms/banner/models.py:14
 msgid "Banner image"
@@ -1544,21 +1493,131 @@ msgid "Title"
 msgstr "Titel"
 
 #: cms/banner/models.py:35
-#, fuzzy
-#| msgid "The title of the plan"
 msgid "The title of the text block"
-msgstr "De titel van het plan"
+msgstr "De titel van het tekstblok"
 
 #: cms/banner/models.py:41
-#, fuzzy
-#| msgid "The description of the action"
 msgid "The description of the text block"
-msgstr "Omschrijving van de actie"
+msgstr "De omschrijving van het tekstblok"
 
 #: cms/cases/cms_apps.py:10
 msgid "ZGW Application"
 msgstr "Mijn Aanvragen app"
 
+#: cms/cases/forms.py:16 cms/cases/tests/test_htmx.py:407
+msgid "Titel bestand"
+msgstr "Titel bestand"
+
+#: cms/cases/forms.py:21
+msgid "Bestand type"
+msgstr "Bestand type"
+
+#: cms/cases/forms.py:23 components/templates/components/File/File.html:3
+msgid "Bestand"
+msgstr "Bestand"
+
+#: cms/cases/tests/test_htmx.py:348 cms/cases/tests/test_htmx.py:376
+#: components/templates/components/AnchorMenu/AnchorMenu.html:3
+msgid "Secundaire paginanavigatie"
+msgstr "Secundaire paginanavigatie"
+
+#: cms/cases/tests/test_htmx.py:351 cms/cases/views/cases.py:28
+#: cms/cases/views/cases.py:59 cms/cases/views/cases.py:84
+#: cms/cases/views/cases.py:113 cms/cases/views/submissions.py:25
+#: cms/cases/views/submissions.py:29 cms/cases/views/submissions.py:55
+#: cms/cases/views/submissions.py:63
+msgid "Open aanvragen"
+msgstr "Open aanvragen"
+
+#: cms/cases/tests/test_htmx.py:353 cms/cases/views/cases.py:24
+#: cms/cases/views/cases.py:29 cms/cases/views/cases.py:48
+#: cms/cases/views/cases.py:60 cms/cases/views/cases.py:85
+#: cms/cases/views/cases.py:114 cms/cases/views/submissions.py:30
+#: cms/cases/views/submissions.py:64
+msgid "Lopende aanvragen"
+msgstr "Lopende aanvragen"
+
+#: cms/cases/tests/test_htmx.py:356 cms/cases/views/cases.py:30
+#: cms/cases/views/cases.py:61 cms/cases/views/cases.py:80
+#: cms/cases/views/cases.py:86 cms/cases/views/cases.py:102
+#: cms/cases/views/cases.py:115 cms/cases/views/submissions.py:31
+#: cms/cases/views/submissions.py:65
+msgid "Afgeronde aanvragen"
+msgstr "Afgeronde aanvragen"
+
+#: cms/cases/tests/test_htmx.py:379 cms/cases/views/status.py:270
+msgid "Gegevens"
+msgstr "Gegevens"
+
+#: cms/cases/tests/test_htmx.py:381 cms/cases/views/status.py:276
+#: components/templatetags/dashboard_tags.py:54
+#: templates/pages/cases/status_inner.html:37
+msgid "Documenten"
+msgstr "Documenten"
+
+#: cms/cases/tests/test_htmx.py:395 templates/pages/cases/document_form.html:28
+msgid "Document selecteren"
+msgstr "Document selecteren"
+
+#: cms/cases/tests/test_htmx.py:404 templates/pages/cases/document_form.html:31
+#: templates/pages/cases/status_inner.html:42
+#: templates/pages/cases/status_inner.html:66
+msgid "Document uploaden"
+msgstr "Document uploaden"
+
+#: cms/cases/tests/test_htmx.py:439 templates/pages/cases/contact_form.html:17
+msgid "Vraag versturen"
+msgstr "Vraag versturen"
+
+#: cms/cases/tests/test_htmx.py:447 cms/cases/views/status.py:478
+#: openklant/tests/test_contactform.py:224
+#: openklant/tests/test_contactform.py:270
+#: openklant/tests/test_contactform.py:341
+#: openklant/tests/test_contactform.py:416 openklant/views/contactform.py:62
+msgid "Vraag verstuurd!"
+msgstr ""
+
+#: cms/cases/views/cases.py:21 cms/cases/views/cases.py:77
+#: cms/cases/views/status.py:73 cms/cases/views/status.py:97
+#: cms/cases/views/submissions.py:22 cms/cases/views/submissions.py:52
+#: templates/pages/cases/list_outer.html:10
+#: templates/pages/cases/submissions_outer.html:11
+msgid "Mijn aanvragen"
+msgstr "Mijn aanvragen"
+
+#: cms/cases/views/mixins.py:34
+#, python-brace-format
+msgid "Zaak bekeken: {case}"
+msgstr "Zaak bekeken: {case}"
+
+#: cms/cases/views/status.py:153
+msgid "No data available"
+msgstr "Geen data beschikbaar"
+
+#: cms/cases/views/status.py:309 openzaak/tests/test_documents.py:243
+#, python-brace-format
+msgid "Document van zaak gedownload {case}: {filename}"
+msgstr "Document van zaak gedownload {case}: {filename}"
+
+#: cms/cases/views/status.py:361
+#, python-brace-format
+msgid "Document was uploaded for {case}: {filename}"
+msgstr "Document {filename} is geupload voor {case}"
+
+#: cms/cases/views/status.py:369
+#, python-brace-format
+msgid "{filename} has been successfully uploaded"
+msgstr "{filename} is succesvol geüpload"
+
+#: cms/cases/views/status.py:384
+#, python-brace-format
+msgid "An error occured while uploading file {filename}"
+msgstr "Een fout is opgetreden bij het uploaden van {filename}"
+
+#: cms/cases/views/status.py:482 openklant/views/contactform.py:68
+msgid "Probleem bij versturen van de vraag."
+msgstr ""
+
 #: cms/collaborate/cms_apps.py:10
 msgid "Collaborate Application"
 msgstr "Samenwerken app"
@@ -1646,7 +1705,7 @@ msgid "Products Application"
 msgstr "Producten app"
 
 #: cms/products/cms_plugins.py:15 cms/products/cms_plugins.py:48
-#: cms/products/cms_plugins.py:62 cms/products/cms_plugins.py:75
+#: cms/products/cms_plugins.py:63 cms/products/cms_plugins.py:77
 msgid "PDC"
 msgstr "PDC"
 
@@ -1658,11 +1717,11 @@ msgstr "Onderwerpen Plugin"
 msgid "Questionnaire Plugin"
 msgstr "Vragenlijst Plugin"
 
-#: cms/products/cms_plugins.py:63
+#: cms/products/cms_plugins.py:64
 msgid "Product Finder Plugin"
 msgstr "Productzoeker Plugin"
 
-#: cms/products/cms_plugins.py:76
+#: cms/products/cms_plugins.py:78
 msgid "Product Location Plugin"
 msgstr "Productlocatie Plugin"
 
@@ -1692,7 +1751,7 @@ msgstr "Begeleiders"
 msgid "Designates whether 'mentors' section is rendered or not."
 msgstr "Bepaalt of de 'begeleider' sectie getoond wordt."
 
-#: cms/profile/cms_appconfig.py:28 templates/pages/profile/me.html:87
+#: cms/profile/cms_appconfig.py:28 templates/pages/profile/me.html:89
 msgid "Mijn netwerkcontacten"
 msgstr "Mijn contacten"
 
@@ -1702,7 +1761,7 @@ msgstr "Bepaalt of de 'contacten' sectie getoond wordt."
 
 #: cms/profile/cms_appconfig.py:33 questionnaire/views.py:53
 #: questionnaire/views.py:56 questionnaire/views.py:149
-#: questionnaire/views.py:152 templates/pages/profile/me.html:95
+#: questionnaire/views.py:152 templates/pages/profile/me.html:97
 msgid "Zelfdiagnose"
 msgstr "Zelftest"
 
@@ -1713,7 +1772,7 @@ msgstr "Bepaalt of de 'zelftest' sectie getoond wordt."
 #: cms/profile/cms_appconfig.py:38 plans/views.py:220
 #: templates/export/plans/plan_export.html:49
 #: templates/export/profile/profile_export.html:48
-#: templates/pages/plans/detail.html:79 templates/pages/profile/me.html:103
+#: templates/pages/plans/detail.html:79 templates/pages/profile/me.html:105
 msgid "Acties"
 msgstr "Acties"
 
@@ -1730,10 +1789,8 @@ msgid "Designates whether 'notifications' section is rendered or not."
 msgstr "Bepaalt of de 'notificaties' sectie getoond wordt."
 
 #: cms/profile/cms_appconfig.py:53
-#, fuzzy
-#| msgid "Designates whether 'mentors' section is rendered or not."
 msgid "Designates whether 'questions' section is rendered or not."
-msgstr "Bepaalt of de 'begeleider' sectie getoond wordt."
+msgstr "Bepaalt of de 'vragen' sectie getoond wordt."
 
 #: cms/profile/cms_apps.py:12
 msgid "Profile Application"
@@ -1777,21 +1834,21 @@ msgstr "Weet je het zeker dat je deze actie wilt verwijderen?"
 
 #: components/templates/components/Action/Actions.html:38
 #: components/templates/components/File/File.html:35 pdc/choices.py:8
-#: templates/pages/profile/contacts/list.html:137
-#: templates/pages/profile/me.html:131
+#: templates/pages/profile/contacts/list.html:144
+#: templates/pages/profile/me.html:133
 msgid "Nee"
 msgstr "Nee"
 
 #: components/templates/components/Action/Actions.html:38
 #: components/templates/components/File/File.html:35 pdc/choices.py:7
-#: templates/pages/profile/contacts/list.html:137
-#: templates/pages/profile/me.html:131
+#: templates/pages/profile/contacts/list.html:144
+#: templates/pages/profile/me.html:133
 msgid "Ja"
 msgstr "Ja"
 
 #: components/templates/components/Action/Actions.html:40
 #: components/templates/components/File/File.html:37
-#: templates/pages/profile/contacts/list.html:139
+#: templates/pages/profile/contacts/list.html:146
 msgid "Verwijderen"
 msgstr "Verwijderen"
 
@@ -1822,10 +1879,6 @@ msgid ""
 msgstr ""
 "er zijn geen acties gevonden met de huidige filters of er zijn geen acties"
 
-#: components/templates/components/AnchorMenu/AnchorMenu.html:3
-msgid "Secundaire paginanavigatie"
-msgstr "Secundaire paginanavigatie"
-
 #: components/templates/components/AnchorMenu/AnchorMenu.html:6
 msgid "Op deze pagina"
 msgstr "Op deze pagina"
@@ -1845,16 +1898,17 @@ msgstr "Aanvraag starten"
 msgid "Einddatum"
 msgstr "Einddatum"
 
-#: components/templates/components/Contact/ContactForm.html:5
+#: components/templates/components/Contact/ContactForm.html:8
+#: components/templates/components/Contact/ContactForm.html:27
 #: components/templates/components/Messages/Messages.html:68
 #: components/templatetags/form_tags.py:137
-#: templates/pages/plans/create.html:70 templates/pages/plans/edit.html:17
+#: templates/pages/plans/create.html:71 templates/pages/plans/edit.html:17
 #: templates/pages/plans/goal_edit.html:14
 msgid "Verzenden"
 msgstr "Verzenden"
 
-#: components/templates/components/Contact/ContactForm.html:7
-#: openklant/tests/test_contactform.py:68
+#: components/templates/components/Contact/ContactForm.html:31
+#: openklant/tests/test_contactform.py:79
 msgid "Contact formulier niet geconfigureerd."
 msgstr ""
 
@@ -1902,16 +1956,15 @@ msgstr "Datum"
 msgid "Download bestand"
 msgstr "Download bestand"
 
-#: components/templates/components/Footer/Footer.html:24
+#: components/templates/components/Footer/Footer.html:25
 msgid "Bekijk op Google Maps"
 msgstr "Bekijk op Google Maps"
 
-#: components/templates/components/Footer/Footer.html:39
-#: openklant/views/contactform.py:31 openklant/views/contactform.py:34
-#, fuzzy
-#| msgid "Contacts for approval"
+#: components/templates/components/Footer/Footer.html:41
+#: openklant/tests/test_contactform.py:112 openklant/views/contactform.py:26
+#: openklant/views/contactform.py:29
 msgid "Contact formulier"
-msgstr "Contacten voor goedkeuring"
+msgstr "Contactformulier"
 
 #: components/templates/components/Footer/Social.html:4
 msgid "Delen"
@@ -1933,7 +1986,7 @@ msgstr "Whatsapp"
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: components/templates/components/Form/Form.html:32
+#: components/templates/components/Form/Form.html:35
 #, python-format
 msgid "Velden gemarkeerd met een sterretje %(star)s zijn verplicht"
 msgstr ""
@@ -1984,7 +2037,7 @@ msgstr "Uitleg over de huidige pagina"
 
 #: components/templates/components/Header/AccessibilityHeader.html:39
 #: components/templates/components/Header/Header.html:12
-#: templates/pages/plans/create.html:52 templates/pages/plans/create.html:57
+#: templates/pages/plans/create.html:53 templates/pages/plans/create.html:58
 msgid "Sluiten"
 msgstr "Sluiten"
 
@@ -2035,7 +2088,7 @@ msgid "Bericht van:"
 msgstr "Bericht van:"
 
 #: components/templates/components/Messages/Message.html:4
-#: templates/pages/contactmoment/list.html:23 utils/admin.py:133
+#: templates/pages/contactmoment/list.html:26 utils/admin.py:133
 msgid "Bericht"
 msgstr "Bericht"
 
@@ -2085,13 +2138,13 @@ msgid "Aanvraag"
 msgstr "Aanvraag"
 
 #: components/templatetags/dashboard_tags.py:84
-#: templates/pages/cases/list.html:25
-#: templates/pages/contactmoment/list.html:18
+#: templates/pages/cases/list_inner.html:20
+#: templates/pages/contactmoment/list.html:21
 msgid "Ontvangstdatum"
 msgstr "Ontvangstdatum"
 
 #: components/templatetags/dashboard_tags.py:89
-#: templates/pages/contactmoment/list.html:19
+#: templates/pages/contactmoment/list.html:22
 msgid "Contactwijze"
 msgstr "Contactwijze"
 
@@ -2129,8 +2182,8 @@ msgid "Identificatie"
 msgstr "Identificatie"
 
 #: components/templatetags/table_tags.py:103 conf/parts/maileditor.py:397
-#: openklant/forms.py:11 openklant/models.py:83
-#: templates/pages/contactmoment/list.html:21
+#: openklant/forms.py:12 openklant/models.py:92
+#: templates/pages/contactmoment/list.html:24
 msgid "Onderwerp"
 msgstr "Onderwerp"
 
@@ -2142,29 +2195,21 @@ msgstr "Antwoord"
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: conf/base.py:539
-#, fuzzy
-#| msgid "Banner image"
+#: conf/base.py:545
 msgid "Banner Image"
 msgstr "Bannerafbeelding"
 
-#: conf/base.py:540
-#, fuzzy
-#| msgid "Banner"
+#: conf/base.py:546
 msgid "Banner Text"
-msgstr "Banner"
+msgstr "Banner tekst"
 
-#: conf/base.py:541
-#, fuzzy
-#| msgid "Banner"
+#: conf/base.py:547
 msgid "Login Banner"
-msgstr "Banner"
+msgstr "Login Banner"
 
-#: conf/base.py:837
+#: conf/base.py:840
 #, python-brace-format
-msgid ""
-"Open Inwoner Platform Bevestigingscode: {token} (deze code is geldig voor 5 "
-"minuten)"
+msgid "Inlogcode: {token} (deze code is geldig voor 5 minuten)"
 msgstr ""
 
 #: conf/parts/maileditor.py:6
@@ -2340,26 +2385,21 @@ msgid "Contact form registration notification"
 msgstr ""
 
 #: conf/parts/maileditor.py:355
-#, fuzzy
-#| msgid ""
-#| "This email is used to remind users that there are actions that are ending "
-#| "today"
 msgid "This email is used to register a contact form submission"
 msgstr ""
-"Deze e-mail is om gebruikers te herinneren dat er acties zijn die vandaag "
-"aflopen"
+"Aan dit e-mailadres worden contactformulier inzendingen toegestuurd"
 
 #: conf/parts/maileditor.py:401 templates/pages/profile/contacts/list.html:83
 msgid "Naam"
 msgstr "Naam"
 
-#: conf/parts/maileditor.py:405 openklant/forms.py:31
+#: conf/parts/maileditor.py:405 openklant/forms.py:33
 #: templates/pages/profile/contacts/list.html:85
 #: templates/pages/profile/mydata.html:105
 msgid "E-mailadres"
 msgstr "E-mailadres"
 
-#: conf/parts/maileditor.py:409 openklant/forms.py:35
+#: conf/parts/maileditor.py:409 openklant/forms.py:37
 #: templates/pages/product/detail.html:147
 #: templates/pages/profile/contacts/list.html:86
 #: templates/pages/profile/mydata.html:101
@@ -3016,14 +3056,12 @@ msgstr ""
 "'/accounts/login', URL voorbeeld: 'https://gemeente.groningen.nl'"
 
 #: configurations/models.py:411
-#, fuzzy
-#| msgid "Allowed file extensions"
 msgid "Allow messages file sharing"
-msgstr "Toegestane bestandsextensies"
+msgstr "Sta het delen van bestanden via Mijn Berichten toe"
 
 #: configurations/models.py:413
 msgid "Whether file sharing via the messages is allowed or not"
-msgstr ""
+msgstr "Of het delen van bestanden via Mijn Berichten mogelijk is of niet. Indien uitgeschakeld dan kunnen alleen tekstberichten worden verzonden"
 
 #: configurations/models.py:417 configurations/models.py:420
 msgid "Site Configuration"
@@ -3093,22 +3131,20 @@ msgstr "Configuratie 'Haal Centraal'"
 msgid "data was retrieved from haal centraal"
 msgstr "data is opgehaald via Haal Centraal BRP"
 
-#: openklant/admin.py:28
+#: openklant/admin.py:29
 msgid ""
 "Voor registratie in de Klanten en Contactmomenten API is dit veld vereist."
 msgstr ""
 
-#: openklant/admin.py:43
-#, fuzzy
-#| msgid "Registratie"
+#: openklant/admin.py:44
 msgid "Email registratie"
-msgstr "Registratie"
+msgstr "Email registratie"
 
-#: openklant/admin.py:51
+#: openklant/admin.py:52
 msgid "Klanten en Contacten API registratie"
 msgstr ""
 
-#: openklant/admin.py:62
+#: openklant/admin.py:63
 msgid "Services"
 msgstr ""
 
@@ -3125,95 +3161,74 @@ msgstr "In behandeling"
 msgid "Afgehandeld"
 msgstr "Afgehandeld"
 
-#: openklant/forms.py:16
-#, fuzzy
-#| msgid "Voornamen"
+#: openklant/forms.py:15 openklant/tests/test_contactform.py:182
+#: openklant/tests/test_contactform.py:198
+msgid "Selecteren"
+msgstr "Selecteren"
+
+#: openklant/forms.py:18
 msgid "Voornaam"
-msgstr "Voornamen"
+msgstr "Voornaam"
 
-#: openklant/forms.py:21
+#: openklant/forms.py:23
 msgid "Tussenvoegsel"
 msgstr ""
 
-#: openklant/forms.py:26 templates/pages/profile/mydata.html:31
+#: openklant/forms.py:28 templates/pages/profile/mydata.html:31
 msgid "Achternaam"
 msgstr "Achternaam"
 
-#: openklant/forms.py:62 openklant/tests/test_contactform.py:88
-#, fuzzy
-#| msgid "Het opgegeven mobiele telefoonnummer is ongeldig."
+#: openklant/forms.py:76 openklant/tests/test_contactform.py:143
 msgid "Vul een e-mailadres of telefoonnummer in."
-msgstr "Het opgegeven mobiele telefoonnummer is ongeldig."
+msgstr "Vul een e-mailadres of telefoonnummer in."
 
-#: openklant/models.py:15
+#: openklant/models.py:22
 msgid "Klanten API"
 msgstr "Klanten API"
 
-#: openklant/models.py:24
+#: openklant/models.py:31
 msgid "Contactmomenten API"
 msgstr "Contactmomenten API"
 
-#: openklant/models.py:33
-#, fuzzy
-#| msgid "Registreren met E-mail"
+#: openklant/models.py:40
 msgid "Registreer op email adres"
-msgstr "Registreren met e-mailadres"
+msgstr "Registreer op email adres"
 
-#: openklant/models.py:37
-#, fuzzy
-#| msgid "Contactmomenten API"
+#: openklant/models.py:44
 msgid "Registreer in Contactmomenten API"
-msgstr "Contactmomenten API"
+msgstr "Registreer in Contactmomenten API"
 
-#: openklant/models.py:41
-#, fuzzy
-#| msgid "Organisatie"
+#: openklant/models.py:48
 msgid "Organisatie RSIN"
-msgstr "Organisatie"
+msgstr "Organisatie RSIN"
 
-#: openklant/models.py:47
-#, fuzzy
-#| msgid "Contact type"
+#: openklant/models.py:54
 msgid "Contactmoment type"
-msgstr "Contact type"
+msgstr "Contactmoment type"
 
-#: openklant/models.py:51
+#: openklant/models.py:58
 msgid "Naam van 'contacttype' uit e-Suite"
 msgstr ""
 
-#: openklant/models.py:54
-#, fuzzy
-#| msgid "Zaaktype identificatie"
+#: openklant/models.py:61
 msgid "Medewerker identificatie"
-msgstr "Zaaktype identificatie"
+msgstr "Medewerker identificatie"
 
-#: openklant/models.py:58
+#: openklant/models.py:65
 msgid "Gebruikersnaam van actieve medewerker uit e-Suite"
 msgstr ""
 
-#: openklant/models.py:71
+#: openklant/models.py:80
 msgid "Open Klant configuration"
 msgstr "Configuratie 'Open Klant'"
 
-#: openklant/models.py:93
+#: openklant/models.py:106
 msgid "Contact formulier onderwerp"
 msgstr ""
 
-#: openklant/models.py:94
-#, fuzzy
-#| msgid "Alle onderwerpen"
+#: openklant/models.py:107
 msgid "Contact formulier onderwerpen"
-msgstr "Alle onderwerpen"
-
-#: openklant/tests/test_contactform.py:111
-#: openklant/tests/test_contactform.py:155
-#: openklant/tests/test_contactform.py:224 openklant/views/contactform.py:26
-msgid "Vraag verstuurd!"
-msgstr ""
-
-#: openklant/views/contactform.py:27
-msgid "Probleem bij versturen van de vraag."
-msgstr ""
+msgstr "Contact formulier onderwerpen"
 
 #: openzaak/admin.py:46
 msgid "API behaviour override options"
@@ -3239,7 +3254,7 @@ msgstr ""
 "Het gebruiken van een link en een informatieobject tegelijkertijd wordt niet "
 "toegestaan. Gebruik of de link, of een informatieobject maar niet beiden."
 
-#: openzaak/admin.py:253
+#: openzaak/admin.py:254
 #, python-format
 msgid "%d zaaktype was successfully set to notify on status changes."
 msgid_plural "%d zaaktypes were successfully set to notify on status changes."
@@ -3250,7 +3265,7 @@ msgstr[1] ""
 "%d zaaktypen zijn succesvol ingesteld om bij statusveranderingen een "
 "notificatie te sturen."
 
-#: openzaak/admin.py:267
+#: openzaak/admin.py:268
 #, python-format
 msgid "%d zaaktype was successfully set to not notify on status changes."
 msgid_plural ""
@@ -3384,31 +3399,35 @@ msgstr "Document upload URL"
 msgid "Enable document upload via URL"
 msgstr "Activeer documentuploads via URL"
 
-#: openzaak/models.py:197
+#: openzaak/models.py:196
+msgid "Enable sending questions via OpenKlant API"
+msgstr "Schakel het versturen van vragen via de OpenKlant Contactmomenten API in"
+
+#: openzaak/models.py:203
 msgid "Zaaktype Configuration"
 msgstr "Zaaktype Configuratie"
 
-#: openzaak/models.py:232
+#: openzaak/models.py:238
 msgid "Information object URL"
 msgstr "Informatieobject URL"
 
-#: openzaak/models.py:236
+#: openzaak/models.py:242
 msgid "Omschrijving"
 msgstr "Omschrijving"
 
-#: openzaak/models.py:241
+#: openzaak/models.py:247
 msgid "Zaaktype UUID"
 msgstr "Zaaktype UUID"
 
-#: openzaak/models.py:249
+#: openzaak/models.py:255
 msgid "Enable document upload"
 msgstr "Activeer documentuploads"
 
-#: openzaak/models.py:253
+#: openzaak/models.py:259
 msgid "Enable document notifications"
 msgstr "Activeer documentnotificiaties"
 
-#: openzaak/models.py:256
+#: openzaak/models.py:262
 msgid ""
 "When enabled the user will receive a notification when a visible document is "
 "added to the case"
@@ -3416,69 +3435,77 @@ msgstr ""
 "Wanneer dit is ingeschakeld dan krijgen actieve gebruikers op deze omgeving "
 "een bericht wanneer er een nieuw zaakdocument voor hen beschikbaar is"
 
-#: openzaak/models.py:262
+#: openzaak/models.py:268
 msgid "Zaaktype Information Object Configuration"
 msgstr "Zaaktype Informatieobject configuratie"
 
-#: openzaak/models.py:283
+#: openzaak/models.py:289
 msgid "Information object UUID"
 msgstr "Informatieobject UUID"
 
-#: openzaak/models.py:295 openzaak/models.py:323
+#: openzaak/models.py:301 openzaak/models.py:329
 msgid "Zaak UUID"
 msgstr "Zaak UUID"
 
-#: openzaak/models.py:298
+#: openzaak/models.py:304
 msgid "Status UUID"
 msgstr "Status UUID"
 
-#: openzaak/models.py:307
+#: openzaak/models.py:313
 msgid "Open Zaak status notification record"
 msgstr "Open Zaak statusnotificatie record"
 
-#: openzaak/models.py:326
+#: openzaak/models.py:332
 msgid "InformatieObject UUID"
 msgstr "Informatieobject UUID"
 
-#: openzaak/models.py:335
+#: openzaak/models.py:341
 msgid "Open Zaak info object notification record"
 msgstr "Open Zaak informatieobject notificatie record"
 
-#: openzaak/tests/test_case_detail.py:507
-#: openzaak/tests/test_case_detail.py:517
-#: openzaak/tests/test_case_detail.py:679 templates/pages/cases/status.html:101
+#: openzaak/tests/test_case_detail.py:452
+#: openzaak/tests/test_case_detail.py:487
+#: openzaak/tests/test_case_detail.py:548 templates/pages/cases/403.html:3
+msgid "Sorry, you don't have access to this page (403)"
+msgstr "Sorry, u heeft geen toegang tot deze pagina (403)"
+
+#: openzaak/tests/test_case_detail.py:516
+#: openzaak/tests/test_case_detail.py:526
+#: openzaak/tests/test_case_detail.py:692
+#: templates/pages/cases/status_inner.html:82
 #: templates/pages/contactmoment/detail.html:19
 msgid "There is no available data at the moment."
 msgstr "Op dit moment zijn er geen aanvragen beschikbaar."
 
-#: openzaak/tests/test_case_detail.py:632
-#: openzaak/tests/test_case_detail.py:880
+#: openzaak/tests/test_case_detail.py:645
+#: openzaak/tests/test_case_detail.py:909
 msgid "some description content"
 msgstr "some description content"
 
-#: openzaak/tests/test_case_detail.py:663
+#: openzaak/tests/test_case_detail.py:676
 #, fuzzy
 #| msgid "Grootte max. 50 MB, toegestane bestandsformaten"
 msgid "Grootte max. 50 MB, toegestane document formaten:"
 msgstr "Grootte max. 50 MB, toegestane bestandsformaten"
 
-#: openzaak/tests/test_case_detail.py:724
+#: openzaak/tests/test_case_detail.py:745
 msgid "{self.uploaded_informatie_object['bestandsnaam']} is succesvol geüpload"
 msgstr ""
 "{self.uploaded_informatie_object['bestandsnaam']} is succesvol geüpload"
 
-#: openzaak/tests/test_case_detail.py:755
+#: openzaak/tests/test_case_detail.py:784
 msgid "upload.TXT is succesvol geüpload"
 msgstr "upload.TXT is succesvol geüpload"
 
-#: openzaak/tests/test_case_detail.py:857
-#: openzaak/tests/test_case_detail.py:926
-#: openzaak/tests/test_case_detail.py:949
-#: openzaak/tests/test_case_detail.py:972
+#: openzaak/tests/test_case_detail.py:886
+#: openzaak/tests/test_case_detail.py:955
+#: openzaak/tests/test_case_detail.py:978
+#: openzaak/tests/test_case_detail.py:1001
 msgid "By clicking the button below you can upload a document."
 msgstr "Via onderstaande knop kunt u een bestand toevoegen."
 
-#: openzaak/tests/test_case_detail.py:904 templates/pages/cases/status.html:90
+#: openzaak/tests/test_case_detail.py:933
+#: templates/pages/cases/status_inner.html:63
 msgid ""
 "By clicking the button below you can upload a document. This is an external "
 "link and you will be redirected to a different system."
@@ -3486,8 +3513,8 @@ msgstr ""
 "Via onderstaande knop kunt u een bestand toevoegen. U wordt doorgestuurd "
 "naar een ander systeem."
 
-#: openzaak/tests/test_case_detail.py:1002
-#: openzaak/tests/test_case_detail.py:1033
+#: openzaak/tests/test_case_detail.py:1041
+#: openzaak/tests/test_case_detail.py:1076
 msgid ""
 "Een fout is opgetreden bij het uploaden van {self."
 "uploaded_informatie_object['bestandsnaam']}"
@@ -3495,7 +3522,8 @@ msgstr ""
 "Een fout is opgetreden bij het uploaden van {self."
 "uploaded_informatie_object['bestandsnaam']}"
 
-#: openzaak/tests/test_formapi.py:103 templates/pages/cases/submissions.html:33
+#: openzaak/tests/test_formapi.py:108
+#: templates/pages/cases/submissions_inner.html:32
 msgid "Er zijn geen open aanvragen."
 msgstr "Er zijn geen open aanvragen."
 
@@ -3516,6 +3544,7 @@ msgid "categories were exported"
 msgstr "categorieen zijn geexporteerd"
 
 #: pdc/admin/organization.py:20 pdc/views.py:200 plans/models.py:98
+#: templates/pages/cases/contact_form.html:3
 #: templates/pages/product/detail.html:137
 msgid "Contact"
 msgstr "Contact"
@@ -3578,11 +3607,11 @@ msgstr ""
 "Afbeelding van het onderwerp in bannerformaat bovenaan de pagina, afmeting: "
 "bij voorkeur minimaal 1200 pixels breed en minimaal 150 pixels hoog"
 
-#: pdc/models/category.py:68 pdc/models/faq.py:14 questionnaire/models.py:99
+#: pdc/models/category.py:67 pdc/models/faq.py:14 questionnaire/models.py:99
 msgid "Category"
 msgstr "Onderwerp"
 
-#: pdc/models/category.py:69 pdc/models/product.py:97 search/forms.py:22
+#: pdc/models/category.py:68 pdc/models/product.py:97 search/forms.py:22
 msgid "Categories"
 msgstr "Onderwerpen"
 
@@ -4050,11 +4079,11 @@ msgstr "Links"
 msgid "Zie ook"
 msgstr "Zie ook"
 
-#: pdc/views.py:228 templates/pages/cases/submissions.html:17
+#: pdc/views.py:228 templates/pages/cases/submissions_inner.html:16
 msgid "Formulier"
 msgstr "Formulier"
 
-#: pdc/views.py:250 templates/pages/product/finder.html:10
+#: pdc/views.py:239 templates/pages/product/finder.html:10
 msgid "Producten"
 msgstr "Producten"
 
@@ -4263,8 +4292,8 @@ msgstr "Er zijn nog geen plannen met deze filters."
 #: plans/tests/test_views.py:1090 plans/tests/test_views.py:1112
 #: plans/tests/test_views.py:1133 plans/views.py:102 plans/views.py:196
 #: plans/views.py:244 templates/cms/collaborate/active_plans_plugin.html:4
-#: templates/pages/plans/create.html:5 templates/pages/plans/edit.html:5
-#: templates/pages/plans/file.html:5 templates/pages/plans/list.html:10
+#: templates/pages/plans/edit.html:5 templates/pages/plans/file.html:5
+#: templates/pages/plans/list.html:10
 msgid "Samenwerken"
 msgstr "Samenwerken"
 
@@ -4272,7 +4301,8 @@ msgstr "Samenwerken"
 msgid "Doelen"
 msgstr "Doelen"
 
-#: plans/views.py:245 templates/pages/plans/list.html:11
+#: plans/views.py:245 templates/pages/plans/create.html:6
+#: templates/pages/plans/list.html:11
 msgid "Start nieuwe samenwerking"
 msgstr "Start nieuwe samenwerking"
 
@@ -4469,10 +4499,8 @@ msgid "Zoek op trefwoord"
 msgstr "Zoek op trefwoord"
 
 #: search/forms.py:33
-#, fuzzy
-#| msgid "Zoeken"
 msgid "Zoeken..."
-msgstr "Zoeken"
+msgstr "Zoeken..."
 
 #: search/models.py:14
 msgid "Term"
@@ -4600,7 +4628,7 @@ msgstr "Ongelidge pagina (%(page_number)s): %(message)s"
 msgid "Sorry, the requested page could not be found (404)"
 msgstr "Sorry, de gevraagde pagina kon niet worden gevonden (404)"
 
-#: templates/404.html:6
+#: templates/404.html:6 templates/pages/cases/403.html:4
 msgid "Ga naar de home pagina"
 msgstr "Terug naar homepage"
 
@@ -4633,7 +4661,7 @@ msgstr "Hoofdafbeelding"
 msgid "Naar samenwerken"
 msgstr "Naar samenwerken"
 
-#: templates/cms/fullwidth.html:24
+#: templates/cms/fullwidth.html:34
 msgid "There is no content."
 msgstr "Deze pagina is nog leeg."
 
@@ -4692,63 +4720,56 @@ msgstr "overnemen"
 msgid "Hijack %(username)s"
 msgstr "Overname %(username)s"
 
-#: templates/master.html:48
+#: templates/master.html:52
 msgid "Terug naar boven"
 msgstr "Terug naar boven"
 
-#: templates/pages/cases/list.html:26
+#: templates/pages/cases/contact_form.html:5
+msgid ""
+"Door middel van dit formulier kunt u een vraag stellen over deze zaak. U "
+"dient ten minste uw telefoonnummer of uw e-mailadres in te vullen. Indien u "
+"uw e-mailadres invult krijgt u een bevestiging per mail."
+msgstr ""
+
+#: templates/pages/cases/document_form.html:5
+msgid "Bestand uploaden"
+msgstr "Bestand uploaden"
+
+#: templates/pages/cases/document_form.html:13
+msgid "Selecteer uw bestand opnieuw"
+msgstr "Selecteer uw bestand opnieuw"
+
+#: templates/pages/cases/list_inner.html:21
 msgid "Zaaknummer"
 msgstr "Zaaknummer"
 
-#: templates/pages/cases/list.html:30 templates/pages/cases/list.html:31
+#: templates/pages/cases/list_inner.html:25
+#: templates/pages/cases/list_inner.html:26
 msgid "Bekijk aanvraag"
 msgstr "Bekijk aanvraag"
 
-#: templates/pages/cases/status.html:36 templates/pages/cases/status.html:76
-#: templates/pages/cases/status.html:93
-#, fuzzy
-#| msgid "Document upload URL"
-msgid "Document uploaden"
-msgstr "Document upload URL"
-
-#: templates/pages/cases/status.html:41
+#: templates/pages/cases/status_inner.html:47
 #, python-format
 msgid ""
 "\n"
-"                                Grootte max. %(max_filesize)s MB, toegestane "
+"                            Grootte max. %(max_filesize)s MB, toegestane "
 "document formaten: %(allowed_extensions)s.\n"
-"                            "
+"                        "
 msgstr ""
 
-#: templates/pages/cases/status.html:50
-msgid "Bestand uploaden"
-msgstr "Bestand uploaden"
-
-#: templates/pages/cases/status.html:58
-#, fuzzy
-#| msgid "Selecteer emoji"
-msgid "Selecteer uw bestand opnieuw"
-msgstr "Selecteer emoji"
-
-#: templates/pages/cases/status.html:73
-#, fuzzy
-#| msgid "Document toevoegen"
-msgid "Document selecteren"
-msgstr "Document toevoegen"
-
-#: templates/pages/cases/status.html:86
+#: templates/pages/cases/status_inner.html:59
 msgid "Document toevoegen"
 msgstr "Document toevoegen"
 
-#: templates/pages/cases/status.html:93
+#: templates/pages/cases/status_inner.html:66
 msgid "Opens new window"
 msgstr "Opent nieuw venster"
 
-#: templates/pages/cases/submissions.html:18
+#: templates/pages/cases/submissions_inner.html:17
 msgid "Laatste wijziging"
 msgstr "Laatste wijziging"
 
-#: templates/pages/cases/submissions.html:19
+#: templates/pages/cases/submissions_inner.html:18
 msgid "Einde geldigheid"
 msgstr "Einde geldigheid"
 
@@ -4756,7 +4777,12 @@ msgstr "Einde geldigheid"
 msgid "Open in admin"
 msgstr "Bekijk in beheeromgeving"
 
-#: templates/pages/contactmoment/list.html:26
+#: templates/pages/contactform/form.html:6
+msgid "Contactformulier"
+msgstr "Contactformulier"
+
+#: templates/pages/contactmoment/list.html:31
+#: templates/pages/contactmoment/list.html:32
 msgid "Bekijk vraag"
 msgstr "Bekijk vraag"
 
@@ -4772,15 +4798,15 @@ msgstr "Datum"
 msgid "Changed by"
 msgstr "Gewijzigd door"
 
-#: templates/pages/plans/create.html:22
+#: templates/pages/plans/create.html:23
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: templates/pages/plans/create.html:23 templates/pages/plans/detail.html:58
+#: templates/pages/plans/create.html:24 templates/pages/plans/detail.html:58
 msgid "Doel"
 msgstr "Doel"
 
-#: templates/pages/plans/create.html:75
+#: templates/pages/plans/create.html:76
 msgid "Maak je eerste contact aan voordat je een samenwerking start"
 msgstr "Maak je eerste contact aan voordat je een samenwerking start"
 
@@ -4818,7 +4844,7 @@ msgstr "Reset filters"
 msgid "Openstaande acties"
 msgstr "Openstaande acties"
 
-#: templates/pages/product/detail.html:32 templates/pages/product/form.html:16
+#: templates/pages/product/detail.html:32 templates/pages/product/form.html:19
 msgid "Bewerken in de Admin"
 msgstr "Bewerken in de beheeromgeving"
 
@@ -4854,15 +4880,15 @@ msgstr "Mogelijke producten"
 msgid "There are no products available at this location."
 msgstr "Op deze locatie zijn geen producten beschikbaar."
 
-#: templates/pages/profile/actions/edit.html:8
+#: templates/pages/profile/actions/edit.html:9
 msgid "Wijzig actie"
 msgstr "Wijzig actie"
 
-#: templates/pages/profile/actions/edit.html:10
+#: templates/pages/profile/actions/edit.html:11
 msgid "Creeer actie"
 msgstr "Creëer actie"
 
-#: templates/pages/profile/actions/edit.html:27
+#: templates/pages/profile/actions/edit.html:28
 msgid "Actie opslaan"
 msgstr "Actie opslaan"
 
@@ -4871,7 +4897,7 @@ msgid "Nieuwe actie toevoegen"
 msgstr "Nieuwe actie toevoegen"
 
 #: templates/pages/profile/actions/list.html:18
-#: templates/pages/profile/contacts/list.html:151
+#: templates/pages/profile/contacts/list.html:158
 msgid "Terug naar mijn profiel"
 msgstr "Terug naar mijn profiel"
 
@@ -4938,13 +4964,7 @@ msgstr "Soort contact"
 msgid "Actief"
 msgstr "Actief"
 
-#: templates/pages/profile/contacts/list.html:106
-#: templates/pages/profile/contacts/list.html:119
-#: templates/pages/profile/contacts/list.html:132
-msgid "Stuur bericht"
-msgstr "Stuur bericht"
-
-#: templates/pages/profile/contacts/list.html:137
+#: templates/pages/profile/contacts/list.html:144
 msgid "Are you sure you want to delete this contact?"
 msgstr "Weet je zeker dat je je contact wilt verwijderen?"
 
@@ -4968,39 +4988,35 @@ msgstr "Volgende actie"
 msgid "Begeleider(s)"
 msgstr "Begeleider(s)"
 
-#: templates/pages/profile/me.html:79
+#: templates/pages/profile/me.html:81
 msgid "U heeft (nog) geen gemeentelijke begeleider."
 msgstr "U heeft geen gemeentelijke begeleider."
 
-#: templates/pages/profile/me.html:89
+#: templates/pages/profile/me.html:91
 msgid "Beheer contacten"
 msgstr "Beheer contacten"
 
-#: templates/pages/profile/me.html:97
+#: templates/pages/profile/me.html:99
 msgid "Start zelfdiagnose"
 msgstr "Start zelftest"
 
-#: templates/pages/profile/me.html:120
-#, fuzzy
-#| msgid "Bekijk aanvraag"
+#: templates/pages/profile/me.html:122
 msgid "Bekijken"
-msgstr "Bekijk aanvraag"
+msgstr "Bekijken"
 
-#: templates/pages/profile/me.html:131
-#, fuzzy
-#| msgid "Weet je het zeker dat je deze actie wilt verwijderen?"
+#: templates/pages/profile/me.html:133
 msgid "Weet u zeker dat u uw account wilt verwijderen?"
-msgstr "Weet je het zeker dat je deze actie wilt verwijderen?"
+msgstr "Weet u zeker dat u uw account wilt verwijderen?"
 
-#: templates/pages/profile/me.html:131
+#: templates/pages/profile/me.html:133
 msgid ""
 "Hiermee worden alleen uw persoonlijke voorkeuren verwijderd. U krijgt dan "
 "bijvoorbeeld geen e-mail meer van ons over wijzigingen van uw lopende zaken. "
 "Uw persoonsgegevens en uw lopende zaken zelf worden hiermee niet verwijderd."
 msgstr ""
 
-#: templates/pages/profile/me.html:133
-msgid "Profiel deactiveren"
+#: templates/pages/profile/me.html:135
+msgid "Profiel verwijderen"
 msgstr "Profiel verwijderen"
 
 #: templates/pages/profile/mydata.html:13
@@ -5296,39 +5312,16 @@ msgstr "Clear given cache only"
 msgid "file {filename} was exported"
 msgstr "file {filename} was exported"
 
-#: utils/validators.py:26
+#: utils/validators.py:36
 #, python-format
 msgid "Uw invoer bevat een ongeldig teken: %s"
 msgstr "Uw invoer bevat een ongeldig teken: %s"
 
-#: utils/validators.py:34
+#: utils/validators.py:44
 msgid "Het opgegeven mobiele telefoonnummer is ongeldig."
 msgstr "Het opgegeven mobiele telefoonnummer is ongeldig."
 
-#: utils/validators.py:62
+#: utils/validators.py:72
 msgid "Ongeldige postcode"
 msgstr "Ongeldige postcode"
 
-#~ msgid "Titel bestand"
-#~ msgstr "Titel bestand"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Velden gemarkeerd met een"
-#~ msgstr "Velden gemarkeerd met een"
-
-#~ msgid "zijn verplicht"
-#~ msgstr "zijn verplicht"
-
-#~ msgid "(Titel bestand)"
-#~ msgstr "(Titel bestand)"
-
-#~ msgid "(Bestandsgrootte)"
-#~ msgstr "(Bestandsgrootte)"
-
-#~ msgid "Bestanden uploaden"
-#~ msgstr "Bestanden uploaden"
-
-#~ msgid "Weet je het zeker dat je je account wilt deactiveren?"
-#~ msgstr "Weet je het zeker dat je je account wilt verwijderen?"