hap-cli 0.9.0__tar.gz → 0.9.2__tar.gz

{hap_cli-0.9.0 → hap_cli-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.9.0
+Version: 0.9.2
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -312,6 +312,7 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
+| `attachment download FILE_ID --worksheet-id WS --row-id ROW --control-id FIELD [-o PATH]` | Download a worksheet-record attachment with the same record and field permission checks as the web app; existing local files are never overwritten |
 | `attachment share [ADDRESS]` | Create a link to a stored file that you can pass on (`--hours`, default 48; `--file-id` to share by attachment id, `--short` for a landing page instead of the storage address) |
 
 > ADDRESS is the file's link — one that has already stopped working is fine, paste it as-is — or just the path part of it. The file itself does not expire, only the link does, so a dead link can always be revived.

{hap_cli-0.9.0/hap_cli → hap_cli-0.9.2}/README.md

@@ -283,6 +283,7 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
+| `attachment download FILE_ID --worksheet-id WS --row-id ROW --control-id FIELD [-o PATH]` | Download a worksheet-record attachment with the same record and field permission checks as the web app; existing local files are never overwritten |
 | `attachment share [ADDRESS]` | Create a link to a stored file that you can pass on (`--hours`, default 48; `--file-id` to share by attachment id, `--short` for a landing page instead of the storage address) |
 
 > ADDRESS is the file's link — one that has already stopped working is fine, paste it as-is — or just the path part of it. The file itself does not expire, only the link does, so a dead link can always be revived.

{hap_cli-0.9.0 → hap_cli-0.9.2}/app_live_tests/smoke.py

@@ -226,6 +226,146 @@ def case_custom_action(app_id: str, section_id: str) -> None:
     hap(["worksheet", "delete", ws_id, "-a", app_id, "-y"], check=False)
 
 
+def case_custom_action_update(app_id: str, section_id: str) -> None:
+    """bug #455751: --action-spec with --btn-id edits the action in place."""
+    print("scenario: custom-action update by id")
+    ws_id = _make_worksheet(app_id, section_id, "LT-action-update")
+    try:
+        ok, res = _try(["worksheet", "create-custom-action", ws_id, "-a",
+                        app_id, "--action-spec", json.dumps(
+                            {"name": "ORIGINAL", "type": "triggerWorkflow",
+                             "color": "#2196F3"})])
+        check("update: workflow action created", ok, str(res)[:160])
+        btn_id = res.get("actionId") if ok else ""
+        proc_id = res.get("processId") if ok else ""
+        ok, res = _try(["worksheet", "create-custom-action", ws_id, "-a",
+                        app_id, "--btn-id", btn_id, "--action-spec",
+                        json.dumps({"name": "UPDATED"})])
+        check("update: edit succeeds", ok, str(res)[:160])
+        check("update: the id is unchanged",
+              ok and res.get("actionId") == btn_id, str(res)[:160])
+        check("update: the same workflow is reported",
+              ok and res.get("processId") == proc_id, str(res)[:160])
+        acts = _actions(ws_id)
+        check("update: still one action", len(acts) == 1,
+              str([(a.get("btnId"), a.get("name")) for a in acts]))
+        got = acts[0] if acts else {}
+        check("update: renamed in place",
+              got.get("btnId") == btn_id and got.get("name") == "UPDATED",
+              str((got.get("btnId"), got.get("name"))))
+        check("update: unnamed settings kept",
+              got.get("color") == "#2196F3" and got.get("clickType") == 1,
+              str((got.get("color"), got.get("clickType"))))
+        wf = [r for r in _workflow_rows(app_id)
+              if r.get("id") == proc_id or r.get("processId") == proc_id]
+        check("update: the action's workflow survives", bool(wf),
+              proc_id)
+
+        # A fill action edited by id stays a fill action and keeps its fields.
+        title = next((c["controlId"] for c in _fields(ws_id)
+                      if c.get("attribute") == 1), "")
+        ok, res = _try(["worksheet", "create-custom-action", ws_id, "-a",
+                        app_id, "--action-spec", json.dumps(
+                            {"name": "FILL", "type": "updateCurrentRecord",
+                             "updateFields": [title]})])
+        fill_id = res.get("actionId") if ok else ""
+        ok, res = _try(["worksheet", "create-custom-action", ws_id, "-a",
+                        app_id, "--btn-id", fill_id, "--action-spec",
+                        json.dumps({"name": "FILL2"})])
+        check("update: fill action edit succeeds", ok, str(res)[:160])
+        acts = _actions(ws_id)
+        fill = next((a for a in acts if a.get("btnId") == fill_id), {})
+        check("update: two actions after editing the second", len(acts) == 2,
+              str([(a.get("btnId"), a.get("name")) for a in acts]))
+        check("update: fill action keeps its kind and field",
+              fill.get("name") == "FILL2" and fill.get("clickType") == 3
+              and [w.get("controlId") for w in fill.get("writeControls")
+                   or []] == [title],
+              str((fill.get("name"), fill.get("clickType"),
+                   fill.get("writeControls"))))
+
+        ok, res = _try(["worksheet", "create-custom-action", ws_id, "-a",
+                        app_id, "--btn-id", "000000000000000000000000",
+                        "--action-spec", json.dumps({"name": "GHOST"})])
+        check("update: unknown id is refused", not ok, str(res)[:160])
+        check("update: nothing created for an unknown id",
+              len(_actions(ws_id)) == 2, str(len(_actions(ws_id))))
+    finally:
+        hap(["worksheet", "delete", ws_id, "-a", app_id, "-y"], check=False)
+
+
+def case_hidden_defaults(app_id: str, section_id: str) -> None:
+    """bug #455757: a hidden field's default goes in with a new record.
+
+    The form submits every non-empty cell on create, hidden ones included,
+    so the defaults the CLI fills in must not be judged as the caller
+    writing a hidden field. Writing one yourself is still refused.
+    """
+    print("scenario: hidden defaults on create")
+    ws_id = _make_worksheet(app_id, section_id, "LT-hidden-defaults")
+
+    def static(value):
+        return {"defsource": json.dumps(
+            [{"cid": "", "rcid": "", "staticValue": value}])}
+    try:
+        ok, res = _try(["worksheet", "add-fields", ws_id, "--controls",
+                        json.dumps([
+                            {"type": 2, "controlName": "Stage",
+                             "fieldPermission": "110",
+                             "advancedSetting": static("Draft")},
+                            {"type": 2, "controlName": "Status",
+                             "fieldPermission": "110",
+                             "advancedSetting": static("Open")}])])
+        check("hidden: fields added", ok, str(res)[:160])
+        ids = {c.get("controlName"): c.get("controlId")
+               for c in _fields(ws_id)}
+        name_id = next((c["controlId"] for c in _fields(ws_id)
+                        if c.get("attribute") == 1), "")
+        stage, status = ids.get("Stage"), ids.get("Status")
+
+        ok, res = _try(["worksheet", "record", "create", ws_id, "-a", app_id,
+                        "--fields-json", json.dumps(
+                            [{"id": name_id, "value": "visible-only"}])])
+        check("hidden: create with only the visible field succeeds", ok,
+              str(res)[:200])
+        row_id = ((res.get("data") or {}).get("rowid")
+                  if ok and isinstance(res, dict) else "")
+        got = (hap(["worksheet", "record", "get", ws_id, row_id, "-a",
+                    app_id]) or {}) if row_id else {}
+        got = got.get("data", got) if isinstance(got, dict) else {}
+        check("hidden: the hidden defaults were stored",
+              got.get(stage) == "Draft" and got.get(status) == "Open",
+              str({k: got.get(k) for k in (name_id, stage, status)}))
+
+        ok, res = _try(["worksheet", "record", "create", ws_id, "-a", app_id,
+                        "--fields-json", json.dumps(
+                            [{"id": name_id, "value": "sneaky"},
+                             {"id": stage, "value": "Won"}])])
+        check("hidden: writing a hidden field yourself is refused",
+              not ok and "Stage" in str(res) and "Status" not in str(res),
+              str(res)[:240])
+
+        rows = json.dumps([{name_id: "batch-1"}, {name_id: "batch-2"}])
+        ok, res = _try(["worksheet", "record", "batch-create", ws_id,
+                        "-a", app_id, "--rows", rows])
+        check("hidden: batch create with only visible fields succeeds", ok,
+              str(res)[:200])
+        rows = json.dumps([{name_id: "batch-3"},
+                           {name_id: "batch-4", stage: "Won"}])
+        ok, res = _try(["worksheet", "record", "batch-create", ws_id,
+                        "-a", app_id, "--rows", rows])
+        check("hidden: batch writing a hidden field is refused on its row",
+              not ok and "row 2" in str(res) and "row 1" not in str(res),
+              str(res)[:240])
+        listed = (hap(["worksheet", "record", "list", ws_id, "-a", app_id])
+                  or {}).get("rows") or []
+        blob = json.dumps(listed, ensure_ascii=False)
+        check("hidden: the refused batch wrote nothing",
+              "batch-3" not in blob and "batch-1" in blob, blob[:200])
+    finally:
+        hap(["worksheet", "delete", ws_id, "-a", app_id, "-y"], check=False)
+
+
 def _items(app_id: str) -> dict[str, str]:
     """All sidebar items (worksheets, pages, chatbots) name -> id."""
     detail = hap(["app", "info", "-a", app_id])
@@ -3397,6 +3537,71 @@ def case_fb_subtable_read(app_id: str, section_id: str) -> None:
         hap(["worksheet", "delete", parent, "--yes"], check=False)
 
 
+def case_editor_inline_subtable(app_id: str, section_id: str) -> None:
+    """Bug #455768: edit-spec field ops on an inline sub-table's own sheet."""
+    print("\nscenario: editor field ops on an inline sub-table (#455768)")
+    import json as _json
+    name = "BUG455768-sub-parent"
+    parent = _make_worksheet(app_id, section_id, name)
+    check("inline-subtable: a throwaway parent was created", bool(parent))
+    if not parent:
+        return
+    try:
+        hap(["worksheet", "update-fields", parent, "--title-name", "名称",
+             "--no-verify", "--fields", _json.dumps([
+                 {"type": "TEXT", "name": "名称"},
+                 {"type": "SUB_LIST", "name": "内嵌明细", "child_fields": [
+                     {"type": "TEXT", "name": "行名称"},
+                     {"type": "NUMBER", "name": "行数量"}]},
+             ], ensure_ascii=False)], check=False)
+        child = next((c.get("dataSource") for c in _fields(parent)
+                      if c.get("type") == 34), "")
+        check("inline-subtable: the parent names its child sheet",
+              bool(child), str(child))
+        if not child:
+            return
+
+        def _child_cols() -> list[dict]:
+            got = hap(["worksheet", "fields", child, "--raw",
+                       "--parent", parent], check=False)
+            return [c for c in got if len(c.get("controlId") or "") == 24] \
+                if isinstance(got, list) else []
+
+        rc, out, err = editor_apply({"app": app_id, "ops": [
+            {"type": "field.update", "worksheet": child, "field": "行名称",
+             "set": {"hint": "按id改"}}]})
+        check("inline-subtable: field.update by sheet id applies", rc == 0,
+              (err or out)[-300:])
+        cols = {c["controlName"]: c for c in _child_cols()}
+        check("inline-subtable: the hint reads back",
+              (cols.get("行名称") or {}).get("hint") == "按id改",
+              str(cols.get("行名称"))[:200])
+
+        rc, out, err = editor_apply({"app": app_id, "ops": [
+            {"type": "field.update", "worksheet": f"{name}/内嵌明细",
+             "field": "行数量", "rename": "数量", "set": {}},
+            {"type": "field.add", "worksheet": child,
+             "field": {"name": "行备注", "type": "Text"}},
+            {"type": "field.reorder", "worksheet": child,
+             "order": ["行备注", "数量"]},
+            {"type": "field.delete", "worksheet": child, "field": "行名称",
+             "confirm": True}]})
+        check("inline-subtable: add / reorder / delete apply", rc == 0,
+              (err or out)[-300:])
+        names = [c["controlName"] for c in
+                 sorted(_child_cols(), key=lambda c: c.get("row", 0))]
+        check("inline-subtable: columns read back renamed, added, "
+              "reordered and deleted", names == ["行备注", "数量"],
+              str(names))
+        sub = next((c for c in _fields(parent) if c.get("type") == 34), {})
+        shown = {c["controlId"]: c["controlName"] for c in _child_cols()}
+        check("inline-subtable: the new column is shown in the sub-table",
+              [shown.get(i) for i in sub.get("showControls") or []]
+              == ["行备注", "数量"], str(sub.get("showControls")))
+    finally:
+        hap(["worksheet", "delete", parent, "-a", app_id, "-y"], check=False)
+
+
 def case_fb_subgroups(app_id: str, section_id: str) -> None:
     """WO-FB 3.1: the editor can see worksheets in second-level groups."""
     print("\nscenario: sub-group visibility (WO-FB 3.1)")
@@ -4546,6 +4751,8 @@ _CASES = {
     "view": case_view,
     "role": case_role,
     "custom-action": case_custom_action,
+    "custom-action-update": case_custom_action_update,
+    "hidden-defaults": case_hidden_defaults,
     "chatbot": case_chatbot,
     "custom-page": case_custom_page,
     "component": case_component,
@@ -4585,6 +4792,7 @@ _CASES = {
     "fb-layout-check": case_fb_layout_check,
     "fb-pair-relation": case_fb_pair_relation,
     "fb-subtable-read": case_fb_subtable_read,
+    "editor-inline-subtable": case_editor_inline_subtable,
     "fb-subgroups": case_fb_subgroups,
     "fb-button-target": case_fb_button_target,
     "g6-advanced-fields": case_g6_advanced_fields,

{hap_cli-0.9.0 → hap_cli-0.9.2/hap_cli}/README.md

@@ -283,6 +283,7 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
+| `attachment download FILE_ID --worksheet-id WS --row-id ROW --control-id FIELD [-o PATH]` | Download a worksheet-record attachment with the same record and field permission checks as the web app; existing local files are never overwritten |
 | `attachment share [ADDRESS]` | Create a link to a stored file that you can pass on (`--hours`, default 48; `--file-id` to share by attachment id, `--short` for a landing page instead of the storage address) |
 
 > ADDRESS is the file's link — one that has already stopped working is fine, paste it as-is — or just the path part of it. The file itself does not expire, only the link does, so a dead link can always be revived.

{hap_cli-0.9.0 → hap_cli-0.9.2}/hap_cli/README_CN.md

@@ -262,6 +262,7 @@ hap --json worksheet record list WORKSHEET_ID
 
 | 命令 | 说明 |
 |---|---|
+| `attachment download FILE_ID --worksheet-id WS --row-id ROW --control-id FIELD [-o PATH]` | 按网页端相同的记录和字段权限校验下载工作表记录附件；不会覆盖已有本地文件 |
 | `attachment share [ADDRESS]` | 为已存储的文件生成一条可以转给别人的链接（`--hours`，默认 48 小时；`--file-id` 按附件 ID 分享，`--short` 返回文件介绍页而非存储地址） |
 
 > ADDRESS 传文件的链接即可——**已经失效的链接照样能传，原样粘贴**——也可以只传路径部分。文件本身不会过期，过期的只是链接，所以失效链接随时可以重新生成。

{hap_cli-0.9.0 → hap_cli-0.9.2}/hap_cli/__init__.py

@@ -3,7 +3,7 @@
 import sys as _sys
 import types as _types
 
-__version__ = "0.9.0"
+__version__ = "0.9.2"
 
 # 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.0 → hap_cli-0.9.2}/hap_cli/commands/attachment_cmd.py

@@ -1,5 +1,7 @@
 """CLI commands for files stored as attachments."""
 
+from pathlib import Path
+
 import click
 
 from hap_cli.context import pass_context
@@ -55,7 +57,43 @@ def attachment_share(ctx, address, hours, file_id, short, display_name, size):
         ctx.handle_error(e)
 
 
+@attachment.command("download")
+@click.argument("file_id")
+@click.option("--worksheet-id", required=True, help="Worksheet containing the record.")
+@click.option("--row-id", required=True, help="Record containing the attachment.")
+@click.option("--control-id", required=True, help="Attachment field containing the file.")
+@click.option(
+    "--output", "-o", "output", type=click.Path(path_type=Path, dir_okay=False),
+    default=None, help="Save as this path. By default, uses the attachment name.",
+)
+@pass_context
+def attachment_download(ctx, file_id, worksheet_id, row_id, control_id, output):
+    """Download a file attached to a worksheet record.
+
+    FILE_ID is listed in an attachment field or a record operation log.
+    Existing local files are never overwritten.
+    """
+    try:
+        session = ctx.get_session()
+        data = attachment_mod.download_attachment(
+            session,
+            file_id,
+            worksheet_id=worksheet_id,
+            row_id=row_id,
+            control_id=control_id,
+            output=output,
+        )
+        ctx.output(data, _download_human)
+    except Exception as e:
+        ctx.handle_error(e)
+
+
 def _human(d):
     click.echo(d["url"])
     if d.get("expiresAt"):
         click.echo(f"Usable until {d['expiresAt']}")
+
+
+def _download_human(d):
+    click.echo(d["path"])
+    click.echo(f"{d['bytes']} bytes")

{hap_cli-0.9.0 → hap_cli-0.9.2}/hap_cli/commands/chat_cmd.py

@@ -246,6 +246,7 @@ def chat_messages(
                 page_index=page,
                 page_size=num,
                 category=category,
+                keyword=keyword,
             )
             if mark_read and category:
                 chat_mod.mark_inbox_read(session, category)

{hap_cli-0.9.0 → hap_cli-0.9.2}/hap_cli/commands/worksheet_cmd.py

@@ -1299,7 +1299,7 @@ def worksheet_save_button(ctx, worksheet_id, btn_config, action_spec,
             eff_app = app_id or getattr(session, "default_app_id", "") or ""
             data = ws_mod.create_custom_action(
                 session, worksheet_id, json.loads(action_spec),
-                app_id=eff_app,
+                app_id=eff_app, btn_id=btn_id,
             )
         else:
             btn_data = json.loads(btn_config)