Commit Graph

18100 Commits

Author SHA1 Message Date
Hetu Nandu
e6dc611833 Merge branch 'fix/js-switch' into 'release'
Fix js toggle issues

See merge request theappsmith/internal-tools-client!349
2020-03-16 07:59:08 +00:00
Hetu Nandu
855b49caee Fix js toggle issues 2020-03-16 07:59:07 +00:00
Satbir Singh
046ccf13cb Merge branch 'fix/navigate-to-page' into 'release'
Fixing navigate to page

See merge request theappsmith/internal-tools-client!379
2020-03-16 07:39:50 +00:00
Arpit Mohan
1f35bd6a07 Adding the policy hierarchy graph and the lateral policy graph
These graphs help us map policies that are inherited from the parent and also lateral policies that are assigned to the users given that the user has a particular permission. Currently, the hierarchy has been defined for org & application. Need to cascade it to more documents such as pages & actions.
2020-03-16 10:46:28 +05:30
Satbir Singh
f5f225157c Fixing navigate to page 2020-03-16 10:45:21 +05:30
Abhinav Jha
4b9d8a9d43 Merge branch 'feature/graph-components' into 'release'
Feature/graph components

Support for Graph components, Line|Bar|Pie|Area|Column graphs added

See merge request theappsmith/internal-tools-client!334
2020-03-13 12:06:42 +00:00
Vicky Bansal
adb7065b99 Feature/graph components 2020-03-13 12:06:41 +00:00
Trisha Anand
edd640a722 isJsConvertible is a boolean, not a string 2020-03-13 15:26:15 +05:30
Trisha Anand
89a9baebac Added label isJsConvertible to the config 2020-03-13 15:25:20 +05:30
Hetu Nandu
afab653228 Merge branch 'fix/page-load-trigger-loading' into 'release'
Fix page load not triggering

See merge request theappsmith/internal-tools-client!377
2020-03-13 09:34:19 +00:00
Hetu Nandu
af247a181e trigger loading 2020-03-13 14:47:04 +05:30
Hetu Nandu
e6e2dd95db Merge branch 'fix/app-initialization' into 'release'
Fix Page load actions on app switch issue

See merge request theappsmith/internal-tools-client!376
2020-03-13 07:35:45 +00:00
Hetu Nandu
f30845a17b Merge branch 'fix/form-issues' into 'release'
Fix issues with Form Widget

See merge request theappsmith/internal-tools-client!373
2020-03-13 07:24:03 +00:00
Hetu Nandu
3faf95b882 Fix issues with Form Widget 2020-03-13 07:24:03 +00:00
Arpit Mohan
a892ee90b5 Merge release branch 2020-03-13 12:47:16 +05:30
Hetu Nandu
1bd5a8c5e7 fix page load actions issues 2020-03-13 01:57:39 +05:30
Trisha Anand
96ca03f852 Merge branch 'hotfix/categories-arraylist' into 'release'
Get all categories now return Mono of List instead of Flux.

See merge request theappsmith/internal-tools-server!226
2020-03-12 14:35:42 +00:00
Trisha Anand
1d404cb9bf Get all categories now return Mono of List instead of Flux. 2020-03-12 20:01:43 +05:30
Trisha Anand
7c1434e274 Merge branch 'feature/action-provider-fields' into 'release'
Transient Provider fields added in Action which are filled before an Action is read.

See merge request theappsmith/internal-tools-server!225
2020-03-12 13:21:03 +00:00
Trisha Anand
2543be8668 Provider fields added with the transient property which is set for Actions when they are read. 2020-03-12 18:46:30 +05:30
Arpit Mohan
cc676e3393 Merge branch 'feature/mono-cache' into 'release'
Correcting the writeKey for Segment in Staging

Also adding Mono.cache in the user invite flow to ensure that the same Mono is not executed multiple times.

See merge request theappsmith/internal-tools-server!224
2020-03-12 11:18:22 +00:00
Arpit Mohan
0c5fc27450 Correcting the writeKey for Segment in Staging
Also adding Mono.cache in the user invite flow to ensure that the same Mono is not executed multiple times.
2020-03-12 16:44:31 +05:30
Satbir Singh
2b2672af57 Merge branch 'release' into 'master'
Release to master

See merge request theappsmith/internal-tools-client!372
2020-03-12 02:22:10 +00:00
Trisha Anand
2a8da8293c Merge branch 'feature/rapid-api-plugin' into 'release'
Fixing null pointer exception during add to page

See merge request theappsmith/internal-tools-server!222
2020-03-11 19:31:22 +00:00
Trisha Anand
6050b370d4 1. Add to Page changes : In case the sample response is null, don't set the cached response for the action.
2. Add to Page changes : Documentation object has been added in Action to handle the extra Template documentation for actions that have been imported from 3p marketplace
3. Added basic structure for rapid api plugin by copy pasting the rest api plugin
2020-03-11 19:31:21 +00:00
Trisha Anand
5927271c71 Merge branch 'feature/rapid-api-plugin' into 'release'
Partial Rapid API Plugin + Minor bug fix.

See merge request theappsmith/internal-tools-server!218
2020-03-11 17:16:15 +00:00
Trisha Anand
b17fae8e44 1. Add to Page changes : In case the sample response is null, don't set the cached response for the action.
2. Add to Page changes : Documentation object has been added in Action to handle the extra Template documentation for actions that have been imported from 3p marketplace
3. Added basic structure for rapid api plugin by copy pasting the rest api plugin
2020-03-11 17:16:15 +00:00
Nikhil Nandagopal
a83518d2ec Merge branch 'hotfix/filepicker' into 'release'
fixed mb to byte conversion

See merge request theappsmith/internal-tools-client!374
2020-03-11 14:40:35 +00:00
Nikhil Nandagopal
c98e3dc7c2 fixed mb to byte conversion 2020-03-11 20:07:12 +05:30
Satbir Singh
e1cc6f84db Merge branch 'feature/nav-events' into 'release'
More events

* PAGE_LOAD
* NAVIGATE
* SIGNUP_CLICK
* LOGIN_CLICK
* DELETE_API_CLICK
* SAVE_API_CLICK
* RUN_API_CLICK
* NAVIGATION_EDITOR
* Renaming applications page to home.
* PAGE_SWITCH on header dropdown
* Added didDrop to WIDGET_CARD_DROP, WIDGET_CARD_DROP
* Removed PREVIEW_APP event because the feature isn't implemented.

See merge request theappsmith/internal-tools-client!365
2020-03-11 13:59:46 +00:00
Satbir Singh
cfb967117c More events 2020-03-11 13:59:46 +00:00
Trisha Anand
f5eab5b5cf Merge branch 'feature/get-categories-marketplace' into 'release'
Get all categories for provider added & get providers without category returns Business Software only

See merge request theappsmith/internal-tools-server!221
2020-03-11 13:03:50 +00:00
Trisha Anand
668b91665d 1. Added an endpoint to get all categories.
2. When provider is being fetched without a category, only Business Software category providers are returned.
2020-03-11 13:03:48 +00:00
Arpit Mohan
ec7e2c67b5 Merge branch 'feature/remove-document-version' into 'release'
Removing document version from all the Mongo documents.

The version field is causing too many OptimisticLockFailureExceptions when we save or update documents in the DB.

Also adding Origin header to the user invite flow so that we can send the correct links to the user

See merge request theappsmith/internal-tools-server!220
2020-03-11 12:55:50 +00:00
Arpit Mohan
2da4727cbd Removing document version from all the Mongo documents.
Also adding Origin header to the user invite flow so that we can send the correct links to the user
2020-03-11 18:18:10 +05:30
Nikhil Nandagopal
3b01de3187 Merge branch 'hotfix/filepicker' into 'release'
added label for file picker

See merge request theappsmith/internal-tools-client!371
2020-03-11 12:06:05 +00:00
Arpit Mohan
c428032a8b Trying to get docker:dind to work on Gitlab CI
At the moment Gitlab CI is failing because it's unable to find the docker service
2020-03-11 16:38:56 +05:30
Arpit Mohan
edd4d7c362 Using gitlab CI environment variable for Git SHA instead of the git command 2020-03-11 15:20:35 +05:30
Arpit Mohan
21af31fb4f Merge branch 'fix/cypress-permissions' into 'release'
Fix cypress permissions.

- Make `cypress/test.sh` executable
- Add `cypress/videos` and `results` to `.gitignore`. These are cypress test results.

See merge request theappsmith/internal-tools-client!370
2020-03-11 09:39:10 +00:00
Arpit Mohan
c9f8e297f9 Merge branch 'feature/docker-build' into 'release'
Docker Build and Gitlab CI

1. Adding the Dockerfile to build the appsmith-editor image and upload it to our Appsmith DockerHub account when code is merged into release/master.
2. dding the .gitlab-ci.yml file to run Cypress test cases on all merge requests. This ensures that we can continue to improve code quality with each merge.
3. Increasing the memory requirement during `craco build` to 4096 else it doesn't build in a container environment.

See merge request theappsmith/internal-tools-client!366
2020-03-11 09:24:18 +00:00
Arpit Mohan
bb7633f5a6 Adding Docker build and cypress testing for all MRs, release & master branches. 2020-03-11 09:24:17 +00:00
Abhinav Jha
6b2e9dbfa5 Fix cypress permissions. 2020-03-11 14:51:08 +05:30
Nikhil Nandagopal
b64a456b92 added label for file picker 2020-03-11 13:47:21 +05:30
Nikhil Nandagopal
0e8aa2ecb6 Merge branch 'hotfix/filepicker' into 'release'
Hotfix/filepicker

See merge request theappsmith/internal-tools-client!369
2020-03-11 06:53:13 +00:00
Arpit Mohan
bfea59f354 Merge branch 'feature/email-templates' into 'release'
Updating the communication emails to users for signup, forgot password and invite user flows

Also adding the Origin header to the BaseController create function. This is required by the user creation flow in order to customize the links in the email. For most of the controllers overriding the BaseController, the request header parameter is non-mandatory and can be skipped for testing or otherwise.

See merge request theappsmith/internal-tools-server!219
2020-03-10 13:56:42 +00:00
Arpit Mohan
68fd2f21d9 Updating the communication emails to users for signup, forgot password and invite user flows
Also adding the Origin header to the BaseController create function. This is required by the user creation flow in order to customize the links in the email. For most of the controllers overriding the BaseController, the request header parameter is non-mandatory and can be skipped for testing or otherwise.
2020-03-10 18:58:28 +05:30
Nikhil Nandagopal
4eed03d370 Merge branch 'hotfix/filepicker' into 'master'
minor fix

See merge request theappsmith/internal-tools-client!367
2020-03-10 10:45:17 +00:00
Nikhil Nandagopal
ca6434430f minor fix 2020-03-10 16:12:04 +05:30
Pushpa B
b1bb4eb73e Merge branch 'feature/cypress-test' into 'release'
Feature/cypress test

Cypress test automation for Login and publish app. added cypress test before pre-push

See merge request theappsmith/internal-tools-client!333
2020-03-10 09:38:13 +00:00
Pushpa B
067fdc2dee Feature/cypress test 2020-03-10 09:38:12 +00:00