Merge pull request #4086 from open-formulieren/feature/3889

[#3889] Improve timeline logs admin
open-formulieren · Apr 9, 2024 · a709ac9 · a709ac9
2 parents 2841a19 + ae56b09
commit a709ac9
Show file tree

Hide file tree

Showing 12 changed files with 302 additions and 9 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -47,6 +47,7 @@ django-cookie-consent
 django-cors-headers
 django-digid-eherkenning
 django-hijack
+django-import-export
 django-jsonform
 django-log-outgoing-requests
 django-modeltranslation

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -88,7 +88,11 @@ cryptography==42.0.4
 cssselect2==0.7.0
     # via weasyprint
 defusedxml==0.7.1
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   odfpy
+diff-match-patch==20230430
+    # via django-import-export
 django==4.2.11
     # via
     #   -r requirements/base.in
@@ -104,6 +108,7 @@ django==4.2.11
     #   django-filter
     #   django-formtools
     #   django-hijack
+    #   django-import-export
     #   django-jsonform
     #   django-log-outgoing-requests
     #   django-modeltranslation
@@ -163,6 +168,8 @@ django-formtools==2.5.1
     # via django-two-factor-auth
 django-hijack==3.4.1
     # via -r requirements/base.in
+django-import-export==3.3.7
+    # via -r requirements/base.in
 django-ipware==5.0.0
     # via django-axes
 django-jsonform==2.21.2
@@ -310,6 +317,8 @@ mail-cleaner==1.2.0
     # via -r requirements/base.in
 mail-parser==3.15.0
     # via django-yubin
+markuppy==1.14
+    # via tablib
 maykin-2fa==1.0.0
     # via -r requirements/base.in
 maykin-json-logic-py==0.13.0
@@ -324,6 +333,8 @@ o365==2.0.31
     # via -r requirements/base.in
 oauthlib==3.2.2
     # via requests-oauthlib
+odfpy==1.4.1
+    # via tablib
 openapi-schema-validator==0.6.2
     # via openapi-spec-validator
 openapi-spec-validator==0.6.0
@@ -395,6 +406,7 @@ pyyaml==6.0.1
     # via
     #   drf-spectacular
     #   jsonschema-spec
+    #   tablib
 qrcode==7.4.2
     # via django-two-factor-auth
 redis==4.5.4
@@ -466,8 +478,10 @@ sqlparse==0.4.4
     # via django
 stringcase==1.2.0
     # via o365
-tablib[xlsx]==3.0.0
-    # via -r requirements/base.in
+tablib[html,ods,xls,xlsx,yaml]==3.5.0
+    # via
+    #   -r requirements/base.in
+    #   django-import-export
 tabulate==0.8.9
     # via -r requirements/base.in
 tinycss2==1.1.0
@@ -516,6 +530,10 @@ webencodings==0.5.1
     #   tinycss2
 wrapt==1.15.0
     # via elastic-apm
+xlrd==2.0.1
+    # via tablib
+xlwt==1.3.0
+    # via tablib
 xmlsec==1.3.10
     # via maykin-python3-saml
 xmltodict==0.12.0

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -167,6 +167,12 @@ defusedxml==0.7.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   odfpy
+diff-match-patch==20230430
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   django-import-export
 django==4.2.11
     # via
     #   -c requirements/base.txt
@@ -183,6 +189,7 @@ django==4.2.11
     #   django-filter
     #   django-formtools
     #   django-hijack
+    #   django-import-export
     #   django-jenkins
     #   django-jsonform
     #   django-log-outgoing-requests
@@ -275,6 +282,10 @@ django-hijack==3.4.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+django-import-export==3.3.7
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
 django-ipware==5.0.0
     # via
     #   -c requirements/base.txt
@@ -570,6 +581,11 @@ mail-parser==3.15.0
     #   django-yubin
 markdown==3.3.4
     # via sphinx-markdown-tables
+markuppy==1.14
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   tablib
 markupsafe==2.1.2
     # via jinja2
 maykin-2fa==1.0.0
@@ -609,6 +625,11 @@ oauthlib==3.2.2
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   requests-oauthlib
+odfpy==1.4.1
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   tablib
 openapi-schema-validator==0.6.2
     # via
     #   -c requirements/base.txt
@@ -782,6 +803,7 @@ pyyaml==6.0.1
     #   -r requirements/base.txt
     #   drf-spectacular
     #   jsonschema-spec
+    #   tablib
     #   vcrpy
     #   zgw-consumers
 qrcode==7.4.2
@@ -942,10 +964,11 @@ stringcase==1.2.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   o365
-tablib[xlsx]==3.0.0
+tablib[html,ods,xls,xlsx,yaml]==3.5.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-import-export
     #   tablib
 tabulate==0.8.9
     # via
@@ -1053,6 +1076,16 @@ wrapt==1.15.0
     #   -r requirements/base.txt
     #   elastic-apm
     #   vcrpy
+xlrd==2.0.1
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   tablib
+xlwt==1.3.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   tablib
 xmlsec==1.3.10
     # via
     #   -c requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -190,6 +190,12 @@ defusedxml==0.7.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   odfpy
+diff-match-patch==20230430
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   django-import-export
 django==4.2.11
     # via
     #   -c requirements/ci.txt
@@ -208,6 +214,7 @@ django==4.2.11
     #   django-filter
     #   django-formtools
     #   django-hijack
+    #   django-import-export
     #   django-jenkins
     #   django-jsonform
     #   django-log-outgoing-requests
@@ -306,6 +313,10 @@ django-hijack==3.4.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+django-import-export==3.3.7
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
 django-ipware==5.0.0
     # via
     #   -c requirements/ci.txt
@@ -645,6 +656,11 @@ markdown==3.3.4
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   sphinx-markdown-tables
+markuppy==1.14
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   tablib
 markupsafe==2.1.2
     # via
     #   -c requirements/ci.txt
@@ -696,6 +712,11 @@ oauthlib==3.2.2
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   requests-oauthlib
+odfpy==1.4.1
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   tablib
 openapi-schema-validator==0.6.2
     # via
     #   -c requirements/ci.txt
@@ -902,6 +923,7 @@ pyyaml==6.0.1
     #   -r requirements/ci.txt
     #   drf-spectacular
     #   jsonschema-spec
+    #   tablib
     #   vcrpy
     #   zgw-consumers
 qrcode==7.4.2
@@ -1101,10 +1123,11 @@ stringcase==1.2.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   o365
-tablib[xlsx]==3.0.0
+tablib[html,ods,xls,xlsx,yaml]==3.5.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-import-export
     #   tablib
 tabulate==0.8.9
     # via
@@ -1240,6 +1263,16 @@ wrapt==1.15.0
     #   -r requirements/ci.txt
     #   elastic-apm
     #   vcrpy
+xlrd==2.0.1
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   tablib
+xlwt==1.3.0
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   tablib
 xmlsec==1.3.10
     # via
     #   -c requirements/ci.txt

diff --git a/requirements/extensions.txt b/requirements/extensions.txt
@@ -132,6 +132,11 @@ defusedxml==0.7.1
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
+    #   odfpy
+diff-match-patch==20230430
+    # via
+    #   -r requirements/base.txt
+    #   django-import-export
 django==4.2.11
     # via
     #   -c requirements/base.in
@@ -148,6 +153,7 @@ django==4.2.11
     #   django-filter
     #   django-formtools
     #   django-hijack
+    #   django-import-export
     #   django-jsonform
     #   django-log-outgoing-requests
     #   django-modeltranslation
@@ -239,6 +245,10 @@ django-hijack==3.4.1
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
+django-import-export==3.3.7
+    # via
+    #   -c requirements/base.in
+    #   -r requirements/base.txt
 django-ipware==5.0.0
     # via
     #   -r requirements/base.txt
@@ -471,6 +481,10 @@ mail-parser==3.15.0
     # via
     #   -r requirements/base.txt
     #   django-yubin
+markuppy==1.14
+    # via
+    #   -r requirements/base.txt
+    #   tablib
 maykin-2fa==1.0.0
     # via
     #   -c requirements/base.in
@@ -499,6 +513,10 @@ oauthlib==3.2.2
     # via
     #   -r requirements/base.txt
     #   requests-oauthlib
+odfpy==1.4.1
+    # via
+    #   -r requirements/base.txt
+    #   tablib
 open-forms-ext-haalcentraal-hr==0.3.1
     # via -r requirements/extensions.in
 open-forms-ext-token-exchange==0.4.0
@@ -626,6 +644,7 @@ pyyaml==6.0.1
     #   -r requirements/base.txt
     #   drf-spectacular
     #   jsonschema-spec
+    #   tablib
 qrcode==7.4.2
     # via
     #   -r requirements/base.txt
@@ -731,10 +750,11 @@ stringcase==1.2.0
     # via
     #   -r requirements/base.txt
     #   o365
-tablib[xlsx]==3.0.0
+tablib[html,ods,xls,xlsx,yaml]==3.5.0
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
+    #   django-import-export
     #   tablib
 tabulate==0.8.9
     # via
@@ -809,6 +829,14 @@ wrapt==1.15.0
     # via
     #   -r requirements/base.txt
     #   elastic-apm
+xlrd==2.0.1
+    # via
+    #   -r requirements/base.txt
+    #   tablib
+xlwt==1.3.0
+    # via
+    #   -r requirements/base.txt
+    #   tablib
 xmlsec==1.3.10
     # via
     #   -r requirements/base.txt

diff --git a/src/openforms/conf/base.py b/src/openforms/conf/base.py
@@ -194,6 +194,7 @@
     "csp_post_processor",
     "django_camunda",
     "log_outgoing_requests",
+    "import_export",
     # Project applications.
     "openforms.accounts",
     "openforms.analytics_tools",