Commit graph

2057 commits

Author SHA1 Message Date
devanshu052000
bf826e4a89 Update submodule ref with feature branch itself 2025-06-25 13:04:07 +05:30
devanshu052000
7f249aeb13 Merge branch 'appbuilder/sprint-14' into feat/query-permissions 2025-06-12 19:33:42 +05:30
devanshu052000
e3a22fe36d Merged sprint-14 branch in ee-server submodule 2025-06-12 18:06:54 +05:30
devanshu052000
86f0c1808c Changed error message and description 2025-06-12 17:34:27 +05:30
devanshu052000
c0423bd713 Fix permission not being applied in preview if released app is set as public 2025-06-12 17:26:46 +05:30
devanshu052000
a50c83d13b Fixed letter case in function call 2025-06-12 00:34:51 +05:30
devanshu052000
b099b82066 Implemented backend call for restricting queries and adding audit logs 2025-06-12 00:27:18 +05:30
devanshu052000
c4b3144d64 Update submodule references 2025-06-09 12:37:34 +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
devanshu052000
223ec1ac14 Update the permissions data in the state on each operation 2025-05-28 11:06:25 +05:30
devanshu052000
5d35806349 Get permissions data with queries on initial app load 2025-05-28 09:56:16 +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
devanshu052000
a0eb1956e2 Implemented import-export logic 2025-05-26 12:00:28 +05:30
devanshu052000
4b0d0184de Implemented versioning logic for query permissions 2025-05-26 09:01:42 +05:30
devanshu052000
4beaaaef91 Added check for running query in the backend 2025-05-24 20:55:50 +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
devanshu052000
8ea84bfacd Fix: app permissions in public released apps 2025-05-23 03:14:24 +05:30
devanshu052000
1d6d807720 Added filter logic for preview apps 2025-05-23 03:08:23 +05:30
devanshu052000
59cac14f4d Added filter logic for released apps 2025-05-22 17:54:04 +05:30
devanshu052000
f3fa111ad4 Implemented business logic for Query Permissions API 2025-05-21 21:21:19 +05:30
devanshu052000
e68b5c48ad Combined both DTOs to reduce duplicate code 2025-05-21 16:48:33 +05:30
devanshu052000
82eb0204c2 Made the service functions reusable for both query as well as page permissions 2025-05-21 15:55:02 +05:30
devanshu052000
b13a8ca376 Created base for API endpoint, feature keys and DTO 2025-05-21 13:17:36 +05:30
devanshu052000
fbb30fcff9 Added the required entities for query_permissions and query_users tables 2025-05-21 11:44:06 +05:30
Ganesh Kumar
5e53d6dd7e
Merge branch 'main' into release/marketplace-sprint-11 2025-05-21 11:08:14 +05:30
devanshu052000
2d1bc33fe0 Added migrations for query_permissions and query_users table 2025-05-20 23:31:29 +05:30
devanshu052000
daa85fe48a Merge page-permission-fixes, keeping current submodule versions 2025-05-20 20:40:41 +05:30
devanshu052000
4477c48734 Update submodule reference 2025-05-20 20:34:10 +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