@voplus/morpho-csp 11.2.9 → 11.3.0-dev.0

package/es/modules/corporate/legal-generation/form/CorporateRepresentativeForm.js

@@ -3,38 +3,126 @@ import { Form } from "antd";
 import React from "react";
 import { SubmitButton } from "../components";
 import dayjs from "dayjs";
-const CorporateRepresentativeForm = () => {
-    return (React.createElement(Form, { layout: "vertical", onFinish: onFinish, initialValues: {
-            Company: { Id: "", Name: "" },
+import { useApplicationContext } from "@voplus/morpho-data";
+import { IDENTITY_FIELD_NAME, IDENTITY_SHAPE_FIELD_NAME, OPERATE_FIELD_NAME, } from "../fields/state";
+import { saveLegalGeneration, validateLegalGenerationCapture, submitLegalGeneration, toReopenedLegalGeneration, } from "./legalGenerationSubmit";
+/** The legal-generation document this wrapper form is composed for. */
+const DOCUMENT_NAME = "Corporate Representative";
+/** Compose the representative and parent data, retaining the returned saved capture. */
+const CorporateRepresentativeForm = (props) => {
+    const [reopened, setReopened] = React.useState(props.reopened);
+    const [revision, setRevision] = React.useState(0);
+    const savedRef = React.useRef(props.reopened);
+    const inFlight = React.useRef(false);
+    const [pending, setPending] = React.useState(false);
+    const [identityFieldErrors, setIdentityFieldErrors] = React.useState({});
+    const application = useApplicationContext();
+    return (React.createElement(Form, { key: revision, layout: "vertical", disabled: pending, onFinish: onFinish, initialValues: {
+            // The company has no default: the submit endpoint requires a real corporate id, so an
+            // unpicked control has to read as empty for its required rule to report it.
+            Company: undefined,
             ParentCompany: { Id: "", Name: "" },
             Country: "",
+            RepresentativeCountry: "",
             Date: "",
-            Identity: { id: "", name: "" },
+            LegalContact: { id: "", name: "" },
             Operate: "Search",
             IdentityName: "",
-            IdentityType: "Passport",
+            IdentityShape: undefined,
             IdentityNumber: "",
+            // Reopening a saved document seeds the fields the persisted content carries; the
+            // capture itself travels on the block's `identity` prop below (spec:3848).
+            ...reopened?.values,
         } },
-        React.createElement(CorporateRepresentativeFields, null),
-        React.createElement(SubmitButton, null)));
-    // spec:1930 — CSP: When 'Select existing' mode is used, the form sends the selected entity's id; manual mode sends the typed fields
-    function onFinish(values) {
-        const { Company, ParentCompany, Country, IdentityName, IdentityType, IdentityNumber, Date, Identity, Operate, } = values;
-        const identity = Operate === "Search"
-            ? {
-                IdentityName: Identity.fullName,
-                IdentityType: Identity.type,
-                IdentityNumber: Identity.number,
+        React.createElement(CorporateRepresentativeFields, { parentCompanyBaseline: reopened?.parentCompanyBaseline, companyDisabled: !!reopened, identityFieldErrors: identityFieldErrors, identity: reopened?.identity, mode: reopened ? (reopened.mode === "manual" ? "Create" : "Search") : undefined }),
+        React.createElement(Form.Item, { name: OPERATE_FIELD_NAME, noStyle: true, hidden: true }),
+        React.createElement(Form.Item, { name: IDENTITY_FIELD_NAME, noStyle: true, hidden: true }),
+        React.createElement(Form.Item, { name: IDENTITY_SHAPE_FIELD_NAME, noStyle: true, hidden: true }),
+        React.createElement(SubmitButton, { pending: pending })));
+    // spec:1930 — CSP: 使用“Select existing”模式时，表单发送所选实体的 id；手动模式发送用户键入的字段
+    // spec:3848 — CSP form identities retain their selected shape snapshot
+    // spec:3850 — CSP: 法律文书生成表单提交时把组合后的载荷送交转换
+    /**
+     * Composes the branch the user submitted and hands it to the conversion (spec:1930, spec:3850):
+     * `Search` carries the picked contact identity's id and drops the typed fields, `Create` carries
+     * the typed representative fields plus the complete captured snapshot under its own keys and no
+     * id. A refused handoff surfaces its message and leaves the form and its values untouched.
+     *
+     * A form reopened on a persisted document is *saved* instead of submitted (spec:3848): the submit
+     * endpoint always creates a new document, so resubmitting would duplicate the one the user opened,
+     * while the same-id save resolves the current mode and selection on the server and regenerates
+     * the existing ZIP. A successful returned capture seeds the next edit session.
+     */
+    async function onFinish(values) {
+        if (inFlight.current)
+            return;
+        const errors = values.Operate === "Create" ? validateLegalGenerationCapture(values.Identity) : {};
+        setIdentityFieldErrors(errors);
+        if (Object.keys(errors).length)
+            return;
+        inFlight.current = true;
+        setPending(true);
+        try {
+            const { Company, ParentCompany, Country, LegalContact, Date, Operate } = values;
+            // `LegalContact` and `Identity` are separate keys on purpose: the picked contact can never be
+            // mistaken for — or overwritten by — the manual capture the shape seam writes (spec:1930).
+            const branch = Operate === "Search"
+                ? // Select-existing: exactly the picked contact's id, no typed person field (spec:1930).
+                    { IdentityId: LegalContact?.id }
+                : {
+                    // Manual: the typed representative fields plus the complete captured snapshot
+                    // (spec:1930, spec:3848).
+                    // spec:1930 — 手动代表国家进入 identity.country，母公司及签发国家独立。
+                    Country: values.RepresentativeCountry,
+                    IdentityName: values.IdentityName,
+                    IdentityShape: values.IdentityShape,
+                    IdentityNumber: values.IdentityNumber,
+                    Identity: values.Identity,
+                };
+            const submission = {
+                documentName: DOCUMENT_NAME,
+                mode: Operate === "Search" ? "select-existing" : "manual",
+                branch,
+                company: Company,
+                parentCompany: ParentCompany,
+                parentCompanyCountry: Country,
+                parentCompanyDetails: values.ParentCompanyDetails,
+                documentDate: Date ? dayjs(Date).format("YYYY-MM-DD") : "",
+            };
+            const outcome = savedRef.current
+                ? await saveLegalGeneration({
+                    endpoint: application.api.currentEndPoint,
+                    accessToken: application.user.info.accessToken,
+                    id: savedRef.current.id,
+                    submission,
+                })
+                : await submitLegalGeneration({
+                    endpoint: application.api.currentEndPoint,
+                    accessToken: application.user.info.accessToken,
+                    submission,
+                });
+            // The returned server content becomes the next edit session and saved id; a failure leaves
+            // the controls and frozen capture mounted with every entered value intact.
+            if (outcome.result) {
+                const saved = toReopenedLegalGeneration({
+                    id: outcome.result.id,
+                    metaKey: outcome.result.metaKey,
+                    name: outcome.result.document?.name ?? outcome.result.documentName,
+                    country: "SGP",
+                    content: outcome.result.content,
+                });
+                if (saved) {
+                    savedRef.current = saved;
+                    setReopened(saved);
+                    setRevision((value) => value + 1);
+                }
             }
-            : { IdentityName, IdentityType, IdentityNumber };
-        const Values = {
-            Company,
-            ParentCompany,
-            Country,
-            Date: dayjs(Date).format("YYYY-MM-DD"),
-            ...identity,
-        };
-        console.log("CorporateRepresentative:", values, Values);
+            return outcome;
+        }
+        finally {
+            inFlight.current = false;
+            setPending(false);
+        }
     }
 };
 export default CorporateRepresentativeForm;

package/es/modules/corporate/legal-generation/form/CorporateRepresentativeForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"CorporateRepresentativeForm.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/legal-generation/form/CorporateRepresentativeForm.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAmB1B,MAAM,2BAA2B,GAAG,GAAG,EAAE;IACxC,OAAO,CACN,oBAAC,IAAI,IACJ,MAAM,EAAC,UAAU,EACjB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE;YACd,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC7B,aAAa,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACnC,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,EAAE;YACR,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC9B,OAAO,EAAE,QAAQ;YACjB,YAAY,EAAE,EAAE;YAChB,YAAY,EAAE,UAAU;YACxB,cAAc,EAAE,EAAE;SAClB;QAED,oBAAC,6BAA6B,OAAG;QACjC,oBAAC,YAAY,OAAG,CACV,CACP,CAAC;IACF,oIAAoI;IACpI,SAAS,QAAQ,CAChB,MAGC;QAED,MAAM,EACL,OAAO,EACP,aAAa,EACb,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,IAAI,EACJ,QAAQ,EACR,OAAO,GACP,GAAG,MAAM,CAAC;QACX,MAAM,QAAQ,GACb,OAAO,KAAK,QAAQ;YACnB,CAAC,CAAC;gBACA,YAAY,EAAE,QAAQ,CAAC,QAAQ;gBAC/B,YAAY,EAAE,QAAQ,CAAC,IAAI;gBAC3B,cAAc,EAAE,QAAQ,CAAC,MAAM;aAC9B;YACH,CAAC,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG;YACd,OAAO;YACP,aAAa;YACb,OAAO;YACP,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACtC,GAAG,QAAQ;SACX,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"CorporateRepresentativeForm.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/legal-generation/form/CorporateRepresentativeForm.tsx"],"names":[],"mappings":"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"}