langgenius/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-07-21 20:15:31 -04:00
Code Issues 775 Packages Projects Releases 10 Wiki Activity

[PR #24150] fix: resolve merge conflict between Features removal and validation enhancement #30530

New Issue
Closed
opened 2026-02-21 20:47:40 -05:00 by yindo · 0 comments
yindo commented 2026-02-21 20:47:40 -05:00
Owner
Copy Link
Copy Source

Original Pull Request: https://github.com/langgenius/dify/pull/24150

State: closed
Merged: Yes

Problem

When merging upstream/main into the feat/trigger branch, a conflict occurred in the workflow header component due to simultaneous but independent changes:

  1. Our branch: Renamed features-trigger.tsx to app-publisher-trigger.tsx and removed the Features button functionality (PR #24085)
  2. Upstream/main: Enhanced validation logic in features-trigger.tsx by adding checklist validation before workflow publishing (PR #24104)

The conflict arose because Git couldn't automatically handle the scenario where one side renamed the file while the other side modified its contents.

Solution

Successfully resolved the conflict by:

  1. Preserving the file rename: features-trigger.tsx → app-publisher-trigger.tsx
  2. Preserving the Features removal: Removed RiApps2AddLine icon, Button component, and handleShowFeatures function
  3. Merging the validation enhancement: Integrated the checklist validation logic from upstream
  4. Combining both improvements: Result is a simplified UI with enhanced safety validation

Changes Made

Merged from upstream/main (PR #24104):

  • Added useEdges, useNodes hooks from reactflow
  • Added useChecklist hook for workflow validation
  • Added CommonEdgeType, CommonNodeType type imports
  • Enhanced onPublish function with dual validation:
    • First check: Validate checklist for unresolved warnings
    • Second check: Existing detailed validation via handleCheckBeforePublish

Preserved from feat/trigger branch (PR #24085):

  • Component rename: FeaturesTrigger → AppPublisherTrigger
  • Removed Features button UI complexity
  • Simplified component structure to focus on publishing functionality
**Original Pull Request:** https://github.com/langgenius/dify/pull/24150 **State:** closed **Merged:** Yes --- ## Problem When merging `upstream/main` into the `feat/trigger` branch, a conflict occurred in the workflow header component due to simultaneous but independent changes: 1. **Our branch**: Renamed `features-trigger.tsx` to `app-publisher-trigger.tsx` and removed the Features button functionality (PR #24085) 2. **Upstream/main**: Enhanced validation logic in `features-trigger.tsx` by adding checklist validation before workflow publishing (PR #24104) The conflict arose because Git couldn't automatically handle the scenario where one side renamed the file while the other side modified its contents. ## Solution Successfully resolved the conflict by: 1. **Preserving the file rename**: `features-trigger.tsx` → `app-publisher-trigger.tsx` 2. **Preserving the Features removal**: Removed `RiApps2AddLine` icon, Button component, and `handleShowFeatures` function 3. **Merging the validation enhancement**: Integrated the checklist validation logic from upstream 4. **Combining both improvements**: Result is a simplified UI with enhanced safety validation ## Changes Made ### Merged from upstream/main (PR #24104): - Added `useEdges`, `useNodes` hooks from reactflow - Added `useChecklist` hook for workflow validation - Added `CommonEdgeType`, `CommonNodeType` type imports - Enhanced `onPublish` function with dual validation: - First check: Validate checklist for unresolved warnings - Second check: Existing detailed validation via `handleCheckBeforePublish` ### Preserved from feat/trigger branch (PR #24085): - Component rename: `FeaturesTrigger` → `AppPublisherTrigger` - Removed Features button UI complexity - Simplified component structure to focus on publishing functionality
yindo added the pull-request label 2026-02-21 20:47:40 -05:00
yindo closed this issue 2026-02-21 20:47:40 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Knowledge Pipeline
Proposal
WIP
cloud
dependencies
feat:webapp
good first issue
outdated
performance
pull-request
Mirrored from GitHub Pull Request
 python:uv
refactor
size:L
stale
status: accepting prs
status: blocked
status: in discussion
stt & tts
vulnerablity
web
wont-fix
🌊 feat:workflow
🌚 invalid
🐞 bug
👻 feat:rag
💪 enhancement
📚 documentation
🔨 feat:tools
🙋‍♂️ question
🙏 help wanted
🤔 cant-reproduce
🤖 feat:agent
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
yindo
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: langgenius/dify#30530
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?