Feature - Gitsync with multi branch#15326
Merged
Conversation
…anchModal; remove tooltips in LifecycleCTAButton
… styles; add Check2 icon
…//github.com/ToolJet/ToolJet into feature/git-sync-2.0-multi-branching-support
…CreateBranchModal to refresh versions and include releasedVersionId; improve CreateDraftVersionModal to refresh versions after creating a draft
…//github.com/ToolJet/ToolJet into feature/git-sync-2.0-multi-branching-support
…gic and add debugging logs
…//github.com/ToolJet/ToolJet into feature/git-sync-2.0-multi-branching-support
…//github.com/ToolJet/ToolJet into feature/git-sync-2.0-multi-branching-support
* Feature: Adding co-relation-id mapping (#14621) * feat: add migration for co_relation_id column * minor cleanup * added entities and dummy util file * fix: Add co-relation column for events * fixed compilation issues * added fields * minor changes * added timestamp cleanups * modified existing migration t * minor updates in co_relation id changes * fix: update migration script * feat: map co-relation-id during pull * chore: update server submodule * fixed layout co_relation id issue * fixed migration changes * revert * timestamp fixes * minor fixes * minor fix * chore: update server submodule (#14755) --------- Co-authored-by: rohanlahori <rohanlahori99@gmail.com> * resolved merge conflicts * fixed app crashing * Feature/version tagging (#14903) * feat: add migration for co_relation_id column * minor cleanup * added entities and dummy util file * fix: Add co-relation column for events * fixed compilation issues * added fields * minor changes * added timestamp cleanups * modified existing migration t * minor updates in co_relation id changes * fix: update migration script * feat: map co-relation-id during pull * chore: update server submodule * fixed layout co_relation id issue * fixed migration changes * revert * timestamp fixes * minor fixes * minor fix * added migration * minor changes * migration fix * dto changes * fixes * feature: api call for github tags post saving version * chore: update frontend & server submodule hash * fix for sub-branch pull * minor fix * feat: send message in api call * chore: update frontend & server submodule hash * chore: update frontend submodule hash * chore: update frontend submodule hash * minor fixes in import flow * fix: remove await from createGit tag * chore: Update server & frontend submodule hash * save version before committing * removed all logs * removed unused console logs * removed logs * fixes * minor fixes * fixes * removed commit changes flow from draft versions * version id fix * minor fixes * added latest changes endpoint using app Name * co_relation_id fix * added co_relation id changes * fixed co_relation id import issue * minor ui fix * fixes for tag flow * version tag fixes * submodule commits --------- Co-authored-by: parthy007 <parthadhikari1812@gmail.com> * fixed appId issue * commented not used entity field * minor co_relation_id fix * auto-commit on app creation changes * normalize(folder-apps): enforce single folder per app using created_at * Changed message * feat: enhance branch and version management UI with improved styles and functionality * Toast message copywritin * git sync related things * feat: Add tooljet folder architecture to gitsync * fix: remove autocommit on app creation * chore: Update server and frontend submodules * git sync apps & folder restriction * chore: Update server and frontend submodules * fix: restrict app rename * feat: Add version dropdown on app import * chore: Update server submodule hash * moved some logic to util.service.ts * fix branch dropdown and draft button status * feat: Support saved version import on app name change * chore: Update server & frontend submodule hash * chore: Update server and frontend server submodule * fix: add flag to skip folder check * chore: Update server and frontend submodules * chore: Update frontend submodule hash * chore: Update frontend & server submodule hash * fix: version name in version dropdown of import modal * fix: sub module * chore: update server and frontend submodule hashes * fix: send correct version name * fix: retriggering of renaming listner * chore: Update frontend & server submodule hash * fix: latest commit on pull tab * rebase submodule * fix imported app version status * remove draft tag on version dropdown in modal * version desc. optional & app removel message & empty version push err message * fix: restrict app rename without draft version * chore: Update frontend & server submodule hash * fix: latest commit on pull modal * fixed the folder success toast (#15272) * fix: git commit on version creation * fix commit button states on valid/invalid license * chore: Update frontend & server submodule hash * fix: pull error text --------- Co-authored-by: Parth <108089718+parthy007@users.noreply.github.com> Co-authored-by: parthy007 <parthadhikari1812@gmail.com> Co-authored-by: Pratush <pratush@Pratushs-MacBook-Pro.local> Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> Co-authored-by: Pratush <pratush@Pratushs-MBP.lan> Co-authored-by: YuktiGoyal02 <100783212+YuktiGoyal02@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR implements multi-branch Git sync functionality, adding support for branch-based version management with Git integration. The feature allows users to create, switch between, and manage feature branches alongside the main version workflow.
Changes:
- Added database schema support for branch versioning (version_type enum, co_relation_id fields, branching flags)
- Implemented backend APIs for branch operations (create, switch, fetch branches)
- Created frontend UI for branch management (modals, dropdowns, banners)
- Updated version creation logic to support branch vs. version distinction
- Added Git sync adapter and repository integration
Reviewed changes
Copilot reviewed 96 out of 99 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| server/migrations/*.ts | Database migrations adding co_relation_id, version_type, branching flags |
| server/src/entities/*.entity.ts | Entity updates with new fields for branch tracking |
| server/src/modules/versions/*.ts | Version service refactoring to support branch creation |
| server/src/modules/git-sync/*.ts | Git sync adapter and repository additions |
| server/src/modules/folders/*.ts | Folder restrictions for git-synced apps |
| frontend/src/_stores/*.js | Branch state management slice |
| frontend/src/_services/*.js | Git sync service methods for branches |
| frontend/src/AppBuilder/Header/*.jsx | Branch UI components (modals, dropdowns) |
| frontend/src/_styles/*.scss | Styling for branch-related UI |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
parthy007
added a commit
that referenced
this pull request
Feb 27, 2026
* added app_versions fields * added data migration for backward compatibility * added ce specific logic * fixed ce migration (need to dev-test) * moved to data migration * migration changes * added endpoint to create draft version * backend changes * added draft to app_import scenario * added version description * minor changes (needs improvement) * fixed breaking dropdown in editor * updated submodule commits * revert package.json * revert ui not used changes * submodule changes * reverting non used files * ui changes * ui changes * ui changes * ui changes * ui changes * copywriting changes * ui changes * ui changes * edit version modal changes * ui integration changes * added button solid and removed unused css * removed commented code from create version modal * updated button size to use large * ui changes * draft version modal changes * added sub-module commits to main * draft version endpoint changes * ui changes for draft version modal * fix breaking ui * ui changes for banner * minor ui changes * remove scss changes from themes file * removed unused components (cleanup) * removed unused components (pr cleanup) * draft version changes * create version modal changes * canvas banner fixes * comment creation logic * refactor: version dropdown * update endpoint changes * fix: promote logic * update submodule * fix: released version and create version modal * fix draft version creation * minor ui changes * minor backend fixes * tooltip changes * added all components in same folder * added minor comments * import fixes * refactor files * fix: overlay issues * fix: on version creation * fix ce bugs * bug fixes * bug fixes * bug fixes * add migrations * splitting changes for import export * minor fixes * draft version of adapter for import -export * git sync minor changes * removed updatedAt from data queries * bug fixes * backend changes * made field optional * added get all branch endpoint (pending to test) * migration changes * branch creation endpoint and dto changes * app_version util service changes * fixed version type changes * branching related changes * chore: Update submodule hash * added logic to allow only single draft version for branching feature * added default value as true for branching * added feature keys * minor changes * minor changes * minor fixes * initial branching support * minor changes * added created by field in app_versions table * minor changes * branching api fixes * bug fixes * minor fix * fix: auto-commit during version creation * chore: update frontend submodule hash * pull changes * fix: include organisationId in fetchPr * chore: update server submodule hash * minor fix (pending to dev test) * scss changes * remove git sync css from themes file * minor change * fix styling * fix: add copy-writing for main branch lockedbanner * chore: update frontend submodule hash * fix: version listing * chore: Update server submodule hash * fix banner lock * base merge * chore: update frontend submodule hash * fix: version listing * merge base * fix: add new prop in AppGitPushDto * chore: update frontend & server submodule hash * fix: auto-commit on promoting the default branch * fix: dropdown states * fix: dropdown states * fix: hide pull commit button from promoted environments * fix: enhance git sync handling for draft versions and improve version creation logic * fix: remove unnecessary whitespace in VersionManagerDropdown component * freeze state fixes * fix: correctly read branch author * chore: update frontend and backend submodule * fixes * fix: atomic changes during branch creation * fix: error propagation * fixed freeze state * refactor methods * submodule update * fix: update autoCommit default state and disable checkbox in CreateBranchModal; remove tooltips in LifecycleCTAButton * feat: enhance BranchDropdown and LifecycleCTAButton; update icons and styles; add Check2 icon * minor fixes * feat: update BranchDropdown to always show Create PR button; enhance CreateBranchModal to refresh versions and include releasedVersionId; improve CreateDraftVersionModal to refresh versions after creating a draft * chore: update subproject commit reference in server/ee * feat: enhance CreateDraftVersionModal to improve version selection logic and add debugging logs * chore: update server submodule * chore: update subproject commit reference in frontend/ee * update submodule * update submodule * chore: comment out import option label in BaseImportAppMenu * ce build fix * fixes * minor fixes * fixes build issues * Git Sync Phase2 Changes (#14886) * Feature: Adding co-relation-id mapping (#14621) * feat: add migration for co_relation_id column * minor cleanup * added entities and dummy util file * fix: Add co-relation column for events * fixed compilation issues * added fields * minor changes * added timestamp cleanups * modified existing migration t * minor updates in co_relation id changes * fix: update migration script * feat: map co-relation-id during pull * chore: update server submodule * fixed layout co_relation id issue * fixed migration changes * revert * timestamp fixes * minor fixes * minor fix * chore: update server submodule (#14755) --------- Co-authored-by: rohanlahori <rohanlahori99@gmail.com> * resolved merge conflicts * fixed app crashing * Feature/version tagging (#14903) * feat: add migration for co_relation_id column * minor cleanup * added entities and dummy util file * fix: Add co-relation column for events * fixed compilation issues * added fields * minor changes * added timestamp cleanups * modified existing migration t * minor updates in co_relation id changes * fix: update migration script * feat: map co-relation-id during pull * chore: update server submodule * fixed layout co_relation id issue * fixed migration changes * revert * timestamp fixes * minor fixes * minor fix * added migration * minor changes * migration fix * dto changes * fixes * feature: api call for github tags post saving version * chore: update frontend & server submodule hash * fix for sub-branch pull * minor fix * feat: send message in api call * chore: update frontend & server submodule hash * chore: update frontend submodule hash * chore: update frontend submodule hash * minor fixes in import flow * fix: remove await from createGit tag * chore: Update server & frontend submodule hash * save version before committing * removed all logs * removed unused console logs * removed logs * fixes * minor fixes * fixes * removed commit changes flow from draft versions * version id fix * minor fixes * added latest changes endpoint using app Name * co_relation_id fix * added co_relation id changes * fixed co_relation id import issue * minor ui fix * fixes for tag flow * version tag fixes * submodule commits --------- Co-authored-by: parthy007 <parthadhikari1812@gmail.com> * fixed appId issue * commented not used entity field * minor co_relation_id fix * auto-commit on app creation changes * normalize(folder-apps): enforce single folder per app using created_at * Changed message * feat: enhance branch and version management UI with improved styles and functionality * Toast message copywritin * git sync related things * feat: Add tooljet folder architecture to gitsync * fix: remove autocommit on app creation * chore: Update server and frontend submodules * git sync apps & folder restriction * chore: Update server and frontend submodules * fix: restrict app rename * feat: Add version dropdown on app import * chore: Update server submodule hash * moved some logic to util.service.ts * fix branch dropdown and draft button status * feat: Support saved version import on app name change * chore: Update server & frontend submodule hash * chore: Update server and frontend server submodule * fix: add flag to skip folder check * chore: Update server and frontend submodules * chore: Update frontend submodule hash * chore: Update frontend & server submodule hash * fix: version name in version dropdown of import modal * fix: sub module * chore: update server and frontend submodule hashes * fix: send correct version name * fix: retriggering of renaming listner * chore: Update frontend & server submodule hash * fix: latest commit on pull tab * rebase submodule * fix imported app version status * remove draft tag on version dropdown in modal * version desc. optional & app removel message & empty version push err message * fix: restrict app rename without draft version * chore: Update frontend & server submodule hash * fix: latest commit on pull modal * fixed the folder success toast (#15272) * fix: git commit on version creation * fix commit button states on valid/invalid license * chore: Update frontend & server submodule hash * fix: pull error text --------- Co-authored-by: Parth <108089718+parthy007@users.noreply.github.com> Co-authored-by: parthy007 <parthadhikari1812@gmail.com> Co-authored-by: Pratush <pratush@Pratushs-MacBook-Pro.local> Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> Co-authored-by: Pratush <pratush@Pratushs-MBP.lan> Co-authored-by: YuktiGoyal02 <100783212+YuktiGoyal02@users.noreply.github.com> --------- Co-authored-by: rohanlahori <rohanlahori99@gmail.com> Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> Co-authored-by: parthy007 <parthadhikari1812@gmail.com> Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com> Co-authored-by: Parth <108089718+parthy007@users.noreply.github.com> Co-authored-by: Pratush <pratush@Pratushs-MacBook-Pro.local> Co-authored-by: Pratush <pratush@Pratushs-MBP.lan> Co-authored-by: YuktiGoyal02 <100783212+YuktiGoyal02@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.