Skip to content

fix(ui): persist GitHub provider trigger selection - #39

Merged
Bl4ckBl1zZ merged 1 commit into
mainfrom
automation/dokploy-upstream-sync
Jul 31, 2026
Merged

Bl4ckBl1zZ merged 1 commit into
mainfrom
automation/dokploy-upstream-sync

Conversation

@Bl4ckBl1zZ

@Bl4ckBl1zZ Bl4ckBl1zZ commented Jul 31, 2026 •

Copy link
Copy Markdown
Owner

What is this PR about?

Integrates upstream Dokploy commit 15bc4b5dc from Dokploy/dokploy:canary (upstream tip bb73c6e6d). The GitHub application and Compose provider forms now keep trigger type as a controlled field, so a saved provider selection remains visible after loading persisted values.

Integration review

  • Upstream range: 5df820a740..bb73c6e6d; substantive change: 15bc4b5dc.
  • Paths reviewed: the application and Compose GitHub provider forms (2 files).
  • Fork-only overlap: none on these paths since the shared base.
  • Preserved behavior: existing webhook creation/removal and provider save flows are unchanged.
  • Conflicts: none; the focused upstream commit was applied directly.
  • Migrations, dependencies, lockfiles, runtime, environment, API/CLI, Docker/Compose, and Traefik changes: none.
  • Risk: low, UI state persistence only.

Verification

  • pnpm install --frozen-lockfile (pass; Node 24.13.1, pnpm 10.22.0)
  • pnpm --filter=dokploy exec biome check <two changed files> (pass)
  • pnpm --filter=dokploy run typecheck (pass)
  • pnpm --filter=dokploy exec vitest --config __test__/vitest.config.ts --exclude __test__/deploy/application.real.test.ts (pass: 80 files, 711 tests)
  • BETTER_AUTH_SECRET=<ephemeral local value> pnpm --filter=dokploy run build (pass; the secret was not persisted or printed)
  • The real Docker deployment test could not start because the local Docker daemon stopped responding; no assertion ran. A successful equivalent hosted check is required before merge.

Rollout / rollback

Normal frontend deployment. Roll back by reverting commit 18618e73e; no data or configuration rollback is required.

Checklist

  • Dedicated branch based on the fork target branch and reviewed against upstream canary.
  • Read CONTRIBUTING.md.
  • Locally verified the changed UI paths, typecheck, broad non-deployment tests, and production build.

Issues related (if applicable)

None.

Screenshots (if applicable)

Not applicable; behavior-only control-state fix.

Summary by CodeRabbit

  • Bug Fixes
    • Improved trigger-type selection by ignoring empty or invalid selection values.
    • Prevented unintended form field updates when clearing or changing the selection in application and compose configurations.

@coderabbitai

coderabbitai Bot commented Jul 31, 2026 •

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 0d38c2ab-0962-419d-86a2-c732ab34b37b

📥 Commits

Reviewing files that changed from the base of the PR and between 3db0dce and 18618e7.

📒 Files selected for processing (2)
  • apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx
  • apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx

📝 Walkthrough

Walkthrough

Both GitHub provider forms now ignore empty trigger-type selections. Valid selections continue to update form state.

Changes

Trigger selection handling

Layer / File(s) Summary
Guard trigger-type form updates
apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx, apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx
Both selectors remove defaultValue and ignore empty values before updating the form field. Valid values continue through field.onChange.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Suggested reviewers: siumauricio

Poem

A rabbit checks the trigger bright,
And skips the empty choice from sight.
Valid hops update the form with care,
No blank state wanders there.
Two providers now behave just right.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly describes the main change: preserving GitHub provider trigger selection in the UI.
Description check ✅ Passed The description explains the change, verification, checklist status, risks, rollback, issues, and screenshots, including the unavailable Docker test.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch automation/dokploy-upstream-sync

Comment @coderabbitai help to get the list of available commands.

@Bl4ckBl1zZ
Bl4ckBl1zZ merged commit 70fa779 into main Jul 31, 2026
4 checks passed
@Bl4ckBl1zZ
Bl4ckBl1zZ deleted the automation/dokploy-upstream-sync branch July 31, 2026 04:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants