admin.suherdy/sign_image_field
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Consolidate image field logic into PDFIframe.prototype.refreshSignItemsForPage to avoid overriding enableCustom methods and improve patching strategy.

Browse Source
This commit is contained in:
Suherdy Yacob 2026-03-16 17:08:23 +07:00
parent c02e629a88
commit 424e68c57c
1 changed files with 93 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
static/src/js/sign_image_upload.js
View File

@ -4,7 +4,7 @@ import { patch } from "@web/core/utils/patch";
import { PDFIframe } from "@sign/components/sign_request/PDF_iframe"; import { PDFIframe } from "@sign/components/sign_request/PDF_iframe";
import { SignablePDFIframe } from "@sign/components/sign_request/signable_PDF_iframe"; import { SignablePDFIframe } from "@sign/components/sign_request/signable_PDF_iframe";
console.log("Sign Image Field: Initializing diagnostic patches..."); console.log("Sign Image Field: Re-evaluating patch strategy without overriding enableCustom for base classes");
/** /**
* Diagnostic Bridge Restoration * Diagnostic Bridge Restoration
@ -16,7 +16,11 @@ const restoreBridge = (instance, caller) => {
const iframe = iwin.frameElement; const iframe = iwin.frameElement;
if (iframe && !iframe.odoo_iframe_instance) { if (iframe && !iframe.odoo_iframe_instance) {
// Only log once per frame to reduce noise
if (!iframe._odoo_bridge_logged) {
console.log(`[Diagnostic] Restoring bridge on iframe element from ${caller}`); console.log(`[Diagnostic] Restoring bridge on iframe element from ${caller}`);
iframe._odoo_bridge_logged = true;
}
iframe.odoo_iframe_instance = instance; iframe.odoo_iframe_instance = instance;
} }
@ -92,68 +96,30 @@ window.diagnosticForceShowFields = () => {
hiddenItems.forEach(el => el.classList.remove('d-none')); hiddenItems.forEach(el => el.classList.remove('d-none'));
}; };
const hookCheckSignItemsCompletion = (instance) => { const processedItems = new WeakSet();
console.log("[Diagnostic] checkSignItemsCompletion hooked. Total signItems mapped:");
let totalItems = 0;
for (const page in instance.signItems) {
const items = instance.signItems[page];
totalItems += Object.keys(items).length;
console.log(` Page ${page}: ${Object.keys(items).length} items`);
}
console.log(`[Diagnostic] Total items managed by PDFIframe: ${totalItems}`);
};
// 1. Patch PDFIframe (ROOT) // Safest Patching Strategy: Only patch `PDFIframe.prototype.refreshSignItemsForPage`
// This avoids ANY issues with `enableCustom` halting mid-execution.
patch(PDFIframe.prototype, { patch(PDFIframe.prototype, {
enableCustom(signItem) {
restoreBridge(this, 'PDFIframe.enableCustom');
if (typeof super.enableCustom === 'function') {
super.enableCustom(...arguments);
}
if (signItem && signItem.data && signItem.data.type === 'image' && signItem.el) {
setupLazyObserver(signItem.el);
}
},
refreshSignItemsForPage(page) { refreshSignItemsForPage(page) {
console.log(`[Diagnostic] refreshSignItemsForPage called for page ${page}`); // Restore bridge right before items are evaluated
restoreBridge(this, 'PDFIframe.refreshSignItemsForPage'); restoreBridge(this, 'PDFIframe.refreshSignItemsForPage');
try { // Execute original first so elements get un-hidden (d-none removed)
return super.refreshSignItemsForPage(...arguments); const result = super.refreshSignItemsForPage(...arguments);
} catch (error) {
console.error("[Diagnostic] Error inside refreshSignItemsForPage:", error);
}
},
refreshSignItems(page = false) { // Now find all image elements and apply our custom observer
console.log(`[Diagnostic] refreshSignItems called (page: ${page})`); if (this.signItems && this.signItems[page]) {
restoreBridge(this, 'PDFIframe.refreshSignItems'); for (const id in this.signItems[page]) {
return super.refreshSignItems(...arguments); const item = this.signItems[page][id];
} if (item && item.data && item.data.type === 'image' && item.el && !processedItems.has(item.el)) {
}); processedItems.add(item.el);
setupLazyObserver(item.el);
// 2. Patch SignablePDFIframe (Signer subclass)
patch(SignablePDFIframe.prototype, {
enableCustom(signItem) {
restoreBridge(this, 'SignablePDFIframe.enableCustom');
if (signItem && signItem.data && signItem.data.type === 'image' && signItem.el) {
setupLazyObserver(signItem.el);
}
super.enableCustom(...arguments);
if (signItem && signItem.data && signItem.data.type === 'image' && signItem.el) {
const el = signItem.el;
const data = signItem.data;
if (this.readonly || (data.responsible > 0 && data.responsible !== this.currentRole)) {
return;
}
// Add upload logic for active signer
if (!this.readonly && item.data.responsible > 0 && item.data.responsible === this.currentRole) {
const el = item.el;
const data = item.data;
el.setAttribute('data-type', 'image'); el.setAttribute('data-type', 'image');
const input = el.querySelector('.o_sign_image_upload_input'); const input = el.querySelector('.o_sign_image_upload_input');
if (input && !el._hasImgListener) { if (input && !el._hasImgListener) {
@ -218,17 +184,19 @@ patch(SignablePDFIframe.prototype, {
el._hasImgListener = true; el._hasImgListener = true;
} }
} }
}, }
}
}
return result;
}
});
patch(SignablePDFIframe.prototype, {
getSignatureValueFromElement(item) { getSignatureValueFromElement(item) {
if (item.data.type === 'image') { if (item.data.type === 'image') {
return item.el.dataset.value || item.data.value || false; return item.el.dataset.value || item.data.value || false;
} }
return super.getSignatureValueFromElement(...arguments); return super.getSignatureValueFromElement(...arguments);
},
checkSignItemsCompletion() {
hookCheckSignItemsCompletion(this);
return super.checkSignItemsCompletion(...arguments);
} }
}); });