Commit graph

193 commits

Author SHA1 Message Date
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
johnsoncherian
e036025c9b Merge branch 'main' into appbuilder/sprint-14 2025-06-27 19:51:37 +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
platform-ops123
36cee365ad
Secure PAT for AppEmbeddings (#12899)
* Secure PAT for AppEmbeddings

* added instruction comments

* updates

* update

* enum update

* remove comments

* remove comments

* updates

* updates

* handle expiry of pat

* fixes

* update

* updates

* remove log

* remove log

* move EmbedApp to appBuilder

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2025-06-27 12:18:25 +05:30
devanshu052000
284356d797 Merge branch 'appbuilder/sprint-14' into feat/component-permissions 2025-06-25 17:20:22 +05:30
devanshu052000
fcfbb46b90 Merge branch 'appbuilder/sprint-14' into feat/query-permissions 2025-06-25 13:12:10 +05:30
Rohan Lahori
e6dcc241e0
Feature edit git pulled apps/pre release (#13003)
* init

* ee git-sync

* dependancies

* added octokit depedencies to server directory

* module fixes

* fixes

* fixes

* pull app changes fix

* ability factory fixes

* code restructuring changes

* added gitlab backend changes

* app git module fixes

* module file changes

* added logo images

* migration

* migration

* migration changes

* added migration to remove enabledflag from parent table

* provider and migration fixes

* removed comments

* revert appimport export changes

* Revert "revert appimport export changes"

This reverts commit b139db811e.

* fixed version rename api calls

* app/version rename commit fixes

* added builder permissions

* review comment changes

* module file and service fixes

* module fixes

* fixes

* fixed module file changes

* added git-sync repository

* fixed app-git imports

* removed injected ssh,https, gitlab repositories

* added app git sync repository (dev testing pending)

* removed more modules

* removed type orm completley (dev testing pending)

* fixed module file

* removed unused dto's

* working

* fixes

* removed comments

* migration changes

* removed node git package

* changed default branch to main

* ssh

* removed apps ability factory dependencies

* minor changes

* migration fixes

* fixes

* added events for app and version rename

* removed comments

* added license checks

* listener fixes

* removed unused files

* fixed db:reset and server issues

* fixed ce and ee migration

* submoudle commits

* migration and entity changes

* module changes

* backend changes for edit app functionality

* ui changes

* added app canvas banner

* api-fix for freeze-editor apis

* header changes

* fix for delete version failing

* minor ui fix

* minor changes

* reverts

* reverts

* fixes

* fixed imports

* removed consoles

* added separate data migration for migrating provider column values

* fix

* fixes

* fixed ui breaking

* fix

* added app canvas banner in ce

---------

Co-authored-by: Rudra deep Biswas <rudra21ultra@gmail.com>
Co-authored-by: rohan <rohan@gmail.com>
Co-authored-by: Midhun G S <gsmithun4@gmail.com>
2025-06-25 12:06:04 +05:30
kriks7iitk
1606852abe
Feature/workflow permission 2 (#12869)
* Added worklfow permsiions

* Fixed bugs in workflow permission

* fix bugs in server for worklfow permsiion

* fix bugs for workflow permissions

* reverted not required files

* reverted package lock json

* revert back .gitmodules url

* revered package lock

* plugins import fix

* fix

* Update groups test cases

---------

Co-authored-by: Adish M <adish.madhu@gmail.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: ajith-k-v <ajith.jaban@gmail.com>
2025-06-21 13:10:05 +05:30
Rohan Lahori
3aa1960eec
migration fix (#13053) 2025-06-20 11:02:01 +05:30
johnsoncherian
11d58c4a89 Merge branch 'main' into appbuilder/sprint-13 2025-06-19 16:42:49 +05:30
Muhsin Shah C P
2d3f05ef39
Instance level OIDC common file changes (#12925)
* Working on data-migration

* Added entity file

* Changing login-configs service functions

* Changed some column names

* Fixed updating and creating sso-configs

* Changed the configs update and get apis & Worked on designs

* Added frontend & server files

* Working on oidc service

* Fixed instance signup case

* Fixed extra botton border  issue

* Fixed table updation issues

* Added frontend and backend files

* Added frontend commit file

* Refactor role assignment condition in AuthUtilService

* Update subproject commit reference in server/ee

* Update subproject commit reference in server/ee

* Fixed: no-permissioned group sync issues

* Fixed: migrations

* Fixed: editing the entity file

* Fixed: migration null check

* Updated subproject commit reference in server/ee

* Updated subproject commit reference in server/ee
2025-06-19 14:37:45 +05:30
johnsoncherian
1b56df6a7b Merge branch 'main' into appbuilder/sprint-13 2025-06-19 08:03:25 +05:30
Rohan Lahori
81527b91e7
Migration fixes pre-release (#13039)
* migration fix

* migration fix

---------

Co-authored-by: Midhun G S <gsmithun4@gmail.com>
2025-06-18 14:21:06 +05:30
johnsoncherian
beb224eb1d Merge branch 'main' into appbuilder/sprint-13 2025-06-17 10:10:05 +05:30
devanshu052000
9cc59c1bb3 Merge branch 'feat/query-permissions' into feat/component-permissions 2025-06-13 15:51:00 +05:30
devanshu052000
7f249aeb13 Merge branch 'appbuilder/sprint-14' into feat/query-permissions 2025-06-12 19:33:42 +05:30
Rudhra Deep Biswas
b426993253
Moving Git Module to Pre-Release (#12852)
* init

* ee git-sync

* dependancies

* added octokit depedencies to server directory

* module fixes

* fixes

* fixes

* pull app changes fix

* ability factory fixes

* code restructuring changes

* added gitlab backend changes

* app git module fixes

* module file changes

* added logo images

* migration

* migration

* migration changes

* added migration to remove enabledflag from parent table

* provider and migration fixes

* removed comments

* revert appimport export changes

* Revert "revert appimport export changes"

This reverts commit b139db811e.

* fixed version rename api calls

* app/version rename commit fixes

* added builder permissions

* review comment changes

* module file and service fixes

* module fixes

* fixes

* fixed module file changes

* added git-sync repository

* fixed app-git imports

* removed injected ssh,https, gitlab repositories

* added app git sync repository (dev testing pending)

* removed more modules

* removed type orm completley (dev testing pending)

* fixed module file

* removed unused dto's

* working

* fixes

* removed comments

* migration changes

* removed node git package

* changed default branch to main

* ssh

* removed apps ability factory dependencies

* minor changes

* migration fixes

* fixes

* added events for app and version rename

* removed comments

* added license checks

* listener fixes

* removed unused files

* fixed db:reset and server issues

* fixed ce and ee migration

* submoudle commits

* minor changes

* reverts

* reverts

* fixes

* fixed imports

---------

Co-authored-by: rohanlahori <rohanlahori99@gmail.com>
Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com>
Co-authored-by: rohan <rohan@gmail.com>
2025-06-11 17:03:58 +05:30
johnsoncherian
e3d1a7b4b5 Merge branch 'main' into feature/modules 2025-06-04 10:36:08 +05:30
Devanshu Gupta
ed234aa553
Feat/audit logs user (#12803)
* feat: added default audit logs for logout, archive, unarchive, profile_update

* feat: added resource data in audit table

* feat: added archive workspace, invite redeem

* feat: updated profile update audit

* feat: updated user invite audit

* feat: completed user actions audit

* feat: added default audit logs for logout, archive, unarchive, profile_update

* feat: added resource data in audit table

* feat: added archive workspace, invite redeem

* feat: updated profile update audit

* feat: updated user invite audit

* feat: completed user actions audit

* fix: merge conflict

* fix: ee commit

* fix: removed logs

* feat: added migration for resource_data

* fix: updated action names

* frontend ee commit

* feat: added /user/instance route

* fix: user instance update

* fix: updated feature name

* user ee commit

* feat: added instance level archive

* fix: user details update instance

* feat: added self signup audit

* ee audit commit

* ee commit

* metadata workspace field

* fix: instace user unarchive data

* fix: review fixes

* fix: moved user name logic to service

* remove log

* ee commit

* fix: user update password
2025-06-02 18:25:47 +05:30
devanshu052000
04519d1b0a Added migrations for component_permissions and component_users table 2025-05-29 14:57:02 +05:30
Kushagra Srivastava
86d60336a8
Unique constraint on plugins to prevent plugin to be installed multiple times in a workspace (#12798)
* fixed plugin duplication bug

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* changed it on DB level

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* changed id to name in error dialog

Signed-off-by: thesynthax <kushagra1403@gmail.com>

* migrations run

Signed-off-by: thesynthax <kushagra1403@gmail.com>

---------

Signed-off-by: thesynthax <kushagra1403@gmail.com>
2025-05-27 12:13:16 +05:30
devanshu052000
2d1bc33fe0 Added migrations for query_permissions and query_users table 2025-05-20 23:31:29 +05:30
Vijaykant Yadav
3f201e9a28 merge base 2025-05-19 10:53:23 +05:30
Muhsin Shah C P
958cbd1d02
[improvement] Default workspace (#12834)
* Added set-default API

* Setting default workspace for super-admin onboarding

* Seperated the migrations

* Added nestjs init

* removed nestjs init

* Added: default workspace case to signup

* Fixed: instance signup

* Fixed: existed non-active user instance signup

* Added: SSO default workspace support

* Added: Default workspace chooser

* Moved some scss changes to ee folder

* Added: disable workspace default organization check

* updated the migration

* Fixing .env issue

* Removed the logs

* Remove personal workspace check from enable signup

* Fixing sign-in cases

* Fixing workspace invited user's instance signup cases

* Fixing sso workspace invited user's instance signup cases

* fixing the workspace signup issue

* Adding ee server and frontend file

* Adding ee server and frontend file

* Adding active check

* Added query fix for the migration

* Added migration logic fix

* Removed/Commented the ENABLE_ONBOARDING_QUESTIONS_FOR_ALL_SIGN_UPS env support from EE and CE

* Adding server and frontend files

* Added frontend file

* Bump version
2025-05-14 16:06:52 +05:30
devanshu052000
d52959572b Revert "Added edition check in migrations."
This reverts commit 4025d23050.
2025-05-12 13:42:56 +05:30
Vijaykant Yadav
3e7f524403 merge base 2025-04-25 12:44:25 +05:30
devanshu052000
4025d23050 Added edition check in migrations. 2025-04-14 12:30:23 +05:30
devanshu052000
9c820813a3 Created page_permissions and page_users table. 2025-04-14 12:23:30 +05:30
Nithin David Thomas
623487e7e0 fix: Update container header for old data to false 2025-04-08 13:53:31 +05:30
gsmithun4
2a5221312a migration fixes for CE 2025-04-07 20:47:03 +05:30
Muhsin Shah C P
d275a8ac58
[fix/modularisation] Fixed the white-label store helper issue and changed EDITION to TOOLJET_EDITION (#12044)
* Fixed: Changed EDITION to TOOLJEET_EDITION and fixed ee frontend helper file issue

* Changed the edition env in docker files
2025-02-25 17:58:43 +05:30
Midhun G S
a8f253d5a6
fix for migration (#12041) 2025-02-25 15:58:16 +05:30
gsmithun4
a245ad598b fix for edition specific migration 2025-02-25 13:15:03 +05:30
gsmithun4
269ec56455 Initial commit 2025-02-25 12:22:50 +05:30
Ganesh Kumar
2205ebb193
feat: made tooljet database and marketplace mandatory (#11170) 2024-10-30 17:30:44 +05:30
Akshay Sasidharan
03329abfa6 sync marketplace and tooljet database changes 2024-10-28 23:37:40 +05:30
Vijaykant Yadav
fbcfe34d93 fix page menu UI and settings 2024-10-22 17:08:53 +05:30
Anantshree Chandola
34510591b2
Feature: Secret constants + Bug fixes for resolution of constants and secrets (#10551)
* Feature: Secret constants

* updates

* use constants

* name length validation

* update checks

* styling updates + unique constraint checks

* editor state updates

* update

* correct state

* ui updates

* added encrypted tag

* styling updates

* style update

* update

* fix for existing bugs

* styling updates

* styles

* update
2024-09-23 11:00:36 +05:30
Midhun G S
b924ea3e94
added type to folder (#10785) 2024-09-19 21:17:16 +05:30
Midhun G S
edeb0d133b
fix for get connection (#10668) 2024-09-09 17:18:01 +05:30
gsmithun4
00ef2387c0 removed migration file 2024-08-08 12:12:05 +05:30
kriks7iitk
eb4ebb6c05 merge CVE 2024-08-06 10:41:11 +05:30
Muhsin Shah
0ed470b9c7 removed nest mailer package
- moved migration file to migrations folder
- copied smtp changes
2024-08-05 14:37:59 +05:30
Muhsin Shah
fc8e71e6b2 Merge branch 'main' into cve/server-high 2024-07-23 14:34:25 +05:30
kriks7iitk
6ffa983436 Merge branch 'main' of github.com:ToolJet/ToolJet into group-revamp-fix_krit 2024-07-17 11:40:30 +05:30
kriks7iitk
ec20f8d2f1 duplication isue fix 2024-07-12 14:07:11 +05:30
kriks7iitk
d9cc52a3e5 Deleted migeations from table migrations 2024-07-11 11:37:22 +05:30
kriks7iitk
fa203bbf2d Migration developer testing 2024-07-09 13:52:10 +05:30
kriks7iitk
2bc01dfc55 Migration fix for custom groups 2024-07-09 12:57:45 +05:30
kriks7iitk
36b5f09c55 Fixed mihrations 2024-07-09 11:34:19 +05:30