Commit graph

114 commits

Author SHA1 Message Date
Adish M
09b2f89cf8
fix git issue cloud server dockerifle (#13299) 2025-07-09 23:41:59 +05:30
Adish M
19eab65c40 Add the fallback and ai path changes to cloud dockerfile 2025-07-09 18:54:59 +05:30
Adish M
f9f37804b5 adding condition to fallback to main if submodule branch is not found 2025-07-09 18:27:43 +05:30
Adish M
90a28e6ea0 changing it back to main 2025-07-09 18:24:29 +05:30
Adish M
f7f7ec4702 hardcoding main branch 2025-07-09 17:56:20 +05:30
Adish M
e96da4597a Update new ai assest path in dockerfile 2025-07-09 17:38:58 +05:30
Adish M
8695c63af7
Enhance Neo4j configuration and installation in Try tooljet Dockerfiles with APOC plugin support (#13248)
* Enhance Neo4j configuration and installation in Try tooljet Dockerfiles with APOC plugin support

* fix: Update Dockerfile to use the latest ToolJet image version
2025-07-08 13:09:41 +05:30
Adish M
317f1e913f
fix: Update path for server keys in Dockerfile (#13184) 2025-07-03 20:58:10 +05:30
Adish M
b8aceb2e7a
fix: Update server installation steps in Dockerfile for consistency (#13183) 2025-07-03 20:49:15 +05:30
Adish M
890161738e
refactor: streamline workflow worker setup and command determination (#13152)
* refactor: streamline workflow worker setup and command determination

* consolidate plugin build and prune commands in Dockerfile
2025-07-02 17:35:53 +05:30
Adish M
abae4dc009
feat: update Dockerfiles and entrypoint for PostgreSQL and Temporal integration (#13144)
* feat: update Dockerfiles and entrypoint for PostgreSQL and Temporal integration

* fix: update Docker image tags for ee-latest versioning

* fix: remove default Dockerfile path and update tag generation logic

* fix: remove unnecessary newline in manual Docker build workflow

* fix: remove duplicate TOOLJET_EDITION environment variable declaration

* fix: update PostgreSQL source list for compatibility and enhance entrypoint script for improved logging and error handling

* update PostgreSQL source list to use bookworm for compatibility
2025-07-02 12:35:22 +05:30
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
Adish M
356cab0035
Update Dockerfile to use dynamic branch name for checkout (#13126) 2025-06-30 20:35:12 +05:30
Adish M
9ba1ca375e
Update Dockerfile to checkout specific branch and separate server build commands (#13124) 2025-06-30 20:25:24 +05:30
Adish M
817c371f17
Refactor Dockerfile for improved build efficiency and dependency management (#13110)
* Refactor Dockerfile for improved build efficiency and dependency management

* Update Dockerfile to include copyfiles installation and correct key path

* Enhance Dockerfile and entrypoint script for improved setup and functionality

- Install grpcurl in the Dockerfile and entrypoint script if not already present
- Add installation steps for Temporal Server and UI Server binaries
- Register Temporal namespace if it doesn't exist
- Update environment variables for Temporal configuration

* Update Dockerfile to use dynamic branch name for checkout

* Update Dockerfile to set BRANCH_NAME as a build argument

* Fix Dockerfile to correct unzip command for Oracle Instant Client zip file
2025-06-30 19:38:44 +05:30
Adish M
d2b8220ab5
fix node version in the preview dockerfile (#13043)
* fix node version in the preview dockerfile

* extra whitespace
2025-06-18 22:30:22 +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
Adish M
52191c9625
Adding dockerfile change for cloud and ee file (#12987)
* Adding dockerfile change for cloud and ee file

* fix EOF
2025-06-05 17:25:35 +05:30
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