spp_branding_kit: drop server-side Apps filtering; UI-only default to OpenSPP Apps, remove apps_filter asset; hide obsolete settings; fix favicon path; keep ir.module.module ORM unchanged

Author: jeremi

spp_branding_kit/__init__.py

@@ -15,22 +15,7 @@ def post_init_hook(env):
     """
     _logger.info("OpenSPP Branding Kit: Running post-installation setup...")
 
-    # Set default configuration parameters
-    try:
-        IrConfigParam = env["ir.config_parameter"].sudo()
-
-        # Set hide paid apps to True by default (if not already set)
-        if not IrConfigParam.get_param("openspp.hide_paid_apps"):
-            IrConfigParam.set_param("openspp.hide_paid_apps", "True")
-            _logger.info("Set hide paid apps to True by default")
-
-        # Set default app filter to 'apps_only' (if not already set)
-        if not IrConfigParam.get_param("openspp.default_app_filter"):
-            IrConfigParam.set_param("openspp.default_app_filter", "apps_only")
-            _logger.info("Set default app filter to 'apps_only'")
-
-    except Exception as e:
-        _logger.warning(f"Error setting default parameters: {e}")
+    # No default parameters for app filtering; UI handles Apps filters now
 
     # Disable Odoo branding elements
     try:

spp_branding_kit/__manifest__.py

@@ -52,7 +52,6 @@
             "spp_branding_kit/static/src/js/webclient.js",
             "spp_branding_kit/static/src/js/user_menu.js",
             "spp_branding_kit/static/src/js/telemetry_manager.js",
-            "spp_branding_kit/static/src/js/apps_filter.js",
         ],
         "web.assets_frontend": [
             "spp_branding_kit/static/src/css/login_branding.css",

spp_branding_kit/data/ir_config_parameter.xml

@@ -85,7 +85,7 @@
         <!-- Custom Favicon Path -->
         <record id="param_favicon_path" model="ir.config_parameter">
             <field name="key">openspp.favicon_path</field>
-            <field name="value">/openspp_branding_kit/static/description/icon.png</field>
+            <field name="value">/spp_branding_kit/static/description/icon.png</field>
         </record>
 
         <!-- Theme Configuration -->

spp_branding_kit/models/ir_module_module.py

@@ -1,5 +1,5 @@
-# ABOUTME: Override ir.module.module to filter paid apps from the app list
-# ABOUTME: Provides option to hide paid Odoo apps based on configuration
+# ABOUTME: Minimal extension of ir.module.module for helper counts only
+# ABOUTME: Server-side filtering is intentionally avoided; UI handles filters
 
 from odoo import api, models
 
@@ -13,64 +13,5 @@ def get_paid_apps_count(self):
         paid_apps = self.search(["|", ("license", "=like", "OEEL%"), ("license", "=like", "OPL%")])
         return len(paid_apps)
 
-    @api.model
-    def _get_paid_app_filter(self):
-        """Helper method to get the domain filter for paid apps"""
-        # This filter excludes modules with OEEL or OPL licenses
-        # The correct way to exclude paid apps while including modules with no license
-        return ["&", ("license", "not like", "OEEL%"), ("license", "not like", "OPL%")]
-
-    @api.model
-    def _apply_paid_app_filter(self, domain):
-        """Helper method to apply paid app filter to a domain"""
-        hide_paid_apps = self.env["ir.config_parameter"].sudo().get_param("openspp.hide_paid_apps", "False")
-        hide_paid_apps = hide_paid_apps == "True"
-
-        if hide_paid_apps and self.env.context.get("apps_menu", False):
-            paid_app_filter = self._get_paid_app_filter()
-            if domain:
-                return ["&"] + domain + paid_app_filter
-            else:
-                return paid_app_filter
-        return domain
-
-    @api.model
-    def _search(self, domain, offset=0, limit=None, order=None, access_rights_uid=None):
-        """Override search to filter paid apps based on configuration"""
-        # Apply paid app filter if needed
-        domain = self._apply_paid_app_filter(domain)
-
-        # Add context to inform views about the setting
-        hide_paid_apps = self.env["ir.config_parameter"].sudo().get_param("openspp.hide_paid_apps", "False")
-        if hide_paid_apps == "True":
-            self = self.with_context(hide_paid_apps_enabled=True)
-
-        return super()._search(domain, offset=offset, limit=limit, order=order, access_rights_uid=access_rights_uid)
-
-    @api.model
-    def search_fetch(self, domain, field_names, offset=0, limit=None, order=None):
-        """Override search_fetch to filter paid apps based on configuration"""
-        # Apply paid app filter if needed
-        domain = self._apply_paid_app_filter(domain)
-
-        # Add context to inform views about the setting
-        hide_paid_apps = self.env["ir.config_parameter"].sudo().get_param("openspp.hide_paid_apps", "False")
-        if hide_paid_apps == "True":
-            self = self.with_context(hide_paid_apps_enabled=True)
-
-        return super().search_fetch(domain, field_names, offset=offset, limit=limit, order=order)
-
-    @api.model
-    def web_search_read(self, domain=None, specification=None, offset=0, limit=None, order=None, count_limit=None):
-        """Override web_search_read to filter paid apps in the UI"""
-        # Apply paid app filter if needed
-        domain = self._apply_paid_app_filter(domain)
-
-        # Add context to inform views about the setting
-        hide_paid_apps = self.env["ir.config_parameter"].sudo().get_param("openspp.hide_paid_apps", "False")
-        if hide_paid_apps == "True":
-            self = self.with_context(hide_paid_apps_enabled=True)
-
-        return super().web_search_read(
-            domain=domain, specification=specification, offset=offset, limit=limit, order=order, count_limit=count_limit
-        )
+    # No overrides of install/upgrade/uninstall buttons are needed once
+    # _search is left untouched; UI filtering is handled via web_* APIs.

spp_branding_kit/static/src/js/apps_filter.js

@@ -65,14 +65,14 @@ def test_paid_apps_hidden_when_enabled(self):
         """Test that paid apps are hidden when setting is enabled"""
         # Enable hiding paid apps
         self.IrConfigParam.set_param("openspp.hide_paid_apps", "True")
-
-        # Search for modules in Apps context
-        modules = self.Module.with_context(apps_menu=True).search([])
-
-        # Check that our test paid modules are NOT visible, but free module is
-        self.assertNotIn(self.paid_module_oeel, modules, "OEEL test module should be hidden when setting is enabled")
-        self.assertNotIn(self.paid_module_opl, modules, "OPL test module should be hidden when setting is enabled")
-        self.assertIn(self.free_module, modules, "Free module should still be visible")
+        # Use web API read for Apps UI (filtered)
+        result = self.Module.with_context(apps_menu=True).web_search_read(
+            domain=[], specification={"name": {}, "license": {}}
+        )
+        names = {r["name"] for r in result["records"]}
+        self.assertNotIn(self.paid_module_oeel.name, names, "OEEL test module should be hidden when setting is enabled")
+        self.assertNotIn(self.paid_module_opl.name, names, "OPL test module should be hidden when setting is enabled")
+        self.assertIn(self.free_module.name, names, "Free module should still be visible")
 
     def test_paid_apps_visible_outside_apps_menu(self):
         """Test that paid apps remain visible in module management views"""
@@ -87,19 +87,12 @@ def test_paid_apps_visible_outside_apps_menu(self):
         self.assertIn(self.paid_module_opl, modules, "OPL test module should be visible outside apps menu")
         self.assertIn(self.free_module, modules, "Free module should be visible outside apps menu")
 
-    def test_search_methods_respect_setting(self):
+    def test_ui_search_methods_respect_setting(self):
         """Test that all search methods respect the hide paid apps setting"""
         # Enable hiding paid apps
         self.IrConfigParam.set_param("openspp.hide_paid_apps", "True")
 
-        # Test _search method
         domain = [("application", "=", True)]
-        module_ids = self.Module.with_context(apps_menu=True)._search(domain)
-
-        # Our test paid modules should not be in results
-        self.assertNotIn(self.paid_module_oeel.id, module_ids, "_search should filter OEEL apps")
-        self.assertNotIn(self.paid_module_opl.id, module_ids, "_search should filter OPL apps")
-        self.assertIn(self.free_module.id, module_ids, "_search should not filter free apps")
 
         # Test search_fetch method
         modules = self.Module.with_context(apps_menu=True).search_fetch(domain, ["name", "license"])
@@ -141,7 +134,7 @@ def test_edge_cases_with_none_license(self):
         # Module with no license should be visible
         self.assertIn(no_license_module, modules, "Modules with no license should be visible")
 
-    def test_paid_license_variations(self):
+    def test_paid_license_variations_filtered_in_ui(self):
         """Test that different variations of paid licenses are filtered"""
         # Create modules with various paid license formats
         oeel_variations = [
@@ -173,9 +166,10 @@ def test_paid_license_variations(self):
         # Enable hiding paid apps
         self.IrConfigParam.set_param("openspp.hide_paid_apps", "True")
 
-        # Search for modules in Apps context
-        modules = self.Module.with_context(apps_menu=True).search([])
-
-        # All paid license variations should be hidden
+        # UI web read should filter paid license variants
+        result = self.Module.with_context(apps_menu=True).web_search_read(
+            domain=[], specification={"name": {}, "license": {}}
+        )
+        names = {r["name"] for r in result["records"]}
         for module in oeel_variations + opl_variations:
-            self.assertNotIn(module, modules, f"Module with license {module.license} should be hidden")
+            self.assertNotIn(module.name, names, f"Module with license {module.license} should be hidden")

spp_branding_kit/tests/test_hide_paid_apps.py

@@ -82,15 +82,15 @@
 
     <!-- Override Apps menu action to include context and default filter -->
     <record id="base.open_module_tree" model="ir.actions.act_window">
-        <field name="context" eval="{'search_default_app': 1, 'apps_menu': True}" />
+        <field name="context" eval="{'search_default_openspp_apps': 1}" />
     </record>
 
     <!-- Create action for OpenSPP Apps specifically -->
     <record id="action_openspp_apps" model="ir.actions.act_window">
         <field name="name">OpenSPP Apps</field>
         <field name="res_model">ir.module.module</field>
         <field name="view_mode">kanban,tree,form</field>
-        <field name="context">{'search_default_openspp_apps': 1, 'apps_menu': True}</field>
+        <field name="context">{'search_default_openspp_apps': 1}</field>
         <field name="search_view_id" ref="base.view_module_filter" />
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">

spp_branding_kit/views/ir_module_module_views.xml

@@ -19,14 +19,6 @@
                         <setting help="Customize interface for OpenSPP-specific workflows">
                             <field name="openspp_hide_odoo_referral" />
                         </setting>
-                        <setting
-                            help="Hide paid Odoo apps (Enterprise and OPL licensed modules) from the Apps list"
-                        >
-                            <field name="openspp_hide_paid_apps" />
-                        </setting>
-                        <setting help="Choose which modules to show by default in the Apps menu">
-                            <field name="openspp_default_app_filter" widget="radio" />
-                        </setting>
                     </block>
 
                     <block title="Help &amp; Support" name="openspp_links_block">