Commit graph

5378 commits

Author SHA1 Message Date
vedant2003
fcfbb18f7d
[Hacktoberfest]Update descriptions for button,chart and modal components (#7557)
* Update en.json

* Update widgetConfig.js
2023-10-20 14:37:38 +05:30
Midhun G S
83d585a79a
Merge pull request #7957 from ToolJet/main
hotfix: merge develop to main
2023-10-19 18:46:40 +05:30
Midhun G S
d3abb3bfcc
Merge pull request #7943 from ToolJet/release/v2.22.0
Release v2.22.0
2023-10-19 18:44:32 +05:30
Midhun G S
31c4fefc72
Merge branch 'main' into release/v2.22.0 2023-10-19 18:23:56 +05:30
Shubhendra Singh Chauhan
2b1e330e97
[docs]readable URLs (#7925) 2023-10-19 17:21:45 +05:30
Muhsin Shah
2739d49262 fix: for manage app modal state issues 2023-10-19 16:05:30 +05:30
Midhun Kumar E
98068a4428
Fix appbuilder specs (#7969) 2023-10-19 15:54:50 +05:30
Muhsin Shah
ed5b673f63 fixed existed app slug special chars issue 2023-10-19 15:36:23 +05:30
Adish M
e5d357f4c4
Merge pull request #7968 from ToolJet/workflow-marketplace-ce
Adding seeding script to workflow
2023-10-19 11:37:20 +05:30
Ajith KV
6dc71c41d7
Modified cypress test cases for url changes (#7956) 2023-10-19 11:36:49 +05:30
Adish M
9ae2ab1802 Adding seeding script to workflow 2023-10-19 11:35:26 +05:30
Mekhla Asopa
b00f7370e1
Updated import spec (#7966) 2023-10-19 11:16:45 +05:30
Anantshree Chandola
4b2f9af794
Handle invalid file on import (#7960)
* handle invalid file on import

* update

* error msg update

* Update frontend/src/HomePage/HomePage.jsx

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

---------

Co-authored-by: Midhun G S <gsmithun4@gmail.com>
2023-10-19 11:14:37 +05:30
Muhsin Shah
56085460c4 fixed: folder slug search params is not appearing sometimes 2023-10-18 19:17:56 +05:30
Shubhendra Singh Chauhan
e64d4d1911
[docs]docusauras version update 2.4.0 -> 2.4.3 (#7928) 2023-10-18 17:09:52 +05:30
Shubhendra Singh Chauhan
95b30d9269
[docs]control component updates (#7952) 2023-10-18 17:09:35 +05:30
Ganesh Kumar
54953a426f
hotfix: tjdb columns of table selected is not listed on drop-down (#7927)
* fix: column names for table is not listed on dropdown

* fix: tjdb list create update and delete operation when adding new conditions old conditions were deleted

* bump to v2.21.2

---------

Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
2023-10-18 16:44:55 +05:30
Anantshree Chandola
06cc13c865
fixes (#7953) 2023-10-18 16:33:56 +05:30
Muhsin Shah
53763eaf93 handled: 404 app error of unauthenticated user request 2023-10-18 16:22:51 +05:30
Muhsin Shah
9e5d01798c fix: app name empty msg 2023-10-18 16:07:27 +05:30
Muhsin Shah
4cdd446043 fixed error message conflicts 2023-10-18 14:25:06 +05:30
Muhsin Shah C P
3ea8d6e3ca
[feature] Make workspace urls more readable (#6698)
* working on replacing workspace id with workspace name

* experimenting with zustand

* added slug column to workspace table

* working on workspace url

* working on backward compatibility

* fixing bugs

* added not found error

* fixed workspace switching issue

* fix: switching b/w workspaces

* fix: workspace login

* changed workspace login url link

* resolved conflicts

* added create organization design

* added backend validation

* fixed constraint errors issue

* fixed: creating new workspace

* fixed: update workspace

* fixed: update workspace bugs

* fixed: auto created slug bugs

* fixed: login slug

* design changes

* added folder slug

* fixed: lint error

* fixed: invite and first user issues

* fixed: login page redirection

* fixed: redirect path

* added reserved word check

* fix: edit workspace design

* fix: folder query issue

* fix: create and edit workspace modal validation issues

* fixing failed test cases

* fixing failed test cases - app.e2e

* fixed organizations specs

* fixed public app issue

* working on app slug

* Added app slug design to the general settings

* Working on appId -> slug changes
- Handling appId cases
- Fixing issues

* Worked on share modal design change
- replaced slug functionality
- Fixed backend slug issues
- Fixed page handle issues

* changed switch label

* replace version param with query param

* fix: possible uuid bug

* fix: login app slug redirection issue

* Worked on unique app slug

* moved all apps related api calls to apps.service.js file

* refactoring the code and fixing minor issues

* Refactored and fixed some bugs

* Fixed bugs: redirect cookie issue

* Fixed dark-mode issues

* removed duplicate code

* Worked on develop branch conflicts

* Moved handle app access check to private route

* Added fix for navigate

* Refactored the code. Added slug to failed sso login redirection path

* again some redirect url fixes

* onbaord navbar tj-icon onclick

* Fix: viewer version id undefined issue

* fix: multi-pages, invalid workspace slug

* fix: removing the version search param while switching the pages

* fix-sso: redirecting to prev tab's login organization slug

* fix-sso: google signup

* fix: preivew permission issue

* Fixing merge issues

* Fixed tjdb issues

* dark mode fix of manage users button

* fix: extra slash in url, tj-logo on click wrong org id

* subpath workspace login url

* resolved lint issue

* fix: cannot clone apps

* fixed switch workspace issue

* fix: login page flashing issue

* fix: back button issue

* fix: private endless redirection

* Update the modal with new UX

* fixed all ui issues

* fixed placeholder translation issues

* fix: sso multi-request issues

* fix: multi-pages crash while promoting a version

* fix: error text msg delay

* added default slug to the first workspace in the instance

* subpath-fix: slug preview url

* fix: same value check

* fixed switch page query params issue

* fix: folder query

* fix: manage app users ui responsive issue

* Backend PR changes

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2023-10-18 13:00:17 +05:30
gsmithun4
ae37929e86 Merge branch 'develop' into release/v2.22.0 2023-10-18 12:45:05 +05:30
Adish M
405305727c
Merge pull request #7950 from ToolJet/subpath-hot-fix
cypress subpath fix
2023-10-18 12:05:33 +05:30
Adish M
e63de846c8 cypress subpath hot fix 2023-10-18 12:03:57 +05:30
Adish M
80dc66d742 cypress subpath fix 2023-10-18 11:38:48 +05:30
Adish M
1e18e7ae7f
Merge pull request #7948 from ToolJet/subpath
subpath workflow fix
2023-10-18 11:07:08 +05:30
Adish M
6b2a958123 adding the changes to marketplace 2023-10-18 11:05:02 +05:30
Adish M
63db13d1c7 adding the changes to other files 2023-10-18 11:03:22 +05:30
Adish M
8a4af60fe7 subpath workflow fix 2023-10-18 11:01:55 +05:30
gsmithun4
d399f34300 Merge branch 'main' into release/v2.22.0 2023-10-18 10:38:59 +05:30
Midhun G S
74282cbe97
Merge pull request #7947 from ToolJet/main
Merge main to develop
2023-10-18 10:31:38 +05:30
Midhun G S
c59084198f
Merge pull request #7941 from ToolJet/release/v2.21.1
Release v2.21.1
2023-10-18 10:25:45 +05:30
Anantshree Chandola
94707a2bf8
Revamps related to app import and app clone resources (#7939)
* revamps

* remove console log

* open cloned app

* remove extra cloneApp func call

* cleanup

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2023-10-18 10:24:18 +05:30
Aditya Aryaman Das
48f318a824
docs: corrected grammatical errors in README.md 2023-10-18 01:27:28 +05:30
gsmithun4
2799f2dffc bump version 2023-10-17 23:57:21 +05:30
Anantshree Chandola
5e9366bfe4
Revamp: Remove duplicate function (#7937)
* revamp

* update
2023-10-17 23:54:53 +05:30
gsmithun4
2f6d384621 bump version 2023-10-17 23:52:18 +05:30
Midhun G S
8e78560c0a
Merge pull request #7936 from ToolJet/main
merge main to develop
2023-10-17 19:25:12 +05:30
Midhun G S
6d3967fbe5
Merge pull request #7921 from ToolJet/release/v2.21.0
Release v2.21.0
2023-10-17 19:20:35 +05:30
Ajith KV
cbb92dfbe2
Modify test cases (#7935) 2023-10-17 17:58:12 +05:30
Anantshree Chandola
a6b6935327 remove option to see all templates for user with no permission 2023-10-17 17:41:06 +05:30
Anantshree Chandola
bfdd288078 very small change 2023-10-17 17:15:52 +05:30
Anantshree Chandola
3fb4cca2ea
updates (#7931) 2023-10-17 16:56:54 +05:30
Anantshree Chandola
82a8b096fa fix 2023-10-17 15:36:24 +05:30
Anantshree Chandola
d4b436dd31 fix failing test 2023-10-17 14:58:57 +05:30
Anantshree Chandola
03e3fd950b
New Improved App creation flow (#7209)
* App creation flow

* Add separate footer and divider

* added create app dto, updated tests

* update test

* Update server/src/dto/app-create.dto.ts

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

* Update server/src/dto/app-create.dto.ts

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

* updates

* Removed comments

* small updates

* rename app flow

* Import App, Create App From Template, Clone App (BE+FE)

* Edit app updates

* remove comments

* updates

* updates

* styling updates

* handle spaces in app name

* update

* styling updates

* Update permissions

* updates

* don't show toast failure message

* Update frontend/src/Editor/Header/EditAppName.jsx

Co-authored-by: Muhsin Shah C P  <muhsinshah21@gmail.com>

* styling updates

* Update server/src/controllers/app_import_export.controller.ts

Co-authored-by: Muhsin Shah C P  <muhsinshah21@gmail.com>

* remove comments

* remove comments and small corrections

* removed logs and deleted unwanted files

* correct lint error

* resolve failing tests + handled trimmed app names

* resolve failing tests + handle trimmed app names

* updates

* duplicate imports removed

* updates

* Rebase corrections and updates

* update

* resolve failing e2e test

* fix error

* fix

* length fix

* fix

---------

Co-authored-by: Midhun G S <gsmithun4@gmail.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
2023-10-17 13:18:18 +05:30
gsmithun4
522bab99cd bump version 2023-10-17 12:44:28 +05:30
Midhun G S
d9e466be3d
Merge pull request #7920 from ToolJet/main
Merge main to develop
2023-10-17 12:42:12 +05:30
Adish M
20f393f0c3
Merge pull request #7899 from ToolJet/docs-pr-app
docs pr preview app
2023-10-17 11:55:42 +05:30