project_scrum: updated mermaid with web_mermaid

Author: iammiracle

project_scrum/__manifest__.p.py

@@ -110,11 +110,7 @@
         # # endif
         'sales_team',
         'calendar',
-        # # if VERSION ==  "14.0"
-        'web_widget_mermaid', # https://github.com/OCA/web/tree/14.0/web_widget_mermaid
-        # # else
-        'web_widget_mermaid_field' # https://github.com/VictorHachard/odoo-modules/tree/17.0/web_widget_mermaid_field,
-        # # endif
+        'web_mermaid'
     ],
     'data': [
         'views/project_scrum_view.xml',

project_scrum/__manifest__.py

@@ -103,7 +103,7 @@
         'mail', 'hr_timesheet',
         'sales_team',
         'calendar',
-        'web_widget_mermaid_field' # https://github.com/VictorHachard/odoo-modules/tree/17.0/web_widget_mermaid_field,
+        'web_mermaid'
     ],
     'data': [
         'views/project_scrum_view.xml',

project_scrum/models/project_scrum_us.p.py

@@ -11,12 +11,10 @@
 
 class ProjectUserStories(models.Model):
     _name = 'project.scrum.us'
-    _inherit = ['mail.thread', 'mail.activity.mixin']
+    _inherit = ['mail.thread', 'mail.activity.mixin', 'mermaid.mixin']
     _description = 'Project Scrum Use Stories'
     _order = 'sequence'
 
-    _mermaid_keywords = r"^(graph|sequenceDiagram|classDiagram|stateDiagram|" \
-                        r"erDiagram|flowchart|pie|journey|gantt|gitGraph)\b"
 
     def create_test_case_from_us(self):
         active_ids = self.env['project.scrum.us'].browse(self.env.context.get('active_ids'))
@@ -174,100 +172,3 @@ def _read_group_sprint_id(self, present_ids, domain):
         'sprint_ids': _read_group_sprint_id,
     }
 
-    mermaid_editor = fields.Html(string="Editor", copy=False)
-
-    def wrap_mermaid_in_pre(self, mermaid_editor):
-        """
-        Finds Mermaid diagrams in HTML content and wraps them inside <pre> tags.
-
-        Args:
-            mermaid_editor (str): The raw HTML content.
-
-        Returns:
-            str: Modified HTML with Mermaid diagrams wrapped in <pre>.
-        """
-        if not mermaid_editor:
-            return ""
-
-        soup = BeautifulSoup(mermaid_editor, "html.parser")
-
-        # Check for existing pre tags with mermaid content
-        if soup.find('pre', class_='mermaid'):
-            return str(soup)
-
-        # Find potential Mermaid blocks
-        potential_blocks = [tag for tag in soup.find_all(["p", "div"])
-                            if re.search(self._mermaid_keywords, tag.get_text().lstrip(), re.MULTILINE)]
-
-        # Process each potential block
-        for start_tag in potential_blocks:
-            diagram_content = []
-            siblings_to_remove = []
-            current_tag = start_tag
-
-            # Process starting tag
-            for child in BeautifulSoup(str(current_tag), "html.parser").find_all(string=True):
-                if child.strip():
-                    diagram_content.append(html.unescape(str(child)))
-
-            # Process potential siblings
-            next_tag = current_tag.next_sibling
-            while next_tag and hasattr(next_tag, 'name') and next_tag.name in ['p', 'div']:
-                if re.search(self._mermaid_keywords, next_tag.get_text().lstrip(), re.MULTILINE):
-                    break
-
-                for child in BeautifulSoup(str(next_tag), "html.parser").find_all(string=True):
-                    if child.strip():
-                        diagram_content.append(html.unescape(str(child)))
-
-                siblings_to_remove.append(next_tag)
-                next_tag = next_tag.next_sibling
-
-            # Create pre tag and replace original tag
-            pre_tag = soup.new_tag("pre")
-            pre_tag.string = "\n".join(diagram_content)
-            pre_tag['class'] = 'mermaid'
-            start_tag.replace_with(pre_tag)
-
-            # Remove siblings that were processed
-            for sibling in siblings_to_remove:
-                sibling.extract()  # extract() is an alternative to decompose()
-
-        return str(soup)
-
-    @api.depends('mermaid_editor')
-    def _compute_mermaid_editor(self):
-        """
-        Computes the Mermaid diagram text and wraps it in <pre> tags if needed.
-        Only processes content that appears to be Mermaid diagrams.
-        """
-        for rec in self:
-            # Skip empty content or when called from our own update
-            if not rec.mermaid_editor:
-                rec.mermaid_diagram = ""
-                continue
-
-            soup = BeautifulSoup(rec.mermaid_editor, "html.parser")
-
-            # Check for existing pre tag with mermaid content
-            pre_tag = soup.find('pre', class_='mermaid')
-            if pre_tag:
-                rec.mermaid_diagram = pre_tag.get_text()
-                continue
-
-            # Check if content appears to be mermaid format
-            text_content = soup.get_text('\n', strip=True)
-            if not re.search(self._mermaid_keywords, text_content, re.MULTILINE):
-                rec.mermaid_diagram = ""
-                continue
-
-            # Extract text preserving structure and indentation
-            text_content = soup.get_text('\n', strip=False).replace('\xa0', ' ')
-            rec.mermaid_diagram = text_content
-
-            # Wrap in pre tags
-            wrapped_content = self.wrap_mermaid_in_pre(rec.mermaid_editor)
-            if wrapped_content != rec.mermaid_editor:
-                rec.mermaid_editor = wrapped_content
-
-    mermaid_diagram = fields.Text(string="Diagram", compute=_compute_mermaid_editor, copy=False)

project_scrum/models/project_scrum_us.py

@@ -11,13 +11,10 @@
 
 class ProjectUserStories(models.Model):
     _name = 'project.scrum.us'
-    _inherit = ['mail.thread', 'mail.activity.mixin']
+    _inherit = ['mail.thread', 'mail.activity.mixin', 'mermaid.mixin']
     _description = 'Project Scrum Use Stories'
     _order = 'sequence'
 
-    _mermaid_keywords = r"^(graph|sequenceDiagram|classDiagram|stateDiagram|" \
-                        r"erDiagram|flowchart|pie|journey|gantt|gitGraph)\b"
-
     def create_test_case_from_us(self):
         active_ids = self.env['project.scrum.us'].browse(self.env.context.get('active_ids'))
         if not active_ids:
@@ -161,101 +158,3 @@ def _read_group_sprint_id(self, present_ids, domain):
     _group_by_full = {
         'sprint_ids': _read_group_sprint_id,
     }
-
-    mermaid_editor = fields.Html(string="Editor", copy=False)
-
-    def wrap_mermaid_in_pre(self, mermaid_editor):
-        """
-        Finds Mermaid diagrams in HTML content and wraps them inside <pre> tags.
-
-        Args:
-            mermaid_editor (str): The raw HTML content.
-
-        Returns:
-            str: Modified HTML with Mermaid diagrams wrapped in <pre>.
-        """
-        if not mermaid_editor:
-            return ""
-
-        soup = BeautifulSoup(mermaid_editor, "html.parser")
-
-        # Check for existing pre tags with mermaid content
-        if soup.find('pre', class_='mermaid'):
-            return str(soup)
-
-        # Find potential Mermaid blocks
-        potential_blocks = [tag for tag in soup.find_all(["p", "div"])
-                            if re.search(self._mermaid_keywords, tag.get_text().lstrip(), re.MULTILINE)]
-
-        # Process each potential block
-        for start_tag in potential_blocks:
-            diagram_content = []
-            siblings_to_remove = []
-            current_tag = start_tag
-
-            # Process starting tag
-            for child in BeautifulSoup(str(current_tag), "html.parser").find_all(string=True):
-                if child.strip():
-                    diagram_content.append(html.unescape(str(child)))
-
-            # Process potential siblings
-            next_tag = current_tag.next_sibling
-            while next_tag and hasattr(next_tag, 'name') and next_tag.name in ['p', 'div']:
-                if re.search(self._mermaid_keywords, next_tag.get_text().lstrip(), re.MULTILINE):
-                    break
-
-                for child in BeautifulSoup(str(next_tag), "html.parser").find_all(string=True):
-                    if child.strip():
-                        diagram_content.append(html.unescape(str(child)))
-
-                siblings_to_remove.append(next_tag)
-                next_tag = next_tag.next_sibling
-
-            # Create pre tag and replace original tag
-            pre_tag = soup.new_tag("pre")
-            pre_tag.string = "\n".join(diagram_content)
-            pre_tag['class'] = 'mermaid'
-            start_tag.replace_with(pre_tag)
-
-            # Remove siblings that were processed
-            for sibling in siblings_to_remove:
-                sibling.extract()  # extract() is an alternative to decompose()
-
-        return str(soup)
-
-    @api.depends('mermaid_editor')
-    def _compute_mermaid_editor(self):
-        """
-        Computes the Mermaid diagram text and wraps it in <pre> tags if needed.
-        Only processes content that appears to be Mermaid diagrams.
-        """
-        for rec in self:
-            # Skip empty content or when called from our own update
-            if not rec.mermaid_editor:
-                rec.mermaid_diagram = ""
-                continue
-
-            soup = BeautifulSoup(rec.mermaid_editor, "html.parser")
-
-            # Check for existing pre tag with mermaid content
-            pre_tag = soup.find('pre', class_='mermaid')
-            if pre_tag:
-                rec.mermaid_diagram = pre_tag.get_text()
-                continue
-
-            # Check if content appears to be mermaid format
-            text_content = soup.get_text('\n', strip=True)
-            if not re.search(self._mermaid_keywords, text_content, re.MULTILINE):
-                rec.mermaid_diagram = ""
-                continue
-
-            # Extract text preserving structure and indentation
-            text_content = soup.get_text('\n', strip=False).replace('\xa0', ' ')
-            rec.mermaid_diagram = text_content
-
-            # Wrap in pre tags
-            wrapped_content = self.wrap_mermaid_in_pre(rec.mermaid_editor)
-            if wrapped_content != rec.mermaid_editor:
-                rec.mermaid_editor = wrapped_content
-
-    mermaid_diagram = fields.Text(string="Diagram", compute=_compute_mermaid_editor, copy=False)