From 98ddf937c18f153e904cf780d68e8601304a16a7 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:37:15 -0700 Subject: [PATCH 1/4] Update workflow-photoshop.js --- .../workflow-photoshop/workflow-photoshop.js | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js index 1fbac20..2d33e7f 100644 --- a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js +++ b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js @@ -23,6 +23,21 @@ function addOrUpdateOperation(array, keyToCheck, valueToCheck, keyToUpdate, newV } } +async function scanForCsam(cfg, id, unityEl, targetEl, refreshWidgetEvent) { + const { scanImgForSafety } = await import('../../steps/upload-step.js'); + let scanResponse = await scanImgForSafety(cfg, id); + if (scanResponse.status === 403) { + unityEl.dispatchEvent(new CustomEvent(refreshWidgetEvent)); + await showErrorToast(targetEl, unityEl, '.icon-error-acmp'); + return false; + } + if (scanResponse.status === 429 + || (scanResponse.status >= 500 && scanResponse.status < 600)) { + const { retryRequestUntilProductRedirect } = await import('../../../scripts/utils.js'); + scanResponse = await retryRequestUntilProductRedirect(cfg, () => scanImgForSafety(cfg, id)); + } +} + function resetWorkflowState(cfg) { cfg.presentState = { activeIdx: cfg.isUpload ? 0 : -1, @@ -159,18 +174,7 @@ async function removeBgHandler(cfg, changeDisplay = true) { return false; } if (isImgModified) { - const { scanImgForSafety } = await import('../../steps/upload-step.js'); - let scanResponse = await scanImgForSafety(cfg, id); - if (scanResponse.status === 403) { - unityEl.dispatchEvent(new CustomEvent(refreshWidgetEvent)); - await showErrorToast(targetEl, unityEl, '.icon-error-acmp'); - return false; - } - if (scanResponse.status === 429 - || (scanResponse.status >= 500 && scanResponse.status < 600)) { - const { retryRequestUntilProductRedirect } = await import('../../../scripts/utils.js'); - scanResponse = await retryRequestUntilProductRedirect(cfg, () => scanImgForSafety(cfg, id)); - } + scanForCsam(cfg, id, unityEl, targetEl); } cfg.preludeState.assetId = id; const removeBgOptions = { From d35168748818873344f810948316fb23241547f8 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:38:33 -0700 Subject: [PATCH 2/4] Update workflow-photoshop.js --- .../core/workflow/workflow-photoshop/workflow-photoshop.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js index 2d33e7f..668fddb 100644 --- a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js +++ b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js @@ -174,7 +174,7 @@ async function removeBgHandler(cfg, changeDisplay = true) { return false; } if (isImgModified) { - scanForCsam(cfg, id, unityEl, targetEl); + scanForCsam(cfg, id, unityEl, targetEl, refreshWidgetEvent); } cfg.preludeState.assetId = id; const removeBgOptions = { From 3e2839f23f52b2c743f7549cc4b773ea5e8e72db Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:41:56 -0700 Subject: [PATCH 3/4] Update workflow-photoshop.js --- .../core/workflow/workflow-photoshop/workflow-photoshop.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js index 668fddb..7bdd7a1 100644 --- a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js +++ b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js @@ -23,12 +23,12 @@ function addOrUpdateOperation(array, keyToCheck, valueToCheck, keyToUpdate, newV } } -async function scanForCsam(cfg, id, unityEl, targetEl, refreshWidgetEvent) { +async function scanForCsam(cfg, id, unityEl, refreshWidgetEvent) { const { scanImgForSafety } = await import('../../steps/upload-step.js'); let scanResponse = await scanImgForSafety(cfg, id); if (scanResponse.status === 403) { unityEl.dispatchEvent(new CustomEvent(refreshWidgetEvent)); - await showErrorToast(targetEl, unityEl, '.icon-error-acmp'); + //await showErrorToast(targetEl, unityEl, '.icon-error-acmp'); return false; } if (scanResponse.status === 429 @@ -174,7 +174,7 @@ async function removeBgHandler(cfg, changeDisplay = true) { return false; } if (isImgModified) { - scanForCsam(cfg, id, unityEl, targetEl, refreshWidgetEvent); + scanForCsam(cfg, id, unityEl, refreshWidgetEvent ); } cfg.preludeState.assetId = id; const removeBgOptions = { From 15562130287e665eec713b27a2866ba1398493f4 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Wed, 14 Aug 2024 23:13:38 -0700 Subject: [PATCH 4/4] Update workflow-photoshop.js --- .../workflow/workflow-photoshop/workflow-photoshop.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js index 7bdd7a1..63e8817 100644 --- a/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js +++ b/unitylibs/core/workflow/workflow-photoshop/workflow-photoshop.js @@ -23,14 +23,9 @@ function addOrUpdateOperation(array, keyToCheck, valueToCheck, keyToUpdate, newV } } -async function scanForCsam(cfg, id, unityEl, refreshWidgetEvent) { +async function scanForCsam(cfg, id) { const { scanImgForSafety } = await import('../../steps/upload-step.js'); let scanResponse = await scanImgForSafety(cfg, id); - if (scanResponse.status === 403) { - unityEl.dispatchEvent(new CustomEvent(refreshWidgetEvent)); - //await showErrorToast(targetEl, unityEl, '.icon-error-acmp'); - return false; - } if (scanResponse.status === 429 || (scanResponse.status >= 500 && scanResponse.status < 600)) { const { retryRequestUntilProductRedirect } = await import('../../../scripts/utils.js'); @@ -174,7 +169,7 @@ async function removeBgHandler(cfg, changeDisplay = true) { return false; } if (isImgModified) { - scanForCsam(cfg, id, unityEl, refreshWidgetEvent ); + scanForCsam(cfg, id); } cfg.preludeState.assetId = id; const removeBgOptions = {