Commit graph

96 commits

Author SHA1 Message Date
Adish M
c7b8981c55
Fix ce render pr app (#12867) 2025-05-14 10:55:28 +05:30
Adish M
6d7733c9da
testing EE PR preview app (#12851)
* testing PR app on render preview

* fix volume issue on ee pr app

* fix postgresql.conf issue

* fix postgresql.conf issue

* fix postgresql.conf issue (#12856)
2025-05-12 16:16:51 +05:30
Adish M
648cc2c247
Adding volume for render PR app (#12795)
* Adding volume for render PR app

* correction mountPath

* dummy PR for testing

* correction in mount path

* correction in mount path

* correction disk size

* correction disk size

* correction disk size

* correction disk size

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue

* postgres starting issue and volume issue fixed

* fix postgresql start up issue in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* fix postgresql start up in ee edition

* clean up

* clean up

* fix EOF

* changed the instance spec for ee edition
2025-05-08 01:37:20 +05:30
Adish M
c16c6dc84e clean up entrypoint.sh 2025-04-29 09:47:06 +05:30
Adish M
f696d15355 remove redis ce-preview dockerfile 2025-04-29 09:45:00 +05:30
Adish M
c60e75a067 adding dockerfile and boot.sh file change for postgresql 2025-04-29 07:57:51 +05:30
Adish M
b5991a7a12 correction to pick up the password from the env and not hardcode it 2025-04-28 19:00:00 +05:30
Adish M
47494ea928 Fix: Render postgresql connection pool issue 2025-04-28 18:39:06 +05:30
Adish M
1f20354095 Fix entrypoint issue in Preview dockerfie 2025-04-25 16:04:59 +05:30
Adish M
4818e01ed1 fix EOF 2025-04-15 15:27:47 +05:30
Adish M
198eec2117 added temporal file for try tooljet 2025-04-15 13:33:35 +05:30
Adish M
b4f6a31d61 gave execution permission to newly added sh files 2025-04-15 12:23:45 +05:30
Adish M
d36976e08b structured the folders for dockerfile and add try tooljet automation 2025-04-15 12:22:18 +05:30
Adish M
aafcb6aab3 fixed try tooljet dockerfile for lts and pre-release 2025-04-14 14:27:05 +05:30
Adish M
3f729d4e12 Separated out edition sepecific entrypoint 2025-04-14 14:22:25 +05:30
Adish M
b892fd3aa1 Adding try-tooljet change to modularisation structure 2025-04-14 14:16:40 +05:30
Adish M
dcee09564c
Adding single image changes from ee lts (#12272) 2025-03-18 11:11:49 +05:30
Midhun G S
11c6f9fa58
changing base branch to main (#12230) 2025-03-12 22:36:46 +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
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
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
Adish M
5bdfbe6dee Adding sub-modules and Ops changes 2025-02-25 12:35:17 +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
c5eb30b1f2 render fix 2024-03-12 17:11:41 +05:30
Adish M
94de99b769 Correction in Postgrest version 2024-03-05 13:05:08 +05:30
Adish M
daef7b8d8a Updating postgrest image tag 2024-02-27 21:13:36 +05:30
Muhsin Shah C P
53d119680f
[chore] Node-module vulnerabilities (#8226)
* started working on node upgrade to 18.18.2

* testing ci

* updated ci node version

* updated action code

* deleted all package-lock.json files

* deleted and ovverrided some packages

* deleted and fixed server & frontend vulnerabilities

* updated firestore version

* fix: ws type issue

* fix: upgraded lerna version

* regenerated package-lock.json files again

* regenerated marketplace lock file

* updated node version in other ci and docker files

* update: lock file plugin side

* updated the npm version in docker & ci files

* removed unused imports from events file

* removed dependency-review action

* updated some packages

* tried to go with current node-module of jest. had to upgrade

* fix: deprecated function usage - ts-jest

* fix: server directory lint issues

* fixed login page issue after router-dom upgrade

* updated import/no-unresolved rule to ignore import errors of  react-loading-skeleton, react-spring packages

* fix: cypress node version & package-lock issue

* regenerated cli package-lock.json

* fix: new webpack version might cause runtime issues (had issues with enterprise). lets use old version only

* fix: form-data docker issue

* removed comment
2023-12-21 11:55:35 +05:30
Adish M
21ced65af4 Fix: server.dockerfile.dev 2023-08-14 10:06:44 +05:30
Adish M
d7e923163a
adding oracle changes to server.dockerfile.dev (#7120) 2023-07-24 21:09:38 +05:30
Akshay Sasidharan
0a70d77796 Merge branch 'main' into merge-main 2023-07-24 12:38:05 +05:30
Adish M
84650aadd0
oracle zip file fix in dockerfile (#7087) 2023-07-21 17:26:13 +05:30
Adish M
858181a72f
Syncing EE dockerifle changes (#6948) 2023-07-11 11:40:20 +05:30
Adish M
d84891b01e
adding dockerfile changes (#6898) 2023-07-03 18:23:49 +05:30
Akshay
1602317ad5
Add support for oracle 9i db (#6637)
* update oracledb package for node 18

* add oracle instant client 11 and 21 binaries for linux

* Revert "add oracle instant client 11 and 21 binaries for linux"

This reverts commit 9ba7d18685.

* add ability to specify instant client version

* update dockerfiles to include oracle 11 instant client

* update ami build for oracle instant client 11

* add data migration for oracle ds default client version 21

* remove console.log in code

* fix server dev dockerfile

* define LD_LIBRARY_PATH

* fix LD_LIBRARY_PATH assignment
2023-06-21 11:39:30 +05:30
Adish M
1a461cd680
Changes in dockerfile for non-sudo user (#6505) 2023-05-25 12:30:42 +05:30
Akshay Sasidharan
f85abdd019 define home dir in env for npm 2023-05-24 15:55:52 +05:30
Akshay Sasidharan
b0de6a94a8 set user 2023-05-24 13:45:42 +05:30
Akshay Sasidharan
18c9c2b745 fix keyring add permission issue 2023-05-24 13:29:02 +05:30
gsmithun4
db19e7627b Merge branch 'main' into merge/main-to-develop 2023-03-31 14:44:22 +05:30
Adish M
38264b38bd
fix for try-tooljet (#5839) 2023-03-24 14:21:11 +05:30
Adish M
29dc483b7f
changes in dockerfile for non-sudo user (#5637)
* changes in dockerfile for non-sudo user

* made the same to server.dockerfile

* added fix for try-tooljet

* corrections

* corrections

* final

* removing try-tooljet

* Update try-tooljet.Dockerfile

* changes made with non-sudo
2023-03-03 11:55:19 +05:30
Adish M
d1d8904439
Fix try-tooljet dependence with base image (#5681)
* Fix try-tooljet dependence with base image

* corrections
2023-03-03 10:57:57 +05:30
Adish M
5a4d557720
fix for try-ooljet (#5677) 2023-03-02 12:08:56 +05:30
Adish M
8e30a6a937
correction in npm version on dockerfile.dev (#5615)
* correction in npm version on dockerfile.dev

* removed extra enable tooljet db
2023-02-24 11:16:18 +05:30
Adish M
cf3bfe94f3
Changes for docker-node upgrade (#5576)
* Changes for docker-node upgrade

* removed the extra node

* removed extra spaces and npm

* changes in server dockerfile

* change npm version to 8.11.0
2023-02-16 21:35:16 +05:30
Kavin Venkatachalam
1efcec9e09
[Feature]: Update Node from 14 to 18 (#5393)
* Updated package.json to support node 18

* Updated package-lock.json with force install

* Updated frontend package.json

* Updated server package.json

* update frontend package-lock.json

* update render dockerfile

* update dockerfiles for node 18

* update node version in actions

* fix setup script for AMI

* install using nvm

* debug

* source bashrc

* change ami os version

* change base ami

* make use of ubuntu focal lts version

* update script

* change branch name

* revert branch name

* update workflow

* node upgrade [plugins] modules updated (#5482)

* modules updated

* adds saphana and oracle package

* adds saphana and oracle package

* eslint rules for -unresolved and resolved properties

---------

Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
Co-authored-by: Arpit <arpitnath42@gmail.com>
2023-02-06 17:38:44 +05:30
Adish M
44da3d7c2b
Update dockerfile for vulnerability fixes (#5396)
* new code for osv

* made changes in server.dockerfile

* removed seeding from docker guide in docs

* corrections in .env.example

* corrections

* removed extra nodejs and npm
2023-01-25 15:10:53 +05:30
Akshay
6b2858af02
Fix env var (#5287) 2023-01-10 23:19:29 +05:30
Adish M
1ebc8b877d
Chore tooljetdb env (#5267)
* Update digitalocean.md

* Update heroku.md

* Update google-cloud-run.md

* Update docker.md

* Update kubernetes-aks.md

* Update kubernetes-gke.md

* Update ecs.md

* Update google-cloud-run.md

* Add tooljetdb env vars for separate instance (#5273)

* Update try tj docker file for tjdb env vars (#5274)

Co-authored-by: Akshay <akshaysasidharan93@gmail.com>
2023-01-09 20:35:24 +05:30
Akshay
655f12e6c1
Chore: Update try-tj image with tooljet database (#5075)
* update try tooljet dockerfile for tjdb

* update docs
2022-12-28 15:45:06 +05:30