testing

Author: stktyagi

openwisp_controller/config/apps.py

@@ -78,15 +78,18 @@ def connect_signals(self):
             sender=self.config_model.templates.through,
             dispatch_uid="config.clean_templates",
         )
+        # VPN clients must be created or removed **before**
+        # self.config_model.templates_changed is evaluated, because
+        # the VpnClient context can influence the configuration checksum.
         m2m_changed.connect(
-            self.config_model.templates_changed,
+            self.config_model.manage_vpn_clients,
             sender=self.config_model.templates.through,
-            dispatch_uid="config.templates_changed",
+            dispatch_uid="config.manage_vpn_clients",
         )
         m2m_changed.connect(
-            self.config_model.manage_vpn_clients,
+            self.config_model.templates_changed,
             sender=self.config_model.templates.through,
-            dispatch_uid="config.manage_vpn_clients",
+            dispatch_uid="config.templates_changed",
         )
         # the order of the following connect() call must be maintained
         m2m_changed.connect(

openwisp_controller/config/static/config/css/admin.css

@@ -177,8 +177,8 @@ input.readonly {
 }
 .field-templates .add-related {
   position: relative;
-  bottom: -7px;
-  left: -3px;
+  bottom: -2px;
+  left: -12px;
 }
 #template_form #id_tags {
   width: 261px;
@@ -191,7 +191,7 @@ input.readonly {
 #device_form #id_notes {
   height: 42px;
 }
-#config-group .field-status .help {
+#config-group .field-status .help div {
   white-space: pre;
   color: #777;
 }
@@ -212,7 +212,6 @@ div.change-form #device_form > div > div.inline-group {
   > fieldset.module
   > div.inline-related
   > h3 {
-  border-top: 0 none;
   padding: 1em;
 }
 .change-form
@@ -227,7 +226,11 @@ div.change-form #device_form > div > div.inline-group {
   margin-top: -1em;
 }
 #main .tab-content .inline-related > h3 {
-  background: transparent;
+  background: var(--ow-color-fg-ghost);
+  word-spacing: 1px;
+  text-transform: uppercase;
+  letter-spacing: 0.2px;
+  font-weight: normal;
 }
 ul.tabs {
   margin: 0;
@@ -237,19 +240,20 @@ ul.tabs {
 }
 ul.tabs li {
   display: inline-block;
-  margin-right: 4px;
+  margin-right: 3px;
 }
 ul.tabs a,
 ul.tabs a:hover,
 ul.tabs a:focus {
   display: inline-block;
-  padding: 13px 16px;
+  padding: 12px 14px;
   color: #333;
   background: rgba(0, 0, 0, 0.06);
   border-radius: 3px;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
   font-size: 15px;
+  word-spacing: -0.1px;
 }
 ul.tabs a:hover,
 ul.tabs a:focus {
@@ -259,16 +263,19 @@ ul.tabs a:focus {
 ul.tabs a.current,
 ul.tabs a.current:hover,
 ul.tabs a.current:focus {
-  background: #fff;
+  background: var(--ow-color-fg-ghost);
   color: #000;
   border: 1px solid rgba(0, 0, 0, 0.1);
   border-bottom: 0 none;
   border-color: rgba(0, 0, 0, 0.25);
   cursor: default;
+  position: relative;
+  z-index: 9;
+  font-weight: bold;
 }
 div.tabs-divider {
   margin-top: -4px;
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  border-top: 1px solid var(--hairline-color);
 }
 .tab-content {
   display: none;
@@ -282,12 +289,15 @@ div.tabs-divider {
   padding: 17em 0;
   font-size: 16px;
 }
+ul.tabs li:first-child .button.current {
+  background-color: var(--body-bg);
+}
 
 /*
 Prevents the overflow of large text in system
 defined variables such as `secret`
 */
-.form-row.field-system_context {
+.form-row.field-system_context div {
   max-width: 51.25em;
   word-wrap: break-word;
 }

openwisp_controller/config/static/config/css/lib/advanced-mode.css

@@ -886,7 +886,7 @@ table.jsoneditor-search button.jsoneditor-previous:hover {
   font-size: 14px !important;
 }
 #main .property-selector .form-row {
-  padding: 5px 0 6px 10px !important;
+  padding: 8px 0 13px 5px !important;
 }
 #main .property-selector {
   text-align: left;

openwisp_controller/config/static/config/css/lib/jsonschema-ui.css

@@ -241,6 +241,7 @@ div[data-schematype="object"]
   > .grid-row
   > .inline-group {
   border-bottom: 1px solid #eee;
+  border-top: 0 none;
 }
 .grid-row > .inline-group > div > .inline-group > div.form-row {
   border: 0 none;
@@ -363,14 +364,15 @@ div[data-schematype="object"]
 .jsoneditor-wrapper div.jsoneditor .grid-column > select {
   position: absolute;
   left: 0;
-  top: 12px;
+  top: 16px;
   z-index: 1;
   font-weight: bold;
 }
 .jsoneditor-wrapper div.jsoneditor .inline-related > select,
 .jsoneditor-wrapper div.jsoneditor .grid-column > select {
   margin-left: 188px;
   background-color: #fff;
+  top: 12px;
 }
 .jsoneditor-wrapper div.jsoneditor .grid-row .grid-column {
   position: relative;

openwisp_controller/config/tests/test_config.py

@@ -13,7 +13,12 @@
 from .. import settings as app_settings
 from ..base.base import logger as base_config_logger
 from ..signals import config_backend_changed, config_modified, config_status_changed
-from .utils import CreateConfigTemplateMixin, CreateDeviceGroupMixin, TestVpnX509Mixin
+from .utils import (
+    CreateConfigTemplateMixin,
+    CreateDeviceGroupMixin,
+    TestVpnX509Mixin,
+    TestWireguardVpnMixin,
+)
 
 Config = load_model("config", "Config")
 Device = load_model("config", "Device")
@@ -906,6 +911,7 @@ def test_config_backend_changed(self):
 class TestTransactionConfig(
     CreateConfigTemplateMixin,
     TestVpnX509Mixin,
+    TestWireguardVpnMixin,
     TransactionTestCase,
 ):
     def test_multiple_vpn_client_templates_same_vpn(self):
@@ -983,3 +989,14 @@ def test_certificate_renew_invalidates_checksum_cache(self):
             self.assertNotEqual(config.get_cached_checksum(), old_checksum)
             config.refresh_from_db()
             self.assertEqual(config.status, "modified")
+
+    def test_checksum_db_accounts_for_vpnclient(self):
+        vpn = self._create_wireguard_vpn()
+        vpn_template = self._create_template(
+            name="vpn1-template", type="vpn", vpn=vpn, config={}
+        )
+        config = self._create_config(organization=self._get_org())
+        config.templates.add(vpn_template)
+        config.refresh_from_db()
+        config._invalidate_backend_instance_cache()
+        self.assertEqual(config.checksum, config.checksum_db)