Commit graph

357 commits

Author SHA1 Message Date
Adish M
4d4a1e325f Removing old github workflows to main branch 2025-04-08 10:55:24 +05:30
Adish M
b76234cac1 Fix: Stopped the old docker release and fix the edition specific action to mina 2025-04-07 13:20:03 +05:30
Akshay Sasidharan
625e201cad Merge branch 'main' into release/marketplace-sprint-9 2025-04-02 20:05:53 +05:30
Midhun G S
b55490493d
Post modularization fixes (#12420)
* [white-labelling] Logo related pending issues (#12243)

* Working on refactoring and fixing white-labelling for modularisation

* Working on fixes

* Fixed: app builder logo issue

* Refactored default state behaviour

* Removed console logs

* Added workspace slug

* Adding single image changes from ee lts (#12272) (#12285)

Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>

* Moving Vulnerability CI from EE (#12288)

* CE modularisation bugs (#12278)

* Working on refactoring and fixing white-labelling for modularisation

* Working on fixes

* Fixed: app builder logo issue

* Refactored default state behaviour

* Removed console logs

* Added workspace slug

* Fixed: Able to update group name with space

* Adding single image changes from ee lts (#12272)

* Fixed: Able to add a user 2 times to the group

* Fixed: Builder isn't able to datasiurces

* Fixed: updated the builder check

* Refactored the changes

---------

Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>

* Add data-cy for components in modularisation branch (#12296)

* [modularisation-bugs] Fixing rest of the priority bugs  (#12301)

* Fixed: custom logout url issue

* Fixed: fixed all workspace redirection issue

* Fixed: made the datsource access same for ce and ee-basicplan builders

* Fixed: sample db connection issue

* Fixed: sample database query issue

* Fixed: page isn't showing the organization list for user whose current organization is archived

* Fixed: granular permission datasource page

* remove license check for oidc login

---------

Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
Co-authored-by: Anantshree Chandola <anantshreechandola23@gmail.com>
2025-04-01 16:16:01 +05:30
Adish M
81796414fb upload artifact version fix 2025-04-01 11:14:21 +05:30
Adish M
4166ae5406 testing vulnerability-ci.yml 2025-04-01 11:06:24 +05:30
Adish M
7c8ba145f8 Adding vulnerability-ci.yml to main 2025-04-01 11:03:37 +05:30
Adish M
40ec663441 Fix forked branch handling by dynamically setting the repo URL. 🚀
- Detect if the branch is from a fork

- Dynamically set the repo URL to use the fork's owner

- Ensure correct repository reference during workflow execution
2025-03-28 15:52:18 +05:30
Adish M
7b844f5151
Fixed forked branch checkout issue in Render deployment (#12407)
Issue:
- Forked branch was not being pulled by Render create service.

Fix:
- Added fix in preview code to correctly fetch and checkout to forked
branch.
2025-03-28 15:33:13 +05:30
Akshay
1587be0f17
Merge pull request #12174 from ToolJet/develop
Merge develop to main
2025-03-27 18:15:19 +05:30
Adish M
3e74c169ad
Fix cypress platform workflow (#12303) 2025-03-19 16:50:51 +05:30
gsmithun4
22bbcbee70 Merge branch 'main' into merge-main-develop-1s 2025-03-12 22:59:30 +05:30
Midhun G S
11c6f9fa58
changing base branch to main (#12230) 2025-03-12 22:36:46 +05:30
Adish M
b3c54f3b58 Fix: Destroy render service according to Edition
- Miss match with render create service name and destory service
2025-03-11 12:39:30 +05:30
Adish M
ffa92c419e
Feature: Adding Modularisation for AWS Packer build (#12098) 2025-03-03 18:26:28 +05:30
Adish M
b8ae574e2d
Removed unused Github actions (#12091) 2025-03-03 14:26:41 +05:30
Adish M
0342d75278
Feature: Docker image build with Modularisation changes (#12089)
- Added change for Edition specfic docker image build
- Added Cloud specific dockerfile
2025-03-03 14:22:24 +05:30
Adish M
5276bfb667
Feature: Cypress for Modularisation (#12071)
* Feature: Cypress for Modularisation

* Adding submodule authentication

* remove render key

* adding fix to fallback to default branch

* adding fix to fallback to default branch

* adding fix to fallback to default branch

* adding submodule change to appbuilder cypress

* adding submodule change to marketplace cypress
2025-02-28 14:32:25 +05:30
Adish M
79fd8ab296
Corrections in render deployment for Modularisation (#12046)
* Testing redner dummy PR

* corrections in file names

* corrections in selecting the branch name

* commenting cloud render code
2025-02-26 11:36:38 +05:30
Adish M
5bdfbe6dee Adding sub-modules and Ops changes 2025-02-25 12:35:17 +05:30
Ajith KV
52937bb120
Fix failing cypress test cases (#11896)
* Fix failing cypress test cases

* modify test cases

* modify failing test cases

* modify failing test cases

* Fix failing test cases

* Fix failing test cases

* fix failing test cases

* fix failing test cases

* fix failing test cases
2025-02-17 10:30:24 +05:30
Adish M
cb3023946c
Update cypress-platform.yml to main (#11911) 2025-02-04 11:07:09 +05:30
Ajith KV
164ce70cef
Update platform config (#11900) 2025-02-03 11:13:38 +05:30
Ajith KV
94ff9dbb29
Update platform cypress config (#11899) 2025-02-03 10:43:27 +05:30
Adish M
4e0eb8d5b8
Update cypress-platform.yml (#11864) 2025-01-24 15:30:49 +05:30
Ajith KV
e80a29d70e
update platform workflow (#11848) 2025-01-22 15:02:22 +05:30
Ajith KV
1728645fa0
update platform workflow (#11845) 2025-01-22 13:38:37 +05:30
Ajith KV
108441c182
Add Cypress E2E testing workflow for all deployment types (#11647)
* configure workflow for multiple deployment scenarios

* fix syntax error

* Update workflow

* Update workflow for normal flow

* Update workflow for better readablity

* Modify nginx config

* Update workflow with seperate job

* update workflow file

* modify nginx configuration

* update config file

* Fix for masking

* seed the nginx config

* update config

* update config

* Update nginx config

* update config

* update config

* Update cypress secrets

* Seperate each jobs

* update common setup step

* Seperate each jobs

* update config

* Update config
2024-12-19 16:33:06 +05:30
Ajith KV
214dc1e0ad
Cypress subpath testing (#11589)
* Update config

* Update files for subpath baseurl

* update config

* skip npm ci

* add subpath config

* Update github-ation version

* Update package

* Update the config

* update commands

* Update config

* update workflow
2024-12-12 14:34:33 +05:30
Adish M
2187a95400
Updated cypress-platform.yml workflow with host 2024-12-11 11:18:19 +05:30
Adish M
4a5c9dde4d Fix: Cypress subpath workflow's docker port 2024-12-10 18:46:15 +05:30
Adish M
3550049b13 Fix: Docker build and docker compose file 2024-12-10 18:23:39 +05:30
Adish M
24ba01686c
Update cypress-platform.yml main 2024-12-10 15:31:55 +05:30
Adish M
a93f14a3d5
Update cypress-platform.yml 2024-12-10 15:30:03 +05:30
ajith-k-v
b3cf0c093d Update the workflow file 2024-12-09 17:01:37 +05:30
ajith-k-v
b71e102764 update cypress workflow for subpath 2024-12-09 14:28:49 +05:30
Adish M
57f75626d1
Fix/tjdb render preview lts 3.0 (#11368)
* Fix for TJDB in render preview app lts-3.0 branch

* removed marketplace env
2024-11-20 13:43:28 +05:30
Adish M
11da5da972 removed marketplace env 2024-11-20 12:54:10 +05:30
Adish M
610eeef625 removed ENABLED_TOOLJET env variable 2024-11-20 12:49:25 +05:30
Adish M
5b841ee73e Fix for TJDB in render preview app 2024-11-20 12:45:11 +05:30
Akshay
86d24c64f2
Fixes in render for v3 (#11354)
Co-authored-by: Adish M <adish.madhu@gmail.com>
2024-11-18 15:12:24 +05:30
Adish M
f805116c9e Fixes in render for v3 2024-11-18 15:06:48 +05:30
Adish M
5b937d71cf Removed build-latest-version.sh from docs-pr-app workflow 2024-11-13 16:48:43 +05:30
Adish M
040bc6415a
Correction in docker release check develop branch (#11301) 2024-11-13 12:20:10 +05:30
Adish M
816ba2b757 Correction in docker release check lts-3.0 branch 2024-11-13 12:07:12 +05:30
Adish M
0b2989d914
Fix docker release automation lts.3.0 branch (#11284) 2024-11-12 13:46:34 +05:30
Adish M
6790179adc
Adding LTS 3.0 checking docker release workflow (#11111)
* Adding LTS 3.0 checking docker release workflow

* changed the tag to 3.0

* change the tag format with new one

* change in image tag

* change in image tag
2024-11-10 19:23:44 +05:30
Adish M
595077ce09
Adding LTS 3.0 checking docker release workflow to main (#11112)
* Adding LTS 3.0 checking docker release workflow to main

* correction in condition

* changed the latest tag to 3.0

* change the tag format with new one

* change in image tag

* change in image tag
2024-11-10 19:23:32 +05:30
Adish M
2ac17e2242
Chore: Tooljet database and marketplace are mandatory set for render (#11173)
* Chore: Tooljet database and marketplace are mandatory set on render and other deployment file for CE

* added PGRST_DB_PRE_CONFIG=postgrest.pre_config

* edited .env.example file
2024-10-30 17:31:08 +05:30
Kavin Venkatachalam
6fdb25fa8b Merge branch 'develop' into chore/merge-develop 2024-10-30 11:40:02 +05:30
Adish M
91c5da4cc8
Fix: marketplace plugins build workflow (#10429)
* Maketplace plugins build workflow

* testing the build command

* testing the build command

* adding continue-on-error: true to test the build
2024-08-13 12:40:06 +05:30
Adish M
7b69d8f75a adding back echo PGRST_DB_PRE_CONFIG=postgrest.pre_config >> .env 2024-08-07 18:24:09 +05:30
Adish M
646693638e Corrections in marketpalce workflow to main 2024-08-07 18:22:53 +05:30
Adish M
4e476adf74 Fix release workflow to update ce lts test system to lts branch 2024-08-02 18:24:41 +05:30
Adish M
d04054eb72 Fix release workflow to update ce lts test system 2024-08-02 17:09:26 +05:30
Adish M
e22dc5f0a1 Fix docker release workflow to update LTS CE test system to main 2024-07-26 13:35:47 +05:30
Adish M
b0cf5a089a Fix docker release workflow to update LTS CE test system 2024-07-26 13:31:08 +05:30
Akshay Sasidharan
e3aa03cef8 remove unused configuration 2024-07-09 16:34:04 +05:30
Adish M
f2870a37ba Correction docker release workflow 2024-07-02 13:07:33 +05:30
Akshay Sasidharan
2dec9a106d Merge branch 'main' into release/marketplace-sprint-2 2024-07-01 16:37:46 +05:30
Manish Kushare
6f43a043dc
Feature: Aggregate and group by functionality in TJDB (#10170)
* Added no codition section when aggregates are not available

* Added feature to add aggregate condition and display it accordingly

* Added feature to change the aggregateFx option

* Added feature to update column option in the aggregate

* Added feature to delete the aggregate

* Disabling the group by according to valid condition but without tooltip

* Added flow for deleting aggregate

* feat: migration and configuration changes to support aggregation in tooljet database

* added functionality for join table operations

* Dropdown styles

* Showing section for aggregate dropdown for joinTable operation

* Added gap in multiple aggregate conditions

* Added table_id in aggregate condition

* Added custom placeholder

Adjusted width of add condition of aggregate

* Refactored logic for disable group_by field

Added tooltip when group by is disabled

* Updated aggregateFx to aggFx and groupBy to group_by

* feat: group_by and aggregate option in list rows

* added table name for aggregate dropdown value in joinTable operation

* Get the group by options

* value of aggregate column dropdown in join table operation

* Added error and success message for aggregate deletion

* Spacing adjustments

* Clear the unwanted code

* Updated the stucture of aggregate

* Updated the structure of group_by

* Fix: Query builder breaking due to undefined values

* feat: logic used to aggregate on joins

* Removing async

* fix: app is crashing

* feat: statement timeout at database level and user session level configuration can be done for ToolJet database

* Added min and max width to dropdown in tooljetdb query manager

* Added description

* Adding width as 80 percentage when description is not avaialable

* New Postgrest change for render related to Aggregate (#10175)

* New Postgrest change for render related to Aggregate and group by functionality

* correction in PGRST_DB_ENABLE_AGGREGATE value

* Adding the env variable PGRST_DB_PRE_CONFIG

* Adding the new postgrest related env changes to CE specific files

* fix: updated env variable naming for aggregates

* Showing description at the bottom for aggregate fx

* Fixing typo error

* Showing tick mark on selected item in dropdown when isMulti is false

* Updated requested changes

* Showing some description when option is not focused or selected

* Updated the component name to AggregateFilter

* fix: updated env variable to enable aggregation in tooljet database

* refactor: new wrapper to create migration connection for tooljet database

* fix: custom error message for aggregation errors has been handled for list_rows operation

* fix: code review fixes

* fix: aggregate function validation typo is updated

* fix: empty validation for Select and Aggregate fields

* postgrest changes for cypress

* removed PGRST_DB_ENABLE_AGGREGATE

---------

Co-authored-by: Ganesh Kumar <ganesh8056234@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>
Co-authored-by: Adish M <adish.madhu@gmail.com>
2024-07-01 14:38:31 +05:30
Adish M
808f36f582 Added slack notification 2024-07-01 14:22:19 +05:30
Adish M
272a62c5b1 Updated LTS system after release 2024-07-01 14:13:07 +05:30
Kavin Venkatachalam
84167f3479 Merge branch 'main' of https://github.com/ToolJet/ToolJet into chore/main-to-develop 2024-06-28 12:05:37 +05:30
Kavin Venkatachalam
7aa656169f Merge branch 'lts-2.50' into perf/0.1 2024-06-26 16:46:08 +05:30
Adish M
75f6d0593d Correction in CE docker release workflow LTS branch 2024-06-18 13:49:30 +05:30
Adish M
7bb02218e7 Correction in CE docker release workflow 2024-06-18 13:47:54 +05:30
Adish M
cc89276076 docker release workflow lts fix ce 2024-06-12 21:32:12 +05:30
Adish M
c439b842ce docker release workflow lts fix 2024-06-12 21:27:03 +05:30
Adish M
9fb52a058e Correction in docker compose file name 2024-06-11 16:00:01 +05:30
Adish M
df729c0224 Run CI fix to main 2024-06-11 12:00:38 +05:30
Adish M
fff15837f6 running lint parallel 2024-06-11 11:36:16 +05:30
Adish M
1eeb133c4a Docker worjflow changes 2024-06-06 17:32:57 +05:30
Adish M
5de99191b3 Run CI imporvements 2024-06-05 17:15:23 +05:30
Adish M
4ae7977af5 LTS tag correction 2024-06-03 17:24:30 +05:30
Adish M
0539d7d87a LTS changes in docker release workflow CE 2024-06-03 16:51:58 +05:30
Adish M
df9ddf8d71 test syste automation for main 2024-05-20 20:35:21 +05:30
Adish M
5fa379e82e adding values to secrets 2024-05-20 20:32:37 +05:30
Adish M
f474472544 adding permission check 2024-05-20 20:19:38 +05:30
Adish M
3c708e2930 adding the script for changing the image 2024-05-20 19:41:45 +05:30
Adish M
ec6f171e9d changing the ipaddress for testing 2024-05-20 19:41:04 +05:30
Adish M
48fa5e1e3a adding back docker code 2024-05-20 19:29:43 +05:30
Adish M
a0a0efb57f checking .shh folder 2024-05-20 18:26:07 +05:30
Adish M
e1928c6812 checking .shh folder 2024-05-20 18:06:43 +05:30
Adish M
342e771228 checking .shh folder 2024-05-20 14:49:03 +05:30
Adish M
0770aa671d checking .shh folder 2024-05-20 14:38:34 +05:30
Adish M
0a3b689bf7 checking .shh folder 2024-05-20 14:31:58 +05:30
Adish M
9bec9e1b1d checking .shh folder 2024-05-20 14:23:10 +05:30
Adish M
2368e688c8 checking .shh folder 2024-05-20 14:20:31 +05:30
Adish M
e9ea8a6460 checking .shh folder 2024-05-20 13:10:26 +05:30
Adish M
be784edfcc Testing gcp command 2024-05-20 13:07:04 +05:30
Adish M
f7d914d3a1 Testing gcp command 2024-05-20 13:01:47 +05:30
Adish M
deb6a1cc52 Testing gcp command 2024-05-20 12:59:39 +05:30
Adish M
b286e676fe Testing gcp command 2024-05-20 12:57:30 +05:30
Adish M
b837557ca5 Testing gcp command 2024-05-20 12:45:08 +05:30
Adish M
77f33f4456 Testing gcp command 2024-05-20 12:44:41 +05:30
Adish M
f8c435bd87 Testing gcp command 2024-05-20 11:50:17 +05:30
Adish M
7c098ca9d0 Test system automation for GCP 2024-05-20 11:48:11 +05:30
Adish M
fdf2b99266 Review sub-path pr app url correction 2024-04-26 17:58:46 +05:30
Adish M
49dcf33ad9 Adding review sub-path pr app 2024-04-26 17:39:37 +05:30