fix(spp_hazard_programs,spp_import_match,spp_oauth): beta fixes and import overwrite toggle

- spp_hazard_programs: remove unused ACL file, fix view XML
- spp_import_match: migrate legacy JS/XML to OWL components, add overwrite match toggle with per-import control, add import result notifications with match counts
- spp_oauth: fix RSA encode/decode and settings view for Odoo 19

Author: emjay0921

spp_hazard_programs/README.rst

@@ -10,9 +10,9 @@ OpenSPP Hazard Programs Integration
    !! source digest: sha256:e4ca3f5b5e8c998b833ccd6526f575c07f53a38ac49875511c31201f13122916
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Alpha
+    :alt: Beta
 .. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
@@ -44,15 +44,15 @@ Key Capabilities
 Key Models
 ~~~~~~~~~~
 
-+----------------------------------+-----------------------------------+
-| Model                            | Description                       |
-+==================================+===================================+
-| ``spp.program`` (extend)         | Adds target incidents, emergency  |
-|                                  | mode, damage filter               |
-+----------------------------------+-----------------------------------+
-| ``spp.hazard.incident`` (extend) | Adds reverse relation to response |
-|                                  | programs                          |
-+----------------------------------+-----------------------------------+
++----------------------------------+----------------------------------+
+| Model                            | Description                      |
++==================================+==================================+
+| ``spp.program`` (extend)         | Adds target incidents, emergency |
+|                                  | mode, damage filter              |
++----------------------------------+----------------------------------+
+| ``spp.hazard.incident`` (extend) | Adds reverse relation to         |
+|                                  | response programs                |
++----------------------------------+----------------------------------+
 
 UI Location
 ~~~~~~~~~~~
@@ -89,10 +89,6 @@ Dependencies
 
 ``spp_hazard``, ``spp_programs``
 
-.. IMPORTANT::
-   This is an alpha version, the data model and design can change at any time without warning.
-   Only for development or testing purpose, do not use in production.
-
 **Table of contents**
 
 .. contents::

spp_hazard_programs/__manifest__.py

@@ -12,14 +12,13 @@
     "author": "OpenSPP.org",
     "website": "https://github.com/OpenSPP/OpenSPP2",
     "license": "LGPL-3",
-    "development_status": "Alpha",
+    "development_status": "Beta",
     "maintainers": ["jeremi", "gonzalesedwin1123", "reichie020212"],
     "depends": [
         "spp_hazard",
         "spp_programs",
     ],
     "data": [
-        "security/ir.model.access.csv",
         "views/program_views.xml",
         "views/incident_views.xml",
     ],

spp_hazard_programs/security/ir.model.access.csv

@@ -369,7 +369,7 @@ <h1 class="title">OpenSPP Hazard Programs Integration</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:e4ca3f5b5e8c998b833ccd6526f575c07f53a38ac49875511c31201f13122916
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenSPP/OpenSPP2/tree/19.0/spp_hazard_programs"><img alt="OpenSPP/OpenSPP2" src="https://img.shields.io/badge/github-OpenSPP%2FOpenSPP2-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenSPP/OpenSPP2/tree/19.0/spp_hazard_programs"><img alt="OpenSPP/OpenSPP2" src="https://img.shields.io/badge/github-OpenSPP%2FOpenSPP2-lightgray.png?logo=github" /></a></p>
 <p>Links hazard incidents to emergency response programs. Enables programs
 to target affected populations using verified impact data, filter
 registrants by damage severity, and automatically enable emergency mode
@@ -393,8 +393,8 @@ <h1>Key Capabilities</h1>
 <h1>Key Models</h1>
 <table border="1" class="docutils">
 <colgroup>
-<col width="49%" />
-<col width="51%" />
+<col width="50%" />
+<col width="50%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">Model</th>
@@ -407,8 +407,8 @@ <h1>Key Models</h1>
 mode, damage filter</td>
 </tr>
 <tr><td><tt class="docutils literal">spp.hazard.incident</tt> (extend)</td>
-<td>Adds reverse relation to response
-programs</td>
+<td>Adds reverse relation to
+response programs</td>
 </tr>
 </tbody>
 </table>
@@ -448,11 +448,6 @@ <h1>Extension Points</h1>
 <div class="section" id="dependencies">
 <h1>Dependencies</h1>
 <p><tt class="docutils literal">spp_hazard</tt>, <tt class="docutils literal">spp_programs</tt></p>
-<div class="admonition important">
-<p class="first admonition-title">Important</p>
-<p class="last">This is an alpha version, the data model and design can change at any time without warning.
-Only for development or testing purpose, do not use in production.</p>
-</div>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">

spp_hazard_programs/static/description/index.html

@@ -63,7 +63,6 @@
                             <field name="category_id" />
                             <field name="status" widget="badge" />
                             <field name="severity" widget="badge" />
-                            <field name="affected_registrant_count" />
                         </list>
                     </field>
                 </page>

spp_hazard_programs/views/program_views.xml

@@ -10,9 +10,9 @@ OpenSPP Import Match
    !! source digest: sha256:b57dea1315fd1f9af8f15720c5332b182c0a01fddd827a3daa73a8e950d41faa
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Alpha
+    :alt: Beta
 .. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
@@ -47,15 +47,15 @@ Key Capabilities
 Key Models
 ~~~~~~~~~~
 
-+-----------------------------+----------------------------------------+
-| Model                       | Description                            |
-+=============================+========================================+
-| ``spp.import.match``        | Matching rule configuration for a      |
-|                             | specific model                         |
-+-----------------------------+----------------------------------------+
-| ``spp.import.match.fields`` | Individual fields used in a rule,      |
-|                             | supports sub-fields                    |
-+-----------------------------+----------------------------------------+
++-----------------------------+---------------------------------------+
+| Model                       | Description                           |
++=============================+=======================================+
+| ``spp.import.match``        | Matching rule configuration for a     |
+|                             | specific model                        |
++-----------------------------+---------------------------------------+
+| ``spp.import.match.fields`` | Individual fields used in a rule,     |
+|                             | supports sub-fields                   |
++-----------------------------+---------------------------------------+
 
 Configuration
 ~~~~~~~~~~~~~
@@ -106,10 +106,6 @@ Dependencies
 ``base``, ``spp_base_common``, ``base_import``, ``queue_job``,
 ``spp_security``
 
-.. IMPORTANT::
-   This is an alpha version, the data model and design can change at any time without warning.
-   Only for development or testing purpose, do not use in production.
-
 **Table of contents**
 
 .. contents::

spp_import_match/README.rst

@@ -10,7 +10,7 @@
     "author": "OpenSPP.org",
     "website": "https://github.com/OpenSPP/OpenSPP2",
     "license": "LGPL-3",
-    "development_status": "Alpha",
+    "development_status": "Beta",
     "maintainers": ["jeremi", "gonzalesedwin1123"],
     "depends": ["base", "spp_base_common", "base_import", "queue_job", "spp_security"],
     "data": [
@@ -20,10 +20,8 @@
     ],
     "assets": {
         "web.assets_backend": [
-            "spp_import_match/static/src/legacy/js/custom_base_import.js",
-        ],
-        "web.assets_qweb": [
-            "spp_import_match/static/src/legacy/xml/custom_base_import.xml",
+            "spp_import_match/static/src/import_match_selector/import_match_selector.js",
+            "spp_import_match/static/src/import_match_selector/import_match_selector.xml",
         ],
     },
     "demo": [],

spp_import_match/__manifest__.py

@@ -1,10 +1,14 @@
 # Part of OpenSPP. See LICENSE file for full copyright and licensing details.
 import logging
+import threading
 
 from odoo import api, models
 
 _logger = logging.getLogger(__name__)
 
+# Thread-local storage to pass import match counts from load() to execute_import()
+_import_match_local = threading.local()
+
 
 class Base(models.AbstractModel):
     _inherit = "base"
@@ -16,14 +20,13 @@ def load(self, fields, data):
             fields,
             option_config_ids=self.env.context.get("import_match_ids", []),
         )
-        model_id = self.env["ir.model"].search([("model", "=", self._name)])
-        overwrite_match = True
-        import_match = self.env["spp.import.match"].search([("model_id", "=", model_id.id)])
-        if import_match:
-            overwrite_match = import_match.overwrite_match
+        overwrite_match = self.env.context.get("overwrite_match", False)
 
         if usable:
             newdata = list()
+            match_created = 0
+            match_skipped = 0
+            match_overwritten = 0
             if ".id" in fields:
                 column = fields.index(".id")
                 fields[column] = "id"
@@ -70,6 +73,7 @@ def load(self, fields, data):
                 row["id"] = ext_id[match.id] if match else row.get("id", "")
                 if match:
                     if overwrite_match:
+                        match_overwritten += 1
                         flat_fields_to_remove = [item for sublist in field_to_match for item in sublist]
                         for fields_pop in flat_fields_to_remove:
                             # Set one2many and many2many fields to False if matched
@@ -80,19 +84,25 @@ def load(self, fields, data):
                             ]:
                                 row[fields_pop] = False
                         newdata.append(tuple(row[f] for f in clean_fields))
+                    else:
+                        match_skipped += 1
                 else:
+                    match_created += 1
                     newdata.append(tuple(row[f] for f in fields))
             data = newdata
+            if self.env.context.get("import_match_ids"):
+                _import_match_local.counts = {
+                    "created": match_created,
+                    "skipped": match_skipped,
+                    "overwritten": match_overwritten,
+                }
         return super().load(fields, data)
 
     def write(self, vals):
-        # nosemgrep: odoo-sudo-without-context - reading model metadata requires sudo
-        model = self.env["ir.model"].sudo().search([("model", "=", self._name)])
         new_vals = vals.copy()
-        for rec in vals:
-            field_name = rec
-            if not vals[field_name]:
-                field = self.env["ir.model.fields"].search([("model_id", "=", model.id), ("name", "=", field_name)])
-                if field and field.ttype in ("one2many", "many2many"):
-                    new_vals.pop(rec)
+        for field_name, value in vals.items():
+            if not value and field_name in self._fields:
+                field_meta = self._fields[field_name]
+                if field_meta.type in ("one2many", "many2many"):
+                    new_vals.pop(field_name)
         return super().write(new_vals)

spp_import_match/models/base.py

@@ -9,6 +9,8 @@
 
 from odoo.addons.queue_job.exception import FailedJobError
 
+from .base import _import_match_local
+
 _logger = logging.getLogger(__name__)
 # options defined in base_import/import.js
 OPT_HAS_HEADER = "headers"
@@ -62,18 +64,30 @@ def execute_import(self, fields, columns, options, dryrun=False):
         _logger.info("Started Import: %s with rows %d", self.res_model, len(input_file_data))
 
         import_match_ids = options.get("import_match_ids", [])
+        overwrite_match = options.get("overwrite_match", False)
+        _import_match_local.counts = None
 
         if dryrun:
             _logger.info("Doing dry-run import")
             if import_match_ids:
-                self = self.with_context(import_match_ids=import_match_ids)
-            return super().execute_import(fields, columns, options, dryrun=True)
+                self = self.with_context(import_match_ids=import_match_ids, overwrite_match=overwrite_match)
+            result = super().execute_import(fields, columns, options, dryrun=True)
+            counts = getattr(_import_match_local, "counts", None)
+            if counts:
+                result["import_match_counts"] = counts
+                _import_match_local.counts = None
+            return result
 
         if len(input_file_data) <= 100:
             _logger.info("Doing normal import")
             if import_match_ids:
-                self = self.with_context(import_match_ids=import_match_ids)
-            return super().execute_import(fields, columns, options, dryrun=False)
+                self = self.with_context(import_match_ids=import_match_ids, overwrite_match=overwrite_match)
+            result = super().execute_import(fields, columns, options, dryrun=False)
+            counts = getattr(_import_match_local, "counts", None)
+            if counts:
+                result["import_match_counts"] = counts
+                _import_match_local.counts = None
+            return result
 
         _logger.info("Started Asynchronous Import: %s", self.res_model)
         # asynchronous import

spp_import_match/models/base_import.py

@@ -70,7 +70,7 @@ def _match_find(self, model, converted_row, imported_row):
             if len(match) == 1:
                 return match
             elif len(match) > 1:
-                raise ValidationError(_("Multiple matches found for '%s'!").format(match[0].name))
+                raise ValidationError(_("Multiple matches found for '%s'!") % match[0].name)
 
         return model