mkdocs2confluence 0.7.36__tar.gz → 0.7.38__tar.gz

{mkdocs2confluence-0.7.36 → mkdocs2confluence-0.7.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.36
+Version: 0.7.38
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.7.36 → mkdocs2confluence-0.7.38}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.7.36"
+version = "0.7.38"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{mkdocs2confluence-0.7.36 → mkdocs2confluence-0.7.38}/src/mkdocs2confluence.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.36
+Version: 0.7.38
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.7.36 → mkdocs2confluence-0.7.38}/src/mkdocs_to_confluence/publisher/pipeline.py

@@ -647,13 +647,6 @@ def _post_process_action(
         except Exception:
             pass  # non-fatal
 
-    # Set full-width layout on created/updated pages (not folders).
-    if full_width and action.page_id and not action.is_folder:
-        try:
-            client.set_page_full_width(action.page_id)
-        except Exception:
-            pass  # non-fatal — page is published, layout is cosmetic
-
     # Apply labels (tags) from front matter — non-fatal on failure.
     if action.page_id and action.labels and not action.is_folder:
         try:
@@ -671,6 +664,13 @@ def _post_process_action(
             # Always print status errors — user configured status explicitly
             print(f"  [warn] could not set page status '{action.confluence_status}': {exc}")
 
+    # Set full-width LAST — Confluence's state/label PUTs can reset the appearance property.
+    if full_width and action.page_id and not action.is_folder:
+        try:
+            client.set_page_full_width(action.page_id)
+        except Exception:
+            pass  # non-fatal — page is published, layout is cosmetic
+
     # Upload assets — skip files whose mtime is not newer than Confluence.
     if action.page_id and action.attachments:
         uploaded, asset_skipped, asset_errors = _upload_assets(
@@ -729,13 +729,8 @@ def execute_publish(
     for action in plan:
         if action.action == "skip":
             report.skipped += 1
-            # Still apply full-width and status even for unchanged pages so that
-            # Confluence appearance resets (e.g. after manual edits) are corrected.
-            if full_width and action.page_id and not action.is_folder:
-                try:
-                    client.set_page_full_width(action.page_id)
-                except Exception as exc:
-                    print(f"  [warn] could not set full-width on page {action.page_id!r}: {exc}")
+            # Still apply status and full-width even for unchanged pages.
+            # full-width is applied LAST — status PUT can reset the appearance property.
             if action.page_id and action.confluence_status and not action.is_folder:
                 try:
                     print(
@@ -747,6 +742,11 @@ def execute_publish(
                     print(
                         f"  [warn] could not set page status '{action.confluence_status}': {exc}",
                     )
+            if full_width and action.page_id and not action.is_folder:
+                try:
+                    client.set_page_full_width(action.page_id)
+                except Exception as exc:
+                    print(f"  [warn] could not set full-width on page {action.page_id!r}: {exc}")
             continue
 
         counter += 1

{mkdocs2confluence-0.7.36 → mkdocs2confluence-0.7.38}/tests/test_publish_pipeline.py

@@ -1338,6 +1338,34 @@ class TestExecutePublishNonFatal:
         assert report.created == 1
         assert report.errors == []
 
+    def test_set_page_full_width_called_after_status_on_skip(self, tmp_path: Path) -> None:
+        """On skip actions, set_page_full_width must be called after set_page_status.
+
+        Regression test: Confluence's state PUT resets content-appearance-published,
+        so full-width must always be the last post-process write.
+        """
+        from mkdocs_to_confluence.publisher.pipeline import PageAction, execute_publish
+
+        docs_dir = tmp_path / "docs"
+        docs_dir.mkdir()
+        page = _make_page_node("P", tmp_path, docs_dir)
+        plan = [PageAction(node=page, title="P", action="skip", parent_id="ROOT",
+                           page_id="pid-skip", confluence_status="In Review")]
+        client = self._make_client()
+        client.set_page_full_width = MagicMock()
+        client.set_page_status = MagicMock()
+
+        execute_publish(plan, client, space_id="~42", docs_dir=docs_dir, full_width=True)
+
+        calls = [c[0] for c in client.mock_calls]
+        assert "set_page_full_width" in calls
+        assert "set_page_status" in calls
+        fw_idx = calls.index("set_page_full_width")
+        st_idx = calls.index("set_page_status")
+        assert fw_idx > st_idx, (
+            "set_page_full_width must be called after set_page_status on skip actions"
+        )
+
     def test_stamp_managed_after_fallback_create_is_non_fatal(self, tmp_path: Path) -> None:
         """stamp_managed after the update-fallback-to-create path is also non-fatal."""
         from mkdocs_to_confluence.publisher.client import ConfluenceError
@@ -1886,6 +1914,55 @@ class TestExecutePublishHelpers:
         _post_process_action(action, client, full_width=True,
                              docs_dir=tmp_path, report=report)
 
+    def test_post_full_width_called_after_status(self, tmp_path: Path) -> None:
+        """set_page_full_width must be called AFTER set_page_status.
+
+        Confluence's state PUT resets content-appearance-published, so
+        full-width must always be the last write.
+        """
+        from mkdocs_to_confluence.publisher.pipeline import PublishReport
+
+        node = _make_section_node("P", [])
+        action = PageAction(node=node, title="P", action="create",
+                            parent_id="ROOT", page_id="pid-9",
+                            confluence_status="In Review")
+        parent = MagicMock()
+        parent.set_page_full_width = MagicMock()
+        parent.set_page_status = MagicMock()
+        report = PublishReport()
+
+        _post_process_action(action, parent, full_width=True,
+                             docs_dir=tmp_path, report=report,
+                             space_key="DS")
+
+        calls = [c[0] for c in parent.mock_calls]
+        fw_idx = calls.index("set_page_full_width")
+        st_idx = calls.index("set_page_status")
+        assert fw_idx > st_idx, (
+            "set_page_full_width must be called after set_page_status"
+        )
+
+    def test_post_full_width_called_after_labels(self, tmp_path: Path) -> None:
+        """set_page_full_width must be called AFTER set_page_labels."""
+        from mkdocs_to_confluence.publisher.pipeline import PublishReport
+
+        node = _make_section_node("P", [])
+        action = PageAction(node=node, title="P", action="create",
+                            parent_id="ROOT", page_id="pid-10",
+                            labels=("foo",))
+        parent = MagicMock()
+        report = PublishReport()
+
+        _post_process_action(action, parent, full_width=True,
+                             docs_dir=tmp_path, report=report)
+
+        calls = [c[0] for c in parent.mock_calls]
+        fw_idx = calls.index("set_page_full_width")
+        lbl_idx = calls.index("set_page_labels")
+        assert fw_idx > lbl_idx, (
+            "set_page_full_width must be called after set_page_labels"
+        )
+
 
 # ── Quiet flag: stdout suppression ───────────────────────────────────────────