Commit Graph

5314 Commits

Author SHA1 Message Date
Satbir
915da9c660 Renaming extract to evalute. 2019-12-02 15:20:25 +05:30
Arpit Mohan
7ad62e71e0 Merge branch 'release' 2019-12-02 14:24:57 +05:30
Arpit Mohan
ee2b61d251 Merge branch 'feature/header-breadcrumb-routing' into 'release'
Editor header - Breadcrumbs routing

Changes:
- The first breadcrumb is "Home" which redirects to the homepage (/)
- The second breadcrumb is "Applications" which redirects to applications (/applications)

See merge request theappsmith/internal-tools-client!175
2019-12-02 08:53:39 +00:00
Abhinav Jha
654d63e484 Editor header - Breadcrumbs routing 2019-12-02 08:53:38 +00:00
Satbir
7d4e565c7b Removed error string as a return value of evalute 2019-12-02 13:46:56 +05:30
Arpit Mohan
90f5af8eda Merge branch 'release' 2019-12-02 13:08:17 +05:30
Satbir
431d127a74 Renaming data binding regex. 2019-12-02 13:07:33 +05:30
Satbir
8cbdd84857 Renaming extractDynamicBoundValue to evaluate. 2019-12-02 13:06:20 +05:30
Satbir
2ac28cde5b Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/js-executor 2019-12-02 09:09:36 +05:30
Satbir
0324e6a745 Fixing tests. 2019-12-02 09:08:11 +05:30
Arpit Mohan
c5ce086ace Merge branch 'feature/release-base-uri' into 'release'
Checking if the name of the user is not null. Only then inserting it that field into analytics service.

See merge request theappsmith/internal-tools-server!97
2019-11-29 13:29:11 +00:00
Arpit Mohan
d8ef880a5c Checking if the name of the user is not null. Only then inserting it that field into analytics service. 2019-11-29 18:55:07 +05:30
Arpit Mohan
11c60e8103 Merge branch 'feature/release-base-uri' into 'release'
Modifying the base uri for oauth2 for release environment

Setting the release uri to `https://release-api.appsmith.com` This ensures that it's all under the appsmith domain.

See merge request theappsmith/internal-tools-server!96
2019-11-29 09:16:27 +00:00
Arpit Mohan
ba9c2f0831 Modifying the base uri for oauth2 for release environment 2019-11-29 14:42:16 +05:30
Arpit Mohan
feb9e0726f Merge branch 'feature/plugin-fields' into 'release'
Renaming executorClass to packageName and adding uiComponent field to plugin object

See merge request theappsmith/internal-tools-server!95
2019-11-29 08:18:21 +00:00
Arpit Mohan
2b959f3af4 Renaming executorClass to packageName and adding uiComponent field to plugin object
This will allow the frontend to be able to dynamically load the component based on the configuration provided in the plugin object.
2019-11-29 13:43:13 +05:30
Arpit Mohan
29258d6913 Merge branch 'feature/dsl-action-extension' into 'release'
Dsl actions now store not just the ids but also the name, plugin type and json path keys.

See merge request theappsmith/internal-tools-server!94
2019-11-29 07:16:16 +00:00
Trisha Anand
de2bd38e9d Dsl actions now store not just the ids but also the name, plugin type and json path keys. 2019-11-29 07:16:16 +00:00
Hetu Nandu
85ba2faecc Merge branch 'feature/plugin-infra' into 'release'
Add support for plugin name based filtering

Started pulling plugins from the server and showing actions and data sources depending of plugin name

See merge request theappsmith/internal-tools-client!169
2019-11-29 05:22:49 +00:00
Hetu Nandu
6cea0e80ad Add support for plugin name based filtering 2019-11-29 05:22:49 +00:00
Arpit Mohan
473bba594a Updating redis properties for heroku environment 2019-11-28 19:01:56 +05:30
Hetu Nandu
743984938d Merge branch 'fix/styleName-prop-issue' into 'release'
Renamed styleName prop to accent

Fixes #108 a weird bug with styled-components that passes down styling props to the dom.

See merge request theappsmith/internal-tools-client!167
2019-11-28 07:08:39 +00:00
Hetu Nandu
08ad87fb05 Renamed styleName prop to accent 2019-11-28 07:08:39 +00:00
Satbir
6e0155664e Removing performance.now and trace. 2019-11-28 09:29:15 +05:30
Satbir
48fa52d9ba Adding JS execution functionality. 2019-11-28 09:26:44 +05:30
Trisha Anand
3b75da393f Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-server!92
2019-11-27 11:59:20 +00:00
Arpit Mohan
8a442d429c Dummy commit to trigger Heroku deployment 2019-11-27 16:37:03 +05:30
Arpit Mohan
15e6eee725 Merge branch 'feature/filter-plugin-type' into 'release'
Adding query parameters to filter get API calls

Fixes #92 

Adding MultiValueMap in the BaseService class to ensure that all controllers support query parameters for the GET API call. Each service will have to handle this independently though. There is no generic default implementation for handling query parameters as of now. 

In the Plugin APIs handling the filtering of fetching plugins specifically by type. This should be used as a template implementation to create a generic implementation of this nature to query the db generically for a list of given fields and values. Will make future API implementations much simpler.

See merge request theappsmith/internal-tools-server!91
2019-11-27 10:51:43 +00:00
Arpit Mohan
fdb2f7a25d Adding query parameters to filter get API calls. Specifically adding filter by plugin type in the get plugins API. 2019-11-27 10:51:43 +00:00
Arpit Mohan
dea2efa776 Merge branch 'feature/oauth2-custom-url' into 'release'
Adding the base uri for google oauth2 redirect uri

This is required because when we host the server in a docker container, by default the baseUri picked up by Spring security is the DNS name of the appsmith server inside the docker networking bridge. These names may not be valid DNS names that Google can redirect to in the event of a successful Oauth2 login. Hence, we are overriding the base uri with our own uri for each environment.

The customer will have to provide this uri when they host it on their internal networks. This uri must be publicly accessible for Oauth2 to work.

See merge request theappsmith/internal-tools-server!90
2019-11-27 08:34:57 +00:00
Arpit Mohan
92ad45091d Adding the base uri for google oauth2 redirect uri
This is required because when we host the server in a docker container, by default the baseUri picked up by Spring security is the DNS name of the appsmith server inside the docker networking bridge. These names may not be valid DNS names that Google can redirect to in the event of a successful Oauth2 login. Hence, we are overriding the base uri with our own uri for each environment.

The customer will have to provide this uri when they host it on their internal networks. This uri must be publicly accessible for Oauth2 to work.
2019-11-27 13:57:01 +05:30
Trisha Anand
cfa5d57157 Merge branch 'bug/get-datasource-per-organization' into 'release'
Datasources are now returned only for the organization of the current user.

Fixes #67

See merge request theappsmith/internal-tools-server!83
2019-11-27 08:22:30 +00:00
Trisha Anand
b0452b74c6 Datasources are now returned only for the organization of the current user. 2019-11-27 08:22:29 +00:00
Trisha Anand
313b2707aa Merge branch 'feature/default-create-page-on-application-creation' into 'release'
Create application also leads to a new page being created along with it.

Closes #78

See merge request theappsmith/internal-tools-server!82
2019-11-27 08:17:46 +00:00
Trisha Anand
606c09067e Fixes the test cases : create for PageService and ApplicationService is no longer used. Instead ApplicationPageService provides createPage and createApplication for the same. Updated the test cases to use the correct service to do this. 2019-11-27 08:17:46 +00:00
Arpit Mohan
e492bf2622 Fixing stupid bug in action execution timeout. Applying only on the action execution instead of the whole execute function 2019-11-27 02:10:01 +05:30
Arpit Mohan
1637d2c7c2 Merge branch 'hotfix/action-execution-timeout-bug' into 'release'
Fixing action execution timeout bug which was defaulting the execution timeout to 0 instead of 10.

See merge request theappsmith/internal-tools-server!89
2019-11-26 12:52:54 +00:00
Arpit Mohan
ca4ff6a28b Fixing action execution timeout bug which was defaulting the execution timeout to 0 instead of 10.
Now if we provide a null / negative value to action execution timeout, it'll default to 10s
2019-11-26 18:19:12 +05:30
Arpit Mohan
bd1373cd10 Merge branch 'feature/name-instead-of-id-for-page-application' into 'release'
Use page and application names instead of ids

Fixes #85

We now introduce the ability to fetch application & page details via their names and not just with the ids. This is to ensure that the frontend can navigate through pages and applications using just the name. It's a lot more user friendly.

See merge request theappsmith/internal-tools-server!81
2019-11-26 12:21:20 +00:00
Trisha Anand
7e6e19e14e PageController : Find pages by application name instead of application id. This first fetches the application from name and then fetches pages using the application id. 2019-11-26 12:21:20 +00:00
Abhinav Jha
a9839326c5 Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!168
2019-11-26 11:56:20 +00:00
Trisha Anand
6a16c34583 Merge branch 'feature/plugin-execution-timeout' into 'release'
Feature/plugin execution timeout

Action execution timeout can now be configured inside actionConfiguration. If the execution takes longer than the configured value (or default 10s) an error with message "Plugin Execution timed out." is returned.

Fixes #61 

See merge request theappsmith/internal-tools-server!88
2019-11-26 11:34:27 +00:00
Trisha Anand
0fd6351a76 Added timeout on the plugin execution.
Next TODO : Make the timeout duration configurable
2019-11-26 11:34:27 +00:00
Abhinav Jha
0ffe94a298 Merge branch 'feature/catch-dsl-errors' into 'release'
Fix published dialog not opening issue. Add try catch around Canvas

Closes #325 and #324

See merge request theappsmith/internal-tools-client!166
2019-11-26 10:45:46 +00:00
Abhinav Jha
5051bd74b8 Fix published dialog not opening issue. Add try catch around Canvas 2019-11-26 10:45:46 +00:00
Abhinav Jha
ef631e3971 Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!165
2019-11-26 05:32:10 +00:00
Abhinav Jha
74a240a4d9 Merge branch 'feature/api-environment-integration' into 'release'
Update API Environment URLs based on environment variables

Closes #316

See merge request theappsmith/internal-tools-client!161
2019-11-25 12:22:05 +00:00
Abhinav Jha
144ea65ca3 Update API Environment URLs based on environment variables 2019-11-25 12:22:05 +00:00
Hetu Nandu
ce2c6af4b4 Merge branch 'fix/form' into 'release'
Drafts in API Pane

Closes: #285 #223 #142 #224 #231 #176 #198 #249 #98 #248 #237 #233 #276 #178 #281 

* #223, #142: Added feature to save drafts of apis which are indicated by an orange dot next to it
* #285 #224: Added better routing in the api pane to save last visited api and selecting by default
* #231: Fixed button disabled state
* #176: Adding 2 headers and param rows by default
* #198 #98: Adding a default name for api `Action{Number}`
* #249: Fixed multiple scrolls in the response view
* #248 #237 #233 #276 : Fixed validations
* #178: Disable post body in GET
* #281: Disable Code Editor context menu

See merge request theappsmith/internal-tools-client!158
2019-11-25 09:15:12 +00:00
Hetu Nandu
1825fd7a19 Drafts in API Pane 2019-11-25 09:15:11 +00:00