Commit graph

593 commits

Author SHA1 Message Date
Nakul Nagargade
818fe9ef9d fix default fx for modalv2 height 2025-07-16 10:10:50 +05:30
Nakul Nagargade
c355ba9335 Fix modal issues 2025-07-15 21:04:43 +05:30
johnsoncherian
5dd3f9ddb7 Merge branch 'fix/appbuilder-04' into fix/modules-bug 2025-07-15 18:46:00 +05:30
Nakul Nagargade
8e3530c608 Merge branch 'snapping-react-moveable-2' into fix-grid-bugs-lts 2025-07-15 16:47:35 +05:30
Johnson Cherian
f6047511d2
Merge pull request #13343 from ToolJet/fix-modal-bugs
Fix modalV2 issues
2025-07-15 16:20:32 +05:30
Ganesh Kumar
1f1eb3f9b7
Release : Google Calendar plugin and Oauth component extraction for plugins (#13393)
* Enhance: Extract the general OAuth flow for plugins [PRE-RELEASE] (#13291)

* Feature: Prometheus plugin (#13161)

* prometheus plugin

* added existing props

* Host and database can be dynamically configured in query builder for PostgreSQL and MySQL data sources (#13163)

* Fix: Postgresql datasource tries to connect via ssl even when ssl toggle is off (#13167)

* The ability to provide a partition key for deleting items in CosmosDB datasource has been enabled (#13166)

* Feature: Ability to configure the database name in Redis datasource (#13165)

* Fix: Avoid setting Content-Type header for requests without body and configure different host for all environments in OpenAPI [PRE-RELEASE] (#13230)

* Send content-type only with body in request

* Persist OpenAPI parameters per operation only

* Configure different host

* Add disable styles to the select input

* Feat: New fields 'client id' and 'client secret' have been introduced in the Slack datasource configuration page in pre-release (#13162)

* Update slack frontend

* Update slack backend to handle custom creds

* Add backfill migrations

* Dynamically change dropdown according to versions

* Change migration file name

* Correctly access scope in chat:write logic

* Extract general OAuth flow

* Render save button correctly

* Update the dropdown labels

* Fix dropdown according to tooljet editions

---------

Co-authored-by: Ganesh Kumar <40178541+ganesh8056@users.noreply.github.com>
Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>

* Feat/google calendar plugin pre release (#13361)

* ee commit

* Feature: Prometheus plugin (#13161)

* prometheus plugin

* added existing props

* Host and database can be dynamically configured in query builder for PostgreSQL and MySQL data sources (#13163)

* Fix: Postgresql datasource tries to connect via ssl even when ssl toggle is off (#13167)

* The ability to provide a partition key for deleting items in CosmosDB datasource has been enabled (#13166)

* Feature: Ability to configure the database name in Redis datasource (#13165)

* merge commit

* feat: updated openapi operation component

* Fix: Avoid setting Content-Type header for requests without body and configure different host for all environments in OpenAPI [PRE-RELEASE] (#13230)

* Send content-type only with body in request

* Persist OpenAPI parameters per operation only

* Configure different host

* Add disable styles to the select input

* Feat: New fields 'client id' and 'client secret' have been introduced in the Slack datasource configuration page in pre-release (#13162)

* Update slack frontend

* Update slack backend to handle custom creds

* Add backfill migrations

* Dynamically change dropdown according to versions

* Change migration file name

* Correctly access scope in chat:write logic

* Extract general OAuth flow

* Render save button correctly

* Update the dropdown labels

* feat: added google calendar

* fix: option styling

* fix: removed test connection

* Fix dropdown according to tooljet editions

* fix: updated oauth type

* fix: added env variable helper

* fix: environment fetch

* feat: added default scope

* Remove connect button when multi-auth true

* Make scope configurable

* Hardcode google calendar scope

---------

Co-authored-by: Ganesh Kumar <40178541+ganesh8056@users.noreply.github.com>
Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
Co-authored-by: Parth <108089718+parthy007@users.noreply.github.com>
Co-authored-by: parthy007 <parthadhikari1812@gmail.com>

---------

Co-authored-by: Parth <108089718+parthy007@users.noreply.github.com>
Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
Co-authored-by: Devanshu Gupta <devanshuguptaknp@gmail.com>
Co-authored-by: parthy007 <parthadhikari1812@gmail.com>
2025-07-14 22:18:06 +05:30
Kavin Venkatachalam
fbee63d14b Resolve submodule conflicts - use local commits 2025-07-14 18:48:12 +05:30
Nakul Nagargade
b51654f8c0 Fix grid mode not working on listview 2025-07-13 18:06:52 +05:30
Shaurya Sharma
84fac83e4e Merge branch 'migration/tabs-image' of https://github.com/ToolJet/ToolJet into migration/tabs-image 2025-07-12 11:20:17 +05:30
Shaurya Sharma
24e39aaf33 Custom themes migration 2025-07-12 11:17:03 +05:30
Devanshu Rastogi
11283dcf17 Update server/src/modules/apps/services/app-import-export.service.ts
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-12 11:05:45 +05:30
devanshu052000
7e602750c9 Fix: Conditionally render border radius only when image shape is set to 'None' 2025-07-12 11:05:15 +05:30
devanshu052000
d7af02b692 Added import export logic for image component 2025-07-12 11:05:03 +05:30
devanshu052000
bb9c851c99 Fix: Updated migration part for image component and restored rounded and thumbnail image shapes 2025-07-12 11:03:22 +05:30
Shaurya Sharma
927f839a98 Tabs migration 2025-07-12 10:57:01 +05:30
Nakul Nagargade
7cee567d8d Fix modalV2 issues 2025-07-11 14:59:26 +05:30
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
Kavin Venkatachalam
e22dce6e49 Merge branch 'fix/appbuilder-03' of https://github.com/ToolJet/ToolJet into fix/modules-bug 2025-07-10 16:21:10 +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
Kavin Venkatachalam
819647b937 Resolve submodule conflicts: link local commits in submodule refs
- frontend/ee: 3b2d439 (fix/appbuilder-03)
- server/ee: 456b951 (fix/modules-bug)
2025-07-09 22:12:40 +05:30
Kavin Venkatachalam
6e3e580598 - fix: enhance ModuleViewer component handling and update version creation logic.
- fixed crash on selecting the multiple modules in the app
2025-07-09 21:52:59 +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