Commit Graph

1145 Commits

Author SHA1 Message Date
rashminagarajp
f46e30a4e1 resolved json conflict 2020-05-18 11:26:27 +05:30
rashminagarajp
56414e3d2c resolved conflicts 2020-05-18 11:04:49 +05:30
rashminagarajp
261ac07367 fixed date picker issue 2020-05-18 09:58:41 +05:30
Arpit Mohan
a54a68832b Merge branch 'newTest/create' into 'release'
Adding UI binding test cases for widgets

See merge request theappsmith/internal-tools-client!592
2020-05-16 07:28:13 +00:00
Aditya Acharya
3286b7f808 Adding UI binding test cases for widgets 2020-05-16 07:28:13 +00:00
Arpit Mohan
be113dd069 Merge branch 'fix/queryPane' into 'release'
Fix/query pane

- Show mongo execute response in seperate cards for each record
- Update postgres read template
- Show query execute error message in the UI.

See merge request theappsmith/internal-tools-client!595
2020-05-16 07:22:25 +00:00
rashminagarajp
3a506e133c comments ressolved 2020-05-15 18:15:08 +05:30
rashminagarajp
31ca946199 ressolved comments 2020-05-15 17:50:09 +05:30
Abhinav Jha
8de960bd91 Merge branch 'fix/clear-date' into 'release'
app crashing on date clear issue fix

Fixed app crash issue on clearing date from date widget

See merge request theappsmith/internal-tools-client!596
2020-05-15 07:02:02 +00:00
Rashmi P
0928af03b0 separated the tests in Bind_tableApi_spec.js 2020-05-14 16:06:47 +00:00
Rashmi P
f674c1db1b changed the table dsl tableWidgetDsl.json 2020-05-14 14:26:52 +00:00
vicky_primathon.in
8b90cbd577 app crashing on date clear issue fix 2020-05-14 19:30:22 +05:30
Akash N
5db021d8d3 Merge branch 'release' of https://gitlab.com/theappsmith/internal-tools-client into fix/queryPane 2020-05-14 18:11:35 +05:30
Akash N
6bd79982fb 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-05-14 18:03:44 +05:30
Rashmi P
c8ec8c9032 debug Bind_tableApi_spec.js 2020-05-14 12:20:12 +00:00
Rashmi P
d5a24cd03c Replaced create api fun commands.js 2020-05-14 11:02:41 +00:00
Rashmi P
41752ed879 Fixed clean up in DatePicker_spec.js 2020-05-14 10:15:09 +00:00
rashminagarajp
8e3c16f3e5 Added Table with Api Bind test case 2020-05-14 14:46:39 +05:30
Arpit Mohan
d4a8352799 Merge branch 'fix/queryDropdown' into 'release'
Fix create datasource button in query dropdown

See merge request theappsmith/internal-tools-client!583
2020-05-14 07:27:00 +00:00
Akash N
1c34a5dfb4 Fix create datasource button in query dropdown 2020-05-14 07:27:00 +00:00
Arpit Mohan
8b0ec391eb Merge branch 'hotfix/deploy-preview-netlify' into 'release'
Adding the environment variables for the deploy-preview environments.

See merge request theappsmith/internal-tools-client!591
2020-05-14 07:12:08 +00:00
Arpit Mohan
24af3dbfc3 Adding the environment variables for the deploy-preview environments. 2020-05-14 12:13:32 +05:30
Hetu Nandu
4be7ff546a Merge branch 'fix/query-execution' into 'release'
Action execution success is determined by "data.isExecutionSuccess" field

See merge request theappsmith/internal-tools-client!580
2020-05-14 06:33:23 +00:00
Hetu Nandu
859abb0443 Action execution success is determined by "data.isExecutionSuccess" field 2020-05-14 06:33:23 +00:00
Abhinav Jha
ea34a65049 Merge branch 'fix/close-propertypane-onblur' into 'release'
Property pane toggle scenario

- Close property pane when clicking outside the property pane. 
- Select widget when toggling open the property pane.

See merge request theappsmith/internal-tools-client!588
2020-05-14 06:13:44 +00:00
Abhinav Jha
b3214151e0 Merge branch 'feature/back-to-editor-button' into 'release'
Back to editor button

- Show grid when starting to drag a widget on an empty canvas.
- Show placeholder on an empty canvas
- Add "Back to editor" button on appviewer's header
- Show empty page placeholder in app viewer.

See merge request theappsmith/internal-tools-client!589
2020-05-14 06:06:20 +00:00
Abhinav Jha
e617957ce8 Back to editor button 2020-05-14 06:06:20 +00:00
Rashmi P
487e9d95b0 Merge branch 'add/Smoke-test-cases' into 'release'
Add/smoke test cases

See merge request theappsmith/internal-tools-client!569
2020-05-14 05:30:54 +00:00
rashminagarajp
052cf49d86 Changed the End points related to https://dev.appsmith.com 2020-05-14 10:40:36 +05:30
Arpit Mohan
a2086ff61b Fixing minor issue with gitlab-ci.yml file that wasn't packaging the Docker image because of runner tag 2020-05-14 08:54:45 +05:30
Arpit Mohan
b94d3e3be8 Merge branch 'fix/content-type-case-check' into 'release'
fix: content-type case check

- do a toLowerCase() before running a check for "content-type" in headers
- truncate api endpoint for provider templates

See merge request theappsmith/internal-tools-client!571
2020-05-13 18:20:53 +00:00
Sunil KS
9dda30f729 fix: content-type case check
- do a toLowerCase() before running a check for "content-type" in headers
- truncate api endpoint for provider templates
2020-05-13 18:20:53 +00:00
Arpit Mohan
b225ca52f8 Merge branch 'fix/dev-hot-reload' into 'release'
Fix WS/WSS connection failure during development.

- With nginx not forwarding web socket connections, local webpack hot reloading was failing. Added nginx configurations to fix this.

See merge request theappsmith/internal-tools-client!587
2020-05-13 16:13:13 +00:00
Abhinav Jha
591a5d3eff Close property pane when clicking outside the property pane. Select widget when toggling open the property pane. 2020-05-13 19:58:27 +05:30
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
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
Rashmi P
a83b62ea22 Fixed time Issue on date picker 2020-05-12 10:46:00 +00:00
Rashmi P
76d65761f2 Formatted the json 2020-05-12 09:55:59 +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
rashminagarajp
987d2342b0 replaced Delete Application through UI by API 2020-05-12 10:05:21 +05:30
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
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