Commit Graph

698 Commits

Author SHA1 Message Date
Trisha Anand
781788f4a3 Extracting mustache keys from layout and finding all the action names from the same. This is then stored to the layout 2019-11-21 07:30:07 +00:00
Trisha Anand
e55ae48396 Merge branch 'release' into 'master'
Release to Master

See merge request theappsmith/internal-tools-server!84
2019-11-21 06:58:10 +00:00
Trisha Anand
89d77ed0e0 Merge branch 'feature/unique-page-name' into 'release'
Adding unique constraints in the mongo db collections using composite keys.

See merge request theappsmith/internal-tools-server!79
2019-11-19 09:02:14 +00:00
Trisha Anand
9a4fea1c56 Updates for getting the test cases for Organization service to run. Since unique name is a new constraint added, the old test cases didnt account for the same. 2019-11-19 09:02:14 +00:00
Trisha Anand
3ce4326b1c Merge branch 'feature/action-valid-flag' into 'release'
Allow creation of invalid actions and datasources

Closes #82

See merge request theappsmith/internal-tools-server!75
2019-11-18 12:20:10 +00:00
Trisha Anand
44e17eef7b Added fields : flag isValid & string array of invalids to track if an action/datasource is invalid and what are the invalidities. This allows for the creation of actions and datasources even if they are invalid. Each update to the object leads to new computation of the validity.
When executing the isValid flag is tested and if false, the execution is stopped.
2019-11-18 12:20:10 +00:00
Arpit Mohan
c5445533f3 Merge branch 'master' into 'release'
Merging master into release to sync up the branches

See merge request theappsmith/internal-tools-server!78
2019-11-18 08:46:59 +00:00
Arpit Mohan
5f43918cee Merge branch 'feature/release-gitlab-ci' into 'release'
Creating docker images from the release and master branches

We now create docker images from the release and master branches and publish this to Docker hub. This is done to ensure that we can setup separate environments for production and staging. Required for stability and testing. This has been done by creating a Docker image by invoking the Dockerfile via the .gitlab-ci.yml file. The master branch will push to the release tag while the release branch will push to the release tag.

See merge request theappsmith/internal-tools-server!77
2019-11-14 12:50:37 +00:00
Arpit Mohan
8fbf61502f Creating dockerfile that creates the server image.
Also modifying .gitlab-ci file to push docker image to the registry
2019-11-14 12:50:37 +00:00
Trisha Anand
0184bc42b6 Merge branch 'feature/plugin-datasource-validation' into 'master'
Datasource validation as part of plugin functionality

See merge request theappsmith/internal-tools-server!70
2019-11-14 08:50:02 +00:00
Trisha Anand
31cf94f08e 1. Added datasource validator function in the plugin interface which simply returns true for all the current plugins.
2. Added static method getPluginExecutor as a util function which removes duplicate code from across different files.
2019-11-14 08:50:02 +00:00
Arpit Mohan
98662714dc Merge branch 'feature/view-published-page' into 'master'
Endpoint to view published page using just PageId

Fixes #83 

We now return all the published layouts for a given pageId in the view mode. In the future, we will whittle the layouts down based on query parameters and other factors to return a single layout in the published page. Today, since most pages only have a single layout, there is no performance impact.

See merge request theappsmith/internal-tools-server!76
2019-11-14 07:06:34 +00:00
Arpit Mohan
f62cd1f21a Endpoint to view published page using just PageId. The layoutId is no longer required. 2019-11-14 07:06:34 +00:00
Arpit Mohan
9267d00d22 Merge branch 'bug/action-with-name' into 'master'
Action only with name now supported

See merge request theappsmith/internal-tools-server!72
2019-11-13 12:26:12 +00:00
Trisha Anand
0d21680f08 Action only with name now supported 2019-11-13 12:26:12 +00:00
Arpit Mohan
4b1f673584 Merge branch 'feature/property-pane-get-api' into 'master'
Adding CRUD API for configurations. The name for the config will be unique across the dataset

Moving the propertyPane API to the config API because it's more generic. Now we will be able to fetch properties using the name of the config parameter. This will allow us to store all the configurations in a single location. This is a more extensible design.

TODO: We still have to make the datastructure of the Config domain more generic. At the moment, it's meant to help the client transition from the older `propertyPane` API to the new `config` API.

See merge request theappsmith/internal-tools-server!71
2019-11-13 12:17:33 +00:00
Arpit Mohan
f4daa33493 Adding CRUD API for configurations. The name for the config will be unique across the dataset. 2019-11-13 12:17:32 +00:00
Arpit Mohan
72497e927c Merge branch 'feature/user-multi-orgs' into 'master'
User association with multiple organizations

Fixes #68 

A user can now be associated to multiple organizations. By default the first organization that the user joins is the default one. The user can then switch between these organizations and work on them independently. At a given time though, the user will be operating on a single organization in a login session.

See merge request theappsmith/internal-tools-server!57
2019-11-13 10:23:23 +00:00
Trisha Anand
f81e22b1a5 Adding the capability to associate a user with multiple organizations 2019-11-13 10:23:23 +00:00
Trisha Anand
ea5a892da3 Merge branch 'bug/empty-datasource' into 'master'
Datasource without any configuration is not valid. Deter the user from...

Closes #77

See merge request theappsmith/internal-tools-server!69
2019-11-13 06:08:36 +00:00
Trisha Anand
55a29c448c Datasource without any configuration is not valid. Deter the user from creating one in such a scenario 2019-11-13 06:08:36 +00:00
Trisha Anand
0a80fe8d7f Merge branch 'bug/api-names-without-space' into 'master'
Api name validation : Don't allow whitespace

Closes #76

See merge request theappsmith/internal-tools-server!66
2019-11-13 05:51:01 +00:00
Trisha Anand
df904539ca Datasource instead of DatasourceId is expected as part of Action. During create and update action, datasource can also be created, which is automatically saved as part of datasource collection 2019-11-13 05:51:01 +00:00
Trisha Anand
923159e2cd Merge branch 'bug/api-sort-by-name' into 'master'
Get all actions returns them in sorted order

Closes #74

See merge request theappsmith/internal-tools-server!68
2019-11-12 09:59:31 +00:00
Trisha Anand
41be720335 Get all actions returns them in sorted order 2019-11-12 09:59:29 +00:00
Trisha Anand
f1878d63ab Merge branch 'feature/redis-session' into 'master'
Redis used for session persistence

See merge request theappsmith/internal-tools-server!67
2019-11-12 09:58:14 +00:00
Trisha Anand
cb4493dc2d Datasource instead of DatasourceId is expected as part of Action. During create and update action, datasource can also be created, which is automatically saved as part of datasource collection 2019-11-12 09:58:14 +00:00
Trisha Anand
54fb13d332 Merge branch 'feature/action-resource-included' into 'master'
Adding datasource as part of action for create/update action, execute action

Closes #60

See merge request theappsmith/internal-tools-server!65
2019-11-12 09:15:09 +00:00
Trisha Anand
e6d9f1df88 Datasource instead of DatasourceId is expected as part of Action. During create and update action, datasource can also be created, which is automatically saved as part of datasource collection 2019-11-12 09:15:09 +00:00
Arpit Mohan
aac31235f6 Merge branch 'master' of gitlab.com:theappsmith/internal-tools-server
# Conflicts:
#	appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
#	appsmith-server/src/main/java/com/appsmith/server/services/ResourceContextServiceImpl.java
2019-11-07 14:28:09 +05:30
Trisha Anand
83b30a2d36 Merge branch 'bug/rest-api-query-params' into 'master'
Query param handling has been added to Rest API plugin using URIComponentsBuilder

See merge request theappsmith/internal-tools-server!63
2019-11-06 12:30:56 +00:00
Trisha Anand
63c0f07708 Query param handling has been added to Rest API plugin using URIComponentsBuilder 2019-11-06 12:30:56 +00:00
Arpit Mohan
bcda3f0feb Renaming all the references of resource to datasource
This renaming is reflective of the entity and it's potential values in the future.
2019-11-06 16:25:08 +05:30
Arpit Mohan
c283b1eddb Merge branch 'hotfix/null-request-body' into 'master'
Handling null values in the request body

See merge request theappsmith/internal-tools-server!62
2019-11-05 12:25:09 +00:00
Arpit Mohan
a61b9ab325 Handling null values in the request body 2019-11-05 12:25:08 +00:00
Trisha Anand
12b4450eda Merge branch 'bug/get-pages-application' into 'master'
Bug/get pages application

See merge request theappsmith/internal-tools-server!61
2019-11-05 11:49:52 +00:00
Trisha Anand
3c1b08d911 Page Controller now can return list of pages by application id and list of page names & ids by application id 2019-11-05 11:49:52 +00:00
Arpit Mohan
f75b94ed43 Merge branch 'bug/get-pages-application' into 'master'
Get Pages by application ID & Get Page names by application ID

See merge request theappsmith/internal-tools-server!60
2019-11-05 11:36:10 +00:00
Trisha Anand
3f968afac6 Page Controller now can return list of pages by application id and list of page names & ids by application id 2019-11-05 11:36:10 +00:00
Arpit Mohan
f493d8c3ae Merge branch 'feature/datasource-resource-naming' into 'master'
Adding ACL bundle for datasources API

See merge request theappsmith/internal-tools-server!59
2019-11-05 11:09:08 +00:00
Arpit Mohan
0c0956ca46 Adding ACL bundle for datasources API 2019-11-05 16:36:09 +05:30
Arpit Mohan
29c7b7cc01 Merge branch 'feature/mustache-key-extraction' into 'master'
Extract mustache keys from action object

When an action is created, we extract the mustache keys from various parts of the action and save it in the field `jsonPathKeys`. This same thing also happens in the update flow.

Since mustache library doesn't have an extraction function, we use a regex template to extract those keys.

We also modify the data type of the `body` parameter in the `ActionConfiguration` to String. This is because there are reserved characters that are not allowed as Mongo keys but are valid JSON keys. Converting to a string will remove all these problems.

Fixes #31 

See merge request theappsmith/internal-tools-server!58
2019-11-05 10:40:09 +00:00
Arpit Mohan
3622d8b0d3 Converting actionConfiguration to a string to extract mustache keys
Also making jsonPathKeys a read-only field. Cannot be written via the API.
2019-11-05 10:40:09 +00:00
Trisha Anand
460c15eb68 Merge branch 'feature/apiCollection' into 'master'
feature/Collection

See merge request theappsmith/internal-tools-server!50
2019-11-05 09:39:54 +00:00
Trisha Anand
00fa2e80f7 Added ActionCollectionService which would act on composite functions. Need to handle all scenarios here. 2019-11-05 09:39:54 +00:00
Trisha Anand
cdf3c720de Merge branch 'bug/72' into 'master'
Fix for dsl getting rewritten

See merge request theappsmith/internal-tools-server!56
2019-11-05 07:37:39 +00:00
Trisha Anand
bd846bfc8d Fix for dsl getting rewritten 2019-11-05 07:37:39 +00:00
Trisha Anand
9fa01ab06a Merge branch 'bug/73' into 'master'
Handles empty params in a request

See merge request theappsmith/internal-tools-server!55
2019-11-05 05:51:14 +00:00
Trisha Anand
68e30ff297 Handles empty params in a request 2019-11-05 05:51:14 +00:00
Trisha Anand
566a56778a Merge branch 'bug/restApi' into 'master'
Bug/rest api

Closes #70

See merge request theappsmith/internal-tools-server!54
2019-11-04 11:20:18 +00:00