Commit graph

2677 commits

Author SHA1 Message Date
Arpit
f098f447d1
fixes: integrating plugins from marketplace (#5678)
* fixes: integrating plugins from marketplace to apps

* clean up

* update deps: markeplace to node 18

* adds plivo

* updates plivo icon

* fixes app crash on clicking sidebae datasources popup

* fixes app crash for rendering selected ds form from leftsidebar

* fixes app crash for loading installed plugins

* fixes: updated correct plugin id to testconection

* init

* updates s3 plugin name

* checking if marketplace flag is "true"

* updates github svg

* plugin icon fix

* fixes:components werent rendering if marketplace plugin queries were used

* github plugin: error message for invalid creds

* fixes: typos

* fixes multiple installation of the same plugin
2023-03-16 18:17:25 +05:30
Muhsin Shah C P
28b3c09cc7
Replacing react-google-login library (#5658)
* replaced google sign-in btn

* removed npm library

* fix: added nonce
2023-03-15 15:06:13 +05:30
Akshay Sasidharan
d7522aceb4 fix tjdb filter conditions using same columns 2023-03-15 04:28:44 +05:30
Ali Yanni
aa88186cdc
Fixes button-group label visibility (#5299)
Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>
2023-03-14 16:45:47 +05:30
Kavin Venkatachalam
6af42b8faf
Fixes widget alignment issue inside container (#5699)
* Fixes widget alignment issue inside container

* Fixes widget alignment issue inside tab
2023-03-07 12:38:40 +05:30
Mekhla Asopa
0271dbf17d
Add data-cy for database functionality (#5455)
* Added data-cy for table header and subheader

* added data-cy for table operations

* added data-cy for table and text

* Added data-cy for delete icon and fields

* Updated and removed duplicate data-cy

* deleted unused files

* Updated data-cy for filter section
2023-03-02 14:33:00 +05:30
Manish Kushare
64a81c062b
bug fixed, app is getting crashed upon clicking columns in the table inspector for the widget inside listview (#5656)
* bug fixed: app is getting crashed upon clicking columns in the table inspector for the widget inside listview

* bug fixed: not able to edit new added column and not able to see valdiation errors

* code enhancement
2023-03-02 11:50:27 +05:30
Manish Kushare
6fadef424f
bug fixed: widget is breaking when default array has wrong enteries (#5649) 2023-03-01 16:05:00 +05:30
Arpit
d26e394e8f
Improvements - ToolJet database edit row operation (#5592)
* init

* edit drawer UI bug fixes

* edit operation

* improved rendering for input elements for the updater form
2023-02-27 19:31:38 +05:30
Arpit
1607499989
fixes: table dashboard state should be reset on updating table name (#5597) 2023-02-27 12:30:07 +05:30
Arpit
adaa15bba7
fixes: Only Table body should be scrollable and table head should be sticky (#5599)
Co-authored-by: Akshay <akshaysasidharan93@gmail.com>
2023-02-27 12:29:50 +05:30
Manish Kushare
ab5fc2c59b
Implementation of bounded box component (#5548) 2023-02-27 11:36:52 +05:30
EatPrayCode
de0830b776
Fix:Show popover in calendar in editor mode when clicked outside the editor (#5483)
* Fix:Show popover in calnder in editor mode when clicked outside the editor

* Fix:Show popover in calnder in editor mode when clicked outside the editor, replace variable

* Fix:Show popover in calnder in editor mode when clicked outside the editor

* Fix:Show popover in calnder in editor mode when clicked outside the editor, replace variable

* Merge develop.

* Fix:Show popover in calnder in editor mode when clicked outside the editor, replace variable

* bug fixed

---------

Co-authored-by: manishkushare <kushare.manish9@gmail.com>
2023-02-24 11:15:13 +05:30
Muhsin Shah C P
7f020ef296
[bug-fix] The public app is redirecting to the login page if the user token expired. (#5461)
* fix: public app issue
- removed auth guard from metadata api

* add: removed auth token from metadata apis

* PR changes

* redo: auth guard

* reverting some changes
2023-02-24 09:32:09 +05:30
Jeet Karia
264e5dc343
added size limit of 100MB for http and https requests (#5606) 2023-02-23 18:28:54 +05:30
Sherfin Shamsudeen
ac21f29cec Merge branch 'main' into hotfix/2.1.5 2023-02-23 18:13:30 +05:30
vjaris42
1dabd24f08
add: parsing of dates as raw values (#5614) 2023-02-23 18:12:18 +05:30
Manish Kushare
8bb7102981
Added option to set the default language for the instance (#5445)
* added instance for the language

* added instance for the language
2023-02-23 12:38:19 +05:30
Arpit
6420f8710c
Tooljet database : code audit or technical debt review. (#5444)
* fetch table data with selected table when fetching tables

* refactored tooljet db operations and listrows

* create operation: dropdown should only show options which are not selected

* list operation: dropdown should only show options which are not selected

* update operation: dropdown should only show options which are not selected

* delete operation: dropdown should only show options which are not selected

* refactor: update op

* clean up

* style fixes

* throw error with descriptive error toast for empty where fields for delete op

* clean up

* default limit should be 1

* fixes codehinter onBlur issue
2023-02-23 12:08:09 +05:30
Arpit
f5ebb86203
Verticle sidebar color fix, Bugfix for #4829 (#5539)
* Verticle sidebar color fix, Bugfix for #4829

* Added default color to vertical divider

* Fixes dark mode

---------

Co-authored-by: Ishan Parlikar <iparlika@emich.edu>
Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>
2023-02-23 12:07:35 +05:30
Manish Kushare
f97067e303
[ Feature request ] : [ Table ] Added feature to highlight a word in the column if matched with searched term (#5413)
* init

* added feature to highlight the cell if it's value matches with searched tern

* reverting the unwanted changes

* removed unwanted changes

* added edge case for isEditable on click event

* minor bug fixes

* made changes to fix the edge case

* bug fixed: action button was not displaying in the column
2023-02-23 12:05:29 +05:30
EatPrayCode
14d7ed08cd
Fix: Show on desktop bug fixed for widgets using subcontainer (#5496)
* Fix: Show on desktop bug fixed for widgets using subcontainer

* Eslint error

* Fixed lint errors

---------

Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>
2023-02-23 12:03:53 +05:30
Midhun Kumar E
33fff5aa8b
Added data-cy to fix DS specs on GitHub actions (#5607)
* Add data-cy for search box

* Add data-cy for query manager components

* Fix data-cy for home page search

* Add data-cy for toggles

* Add data-cy query headers

* Modify data-cy for textinput

* Add data-cy for query list
2023-02-23 08:36:26 +05:30
Ajith KV
e66c69b889
Added Missing data-cy for password reset page (#5605)
* Fix password helper text typo

* Add missing data-cy for password reset page
2023-02-23 08:34:51 +05:30
Midhun Kumar E
88fba22b34
Added data-cy for sidepanel and multipage icons (#5560)
* Add data-cy for side panel elements

* Add data-cy for multipage elements

* Add missing data-cy
2023-02-20 10:00:05 +05:30
Ajith KV
b905b9641f
Add data-cy for forgot password page elements (#5587) 2023-02-20 09:59:13 +05:30
Ajith KV
d2debb9ded
Add and modify data-cy for signup page elements (#5566) 2023-02-16 14:52:04 +05:30
Kiran Ashok
6401d47268
typo fix :: go to app action (#5435) 2023-02-16 11:09:46 +05:30
EatPrayCode
b1e99b053d
Bug: Remove on-click event if a widget is disabled (#5437) 2023-02-16 11:09:31 +05:30
EatPrayCode
df9d5ed45b
Fix: Fixed row id not changing on button click (#5442) 2023-02-16 11:09:03 +05:30
Manish Kushare
5d7a5cd565
bug fixed: Unable to set a toggle switch column to false when initiated to true (#5470) 2023-02-16 11:08:43 +05:30
Muhsin Shah C P
db4160a819
[improvement] Renamed the column read_on_dashboard to hide_from_dashboard (#5291)
* renamed the column

* refactoring the code
2023-02-14 15:41:55 +05:30
Midhun Kumar E
2af995f8d7
Added data-cy for multipage elements (#5557)
* Modify data-cy for table

* Add data-cy for page rename elements

* Add data-cy for search on sidepanel

* Add data-cy for pagehandle elements

* Add data-cy for page events elements

* Add data-cy for options, icons and modal
2023-02-14 15:40:59 +05:30
Ajith KV
8b76f9340c
Add data-cy for self-hosted onboarding (#5529) 2023-02-10 16:37:02 +05:30
Ajith KV
12daac6d92
Add and modify data-cy for v2 (#5458)
* Add data-cy for v2 elements

* Add and modify data-cy

* fix and modify multiworkspace spec

* Add data-cy for workspace variable

* Fix user permission spec

* Add selectors and text for workspace variable

* Fix changes

* Add test cases for workspace varaible user permissions

* Modify workspace variable data-cy

* Add and modify data-cy for manage groups

* Fix and modify Manage groups spec

* Fix and modify single workspace spec

* Add missing data-cy for single workspace

* Fix and modify dashboard spec

* Add and modify data-cy for dashboard elements

* Fix and modify profile spec

* Add data-cy for avatar

* Fix and modify SSO onboarding spec

* Add data-cy for workspace name

* fix failing specs

* Add data-cy work edit workspace button

---------

Co-authored-by: Sherfin Shamsudeen <sherfin94@gmail.com>
2023-02-09 16:26:10 +05:30
Midhun Kumar E
7f1d0a5361
Add data-cy to fix table regression. (#5513)
* Add data-cy

* Remove accidental modification
2023-02-09 10:44:28 +05:30
Midhun Kumar E
b50bba97c7
Add data-cy for sidepanel header (#5511) 2023-02-09 10:18:24 +05:30
Kavin Venkatachalam
f6e23fbd65
[Bug]: Fixed app crashes when items dropped into container inside listview (#5449)
* Fixed app crashes when items dropped into container inside listview

* Fixes Link widget crash
2023-02-08 11:51:19 +05:30
Manish Kushare
94f68039cb
[ Bug fixed ] : [ Table ] When column name is changes, particular column data becomes empty when downloaded (#5479)
* bug fixed :when column name is changes, particular column data becomes empty when downloaded

* bug fixed

* refactored the code to improve readability by changing reduce function to map function
2023-02-07 12:59:33 +05:30
Sherfin Shamsudeen
a63a4639bf
Merge pull request #5492 from ToolJet/merge-back/2.1.2
Merge back hotfix 2.1.2
2023-02-07 12:35:42 +05:30
Arpit
3e1a531c4c
[hotfix]: fixes - slack scope (#5477)
* fixes: slack scope

* fixes: error for scope

* bumped version to 2.1.2
2023-02-07 12:29:37 +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
Jittojoyes98
c5becae6eb
Update dto API completed (#5456)
* Update dto API completed

* Fixed file name

* Fixed order of class validator

* Error message shown
2023-02-06 14:07:55 +05:30
Arpit
29bdabb176
eslint fixes: frontend (#5464) 2023-02-02 20:58:06 +05:30
Mekhla Asopa
783d1df4b3
Updated data-cy for v2-beta (export and import) (#5332)
* Updated spec and data-cy for v2-beta

* Removed spec changes

* removed text and spec changes
2023-02-02 14:41:25 +05:30
Arpit
6cc704af8b
[runpy] support to import external libraries (#5288)
* support to import external lib with micropip

* upgraded pyodide version: v0.22.0

* deprecating pyodide-v0.21.3

* removes unsused code
2023-01-27 17:26:21 +05:30
Arpit
7002b2d76d
4810 - add a list messages operation to the Slack plugin (#5378)
* 4810 - add a list messages operation to the Slack plugin

* support pagination

* update docs

* eslint fixes

Co-authored-by: Maurits Lourens <maurits.lourens@gmail.com>
2023-01-27 16:26:31 +05:30
Muhsin Shah C P
3ead224651
[bug-fix] User can't update the single workspace name (#5426)
* fix: user can update the workspace name

* fixed a bug

* fixed multi-org list issues
2023-01-25 18:55:00 +05:30
John Bampton
d4024fddb6
all: fix spelling (#5325) 2023-01-25 18:02:39 +05:30
Manish Kushare
f3965da73c
[ Bug fixed ] - [ Table widget ] showing blank spaces for undefined and null values in the respective cells (#5368)
* bug fixed - shwowing blank spaces for undefined and null values in the respective cells

* removed the condition for string undefined and null edge case
2023-01-25 18:02:13 +05:30
Manish Kushare
f743312985
bug fixed : wrong timezone entries (#5395) 2023-01-25 18:01:14 +05:30
EatPrayCode
4b41889821
Feature: Show scrollbars in released and preview pages (#5420)
Co-authored-by: Ashwath Bharadwaj <ashwathbharadwaj@Ashwaths-MacBook-Pro.local>
2023-01-25 18:00:21 +05:30
Kiran Ashok
22e2ae39b8
Fix :: Scrolling issue through whole dashboard (#5416)
* fix :: scrolling issue through whole dashboard

* cleanup

* revert :: padding in sidebar

* feat :: added margin
2023-01-25 16:42:06 +05:30
Arpit
f1f47f298a
fixes: On Database queries clickable area to add condition is more that expect (#5372) 2023-01-25 12:13:46 +05:30
Arpit
b19c854dbd
fixes app crash for adding and then removing ds (#5281)
* fixes app crash dues to options obj empty

* undefined selected ds fix

* undefined selected ds fix

* undefined selected ds fix:slack

* undefined selected ds fix:zendesk

* undefined selected ds fix:zendesk

* undefined selected ds fix:zendesk ds id
2023-01-25 12:09:02 +05:30
Muhsin Shah C P
c6ed8c0ced
[bug-fix] OpenAPI query fields doesn't show saved values (#5421)
* fix: saved fields are missing

* refactoring the code

* fix: null issue
2023-01-25 11:42:31 +05:30
vjaris42
1b9304835a
add: check for incoming new datasource (#5359) 2023-01-25 11:42:04 +05:30
Manish Kushare
b88c50eca6
[ Feature added ] : [Table widget ] adding CSA to deselect the row (#5320)
* feature add: un select the selected row using csa

* adding age case if wrong key and value is provided while un selecting selecetd row, then show alert message and do nothing

* made the suggested changes

* added csa action to discard the changes

* update the changes rquested
2023-01-24 20:43:16 +05:30
Midhun Kumar E
633edc7271
Added data-cy for all the components. (#5385)
* Add dataCy Prop

* Add data-cy for all the components

* Add data-cy for all the custom component
2023-01-24 17:22:35 +05:30
Midhun Kumar E
eaa5b6d4ae
Add data-cy (#5411) 2023-01-24 15:03:45 +05:30
vjaris42
686de2b224
fix: route name for manage users (#5364) 2023-01-24 12:07:12 +05:30
Muhsin Shah C P
25d7f70d5a
fixed last name null issue (#5327) 2023-01-24 11:56:06 +05:30
vjaris42
82cad72fc3
File picker issues on CSV parsing (#5025)
* fix: csv parsing for multiline values

* fix: remove escape characters while copying inspector values

* add: defalut value for null/undefined cells
2023-01-24 11:45:57 +05:30
tanishk-23
d5e7bbc53d
Bug: Added workspace title length validation while editing (#4671) 2023-01-24 01:53:28 +05:30
Midhun G S
93628381d2
Merge branch 'develop' into merge-main/v2.0.4 2023-01-20 22:10:29 +05:30
Arpit
be3fc4b9bb
[Bugfix] app crashes when delete op is ran for tj db query (#5342)
* fixes: app crashes when delete op is ran for tj db query

* fixe: error toast for preview query: tj-db

* fixes:Validation of Limit input field
2023-01-19 21:47:20 +05:30
Muhsin Shah C P
1230551988
[bug-fix] Public app is redirecting to login page [Subpath] (#5338)
* fix: sub path issue

* fix: preview app login issue
2023-01-19 20:56:34 +05:30
Arpit
6e057e89b9
[Bugfix] The sequence of primary columns in the table changes after updating rows using the query builder (#5374)
* fixes: The sequence of primary columns in the table changes after updating rows using the query builder

* Revert "fixes: The sequence of primary columns in the table changes after updating rows using the query builder"

This reverts commit b0f262332e.

* update query with order as parameter
2023-01-19 15:32:21 +05:30
vjaris42
c22059498a
add: received props check to update state on initial render (#5362) 2023-01-19 14:45:39 +05:30
Arpit
4d78f830b7
fixes: mobile toggle was hidden (#5353) 2023-01-18 14:14:45 +05:30
Sherfin Shamsudeen
d0548e55ca Merge branch 'main' into merge-back/2.0.3 2023-01-17 20:13:10 +05:30
Kiran Ashok
3484d653d3
fix :: removing form for submision removal (#5350) 2023-01-17 19:55:59 +05:30
Yuku Takahashi
5448e6d148
Enhance GraphQL plugin to be able to send custom headers (#5127) 2023-01-16 15:04:12 +05:30
Manish Kushare
7ab793fe49
[ Bug fixed ] : datepicker UI in table widget column is broken (#5335)
* bug fixed : datepicker UI in table widget column

* made thead position static instead of sticky
2023-01-16 13:26:08 +05:30
Sherfin Shamsudeen
948456dd08 Merge branch 'main' into merge-back-main-2.0.2 2023-01-13 13:47:57 +05:30
Kiran Ashok
673221df0b
Fix ::Removed max length in inputs , added it only for worspace and company name (#5310)
* fix :: max length in inputs , added it only for worspace and company name

* fix header styling org invite

* fix styling of invire header

* fix :: for larger texts

* fix :: self host overflow

* fix mobile screen

* mobile fix  :: email check page

Co-authored-by: Sherfin Shamsudeen <sherfin94@gmail.com>
2023-01-13 13:39:11 +05:30
vjaris42
22b349c8e8
fix: password reset on save for encrypted fields (#5323) 2023-01-13 12:13:13 +05:30
Sherfin Shamsudeen
ef787cf484
fixes: action: showModal and closeModal throws error on trigger (#5315)
Co-authored-by: arpitnath <arpitnath42@gmail.com>
2023-01-12 17:02:45 +05:30
Midhun Kumar E
17abaf048e
Add and modify data-cy (#5314) 2023-01-12 15:23:18 +05:30
Kiran Ashok
73cd573b0e
Fix :: Users not able to complete signup process in firefox (#5304)
* fix :: signup submission error in firefox

* adding prevent default to submit btn in self host

Co-authored-by: Sherfin Shamsudeen <sherfin94@gmail.com>
2023-01-12 12:48:42 +05:30
Arpit
7c3024c146
fixes: how unread errors in the debugger badge (#5275) 2023-01-09 20:52:23 +05:30
Arpit
6131c25bea
Revert "Bugfix :: Popover gets removed when cursor goes to canvas (#5… (#5271)
* Revert "Bugfix :: Popover gets removed when cursor goes to canvas (#5246)"

This reverts commit 313d3bbd83.

* hinter closes on on mouse entering canvas
2023-01-09 19:43:47 +05:30
Manish Kushare
56f7bca20e
[ Bug fixed ] : ToolJet logo dark theme (#5248)
* made logo consistent with the dark theme

* bug fixed

* bug fixed
2023-01-09 19:27:54 +05:30
Arpit
57cb2cbb5b
fire error toast as per error response (#5264)
* fire error toast as per error response

* fire error toast as per error response: run Query

* checks for invalid operations
2023-01-09 18:55:51 +05:30
Manish Kushare
d18e7eaeb1
dark theme fixes (#5266)
Co-authored-by: stepinfwd <stepinfwd@gmail.com>
2023-01-09 18:33:46 +05:30
Gandharv
b84d7687b3
fix: app card height while no edit access for user (#5230)
* fix: app card height while no edit access for user

* fix: firefox fix pagination width
2023-01-09 18:11:32 +05:30
Arpit
cee253bc25
fixes: app crash from code hinter (#5265) 2023-01-09 17:56:04 +05:30
Arpit
8e81aa5c2b
[multipages] disable: duplicate page (#5260)
* disable: duplicate page::multipages

* on hide should not be fired for static backdrop: page event settings

* Disallow switching to the same page

Co-authored-by: Sherfin Shamsudeen <sherfin94@gmail.com>
2023-01-09 17:41:39 +05:30
Kiran Ashok
d3df7c3123
Bugfix :: Onboarded data saved to telemetry (#5205)
* feat :: onboarded data forwarded to telemetry

* fix :: called temeltry api on setup sucees

* revert merge

* update endpoints for new onboarding data

* adding try catch

* added try catch for APIs

Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2023-01-09 17:33:50 +05:30
Kiran Ashok
1cf31e4d9e
fix :: navbar bg color fix theme wise (#5262) 2023-01-09 16:40:28 +05:30
Kiran Ashok
313d3bbd83
Bugfix :: Popover gets removed when cursor goes to canvas (#5246)
* fix :: popover removal issue fix in tooljet db query manager

* cleanup

* cleanup
2023-01-09 16:07:35 +05:30
Manish Kushare
2986f014d2
bug fixed (#5261) 2023-01-09 15:44:34 +05:30
Kavin Venkatachalam
127a47ef41
Fixes redirection while switching the workspace (#5259) 2023-01-09 15:06:54 +05:30
Kiran Ashok
8075b9f957
enter click on sso bugfix (#5257) 2023-01-09 15:04:20 +05:30
Kavin Venkatachalam
dfddfd9d1a
Fixes unclickable buttons on template modal for lower resolution (#5254) 2023-01-09 14:16:09 +05:30
Arpit
76e795d22a
fixes: Boolean data is not visible in the table widget (#5245) 2023-01-09 14:15:57 +05:30
Muhsin Shah C P
e583e36c46
fix: manage user btn will only show for admins (#5238) 2023-01-09 13:27:25 +05:30
Muhsin Shah C P
84e603124d
Fix: no organization name visible in single workspace (#5256) 2023-01-09 13:23:20 +05:30
Arpit
e091e5c662
style fixes: editor header (#5228)
* style fixes: editor header
2023-01-09 12:39:50 +05:30
Kiran Ashok
f877956100
Bugfix :: navbar in verification success screen (#5252)
* fix :: verification screen navbar

* giving bg color for eye button so that password overflow is hidden

* revert some styles

* reverting style

* pr fixes :: adding padding to input field
2023-01-09 12:38:10 +05:30
Sherfin Shamsudeen
4ad4515703 Change the position of id inside page object 2023-01-07 23:18:50 +05:30
Sherfin Shamsudeen
672993e49a Expose page id in viewer also 2023-01-07 11:13:33 +05:30
arpitnath
71fcdfb6a4 fixes: persisted state for components from duplicate pages 2023-01-06 18:37:27 +05:30
Arpit
b182fb7735
follow up to: #5164 (#5223) 2023-01-06 17:38:58 +05:30
Muhsin Shah C P
cf3a045a2f
fix: boolean column issues (#5242) 2023-01-06 17:31:02 +05:30
Arpit
ac326518e2
with empty col name, we should not be able to create new cols (#5243) 2023-01-06 17:17:49 +05:30
Kiran Ashok
26b047f9fd
Bugfix :: TooljetDB query manager fields scroll issue (#5236)
* fix :: scroll issue query manager tooljet db

* updating other fields scroll issue

* fix :: scrollbar hiddden
2023-01-06 17:15:18 +05:30
Manish Kushare
01f93fb405
[ Bug fixed ] : dark theme bug fixes (#5239)
* dark theme bug fixes

* made popover content of the real time avatar consistent with the dark theme
2023-01-06 17:14:56 +05:30
Kiran Ashok
e1e5f15f8c
fix :: removed disabled button during login due to browser autocomplete issue (#5241) 2023-01-06 17:13:08 +05:30
Kavin Venkatachalam
e7a833b70d
Make TooljetDB as first item in query panel (#5229) 2023-01-06 14:29:25 +05:30
Kiran Ashok
04505c0c46
fix :: making navbar transparent (#5231) 2023-01-06 14:25:02 +05:30
Kiran Ashok
a8667ec306
Bugfix :: Remove autocompletion and rendered logo as svg (#5232)
* fix :: turnoff autocomplete and rendered logo as svg

* rendering as svg

* svg

* fixing width and height as auto
2023-01-06 14:24:53 +05:30
Muhsin Shah C P
6453aca185
fix: now menu item will hide for non-admin user (#5222) 2023-01-06 00:31:32 +05:30
Arpit
774da9c3cd
Popoup drawer styles fixes (#5219)
* styles fixes

* typos
2023-01-05 22:39:14 +05:30
Kiran Ashok
2ab66d1dd0
Bugfix :: Fixing scroll in dashboard and databases (#5203)
* fix :: dashboard scroll

* fix :: reverting some styles

* fix :: scroll issue dashboard

* fix

* fix :: scroll in database

* cleanup

* pr fixes and added auto focus to folder modal

* fix for ::  row of data at the end of the table is not visible
2023-01-05 18:28:26 +05:30
Gandharv
8492ecff23
fix: notification center badge (#5176)
* fix: comment notification badge position

* fix: add pinned icon for left sidebar items
2023-01-05 18:26:38 +05:30
Arpit
2f3a32b7ba
pass header editors context (#5218) 2023-01-05 17:33:55 +05:30
Manish Kushare
c26f30b1cd
added tooltip to the leftsidebar icons (#5215) 2023-01-05 17:28:01 +05:30
Sherfin Shamsudeen
5a97d65005 Fix unmerged styles 2023-01-05 17:09:54 +05:30
Sherfin Shamsudeen
78f1a1bba7 Merge branch 'develop' into v2-beta 2023-01-05 16:45:43 +05:30
Manish Kushare
1cf35a9e0a
[ Bug fixed ] : Popover content in left sidebar is not scrollable (#5195)
* bug fixed

* bug fix

* Revert "bug fix"

This reverts commit eefdb4cc9e.

* avoided Editor component to render while dragging the query panel

on first render made popoverContent height as 95vh if query panel is not expanded

* made the suggested changes

* made text inside notification center consistent with the dark theme
2023-01-05 14:47:24 +05:30
Kavin Venkatachalam
4634bbe37c
Fixes showing version name empty on enter key press (#5191) 2023-01-05 14:36:39 +05:30
Muhsin Shah C P
ddf771082f
fix (#5208) 2023-01-05 14:25:42 +05:30
Gandharv
a270d2794e
fix: overlapping columns in tooljet database (#5204)
* fix: overlapping columns

* disable search in organization dropdown
2023-01-05 14:01:47 +05:30
Muhsin Shah C P
1374b42284
fix: login redirection issue (#5207) 2023-01-05 13:50:41 +05:30
Kiran Ashok
ba848908bc
Bugfix :: Removed testimonial screen from onboarding pages (#5183)
* fix :: removed testimonial section

* moved logo to center

* add bg color to navbar

* fix logo size

* fix logo size
2023-01-05 13:37:19 +05:30
Kavin Venkatachalam
e43821d0af
Fixes selecting widget from inspector bug (#5193) 2023-01-05 13:28:23 +05:30
Arpit
9514038d7d
Add disabled state bg color select component (#5206)
* adds bg color for disabled state: select component

* fixes: dark theme
2023-01-05 13:13:59 +05:30
Kavin Venkatachalam
8d9442a3e2
Fixes preview bug on restapi (#5201) 2023-01-05 12:43:05 +05:30
Arpit
bc880a1cd7
V2 tables dashboard improvements (#5188)
* disable select input for primary key

* remove toggle column for primary key, replace it with a badge

* adds no-apps svg

* clean up

* update svg

* update svg icon: correct

* bg fix

* reverts styles

* fixes page handler icon margins and padding

* fix

* update badge color
2023-01-05 11:53:53 +05:30
Arpit
9fb58c938c
v2-improvement: select the first group by default and render the selected on by default (#5197)
* select default group on mount

* typo
2023-01-05 11:41:59 +05:30
Gandharv
337cdfc99f
chore: add image extensions in webpack resolver (#5200) 2023-01-05 11:28:15 +05:30
Gandharv
5b3add2bff
fix: dnd on pages section (#5202) 2023-01-05 11:26:30 +05:30
Arpit
b714c71cd9
adds padding (#5190) 2023-01-05 11:03:05 +05:30
Manish Kushare
4b464d9b84
made left sidebar icon consistent with the dark theme (#5196) 2023-01-05 10:59:32 +05:30
Muhsin Shah C P
6af7987b8d
bug-fix: user can add values to auto-generated column white creating updating rows (#5189) 2023-01-04 21:24:13 +05:30
Muhsin Shah C P
f75460e662
[bug-fix] doesn't work multiple sort options - Tooljet DB (#5185)
* removed some filters

* fixed sorting issue
2023-01-04 21:23:04 +05:30
Arpit
02a6d54d88
V2 minor UI fixes (#5187)
* viwer margin for theme flip button

* adds cursor to pointer

* adds min height to mobile view
2023-01-04 20:25:42 +05:30
vjaris42
22f6f32f25
replace logo & add csv template (#5186) 2023-01-04 18:05:30 +05:30
Kavin Venkatachalam
bdc4114052
Fixes unsaved popup showing on tooljetDB (#5184) 2023-01-04 17:53:40 +05:30
vjaris42
fb9e080a2f
fix: avatar and last name blank issues (#5171) 2023-01-04 17:47:13 +05:30
vjaris42
9e0f864a11
[Fix] :: app version dropdown UI (#5181)
* fix: app version ui and delete modal

* replace: TooljetDb query text on Query panel
2023-01-04 17:41:40 +05:30
Arpit
21f2c7bcaf
Table dashboard improvements (#5182)
* add placeholder text for no tables

* adds placeholder for empty records

* renamed tooltip to database

* renamed routes to database
2023-01-04 17:28:13 +05:30
Arpit
3ed29c387a
hide header for desktop mode (#5178) 2023-01-04 17:21:37 +05:30
Gandharv
ad05b78ffa
fix: add pinned icon for left sidebar items (#5180) 2023-01-04 17:18:47 +05:30
Arpit
1e607f547d
removes placeholder for no folder list (#5179) 2023-01-04 16:49:22 +05:30
Gandharv
7156fc222f
Homepage and editor design fixes (#5172)
* logo + editor changes

* render svg instead of img

* render svg instead of img

* removes unused css
2023-01-04 15:33:55 +05:30
Shubhendra Singh Chauhan
09f7e61408
Updated guide link in editor to v2 doc (#5174) 2023-01-04 15:33:35 +05:30
Manish Kushare
bf7d576a90
added unfold icon when query panel is not expanded (#5173) 2023-01-04 15:16:34 +05:30
Manish Kushare
60c311296d
[ Bug fixed ] : [Multi-Select widget ] app freezes when we use control component action to control the same multi-select (#5011)
* bug fixed: app freezes

* bug fixed : app frezzes when invalid value is provided
2023-01-04 14:59:23 +05:30
Manish Kushare
08e8b5fc3a
replaced parameter with Parameter (#5096) 2023-01-04 14:58:36 +05:30
Manish Kushare
164028ae14
[ Bug fix ] : dark theme fixes (#5164)
* Close button for filter is not visible in dark mode.

* fixed : Hovering on dark mode selector is showing cursor instead of mouse pointer

* bug fixed

* bug fixes : dark theme

* fix : dark theme issue in search box and add page field in Pages

* bug fixed : serachbox in pages remains in dark theme only

* fixed properties and style tab bg in dark theme for the widget inspector
2023-01-04 14:47:16 +05:30
Midhun G S
dd9c929ff3
[V2-Beta] Fix : ToolJet Database bugs (#5166)
* database fixes

* default value fix
2023-01-04 14:01:01 +05:30
Manish Kushare
6e914e26eb
spacing between method and url in restapi (#5162) 2023-01-04 13:41:10 +05:30
Gandharv
2f025d11d3
Update homepage design (#5121)
* move all apps link under folders

* home page changes

* css changes

* fix

* fix comments icon

* breadcrumb fix

* change logo

* css fixes

* icon

* fix: comment notifications page id param addition

* loader heights change

* fix spacing

* update scroll

* delete unused file

* theme dark fix

* fix cursor

* css changes

* exp: removes skeleton

* exp: update apploader

* hide selector if single workspace

* keep search icon while searching pages

* update apploader

* use ui/select

* update plugin icons

* modal css changes

* css changes

* show delete, edit on hover only - querymanager

* update sidebaritem to use svg directly instead of img tag

* use svg for appicon
2023-01-04 13:28:55 +05:30
Kiran Ashok
b93b2cd269
fix :: single workspace singup page breaking (#5163) 2023-01-04 13:13:34 +05:30
Arpit
3f64abdaf4
[Bugfix] unable to create a rest api dataquery on v2-beta, (#5170)
* fixes: not able to create new restapi query

* fixes: not able to create new restapi query, revert prev commit

* resolves restapi datasource id
2023-01-04 12:55:30 +05:30
Arpit
5fe3822ded
check if default value is an empty string (#5169) 2023-01-04 12:08:18 +05:30
Midhun G S
0e3c9b7da2
Fix: Bug on query create if two ds in same kind (#5167) 2023-01-04 10:03:18 +05:30
Manish Kushare
55acd6c4d9
[ Bug fixed ] : select custom component styles not getting applied in query manager (#5128)
* bug fixed : select custom component styles not getting applied in query manager

* bug fix : not able to custom style select component

* fixed: Operation dropdown options are not fully visible.
2023-01-03 17:12:43 +05:30
Kavin Venkatachalam
fe4ba616a5
[Bug]: Query Manager Bugfixes (#5089)
* Fixes draft query & name issues on query manager

* Fixes textarea showing in RunJS while switching queries

* Fixes clearing unsaved values while resizing the query panel

* Fixes showing confirmation popup on tooljetdb without any changes

* Removed unwanted changes

* Fixes toggling off the raw JSON on body brings you back to header in REST API

* Fixed modal showing on tooljetDB
2023-01-03 15:59:31 +05:30
Manish Kushare
681f5a721d
bug fixed : dark theme issues (#5158) 2023-01-03 15:27:14 +05:30
Manish Kushare
b0d401df36
[ Bug fixed ] : UI is not consistent when query name is large in query panel header (#5098)
* truncate the query name excedding 20 letters in the query panel header

* made the suggested changes

* bug fixed
2023-01-03 15:04:49 +05:30
Kiran Ashok
b7b87842be
removing styles already present in onboarding css file (#5160) 2023-01-03 14:07:10 +05:30
AdithyaPadmashali
75b9c8c408
Changed bottom padding to 1.5rem in modal-main (#5156) 2023-01-03 13:15:47 +05:30
Kiran Ashok
848d8ba2dc
fix :: setupscreen for admin broken in lower resultion fix (#5157) 2023-01-03 13:07:26 +05:30
Manish Kushare
b5d456a7fb
bug fixed : restAPI is getting created everytime after adding new datasource or deleting a data source (#5115) 2023-01-03 12:59:47 +05:30
Kiran Ashok
47023bb8dd
gave width to login/signup page skeleton (#5153) 2023-01-03 12:03:15 +05:30
Himanshu Kumar Suman
f7a288e4a5
fix-the-height-of-button-in-navbar-#3136 (#4980)
* fix-the-height-of-button-in-navbar-#3136

* Reverted package-lock.json changes

* Fixed organisation height

Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>
2023-01-03 10:45:57 +05:30
Han Ye Htun
44db9e7952
fix secondary text color update with secondary sign display (#5124)
* fix secondary text color update with secondary sign display

* Fixes lint errors

Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>
2023-01-03 09:04:26 +05:30
Manish Kushare
4d7843836b
[ Bug fix ]: Dark theme bugs (#5145)
* bug fixed : profile pop-up in the homepage is not consistent with the dark theme

* Popover content of inspector,debugger,pages and datasouces are inconsistent with the dark theme

* dark theme fixes for menu icon in the homepage

* dark theme fixes
2023-01-03 08:53:01 +05:30
Manish Kushare
4955689281
[ Bug fixed ]: GraphQL headers url paramaters key value UI is not as expected (#5116)
* bug fixed : GraphQL headers & url paramateres key & value UI is not as expected.

* made the suggested changes
2023-01-03 08:33:38 +05:30
Manish Kushare
59d2acfb88
[ Bug fixed ] : Edit version pop-up is not getting closed after clicking on x button (#5118)
* bug fixed : edit version pop-up is not getting closed after clicking on x button

* made the suggested changes
2023-01-03 08:31:47 +05:30
Manish Kushare
d95c61d61e
[ Bug fixed ]: Should be workspace instead of organization (#5095)
* replace add new organization with add new workspace

* replace organization-settings with workspace-settimngs

* made the suggested changes
2023-01-02 17:41:29 +05:30
Arpit
5f1cc81e10
[multipage]redirects to homepage if page is invalid (#5107)
* redirects to homepage if page is invalid

* remove console
2023-01-02 17:36:48 +05:30
Manish Kushare
cfcb108b7d
[ Bug fixed ] : input field width is not fixed (#5057)
* bug fixed : codehinter width is not fixed

* fixed spacing issue in the rest api input url field

* bug fixed : minor shift in the content in the input field
2023-01-02 17:30:38 +05:30
vjaris42
456375c2db
add: autosave for newly created apps (#5069) 2023-01-02 16:49:21 +05:30
Kiran Ashok
312be78918
toast fixes (#5134) 2023-01-02 14:21:54 +05:30
Pranay
035c06feb3
fix: calendar icon file name (#4882)
Co-authored-by: manishkushare <kushare.manish9@gmail.com>
2023-01-02 13:14:42 +05:30
Kiran Ashok
44c66423ef
changed work email to email (#5126) 2023-01-02 12:42:37 +05:30
Gandharv
f4ab2a2221
fix: scroll in debugger panel (#5110)
* fix: popover width

* fix: debugger scroll

* rename title to debugger

* css changes

* homepage pagination

* same width edit-launch btns -> appcard

* profile icons

* fix render deploy

Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
2022-12-30 17:23:20 +05:30
Midhun G S
637af22024
[v2-beta] Improvement - Editor (#5038)
* editor improvement

* review comments
2022-12-30 14:56:12 +05:30
Sherfin Shamsudeen
3e18acd476
Merge pull request #5106 from ToolJet/chore/develop-to-v2-beta
Merge develop to v2-beta
2022-12-30 14:22:16 +05:30
Kiran Ashok
32aa59fda4
split onboarding css , bugfixes , code improvements (#5050) 2022-12-30 12:09:07 +05:30
Gandharv
71e47e088f
Merge branch 'v2-beta' into chore/develop-to-v2-beta 2022-12-30 11:37:12 +05:30
Manish Kushare
4b5c65eeef
feature added : display loader in Run button when query is running (#5112) 2022-12-30 08:58:17 +05:30
vjaris42
71bac415bb
[Fix] :: App import from v2->v2 (#5100)
* filter: static datasources

* fix: null lastname on multisearch

* chore: add datasource type field while importing app
2022-12-30 00:56:37 +05:30
Arpit
1fcd9bb5e1
tj query requires filter options and where (#5102) 2022-12-29 18:14:20 +05:30
Arpit
9b51df49c5
remove max width (#5109) 2022-12-29 18:12:10 +05:30
Gandharv
e8e039ee63
fix: popover width (#5108) 2022-12-29 18:05:36 +05:30
gandharv
88fb4aca6f Merge branch 'develop' into chore/develop-to-v2-beta 2022-12-29 17:44:34 +05:30
Arpit
545f29d0a7
removes search placeholder icon (#5105) 2022-12-29 17:28:44 +05:30
Arpit
11ff100b3c
Popoulate default values (#5104) 2022-12-29 17:28:18 +05:30
Gandharv
dbdd228665
fix: homepage design changes (#5073)
fix: homepage design changes (#5073)
2022-12-29 17:19:10 +05:30
Gandharv
f9aa596994
feat: app builder design changes (#5041)
* feat: version manager, realtime avatars + popover addition
2022-12-29 17:18:24 +05:30
Arpit
0cb8507640
improvements to pagination (#5053)
improvements to pagination in tooljet database
2022-12-29 13:48:32 +05:30
Kavin Venkatachalam
021ba6f439
Fixes showing success message on every query run in viewer (#5094) 2022-12-29 13:19:04 +05:30
Sherfin Shamsudeen
bc4974da4e
Main (#5097)
* [Hotfix]: Fixes Showing Toast Message on Query Success in Viewer (#5077)

* Fixes showing success message on every query run in viewer

* Removed unwanted changes

* Bump patch version

Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>
2022-12-29 13:18:20 +05:30
Arpit
ba73302d51
updated toast context (#5087) 2022-12-29 12:54:12 +05:30
vjaris42
840863c7ba
hide: search results when forms enabled (#5092) 2022-12-29 11:11:57 +05:30
Arpit
6826fdc8df
Tooljet db query - Filter condition should resolved dynamic variables used in the editor (#5080)
* fixes: filters were not resolved when a non string is passed

* check for undefined and null

* clean up
2022-12-28 21:54:22 +05:30
Arpit
acefdb8400
fixes: tj query query panel (#5083) 2022-12-28 21:15:09 +05:30
Kavin Venkatachalam
b9be30aff3 Fixes conflicts 2022-12-28 17:35:19 +05:30
arpitnath
b2b4c448f3 fixes conflicts 2022-12-28 15:01:31 +05:30
Sherfin Shamsudeen
d6a72b50bd Merge develop to v2-beta 2022-12-27 20:10:33 +05:30
Akshay
9c62b2d317
Feature: Make tooljetdb optional (#5062)
* make tooljetdb optional

* restrict routes when tooljetdb is disabled

* validate dbname before creating database

* fix comment

* format
2022-12-27 16:18:36 +05:30
Manish Kushare
0fa2bf9d12
bug fixed : some columns are missing in downloaded file (#5064) 2022-12-27 14:22:00 +05:30
Mekhla Asopa
c6440162dc
Automation for export import functionality (#4848)
* Added data-cy

* Updated spec with verify elements

* Updated spec with export app method

* Added data-cy for import and Add test case for app import

* Updated rename method in the export spec

* update variable in import spec

* Updated spec with version assertion
2022-12-27 14:03:59 +05:30
Midhun G S
cc0b3993f1
comments last name displayed as null (#5060) 2022-12-26 21:30:22 +05:30
Sherfin Shamsudeen
c5db1e8c95
Remove border-width for code hinter inside rest-methods-url div (#5054) 2022-12-26 18:46:41 +05:30
Arpit
6712bd2fb3
Internal storage - Pagination for Database table (#5040)
* init

* footer component with pagintion ui basic styles

* pagination:  apply a limit and offset rows through query params

* open create row drawer from footer button

* border color for dark theme footer button

* cleaned

* pagination

* fixes: input value

* moved functions to component level
2022-12-26 17:09:12 +05:30
Arpit
bfceb37da9
[Improvement] Internal storage - table validations (#5034)
* adds dto for create and rename tables, renametable service

* adds constraints for psql reserved keyword for column name

* validations for column default value
2022-12-26 17:06:25 +05:30
Mike
aa0359171d
fix: 4966 edit comments (#5004)
fix: 4966 edit comment upd
2022-12-26 15:46:45 +05:30
Mike
ddeedf1232
[docs] small grammar fix in editor (#5003) 2022-12-26 12:03:01 +05:30
vjaris42
120a7b310c
fix: last name null issues (#5043) 2022-12-23 13:27:08 +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
Manish Kushare
0ef27c9fc5
[ Bug fixed ] : able to rename a query name to existing one (#5031)
* bug fixed : able to have rename a query to existing one

* refactored code and added toast error message
2022-12-22 19:57:52 +05:30
Manish Kushare
4a4c9be831
bug fixed : not able to view query, once we click on breadcrum if only single query present (#5032)
solved bug for save and create button
2022-12-22 19:34:46 +05:30
vjaris42
e49ef9777f
[Enhancement] :: Allow users to add custom query parameters for postgresql connections (#4912)
* add: custom endpoint for s3 hosts

* add: key-value pair editor for connection options

* add: newkeyvalue Pair button

* fix: reset header key-value pairs
2022-12-22 17:35:11 +05:30
Muhsin Shah C P
c5d74c4a27
Fixed the issue (#4790) 2022-12-22 17:16:50 +05:30
Kiran Ashok
60bc09f0ba
fix :: drag issue in column properties (#4840) 2022-12-22 17:01:36 +05:30
Arpit
8e1a3bab9c
[improvement] Multipages : sync undo redo to page level (#5010)
* undo/redo is page level

* resolves: auto save definitions and double redo/undo actions
2022-12-21 18:49:05 +05:30
John Bampton
c84d306fc3
[CLI] Fix spelling (#5027) 2022-12-21 15:09:47 +05:30
vjaris42
307f869ff9
Make encrypted fields editable (#5008)
* fix: data sources update

* fix: default state for custom s3 url

* refactor: move state to parent

* make encrypted fields default enabled for new datasources

* show edit toggle only while editing datasource

* chore: change toggle placement

* chore: replace edit toggle with button

* fix: password reset
2022-12-21 12:33:12 +05:30
vjaris42
68393cecb2
[Feature] :: Allow users to invite users in bulk (#4995)
* add: ability to bulk upload users

* refactor: inviting users asynchronously

* chore: add transaction wrap

* chore: fetch existing groups initially

* chore: add transaction wrap

* chore: add package-lock

* fix: namespace issue

* fix: empty group names
2022-12-21 12:32:39 +05:30
Kiran Ashok
b66d38cf45
Feature :: onboarding self hosted users (#4933)
* fix :: keystroke not taken initially

* fix :: trim company name

* fix :: setting autocomplete to off

* removing redirectsso and confirmation page as its unused now

* few ui corrections , laoding states

* Fixed organization login sso issue

* Add db transaction wrap

* refactoring the code

* flow changes

* Added db tranxn wrap to auth services

* adding accept invite screen

* added verify organization token route

* fixes

* adding disable_multiworkspace to default config

* cleanup

* intermediate commit :: revamping organization page , api integration

* fixes

* feat :: organization token send in invite from org account setup

* fix :: making orgtoken conditional and ui changes / functional updates organization invte

* removed unwanted code

* fix :: login/account setup for sso user in single workspace flow

* fixes

* fix :: CTA loader misaligned

* fix :: sso login single workspace

* fix

* fix :: role check db

* fix :: role check DB

* fix :: setting fallback screen for organizational invite

* feat :: org signup

* fix :: loading states bug

* fix :: loading bug

* fixes

* added password length validation

* fixes

* fix: sub path for static asset serve (#4665)

* fix: sub path for static asset serve

* fix: sub path for static asset serve

* fix: sub path for static asset serve (#4668)

* Bugfix :: Sort event fired on sort removal (#4542)

* onsort applied on sort removal

* bugcheck

* removing unused toast

* Feature :: Table image column type addition (#4547)

* feat :: adding column type image

* feat :: adding image fit property

* Fix :: Closing of textarea ontype Table widget (#4549)

* fix :: closing of textarea ontype

* fix :: bug not able to clear value

* bug fixed : generate file in text is not supported (#4346)

* add eslintignore for frontend (#4669)

* [cypress] Fix failing manage SSO spec in single workspace #4390 (#4509)

* added  [data-cy=login-page-logo] also removed one dropdown of same name

* Revert command.js

* call loginpagelogo

* Fixed toast test case

* updated text

* remove timer

* revert linting

* Github text fixed

* Replaced the woocommerce connection screenshot from dark to light one (#4654)

Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com>

Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com>

* gifs for Keyboard Shortcuts Added (#4643)

* Fix. Image to button group docs (#4630) (#4631)

* Add. Image to button group docs (#4630)

* Update docs/docs/widgets/button-group.md

Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com>

* [added] Translated global strings in french #4169 (#4232)

* [added] Translated global strings in french 

Added global strings translated to French language , Issue: #4169

* [localization ] Fixed the Proposed Changes in French Translation

* [localization ] Fixed the Remaining Proposed Changes in French Translation v2

* Update selectHost

Co-authored-by: roiLeo <medina.leo42@gmail.com>

Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com>
Co-authored-by: roiLeo <medina.leo42@gmail.com>

* [localization] issue-4188 added spanish keys for card app (#4229)

* issue-4188 added spanish keys for card app

* IT-4188 fixed PR

* Improve toast message shortcut on component deletion (#4513)

* Improve toast message shortcut

* Improved user agent check

Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>

* Improved user agent check

Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>

* feat: Add DTO for organization create (#4651)

* feat: Add DTO for organization create

* chore: fix eslint error

* chore: eslint ...

* Fixed failing manage SSO spec in multi workspace (#4658)

* Fixed failing manage SSO spec in multi workspace

* github to gitHib

* persist data without saving the query (#4649)

* Fixed failing dashboard specs (#4667)

* Add and modify data-cy

* Fix failing manage users spec in multiworkspace

* Fix failing user permission spec in multi workspace

* Fix failing dashboard spec

* Fix failing manage group spec

* Fix failing manage users spec in single workspace

* Fix failing user permission spec in single workspace

* indentation changes

* Remove wait

* [Marketplace] AWS S3 (#4670)

* fix: sub path for static asset serve (#4665)

* fix: sub path for static asset serve

* fix: sub path for static asset serve

* marketplace: s3

* rename operations file to query_operations

* fix: crash on click of existing plugin

* remove unused console

* adds missing async await

* add isoptional for repo

* plugin card ui style fixes

* update plugin name

Co-authored-by: Gandharv <gandharvkumargarg@gmail.com>

* fix: Added a modal with warning message on disabling password (#4552)

* Copy to clipboard (#4588)

* Update EventManager.jsx

* Update EventManager.jsx

* Update EventManager.jsx

* fix :: adding sso configs based on org id

* loader and password check

* multiworkspace invite flow updated

* restrict only active users

* fix

* added error message for password length check

* fix :: password trim

* fix :: all happy flows tested , single and multi exept sso

* fix: message on invalid password

* revert: package-lock.json file

* feat :: changing ui for user present for org invite in  multi workspace

* fix :: remove password check for existing user multiworkspace

* fix :: added fallback

* fix :: typo

* fix :: adding checks

* fix

* feat :: for single workspace user logged in directly

* fix :: code meaning fix

* fix

* fixes

* fix

* fix

* fix

* fix :: sso fix and bug updates

* fix :: json resolution for only single workspace

* token :: app level

* fix

* fix

* fixes

* fix

* ui fixes , removed loading and added checks

* showing sso options

* fix :: back to

* fix single workspace

* adding sso check ui

* sso single workspace fix

* code refactoring

* fix :: bugfix on click enter submit in signup and signin

* qa fix :: typo

* fix for sending welcome email on invite

* bug fixes

* fix

* qa bug fixes and translations

* switch workspace fixes

* fix :: company name taking empty spaces

* adding some more translations

* making all screens center aligned

* fix :: login page not loading

* fix :: singup conditional

* fixes

* typo fix

* fix :: for diabled cases of sso , password login , disabled signup

* fix

* fix :: added max input length for workspace name

* fix

* fix :: missing validation on edit email

* fix :: all screens vertically aligned

* fix :: alignment link expiry screen

* fix

* fix :: styling terms and condition

* fix :: for redirect url loginto workspace fixed according to new design

* typo

* feat :: removed onboarding modal , redundant

* typo fix

* fix

* name is now mandatory for sign up

* fix for password retry count not updating

* showing onboarding questions for sign up users

* fix :: spaces in password in diff screens

* fix :: darkmode initial

* fix for accept organization invite success message

* fix :: dark mode

* fix :: dark mode

* feat :: updating all dark mode images

* bugfix img

* bugfix ::img

* dark mode :: improvements

* single workspace signup fix

* updating images

* stylefix

* self review :: bugfixes

* sign up page fix

* fix for asking password for single ws activation

* or separator fix for signup page

* fix

* feat :: updating cta images

* fix :: loader bugs

* hiding sso options in org invite, sign in via sso

* fix :: dark mode img

* bugfixes :: cta changed

* Fix :: onboarding styles fixes (#4773)

* fix: styling in authWrappers

* cleanup

Co-authored-by: Vijaykant Yadav <vjy239@gmail.com>

* fix :: conflicting styles

* fix :: loaders , and added header to link expired screen , style fixes

* fix :: mobile onboarding btn

* fix :: loading onboarding completion

* fix :: subpath not taking img path

* fix :: path

* fix :: removing trailing img / for subpath

* fix :: cta img

* fix :: remove scrollbar

* last name as undefined in comments

* fixed loading bug and cursor of company input onboard form

* comments fixes

* fix :: removing verify email screen on org invite

* comments fix

* fix :: no login methods

* fix :: bug in expired  org invite verification link

* fix :: edge case name being empty when user types multiple spaces

* fix :: comments breaking

* fix :: notification breaking

* fix :: user groups table lastname

* fix for sso redirection

* fix :: empty first and last name during org invite

* bug fixed :On updating any permissions under permission tab, currentTab switches to app tab (#4734)

* fix: popout editor closing for tables (#4674)

Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>

* Added default value for backgroundColor In NumberInput (#4378)

* fix: added background styles for number input

* fix: removed additional f from the background color property

* fix: added backgroundColor property from styles

* fixes: default bg color for dark mode

Co-authored-by: arpitnath <arpitnath42@gmail.com>
Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>

* Added the hover effects on datasources (#4303)

Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>

* Added Background Color to Text Input (#4194)

* Added Background Color to Text Input

* Added Default Value for Background Color

* added default value and make background of text input consistent with the dark theme

Co-authored-by: manishkushare <kushare.manish9@gmail.com>
Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>

* feat: Add update version button on installable plugin (#4766)

* feat: Add update version button on installable plugin

* use id from update method

* removes redundant check

* use plugin id for fetching files from s3

* fetch latest plugins once updated

* disable update and remove buttons while update in progress

* replace href with link-span cx + send body in patch request

* fix: Dark mode on table's `Striped` and `Striped & Bordered` table type mode (#4611)

* [ Hotfix ] :: Hard to resize table columns  (#4438)

* fix :: hard to resize , scrollbar should not be visible

* fix :: resizer not working in pewview

* Enhancement : [RangeSlider widget] Bind onChange event (#4192)

* add onChange event and its handler

* add handler for slider change as well

* fix lint

* added onChange fire event when slider value is changed

Co-authored-by: manishkushare <kushare.manish9@gmail.com>

* Added data-cy for table widget elements (#4792)

* Add data-cy to tooltip label

* Add data-cy to table filter pop-over

* Add data-cy to table elements

* Add review changes

* [docs] Widget updates (#4793)

* widget updates

* minor update

* Update README.md (#4784)

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Fixed grammatical errors in localization doc (#4800)

* [docs] widget property updates (#4806)

* fixes

* added resend invite API

* Onboarding revamp test cases (#4770)

* fix: test cases for oauth

* fix: app controller test cases

* fix: test cases for oauth

* fix: app controller test cases

* remove: unused vars

* fix: test cases for oauth

* fix: app controller test cases

* remove: unused vars

* chore: PR fixes and cleanup

* fix: single workspace test cases

* fix: test cases for oauth

* fix: app controller test cases

* remove: unused vars

* chore: PR fixes and cleanup

* fix: test cases for oauth

* fix: single workspace test cases

* add: test cases for invitation links

* add: test cases for sso

* fix: test cases for oauth

* fix: app controller test cases

* remove: unused vars

* chore: PR fixes and cleanup

* fix: test cases for oauth

* fix: single workspace test cases

* add: test cases for invitation links

* fix: test cases for oauth

* fix: app controller test cases

* chore: PR fixes and cleanup

* add: test cases for sso

* fix: app test cases

* fix: linting in files

* fix: test cases for oauth

* fix: app controller test cases

* remove: unused vars

* chore: PR fixes and cleanup

* fix: test cases for oauth

* fix: single workspace test cases

* add: test cases for invitation links

* fix: test cases for oauth

* fix: app controller test cases

* chore: PR fixes and cleanup

* add: test cases for sso

* fix: app test cases

* fix: test cases for oauth

* fix: linting in files

* rebase: from feature/onboarding-revamp

Co-authored-by: Vijaykant Yadav <vjy239@gmail.com>

* feat :: api update resend invite

* loading state resend mail

* adding loading state

* checkpoints shown only till tablet

* fix: failing test cases for sso

* pr:: changes changed all imports and removed unwanted fragments

* pr changes

* fix :: naming images

* fix :: style organized for onboarding

* fix for user seed issue

* removing unwanted styles

* Setting darkmode from props :: onboarding (#4885)

* passing darkmode as props to components

* error toast

* Review comment :: rename env variable

* Pr :: changes , code cleanup onborading form

* develop merge

* init :: CE setup page

* pr changes ::form splitted to components

* admin , worspace ui :: init save

* password warning added

* chore :: lint folder renaming

* chore :: lint fix

* review comments

* fixes

* fix for test cases failure

* changes :: removed empty divs

* cleanup

* feat :: onboarding setup completed

* updates

* first-user setup account

* fixes

* add guard for first user sign up api

* validation changes

* feat :: api integration

* workspace is mandatory for first user

* fix :: code cleanup , darkmode

* feat :: signup not enable info card

* fix code cleanup

* Fixed all e2e test cases

* Fixed an issue

* added style changes , signup status

* deisgn review style changes

* self review :: code improvements

* pr review changes

* removed unwanted state

* typo fixes

* feat :: improved ux on form , autofocus and enter key support, removing warnings

* pr review changes :: common constants and helpers moved

Signed-off-by: Pakeetharan Balasubramaniam <bpakee@gmail.com>
Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: Gandharv <gandharvkumargarg@gmail.com>
Co-authored-by: Manish Kushare <kushare.manish9@gmail.com>
Co-authored-by: Akshay <akshaysasidharan93@gmail.com>
Co-authored-by: alammoiz <moixalam@gmail.com>
Co-authored-by: Pakeetharan Balasubramaniam <bpakee@gmail.com>
Co-authored-by: Akhilesh Kumar Mishra <79476272+iamakhileshmishra@users.noreply.github.com>
Co-authored-by: Hemanth Kumar <49117799+Hemanthhari2000@users.noreply.github.com>
Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com>
Co-authored-by: akk312000 <akk312000@gmail.com>
Co-authored-by: roiLeo <medina.leo42@gmail.com>
Co-authored-by: Jose Morales <jmoralesmnz@gmail.com>
Co-authored-by: 3t8 <62209650+3t8@users.noreply.github.com>
Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>
Co-authored-by: Santosh Bhandari <bsantosh909@gmail.com>
Co-authored-by: Arpit <arpitnath42@gmail.com>
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
Co-authored-by: Akarsh Jain <72064462+akarsh-jain-790@users.noreply.github.com>
Co-authored-by: Utsav Paul <91927689+Smartmind12@users.noreply.github.com>
Co-authored-by: Vijaykant Yadav <vjaris42@Vijaykants-MacBook-Pro.local>
Co-authored-by: Vijaykant Yadav <vjy239@gmail.com>
Co-authored-by: geisterfurz007 <geisterfurz007@users.noreply.github.com>
Co-authored-by: Kavin Venkatachalam <kavin.saratha@gmail.com>
Co-authored-by: Abhushan Gautam <carefreeav09@gmail.com>
Co-authored-by: Syed Ansar <82027712+Syed-Ansar@users.noreply.github.com>
Co-authored-by: Rahul Sunil <rahulsunil2@gmail.com>
Co-authored-by: Srisuma Atluri <40341173+Srisuma13@users.noreply.github.com>
Co-authored-by: Midhun Kumar E <midhun752@gmail.com>
Co-authored-by: Navaneeth Pk <navaneeth@tooljet.io>
Co-authored-by: Akasshhg <91525166+gogoiakash2311@users.noreply.github.com>
2022-12-21 00:13:18 +05:30
Manish Kushare
ba7e38b7d9
[ Enhancement ] : Query panel UI design (#4757)
* added colors variable in color.scss

* made left side bar of query panel width fixed to 249px and main container width to grow accoding to available width of query panel

* made UI updates in query container - left sidebar of query panel

* set query name font weight to 400

change the border color of left sidebar of query panel

added colors in colors.scss

commented unused variable

* UI update for header in the leftsidebar of the query panel

* updated width of the primary default secondary button

* Updated UI for query panel header

* draf : tranfomration UI update

* draft - preview section UI update

* draft : query manager advance options UI update

* draft : UI update for restApi query editor

* update

* femoved disable save button logic

* small updates

removing box shadow for rest api options button

adjusted spacing for data source selectionn div

* reverting changes in _ui/Search component

* bug fixed : Query Panel header spacing and alignment issues

dark theme update

* spacing and dark theme update in query container

* bug fixed : transition issue in tabs

* dark theme updates and bug fixes

* input checkbox update

* added cursor pointer to input checkbox

* updates

* updates

* bug fixed : removed typo error from last commit

* update

* added 3 rows in rest api tab content by default

* update spacing between datasource picker and element to render div

* spacing top for event manager section

* removed inline style from preview component

* data source lister font size update

* removed inline style from editor component and added style in css

* small updates

* applied color theme for dropdown options in the query manager

* added cursor pointer to control section of dropdown

* updated select data source section in query manager

* dynamic form bug fixed

* bug fixed : breadcrum

* bug fixed : toggle in GroupHeaders is not consistent with the dark theme

* bug fixed : clear icon in searchbox in query manager

* bug fixed : color in rest api in request url

* search box query manager final design

* small update

* made suggested changes

* query editor design for stripe query

* made changes in stripe

* updated the files with minor changes

* made minor updates in stripe

* set Get as default method in rest api

* add functionality to update query name from query panel header as well

* change the width of list data queries section

change size of icon to 20px

* updated changes

* created queryManager.scss file

* added default value to input text box in the query panel header

* bug fixed

* fixed minor bugs

* moved custom-toggle css in queryManager.scss

added on focus css for ternary button

* removed unsued lines from queryManager.jsx

* bug fixed: spacing in search box

* bug fixed: spacing in search box

* code enhancement as per changes requested

* fixed : search box component breaking inside DataSourceManager component

* made a function to style select component in query manager

* styles select component in rest api and transformation using common method

* chnaged run query on page load to application load
2022-12-20 18:38:51 +05:30
Kavin Venkatachalam
efe3216f9d
[Bugfix]: Updated Local State After Deleting the Child Widget in Form (#4985)
* Fixed bugs on form widget

* Passed childComponents data to the parent
2022-12-20 17:08:36 +05:30
Manish Kushare
35fc8d160c
[Bug fixed ] :[ Table widget ] Badge column type is always editable in table row regardless of the editable property (#4999)
* bug fixed: Badge column type is always editable in table row regardless of the editable property

* refactored the code
2022-12-20 17:07:49 +05:30
Muhsin Shah C P
44d450725a
[fix] Redirect URL didn't work for preview apps (#4997)
* Fixed redirect URL Issue
- refactored the code
- added intercepter (valid app check)

* fixed another code

* code refactoring
2022-12-20 14:53:59 +05:30
Arpit
85cea9e6f1
resolves basic ds proxies (#5012) 2022-12-19 18:54:45 +05:30
Arpit
2065e700cc
viewer page drawer page text wraps (#5015) 2022-12-19 18:40:50 +05:30
Arpit
0221899bf8
[Bugfix/v2-beta] Multipages: Page name should have at-least 1 character (#4983)
* fixes: Page handler is also accepting  only <space> : but the url should not include blank space

* page name and page handler cannot be named with white spaces
2022-12-19 18:27:18 +05:30
Arpit
f32ce7d14a
fixes: For empty apps with a single page, the preview page is breaking. (#4982) 2022-12-19 18:25:46 +05:30
Arpit
973cc88c1a
fixes: which switches to the same page on page load event (#4981) 2022-12-19 18:23:17 +05:30
Kavin Venkatachalam
08174763fb
Fixed bugs on form widget (#4973) 2022-12-19 18:17:15 +05:30
ishaanparlikar
55c783064e
change position of cell background color option in column properties (#4891)
* fixed #4838

* Removed extra input field
2022-12-19 15:39:57 +05:30
Maurits Lourens
742d2b9887
fix bug when tooltip contains number (#4953) 2022-12-19 15:36:29 +05:30
Manish Kushare
6d26ff7ec8
[ Enhancement ] : Adding PDF downloading option in Table widget (#4597)
* added support for pdf download

* bug fixed : data in PDF file was not visible

* bug fixed

* removed console statement

* bug fixed : long text are hidden in pdf

* enhancement of code

* made the header in  uppercase format

* removed console

* removed custom width logic
2022-12-19 15:12:42 +05:30
Manish Kushare
a7daa00f00
[ Bug fixed ] : [ Table widget ] download as excel exports extra columns (#4906)
* bug fixed: Table widget Download as Excel exports extra columns

* bug fixed

* excluded bulk selector column from the downloaded file

* removed console

* bug: code was breaking with large data set

* made headers in uppecase format

* removed max width adjusting logic
2022-12-19 15:09:42 +05:30
Kavin Venkatachalam
a8fa6693d9
[Enhancement]: Query Builder Improvements (#4893)
* Added unsaved changes popup on query manager

* Cleanup changes in codehinter

* Fixed bug on clearing query values while dropping widget

* Persisted changed value in transformation during toggle

* Persisted updated value with dark mode toggle

* Fixed clearing transformation on initial render of confirmation popup

* Fixed getting confirm dialog on focusing fields

* Fixed getting confirm dialog for older queries with transformation

* Reverting the timeout change as it causes very much delay in hude apps
2022-12-19 14:57:14 +05:30
vjaris42
e50fa984ee
[Feature] :: Allow users to be filtered via status (#4908)
* add: user filter via status

* fix: typo in options name

* refactor: add All options to status filters
2022-12-19 12:36:08 +05:30
Arpit
c5d03f904c
[Feature] Runpy : support for running Python code as a query (#4690) 2022-12-16 14:35:59 +05:30
Manish Kushare
547a9cd6cc
exposed text property (#4989) 2022-12-15 18:53:24 +05:30
Manish Kushare
7bf260b7fb
exposed the label property (#4988) 2022-12-15 18:49:53 +05:30
Manish Kushare
3d6b8fedd9
[ Bug fixed ] : [ Table Widget ] Updated changes persist , even after discarding it. (#4903)
* bug fixed : on discard changes, updated changes still persists

* code enhancement

* code enhancement
2022-12-15 18:43:24 +05:30
Manish Kushare
5ae46081de
bug fixed : canavs background color is not getting applied in the viewer mode (#4818) 2022-12-15 18:35:16 +05:30
Manish Kushare
71ed5bf490
bug fixed : removed word-break warning (#4809) 2022-12-15 18:33:46 +05:30
arpitnath
4c56b08677 passing pages from props to event manager, query manager 2022-12-13 15:00:46 +05:30
arpitnath
670931c713 fixes: app crash on selecting page switch event for query manager, form and settings modal 2022-12-13 14:29:41 +05:30