Commit graph

2051 commits

Author SHA1 Message Date
Johnson Cherian
0d7ff2d1f3
Merge branch 'main' into fix/hide-modules-tab 2025-06-21 16:15:39 +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
Johnson Cherian
8844f4fdab
Merge branch 'main' into fix/hide-modules-tab 2025-06-20 15:52:28 +05:30
Kavin Venkatachalam
0e618973d8 chore: version bump 2025-06-20 15:44:56 +05:30
Midhun G S
2c146ad3e8
fix for plugin scripts (#13055) 2025-06-20 14:30:52 +05:30
Adish M
9aa9675b60
Adding Cloud plugin scripts (#12995) 2025-06-20 12:59:17 +05:30
Rohan Lahori
3aa1960eec
migration fix (#13053) 2025-06-20 11:02:01 +05:30
johnsoncherian
a5750f2942 chore: update submodule references 2025-06-19 17:43:33 +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
3070a1387c chore: version bumped to 3.15.0 2025-06-19 09:56:01 +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
Muhsin Shah C P
957b1513af
refactor: update signIn method signature in ISamlService interface (#13036) 2025-06-18 13:09:06 +05:30
Midhun G S
175345479a
Node upgrade 18->22 (#12836)
* node upgrade initial commit

* Removed node-saas and added saas. Fixed the CSS warnings from saas

* add node version 22 to dockerfile and AMI setup script

* change the base image to debian 12

* Update the node version (#12860)

* correction in builder image

* Update ce-production.Dockerfile

* upgrade node to 22.15.1

* server package lock

* package upgrade

* package upgrade

* base directory package upgrade

* revert sentry package upgrade

* fix

* added copy files

* fix dockerfile for copywrite package issue

* removed copy files package

* fix dockerfile for copywrite package issue

---------

Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>
Co-authored-by: Adish M <adish.madhu@gmail.com>
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
2025-06-17 13:01:46 +05:30
johnsoncherian
7eb1446a98 fix: added missing dependancies in modules module 2025-06-17 10:52:32 +05:30
johnsoncherian
beb224eb1d Merge branch 'main' into appbuilder/sprint-13 2025-06-17 10:10:05 +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
118a8d799f Merge branch 'appbuilder/sprint-13' into feature/modules 2025-06-09 10:33:01 +05:30
johnsoncherian
9165682c67 chore: update submodule references 2025-06-09 10:31:37 +05:30
johnsoncherian
f4b2606ea0 Merge branch 'main' into appbuilder/sprint-13 2025-06-05 09:30:20 +05:30
Ajith KV
ea5e6beb7e
Update platform cypress workflow for enterprise edition (#12875)
* Update platform cypress workflow

* fix syntax

* fix syntax

* update the workflow

* update workflow

* update the port

* correction in the .env variables

* correction in the matrix check

* correction in the matrix check

* correction in the matrix check

* fix for platform ee cypress workflow

* Update the workflow for environment specific cypress env

* Update ee config

* update the file name

* update the file name

* update typo

* update dockerfile

* update the port

* adding logs to check the migration

* added redis to the dockerfile

* added redis to the dockerfile

* fix redis issue

* corrections ce and ee steps

* clean up

* adding latest submodules

* removing submodules

* removing submodules

---------

Co-authored-by: Adish M <adish.madhu@gmail.com>
2025-06-04 12:30:00 +05:30
johnsoncherian
efed245f08 Merge branch 'main' into appbuilder/sprint-13 2025-06-04 12:20:11 +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
Ganesh Kumar
4c7ff67a3d submodule reference updated 2025-05-30 12:21:37 +05:30
Ganesh Kumar
844bc51979 version bump 2025-05-29 18:00:54 +05:30
johnsoncherian
e0dc90d36a chore: update submodule references 2025-05-29 12:29:27 +05:30
johnsoncherian
718c96e7d3 chore: update submodule references 2025-05-29 12:06:54 +05:30
johnsoncherian
425710f513 Merge branch 'feature/modules' into page-permission-fixes 2025-05-29 11:46:57 +05:30
johnsoncherian
65483deb28 choreL updated submodule reference 2025-05-28 14:14:21 +05:30
johnsoncherian
ad62add247 Merge branch 'main' into feature/modules 2025-05-28 14:11:55 +05:30
Parth
afb27b8673
Feature: Add Clickup plugin (#12703)
* initialize clickup plugin, add getConnection and testConnection

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

* including the openapi yaml

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

* trying to attach the openapi spec

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

* Fix key casing mismatch

* Update copywriting

* Fix clickup logic

* Filter limited operation request

* Add error standardisation

* Fix asterik symbol position

* Fix copywriting

* Fix wrong URL

* Fix asterisk gapping

* Handle array types

* Update marketplace package-lock.json

* Add the same package-lock as release branch

* chore: update package-lock.json

---------

Signed-off-by: thesynthax <kushagra1403@gmail.com>
Co-authored-by: thesynthax <kushagra1403@gmail.com>
Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
2025-05-27 21:03:15 +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
Ganesh Kumar
64c8e8af9c
Feat: Restrict data source deletion if queries are present in any app within a instance (#12824)
* datasource or marketplace plugin deletion should not delete queries so have a dependency check

* removed a api from controller to check if marketplace plugins has dependent queries

* info message updated

* restrict uninstalling marketplace plugin when queries are used feature

* submodule commit hash updated

* dependent queries info modal title updated
2025-05-23 15:26:21 +05:30
Ganesh Kumar
cccd84d628 submodule reference updated 2025-05-23 13:38:34 +05:30
Ganesh Kumar
5e53d6dd7e
Merge branch 'main' into release/marketplace-sprint-11 2025-05-21 11:08:14 +05:30
Johnson Cherian
1c7ef25656
chore: updated version (#12904)
* chore: updated version

* chore: updated references
2025-05-20 11:57:30 +05:30
johnsoncherian
170355d949 update server submodule reference 2025-05-19 18:18:57 +05:30
Vijaykant Yadav
3f201e9a28 merge base 2025-05-19 10:53:23 +05:30
Johnson Cherian
09bc300466
Merge pull request #12605 from ToolJet/appbuilder/sprint-11-edit
container size
2025-05-16 18:06:20 +05:30
johnsoncherian
d084360650 Merge branch 'appbuilder/sprint-12' into appbuilder/sprint-11-edit 2025-05-16 18:06:06 +05:30
johnsoncherian
1581552a71 Merge branch 'appbuilder/sprint-12' into fix/custom-themes-ui 2025-05-16 18:02:11 +05:30
johnsoncherian
b64b5ad5ea update reference 2025-05-16 12:30:44 +05:30
Johnson Cherian
31552242a2
Merge pull request #12591 from ToolJet/feat/steps-v2-alignment-style-improvement
feat: dynamic steps length based on steps text size
2025-05-15 15:28:29 +05:30
Johnson Cherian
432066b4f6
Merge pull request #12709 from ToolJet/fix/query-duplicate-failure
Fix: Add datasourceId to static queries in GET requests
2025-05-15 15:04:06 +05:30
Johnson Cherian
51dbe8bee9
Merge branch 'main' into fix/query-duplicate-failure 2025-05-15 15:03:50 +05:30
devanshu052000
e1bf0ea4c6 Updated submodule ref 2025-05-15 14:28:22 +05:30
gsmithun4
81f039b481 Merge branch 'main' into fix/external-epi 2025-05-14 21:41:27 +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