From 1475b9c31b72db4bfcec034834c44f1ee2b830cc Mon Sep 17 00:00:00 2001
From: Sergey Motornyuk <sergey.motornyuk@linkdigital.com.au>
Date: Sat, 29 Jul 2023 14:31:21 +0300
Subject: [PATCH] chore: fix admin form overflows

---
 .../editable_config/assets/css/editable_config.css    |  4 ++++
 ckanext/editable_config/assets/script.js              | 10 ----------
 ckanext/editable_config/assets/style.css              |  5 -----
 ckanext/editable_config/assets/webassets.yml          | 10 +++++-----
 ckanext/editable_config/config_declaration.yaml       |  3 +++
 .../templates/editable_config/config.html             | 11 ++++++++++-
 ckanext/editable_config/tests/test_fixtures.py        |  4 +---
 7 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 ckanext/editable_config/assets/css/editable_config.css
 delete mode 100644 ckanext/editable_config/assets/script.js
 delete mode 100644 ckanext/editable_config/assets/style.css

diff --git a/ckanext/editable_config/assets/css/editable_config.css b/ckanext/editable_config/assets/css/editable_config.css
new file mode 100644
index 0000000..3d49d9a
--- /dev/null
+++ b/ckanext/editable_config/assets/css/editable_config.css
@@ -0,0 +1,4 @@
+.editable-option-help--key {
+    max-width: 100%;
+    overflow-wrap: break-word;
+}
diff --git a/ckanext/editable_config/assets/script.js b/ckanext/editable_config/assets/script.js
deleted file mode 100644
index d68a4ba..0000000
--- a/ckanext/editable_config/assets/script.js
+++ /dev/null
@@ -1,10 +0,0 @@
-ckan.module("editable_config-module", function ($, _) {
-  "use strict";
-  return {
-    options: {
-      debug: false,
-    },
-
-    initialize: function () {},
-  };
-});
diff --git a/ckanext/editable_config/assets/style.css b/ckanext/editable_config/assets/style.css
deleted file mode 100644
index 9631595..0000000
--- a/ckanext/editable_config/assets/style.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-body {
-  border-radius: 0;
-}
-*/
diff --git a/ckanext/editable_config/assets/webassets.yml b/ckanext/editable_config/assets/webassets.yml
index fa62321..4772267 100644
--- a/ckanext/editable_config/assets/webassets.yml
+++ b/ckanext/editable_config/assets/webassets.yml
@@ -7,8 +7,8 @@ editable_config-js:
     preload:
       - base/main
 
-# editable_config-css:
-#   filter: cssrewrite
-#   output: ckanext-editable_config/%(version)s-editable_config.css
-#   contents:
-#     - css/editable_config.css
+editable_config-css:
+  filter: cssrewrite
+  output: ckanext-editable_config/%(version)s-editable_config.css
+  contents:
+    - css/editable_config.css
diff --git a/ckanext/editable_config/config_declaration.yaml b/ckanext/editable_config/config_declaration.yaml
index f8d01a6..91db5c7 100644
--- a/ckanext/editable_config/config_declaration.yaml
+++ b/ckanext/editable_config/config_declaration.yaml
@@ -36,6 +36,7 @@ groups:
         type: int
         default: 0
         example: 10
+        editable: true
         description: |
           Minimal number of seconds between two consequent change detection
           cycles. Basically, if you set 60 as a value, plugin will check config
@@ -60,12 +61,14 @@ groups:
       - key: ckanext.editable_config.disable_admin_config_tab
         type: bool
         example: true
+        editable: true
         description: |
           Remove "Config" tab from CKAN's Admin UI.
 
       - key: ckanext.editable_config.replace_admin_config_tab
         type: bool
         example: true
+        editable: true
         description: |
           Replace "Config" tab from CKAN's Admin UI with basic form for
           editable config options.
diff --git a/ckanext/editable_config/templates/editable_config/config.html b/ckanext/editable_config/templates/editable_config/config.html
index 8cf8324..d06b883 100644
--- a/ckanext/editable_config/templates/editable_config/config.html
+++ b/ckanext/editable_config/templates/editable_config/config.html
@@ -13,6 +13,12 @@
     {% asset "editable_config/editable_config-js" %}
 {% endblock scripts %}
 
+{% block styles %}
+    {{ super() }}
+    {% asset "editable_config/editable_config-css" %}
+{% endblock styles %}
+
+
 {% block primary_content_inner %}
     {% block form %}
 
@@ -64,7 +70,10 @@ <h2 class="module-heading">
             {% block sidebar_content %}
                 {% for name in options %}
                     <p>
-                        <label for="{{ "field-value-" ~ name.replace(".", "-") }}">
+                        <label
+                            class="editable-option-help--key"
+                            title="{{ name }}"
+                            for="{{ "field-value-" ~ name.replace(".", "-") }}">
                             {{ name }}
                         </label>
                         {{ h.render_markdown(h.editable_config_option_description(name), allow_html=true) }}
diff --git a/ckanext/editable_config/tests/test_fixtures.py b/ckanext/editable_config/tests/test_fixtures.py
index 0c61035..efa01e5 100644
--- a/ckanext/editable_config/tests/test_fixtures.py
+++ b/ckanext/editable_config/tests/test_fixtures.py
@@ -5,7 +5,6 @@
 import pytest
 
 import ckan.plugins.toolkit as tk
-from ckan.common import config_declaration as cd
 
 
 @pytest.mark.usefixtures("with_plugins", "non_clean_db")
@@ -20,8 +19,7 @@ def test_key_and_value_required(self, option_factory):
 
     def test_key_cannot_be_undeclared(self, option_factory, faker):
         """Undeclared options are not allowed."""
-        while (key := faker.word()) in cd:
-            continue
+        key = faker.word()
 
         with pytest.raises(tk.ValidationError) as e:
             option_factory(key=key, value=faker.word())