Commit graph

5706 commits

Author SHA1 Message Date
Johnson Cherian
a6104f6b79
Merge pull request #13247 from ToolJet/fix/query-breaking
Fixed query breaking due to nested proxy
2025-07-09 00:15:59 +05:30
Johnson Cherian
0b282f45d0
Revert "Add support to show guidelines on component drop" 2025-07-09 00:14:28 +05:30
johnsoncherian
dc68be6130 Merge branch 'fix/appbuilder-02' into snapping-react-moveable 2025-07-09 00:10:18 +05:30
devanshu052000
e2034073ae Update frontend submodule reference 2025-07-08 18:53:38 +05:30
Kartik Gupta
e924ce9551 update submodules 2025-07-08 16:17:14 +05:30
johnsoncherian
489c8aa950 fix:: updated filepicker default size 2025-07-08 15:31:01 +05:30
johnsoncherian
7906279667 Merge branch 'fix/appbuilder-02' into snapping-react-moveable 2025-07-08 15:18:47 +05:30
johnsoncherian
890fc2aa4e chore: update submodule reference 2025-07-08 15:03:45 +05:30
johnsoncherian
618ae95b08 Merge branch 'fix/appbuilder-02' into snapping-react-moveable 2025-07-08 15:02:52 +05:30
Kartik Gupta
d82ee5d307 cloud changes 2025-07-08 12:59:42 +05:30
Shaurya Sharma
6c28d3f522 Fixed query breaking due to nested proxy 2025-07-08 12:09:16 +05:30
Nakul Nagargade
bff1ec9807 Clean code 2025-07-07 19:08:23 +05:30
Nakul Nagargade
a77c54c736 Fix ghost not coming when resizing 2025-07-07 19:02:51 +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
NishidhJain11
3be1b963f8
Enable HMR & optimize build & re-build times in development mode by updating devtool source-map value (#13047)
Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>
2025-07-07 14:13:06 +05:30
johnsoncherian
823c669878 merge branch 'main' into fix/appbuilder-02 2025-07-07 00:00:19 +05:30
adishM98 Bot
584aa7a7ee 🔄 chore: update submodules to latest main after auto-merge 2025-07-04 12:17:17 +00:00
johnsoncherian
1c2b312b9e chore: update version for release 2025-07-03 21:02:31 +05:30
johnsoncherian
f60784aecc chore: update version for release 2025-07-03 20:36:37 +05:30
Kavin Venkatachalam
841d660783 fix: modules are hidden if the query manager is expanded 2025-07-03 19:15:20 +05:30
Kavin Venkatachalam
ace4fe754c fix: Added a fallback for module context 2025-07-03 17:49:20 +05:30
Kavin Venkatachalam
edf657b659 Revert "fix: add fallback for useModuleId hook in query panel"
This reverts commit 27ba7dec30.
2025-07-03 17:47:41 +05:30
Kavin Venkatachalam
d9b6efefad Updated submodules ref 2025-07-03 16:39:19 +05:30
johnsoncherian
27ba7dec30 fix: add fallback for useModuleId hook in query panel
Handle case where ModuleContext is not available by wrapping
useModuleId in try-catch with 'canvas' fallback
2025-07-03 16:39:05 +05:30
Kavin Venkatachalam
108aa42eea fix: show modules inside the editor 2025-07-03 16:38:40 +05:30
Vijaykant Yadav
8388838703 fix: disable pages on modules 2025-07-03 12:41:36 +05:30
Kavin Venkatachalam
ddf49784ff chore: updated submodules 2025-07-02 17:51:33 +05:30
Kavin Venkatachalam
bd3ff240c7 feat: disable modules on viewer if the license is invalid 2025-07-02 17:40:25 +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
Nakul Nagargade
7198427ff9 Refactor 2025-07-02 14:44:21 +05:30
adishM98 Bot
329a0aba6f 🔄 chore: update submodules to latest main after auto-merge 2025-07-02 05:28:31 +00:00
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
Nakul Nagargade
74dada642c fix for modal and resolve merge conflicts 2025-07-02 10:48:16 +05:30
ajith-k-v
c8ed8bd987 Add data-cy for new editor components 2025-07-02 00:42:46 +05:30
Nakul Nagargade
d315ce48e8 fix 2025-07-01 19:14:17 +05:30
Nakul Nagargade
b88d76a4bb merge conflic fix 2025-07-01 19:13:26 +05:30
Nakul Nagargade
6bb5b8e1c9 Merge branch 'appbuilder/sprint-14' into snapping-react-moveable 2025-07-01 19:12:28 +05:30
Nakul Nagargade
5fcfb40dca remove console 2025-07-01 19:02:09 +05:30
vjaris42
ba5c1eff05
fix: mobile view on editor (#13136) 2025-07-01 16:14:12 +05:30
vjaris42
58c5c727f4
Fix: pages bugs (#13133)
* bug fixes

* bug fixes

* styling fixes

* revert onoutsideclick changes for rightsidebar
2025-07-01 14:49:15 +05:30
Shaurya Sharma
9d1f23f40a Added chart border property and removed white background color 2025-07-01 14:33:10 +05:30
Kavin Venkatachalam
884fb29a23
[fix]: Form bug on refresh fields (#13113)
* fix: handled deisgn feedback for loader, refreshing the form was causing the component duplication, checkbox issue on refresh form

* fix: Fixed the unmounting issue on the dataSectionUI
2025-07-01 10:07:07 +05:30
vjaris42
73f2b09666
fix: styling and other bugs (#13115) 2025-06-30 17:00:48 +05:30
Kavin Venkatachalam
fd909ab00a
feat: Form 2.0 (#12941)
* init: Added resetOnSubmit, validateOnSubmit properties and exposed formData value

* Added the generate form from dropdown menu on the inspector

* feat: Added generate form button and fields section

* Added the generate column popup UI

* feat: Added UI for form fields

* feat: Added the UI for new custom field

* chore: Added refresh data and custom schema UI

* feat: Added the util function to map the JSON to component

* chore: cleanup and fixed bugs on dropdown

* feat: Added fields property to the form config

* feat: save generated fields on form

* feat: generated child components from the JSON

* fix: bugs on generating component from JSON

* chore: added functionality for view properties and styles on field popover

* feat: Added local state for add new custom fields

* feat: Added logic to create component on submitting new custom field

* fix: bugfies on creating a custom fields

* feat: Handled grouping of data in the manage column modal

* feat: Handled deletion case of the fields

* fix: fixed bug on deleting the fields

* chore: Updated the form fields logic to store only the necessary values and fetch the remaining values from the component directly using componentId

* chore: updated logic to handle fx in mandatory and selected fields

* feat: Added functionality to update the component from form fields

* fix: bug on componentType typo

* chore: written logic to handle the componentType update

* feat: Added multiple updates including componentType change

* chore: Added few more input components

* chore: Moved the form fields property logic to new formComponentSlice

* fix: creating a custom field while dragging across the parent components

* chore: reverted the deletion logic a bit to properly fetch the parentID from the component

* fix: while moving the component with more than 1 form field, it is clearing the complete list

* fix: handle the case of moving component from canvas to form

* chore: Removed unwanted UI blocks and added logic to conditionally display data section when custom schema is turned off

* chore: cleaned up the Dropdownmenu component & added memo to avoid re-render

* feat: Added query support and updated logic to display the columns on the modal

* chore: cleanup & passed the correct columns to the  component

* chore: cleaned up the form status constant

* chore: wrapped functions in a

* chore: created a separate function to create components from form

* chore: cleaned up the code to use the same code for component creation

* chore: updated the logic for the form field component update

* feat: Added functionality for single field popover icons & moved the single field creation out of common function to simplify the field update

* fix: removed the deleted fields while refreshing the form

* fix: updated the logic for the refresh fields

* feat: Added logic to ignore the components to be deleted for regeration of form

* chore: moved the component list supported to a constant

* fix: Added a backfill logic for the fields property to handle without migration

* fix: added a correct key for custom field

* fix: Fixed issue on adding custom fields while regenrating the form

* fix: Fixed issues on generating form fields while refreshing the FORM

* chore: cleanedup the code

* chore: Fixed path and merged with main

* fix: avoided the multiple re-renders on FORM and fixed the state issue on data & formData

* fix: removed the child components from inspector & added a support for query even if it is an array to generate the form

* fix: fixed few bugs and design feedbacks

* fix: Added a logic to set the width of the dropdown menu same as dropdown trigger

* feat: updated the deprecated section for Form

* feat: Added a logic to run query on selecting the query on generate form from

* fix: changed the logic of selection handled in the manage column modal. The components will be created only if the column is selected.

* refactor: moved the manage fields from button to an icon

* fix: merged the field definition with the existing default data to show it on manage column popup

* feat: focused the codehinter when the rawJson is selected on the dropdown menu

* chore: cleanup

* feat: update formComponentSlice with latest changes

- Fixed getCurrentPageIndex usage in setComponentPropertyByComponentIds
- Enhanced component batch operations functionality
- Improved form field management logic

* Reverted the git changes reflected on the form PR

* Reverted the git changes reflected on the form PR

* Reverted the git changes reflected on the form PR

* fix: fixed the issues due to merge conflict

* feat: Removed componentMapping modal for rawJson. Added JsonSchema in the dropdown menu and moved the refresh button inside the modal footer for the queries

* fix: Added a loader in the column mapping & updated the styles

* chore: cleanup and moves to separate files

* chore: cleanup the components

* fix: modal was not poping up when I click a different query

* chore: cleanedup `ColumnMappingComponent`

* fix: fixed bugs on regenerating the forms, shown the loader while running the query, added support for multiple queries etc

* chore: removed unwanted props

* fix: fixed the undo/redo issues

* fix: Fixed the issue on custom fields not showing up on the columnMappingModal

* fix: bugfixes like duplicate field, maping popup stays on screen, visibility not working, form loader etc

* fix: Fixed the height of the textare and fixed showing the main popover on click of make mandatory button

* fix: Fixed the undo redo issue on deleting the form component

* fix: removed the undo/redo while saving the form data section

* chore: updated the default data for rawJSON

* fix: Fixed bugs on toggleswitch, scroll, placeholder etc

* fix: Added a condition to render the placeholder input

* chore: taken care bito feedback

* fix: fixed the modal closing issue

* fix: Fixed the gutter issue as the canvas height needs to be updated once the child components are generated

* chore: fixed design feedback

* fix: Added hover to the modal body instead of each section
2025-06-27 20:08:15 +05:30
johnsoncherian
e036025c9b Merge branch 'main' into appbuilder/sprint-14 2025-06-27 19:51:37 +05:30
Johnson Cherian
90c577f553
fix: cleanup custom component iframe on unmount (#13015) 2025-06-27 18:16:59 +05:30
Kavin Venkatachalam
39550063e2
fix: updated the default data of the custom component (#13024) 2025-06-27 18:15:51 +05:30
johnsoncherian
bf474466d2 chore: update submodule references 2025-06-27 18:14:22 +05:30
Shaurya Sharma
9b78959b68
Custom themes (#13064)
* feat: Add CSA and functionalities for managing loading, visibility, and disable states for full tab component. (#11267)

* feat: tab draggble option and popover menu (#11267)

* feat: tab scrollable arrows and tabItem logic(#11267)

* feat: remove logs(#11267)

* feat: Tabslayout name change(#11267)

* fix: component update on Tabs

* fix: tab text color update

* feat: setTabDisable CSA added(#11267)

* feat: added CSA for tab specific changes(#11267)

* feat: added handle function for tab specific changes(#11267)

* feat: shimmer for tab nav and icon chooser (#11267)

* feat: icon for each tab in TabNav items (#11267)

* feat: equal split width fix for each tab in TabNav items (#11267)

* feat: styles for Tab Nav (#11267)

* feat: slide options(#11267)

* feat: fix radius (#11267)

* feat: slider (#11267)

* feat: fix slide direction (#11267)

* feat: fix slide direction 2 (#11267)

* feat: fix styles right side inspector view (#11267)

* feat: nav ellipsis ... (#11267)

* feat: children different for dynamic and non-dynamic (#11267)

* feat:[tabsLayout] change default values in config (#11267)

* feat:[tabsLayout] split and auto fix (#11267)

* feat: fix styles accent and text  (#11267)

* feat: fix styles divider and more 2(#11267)

* feat: fix styles divider and more 3(#11267)

* feat: fix styles 4(#11267)

* feat: fix styles 5(#11267)

* feat: fix tab icon visibility 6 (#11267)

* feat: modify name of property from id to Tab 7(#11267)

* fixes and changes

* fix: csa for tabs

* new changes and fixes

* fix: dynamic options sytling

* v2 changes

* add: new properties and styles to inspector for range slider

* fixes of range slider

* fix: styling

* fix: styling of icons

* fixed endvalue and startvalue problem

* ColorSwatches for table

* fix: styling

* transition effect fix

* fix: properties and migration

* fix: slider functionality

* fixed transition

* new changes

* visible,disable,loading,width

* feat: merge appbuilder/sprint-11 with main

* fix: styling

* style: extend tabpane background to whole pane

* [Issue 12503] Update input's with type as color to colorSwatches and also change accent color value to primary brand css variable' -m 'Changes done for: Currency, Email, Phone Number & ModalV2 component

* review changes

* fix: tinycolor import

* [Issue 12503] Update input's with type as color to colorSwatches and also change accent color value to primary brand css variable

Changes done for: Date, Time, DateTime & Date Range Picker components

* [Issue 12503] Update input's with type as color to colorSwatches and also change accent color value to primary brand css variable

Changes done for: Form, Textarea & Horizontal Divider component

* Fix: Add default selected value config for Header & Footer Background Color input field for Form component so that its shows correct color demo & its value

* Fix: Resolved custom theming issues in different components

* feat: Revamps file uploader widget

* Fixes added

* Custom theme extra code for extra components

* Submodule commit change

* Submodule commit change

* Textinput theming added

* Number input theming added

* Email & Password Theming added

* Textarea theming added

* Error system status added along with rating theming

* ToggleV2 theming added

* Toggle, RadioButton & Error related theming added

* Checkbox Theming added

* Dropdown V2 and legacy theming added

* Multiselect V2 theming added

* Adding ux friendly error messages

* Misc1 and Misc 2 theming added

* Multiselect legacy theming added

* Form components theming added

* Subcontainer related issues

* Subcontainers theming added

* Tabs theming added

* Filepicker theming added

* Range slider theming added

* Steps theming added

* Submodule update

* Package update

* Added Header text, background and container background color

* Submodule Update

* Submodule update

* Submodule update

* Submodule update

* Hover effect added

* feat: Revamps file uploader widget

* Adding ux friendly error messages

* Adds style tab

* Adds min file validation

* Reset vs code

* Adds support for theme

* Base theme added

* Base theme added

* Base theme added

* initial commit

* fix

* Fixes

* Submodule update

* Added auto color assign feature for multiselect/select in table

* Table column popover going out of bounds fix

* Changed layout of component manager

* DropdownV2 added to selectInputs

* HTML column data type added

* Table column icons added

* Fix dropping widget width while dragging

* Changed datepicker icon and added icons to table dropdown

* Style: Update Accordion Component UI

* Temp changes

* Fix group selection in form

* fix when dropping a component, shadow is coming on top of component manager.

* improve performace on useGroupedTargetsScrollHandler

* Fix

* Review fixes

* Minor changes

* chore: update submodule references

* Color swatches added icon/default and added disabled/loading state

* Submodule update

* Bugs solved

* Fixes for Component sidebar

* Custom theme related bug fixes

* App Background Switch added

* Submodule update

* Submodule update

* HTML fixes

* Submodule update

* Query breaking on Symbol fix

* Import export property migration for Rangepicker & Textarea

* Auto color pills not working for table select fix

* Custom themes minor bugs

* Submodule update

* Minor fixes

* Revamp pages in editor and viewer

* bug fixes

* merge base

* fix conflicts

* fix conflicts

* bug fixes

* Added swatches to page menu

* Submodule update

* Submodule update

* Submodule update

* Styling fixes

* Changed few page styles

* bug fixes

* fix: pages icon and layout for right sidebar

* fix: styling for pages menu

* fix base styling

* merge base

* bug fixes

* Bug fixes

* Submodule update

* Submodules updated

* bug fixes

* fix top styling of nav bar

* Sass loader error fix

* styles: correct styles to match the dsigns

* Accordion design added with some minor styling fixes

* fix: update default supported file of filepicker to any

* fix: update styles mismatches

* fix: hide min and max file count if multi file select is disabled

* TJ Default changed to Tooljet Migration

* Multiline code editor suggestions now close when out of view

* add border to canvas

* Dark theme link color fix for html column type

* Spinner color fix

* bug fixes

* bug fixes

* Submodules updated

* update reference

* Submodule update

---------

Co-authored-by: Raman Kumar <k.raman1998@yahoo.in>
Co-authored-by: Vijaykant Yadav <vjy239@gmail.com>
Co-authored-by: TaruunMalik <taruunrmalik09@gmail.com>
Co-authored-by: johnsoncherian <johnsonc.dev@gmail.com>
Co-authored-by: NishidhJain11 <nishidh@tooljet.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Nakul Nagargade <nakul@tooljet.com>
2025-06-27 18:12:34 +05:30
vjaris42
08d5cc9390
Revamp pages in viewer and editor (#13022)
* initial commit

* fix

* Fixes

* Fix dropping widget width while dragging

* Fix group selection in form

* fix when dropping a component, shadow is coming on top of component manager.

* improve performace on useGroupedTargetsScrollHandler

* Fix

* Revamp pages in editor and viewer

* bug fixes

* merge base

* fix conflicts

* fix conflicts

* bug fixes

* bug fixes

* fix: pages icon and layout for right sidebar

* fix: styling for pages menu

* fix base styling

* merge base

* bug fixes

* bug fixes

* fix top styling of nav bar

* add border to canvas

* bug fixes

* bug fixes

* update reference

* bug fix

---------

Co-authored-by: Nakul Nagargade <nakul@tooljet.com>
2025-06-27 17:36:32 +05:30