Send and process empty setting arrays as __empty__

matomo-org · Dec 19, 2024 · 38ba77f · 38ba77f
1 parent c7c1027
commit 38ba77f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 15 deletions.
diff --git a/plugins/CorePluginsAdmin/SettingsMetadata.php b/plugins/CorePluginsAdmin/SettingsMetadata.php
@@ -20,6 +20,8 @@ class SettingsMetadata
 {
     public const PASSWORD_PLACEHOLDER = '******';
 
+    public const EMPTY_ARRAY = '__empty__';
+
     /**
      * @param Settings[]  $settingsInstances
      * @param array $settingValues   array('pluginName' => array('settingName' => 'settingValue'))
@@ -34,6 +36,11 @@ public function setPluginSettings($settingsInstances, $settingValues)
 
                     $fieldConfig = $setting->configureField();
 
+                    // empty arrays are sent as __empty__ value, so we need to convert it here back to an array
+                    if ($setting->getType() === FieldConfig::TYPE_ARRAY && $value === self::EMPTY_ARRAY) {
+                        $value = [];
+                    }
+
                     if (
                         isset($value) && (
                         $fieldConfig->uiControl !== FieldConfig::UI_CONTROL_PASSWORD ||

diff --git a/plugins/CorePluginsAdmin/vue/dist/CorePluginsAdmin.umd.js b/plugins/CorePluginsAdmin/vue/dist/CorePluginsAdmin.umd.js