Commit Graph

18100 Commits

Author SHA1 Message Date
Abhinav Jha
e326f0d870 Fix WS/WSS failure during development. 2020-05-13 19:38:39 +05:30
Arpit Mohan
9f2267ed68 Moving all redirect configuration to the netlify.toml file
This is to ensure that all Netlify redirects are in a single location and and removing _redirects file. This file was creating a problem between the proxy redirects and the catch-all redirect to index.html
2020-05-13 02:13:22 +05:30
Arpit Mohan
c432126db0 Merge branch 'feature/deploy-preview' into 'release'
Adding the nginx config for proxying deploy-previews on appsmith.com domain

This MR fixes changes the following: 
1. Cypress tests are now parallelized. Each run is recorded on `https://dashboard.cypress.io` and there are parallel threads spun up in the test phase via `.gitlab-ci.yml`. This cuts the test time down to 16 mins instead of 1 hour. On local systems, the parallelization is turned off.
2. Added nginx configuration for proxying API calls during deploy-previews. Will make reviewing features and code much easier. 
Now, there is no need of the `REACT_APP_BASE_URL` field in the `index.js` file. By default all deployments will initiate API calls via `https://<url>/api`. These calls will be proxied by Nginx in non-Netlify scenarios. For deploy previews, you can now visit: `https://<#MR>.appsmith.com` and it should load the code in that branch.
3. For Netlify deployments, made changes to the `netlify.toml` file to redirect the `/api` invocations to the appropriate endpoint. Also modified the build command in "Deploy Settings" in the Netlify console. Check that for details.
4. Now in order to run test cases locally, you will require Nginx & https to work. Check `start-https.sh` for details.
5. Added Docker tags to all master builds which allow us to revert back to previous images in production (if required)

See merge request theappsmith/internal-tools-client!521
2020-05-12 19:59:36 +00:00
Arpit Mohan
aefcf68c80 Adding the docker image for Cypress + Nginx container.
Also modifying the Gitlab CI to use local Nginx for proxying to API backend while running Cypress tests.
2020-05-12 19:59:36 +00:00
Hetu Nandu
8ca4683de7 Merge branch 'feature/dont-send-untitled-ds-name' into 'release'
Untitled datasources are named by the server

See merge request theappsmith/internal-tools-client!581
2020-05-12 15:14:29 +00:00
Hetu Nandu
d19f86ffee Untitled datasources are named by the server 2020-05-12 15:14:29 +00:00
Shrikant Kandula
1c33380820 Merge branch 'chore/rename-should-cache-field' into 'release'
Rename ActionExecutionResult.shouldCacheResponse -> isExecutionSuccess.

See merge request theappsmith/internal-tools-server!334
2020-05-12 13:50:56 +00:00
Nandan H A
1c094be437 Merge branch 'feature/API_Pane_tests' into 'release'
Feature/api pane tests

The MR contains the following tests for API Pane.

1.Basic API test with header
2.Search test
3.Copy to Home
4.Move to home
5.Delete API
6.Check API name uniqness

See merge request theappsmith/internal-tools-client!566
2020-05-12 13:47:13 +00:00
Nandan H A
c9ae4297d6 MR contains basically tests related to API pane
1.Basic API with header
2.Copy to home
3.Move to home
4.Delete API
5.Check API name uniquness
6.Search API on side bar
2020-05-12 13:47:13 +00:00
Shrikant Kandula
9c48f42990 Rename ActionExecutionResult.shouldCacheResponse -> isExecutionSuccess. 2020-05-12 18:25:49 +05:30
Arpit Mohan
d2d0805146 Merge branch 'feat/use-unique-name-on-post-datasource' into 'release'
Automatically use a unique name for creating datasources without name.

In the request from frontend for datasource creation, if the data
doesn't have a `name` value, we now set it to an automatically numbered
value and save with that.

See merge request theappsmith/internal-tools-server!333
2020-05-12 12:23:23 +00:00
Rashmi P
a83b62ea22 Fixed time Issue on date picker 2020-05-12 10:46:00 +00:00
Shrikant Kandula
b65690ec74 Automatically use a unique name for creating datasources without name.
In the request from frontend for datasource creation, if the data
doesn't have a `name` value, we now set it to an automatically numbered
value and save with that.
2020-05-12 16:05:29 +05:30
Rashmi P
76d65761f2 Formatted the json 2020-05-12 09:55:59 +00:00
Nikhil Nandagopal
5dad85ff3e Update form.json 2020-05-12 09:48:56 +00:00
Arpit Mohan
bc563e5f07 Merge branch 'test/deleteDatasource' into 'release'
Test/delete datasource

Delete datasource at the end of query flow

See merge request theappsmith/internal-tools-client!578
2020-05-12 08:10:38 +00:00
Akash N
c8ad80d414 Delete datasource after the query pane test is complete. 2020-05-12 08:10:38 +00:00
Trisha Anand
c19471ad96 Removing testing step from ci/cd pipeline for the branch feature/acl. 2020-05-12 13:32:28 +05:30
Trisha Anand
82710edbc9 Fixed the package step to run on feature/acl branch only for acl 2020-05-12 13:04:09 +05:30
Trisha Anand
aafee640bd Added CI instructions for special build and tagging of the ACL branch. 2020-05-12 13:01:29 +05:30
rashminagarajp
987d2342b0 replaced Delete Application through UI by API 2020-05-12 10:05:21 +05:30
Arpit Mohan
f4d79ae25b Merge branch 'bug/curl-error-reporting' into 'release'
Report error when cURL command is invalid.

See merge request theappsmith/internal-tools-server!327
2020-05-12 04:12:55 +00:00
Shrikant Kandula
7f4d32e7d4 Report error when cURL command is invalid. 2020-05-12 04:12:55 +00:00
Arpit Mohan
4207de2c53 Merge branch 'bug/add-mongo-auth-type-to-uri' into 'release'
Auth mechanism is not added to URI in the MongoPlugin. Fixed now.

See merge request theappsmith/internal-tools-server!330
2020-05-12 04:11:47 +00:00
Nikhil Nandagopal
0a1b965d83 Merge branch 'feature/text-widget-align' into 'release'
Adding alignment property to TextWidget

See merge request theappsmith/internal-tools-client!577
2020-05-11 16:18:07 +00:00
Trisha Anand
963a3388c3 In CI, buidling and packaging ACL branch with a new tag for the deployment. 2020-05-11 21:15:19 +05:30
Satbir Singh
14f287cb5e Removed textAlignemnt from form widget. 2020-05-11 19:52:47 +05:30
Satbir Singh
5a06911b2f Adding aligment property to TextWidget 2020-05-11 19:49:58 +05:30
Nikhil Nandagopal
1fdc96ccc6 tweaked image 2020-05-11 16:59:17 +05:30
Nikhil Nandagopal
8c08ea9257 updated default image 2020-05-11 16:58:07 +05:30
Nikhil Nandagopal
cc1ce1bba7 removed label 2020-05-11 16:30:53 +05:30
Nikhil Nandagopal
eade785bed minor text fixes
removed labels
2020-05-11 16:30:31 +05:30
rashminagarajp
a1f6b62d26 seperated after block and update replaced session_id to SESSION 2020-05-11 16:08:49 +05:30
rashminagarajp
b1a5fe41aa formatted the example.json 2020-05-11 15:40:40 +05:30
Hetu Nandu
0bcb6c85f2 Merge branch 'test/queryActions' into 'release'
Tests for query actions

See merge request theappsmith/internal-tools-client!560
2020-05-11 09:03:46 +00:00
Hetu Nandu
c2f730edb1 feat: dynamic post body in api form
- add info icon
- display helper text and placeholders dynamically
2020-05-11 09:03:46 +00:00
Shrikant Kandula
f3e448019d Auth mechanism is not added to URI in the MongoPlugin. Fixed now. 2020-05-11 12:16:09 +05:30
Rashmi P
c7cc13c50c Formatted the example.json 2020-05-11 05:15:26 +00:00
Nikhil Nandagopal
7dbe243d45 updated widget config 2020-05-09 12:25:20 +05:30
Trisha Anand
6cdab92bbe Merge branch 'feature/acl-action-inheritance' into 'feature/acl-spring-object'
Action Permission Inheritance during create.

See merge request theappsmith/internal-tools-server!329
2020-05-08 15:39:36 +00:00
Trisha Anand
b7435e546f Added action inheritance for permissions during create. No update permissions for action added. Fixed the existing test cases to run with the new code.
TODO : Add test cases for action permissions.
2020-05-08 15:39:36 +00:00
Trisha Anand
02de2ea1f6 Removing Arn because its not being used anymore. 2020-05-08 21:08:16 +05:30
Abhinav Jha
882de368eb Merge branch 'feature/propertypane-toggle-ux' into 'release'
Stop showing property pane on click

- Property pane opens when you first drag and drop a new widget
- Property pane toggles via the top right "show props" toggle
- Property pane remembers its open/close state before and after a drag/resize. For example, if the property pane was open when the user started dragging the widget, the property pane will open again once the user stops dragging.

See merge request theappsmith/internal-tools-client!565
2020-05-08 15:31:36 +00:00
Abhinav Jha
0bf035e927 Stop showing property pane on click 2020-05-08 15:31:36 +00:00
Trisha Anand
f7bb87824c Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-server/src/main/java/com/appsmith/server/domains/User.java
2020-05-08 20:57:51 +05:30
Hetu Nandu
2893e09b64 Merge branch 'fix/custom-content-type-api' into 'release'
Fix content type switching to raw when custom

See merge request theappsmith/internal-tools-client!568
2020-05-08 12:54:27 +00:00
Hetu Nandu
ff2f32290f Fix content type switching to raw when custom 2020-05-08 12:54:27 +00:00
Rashmi P
16c10daaa8 Merge branch 'release' into 'add/Smoke-test-cases'
# Conflicts:
#   cypress/support/commands.js
2020-05-08 11:12:49 +00:00
Trisha Anand
c12d83caa5 Merge branch 'feature/acl-page-inheritance' into 'feature/acl-spring-object'
Completed the loop on page inheritance from application

See merge request theappsmith/internal-tools-server!328
2020-05-08 11:07:52 +00:00
Trisha Anand
d7637355fe Create Page always sets the inherited policies from the application. Update Application policy remains to be done. Leaving it as a TODO for now. 2020-05-08 16:32:46 +05:30