Commit graph

458 commits

Author SHA1 Message Date
Muhsin Shah C P
9257f6feea
Workspace name sanitisation (#6299)
* added unique organization name constraint

* sanitization task: workspace-name

* refactoring the code

* resolved PR changes

* fixed migration & added some checks

* change: trimming workspace name

* handle error messages

* added missing css

* working on the error messages

* change: first workspace's name of the new user

* change: removed underscore from the list

* Tested and fixed first workspace name changes

* Fixing error handler issues

* working on session storage implementation

* revert: session storage

* change: close modal if the edited name is same as prev name

* fixing bugs

* workspace name: refactoring the code

* workspace name: refactoring again

* workspace name: fixing and refactoring code

* fixed e2e test cases

* added catchDbException to catch db lever errors

* added: PR changes

* workspance name: css fix

* updated workspace name constraints and default name

* fix: test cases

* fix: app.e2e tests case

* fix: wrong error message

* fix: last state issue

* reverted some changes

* added workspace name tooltip

* added more tooltip for workspace name

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2023-06-01 19:21:38 +05:30
Midhun G S
77124ff221
wrapping check update API call inside try catch (#6612) 2023-05-31 11:44:09 +05:30
Arpit
f98603f1f8
Disable/removing AWS S3 plugin from marketplace (#6414) 2023-05-30 20:09:28 +05:30
Arpit
38b92e27f5
Adds guards to plugins API endpoints based on env (#6579)
* Add guards to plugins API endpoints based on environment variable

* clean up
2023-05-30 20:08:40 +05:30
Sherfin Shamsudeen
48344b88e9 Merge branch 'main' into merge-back/2.6.1 2023-05-26 13:51:25 +05:30
Arpit
7f281980a3
Hotfix - support resolving codeblocks workspace (#6551)
* fixes: resolve both {{object}} and %%object%% within a single string

* resolved multiple server/client/app variables together

* clean up

* clean up
2023-05-26 13:50:39 +05:30
Sherfin Shamsudeen
b82a8a7a35 Merge branch 'main' into develop 2023-05-25 18:32:59 +05:30
Justin Warren
a558548864
Add LISTEN_ADDR environment variable for server. (#6082)
LISTEN_ADDR defaults to '::' so server supports IPv6 and IPv4
2023-05-25 12:32:00 +05:30
Midhun G S
88549c15c6
building fe assets synchronously (#6514) 2023-05-24 22:26:24 +05:30
arpitnath
91c971832f current organization Id to be passed from frontend 2023-05-16 12:29:34 +05:30
arpitnath
cea948710e changing scope of API key from user to workspace 2023-05-14 01:40:48 +05:30
Arpit
2ddbd3309e
Feature - ToolJet Copilot 🚀 (#6074)
* add support for Copilot assistance

* clean up

* fixes workspace settings crash

* refactor and resolved review comments

* api endpoint should be inferred from env

* copilot style fixes

* copilot style fixed

* beta tag fro copilot settings: workspace

* fire toast for unauthorised recommendation request

* include the previous code with the newly generated response

* scoping apikeys to orgs

* controller updates for copilot

* copilot org key updated

* disable toggle for new workspaces

* disable toggle for new workspaces

* fixes: multi-workspace toggle updates

* uninstall unsued packages

* fixes button state for copilot in transformations

* updated the urls
2023-05-11 15:04:48 +05:30
Muhsin Shah C P
f215d1df96
App version creation flow enhancement - New released version warning popup - Current version issues (#5947)
* current version issue

* working on modal design

* Added released version popup and shake animation

* refactoring the code

* improved the experience

* extra changes

* css revert

* fix: disable components & properties

* fix: switched released version saving & create version modal input value retain issues

* fix: retained values issues

* fix: edit version modal current name issue
- disabled comment's icon

* override grayed out effect for preview

* fix: text overflow issue

* css fix: overflow

* added check for sub-containers

* fixed and added specs

* UI and UX fixes

* lint fix

* added clearInternal fn

* change:added clearInternal fn

* refactoring the code

* removed the comments

* added some code that were missing after the merge

* fixed merge issues

* fixed undo redo

* reverted the store changes
2023-05-11 12:32:21 +05:30
Arpit
c2434d216b
add the missing block (#6332) 2023-05-10 13:49:17 +05:30
Muhsin Shah C P
ff103d0e42
copy pasting the code from EE and testing (#6272) 2023-05-09 15:41:05 +05:30
Akshay
642569b519
Merge pull request #6178 from ToolJet/improvements/marketplace-plugin-schema-validations
Plugins JSON validation to prevent saving invalid data to database
2023-05-04 14:14:30 +05:30
Arpit
a2b4e49776
remove console log 2023-05-03 16:08:34 +05:30
arpitnath
33416b2563 Merge branch 'develop' into plugin/textract 2023-05-03 13:21:05 +05:30
Akshay
36f4bdd401
Merge pull request #6224 from ToolJet/main
Hotfix merge back to develop
2023-05-03 12:46:30 +05:30
arpitnath
752cd7c436 clean up 2023-05-02 15:24:31 +05:30
arpitnath
95f4bdfa9b retreiving the protobuff and saving services and rpcs 2023-05-02 05:19:38 +05:30
arpitnath
a60ffb3dc7 fixes: app crash for adding a new gds from marketplace 2023-04-28 19:48:36 +05:30
Muhsin Shah C P
e28acce37c
[fix] camel paths are converted with underscore while populating the OpenAPI plugin operations field causing internal server error & crashing OpenAPI queries when the user changes the datasource (#6149)
* fix: paths issue

* fix: switching ds from query issue

* fix: decamelizing issue

* fix: else case

* refactoring the code
2023-04-28 16:13:51 +05:30
Muhsin Shah C P
ec8e560af1
[fix] Error when accessing the app preview with slug instead of app id (#6179)
* fix

* refactoring the code
2023-04-28 11:11:08 +05:30
arpitnath
44d696f8bc Plugins JSON validation to prevent saving invalid data to database 2023-04-27 18:48:45 +05:30
Akshay
8772cff54c
Merge pull request #6165 from ToolJet/fix/tracking-vars
Fix: Telemetry flag check
2023-04-27 14:29:23 +05:30
Akshay Sasidharan
d2207cf48c enable check for update when var is unset 2023-04-27 13:54:28 +05:30
Akshay Sasidharan
c995a39cbd fix telemetry flag check 2023-04-27 12:24:01 +05:30
arpitnath
30f5b26e98 Merge branch 'develop' into plugin/textract 2023-04-23 02:28:59 +05:30
arpitnath
fa132fd99a update name 2023-04-21 15:44:12 +05:30
Kiran Ashok
65259afeb2
Feature Homepage and settings redesign (#5763)
* adding colors

* feat :: add button

* feat :: added typography

* feat: init storybook

* removes browserlist

* feat :: adding button styles and button component

* feat :: added sass addon

* stories update

* feat :: replacing with radix colors

* danger variants

* updates buttin story

* fix :: removing default items

* cleanup

* fix icons update

* feat :: folder list component

* fix :: naming

* icon and split button :: init

* intermediate save :: app card component

* renaming

* updates

* update for module imports

* updates icon

* update :: homepage design updates

* design changes dashboard

* updates :: apps section

* workspace stting new design upate

* updates dasboard design

* style :: fixes

* feat :: added context for sidebar nav breadcrumb

* added all solid icons

* intermediate update

* change: conditions for fetching users

* sorybook updates

* design updates :: workspace settings page

* manage users page

* lint fixes

* fix :: styling

* stle fixes :: workspace settings

* homepage redesign

* fix :: all drawer colors and position ,teplate page revamp , database page header fixes

* imported all bulk icons

* svg to jsx : bulk icons

* minor :: cleanup

* fix :: manage users drawer

* fix :: searchboxes , userspage fixes

* fix :: all inputs and minor ui fixes

* database page ui fixes

* fix :: database and folder search functionality and iconlist in homecard

* fixed some db functionality and edge cases for longer texts

* fix :: user addition manage user page

* self review cleanup and change in bulk icon fill state

* fix :: homepage seacbar

* merging develop and resolving conflicts

* remove unwanted stories

* reverting merge with develop

* Revert "reverting merge with develop"

This reverts commit 2150c8ec0c.

* clearing out warnings

* lint fixes

* feat :: added org modal in database page

* fix :: sso loader theme

* fix :: broken styles select

* fixed icon warning and select ui

* fix :: upload bulk and user select dark mode

* merge styles  with develop

* feat :: integrated new ui for database

* removing storybook files

* fix :: all bugs related to users dropdown and cleanup

* fix: user search api for organization page

* cleanup and splitting dropzone component

* fix :: overflow issue in app card time

* fix for scrollbars in homepage

* PR review fixes

* updates :: fix d=global datasource design issues , homepage responsiveness

* tj db operations

* breadcrumb bug fixes

* lint fixes

* removing logs , removed fade in in datasource and database page

* marketplace page ui fix

* removing inital users table fetch

* Pr :: review changes

* remove logs

* fix :: popover bug

* minot style fix

* fix :: remove arrow from all popovers

* fix :: for loading states

* ux :: sidebar items reorder

* style :: fix

* style fix :: templates

* fix :: qa bugs

* fix :: Qa reported bugs

* removes :: folder fetch bug

* share link and datsource bg color fix

* fixes :: rename group ,

* removed logs

* pages popover background fix

* fix :: tj db table addition ui bug

* fix :: ui bug confirm modal password disable

* modal , revert name capitalize in lists, typos fix

* typos , users page route bugfix

* users page header bugfix

* workspace archive btn , datasources form style for select

* groups updated , delete, create flow updated

* avatar bug in profile page fix

* revert styles

* fix :: for create new table nav breadcrumb not being updated

* click state bug fix in avatar

* fix bug with appcard popover

* fix :: text capitalize issue

* fix :: lints and updated icon for filter delete

* fix warnings

---------

Co-authored-by: gandharv <gandharvkumargarg@gmail.com>
Co-authored-by: Vijaykant Yadav <vjy239@gmail.com>
2023-04-21 11:45:48 +05:30
Midhun G S
963a7130bc
Merge pull request #6073 from ToolJet/main
Merge Main to Develop
2023-04-19 21:40:27 +05:30
arpitnath
e688662a1f plugin: aws textract 2023-04-19 21:12:57 +05:30
vjaris42
45b41eae34
fix: app import conflicts (#6060) 2023-04-19 21:04:42 +05:30
Sherfin Shamsudeen
08269d7424
Merge pull request #6044 from ToolJet/main
Merge Main to Develop
2023-04-14 17:13:28 +05:30
vjaris42
b955d30966
fix: app import (#6043) 2023-04-14 16:59:27 +05:30
Midhun G S
044d1083eb
remove token data from app export (#6035) 2023-04-14 15:37:42 +05:30
Midhun G S
7a82f4a981
Merge pull request #6024 from ToolJet/main
Merge main to develop
2023-04-13 16:04:37 +05:30
Midhun G S
eceff7bb21
Fix for Authorize Oauth API not accessible (#6022) 2023-04-13 15:16:09 +05:30
Arpit
6d2e2046cf
Feature : OpenAI plugin (#5975)
* openai plugin init

* admin private route with admin access only

* update dev mode check
2023-04-11 11:07:27 +05:30
vjaris42
869c1daa5c
Fixes query duplication on import on apps having multiple versions (#5971)
* fix: app import with multiple versions

* clenaup
2023-04-10 14:03:30 +05:30
Muhsin Shah
3d57e64d2c fix: yjs token 2023-04-07 13:25:02 +05:30
Muhsin Shah C P
6c1c692b12
fix: conflict b/w yjs auth_token and session token (#5962) 2023-04-07 13:10:43 +05:30
vjaris42
891bed5455
Fixes app import on different workspace (#5957)
* fix: app import on different workspace

* added schema details

* changeQueryDataSource fix

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2023-04-07 11:48:20 +05:30
vjaris42
542aa5b278
API Support for getting data source options under a datasource (#5948)
* feature: multi env support for datasources

* revert: datasources by env id api

* revert: datasources by env id api:frontend

* lint fixes

---------

Co-authored-by: Midhun G S <gsmithun4@gmail.com>
2023-04-06 17:52:28 +05:30
Muhsin Shah C P
32740743e1
[Improvement] URLs scoped with workspace id (#5487)
* add: new URL prefix

* fix: working on home page

* add: profile path

* playing with rxjs

* removed context part

* working on path changes

* changing routes
- TODO: replace the workspaceId with actual id

* redo: public apps path

* initial commit

* added authorize API

* remove privileges from auth response

* fixed some api issue
- added subscriptions

* fix: redirect url workspace-id null issue

* fix: switch workspace

* fix: organization list mapping
- menu item paths

* fix: preview url
- editor, viewer permission mapping

* jwt fix

* fix: some url issue
- permission mappings
- workspace login

* fixed some issues
- user invite workspace-id
- org settings menu item default selected item issue

* app viewer fixes

* fixing workspace login issues

* fix

* fixing issues
- tooljet db
- path issues
- refatoring the code

* fix: workspace vars permissions

* fix: multi-page handle

* fix: create app from template

* fix: bulk user upload

* fix: import app
- clone app
- upload profile image

* fix: onboarding

* fix: log out

* fixed multi-workspace logout issue

* fix: launch btn

* fix: oauth2

* fixes

* fix: sso login

* fix: workspace sso login

* fixing sso issues

* fix: moved list of orgs to rxjs
- fixed switching issues

* reverting some changes

* fixed some minor bugs

* fixing sso redirect url issues

* fix: switching network timing issues

* fix: back to workspace-id

* fix: tj-database
- refactored the code - removed org id from some pages
- will get the org id from the service file only

* fix: multi-pages

* fix: infinite loop issue

* fixing workspace switching issue

* fixes
- comment link
- logout & private route redirect url

* fix: wrong uuid error

* fixing subpath
- fixed most of the places
- need to test & fix workspace login, sso, new account

* fix: subpath workspace login

* fix: rxjs handle bug

* Revert "fix: tj-database"

This reverts commit 9632ec2ff0.

* fix: reverted tj-db changes

* fix: subpath sso

* typo fix

* fix: existing session issues

* new: switch workspace page

* fix: modal dark-mode

* added default sso support

* fixes
- subpath workspace switching
- handle wrong routes

* fix: manager user button
- refactored the code

* removed SINGLE Workspace feature

* rebase

* add: change modal text

* fix: added validation

* fixed private app 401 issue

* initial commit

* fix: logged out session multi-tab issue

* refactoring the code

* fix: redirect url issue

* added auth-token in cookies

* Fix: failing e2e specs

* added session API

* fix: backend session guard

* fix: removing user details from local storage

* fix: null wid

* undo and redo

* fix: login page

* fix: viewer login redirection

* fix: login page redirection

* fix: public apps logout issue

* added session storage and scheduler

* added profile api

* fix: sso login
- switch workspace
- login page
- setup admin

* working on fixes

* fix: socket issue

* fix: setup admin api

* connected profile & logout apis

* fix: malfunctioned auth token case

* fix: realtime avatar

* fix: profile avatar

* fix: Realtime cursors avatar

* setting max age for auth token cookie

* add: Go to login page if logout api returns 401

* fix: subpath login

* fix

* fix: app logout [viewer]

* fix: authorize page

* remove expiry from jwt

* fix: integrations route
- session api

* small fix

* fix: updated profile

* fix: workspace login [logged user]

* fix: oauth and another workspace page issue

* fixed app preview logout issue

* subpath fix

* fix: subpath app id

* fix: selected state didnt change for apps page [subpath]

* fix

* add cookie parser to test app

* specs added

* increased user session expiry time

* test: session & new apis

* working on test cases

* fix: onboarding issue

* fixing specs

* fix: test cases

* fix: removing profile api calls

* some fixes

* fixing rebase issues

* fix: global ds issues

* fix: app is crashing

* fix: back to text

* fix: oauth test cases

* fix: test-helper

* fix: onboarding test cases

* fix: tests again

* refactoring the code

* latest develop merging precautions
- fixed a minor null issue

* fix: typo

* fix :menu issues due to the merging

* fix: - clicking on tooljet logo didnt redirect to login page for public apps
- private app preview doesnt load after login

* subpath fixes

* fixed back to issue

* PR changes

* fix: spec fixes for EE

* doc: URL scoped for workspace

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: Shubhendra <withshubh@gmail.com>
2023-04-06 16:42:58 +05:30
Midhun G S
c6cd35cd94
fix for query event mapping to other query breaks (#5892) 2023-03-31 14:34:18 +05:30
Kiran Ashok
49fce7a818
Feature/onboarding phonenumber (#5773)
* feat :: added phone number input

* Add:  phone number to signup api

* revert some changes

* cleanup logs

* feat :: cloud phone number addition

* service

* check for phone input

* add: ph number to onboarding & setup-admin apis

* validation for phone number

* check for wrong phone number case

* adding check if phonenumber is present

* fix :: conditions for active button

* removed validation

* fix :: dark mode style

* lint fixes

---------

Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com>
2023-03-24 21:47:41 +05:30
vjaris42
bb9a211e55
[Feature] :: Global datasources (#5504)
* add: columns and migrations for data queries and sources

* add: migrations for app environments

* fix: datasources and queries api

* fix: import apis

* add: radixui colors

* create: global datasource page

* fix: version creation not including global datasources queries

* fix: version deletion failure

* fix: ui and other bugs

* add: check for abilities on global ds

* fix: bugs

* fix: existing test cases

* fix: migration and bugs

* fix: rest api oauthorize bugs

* hide: add button for local ds

* fix: query bugs

* fix: new organization environment creation

* fix: local ds label showing for new apps

* fix: on page load queries for preview app and published app

* fix: import bugs from v1

* fix: merge conflicts

* fix: import apis

* fix: apss with mulit envs

* fix: ui bugs

* fix: environments not being created on db:seed

* fix: ui bugs

* fix: route settings for global datasources

* fix: customer dashboard template

* fix: local ds queries not being saved

* fix: runpy issues

* changes: ui

* fix: migration issues

* fix: ui

* hide datasources when no local datasources

* fix: test cases

* fix: unit test cases and global queries on app import/export

* cleanup

* add: package-lock file

* undo: migration rename

* cleanup

* fix: ui bugs

* migration fixes

* fix: dark mode issues

* fix: change datasource failing on query create mode

* fix: workspace selector issues

* fix: clickoutside for change scope option

* migration changes

* fix: open api issue

* reverting configs changes

* [Fix] Global datasources & Environment Id issue (#5830)

* fix: oauth env id issue

* code changes

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com>
2023-03-24 21:41:21 +05:30
Arpit
7dea6c9ad1
Enhancements to the process of developing a Marketplace plugin (#5777)
* in dev mode, start watching for changes in all packages

* plugin reload service

* typo

* fixes updates from fs

* checks if marketplace dev mode is on to decode the run code from plugin index file

* clean up

* removes console.log

* refactor: marketplace dashboard

* prep to merge

* dotenv

* fixes: install new upadates for one plugin at a time

* fixes app crash for new plugins(marketplace/datasource) with default schema

* avoid creating docs for marketplace to root docs

* Before starting watcher, build the marketplace once.

* fixes: installed plugin crashes if deleting the entire plugin from the dir, but the build still haves the plugin files
2023-03-24 17:05:08 +05:30