From 486a30402bdd232b071be01b53455cde9b690187 Mon Sep 17 00:00:00 2001 From: hjlarry Date: Fri, 23 Jan 2026 14:33:15 +0800 Subject: [PATCH] remove forceUpload --- api/controllers/console/app/workflow.py | 1 - api/services/workflow_service.py | 4 +--- .../workflow-app/hooks/use-nodes-sync-draft.ts | 13 +++---------- web/app/components/workflow/hooks-store/store.ts | 1 - .../workflow/hooks/use-nodes-sync-draft.ts | 3 +-- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py index aea88859a4..6bc7c2edc4 100644 --- a/api/controllers/console/app/workflow.py +++ b/api/controllers/console/app/workflow.py @@ -331,7 +331,6 @@ class DraftWorkflowApi(Resource): account=current_user, environment_variables=environment_variables, conversation_variables=conversation_variables, - force_upload=args.get("force_upload", False), ) except WorkflowHashNotEqualError: raise DraftWorkflowNotSync() diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py index 3ab344c187..21ea47d81f 100644 --- a/api/services/workflow_service.py +++ b/api/services/workflow_service.py @@ -200,17 +200,15 @@ class WorkflowService: account: Account, environment_variables: Sequence[VariableBase], conversation_variables: Sequence[VariableBase], - force_upload: bool = False, ) -> Workflow: """ Sync draft workflow - :param force_upload: Skip hash validation when True (for restore operations) :raises WorkflowHashNotEqualError """ # fetch draft workflow by app_model workflow = self.get_draft_workflow(app_model=app_model) - if workflow and workflow.unique_hash != unique_hash and not force_upload: + if workflow and workflow.unique_hash != unique_hash: raise WorkflowHashNotEqualError() # validate features structure diff --git a/web/app/components/workflow-app/hooks/use-nodes-sync-draft.ts b/web/app/components/workflow-app/hooks/use-nodes-sync-draft.ts index 5b0214d078..45295d56b6 100644 --- a/web/app/components/workflow-app/hooks/use-nodes-sync-draft.ts +++ b/web/app/components/workflow-app/hooks/use-nodes-sync-draft.ts @@ -118,7 +118,6 @@ export const useNodesSyncDraft = () => { onError?: () => void onSettled?: () => void }, - forceUpload?: boolean, ) => { if (getNodesReadOnly()) return @@ -126,8 +125,8 @@ export const useNodesSyncDraft = () => { // Check leader status at sync time const currentIsLeader = isCollaborationEnabled ? collaborationManager.getIsLeader() : true - // If not leader and not forcing upload, request the leader to sync - if (isCollaborationEnabled && !currentIsLeader && !forceUpload) { + // If not leader, request the leader to sync + if (isCollaborationEnabled && !currentIsLeader) { if (isCollaborationEnabled) collaborationManager.emitSyncRequest() callback?.onSettled?.() @@ -141,16 +140,10 @@ export const useNodesSyncDraft = () => { setDraftUpdatedAt, } = workflowStore.getState() - // Add force_upload parameter if needed - const finalParams = { - ...postParams.params, - ...(forceUpload && { force_upload: true }), - } - try { const res = await syncWorkflowDraft({ url: postParams.url, - params: finalParams, + params: postParams.params, }) setSyncWorkflowDraftHash(res.hash) setDraftUpdatedAt(res.updated_at) diff --git a/web/app/components/workflow/hooks-store/store.ts b/web/app/components/workflow/hooks-store/store.ts index 9567823929..0dc3785855 100644 --- a/web/app/components/workflow/hooks-store/store.ts +++ b/web/app/components/workflow/hooks-store/store.ts @@ -40,7 +40,6 @@ export type CommonHooksFnMap = { onError?: () => void onSettled?: () => void }, - forceUpload?: boolean, ) => Promise syncWorkflowDraftWhenPageClose: () => void handleRefreshWorkflowDraft: () => void diff --git a/web/app/components/workflow/hooks/use-nodes-sync-draft.ts b/web/app/components/workflow/hooks/use-nodes-sync-draft.ts index 4ac4d3f7c4..7add13adc7 100644 --- a/web/app/components/workflow/hooks/use-nodes-sync-draft.ts +++ b/web/app/components/workflow/hooks/use-nodes-sync-draft.ts @@ -24,7 +24,6 @@ export const useNodesSyncDraft = () => { onError?: () => void onSettled?: () => void }, - forceUpload?: boolean, ) => { if (getNodesReadOnly()) return @@ -36,7 +35,7 @@ export const useNodesSyncDraft = () => { } if (sync) - doSyncWorkflowDraft(notRefreshWhenSyncError, callback, forceUpload) + doSyncWorkflowDraft(notRefreshWhenSyncError, callback) else debouncedSyncWorkflowDraft(doSyncWorkflowDraft) }, [debouncedSyncWorkflowDraft, doSyncWorkflowDraft, getNodesReadOnly])