Commit graph

83 commits

Author SHA1 Message Date
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
Akshay
9b2787cc76
Chore: Render preview with supervisord (#5048)
* run postgrest and tooljet with supervisord for preview apps

* update render.yaml for pgrest values

* update env vars

* revise db name
2022-12-26 13:45:21 +05:30
Akshay
602b1b4ad3
Feature: Tooljet Database (#4951)
* wip

* internal db per workspace

* fix async query

* feat: add storage layer route

* feat: add drawer component

* feat: add react-table to load data

* feat: add columns form

* feat: add create column form, create row form

* feat: add postgrest js

* add tooljet db controller to proxy requests to postgrest

* util: add postgrest filter builder helper utility

* feat: add filter popover

* use helper utility for building query

* add sortable filters

* add box shadow for filter popup

* use overlay trigger

* use react select

* add new column addition

* add dropdown for table header, table list

* Move filter.jsx

* feat: add sort popover

* feat: add postgrest js .order fn

* setup tooljetdb with restricted grants for users

* make db schemas added loaded dynamically on postgrest server

* fix query

* sign jwt token to auth user at postgrest

* update db schema user with workspace

* chore: add table listing

* update data and columns from api

* feat: add context api for sharing data

* add ability to create table, view tables and add columns

* use columns for sort from context api

* fix ormconfig

* feat: add table listing integration

* feat: add create table integration

* fix for rds deployment

* add internal table translation instead of schema

* remove tooljetdb as a datasource

* wrap placeholder on proxy query

* add active workspace guard

* scope tooljetdb by workspace

* update active workspace guard

* seperate proxy related concerns to different service

* make use of org id param

* rename storage layer to tooljet databse

* update specs

* feat: Update list when new table added

* feat: add create column

* chore: add orgId to url + misc changes

* chore: move popover to separate file

* remove unused var

* rename files

* feat: add multiple columns

* feat: add new row

* removes postgrest-js from pkg lock

* feat: add row data

* feat: add sorting

* feat: allow row deletion

* feat: add search

* feat: add filtering

* feat: add edit mode

* feat: add columns while edit table

* add view table action

* update setup for column constraint

* fix query

* integrate view_table, primary key field

* render toogle for boolean data type

* update view table query for primary key

* fetch metadata refactor

* add capability to set default values

* feat: allow deletion of record based on primary key

* feat: add default value while creating column

* send query from sort & filter component

* css changes

* allow empty data

* add requested changes

* add err message

* add common fn

* allow sort + filter

* remove unwanted defaults key

* css changes

* add more operators

* dark mode fixes

* add drawer footer

* add loader for list tables

* add dashboard design changes

* design changes

* add capability to drop table and delete column

* add breadcrumbs

* design changes

* add profile

* refactor tooljetdb controller

* update routes

* add empty page changes

* delete column fix

* fix delete column

* design changes

* fetch tables post delete

* homepage changes

* hide ellipsis on hover

* add org settings page

* add edit + create org

* add notification center

* fix: group permissions switch issue

* add logo

* remove anchor tag

* fix merge conflicts

* css changes

* add err boundary

* setup query editor

* css changes

* fix: merge conflicts

* add menuPortal prop to filterform and sort form

* fix seed

* fix: build

* design changes

* design changes + refactor code

* fix imports

* fix: drawer issue on delete table

* add search box changes

* fix: tablename max-length 255

* fix: set newly created table as selected item

* remove edit column option

* added badges to enterprise only features

* disable edit column

* table styles

* fix: popover position, placeholder default

* fix: display boolean values in table

* fix: tooljet database default type values

* css changes

* add query manager for tooljet db with create and list row

* dark mode fixes

* remove Header component

* add ability to delete tooljetdb rows from query manager

* add ability to update tooljetdb rows

* dark mode fixes

* css changes

* display actions icon on hover

* folder onclick change

* add empty page styles

* fix proxy requests

* feat: randomize icon creation

* add max items per page prop for pagination

* removes unwanted position attr

* add table name validation + disable submit btn while api fetch

* [Bugfix] internal storage toast  | trigger toasts for running preview db queries (#5019)

* resolves: no toasts are fired when preview query is run for db queries

* fire success toast for created and no content status text for query success

* remove invalid migration

* skip migration if tooljet db already created

* fix: app clone icon param

* fix: show confirmation box if filter options are empty in query (#5021)

* for now: show native confirmation box of the brower to confirm the delete all query

* typo

* Revert "typo"

This reverts commit b5ce5ed889.

* cleaned

* cleaned

* show confirmation box if filter options are empty in query

* [Refactor/Bugfix] database query (#5028)

* refactored list rows operations

* remove unwanted cls

* refactor create row

* reafactored update rows

* refactored delete rows

* padding fix for tj-query

* add static templates

* review changes

* remove unused file

* Chore: tooljetdb render setup (#5033)

* add postgrest for render preview deploy

* pin version

* add healthCheckPath

* remove health check

* handle database url parsing db params

* add defaults for tooljetdb env

* fix hostname

* handle env in migration files

* refactor dbconfig build

* fix pg db usage

* add parsed env context

* add tooljetdb env

* refactor db config utils

Co-authored-by: gandharv <gandharvkumargarg@gmail.com>
Co-authored-by: Shubhendra <withshubh@gmail.com>
Co-authored-by: Arpit <arpitnath42@gmail.com>
2022-12-23 02:09:57 +05:30
Francesco Frassinelli
769e56dce6
fix: change client.Dockerfile.dev node_modules path (#4824) 2022-11-28 10:59:31 +05:30
Akshay
9d38c2955e
chore: Setup github action for render deploy (#4750) 2022-11-15 17:02:23 +05:30
Akshay
561db28a39
Chore: Setup preview apps with Render (#4520)
* add dockerfile for preview apps
* add render.yaml
2022-10-19 13:54:34 +05:30
Midhun G S
61158d8122
Merge main to develop (#4049)
* Fix: User group permissions error on Openshift platform (#4041)

* update dockerfile for file permissions on root group

* add permissions from the user group on dockerfile

* bump to v1.24.4

* bump to v1.25.0

* [feature] Added pagination and filtering features to users page (#3921)

* added pagination and filtering in backend

* added pagination
    - created a seperate component for users table
    - added pagination

* Added filter UI

* temporary css fix for pagination footer

* fixed pagination width issue

* now result will also clear when user clicks on clear icon

* Added seperate api for comment mentions

* Now we can search mentions by email, first and last names

* Fixed a bug
- email didn't send for comment mentions

* refactoring the code

* resolved PR changes

* Added isAdmin guard

* adding some checks

* fixed lint errors

* added wild card search

* Added no result found text

* fixed failing test case

* Working on PR changes

* Now users table avatars will load image too

* replaced skeleton classes with skeleton library component

* Completed PR changes

* added orderby

* Fixed some issues

* fixed failed test case

* have fixed some css issues

* replaced query with quersrting package

* fixed minor width issue

* Fixed some css issues

* fixed darkMode issue

* implemented on enter press search

* Refactored the code

* fixed white space issue

* refactored the code

* fixed overlapping issue

* refactored the code

* fixing some issues

* fixes

* removed guard

* code cleanup

* comments notification fix

* fixed conflict issues

* fixed css height issue

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>

* Remove signup guard from set-password-from-token API (#4050)

* Remove sign up guard set-password-from-token API

* test cases fix

* Bump to v1.25.1

* Feature: Add PG_DB_OWNER env var to disable db and extension creation (#4055)

* add PG_DB_OWNER env var to disable db and extension creation

* update docs

* bump to v1.25.2

Co-authored-by: Akshay <akshaysasidharan93@gmail.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
2022-09-16 21:08:45 +05:30
Akshay
0d482f8161
Revise docker setup (#3954)
* fixes separate client build

* update docs

* add SERVE_CLIENT flag for dev docker step for uniformity

* Doc changes

* Doc changes

* Doc changes

* update readme

* add separate docker compose setups

* Doc changes

* rename compose files

* remove unused dependency

* rename service name to server for uniformity

Co-authored-by: Navaneeth Pk <navaneeth@tooljet.io>
2022-09-05 21:06:11 +05:30
Akshay
14fc14c90c
Chore: Fix docker image build (#3934)
* make webpack-cli non dev dependency

* update dockerfiles

* Revert "make webpack-cli non dev dependency"

This reverts commit d2eb5cf701.

* update dockerfile
2022-09-01 22:40:02 +05:30
Akshay Sasidharan
c422546e18 fix try tooljet setup 2022-08-29 23:44:17 +05:30
Akshay Sasidharan
df23272af2 hotfix: add server scripts to dockerfile 2022-08-18 12:59:49 +05:30
Akshay
f3f9baeab2
Fix: Only add distributable files for server on docker image (#3729)
* only add build server files on docker images

* copy .version file

* remove DO clean up script

* add dotenv and joi
2022-08-03 17:06:11 +05:30
Akshay
94efa97270
Update digital ocean setup (#3644)
* add placeholder values for digital ocean secrets

* revise dockerfile with security updates

* update postbuild script to use transpiled code

* add cloud-init dependency

* move cloud-init to digitalocean postbuild script

* update digitalocean postbuild script
2022-07-19 22:07:54 +05:30
Akshay
a13a2d4d63
Chore: ToolJet setup to try locally (#3158)
* add dockerfile for try tooljet setup

* update npm scripts and logged messages

* refactor npm scripts for dist folder scripts

* update usages of db setup and seed

* setup script to init db and boot app

* fix dockerfile

* update dockerfile

* user production.Dockerfile as base image

* fix script

* fix script exit

* fix lint
2022-05-31 18:42:36 +05:30