Commit Graph

2569 Commits

Author SHA1 Message Date
Nikhil Nandagopal
dcdfba0d3c Merge branch 'master' of github.com:appsmithorg/appsmith-ee into release 2020-09-23 12:39:31 +05:30
Nikhil Nandagopal
03b7441258 Merge branch 'master' of github.com:appsmithorg/appsmith 2020-09-23 12:38:56 +05:30
Nikhil Nandagopal
29fa3c9715
added code to manually trigger intercom on click (#687)
Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
2020-09-23 12:38:21 +05:30
Automated Github Action
2ee6f553c3 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-23 06:07:19 +00:00
Shrikant Sharat Kandula
577e9a7017
Refactor ignoreCache parameter to use Boolean type (#681) 2020-09-23 11:01:58 +05:30
Automated Github Action
9a1af06de4 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-23 05:06:12 +00:00
Shrikant Sharat Kandula
de1ea7dfb4
Add option to override server timezone for MySQL datasources (#659)
* Add option to override server timezone for MySQL datasources

* Added test for server timezone override for MySQL

* Fix serverTimezone property config
2020-09-23 10:07:33 +05:30
Arpit Mohan
aab61f21d0
Merge branch 'master' into release 2020-09-22 18:16:01 +05:30
Satbir Singh
fc2e5ffa26 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-09-22 17:28:18 +05:30
devrk96
a297737ca3
Feature: Theme switching between light and dark mode (#578)
* Theme switching feature integrated

* Condition removed

* menu height bugs fixed

* warnings removed
2020-09-22 17:26:11 +05:30
Abhinav Jha
31c00b72b3
Show JS dependencies in the entity explorer (#546) 2020-09-22 16:42:34 +05:30
Automated Github Action
9dd1292e67 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-22 09:06:36 +00:00
satbir121
ff49033e08
Fixing duplicate app issue. (#666) 2020-09-22 14:33:02 +05:30
Arpit Mohan
08533e3fb9 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-09-22 09:58:58 +05:30
akash-codemonk
a8a28835c1
Update datasource structure icons (#642)
* Update datasource structure icons
2020-09-22 09:42:39 +05:30
Automated Github Action
fe6c5e0382 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-21 14:06:58 +00:00
satbir121
c935c5b20f
Merge pull request #649 from appsmithorg/fix/theme-tests
Fix theme initial load.
2020-09-21 19:35:21 +05:30
Satbir Singh
aab56496c9 Adding type and app background 2020-09-21 18:55:58 +05:30
Satbir Singh
3713eceb9c Fixing tests finally! 2020-09-21 18:41:28 +05:30
Automated Github Action
6c96ca210e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-21 13:06:21 +00:00
Arpit Mohan
a0d5f67aa5 Removing the keep-alive ping check for CI builds (#565) 2020-09-21 18:33:47 +05:30
Shrikant Sharat Kandula
493ea60197 Use a unique instance ID for pinging home (#566)
* Use a unique instance ID for pinging home

* Fix event name
2020-09-21 18:31:11 +05:30
Shrikant Sharat Kandula
80decc497c Add a scheduled task to ping home (#560)
* Add a scheduled task to ping home

* Removed commented logging code

* Add docstrings to ping scheduled task

* Move IP address API URI to a constant
2020-09-21 18:31:11 +05:30
Arpit Mohan
20d85d8949
Giving higher preference to window variables instead of build variables in configuration. (#644)
This is because window configurations have been set by the user while the build configurations have been set by the build script.
2020-09-21 18:20:19 +05:30
Arpit Mohan
92a916373e Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-09-21 18:08:31 +05:30
Shrikant Sharat Kandula
6ef5838cd8
Add UPDATE query templates for Postgres and MySQL plugins (#646) 2020-09-21 17:56:24 +05:30
satbir121
703e39999e
Revert "Revert "Fixing applications page first theme load."" 2020-09-21 17:47:08 +05:30
Automated Github Action
c39eee0c33 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-21 12:08:43 +00:00
satbir121
94e1239c6a
Revert "Fixing applications page first theme load." 2020-09-21 17:23:23 +05:30
satbir121
b618da98b2
Merge pull request #643 from appsmithorg/fix/theme
Fixing applications page first theme load.
2020-09-21 16:54:34 +05:30
Satbir Singh
44b03cdb33 Fixing applications page first theme load. 2020-09-21 16:48:33 +05:30
Automated Github Action
41320301d7 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-21 11:05:45 +00:00
Shrikant Sharat Kandula
34edbe87e3
Fix unquoted identifiers in generated queries for Postgres (#639) 2020-09-21 16:28:14 +05:30
Automated Github Action
d1be948146 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-21 10:06:57 +00:00
akash-codemonk
8b668484ad
Feat/database structure (#525)
Datasource structure ui
2020-09-21 14:41:42 +05:30
Automated Github Action
c3703edba4 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-21 06:07:35 +00:00
Abhinav Jha
114dfd3cbb
Add Tests: Delete widget and Undo delete widget (#556)
* Add selectors for delete trigger, toast action and copy trigger

* Copy/Paste/Delete/Undo test

Co-authored-by: Nandan <nandan@thinkify.io>
2020-09-21 11:27:54 +05:30
Automated Github Action
42f213902c Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-19 12:08:20 +00:00
Nikhil Nandagopal
7bd5e9655a Merge branch 'master' of github.com:appsmithorg/appsmith 2020-09-19 17:16:26 +05:30
Nikhil Nandagopal
b6071a054e Merge branch 'master' into release 2020-09-19 17:15:46 +05:30
Nikhil Nandagopal
04368d675e Patch for Rich text editor updates 2020-09-19 17:15:19 +05:30
Arpit Mohan
790ad71a2c
Adding more details to Contributing.md for server compilation (#582) 2020-09-19 12:56:42 +05:30
Automated Github Action
7f5c135f08 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-18 13:06:03 +00:00
Hetu Nandu
962dfcbd86
Router switching for editor to avoid extra renders (#571) 2020-09-18 18:17:32 +05:30
Satbir Singh
ff6b7d487f Adding onClick property for image widget.
(cherry picked from commit d444b2e169)
2020-09-18 16:42:35 +05:30
Satbir Singh
e7a1ba0741 Adding onClick property for image widget.
(cherry picked from commit d444b2e169)
2020-09-18 16:41:12 +05:30
Automated Github Action
91b9d4ec66 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-18 11:06:09 +00:00
satbir121
3d52c1cd24
Adding onClick property for image widget. (#575) 2020-09-18 15:58:00 +05:30
Abhinav Jha
9e5b99cde1
Prime cut feature code for keyboard shortcut tests (#568)
* Update cypress layoutDSL to include parentIds. Handle widget's parentId undefined scenario

* handle tabs parsing error when deleting tabs widget
2020-09-18 15:57:49 +05:30
Satbir Singh
d444b2e169 Adding onClick property for image widget. 2020-09-18 15:42:57 +05:30
Arpit Mohan
f7f5e9fabc Fixing merge conflicts in server README 2020-09-18 13:59:45 +05:30
Arpit Mohan
68b09359cc Removing cacheResponse from the JSON response for actions (#564)
This is because this `cacheResponse` field is only used for auto-complete on the UI. The user can still run the action manually and get the auto-complete to work. The downside to sending the `cacheResponse` field in the JSON response is that for large responses, the client times out as our response times increase to 20 secs. Hence removing this for now.

In future, we'll extract the JSON schema structure from the response body and send that to the client for populating auto-complete.
2020-09-18 13:23:41 +05:30
Arpit Mohan
64549e4b06 Removing cacheResponse from the JSON response for actions (#564)
This is because this `cacheResponse` field is only used for auto-complete on the UI. The user can still run the action manually and get the auto-complete to work. The downside to sending the `cacheResponse` field in the JSON response is that for large responses, the client times out as our response times increase to 20 secs. Hence removing this for now.

In future, we'll extract the JSON schema structure from the response body and send that to the client for populating auto-complete.
2020-09-18 13:19:56 +05:30
Arpit Mohan
149df6925a
Removing the keep-alive ping check for CI builds (#565) 2020-09-18 13:13:40 +05:30
Automated Github Action
20cb3c6439 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-18 07:06:32 +00:00
NandanAnantharamu
c51ec0e59b
locator updated (#570)
* locator updated

* updated action type

* Updated test
2020-09-18 11:47:51 +05:30
Automated Github Action
0cd99df405 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-18 06:07:10 +00:00
Abhinav Jha
0b87c7431b
Fix issue where tabs are lost when the user enters an invalid tabs value (#569) 2020-09-18 10:52:54 +05:30
Automated Github Action
31bba6a8f7 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-18 01:12:38 +00:00
Shrikant Sharat Kandula
19bd7d272a
Use a unique instance ID for pinging home (#566)
* Use a unique instance ID for pinging home

* Fix event name
2020-09-18 06:38:53 +05:30
Automated Github Action
0ee1e5598d Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-17 17:06:23 +00:00
NandanAnantharamu
437eb05f19
Updated locator for org setting on the home page (#567) 2020-09-17 22:31:01 +05:30
Arpit Mohan
7e7a14ac74 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-09-17 19:01:46 +05:30
Arpit Mohan
e688f62378
Removing cacheResponse from the JSON response for actions (#564)
This is because this `cacheResponse` field is only used for auto-complete on the UI. The user can still run the action manually and get the auto-complete to work. The downside to sending the `cacheResponse` field in the JSON response is that for large responses, the client times out as our response times increase to 20 secs. Hence removing this for now.

In future, we'll extract the JSON schema structure from the response body and send that to the client for populating auto-complete.
2020-09-17 18:51:26 +05:30
Abhinav Jha
0eb6ebf95a
Increase clickable area of entities in explorer (#561) 2020-09-17 18:45:21 +05:30
Automated Github Action
8fd09f167b Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-17 13:06:21 +00:00
Shrikant Sharat Kandula
65c247a10c
Add a scheduled task to ping home (#560)
* Add a scheduled task to ping home

* Removed commented logging code

* Add docstrings to ping scheduled task

* Move IP address API URI to a constant
2020-09-17 17:54:48 +05:30
Automated Github Action
6ad176151c Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-17 12:08:47 +00:00
Abhinav Jha
1d981463aa
Fix cut widget feature issue (#562) 2020-09-17 17:22:58 +05:30
Automated Github Action
03b5bfbfcb Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-17 09:06:34 +00:00
Shrikant Sharat Kandula
75ba90928e
Add datasource structure caching and MySQL structure support (#553)
* Implement caching for datasource structure

* Avoid using final fields so spring-data can load objects

* Use type variable for getStructure method

* Initial version with base structure for MySQL plugin

* Add tests for MySQL plugin structure

* Add sorting for keys in Postgres structure as well

* Show "primary key" instead of just "primary"

* Refactor to reduce inline magic strings
2020-09-17 13:59:46 +05:30
Automated Github Action
d76ac0ea76 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-17 08:06:47 +00:00
satbir121
bef53b73aa
Making the ovrflow auto. (#559) 2020-09-17 13:27:19 +05:30
Automated Github Action
1584c83ed6 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-16 14:06:50 +00:00
Nikhil Nandagopal
3c22f8926f Merge branch 'master' into release 2020-09-16 18:41:04 +05:30
Nikhil Nandagopal
cac15f2cac
Update welcomeUserTemplate.html 2020-09-16 18:40:43 +05:30
Automated Github Action
cb1ddf611e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-16 13:06:12 +00:00
Nikhil Nandagopal
60043089ee
Feature/track install (#557)
* Bump http-proxy from 1.18.0 to 1.18.1 in /app/client (#538)

Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.18.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update install.sh

* Update install.sh

* Removed printing the ip

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
2020-09-16 18:08:53 +05:30
Automated Github Action
bc756cc539 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-16 12:08:28 +00:00
satbir121
b9154f6ea9
Homepage redesign with themes (#482)
* Updating homepage body color

* WIP: Fixing scrolls and adding anchors

* Removing divider from bottom of the page.

* Adding hover background color to app card

* Changing edit and launch icons.

* Fixing app name paddding in card.

* Fixing workspaces overflow

* Adding right padding to applications view

* Adding share icon to share btn

* Fixing Application card styles.

* Fixing text decoration in button.

* Adding new workspace button

* Fixing new workspace and new app styles.

* Adding icon sizes.

* Fixing Org Name and Org settings menu.

* Application menu working

* Fixing overlay visibility on app card

* Fixing settings page content width.

* Fixing workspace icon

* Changing app card colors.

* Removing debugger

* Adding app icon.

* Fixing the spaces in application card

* Adding storybook-static folder to gitignore.

* Adding other storybook files.

* Adding menu items for app

* Removing cypress selector from text.

* Menu width issue fixed

* Default app icon color added

* Removing hardcoded colors

* Removing hardcoded colors.

* Light Mode on!

* Showing correct icon and color in menu

* Update color working properly.

* Updating appIcon

* Editable text working.

* Adding validator

* Adding edit permissions to menu

* Removing box shadow on app card.

* Fixing context menu fill color

* Fixing Menu hover issues.

* Fixing menu open close hover issues.

* Fixing settings pages

* Changed Workspace to org.

* Fix: State management in EditableText Component (#540)

* Error state height is fixed as per design

* savingState prop condition fixed

* Fixing createnew.

* Fixing saving state for application card.

* Fixed application card editable text error.

* Fixing issue caused during merge.

* Fixing tests in create org.

* Removing commented code.

* Removing unwanted vars.

* Fixing delete duplicate tests.

* Latest color palette.

* Fixing form and table widget.

* Removing switcher from header

* Removing unused files

* Fixing app card context dropdown

* Show overlay fix

* Adding localStorage support to theme.

* Making dark mode the default.

Co-authored-by: Rohit Kumawat <rohit.kumawat@primathon.in>
2020-09-16 17:20:47 +05:30
Automated Github Action
5f0b1dfee5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-16 11:06:02 +00:00
Abhinav Jha
436f190555
Feature: Widgets: Cut-Copy-Paste-Delete shortcuts, undo-delete facility (#500) 2020-09-16 15:58:01 +05:30
Automated Github Action
a2340ac029 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-16 10:06:23 +00:00
Nikhil Nandagopal
1b33da86c8 Merge branch 'release' 2020-09-16 15:34:29 +05:30
akash-codemonk
5891d40271
Fix ConfirmRunModal not showing up in view mode (#551) 2020-09-16 15:14:07 +05:30
Nikhil Nandagopal
7b42b60d47 Merge branch 'release' 2020-09-16 13:42:53 +05:30
Nikhil Nandagopal
82ce5a1c2e
Merge pull request #49 from appsmithorg/release
Release
2020-09-16 13:42:34 +05:30
Automated Github Action
7dc189265e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-16 08:11:57 +00:00
Nikhil Nandagopal
ce628768bb
Fix/bindings (#554)
* changed chart data to behave as an array <str, str> and not use json stringify to update
added a generic logic to flag all objects with internal bindings as dynamic
moved unescape to only handle at the time of eval and removed new lines before eval

* added a migration for older charts that have their data as strings

* flagged column actions as an action trigger to avoid evaluating it

* minor fix

* fixed chart fields disappearing

* added migration on update

* added migration to constructor

* added a fallback for first time renders

* removed migration from did update

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
2020-09-16 13:41:24 +05:30
Nikhil Nandagopal
daf65bf2f3
Merge pull request #48 from appsmithorg/release
Release
2020-09-16 11:30:19 +05:30
Automated Github Action
5513589aaa Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-15 17:06:13 +00:00
Nikhil Nandagopal
4995706679
Fix chart data evaluation (#548)
* changed chart data to behave as an array <str, str> and not use json stringify to update
added a generic logic to flag all objects with internal bindings as dynamic
moved unescape to only handle at the time of eval and removed new lines before eval

* added a migration for older charts that have their data as strings

* flagged column actions as an action trigger to avoid evaluating it

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
2020-09-15 22:24:15 +05:30
Automated Github Action
745edafaf6 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-15 10:06:34 +00:00
Trisha Anand
423b7eb176
Added confirmBeforeExecute field in action view dto which is returned only during view mode. (#547)
* Added `confirmBeforeExecute` field in action view dto which is returned only during view mode.

* Added test for fetch actions in view mode.
2020-09-15 15:22:35 +05:30
Hetu Nandu
5cb1e2c0c0 Merge branch 'release' 2020-09-15 15:02:34 +05:30
Hetu Nandu
908e62af21 Merge branch 'release' 2020-09-15 15:00:16 +05:30
Automated Github Action
9466dd13f2 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-15 08:07:12 +00:00
devrk96
3f9d2e8d8d
Feature: Callout component (#535)
* callout component with story implemented

* text className import fixed

* callout color and background color fixed

* storywrapper import fixed

* fill property fixed

* background prop added
2020-09-15 12:40:53 +05:30
Automated Github Action
8d2463d8c1 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-15 07:06:25 +00:00
Hetu Nandu
f09b717b38
Retry dynamic import and lazy promises (#543) 2020-09-15 12:29:58 +05:30