Commit graph

574 commits

Author SHA1 Message Date
Vijaykant Yadav
7b7841fa64 Merge remote-tracking branch 'origin/fix/appbuilder-03' into fix/pages-bugs-04 2025-07-11 10:59:08 +05:30
johnsoncherian
8133199d58 Merge branch 'main' into fix/appbuilder-03 2025-07-11 10:37:37 +05:30
gsmithun4
9d3f04e014 fix 2025-07-10 23:09:29 +05:30
Nakul Nagargade
d02b3d8c5c Merge branch 'fix/appbuilder-03' into gh-12680-toggle-app-mode 2025-07-10 19:09:59 +05:30
johnsoncherian
ed295b9cc6 Merge branch 'main' into fix/appbuilder-03 2025-07-10 15:43:03 +05:30
Vijaykant Yadav
a1efa98ba1 fix: migration and design changes 2025-07-10 15:18:01 +05:30
Akshay Sasidharan
ea8f020fa1 Merge branch 'release/workflows-fixes' of github.com:ToolJet/ToolJet into release/workflows-fixes 2025-07-10 12:48:40 +05:30
Akshay Sasidharan
6312b26d69 Merge branch 'main' into release/workflows-fixes 2025-07-10 12:45:07 +05:30
Akshay
680040d520
fix: workflow schedule cleanup (#13295) 2025-07-10 12:31:16 +05:30
Midhun G S
0c5ab3484c
Platform LTS Final fixes (#13221)
* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* Bugfixes/whitelabelling apis (#13180)

* white-labelling apis

* removed consoles logs

* reverts

* fixes for white-labelling

* fixes

* reverted breadcrumb changes (#13194)

* fixes for getting public sso configurations

* fix for enable signup on cloud

* Cloud Trial and Banners (#13182)

* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* Cloud Trial and Banners

* revert

* initial commit

* Added website onboarding APIs

* moved ai onboarding controller to auth module

* ee banners

* fix

---------

Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>

* Bugfixes/minor UI fixes-CLoud (#13203)

* Bugfixes/UI bugs platform 1 (#13205)

* cleanup

* Audit logs fix

* gitignore changes

* postgrest configs removed

* removed unused import

* improvements

* fix

* improved startup logs

* Platform cypress fix (#13192)

* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* Bugfixes/whitelabelling apis (#13180)

* white-labelling apis

* removed consoles logs

* reverts

* fixes for white-labelling

* fixes

* Cypress fix

* reverted breadcrumb changes (#13194)

* cypress fix

* title fix

* fixes for getting public sso configurations

---------

Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>

* deployment fix

* added interfaces and permissions

* Bugfixes/lts 3.6 branch 1 platform (#13238)

* fix

* Licensing Banners Fixes Cloud and EE (#13241)

* design: Adds license buttons to header

* Refactor header actions

* Cloud Blocker bugfixes (#13160)

* fix

* minor email fixes

* settings menu fix

* fixes

* subscription page

* fix banners

---------

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>

* fix for public apps

* fix

* CE Instance Signup bug (#13254)

* CE Instance Signup bug

* improvement

* fix

* Add WEBSITE_SIGNUP_URL to deployment environment variables

* Add WEBSITE_SIGNUP_URL to environment variables for deployment

* Super admin banner fix (#13262)

* Git Sync Fixes  (#13249)

* git-sync module changes

* git sync fixes

* added app resource guard

* git-sync fixes

* removed require feature

* fix

* review comment changes

* ypress fix

* App logo fix inside app builder

* fix for subpath cache

* fix (#13274)

* platform-cypress-fix (#13271)

* git sync fixes (#13277)

* fix

* Add data-cy for new components (#13289)

---------

Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: rohanlahori <rohanlahori99@gmail.com>
Co-authored-by: Adish M <adish.madhu@gmail.com>
Co-authored-by: Rudra deep Biswas <rudra21ultra@gmail.com>
2025-07-09 22:36:41 +05:30
Vijaykant Yadav
53a8ca74ab merge base 2025-07-09 17:58:41 +05:30
Nakul Nagargade
16b55d3431 Merge remote-tracking branch 'origin/fix/appbuilder-03' into fix-import-export-container-form 2025-07-09 16:47:51 +05:30
Muhsin Shah C P
3ab3471b89
chore: update subproject commits for frontend and server; add UPDATE_ICON feature key to workflow abilities (#13287) 2025-07-09 16:45:45 +05:30
johnsoncherian
bf6d570fa7 Merge branch 'main' into fix/appbuilder-02 2025-07-09 01:39:40 +05:30
Ganesh Kumar
88ac5416ad Merge branch 'main' into feat/optional-tjdb-sql-mode 2025-07-08 23:00:33 +05:30
Ganesh Kumar
8eff0bd6c8 Merge branch 'main' into fix/workspace-constants-mapping 2025-07-08 21:02:59 +05:30
Akshay
9316b763fc
Refactor: Workflows feature is configurable (#13235)
* refactor: Disable workflows for cloud edition

* chore: update submodule to latest commit
2025-07-08 14:07:42 +05:30
Akshay Sasidharan
72adb1afae Merge branch 'main' into release/workflows-lts-migration 2025-07-08 13:20:59 +05:30
Kartik Gupta
d82ee5d307 cloud changes 2025-07-08 12:59:42 +05:30
Nakul Nagargade
273c06505b Fix on import header and footer components would lose thier childrens 2025-07-08 10:56:24 +05:30
Kartik Gupta
ca826d5856 fix feedbacks 2025-07-08 10:10:29 +05:30
Muhsin Shah C P
8824a26110
[pre-release] Webhook trigger isn't working & changed the workflow-node(query) creation API endpoint [dependency PR] (#13237)
* fix: update workflow query endpoint to use correct URL

* chore: update subproject commits for frontend and server

* fix: add request parameter to triggerWorkflow method in controller and interface
2025-07-07 18:41:28 +05:30
Muhsin Shah C P
5599a8caa2
[workflow-migration] Fixed the Loop node not saving issue. (#13229)
* feat: implement workflow query validation guard and add static data source retrieval method

* chore: update subproject commits for frontend and server

* refactor: remove ValidateWorkflowQuerySourceGuard as part of code cleanup

* fix: correct data_source_id property assignment in createWorkflowQuery function

* fix: update endpoint for createWorkflowQuery to use correct URL for workflow nodes
2025-07-07 18:11:17 +05:30
parthy007
b6bc83af6c Delete workspace_constant when not required 2025-07-07 17:01:54 +05:30
Vijaykant Yadav
d1f47d2e79 merge base 2025-07-07 15:55:20 +05:30
NishidhJain11
fb7c751a34
Feat/AI modularisation (#13142)
* fix deps

* Modularisation changes for Build with AI feature

* New app loading UI for Build with AI feature & added animation for chat messages

* Fix Error using AI feature

* add missing services and logic

* fix app gen

* update submodules

* EE frontend submodule updated

* update submodules

* EE frontend submodule updated post sync

* Added Artifact Preview component to ee moddules list

* Updated ai slice code

* app gen changes

* Resolved fix with AI bugs

* Resolved AI Copilot bugs

* app gen changes and query fixes

* fix query generation bugs

* update copilot

* Resolved ChatMode dropdown & popover bug fix

* Resolved PR suggestions & PreviewBox component in CE edition

* Synced frontend/ee with main

* Synced server/ee with main branch

* Enhance submodule checkout process to handle branch existence and fallback to main (#13218)

* Enhance submodule checkout process to handle branch existence and fallback to main

* Improve submodule checkout process to handle branch validation and fallback to main

* chore: Comment out Node.js setup, dependency installation, and build steps in cloud frontend workflow

* refactor: Enhance submodule checkout process to include submodule name in logs

* Update submodule checkout process to use the correct submodule name extraction method

* fix: Update submodule checkout script to use correct submodule path variable

* Improve submodule checkout process to correctly handle branch names and fallback to main

* chore: Uncomment Node.js setup, dependency installation, and build steps in cloud frontend workflow

* fix: Update branch checkout logic to use correct syntax and improve fallback handling

* fix: Update git checkout command to use -B flag for branch creation

* fix: Improve submodule checkout process to explicitly fetch branch ref before checkout

* fix: Enhance submodule checkout process with improved branch validation and error handling

* fix: Improve branch checkout logic by enhancing fetch command and validating branch existence

* fix: Enhance manual Git checkout process with improved fetch and error handling

* fix: Restore Node.js setup, dependency installation, and Netlify deployment steps in workflow

* 🔄 chore: update submodules to latest main after auto-merge

* Took sync of fix/appbuilder-02 in frontend/ee

---------

Co-authored-by: Kartik Gupta <gupta.kartik18kg@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>
Co-authored-by: adishM98 Bot <adish.madhu@gmail.com>
2025-07-07 15:11:58 +05:30
Akshay Sasidharan
ae0d92ead0 feat: disable mutti-tenant TJDB SQL mode for cloud 2025-07-07 12:39:47 +05:30
Devanshu Rastogi
2447a55e22
Fix: Workflow app crashes when user clicks on response node (#13217)
* Added controller and service for fetching logs and nodes seperately

* Add inifinte scroll pagination for workflow logs

* Fix "All Nodes" not renderd on Nodes column

* Fix reducer to append logs on Logs column

* Fix: incorrect code placement

* Fix reducer to append logs on Nodes column

* Prepend execution log on workflow run

* Fix node ordering

* Decouple logs panel from workflow editor

* Update execution nodes when log panel is opened

* Reset log selection on workflow run

* Added 'updatePreviewState' function

* Update ee-server submodule reference
2025-07-07 10:37:46 +05:30
parthy007
ff1e145359 Fix module for in-mem-cache 2025-07-04 21:43:26 +05:30
parthy007
7bd397f51e Update service name 2025-07-04 19:24:05 +05:30
parthy007
cb1f9c4d72 Update module for in-mem-cache 2025-07-04 15:48:02 +05:30
parthy007
bbf42ddaf6 Merge branch 'release/marketplace-sprint-12' into fix/workspace-constants-mapping 2025-07-04 14:17:25 +05:30
Akshay Sasidharan
69a61051cf feat: migrate PR #3745 - Release: Workflow prioritised client issues (v3.5.62-ee-lts)
🚀 Features:
- Workflow node specific errors are thrown on App builder, Workflow builder and Webhook triggers
- Enhanced error handling with specific node error reporting

🌟 Enhancements:
- Node preview shows hints and errors
- Improved node preview functionality showing errors and hints

🛠️ Fixes:
- Loop node preview fix
- Fix query id shown for failed nodes
- Enhanced error visualization in workflow logs panel

Migration Details:
- Applied composition pattern for frontend workflow components
- Enhanced QueryNodeConfiguration with better error handling and node preview
- Updated LogsPanel with collapsible error details and new triangle icons
- Improved ResponseNodeConfiguration with updated preview state management
- Updated workflow reducer to handle new preview state structure
- Added workflow execution node handle utility function

Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
2025-07-03 18:44:40 +05:30
Akshay Sasidharan
f11ea30325 feat: migrate workflow-in-workflow capabilities and enhanced node preview (PR #3735)
Migrate hotfix for workflow blockers including:

- Feature: Ability to call workflow within a workflow
- Feature: Preview query node with other previewed node results
- Fix: startTrigger input accepts string values instead of code/JSON

Frontend changes:
- Add workflow-in-workflow support in FlowBuilder and QueryNodeConfiguration
- Enhance query node preview with upstream node state management
- Implement preview state cleanup with deleteNodePreviewState calls
- Replace TestParameter input with CodeHinter for better JSON editing
- Add workflow node type support and error styling
- Update WorkflowEditor components for nested workflow handling

Backend changes:
- Update workflow execution controller to handle state parameter
- Enhance PreviewWorkflowNodeDto with optional state field
- Modify workflow services for state-aware query execution
- Update triggers listener and webhooks service

Migration follows composition pattern for frontend EE modules and
inheritance pattern for backend services.

Co-authored-by: Akshay Sasidharan <akshaysasidrn@tooljet.com>
Co-authored-by: Shah <shah21@tooljet.com>
Co-authored-by: Devanshu <devanshu052000@tooljet.com>
2025-07-03 14:06:15 +05:30
Akshay Sasidharan
d6bda6610a feat: migrate PR #3713 - Workflows Sprint 10
- Default workflow parameters feature (#3708)
- Console.log parameter fix for RunJS nodes (#3703)
- Node loop restriction with cycle detection (#3672)
- Logs panel responsive virtualization fixes (#3694)

Co-authored-by: Devanshu Rastogi <devanshu.rastogi05@gmail.com>
Co-authored-by: Manish Kushare <37823141+manishkushare@users.noreply.github.com>
Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>"
2025-07-03 11:44:31 +05:30
Vijaykant Yadav
9ad10cf2dd fix page api bugs 2025-07-03 11:25:37 +05:30
Akshay Sasidharan
19730503ab release: Workflows sprint 9
What's changed?
🚀 Features
Feature: Configurable workflow execution in #3663 by @akshaysasidrn
Feature: Duplicate the workflow node in #3616 by @manishkushare
🛠️ Fixes
Fix: Resolve workspace constants and secrets in workflow context in #3659 by @akshaysasidrn
2025-07-02 19:38:12 +05:30
Midhun G S
f1d7fe4d90
fix (#13158) 2025-07-02 18:33:53 +05:30
Rohan Lahori
f56ea9292b
migration fix (#13156) 2025-07-02 17:42:41 +05:30
Johnson Cherian
61c03fdaa3
Merge pull request #13132 from ToolJet/fix/chart-border
Added chart border property and removed white background color
2025-07-02 17:19:33 +05:30
Rohan Lahori
c9d01da916
Bugfixes/email smtp issues (#13154) 2025-07-02 17:16:39 +05:30
Midhun G S
c38c12327f
guard level fixes (#13153) 2025-07-02 16:16:24 +05:30
Akshay Sasidharan
8fca46f7cb feat: Workflows import export support 2025-07-02 16:15:24 +05:30
Akshay Sasidharan
1cfdec70d7 fix: Async workflow in runjs 2025-07-02 13:21:18 +05:30
Midhun G S
90e7c4cab9
Cloud licensing related changes (#13033)
* added all pending cloud migration

* restrict cloud migrations

* added cloud data-migrations

* Added cloud entities

* keep tables across all

* cloud licensing initial changes

* fix

* payments module

* license counts updates

* update

* Added all pending cloud migration to pre-release + Payments module (#13006)

* added all pending cloud migration

* restrict cloud migrations

* added cloud data-migrations

* Added cloud entities

* keep tables across all

* payments module

* license counts updates

* update

* migration fixes

* pass orgId

* movement

* added cloud instance settings

* org id to license terms

* before merge

* dockerfile changes for cloud

* migration fixes

* subscription

* merge main

* posthog-js package

* fix

* selhostcustomer migration timestamp update

* fix

* fixes

* fix

* fix

* Adding cloud dockerfile changes

* migration fix

* fix

* fix

* fix

* fixes

* added migration progress

* fix

* added migration files for cloud

* fix

* added migrations for cloud

* add organizationId for pages controller

* fixes for plugins script

* fix

* final

* added cloud licensing envs

* UI WRAPPER BUG

* fix

* orgId groups fix

* lint check fixes

* Refactor Dockerfiles to use dynamic branch names for builds

* Feature/promote release permission management (#13020)

* migration and entity changes

* removed extra migration

* added default group permissions

* basic ui changes

* added promote and release permissions

* fixed tooltips for promote and release buttons

* fix

* fixed app promote ability check

* ce compatibility ui change

* ui fixes

* removed console.log

* removed comments

* updated ee-preview.Dockerile

* using base img node:22.15.1-bullseye

* fix for ce render

* Update ce-preview.Dockerfile

* Update ee-preview.Dockerfile

* ui fix

* fix

* fixes

* fixes

* fixes

* fixes

* minor fixes

* fix

---------

Co-authored-by: Souvik <psouvik260@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>

* Bugfix/git sync pre release (#13098)

* bugfixes

* ui fixes for disabled states in version creation

* minor fixes

* removed unused imports

* fixes

* removed comments

* module file fixes

* module fixes

* white-labelling fixes

* login-configs

* fix for migration for ce

* Fix for app count guard (#13131)

* fix for app count guard

* added check

* for debug

* license key

* Modules : Platform Functionality  (#12994)

* init

* mod

* app import-export

* licensing and UI

* review and permissions

* update

* updates

* update

* update

* fix breadcrumb

* fix app builder error

* remove launch button for modules

* fixed homepage

* fix permission check

---------

Co-authored-by: platform-ops123 <platformops545@gmail.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>

* reverted logs

* tjdb guard and dark mode (#13137)

* ui fixes

* added modules module

* removed unused imports

* fix

* fix

* Cypress fix

* fixes for cloud instance level licensing (#13146)

---------

Co-authored-by: platform-ops123 <platformops545@gmail.com>
Co-authored-by: Rudra deep Biswas <rudra21ultra@gmail.com>
Co-authored-by: Adish M <adish.madhu@gmail.com>
Co-authored-by: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Co-authored-by: Vijaykant Yadav <vjy239@gmail.com>
Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: Souvik <psouvik260@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>
Co-authored-by: rohanlahori <rohanlahori99@gmail.com>
Co-authored-by: ajith-k-v <ajith.jaban@gmail.com>
2025-07-02 10:57:36 +05:30
Akshay Sasidharan
131ff6a288 feat: Setup async workflow query execution with SSE
Overview
This PR implements real-time workflow execution monitoring using Server-Sent Events (SSE) as part of our LTS feature support. The implementation allows for tracking long-running workflows without requiring deployment changes.

Technical Changes
1. Server Components
Added WorkflowStreamService to manage persistent SSE streams with automatic cleanup
Implemented @sse endpoint in WorkflowExecutionsController for streaming status updates
Created WorkflowTriggersListener to emit workflow execution events with EventEmitter2
Added workflow execution status constants to identify different states in the execution lifecycle
2. Client-side Components
Implemented AsyncQueryHandler to manage SSE connections and parse event streams
Enhanced queryPanelSlice with methods to create async handlers and trigger workflows
Added support for non-blocking workflow execution with real-time status updates
3. Workflow Integration
Modified workflow triggering to use the SSE-based monitoring approach
Maintained same-server architecture to avoid deployment changes
Added automatic reconnection handling and error recovery for client connections
Architecture Decisions
Selected Same Server Approach: Chose to implement workflows within the same HTTP server to maintain the existing deployment setup for LTS users
Real-time Updates with SSE: Leveraged Server-Sent Events for their simplicity, efficiency, and compatibility with existing infrastructure
Future Extension Path: Implementation can be extended to Worker Threads or Microservice architecture later if needed
2025-07-01 19:17:07 +05:30
parthy007
39d6d14287 Merge branch 'main' into fix/workspace-constants-mapping 2025-07-01 18:55:20 +05:30
Nakul Nagargade
d1292add98 Merge branch 'appbuilder/sprint-14' into gh-12680-toggle-app-mode 2025-07-01 18:45:06 +05:30
Nakul Nagargade
68a9224972 Fix toggle app mode not working for public apps 2025-07-01 18:39:31 +05:30
parthy007
956e6b4534 Merge branch 'main' into fix/workspace-constants-mapping 2025-07-01 17:01:08 +05:30