Make theme device plugin config override theme common plugin config

qgis · Mar 11, 2024 · f329bc6 · f329bc6
1 parent 4a6cd94
commit f329bc6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/components/PluginsContainer.jsx b/components/PluginsContainer.jsx
@@ -31,8 +31,9 @@ class PluginsContainer extends React.Component {
                 console.warn("Non-existing plugin: " + pluginConf.name);
                 return null;
             }
-            const themePluginConfig = this.props.theme?.config?.[this.props.mode]?.plugins ?? this.props.theme?.config?.plugins;
-            const cfg = {...(pluginConf.cfg || {}), ...(themePluginConfig?.[pluginConf.name] || {})};
+            const themeDevicePluginConfig = this.props.theme?.config?.[this.props.mode]?.plugins?.[pluginConf.name] || {};
+            const themePluginConfig = this.props.theme?.config?.plugins?.[pluginConf.name] || {};
+            const cfg = {...(pluginConf.cfg || {}), ...themePluginConfig, ...themeDevicePluginConfig};
             const appCfg = this.props.pluginsAppConfig[pluginConf.name + "Plugin"] || {};
             return (<Plugin key={pluginConf.name + idx} {...cfg} {...appCfg} />);
         });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2024.03.10-master",
+    "version": "2024.03.11-master",
     "description": "QGIS Web Client 2 core",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",