Commit Graph

2016 Commits

Author SHA1 Message Date
Hetu Nandu
46f0873efe update paths 2020-06-30 15:19:30 +05:30
Arpit Mohan
2854e252ff Merge remote-tracking branch 'client/release' into release 2020-06-30 10:09:32 +05:30
Arpit Mohan
37c225dedc Merge branch 'feature/locatorsUpdate' into 'release'
Updating the locators for the API pane to get more tests to pass

See merge request theappsmith/internal-tools-client!791
2020-06-30 04:19:16 +00:00
Nandan H A
4eb30fccf2 Updating the locators for the API pane to get more tests to pass 2020-06-30 04:19:16 +00:00
Arpit Mohan
5865b615bc Merge branch 'fix/autoCompleteActionConfig' into 'release'
Show the action's actionConfiguration for for 'config' in autocompletion

Show the action's actionConfiguration for 'config' in autocompletion

See merge request theappsmith/internal-tools-client!794
2020-06-30 04:18:25 +00:00
Nikhil Nandagopal
faddd04cb3 updated query templates
added error message for all APIs
2020-06-29 18:18:21 +05:30
Satbir Singh
f55357029c Removed syncfusion completely. 2020-06-29 09:10:19 +00:00
Satbir Singh
d640c03386 Query editor auto save. 2020-06-29 08:23:10 +00:00
Akash N
7d6dacb848 Show the action's actionConfiguration for for 'config' in autocompletion 2020-06-29 13:11:53 +05:30
Akash N
902096cede Use react-table instead of syncfusion/react-grids for query table 2020-06-29 06:13:29 +00:00
Trisha Anand
930e577f98 Bug Fix : When page name is updated, the policies should not get overwrritten. Changed the base service function to reset the empty policies to null in case the update is not used to update the policies. 2020-06-27 19:45:24 +00:00
Nandan H A
a1378c7527 Merge branch 'feature/locatorsUpdate' into 'release'
Feature/locators update

See merge request theappsmith/internal-tools-client!784
2020-06-26 13:56:18 +00:00
Nandan H A
de3773b7af Feature/locators update 2020-06-26 13:56:18 +00:00
Satbir Singh
91231166a0 Merge branch 'master' into 'release'
Backmerge api name hotfix in master to release.

See merge request theappsmith/internal-tools-client!790
2020-06-26 12:03:33 +00:00
Trisha Anand
76e3db497c Bug fix : Google SSO for sign up led to the organization id for personal organization not getting set up. 2020-06-26 11:59:33 +00:00
Arpit Mohan
bbf0aef450 Merge branch 'bug/embedded-datasource-without-organization-id' into 'release'
When organizationId is null in a datasource, fail with the right error message

The organization id is subsequently used to find a matching plugin (checking for installation essentially), but when organization id is missing, this query never returns. But the error message reads as if the plugin is not installed, whereas it should've been that organization id is missing.

See merge request theappsmith/internal-tools-server!406
2020-06-26 11:43:16 +00:00
Shrikant Kandula
d5921ea52d When organizationId is null in a datasource, fail with the right error message 2020-06-26 11:43:16 +00:00
Satbir Singh
84da0a63fb Fixing api name not getting saved. 2020-06-26 16:52:54 +05:30
Vicky Bansal
945326fe43 Merge branch 'fix/table-crash-issue' into 'release'
Action column index binded instead of taking it from state for column actions

See merge request theappsmith/internal-tools-client!766
2020-06-26 09:58:52 +00:00
Trisha Anand
f640f85042 Merge branch 'fix/org-react-table' into 'release'
fix: Update Syncfusion table to react table on Org Settings

See merge request theappsmith/internal-tools-client!786
2020-06-26 09:23:53 +00:00
Arpit Mohan
f62439445a Merge branch 'fix/table-widget-create-all-columns' into 'release'
Taking keys from all data points of table to generate columns instead of just first data point of table data.

See merge request theappsmith/internal-tools-client!779
2020-06-26 07:55:45 +00:00
Tejaaswini
beb3a2cbb9 fix: Update Syncfusion table to react table on Org Settings 2020-06-26 00:18:07 +05:30
Nikhil Nandagopal
3bb16489c4 Merge branch 'fix/lightning-menu-icon-hides-text' into 'release'
Fix/lightning menu icon hides text

See merge request theappsmith/internal-tools-client!778
2020-06-25 10:24:27 +00:00
Trisha Anand
779c79476d Merge branch 'bug/acl-update-role-race-condition' into 'release'
Race condition bug caught in remove user from organization flow where multiple applicaitons/pages/actions exist for an organization.

See merge request theappsmith/internal-tools-server!407
2020-06-25 10:15:07 +00:00
Trisha Anand
57f4f734dd Race condition bug caught in remove user from organization flow where multiple applicaitons/pages/actions exist for an organization. 2020-06-25 15:39:32 +05:30
Hetu Nandu
fb65b204a8 JSON stringify fixes 2020-06-25 10:04:57 +00:00
Shrikant Kandula
3217daab14 Fix Mustache rendering to work on object fields directly 2020-06-25 09:58:20 +00:00
Trisha Anand
6d103b4939 Untested changes for fixing the bug where duplicate policies are getting created for the same permission. 2020-06-25 08:09:59 +00:00
vicky_primathon.in
2758dd9689 Highlighting icon backround when field is in focused state but user hovers over icon space 2020-06-25 13:04:15 +05:30
vicky_primathon.in
9c33f83ae9 Taking keys from all data points of table to generate columns intead of just first data point of table data 2020-06-25 12:48:51 +05:30
Arpit Mohan
ac397ee779 Merge branch 'fix/scrollbars' into 'release'
Fix/scrollbars

Remove scrollbars for function docs, autocomplete, current value and evaluated value.

See merge request theappsmith/internal-tools-client!775
2020-06-25 07:17:58 +00:00
Akash N
6f5c8ecca5 Remove scrollbars for function docs, autocomplete, current value and evaluated value. 2020-06-25 07:17:58 +00:00
vicky_primathon.in
74ac989815 Fixing the text not visible issue when the lightning menu is enabled on a field and field is in focused state 2020-06-25 12:20:18 +05:30
Tejaaswini
7aa4bf4395 fix: User permission management related bugs
- Use manage:organizations permission to restrict users from managing apps
- Add loading indicators will changing role and deleting users
- Restrict user from deleting himself or changing his role.
2020-06-25 08:35:41 +05:30
Nandan H A
ad549f9638 Feature/locators update 2020-06-24 13:52:41 +00:00
Trisha Anand
a73d182d73 Merge branch 'bug/org-creation' into 'release'
Bug fix : Create Organization is failing because the user is read from the session and not from the repository. Now reading the user at appropriate places.

See merge request theappsmith/internal-tools-server!405
2020-06-24 12:14:25 +00:00
Trisha Anand
aebb50d216 Bug fix : Create Organization is failing because the user is read from the session and not from the repository. Now reading the user at appropriate places. 2020-06-24 17:30:24 +05:30
Arpit Mohan
b63ca6726d Merge branch 'feat/plugin-templates' into 'release'
Add server-side templates support for plugins

Two main themes in this MR:

1. Add support for saving query templates as resource files inside a plugin. This has been done for both Postgres and MongoDB plugins, based on current template contents.
2. Loading of form JSON is now reactive. The blocking call has been moved inside a `Mono.fromSupplier`.
3. The loading of from JSON as well as the templates is cached and are loaded on-demand. This means that the templates are loaded once for a plugin through the lifetime of the server process, and that they are loaded only at the first time they are needed.
4. If loading of these resources fails, we try again when they are needed the next time.

See merge request theappsmith/internal-tools-server!385
2020-06-24 11:08:25 +00:00
Shrikant Kandula
eee2cfcaff Add server-side templates support for plugins 2020-06-24 11:08:25 +00:00
Shrikant Kandula
40b5466bd8 Fill response body with value when running findAndModify Mongo query 2020-06-24 11:05:19 +00:00
Satbir Singh
0fbc02e092 Merge branch 'fix/aloglia' into 'release'
Gitbook-aloglia syncing lambda function now takes care of ordering.

See merge request theappsmith/internal-tools-client!656
2020-06-24 08:30:33 +00:00
Shrikant Kandula
d7655ebb3c Add image location and documentation link fields to plugins 2020-06-24 08:28:54 +00:00
Arpit Mohan
aa2d1b1944 Merge branch 'fix/queryNameUpdate' into 'release'
Fix query name not updating

- For queries take the payload as it is.

See merge request theappsmith/internal-tools-client!771
2020-06-24 08:24:03 +00:00
Arpit Mohan
51b3a765ac Merge branch 'fix/expandEvaluatedValue' into 'release'
Expand evaluated value on click

- Show evaluatedValue based on input focus and content's hover state.

See merge request theappsmith/internal-tools-client!765
2020-06-24 08:22:27 +00:00
Akash N
1403141cc7 Expand evaluated value on click
- Show evaluatedValue based on input focus and content's hover state.
2020-06-24 08:22:27 +00:00
Suhas Ranganath
65ed71885a Merge branch 'fix/deactivate-button' into 'release'
Fix: Deactivate invite button and hide delete

See merge request theappsmith/internal-tools-client!768
2020-06-24 07:51:58 +00:00
Satbir Singh
e4b9059d5d Reverting local api to point to release-api. 2020-06-24 12:04:14 +05:30
Shrikant Kandula
522e6221f7 Make NO_SSL the default for Mongo datasources 2020-06-24 11:02:34 +05:30
Arpit Mohan
0be492e8e9 Fixing OAuth2 SSO login for new ACL flow 2020-06-23 13:19:22 +00:00
Akash N
b153c86f9c Fix query name not updating
- For queries take the payload as it is.
2020-06-23 16:40:26 +05:30
Tejaaswini
cb6997bcf0 Fix: Deactivate invite button and hide delete
- Deactivate the invite user button when email or role is not selected
- Hide Delete button for Appviewer role
- Fix dropdown position
2020-06-23 11:59:22 +05:30
Satbir Singh
7fa91b88d5 Fixing request view file name 2020-06-23 09:42:52 +05:30
Satbir Singh
e4858b82f8 Chrome dev tools request body 2020-06-23 03:58:42 +00:00
Vicky Bansal
c4eeccbf81 Merge branch 'fix/action-selectors' into 'release'
Fix/action selectors

See merge request theappsmith/internal-tools-client!723
2020-06-22 13:55:19 +00:00
Vicky Bansal
8a9f00c5a4 Merge branch 'fix/image-validation-regex' into 'release'
image validation regex updated to support query values

See merge request theappsmith/internal-tools-client!751
2020-06-22 13:47:56 +00:00
Vicky Bansal
b7b2766bc2 Merge branch 'fix/table-video-field-support' into 'release'
Fix/table video field support

See merge request theappsmith/internal-tools-client!752
2020-06-22 13:46:19 +00:00
Vicky Bansal
12c6147d1c Fix/table video field support 2020-06-22 13:46:19 +00:00
vicky_primathon.in
31c52ca7b4 Handling unselected action values to show No Action 2020-06-22 18:40:36 +05:30
Tejaaswini Narendra
d1ae457f9f fix: invite user email validation 2020-06-22 11:12:54 +00:00
vicky_primathon.in
59a855bde9 Action column index binded instead of taking it from state for column actions 2020-06-22 13:55:03 +05:30
Hetu Nandu
e534cec07c Merge branch 'fix/createApiLoader' into 'release'
Fix/create api loader

- Show loader in api home screen when creating a new api action
- Show loader in query home screen when creating a new query action
- Show column lines for table in query pane

See merge request theappsmith/internal-tools-client!734
2020-06-20 05:29:30 +00:00
Akash N
598ef55aff Fixes
- Show loader in api home screen when creating a new api action
- Show column lines for table in query pane
2020-06-20 05:29:30 +00:00
Hetu Nandu
760713aa69 Merge branch 'fix/datasourceName' into 'release'
Duplicate datasource fixes

- Do not show datasoure field menu when url is blank
- Embedded datasource name shouldn't be blank
- Omit datasource name while creating a datasource

See merge request theappsmith/internal-tools-client!759
2020-06-20 05:28:10 +00:00
Akash N
a0ca632e72 Duplicate datasource fixes
- Do not show datasoure field menu when url is blank
- Embedded datasource name shouldn't be blank
- Omit datasource name while creating a datasource
2020-06-20 05:28:10 +00:00
Trisha Anand
cd30e36eaa Hacky solve for setting the action execution request in case of failures in URL/HTTP Method/etc. 2020-06-19 23:43:32 +05:30
Satbir Singh
6def10319e Adding type for request. 2020-06-19 23:03:02 +05:30
Satbir Singh
bf0c0d737f Changing response request structure. 2020-06-19 21:57:12 +05:30
Trisha Anand
0603da29ee User test - Add request URL and http method to the execution result 2020-06-19 16:24:58 +00:00
Nandan H A
5e8356c4d7 Feature/locators update 2020-06-19 14:32:56 +00:00
Hetu Nandu
64fc1dc3f3 Merge branch 'master' into 'release'
Backmerge Master to release

See merge request theappsmith/internal-tools-client!760
2020-06-19 13:09:03 +00:00
Hetu Nandu
2d956644df Hot fixes 2020-06-19 13:06:45 +00:00
vicky_primathon.in
c5af30370f lightning menu tooltip flash issue fixed 2020-06-19 16:27:54 +05:30
Nikhil Nandagopal
eaea735f9e Merge branch 'fix/date-picker-2' into release 2020-06-19 14:33:27 +05:30
Nikhil Nandagopal
fa71e7c4ef changed date picker to store formatted date 2020-06-19 13:21:07 +05:30
vicky_primathon.in
e950a3f935 wrapping action code issue fixed. tree component is changed. 2020-06-19 13:00:11 +05:30
Abhinav Jha
9681ae2c51 Merge branch 'fix/minor-bugs' into 'release'
fix: bug fixes

See merge request theappsmith/internal-tools-client!727
2020-06-19 07:26:29 +00:00
Shrikant Kandula
5ce19962a3 Merge branch 'chore/sending-email-should-be-nonblocking' into 'release'
Sending emails is now done in a non-blocking way

See merge request theappsmith/internal-tools-server!396
2020-06-19 07:14:43 +00:00
Tejaaswini
f3bc246ecb fix: revert changes 2020-06-19 11:25:20 +05:30
vicky_primathon.in
f1bc994888 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into fix/action-selectors 2020-06-18 23:22:20 +05:30
Satbir Singh
e2a30da1c3 Merge branch 'master' into 'release'
Backmerge master to release.

See merge request theappsmith/internal-tools-client!754
2020-06-18 16:24:21 +00:00
Hetu Nandu
8a80132820 Merge branch 'fix/date-picker-2' into 'master'
minor fix for date picker validator

See merge request theappsmith/internal-tools-client!748
2020-06-18 16:11:42 +00:00
Hetu Nandu
60b9bba24b Merge branch 'fix/hot-fixes-2' into 'master'
Action draft fixes

See merge request theappsmith/internal-tools-client!753
2020-06-18 14:16:49 +00:00
Hetu Nandu
ded1a130e3 Action draft fixes 2020-06-18 14:16:49 +00:00
Tejaaswini
c02acf21bc fix: Minor change 2020-06-18 18:01:56 +05:30
Tejaaswini
0ffff9db4f merge 'release' into 'fix/minor-bugs' 2020-06-18 17:46:46 +05:30
Shrikant Kandula
5f0a3034b8 Sending emails is now done in a non-blocking way 2020-06-18 17:29:36 +05:30
vicky_primathon.in
700b74136e image validation regex updated to support query values 2020-06-18 16:53:11 +05:30
Hetu Nandu
549b9ba0ad Fix dropdown default value issue 2020-06-18 16:30:05 +05:30
Shrikant Kandula
70c312ca40 Merge branch 'bug/disallow-delete-datasource-with-actions' into 'release'
Fail deleting datasource if there's actions against it

See merge request theappsmith/internal-tools-server!388
2020-06-18 10:41:49 +00:00
Shrikant Kandula
9f6a4f6ea5 Fail deleting datasource if there's actions against it 2020-06-18 10:41:48 +00:00
Shrikant Kandula
45961ddcde Merge branch 'bug/fail-on-invalid-page-id-when-creating-action' into 'release'
Fail with an error if can't find page when creating an action

See merge request theappsmith/internal-tools-server!394
2020-06-18 10:25:13 +00:00
Nikhil Nandagopal
ba8f9fa00e minor fix for date picker validator 2020-06-18 15:50:53 +05:30
Trisha Anand
63852041de Merge branch 'bug/delete-application-app-viewer' into 'release'
Bug Fix : Application and page can only be deleted if you have manage application/page permissions respectively.

See merge request theappsmith/internal-tools-server!395
2020-06-18 10:20:50 +00:00
Shrikant Kandula
f19764ab99 Merge branch 'bug/space-not-needed-in-header-in-curl' into 'release'
Fix parse error when there's a space in header in curl command

See merge request theappsmith/internal-tools-server!390
2020-06-18 10:11:39 +00:00
Trisha Anand
4337e88934 Application and page can only be deleted if you have manage application/page permissions respectively. 2020-06-18 15:35:30 +05:30
Shrikant Kandula
1d5fa960db Fail with an error if can't find page when creating an action 2020-06-18 15:05:55 +05:30
Abhinav Jha
82e3b4ffa7 Merge branch 'fix/modal-overlay' into 'release'
Fix modal overlay covering widget cards pane issue

See merge request theappsmith/internal-tools-client!743
2020-06-18 09:25:41 +00:00
Abhinav Jha
fb8fd1b2aa Merge branch 'fix/chart-widget-crash' into 'release'
Fix the chart widget crash issue

- Fix chart widget crash issue which was caused due to incorrect default values.

See merge request theappsmith/internal-tools-client!744
2020-06-18 09:25:05 +00:00
Abhinav Jha
e9377d8187 Add singleChartData to chartData migration 2020-06-18 14:31:12 +05:30
Satbir Singh
bb54ffcd0c Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into fix/backmerge 2020-06-18 14:07:23 +05:30
Trisha Anand
ec8c63bfee For invitation, throw a bad request error in case all the invite dto fields are not set. 2020-06-18 14:05:48 +05:30
Abhinav Jha
8add047d70 Cleanup 2020-06-18 13:18:19 +05:30
Satbir Singh
fd3f4c2028 Fixing performance issue in apiName 2020-06-18 07:46:53 +00:00
Abhinav Jha
1d2e165a71 Fix the chart widget crash issue 2020-06-18 13:16:04 +05:30
Abhinav Jha
f70d92b8d0 Merge branch 'fix/remove-console-warnings' into 'release'
Remove console warnings

- Remove console eslint warnings like react hook dependency warnings and unused vars warnings

See merge request theappsmith/internal-tools-client!738
2020-06-18 05:53:41 +00:00
Abhinav Jha
78ebdfc9d8 Fix modal overlay covering widget cards pane issue 2020-06-18 10:56:50 +05:30
Abhinav Jha
57e341b7e8 Fix modal overlay z-index issue 2020-06-17 16:35:05 +00:00
Satbir Singh
8bdc1e7563 Merge branch 'master' into 'release'
Hotfix api name edit backmerge.

See merge request theappsmith/internal-tools-client!737
2020-06-17 13:58:29 +00:00
Abhinav Jha
fdd826d929 Remove console warnings like react hook dependency warnings and unused vars 2020-06-17 19:23:01 +05:30
Satbir Singh
98f65405a7 Handling api name change error. 2020-06-17 13:16:14 +00:00
vicky_primathon.in
f479e1d1d1 wrapping action code reverted 2020-06-17 18:28:26 +05:30
Trisha Anand
e5282dac11 In case a page is opened in edit mode, it should open with permission of MANAGE_PAGE. In case the user is a viewer, the page must not open. 2020-06-17 17:34:26 +05:30
Nandan H A
7bba999c9f Fixing tests for ACL flow
The current push for fixing tests in the new ACL flow.

1. New way to handle create application.
2. API login
3. Removed redundant tests.
4. Fixed Issues wrt ACL changes
2020-06-17 10:47:01 +00:00
Arpit Mohan
fc8e43da1f Query pane fixes
- Show mongo execute response in seperate cards for each record
- Update postgres read template
- Show query execute error message in the UI.
2020-06-17 10:19:56 +00:00
vicky_primathon.in
51545bf774 changes for child fields 2020-06-17 15:10:29 +05:30
Trisha Anand
893698f09e Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
2020-06-17 15:10:23 +05:30
Trisha Anand
8fc99cf0bd In case a user is invited to an organization as developer, correct top permissions are being assigned via Appsmith role. 2020-06-17 09:33:00 +00:00
Abhinav Jha
d7cac27c8f Remove 100% width from button size 2020-06-17 13:14:25 +05:30
Shrikant Kandula
8e40240f25 Fix parse error when there's a space in header in curl command 2020-06-17 12:32:08 +05:30
Abhinav Jha
3eb7fbdf18 Merge branch 'fix/new-widget-borders' into 'release'
Prevent widget name un-highlight when clicking on property pane.

See merge request theappsmith/internal-tools-client!730
2020-06-17 06:39:22 +00:00
Abhinav Jha
044df2b08d Add max width to back to editor button on appviewer 2020-06-17 11:59:09 +05:30
Vicky Bansal
232f5a9206 Fix/empty cells for empty table 2020-06-17 06:00:43 +00:00
Tejaaswini
16606a45a2 fix: bug fixes
- refresh users list
- show orgdropdown and share based on permission
2020-06-17 09:47:25 +05:30
Satbir Singh
7e3df81302 Api name editable. 2020-06-16 10:23:19 +00:00
Abhinav Jha
0f7fd2287a Stop click propagation on property pane to prevent the widget from getting unselected 2020-06-16 15:42:17 +05:30
Vicky Bansal
5643a53c9f Fixing table bugs 2020-06-16 07:37:39 +00:00
Tejaaswini
c99640df91 Merge branch 'release' into feature/acl 2020-06-16 11:44:44 +05:30
Arpit Mohan
c6af229a97 Merge branch 'bug/default-page-action-refactor' into 'release'
Adding the widget names set to the default layout for a page

During action name refactor, we require the widget names to exist in the layout. Hence all default layouts must have the widgetName set.

See merge request theappsmith/internal-tools-server!387
2020-06-16 05:25:54 +00:00
vicky_primathon.in
02d841a1b1 changes for tree structure 2020-06-16 10:50:46 +05:30
Arpit Mohan
a4132d5845 Adding the widget names set to the default layout for a page 2020-06-16 10:50:07 +05:30
Shrikant Kandula
dd0ba857c2 Fix cURL import when using --url argument
Also fixes cases where there's a space between `-X` and `POST` and
similar cases.
2020-06-16 09:59:43 +05:30
Akash N
1d38c98a7f Fix tab key navigation for headers and query params
- Extend existing extraKeys to avoid overriding the `Tab` extraKey
2020-06-15 13:14:39 +00:00
Abhinav Jha
2609f26117 Merge branch 'fix/lightning-menu' into 'release'
Fix/lightning menu

- Add lightning menu to assist users in binding
- Change the action selection display for consistency.

See merge request theappsmith/internal-tools-client!706
2020-06-15 10:51:20 +00:00
Hetu Nandu
70d4818767 add missing semi-colons in styles 2020-06-15 14:21:00 +05:30
Satbir Singh
cb628d26b2 Merge branch 'fix/remove-ff' into 'release'
ApiPaneV2 DocsV2 QueryV2 DatasourceV2 feature flag removed

See merge request theappsmith/internal-tools-client!721
2020-06-15 08:03:07 +00:00
Satbir Singh
bb4004fce0 ApiPaneV2 DocsV2 QueryV2 DatasourceV2 flag removed 2020-06-15 12:21:46 +05:30
vicky_primathon.in
cddd6586f2 overflow fix reverted 2020-06-15 11:18:17 +05:30
Tejaaswini Narendra
09554f97e8 Back to editor in app view mode should not be visible to users with only read application permissions 2020-06-12 15:44:51 +00:00
Trisha Anand
9dfb72720e Fixed the broken test cases. 2020-06-12 19:35:01 +05:30
Trisha Anand
bb6dc61015 Build fix 2020-06-12 19:16:31 +05:30
Trisha Anand
73757c3425 Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	.gitignore
#	appsmith-plugins/mongoPlugin/plugin.properties
#	appsmith-plugins/postgresPlugin/plugin.properties
#	appsmith-plugins/rapidApiPlugin/plugin.properties
#	appsmith-plugins/restApiPlugin/plugin.properties
#	appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
#	appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
#	appsmith-server/src/main/java/com/appsmith/server/repositories/ActionRepository.java
#	appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
#	appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
#	appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java
#	appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
#	appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
#	appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
#	appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
#	build.sh
2020-06-12 19:14:31 +05:30
Shrikant Kandula
18476432ac Don't invite users if they have any access in an org, not just admin. 2020-06-12 17:48:35 +05:30
Trisha Anand
6eea8ec43e Merge branch 'fix/acl-buglist' into 'feature/acl'
Modal collapse on role entry : Fix enter role from the dropdown closes the share pop up

See merge request theappsmith/internal-tools-client!712
2020-06-12 11:59:20 +00:00
Shrikant Kandula
b391f46e2c ACL Migration Script 2020-06-12 11:54:21 +00:00
Hetu Nandu
e6972ea772 add lodash docs 2020-06-12 16:26:46 +05:30
Tejaaswini
3b147cc445 Merge branch 'release' into feature/acl 2020-06-12 15:38:40 +05:30
vicky_primathon.in
3bf86936b1 merge conflicts resolved 2020-06-12 14:16:42 +05:30
Hetu Nandu
133f50807e Fix api pane performance 2020-06-12 08:35:52 +00:00
Trisha Anand
4eab663c8e Bug fix for forgot password error "user not found". During reset password, the user is not logged in and hence the permissions can not be applied during repository findByEmail 2020-06-12 13:57:57 +05:30
Satbir Singh
1b546cd308 Merge branch 'fix/save-edit' into 'release'
Save on edit debounce rate decreased and Run api is filled

See merge request theappsmith/internal-tools-client!715
2020-06-12 08:03:17 +00:00
Satbir Singh
75cef07aa9 Save on edit debounce rate decreased and Run api is filled 2020-06-12 08:03:17 +00:00
Trisha Anand
3dafccba2e In case of sending email for an existing user, fixed the URL. 2020-06-12 13:30:53 +05:30
Nikhil Nandagopal
5e292f0534 Merge branch 'fix/form' into 'release'
made form data visible at the top level

See merge request theappsmith/internal-tools-client!700
2020-06-12 05:28:37 +00:00
Akash N
e6ed4fd5bc Datasouces and query fixes
-  Show plugin icons in query sidebar and dropdown
- Collapse all sections except the first one in datasources form
- Collapse from second depth in query mongo response UI.
2020-06-12 05:09:49 +00:00
Satbir Singh
f606b0989e Merge branch 'fix/api-scroll' into 'release'
Fixing api Scroll.

See merge request theappsmith/internal-tools-client!689
2020-06-12 03:54:12 +00:00
Satbir Singh
1538a70d1f Fixing api Scroll. 2020-06-12 03:54:12 +00:00
Shrikant Kandula
ab83bc0223 Fix problem where not all apps were getting policies when invited. 2020-06-11 20:56:52 +05:30
vicky_primathon.in
db17836810 info icon placed after field. test case fixed for action selectors 2020-06-11 19:30:38 +05:30
Tejaaswini
08323d3281 fix: Modal collapse on role entry 2020-06-11 17:01:32 +05:30
Hetu Nandu
c2213bd696 Evaluated value bug fixes 2020-06-11 11:03:16 +00:00
vicky_primathon.in
d7b8c0da7d lightning menu disabled for disabled fields 2020-06-11 14:26:38 +05:30
Tejaaswini
53732cf7d9 fix: Disable application share button visibility 2020-06-11 13:03:54 +05:30
vicky_primathon.in
299d1d8158 code review changes 2020-06-11 12:54:19 +05:30
Trisha Anand
e7e008dcd2 Fixed the repository function which was failing for fetching actions during updateLayout. 2020-06-11 07:22:16 +00:00
Nikhil Nandagopal
e468fbbe62 Merge branch 'release' into fix/form 2020-06-11 12:23:34 +05:30
Arpit Mohan
b837016ae0 Merge branch 'feat/queryExecuteOnLoad' into 'release'
Add checkbox field for executeOnLoad in query form

See merge request theappsmith/internal-tools-client!705
2020-06-11 06:29:32 +00:00
Akash N
41e431ebb4 Add checkbox field for executeOnLoad in query form 2020-06-11 06:29:32 +00:00
vicky_primathon.in
da3ad7edc9 merge conflicts resolved 2020-06-11 10:52:00 +05:30
rashmipn
8c0d010216 fixed issue 2020-06-11 10:43:18 +05:30
Rashmi P
640bafdbd7 Merge branch 'update/Dsl' into 'release'
Update/dsl

See merge request theappsmith/internal-tools-client!678
2020-06-10 17:49:16 +00:00
Satbir Singh
13afc1a703 Merge branch 'feature/save-edit' into 'release'
Save api on edit.

See merge request theappsmith/internal-tools-client!702
2020-06-10 17:42:51 +00:00
Satbir Singh
13422048e4 Save api on edit. 2020-06-10 17:42:51 +00:00
Abhinav Jha
80f03d970b New Widget borders 2020-06-10 17:31:20 +00:00
Tejaaswini
54003a1d31 update: Invite user form design 2020-06-10 20:30:11 +05:30
vicky_primathon.in
a528ffc7d4 merge conflicts resolved 2020-06-10 19:16:45 +05:30
vicky_primathon.in
f70a3143c6 action selector breakages fixed 2020-06-10 19:11:26 +05:30
rashmipn
16b70bd52d resolved conflicts 2020-06-10 18:05:41 +05:30
Arpit Mohan
4322555d16 Merge branch 'fix/runQueryTwice' into 'release'
Use isExecutionSuccess flag to handle query execution errors

See merge request theappsmith/internal-tools-client!684
2020-06-10 12:25:54 +00:00
Akash N
69a65f7052 Use isExecutionSuccess flag to handle query execution errors 2020-06-10 12:25:52 +00:00
Arpit Mohan
9c6e46c649 Merge branch 'Add/Pagination-tests' into 'release'
Add pagination Cypress tests

This adds tests for server-side pagination in a table. 

Pagination via table pageNo and by responseUrl are covered in this scenario.

See merge request theappsmith/internal-tools-client!693
2020-06-10 12:25:16 +00:00
Rashmi P
66b26c42ee Add pagination Cypress tests 2020-06-10 12:25:16 +00:00
Nikhil Nandagopal
05bb520479 Merge branch 'release' into fix/form 2020-06-10 17:50:39 +05:30
Nikhil Nandagopal
125fb9c162 Merge branch 'fix/bugs' into 'release'
Fix/bugs

See merge request theappsmith/internal-tools-client!696
2020-06-10 12:19:55 +00:00
Hetu Nandu
cb2867069f Action creator evaluated value fixes 2020-06-10 12:16:50 +00:00
Nikhil Nandagopal
bc9ec2a2eb Merge branch 'release' into fix/bugs 2020-06-10 17:11:23 +05:30
Arpit Mohan
7af301566c Adding sorry-cypress integration to ensure Cypress parallelization without the Cypress dashboard 2020-06-10 11:14:58 +00:00
Arpit Mohan
01737b9599 Experimenting with maven-shade-plugin to create a fat-jar of the postgres dependency.
Will have to do this for all plugins. Currently, it's not registering the plugin with the SpringPluginManager
2020-06-10 11:11:23 +00:00
vicky_primathon.in
a5986ed8a8 merge conflicts resolved 2020-06-10 16:34:11 +05:30
Shrikant Kandula
1ce336257c Mark any 2xx status code in REST API plugin as successful execution. 2020-06-10 10:51:07 +00:00
Trisha Anand
7a658ce5ea App viewer user in an organization should have read:organizations permission. 2020-06-10 15:55:29 +05:30
Nikhil Nandagopal
ed37c27c67 added pagination info 2020-06-10 15:51:16 +05:30
vicky_primathon.in
e930a3963c Merge branch 'feature/widget-actions-menu' of gitlab.com:theappsmith/internal-tools-client into fix/lightning-menu 2020-06-10 15:41:12 +05:30
Trisha Anand
491afc3599 In case of global datasource, no need to check for organizationId during action create. 2020-06-10 09:08:01 +00:00
Nikhil Nandagopal
a26e8ea51c Merge branch 'release' into fix/bugs
# Conflicts:
#	cypress/integration/Smoke_TestSuite/FormWidgets/DatePicker_spec.js
2020-06-10 14:22:04 +05:30
Tejaaswini Narendra
4f34b2c502 fix: Send organizationId for embedded datasources
- show organization title in invite form
- show form when clicking on share in dropdown
- show org name in org settings page
- remove the deleted application from the UI when delete is successful
- fix role update in user list table
2020-06-10 08:29:21 +00:00
Hetu Nandu
e2eb590a86 Query pane evaluated value 2020-06-10 07:49:27 +00:00
Nikhil Nandagopal
32d934604f fixed tests 2020-06-10 12:04:46 +05:30
Trisha Anand
a89355a5ec Fixes bugs : 1. read:datasource permission should not be applied to application; 2. A user shouldn't be added to an organization if the user already exists in the organization. 2020-06-10 06:22:16 +00:00
Tejaaswini
4196f11af9 Merge branch 'release' into feature/acl 2020-06-10 11:50:54 +05:30
Arpit Mohan
3cf8ff008f Hacky fix for the postgres plugin to work. Including the dependency in the appsmith-server/pom.xml file instead of the plugin 2020-06-10 10:46:09 +05:30
Trisha Anand
ac06cc9668 1. user permissions during create/update of actions and datasources would now be set.
2. During update, policies are set to null in the update object to ensure that the policies are not overwritten to empty set.
2020-06-09 20:25:13 +05:30
Nikhil Nandagopal
2df86b79e9 fixed type def
resolved mr comments
2020-06-09 18:40:42 +05:30
Nikhil Nandagopal
7da961bcc9 fixed clearing date picker 2020-06-09 18:34:47 +05:30
Arpit Mohan
bbd33c2968 Removing the query field in ActionConfiguration and using String body as the field to store the query
This is to simplify the query pane on the frontend client. The client doesn't need to have separate interfaces for sql and non-sql plugins. All queries will be sent to the server in the form of a String that is parsed in different formats based on the plugin.

Also adding test cases for PostgresPlugin. Used TestContainers to simulate the postgres db in Docker inside the Java test itself. Very useful.
2020-06-09 12:12:27 +00:00
Tejaaswini Narendra
91efefee09 fix: Minor change
- remove return
2020-06-09 12:10:55 +00:00
Nikhil Nandagopal
9becaa9a9f made form data visible at the top level 2020-06-09 17:34:38 +05:30
Nikhil Nandagopal
97d78ba379 commented datepicker required field test 2020-06-09 16:34:04 +05:30
Hetu Nandu
6b54eb8f9e Update displayWidgetDsl.json 2020-06-09 09:44:57 +00:00
Nikhil Nandagopal
a567622e0d minor fix 2020-06-09 14:29:08 +05:30
Nikhil Nandagopal
8501ebe670 added date format to date picker 2020-06-09 14:14:13 +05:30
Nikhil Nandagopal
563c74f1a9 fixed tests failing 2020-06-09 11:55:11 +05:30
rashmipn
e2ce5f929c Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into update/Dsl 2020-06-09 11:49:10 +05:30
Rashmi P
d9639266f1 Removed Required toggle fun DatePicker_spec.js 2020-06-09 06:16:53 +00:00
Arpit Mohan
99e7519550 Handling form data via the field bodyFormData in ActionConfiguration
This is because the client sends us the data for form-data in the form of a list of Property fields with keys and values. This is consistent with how the client stores & renders headers & query parameters as well.
For MediaType application/x-www-form-urlencoded we will use the bodyFormData field.
2020-06-09 05:48:16 +00:00
Trisha Anand
061577d2c9 Bug : When the user tries to invite without selecting the role user, this leads to null pointer exception.
Fix : A user CAN NOT be invited to an organization without specifying the role.
2020-06-08 14:56:12 +00:00
Nikhil Nandagopal
79c62d4863 fixed data tree path 2020-06-08 17:56:07 +05:30
Trisha Anand
a888d54059 Changed the get all actions function to fix the bug where find by Example is not working. Instead the same has now been implemented using criteria. 2020-06-08 12:05:49 +00:00
Nikhil Nandagopal
8b0258b4b9 Merge branch 'release' into fix/bugs
# Conflicts:
#	src/pages/Editor/APIEditor/PostBodyData.tsx
2020-06-08 17:13:03 +05:30
Nikhil Nandagopal
b84384fa99 fixed filepicker not closing 2020-06-08 16:59:20 +05:30
Nikhil Nandagopal
dff9c60f9f fixed resize handles size
fixed body for url encoded form data
added defaults for dropdown and radio widget
added multipart type but hid it till we figure out logic
allowed number to be added to defaults of widgets
2020-06-08 16:39:13 +05:30
Satbir Singh
618d6180e6 Adding styled component names to dom for local env 2020-06-08 09:00:58 +00:00
Tejaaswini
5b9f4ad16f fix: Add orgId to datasource, 3P import and plugins API 2020-06-08 14:21:53 +05:30
Tejaaswini
bbdec60516 Merge branch 'release' into feature/acl 2020-06-08 13:36:15 +05:30
Trisha Anand
9ac7e817cc Merge branch 'feature/acl-remove-getCurrentOrganization' into 'feature/acl-spring-object'
Removed the usage of get current organization id. Added organization id to a few api calls.

See merge request theappsmith/internal-tools-server!367
2020-06-08 06:45:04 +00:00
Trisha Anand
a31796a216 Removed the usage of get current organization id. Requires addition of organization id to a few api calls. 2020-06-08 06:45:04 +00:00
Hetu Nandu
e401844014 Fix Chart series data 2020-06-05 16:20:23 +00:00
Trisha Anand
f02ae99af4 Merge branch 'fix/create-api' into 'feature/acl'
fix: Create API and Curl Import API

See merge request theappsmith/internal-tools-client!690
2020-06-05 13:52:08 +00:00
Tejaaswini
7c3d18b7f6 Merge branch 'feature/acl' into fix/invite-users 2020-06-05 18:58:21 +05:30
Tejaaswini
926a6caed4 fix: Create API and curl import flow 2020-06-05 18:52:30 +05:30
Trisha Anand
f9d63f9881 Adding a 3P Api to a page now also expects the client to send the organization id. 2020-06-05 16:14:15 +05:30
Trisha Anand
87aafd6cf4 Adding test case for testDatasource
Refactoring the testDatasource code by moving the business logic to the service layer.
2020-06-05 10:05:23 +00:00
Tejaaswini
81c1e0d5f4 feat: pass orgId to createDatasource APIs
- Set Current Organization Id based on the application that the user is accessing
- Send saved organization id in datasource creation APIs.
2020-06-05 14:13:01 +05:30
Tejaaswini
d33188adc1 Merge branch 'release' into feature/acl 2020-06-05 13:39:01 +05:30
rashmipn
e3729a4ea0 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into update/dsl 2020-06-05 09:18:59 +05:30
Hetu Nandu
d9540f8927 Evaluated value popup 2020-06-04 13:49:22 +00:00
Tejaaswini
7a02d62682 Merge branch 'feature/acl' into fix/invite-users 2020-06-04 19:00:47 +05:30
Tejaaswini
efad40becd fix: Update UI changes 2020-06-04 18:42:19 +05:30
Tejaaswini Narendra
81df7326c5 fix- Update minor UI changes 2020-06-04 12:15:09 +00:00
Arpit Mohan
1a68b7f561 Fixing the DSL Json for default layouts in new pages. 2020-06-04 16:13:47 +05:30
vicky_primathon.in
19b8c46cc1 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-04 16:03:40 +05:30
vicky_primathon.in
cf0fa0fd22 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-04 16:03:05 +05:30
vicky_primathon.in
b72e8ecd0f lightning menu popover placement fixed 2020-06-04 15:25:44 +05:30
Tejaaswini
6c8eaf2aad fix: Minor UI changes 2020-06-04 14:47:08 +05:30
vicky_primathon.in
0062b3182f padding added in dynamic auto complete to show lightningmenu icon reverted 2020-06-04 14:22:48 +05:30
Trisha Anand
9e1742c289 Add OrgId to the output of the api used to return all the page ids and names given an application (id or name) 2020-06-04 08:08:15 +00:00
Aditya Acharya
303363cb60 Merge branch 'Binding/ChartText' into 'release'
Binding/chart text

See merge request theappsmith/internal-tools-client!673
2020-06-04 07:50:39 +00:00
Aditya Acharya
3f10d16bfb Binding/chart text 2020-06-04 07:50:39 +00:00
Arpit Mohan
1ac69bab50 Modifying the default page name to Page1
Also creating a default empty layout when a new page is created. This ensures that the client can show the default message on new page creations.
2020-06-04 13:05:34 +05:30
Satbir Singh
11b2995387 Enabling Optimizely through ad blockers. 2020-06-04 07:13:36 +00:00
rashmipn
eea9e837fb Updated the dsl's 2020-06-04 12:32:07 +05:30
Tejaaswini
4e9685b8d5 fix-Update minor UI changes 2020-06-04 12:28:30 +05:30
rashmipn
3541d16f95 Updated the dsl 2020-06-04 12:06:21 +05:30
Hetu Nandu
44e657fe12 refactored function name
reverted binding logic
2020-06-03 17:27:24 +00:00
Tejaaswini Narendra
52e70e479f fix:Minor UI changes
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button
2020-06-03 13:54:42 +00:00
vicky_primathon.in
199e70955e Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 18:01:21 +05:30
vicky_primathon.in
3e5d7eeb34 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-03 18:00:28 +05:30
vicky_primathon.in
b38b5b3a30 lightning menu border changes 2020-06-03 17:51:18 +05:30
Satbir Singh
3b729bc470 Merge branch 'fix/react-table-widget' into 'release'
Fix/react table widget

See merge request theappsmith/internal-tools-client!599
2020-06-03 10:50:10 +00:00
Vicky Bansal
c2efa63eba Fix/react table widget 2020-06-03 10:50:10 +00:00
vicky_primathon.in
86a8c49e73 isHover state removed from dynamic auto complete 2020-06-03 15:23:32 +05:30
vicky_primathon.in
d537fbcebd Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into fix/icons-placement-issues 2020-06-03 15:22:01 +05:30
vicky_primathon.in
b7ee43da39 merge conflicts resolved 2020-06-03 15:21:07 +05:30
vicky_primathon.in
210a4f3e71 merge conflicts resolved 2020-06-03 15:19:18 +05:30
vicky_primathon.in
2f6211e01b syntax highlight for code in action selectors 2020-06-03 15:09:17 +05:30
vicky_primathon.in
5259756bf6 Merge branch 'feature/syntax-highlighting' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 12:48:40 +05:30
vicky_primathon.in
f55b76b582 Merge branch 'master' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-06-03 12:45:28 +05:30
vicky_primathon.in
b28d1e6f5f lightning menu changes merged 2020-06-03 12:44:17 +05:30
vicky_primathon.in
535706aa9b lightning menu changes merged 2020-06-03 12:41:42 +05:30
vicky_primathon.in
2a477468ed changes to fix hover issue 2020-06-03 12:40:16 +05:30
Akash N
62f003df6e Embedded Datasource
- Show path along with url in the api pane for embedded datasource
- Add store as datasource menu option for embedded datasource
- Allow users to type the  path for global datasources
- Show the base url as a tag along with the path for global datasource.
2020-06-03 05:40:48 +00:00
vicky_primathon.in
4ca1f5b02e delete icon placement fix, spacing in auto complete for lightning menu icon added 2020-06-03 10:14:11 +05:30
Aditya Acharya
2eb6d6cbe7 Merge branch 'LocatorFix' into 'release'
Locatorfix

See merge request theappsmith/internal-tools-client!672
2020-06-02 11:50:39 +00:00
vicky_primathon.in
5b43bd2d5f lightning menu user states added 2020-06-02 17:18:54 +05:30
Hetu Nandu
973af1c5e7 Single series chart data 2020-06-02 11:27:24 +00:00
acharyaaditya18
4455c98ff7 Locatorfix 2020-06-02 15:34:38 +05:30
vicky_primathon.in
e6c6556b50 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/lightning-menu 2020-06-02 14:31:44 +05:30
vicky_primathon.in
2bff98d10d lightning menu state latest changes 2020-06-02 14:31:03 +05:30
Tejaaswini Narendra
c3f1939d43 fix:Minor UI changes
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button
2020-06-02 08:11:30 +00:00
Abhinav Jha
341133a95d Add syntax highlighting component 2020-06-02 13:24:31 +05:30
vicky_primathon.in
5fd3e59f7a hover and active state in lightning menu added 2020-06-02 12:43:13 +05:30
Rashmi P
76b0c65528 Merge branch 'Add/publish-map-tests' into 'release'
added map widget publish tests

See merge request theappsmith/internal-tools-client!665
2020-06-02 06:58:15 +00:00
Rashmi P
304cc969e9 added map widget publish tests 2020-06-02 06:58:15 +00:00
Tejaaswini
17940bcfef Merge branch 'release' into feature/acl 2020-06-02 11:29:58 +05:30
rashmipn
e7edbd744b Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into Add/publish-map-tests 2020-06-02 11:27:43 +05:30
acharyaaditya18
482f347010 Locator Updated 2020-06-02 10:21:29 +05:30
Trisha Anand
f8cf87e3c8 Invite existing user to an organization works. Updated the test case for adding user to an organization as well to use the new API. 2020-06-01 17:39:27 +00:00
rashmipn
2086baed79 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into Add/publish-map-tests 2020-06-01 17:30:39 +05:30
acharyaaditya18
7fe4eff407 Dropdown Fix 2020-06-01 16:29:30 +05:30
rashmipn
6c5692d35a added map widget publsh tests 2020-06-01 14:58:39 +05:30
Akash N
e808c21a88 Fix search 2020-06-01 10:42:10 +05:30
Satbir Singh
5a1f1b63b6 Merge branch 'feature/lightning-menu-feature-flag-config' into 'release'
Adding feature flag configuration for lightning menu. (UNUSED)

See merge request theappsmith/internal-tools-client!662
2020-05-30 02:41:11 +00:00
Satbir Singh
e5995b5869 Increased width of documentation. Open link shows on hover. Increased font size of search. Adding Check request body button. 2020-05-30 02:39:18 +00:00
Abhinav Jha
1f5284bb67 Adding feature flag configuration for lightning menu. (UNUSED) 2020-05-29 23:59:03 +05:30
Tejaaswini Narendra
d3718bc28e fix:Minor UI changes
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button
2020-05-29 13:21:05 +00:00
Satbir Singh
a8ab4b5523 Compact documentation UI 2020-05-29 11:49:46 +00:00
vicky_primathon.in
0236dcd251 button text alignment fixed 2020-05-29 17:03:08 +05:30
vicky_primathon.in
c956105365 merge conflicts resolved 2020-05-29 16:59:27 +05:30
Aditya Acharya
a5454fc743 Merge branch 'Binding/PublishAdd' into 'release'
Publish Test Cases

See merge request theappsmith/internal-tools-client!655
2020-05-29 10:04:55 +00:00
Aditya Acharya
17bddbda75 Publish Test Cases 2020-05-29 10:04:55 +00:00
Rashmi P
9aa3b5f247 Add/publish bind tests 2020-05-29 10:02:03 +00:00
Tejaaswini
c2b7eb2f28 Merge branch 'release' into feature/acl 2020-05-29 13:45:02 +05:30
Satbir Singh
26717a14a6 Updated algolia for the order. 2020-05-29 12:42:35 +05:30
Hetu Nandu
2fb29290f1 Merge branch 'fix/chart-data-validation' into 'release'
Chart validations, Tabs add new tab issue fix

* Chart validation fixes
* Tab widget, adding new tab will display the same inside pane configurations

See merge request theappsmith/internal-tools-client!574
2020-05-29 06:07:56 +00:00
Vicky Bansal
747c3d5d8b Chart validations, Tabs add new tab issue fix 2020-05-29 06:07:56 +00:00
vicky_primathon.in
6d42c7fe32 all code review comments handled 2020-05-29 11:37:18 +05:30
Trisha Anand
f1e1e6959a Bug : New users aren't able to read their own user object and hence homepage doesnt load.
Fix : Added lateral permissions for user on create.
2020-05-29 05:28:30 +00:00
Satbir Singh
6a89f3acd0 Changed the popover for api creation. 2020-05-29 00:57:01 +05:30
Satbir Singh
e82696759d Changed label 2020-05-29 00:56:08 +05:30
Satbir Singh
0bf9d74a46 Changed Show Modal to Open Popup 2020-05-29 00:33:37 +05:30
Satbir Singh
5e526b9119 Changing Show Alert to Show message in tests 2020-05-29 00:29:09 +05:30
Satbir Singh
7d9b6784e5 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into fix/tweaks 2020-05-28 23:53:05 +05:30
Satbir Singh
b7b74ffd02 Feature/help 2020-05-28 18:10:26 +00:00
vicky_primathon.in
96776b746a code review changes 2020-05-28 18:40:25 +05:30
vicky_primathon.in
666ab68703 actions sub-branching in UI done. separating query and api as separate actions done. 2020-05-28 16:22:48 +05:30
Aditya Acharya
bc51f22b16 Publish/alltests 2020-05-28 10:35:54 +00:00
vicky_primathon.in
da4ed9d470 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-05-28 15:42:40 +05:30
vicky_primathon.in
63c19544e9 create new saga for createNewQueryAction 2020-05-28 15:42:02 +05:30
vicky_primathon.in
aa743dccb5 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-05-28 14:49:58 +05:30
vicky_primathon.in
611b317aed Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/lightning-menu 2020-05-28 14:49:13 +05:30
vicky_primathon.in
d218f50e6a code review changes 2020-05-28 14:48:08 +05:30
Nikhil Nandagopal
f11efcbf9a Merge branch 'fix/tweaks' of gitlab.com:theappsmith/internal-tools-client into fix/tweaks 2020-05-28 14:32:58 +05:30
Satbir Singh
830184dda0 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into fix/tweaks 2020-05-28 14:29:34 +05:30
Nikhil Nandagopal
03ff6a36f7 fixed test 2020-05-28 14:27:07 +05:30
Nikhil Nandagopal
b57701c81c removed uncommented code
fixed message
increased date range
2020-05-28 14:10:52 +05:30
Trisha Anand
d6670c70cc Bug Root Cause : New users have no applications inside the organizations(s). In this case, get all applications does not return back organizationApplications object.
Fix : In getAllApplications, instead of iterating over collections of applications which could be empty, we iterate over organizations where we are guaranteed to have atleast one organization.
2020-05-28 13:31:24 +05:30
Rashmi P
70a521a4d2 Merge branch 'Add/Publish-test-cases' into 'release'
Add/publish test cases

See merge request theappsmith/internal-tools-client!645
2020-05-28 06:37:47 +00:00
Rashmi P
57b65fc974 Add/publish test cases 2020-05-28 06:37:47 +00:00
Nikhil Nandagopal
c5e07ca45a Update EntityDefinitions.ts 2020-05-28 06:12:04 +00:00
vicky_primathon.in
263ac8aafb tree level UI updated 2020-05-28 10:02:50 +05:30
Abhinav Jha
d47e5b53d5 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/lightning-menu 2020-05-28 02:17:52 +05:30
vicky_primathon.in
24b60c7b71 Merge branch 'feature/lightning-menu' of gitlab.com:theappsmith/internal-tools-client into feature/widget-actions-menu 2020-05-27 20:43:06 +05:30
Trisha Anand
6475be63d1 Baseline code added for cascading the org level permissions to applications, pages and eventually actions. 2020-05-27 14:36:57 +00:00
Arpit Mohan
a99de4a116 Update .gitlab-ci.yml to build the code for feature/acl branch 2020-05-27 14:06:08 +00:00
Tejaaswini Narendra
913d5123b4 fix:Minor UI changes
- add ellipsis for the application title
- align org name, list of applications
- increase font size of org name
- increase size of create application icon
- add name for create application card
- remove create application button
2020-05-27 13:36:06 +00:00
Nandan H A
a102ca9d6f Removed redundant tests.
Added all verb tests to same spec file.
Added pagination test.
updated beforeEach in index file.
2020-05-27 11:21:11 +00:00
Arpit Mohan
d20e92a587 Modifying the Action object to include an array of Property for dynamicBindingPathList 2020-05-27 13:16:38 +05:30
Nikhil Nandagopal
5e136ddf7b removed common widgets 2020-05-27 11:13:14 +05:30
Aditya Acharya
1ef092b9d2 Publish/test cases 2020-05-26 12:22:29 +00:00
Arpit Mohan
9f82bde92c Adding statusCode from AppsmithPluginErrors when plugins error out
This ensures that we can always display a status code on the client.
2020-05-26 11:50:09 +00:00
Trisha Anand
59a83d414b Added description to roles for organization appsmith roles. 2020-05-26 10:49:42 +05:30
vicky_primathon.in
cfc457c0d7 create new api, query supported 2020-05-26 09:39:40 +05:30
Nikhil Nandagopal
50ec3073f8 increased date picker range
removed input icon
changed table action text
2020-05-25 17:50:55 +05:30
Nikhil Nandagopal
3211b8c915 minor text changes 2020-05-25 15:02:01 +05:30
Tejaaswini
e471706593 Merge branch 'release' into feature/acl 2020-05-25 14:47:05 +05:30
vicky_primathon.in
5987071232 disable lightning menu flag removed 2020-05-25 14:22:38 +05:30
Hetu Nandu
f7f494d9b4 Merge branch 'fix/autocomplete' into 'release'
removed properties that won't be used for bindings

See merge request theappsmith/internal-tools-client!633
2020-05-25 07:37:07 +00:00
vicky_primathon.in
7685d729ee lightning menu changes 2020-05-25 12:59:00 +05:30
Abhinav Jha
fc8384ef6e organize lightning menu code 2020-05-24 15:29:22 +05:30
Abhinav Jha
569ce718e3 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/lightning-menu 2020-05-24 14:59:23 +05:30
Abhinav Jha
9906e53623 Fix widget drop crash issue 2020-05-24 14:56:09 +05:30