Commit Graph

18234 Commits

Author SHA1 Message Date
Satbir Singh
a260b9f621 Fixing the application header issue. 2020-03-06 15:45:26 +05:30
Hetu Nandu
7360387281 Merge branch 'feature/form-widget' into 'release'
Form Widget

See merge request theappsmith/internal-tools-client!336
2020-03-06 09:45:21 +00:00
Hetu Nandu
d9dee9b16d Form Widget 2020-03-06 09:45:21 +00:00
Nikhil Nandagopal
eef83cb482 Merge branch 'feature/file-picker' into 'release'
file picker fixes

See merge request theappsmith/internal-tools-client!354
2020-03-06 09:41:13 +00:00
Abhinav Jha
5e662d1bfc Merge branch 'fix/P0-issues-4-single-click' into 'release'
Fix/p0 issues 4 single click

- Fix invite users issue where selecting the roles dropdown used to cause a page reload.
- Remove DropTargetMask Component. Use DragLayerComponent to render Grids
- Fix canvas width to 1224px
- Fix n-1 page save issue. This issue caused the previous state of the canvas to be saved. Resulting in the latest changes not being reflected in the published view and on reload
- Remove Roboto font. It is not being used, however, was being downloaded
- Increase the min bottom row offset for the main container to 5.

See merge request theappsmith/internal-tools-client!353
2020-03-06 09:33:20 +00:00
Abhinav Jha
e3d63f0b22 Remove roboto font. Change the property pane toggling mechanism. Increase max bottom row offset for main container from 2 to 5. Fix padding and offsets for the widget border component, resize handles. 2020-03-06 09:33:20 +00:00
Nikhil Nandagopal
f945236b88 Merge branch 'release' into feature/file-picker 2020-03-06 14:51:24 +05:30
Nikhil Nandagopal
0e98e4738a file picker fixes 2020-03-06 14:50:18 +05:30
Satbir Singh
e28637b1e3 Merge branch 'feature/analytics-staging' into 'release'
Separating segment for production and staging.

See merge request theappsmith/internal-tools-client!350
2020-03-06 08:14:59 +00:00
Satbir Singh
4c392c9c92 Separating segment for production and staging. 2020-03-06 08:14:59 +00:00
Satbir Singh
02a01c700a Merge branch 'fix/login-struct-change' into 'release'
Updating login structure as per backend

See merge request theappsmith/internal-tools-client!351
2020-03-06 06:54:44 +00:00
Satbir Singh
c2dcc435dc Updating login structure as per backend 2020-03-06 06:54:44 +00:00
Arpit Mohan
89dec71a07 Merge branch 'feature/user-profile' into 'release'
Modifying the user profile endpoint to send organization and application details

For event tracking, we need the organization name and application names that a user is accessing. In order to reduce the number of API calls, we are returning this information along with the enhanced user profile API call `/profile`. Another endpoint was added instead of `/me` to maintain backwards compatibility.


See merge request theappsmith/internal-tools-server!213
2020-03-06 06:17:01 +00:00
Arpit Mohan
35b0c22334 Adding /profile endpoint to return enhanced user profile to the client. 2020-03-06 06:17:00 +00:00
Satbir Singh
8c13eafde3 Merge branch 'feature/rem-events' into 'release'
More events

See merge request theappsmith/internal-tools-client!346
2020-03-06 04:59:24 +00:00
Satbir Singh
0b9a0cc6ab More events 2020-03-06 04:59:24 +00:00
Arpit Mohan
40964c3dfe WIP commit of trying to create an inheritance structure with permissions.
Also, moving all permissions to READ & MANAGE. Not maintaining separate permissions to create, update & delete.
2020-03-06 09:29:45 +05:30
Arpit Mohan
1475d9124a Fixing all the test cases for OrganizationService
We still need to add a lot more test cases to ensure that no functionality has broken. But this is a start in the right direction.
2020-03-05 19:35:24 +05:30
Arpit Mohan
c9a885d605 Modifying the create application flow in ApplicationPageService. All the tests in ApplicationService are passing
In order to create an application with valid permissions, we copy the relevant permissions from the organization of the user. This involves changes to the organizationService and OrganizationRepository as well.
2020-03-05 18:53:40 +05:30
Arpit Mohan
c813678f49 Adding the AclPermission enum to track all possible permissions globally
Also moving the argument AclPermission to the custom Repository interface level. This is to ensure that all the service functions can invoke the same repository function with different permissions based on their requirements.
2020-03-05 15:33:41 +05:30
Hetu Nandu
8654a87eea Merge branch 'fix/disparity-in-styles' into 'release'
Fix disparity in the styles of local and release builds.

See merge request theappsmith/internal-tools-client!347
2020-03-05 09:33:39 +00:00
Satbir Singh
5e912d23cc Merge branch 'fix/build' into 'release'
No sentry source maps uploaded on local build.

See merge request theappsmith/internal-tools-client!348
2020-03-05 09:17:11 +00:00
Satbir Singh
b9dfd0e71e No sentry source maps uploaded on local build. 2020-03-05 09:17:10 +00:00
Abhinav Jha
8b6eabd771 Fix disparity in the styles of local and release builds. 2020-03-05 14:11:32 +05:30
Arpit Mohan
c5e8f3bef4 Removing unnecessary and extra code in AclFilter, MongoAspect and CustomWebExpressionHandler 2020-03-04 19:12:34 +05:30
Arpit Mohan
243376642b Deleting the unnecessary annotations and aspects 2020-03-04 19:02:24 +05:30
Arpit Mohan
f47e7eb882 Adding ACL policy filters to CustomApplicationRepository functions 2020-03-04 18:57:46 +05:30
Arpit Mohan
0914acdca6 Adding default principal for anonymous Users in SecurityConfig
Also, hard-coding the document fields in BaseRepositoryImpl criteria queries.
2020-03-04 18:57:46 +05:30
Arpit Mohan
7019bae082 Adding policy to the document object instead of the user
The login has broken and all users are being treated as un-authenticated users
2020-03-04 18:57:46 +05:30
Arpit Mohan
a1ee6d9508 Adding querydsl properties instead of hardcoded names 2020-03-04 18:57:46 +05:30
Arpit Mohan
3a1673dfca Adding QueryDsl to the appsmith-server and appsmith-interfaces modules
This will generate the annotated classes so that we can refer to the fields easily and scalably.
2020-03-04 18:57:46 +05:30
Arpit Mohan
125982dabf Adding the ARN object and parsing it for user login and while checking permissions in PreAuthorize & custom repo implementations 2020-03-04 18:57:46 +05:30
Arpit Mohan
e078382b94 Adding the user policy object that has permissions for ARN objects.
Now we need to parse the ARN and match it to the policy in the PreAuthorize & Custom repository functions.
2020-03-04 18:57:46 +05:30
Arpit Mohan
bd5424095a Adding default implementations for a few functions which filter by ACL clause.
This is present in the BaseRepositoryImpl. In this manner, we can add default conditions to all the basic JPA queries. Now we only need to figure out how to intercept the custom queries to add user details into.
2020-03-04 18:57:46 +05:30
Arpit Mohan
5b09427b6c Removing the aspect and trying to implement the application repository directly 2020-03-04 18:57:46 +05:30
Arpit Mohan
29ae5fd360 Adding default implementation for applicationrepository to test 2020-03-04 18:57:46 +05:30
Arpit Mohan
63f4056a8a Another WIP commit.
At the moment, we cannot fetch the user from securityContext in the SoftDeleteMongo Query Lookup
2020-03-04 18:57:46 +05:30
Arpit Mohan
d5ed147111 Getting the AclAspect to work for both Mono & Flux methods.
This is done by checking the return type of the function via the joinPoint method signature
2020-03-04 18:57:46 +05:30
Arpit Mohan
bd1c390402 Allowing user to define multiple AclPermissions for a given permission
Also adding proper Acl permissions on ApplicationService and PageService functions
2020-03-04 18:57:46 +05:30
Arpit Mohan
9f3197792a WIP Commit to save the dev state 2020-03-04 18:57:46 +05:30
Arpit Mohan
81d39042a6 Merge branch 'feature/mdc-session-logging' into 'release'
Adding sessionId to the MDC logging to make debugging simpler

See merge request theappsmith/internal-tools-server!211
2020-03-04 12:49:50 +00:00
Arpit Mohan
f53a444635 Adding sessionId to the MDC logging to make debugging simpler 2020-03-04 18:16:12 +05:30
Abhinav Jha
6edd3edf66 Merge branch 'fix/remove-page.min-js' into 'release'
Remove the troublemaking page.min.js

See merge request theappsmith/internal-tools-client!343
2020-03-04 10:43:19 +00:00
Abhinav Jha
e995b90151 Remove the troublemaking page.min.js 2020-03-04 16:07:00 +05:30
Trisha Anand
dfdd44674b Merge branch 'feature/filter-providers-category' into 'release'
Filter providers by category

See merge request theappsmith/internal-tools-server!210
2020-03-04 09:58:16 +00:00
Trisha Anand
0cba85c95b Filter providers by category added. 2020-03-04 15:24:14 +05:30
Abhinav Jha
8068528870 Merge branch 'fix/P0-issues-2' into 'release'
Fix - P0 issues

- Property pane does not toggle for the containers when dragging/resizing a widget within the container
- Property pane stays in the same state(open/closed) before and after drag/resize
- Changing the UI reducers does not re-evaluate the datatree
- Focus event does not trigger when moving the mouse out of the boundaries of a widget.
- When the user clicks outside the canvas, the widget focus and selection is reset.

See merge request theappsmith/internal-tools-client!340
2020-03-04 08:10:40 +00:00
Abhinav Jha
37c96ab839 Fix - P0 issues 2020-03-04 08:10:40 +00:00
Trisha Anand
c27cd0e0c5 Merge branch 'feature/template-to-action' into 'release'
Marketplace GET Controller & Add an action/template to current page

See merge request theappsmith/internal-tools-server!209
2020-03-04 07:50:54 +00:00
Trisha Anand
f97053a314 Marketplace GET Controller & Add an action/template to current page 2020-03-04 07:50:54 +00:00