Skip to content

fix: resolve merge conflict between Features removal and validation enhancement#24150

Merged
crazywoola merged 38 commits intolanggenius:feat/triggerfrom
lyzno1:feat/trigger
Aug 19, 2025
Merged

fix: resolve merge conflict between Features removal and validation enhancement#24150
crazywoola merged 38 commits intolanggenius:feat/triggerfrom
lyzno1:feat/trigger

Conversation

@lyzno1
Copy link
Copy Markdown
Member

@lyzno1 lyzno1 commented Aug 19, 2025 •
edited
Loading

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 Remove workflow features button #24085)
  2. Upstream/main: Enhanced validation logic in features-trigger.tsx by adding checklist validation before workflow publishing (PR fix: validate checklist before publishing workflow #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

hyongtao-code and others added 30 commits August 16, 2025 11:08
@hyongtao-code
Fix missing user_id in trace_manager (langgenius#24024)
8b601a9
@hyongtao-code
Fix: add 'api_key' alias for backward compatibility (langgenius#24022)
af10b3c 
Signed-off-by: Yongtao Huang <yongtaoh@gmail.com>
Co-authored-by: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com>
@hyongtao-code @autofix-ci
Update mypy.ini (langgenius#24014)
32fa817 
Co-authored-by: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
@kurokobo
chore(i18n): correct japanese translation (langgenius#24041)
d92ddc4
@zhanluxianshen @autofix-ci
no used function for message_queue. (langgenius#24027)
0a9af45 
Signed-off-by: zhanluxianshen <zhanluxianshen@163.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
@kurokobo
Revert "Fix: Correct file variable handling for custom tools in workf…
c696340 
…low (langgenius#24061)
@hyongtao-code @crazywoola
Restore useLabelStore mistakenly removed in commit 403e2d5 (langgeniu…
ff52a54 
…s#24052)

Co-authored-by: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
@lyzno1
chore: synchronize translations (langgenius#24044)
b475a6b
@NeatGuyCoding
feat: add testcontainers based tests for metadata service (langgenius…
97b24f4 
…#24048)
@NeatGuyCoding
feat: add testcontainers based tests for model loadbalancing service (l…
80f0594 
…anggenius#24066)
@Zhehao-P
feat: add select input support to the conversation opener (langgenius…
f8fc9f8 
…#24043)
@laipz8200
feat: add CLAUDE.md for LLM-assisted development guidance (langgenius…
fa4d3bb 
…#23946)
@laipz8200
feat: add Redis SSL/TLS certificate authentication support (langgeniu…
052d0e0 
…s#23624)
@lyzno1
Fix sticky table header transparency with backdrop-filter blur in dar…
9755564 
…k mode (langgenius#23999)
@liugddx @crazywoola
fix: update first_id logic to use the oldest answer item in chat mess…
6b51530 
…ages (langgenius#23992)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
@WTW0313
refactor: improve loading animation and debug panel styles (langgeniu…
218e247 
…s#24075)
@Mairuis
fix(oauth): redis compatibility (langgenius#23959)
a7fe0e3
@iamjoel @Stream29 @autofix-ci
feat: enchance prompt and code (langgenius#23633)
de9c5f1 
Co-authored-by: stream <stream@dify.ai>
Co-authored-by: Stream <1542763342@qq.com>
Co-authored-by: Stream <Stream_2@qq.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
@BoWuGit
fix: return empty list instead of raising exception for qdrant search…
790a6ec 
… when score_threshold is 1 (langgenius#24032)
@github-actions @Stream29
chore: translate i18n files (langgenius#24081)
26d7654 
Co-authored-by: Stream29 <36751053+Stream29@users.noreply.github.com>
@iamjoel
fix: no current code caused code generation show error (langgenius#24086
f5033c5 
)
@HyaCiovo
fix(ui): Optimize UI component styles and layouts (langgenius#24090) (l…
5e8fe30 
…anggenius#24092)
@RockChinQ
feat: no longer enable auto upgrade when marketplace is disabled (lan…
531e784 
…ggenius#24… (langgenius#24101)
@ZeroZ-lab
Feature/improve goto anything commands (langgenius#24091)
b0e58f9
@github-actions @crazywoola
chore: translate i18n files (langgenius#24102)
ba775a1 
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
@ElvisWai @autofix-ci
fix pg_vector extension requires SUPERUSER, but not available on Huaw…
16d1289 
…ei Cloud RDS (langgenius#24093)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
@crazywoola
Revert "fix pg_vector extension requires SUPERUSER, but not availabl… (…
8288b1d 
…langgenius#24108)
@laipz8200
fix: validate checklist before publishing workflow (langgenius#24104)
4445460
@hyongtao-code
Chore: remove some dead code in experience-enhance-group (langgenius#…
ef5decc 
…24110)

Co-authored-by: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com>
@Stream29 @autofix-ci
fix: treat default template of code as empty (langgenius#24106)
ae7de7d 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
whhe and others added 8 commits August 18, 2025 17:36
@whhe
Bump pyobvector to 0.2.15 (langgenius#24120)
670d479
@Zhehao-P @autofix-ci
Use typing.Literal to replace str places (langgenius#24099)
c0702aa 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
@liugddx @crazywoola
feat: add delete avatar functionality with confirmation modal (langge…
a3a041e 
…nius#24127)

Co-authored-by: crazywoola <427733928@qq.com>
@github-actions @crazywoola
chore: translate i18n files (langgenius#24131)
a2537ba 
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
@asukaminato0721
an example of suppress (langgenius#24136)
ebd2c82
@NeatGuyCoding
feat: add testcontainers based tests for feature service (langgenius#…
60cc82a 
…24026)
@9527MrLi @1wangshu
@Blackoutta @crazywoola
feat: Implements periodic deletion of workflow run logs that exceed t… (
7519944 
langgenius#23881)

Co-authored-by: shiyun.li973792 <shiyun.li@seres.cn>
Co-authored-by: 1wangshu <suewangswu@gmail.com>
Co-authored-by: Blackoutta <hyytez@gmail.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
@lyzno1
Merge upstream/main: resolve conflict in app-publisher-trigger.tsx
cd1d005 
- Preserve file rename from features-trigger.tsx to app-publisher-trigger.tsx
- Preserve removal of Features button functionality
- Merge upstream validation enhancements (useChecklist, needWarningNodes)
- Combine both changes for improved workflow publishing validation
@dosubot dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. 🌊 feat:workflow Workflow related stuff. labels Aug 19, 2025
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Aug 19, 2025
@crazywoola crazywoola merged commit aacea16 into langgenius:feat/trigger Aug 19, 2025
1 check passed
@lyzno1 lyzno1 deleted the feat/trigger branch August 19, 2025 05:49
lyzno1 added a commit to lyzno1/dify that referenced this pull request Aug 20, 2025
@lyzno1
fix: resolve merge conflict between Features removal and validation e…
8ce06df 
…nhancement (langgenius#24150)
This was referenced Aug 21, 2025
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crazywoola crazywoola crazywoola approved these changes

Assignees

No one assigned

Labels

🌊 feat:workflow Workflow related stuff. lgtm This PR has been approved by a maintainer size:XXL This PR changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.