timur.gorodetskiy/ct-forms-portal
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix(oid): передаём статус СТ в поток оповещения (не читаем из SP)"

Browse Source 
This reverts commit a3ffaf696a.
This commit is contained in:
Тимур Городецкий
2026-09-04 09:55:39 +05:00
parent 7b4382370d
commit 04faca37ae
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/webparts/ctFormsPortal/forms/oid/components/Step4Approval/useStep4Approval.ts
+7 -7
View File
@@ -223,9 +223,9 @@ export function useStep4Approval(args: UseStep4ApprovalArgs) {
comment.trim() comment.trim()
); );
const notify = async (spId: number, statusForFlow: string): Promise<void> => { const notify = async (spId: number): Promise<void> => {
try { try {
await service.triggerApprovalNotification(spId, statusForFlow); await service.triggerApprovalNotification(spId);
} catch (e) { } catch (e) {
console.error("[Step4] notify failed for spId", spId, e); console.error("[Step4] notify failed for spId", spId, e);
setNotifyWarning( setNotifyWarning(
@@ -262,17 +262,17 @@ export function useStep4Approval(args: UseStep4ApprovalArgs) {
await service.updateOIDStatus(oid!.id, "approved"); await service.updateOIDStatus(oid!.id, "approved");
onSave({ oid: { ...oid!, status: "approved" }, approvalChain: updatedChain }); onSave({ oid: { ...oid!, status: "approved" }, approvalChain: updatedChain });
if (currentMember.spApprovalId) { if (currentMember.spApprovalId) {
await notify(currentMember.spApprovalId, "Согласовано"); await notify(currentMember.spApprovalId);
} }
onStepComplete(4); onStepComplete(4);
} else { } else {
const nextPending = updatedChain.find((m) => m.status === "pending"); const nextPending = updatedChain.find((m) => m.status === "pending");
if (nextPending) { if (nextPending) {
if (currentMember.spApprovalId) { if (currentMember.spApprovalId) {
await notify(currentMember.spApprovalId, "На согласовании"); await notify(currentMember.spApprovalId);
} }
if (nextPending.spApprovalId) { if (nextPending.spApprovalId) {
await notify(nextPending.spApprovalId, "На согласовании"); await notify(nextPending.spApprovalId);
} }
} }
} }
@@ -305,7 +305,7 @@ export function useStep4Approval(args: UseStep4ApprovalArgs) {
oid: { ...oid!, status: "rejected" }, oid: { ...oid!, status: "rejected" },
}); });
const initiator = finalChain.find((m) => m.role === "Инициатор"); const initiator = finalChain.find((m) => m.role === "Инициатор");
if (initiator?.spApprovalId) await notify(initiator.spApprovalId, "Отклонено"); if (initiator?.spApprovalId) await notify(initiator.spApprovalId);
} }
closeActionDialog(); closeActionDialog();
@@ -350,7 +350,7 @@ export function useStep4Approval(args: UseStep4ApprovalArgs) {
); );
if (firstApprover?.spApprovalId) { if (firstApprover?.spApprovalId) {
try { try {
await service.triggerApprovalNotification(firstApprover.spApprovalId, "На согласовании"); await service.triggerApprovalNotification(firstApprover.spApprovalId);
} catch (e) { } catch (e) {
console.error("[Step4] notify (send) failed", e); console.error("[Step4] notify (send) failed", e);
setNotifyWarning( setNotifyWarning(
src/webparts/ctFormsPortal/forms/oid/services/OidService.ts
+2 -5
View File
@@ -1250,17 +1250,14 @@ export class OidService {
); );
} }
// status — финальный статус СТ («Согласовано»/«На согласовании»/«Отклонено»), который поток async triggerApprovalNotification(spItemId: number): Promise<void> {
// использует для выбора ветки. Передаём явно, чтобы поток НЕ перечитывал статус из SharePoint
// (коннектор может вернуть устаревшее значение сразу после записи — read-after-write lag).
async triggerApprovalNotification(spItemId: number, status?: string): Promise<void> {
if (!FLOW_NOTIFY) return; if (!FLOW_NOTIFY) return;
const client = await this.context.aadHttpClientFactory.getClient( const client = await this.context.aadHttpClientFactory.getClient(
"https://service.flow.microsoft.com/", "https://service.flow.microsoft.com/",
); );
const res = await client.post(FLOW_NOTIFY, AadHttpClient.configurations.v1, { const res = await client.post(FLOW_NOTIFY, AadHttpClient.configurations.v1, {
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
body: JSON.stringify({ RowID: spItemId, status: status ?? "" }), body: JSON.stringify({ RowID: spItemId }),
}); });
if (!res.ok) { if (!res.ok) {
const text = await res.text().catch(() => ""); const text = await res.text().catch(() => "");