hap-cli 0.9.3__tar.gz → 0.9.4__tar.gz

{hap_cli-0.9.3 → hap_cli-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.9.3
+Version: 0.9.4
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0

{hap_cli-0.9.3 → hap_cli-0.9.4}/app_live_tests/smoke.py

@@ -155,6 +155,32 @@ def case_view(app_id: str, section_id: str) -> None:
     hap(["worksheet", "delete", ws_id, "-a", app_id, "-y"], check=False)
 
 
+def case_view_spec_partial(app_id: str, section_id: str) -> None:
+    """Bug #455744: a --view-spec naming only the card title must leave the
+    calendar's name, type and start-date field alone."""
+    print("scenario: view update --view-spec keeps unexpressed settings")
+    ws_id = _make_worksheet(app_id, section_id, "LT-view-spec-partial")
+    title_id = next((c["controlId"] for c in _fields(ws_id)
+                     if c.get("attribute") == 1), "")
+    res = hap(["worksheet", "view", "create", ws_id, "日历",
+               "--view-type", "calendar", "--begin-date", "ctime",
+               "-a", app_id])
+    vid = res.get("viewId") if isinstance(res, dict) else ""
+    check("calendar view created", bool(vid), str(res))
+    ok, res = _try(["worksheet", "view", "update", ws_id, vid, "-a", app_id,
+                    "--view-spec",
+                    json.dumps({"card": {"titleField": title_id}})])
+    check("title-only view-spec update succeeds", ok, str(res))
+    view = hap(["worksheet", "view", "info", ws_id, vid]) or {}
+    adv = view.get("advancedSetting") or {}
+    check("name kept", view.get("name") == "日历", str(view.get("name")))
+    check("still a calendar", view.get("viewType") == 4,
+          str(view.get("viewType")))
+    check("start date kept", adv.get("begindate") == "ctime", str(adv))
+    check("title field written", adv.get("viewtitle") == title_id, str(adv))
+    hap(["worksheet", "delete", ws_id, "-a", app_id, "-y"], check=False)
+
+
 def _roles(app_id: str) -> dict[str, str]:
     data = hap(["app", "role", "list", "-a", app_id], check=False)
     roles = data.get("roles", []) if isinstance(data, dict) else []
@@ -4832,6 +4858,7 @@ _CASES = {
     "rs-business-rules": case_rs_business_rules,
     "field": case_field,
     "view": case_view,
+    "view-spec-partial": case_view_spec_partial,
     "role": case_role,
     "custom-action": case_custom_action,
     "custom-action-update": case_custom_action_update,

{hap_cli-0.9.3 → hap_cli-0.9.4}/hap_cli/__init__.py

@@ -3,7 +3,7 @@
 import sys as _sys
 import types as _types
 
-__version__ = "0.9.3"
+__version__ = "0.9.4"
 
 # The command tree used to live in hap_cli/hap_cli.py. A module named
 # after the package it sits in shadows that package: run python with the

{hap_cli-0.9.3 → hap_cli-0.9.4}/hap_cli/core/worksheet.py

@@ -2222,20 +2222,34 @@ def update_view_spec(
     from hap_cli.core import view_spec_adapter as _vsa
     field_resolver, control_types = _view_field_maps(
         session, worksheet_id, app_id)
+    current = get_view_detail(
+        session, worksheet_id, view_id, app_id=app_id) or {}
+    # The adapter is built for create, where a missing type means a table
+    # view and a missing name means "". On an update the spec only says
+    # what changes, so an absent type is the view's current type (it also
+    # drives type-specific translation such as card/cover defaults) and an
+    # absent name must not be written at all — otherwise a title-only spec
+    # turns a calendar into a nameless table view (bug #455744).
+    spec = dict(spec)
+    if "viewType" not in spec and "type" not in spec \
+            and current.get("viewType") is not None:
+        spec["viewType"] = current["viewType"]
     payload = _vsa.build_view_payload(
         spec, worksheet_id=worksheet_id, app_id=app_id, view_id=view_id,
         field_resolver=field_resolver or None,
         control_types=control_types or None,
     )
+    if "name" not in spec:
+        payload.pop("name", None)
     # Changing the view TYPE is not a partial edit. The product handles it
     # by posting the whole view object — read back, merged, re-defaulted for
     # the new type — with no editAttrs (ViewControl.jsx:256-259). Naming
     # viewType in editAttrs is a path the product never takes.
     new_type = payload.get("viewType")
     if new_type is not None:
-        current = get_view_detail(
-            session, worksheet_id, view_id, app_id=app_id) or {}
         if current and current.get("viewType") != new_type:
+            logger.info("view spec: view %s type %s -> %s, saving whole view",
+                        view_id, current.get("viewType"), new_type)
             merged = {**current, **payload}
             merged.pop("editAttrs", None)
             merged.pop("editAdKeys", None)

{hap_cli-0.9.3 → hap_cli-0.9.4}/hap_cli/tests/test_core.py

@@ -10566,6 +10566,78 @@ class TestUpdateViewSpec:
             assert identity not in body["editAttrs"]
         assert "navshow" in body["editAdKeys"]
 
+    @staticmethod
+    def _route_current(mock_post, current):
+        def _route(url, json=None, **kw):
+            if url.endswith("/Worksheet/GetWorksheetControls"):
+                return _mock_response({"controls": [
+                    {"controlId": "c1", "controlName": "标题", "type": 2},
+                ]})
+            if url.endswith("/Worksheet/GetWorksheetViewById"):
+                return _mock_response(current)
+            return _mock_response({"viewId": "vw1"})
+        mock_post.side_effect = _route
+
+    @staticmethod
+    def _save_body(mock_post):
+        saves = [c for c in mock_post.call_args_list
+                 if c.args[0].endswith("/Worksheet/SaveWorksheetView")]
+        assert len(saves) == 1
+        return saves[0].kwargs["json"]
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_title_only_spec_keeps_calendar_type_and_name(
+            self, mock_post, mock_session):
+        """Bug #455744: a spec naming only card.titleField must not turn a
+        calendar into a table view or blank its name — the spec says
+        nothing about either, so both are left as they are."""
+        self._route_current(mock_post, {
+            "viewId": "vw1", "viewType": 4, "name": "QA Calendar",
+            "advancedSetting": {"begindate": "cd1"},
+        })
+        ws_mod.update_view_spec(
+            mock_session, "ws1", "vw1", {"card": {"titleField": "c1"}},
+            app_id="app1",
+        )
+        body = self._save_body(mock_post)
+        # Still a partial edit — not the whole-object type-change save.
+        assert "editAttrs" in body
+        assert body.get("viewType", 4) == 4
+        assert "name" not in body
+        assert "name" not in body["editAttrs"]
+        assert "viewType" not in body["editAttrs"]
+        assert body["advancedSetting"]["viewtitle"] == "c1"
+        assert "begindate" not in body["editAdKeys"]
+        assert body["editAdKeys"] == list(body["advancedSetting"])
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_spec_without_name_keeps_table_view_name(
+            self, mock_post, mock_session):
+        self._route_current(mock_post, {
+            "viewId": "vw1", "viewType": 0, "name": "全部"})
+        ws_mod.update_view_spec(
+            mock_session, "ws1", "vw1", {"card": {"titleField": "c1"}},
+            app_id="app1",
+        )
+        body = self._save_body(mock_post)
+        assert "name" not in body
+        assert "name" not in body["editAttrs"]
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_explicit_type_change_still_saves_whole_view(
+            self, mock_post, mock_session):
+        self._route_current(mock_post, {
+            "viewId": "vw1", "viewType": 0, "name": "全部"})
+        ws_mod.update_view_spec(
+            mock_session, "ws1", "vw1", {"viewType": "gallery"},
+            app_id="app1",
+        )
+        body = self._save_body(mock_post)
+        assert body["viewType"] == 3
+        assert "editAttrs" not in body
+        # The spec did not rename it, so the current name rides along.
+        assert body["name"] == "全部"
+
 
 class TestFieldNormalizerFixtureCoverage:
     """Loads the user's captured get_worksheet_structure fixtures from

{hap_cli-0.9.3 → hap_cli-0.9.4}/hap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.9.3
+Version: 0.9.4
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0