Commit Graph

2127 Commits

Author SHA1 Message Date
sidhantgoel
7fc5dc059a
Merge pull request #13999 from appsmithorg/fix/mysql_testfix
fixed mysql plugin tests
2022-06-04 17:10:20 +05:30
Pawan Kumar
78e6bcf7ad
fix: Theming UX Changes (#13741)
* update color control ux

* add reset theme option

* remove the console

* update theme card

* update icons + text for reset

* update button size

* fix cypress tests

* fix cypress tests

* fix flaky git tests

* incorporate ashit feedback

* fix cypress tests

* fix color button in theme panel

* fix reset theme logic + jest tests

* fix button styles reset issue in json form

* add cypress test for theming reset

* incorporate ashit feedback

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
2022-06-03 15:55:38 +05:30
Anagh Hegde
b3baa36a18
fix: move git file operations to elastic schedulers (#13907)
* use non-blocking calls for file operations

* Move the file system operation to an elastic thread
2022-06-03 15:54:08 +05:30
Anagh Hegde
4c6c109edf
fix: Update the widget from drop down to select widget in suggested widget list (#13944)
* Update the widget from drop down to select widget
2022-06-03 07:49:56 +00:00
Abhijeet
acf3e0c6fd
fix: Add sequential counter suffix for imported application nomenclature (#14245)
* Add sequencial counter for import application flow

* Refactor
2022-06-03 10:37:56 +05:30
Sumit Kumar
910875ddfc
fix: fix class cast exception seen on MySQL plugin when built on local setup (#14099)
* fix class cast exception by removing all netty.io packages from mysql r2dbc
* fix CI test failure
2022-06-02 17:14:21 +05:30
Abhijeet
78ce45a190
chore: Remove client subscription for delete branch (#14152)
* Remove client subscription for delete branch

* Remove unused imports
2022-06-02 11:47:13 +05:30
Pawan Kumar
33767cf75f
fix: Theming is not applied to Table's 'Delete' & JSONForm's 'Reset & Update' buttons in Crud template (#14193)
* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-06-02 11:37:36 +05:30
subratadeypappu
c52ce5200d fix: Show table structure when desc table or describe table command is run stand-alone in MySQL (#14054) 2022-06-01 19:23:42 +06:00
Trisha Anand
5054cf312e
feat: Add Policy Domain (#14224) 2022-06-01 16:35:54 +05:30
Trisha Anand
ecce50a1b4
feat: Add User Group domain (#14221) 2022-06-01 16:33:11 +05:30
Anagh Hegde
c073170816
Update url for connecting to repo git sync (#14226) 2022-06-01 16:20:01 +05:30
Trisha Anand
adf70ed6fa
feat: Adding Permission Group datastructure (#14147) 2022-06-01 16:19:14 +05:30
subratadeypappu
531f5f89d5
fix: Upgrade Lombok package version to 1.18.22 to avoid build error (#14080) (#14156)
Update lombok packages to version 1.18.22
2022-06-01 10:29:42 +00:00
rahulramesha
593822db88 Merge branch 'release' of github.com:appsmithorg/appsmith into release-v1.7.2 2022-06-01 12:06:47 +05:30
Aishwarya-U-R
be926e3b22
Merge branch 'master' into release-v1.7.2 2022-06-01 11:50:27 +05:30
Shrikant Sharat Kandula
73e43fadbd
Support for custom CA certificates (#14207)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-06-01 11:14:27 +05:30
Abhijeet
d669cf4e4d
chore: Add branch name param for git analytics events (#14133) 2022-05-30 10:32:54 +05:30
Nayan
a362e536fd
feat: Sort datasources alphabetically and mark recently created datasources (#13958)
Return list of datasources in the GET /api/v1/datasources sorted alphabetically. Also set a flag isRecentlyCreated to the most recently created 3 datasources.
2022-05-29 00:02:39 +06:00
Trisha Anand
132a5065fe
feat: Add conceptual Tenant (#13935) 2022-05-27 18:29:08 +05:30
Shrikant Sharat Kandula
39b071961a
Better error response for admin API when env file is not found (#13373) 2022-05-27 17:04:40 +05:30
Arpit Mohan
f0663ec341
Merge branch 'master' into v1.7.1_promote_release_to_master 2022-05-27 07:49:15 +02:00
Abhijeet
6c1e5ec8c4
fix: Close insert modal for MongoDB and Google sheet after InsertQuery is executed for generated CRUD pages (#14115)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-05-26 16:20:28 +05:30
Abhijeet
845d5b2ad4
chore: Update CRUD page template to include JSONFormWidget (#12662)
* Updated Template

* Fix testcases

* Try removing autogenerated field entry from insert modal

* Update mongo testcase
2022-05-26 09:19:33 +05:30
Anagh Hegde
7f56d3972c
fix: Add support to generate ssh keys of type RSA (#13640)
* Add support to generate ssh keys on RSA algo
* Add the ssh key metadata to the get ssh key api
2022-05-25 14:14:02 +00:00
Anagh Hegde
109ff332ef
Update docs links for git (#14058) 2022-05-24 20:29:51 +05:30
Sidhant Goel
47a4023a45
Merge branch 'release' into fix/mysql_testfix 2022-05-23 18:15:55 +05:30
sidhantgoel
b4ead512f1
fix: Fixes encryption handler (#13985) 2022-05-23 18:04:11 +05:30
Sidhant Goel
8a50dea54d
added comment 2022-05-23 16:18:06 +05:30
Sidhant Goel
54b82d0502
Fix for running migrations before application start 2022-05-23 15:21:32 +05:30
Sidhant Goel
7e24ae2126
fixed mysql plugin tests 2022-05-21 16:47:42 +05:30
Nayan
6b6deaf98f
feat: Add query count and page count as attributes to publish app event (#13847)
Adds number of pages and number of queries in a Application to the list of analytics attributes when an application is published.
2022-05-20 23:42:09 +06:00
Anagh Hegde
961d412a9f
chore: Add isSystemGenerated field to analytics for git operations (#13705)
* Add isSysteGenerated field to analytics for git operations
2022-05-19 20:42:16 +05:30
Leo Thomas
9ddb11dbfb
SQL Server Connection pool with HikariDataSource (#13707)
Co-authored-by: Leo Thomas <leoweb2010@gmail.com>
2022-05-18 22:03:39 +05:30
Sidhant Goel
12a269f66e
closing stream 2022-05-18 17:00:50 +05:30
Sidhant Goel
a2132d18c7
Added comment to explain processing optimizations done using stream 2022-05-18 16:17:26 +05:30
Sidhant Goel
f24553cc12
optimized the workspace copy migration 2022-05-18 14:52:52 +05:30
Sidhant Goel
a3e593250d
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-18 12:53:08 +05:30
Nayan
33c78e93ef
feat: Update organization slug (#13791)
When organization name is updated, the slug is not updated. This generates a outdated URL when user clicks on a organization name from the left panel. This PR changes the following behaviors

    The Organization slug will be no more unique
    Link to organization applications will be based on organization id instead of slug
    Organization slug will be updated whenever there is a change in organization name
    All the existing organization slugs will be updated
2022-05-18 11:08:13 +06:00
Sidhant Goel
47f8ed94b1
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-17 20:23:36 +05:30
Trisha Anand
11ee278740
fix: NPE check when datasource createdAt is null (#13894) 2022-05-17 15:44:14 +05:30
Trisha Anand
ea80a6028c fix: NPE check when datasource createdAt is null
(cherry picked from commit beafb371b24180dce2e351f1dea6d9d34db2a204)
2022-05-17 14:34:28 +05:30
Ankita Kinger
ccf74e691b Merge branch 'master' of https://github.com/appsmithorg/appsmith into chore/release-v1.6.26 2022-05-17 12:39:04 +05:30
Nayan
71ffbdeb45
fix: Theming issue when application has multiple git branches (#13870)
* fix: Themeing issue when application has multiple git branches

* Don't commit published mode theme

* -updated as per review comment

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-05-17 10:14:08 +05:30
Abhijeet
e7f34b0034
chore: Improve execution time logging (#13811)
* Increate timeout for git APIs and log execution time in mixpanel

* Improve execution time logging
2022-05-16 09:45:34 +00:00
Sidhant Goel
6a249c1cbe
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-12 16:21:24 +05:30
Sidhant Goel
6a9d62476d
Added migration to update sequence names 2022-05-12 16:16:18 +05:30
Anagh Hegde
807eea20b4
test: Fix git test failures (#13748)
* Fix test failures

* Fix testcase for pull changes

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-05-12 15:44:13 +05:30
Sidhant Goel
9cde523e52
Reverted changes in strings from workspace to organization 2022-05-12 15:20:33 +05:30
Sidhant Goel
109f34b3ab
renamed USER_ADDED_TO_ORGANIZATION_EMAIL_TEMPLATE to USER_ADDED_TO_WORKSPACE_EMAIL_TEMPLATE and corresponding template file name 2022-05-11 22:21:25 +05:30
Sidhant Goel
0abf57488a
Renamed PluginOrgDTO to PluginWorkspaceDTO 2022-05-11 22:18:26 +05:30
sidhantgoel
1e1e11d9be
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
grammar correction

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 22:16:55 +05:30
sidhantgoel
4a984b68ae
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
grammar correction

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 22:13:54 +05:30
Sidhant Goel
3f83e93a89
Merge branch 'feat/migrate_organization_to_workspaces' of github.com:appsmithorg/appsmith into feat/migrate_organization_to_workspaces 2022-05-11 22:10:15 +05:30
Sidhant Goel
087d24c6de
Removed migration to delete organization collection
Renamed constant FieldName.ORGANIZATION to FieldName.WORKSPACE, kept the value as organization
Renamed constants in appsmith errors
2022-05-11 22:08:03 +05:30
sidhantgoel
9848cb5294
Update app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
Organization to Workspace in comments

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:37:04 +05:30
sidhantgoel
30aa1a9a6a
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
orgMono to workspaceMono

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:36:44 +05:30
sidhantgoel
93e96d0c7f
Update app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ExamplesWorkspaceClonerCEImpl.java
grammar correction in comments

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:34:56 +05:30
sidhantgoel
e0ee0134eb
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
orgMono to workspaceMono

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:34:17 +05:30
sidhantgoel
796868ab79
Update app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
renamed organizationId to workspaceId in comment

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:33:31 +05:30
Sidhant Goel
214e5a8318
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-11 18:03:51 +05:30
balajisoundar
ba0b58aa8f
chore: add theme stylesheet for Table widget v2 (#13713) 2022-05-11 11:06:19 +05:30
Sidhant Goel
c1cd3d2f10
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-10 16:59:26 +05:30
Abhijeet
797828a50a Fix build failure 2022-05-10 15:18:57 +05:30
Anagh Hegde
ab3d1d9815
Delete application created during git import for empty repo (#13450) 2022-05-10 13:02:30 +05:30
Nayan
c75e330506
feat: Track recently forked templates (#13159)
This PR adds feature to track recently forked templates by the user.
2022-05-10 13:28:43 +06:00
Nayan
12dfef1578
fix: Test failing for theme name change (#13663)
Fixes a failing junit test due to theme name change.
2022-05-10 10:59:20 +06:00
Sidhant Goel
98d1ac017b
Renamed organization in variable names and comments 2022-05-09 21:16:23 +05:30
Anagh Hegde
4db07f88b4
Fix test failures (#13306) 2022-05-09 13:17:20 +00:00
Sidhant Goel
9f56a7e49b
Renamed variable names and function names 2022-05-07 00:44:57 +05:30
Sidhant Goel
19483c6f07
QOrganization to QWorkspace in CustomWorkspaceRepositoryCEImpl 2022-05-06 23:19:19 +05:30
Sidhant Goel
db73a16ad6
UserOrganizationServiceImpl to UserWorkspaceServiceImpl 2022-05-06 23:13:39 +05:30
Sidhant Goel
0b99548493
OrganizationControllerTest to WorkspaceControllerTest 2022-05-06 23:12:07 +05:30
Sidhant Goel
549ca3ee4a
OrganizationController to WorkspaceController 2022-05-06 23:10:29 +05:30
Sidhant Goel
f514847847
OrganizationPlugin to WorkspacePlugin 2022-05-06 23:08:19 +05:30
Sidhant Goel
a4e4c00826
OrganizationPluginStatus to WorkspacePluginStatus 2022-05-06 23:07:45 +05:30
Sidhant Goel
25ec1ec5ae
ShareOrganizationPermissionTests to ShareWorkspacePermissionTests 2022-05-06 23:06:50 +05:30
Sidhant Goel
7298b05ef6
Renamed ExamplesOrganizationClonerTests to ExamplesWorkspaceClonerTests 2022-05-06 23:05:56 +05:30
Sidhant Goel
0b7dc1aa7e
Renamed UserOrganizationServiceCEImpl to UserWorkspaceServiceCEImpl 2022-05-06 23:04:44 +05:30
Sidhant Goel
ddc99df246
Renamed ExamplesOrganizationCloner(s) ExamplesWorkspaceCloner(s) 2022-05-06 23:03:43 +05:30
Sidhant Goel
1c2db28676
Renamed OrganizationApplicationsDTO to WorkspaceApplicationsDTO 2022-05-06 22:58:41 +05:30
Sidhant Goel
cb1cb07ba2
Renamed UserOrganizationServiceTest to UserWorkspaceServiceTest 2022-05-06 22:57:25 +05:30
Sidhant Goel
c73defbb03
Renamed UserOrganizationService to UserWorkspaceService 2022-05-06 22:56:25 +05:30
Sidhant Goel
50082fcd14
Renamed UserOrganizationServiceCE to UserWorkspaceService 2022-05-06 22:36:23 +05:30
Sidhant Goel
6c5134ca42
Renamed UserOrganizationServiceCE to UserWorkspaceServiceCE 2022-05-06 22:35:34 +05:30
Sidhant Goel
ffed375768
Renamed OrganizationServiceImpl to WorkspaceServiceImpl 2022-05-06 22:31:25 +05:30
Sidhant Goel
8f4cacd9bf
Renamed OrganizationControllerCE to WorkspaceControllerCE 2022-05-06 22:29:55 +05:30
Sidhant Goel
91678931e4
Renamed OrganizationServiceCEImpl to WorkspaceServiceCEImpl 2022-05-06 22:28:28 +05:30
Sidhant Goel
6e27e5abd4
Renamed OrganizationServiceUnitTest to WorkspaceServiceUnitTest 2022-05-06 22:26:29 +05:30
Sidhant Goel
8ff79a5c22
Renamed OrganizationServiceTest to WorkspaceServiceTest 2022-05-06 22:25:18 +05:30
Sidhant Goel
4ade25c457
Rename OrganizationService to WorkspaceService 2022-05-06 22:23:50 +05:30
Sidhant Goel
49297c35ac
Renamed OrganizationServiceCE to WorkspaceServiceCE 2022-05-06 22:21:36 +05:30
Sidhant Goel
7458df100a
Renamed Organization repositories to Workspace repositories 2022-05-06 22:19:13 +05:30
Sidhant Goel
96adf6c273
Created Workspace domain object
Marked Organization deprecated
Replaced all references to Organization with Workspace
Added migration to copy documents from organization collection to workspace collection
Added migration to create indexes on workspace collection
Added migration to drop organization collection
2022-05-06 22:04:10 +05:30
Abhijeet
9aa4bd104a
fix: Missing pluginId issue for datasource during the import flow if destination org don't have sepcific plugin installed (#13487)
* Fix missing pluginId issue for datasource

* Refactor assertion

* Update error message
2022-05-06 15:08:06 +05:30
Leo Thomas
c8fce60831
fix: Firestore where condition issue (#12929)
* Fix 11141-Added JDBC override parameter for resolving Cast Errors with timestamp

* Firestore Where condition Unit Test for Arrays

* Code review comments update

* removed two unrelated file somehow added here from the previous PR

* Code review comments update V2

* Code review Comments Fix - Second

* Removing the frontend Changes related to dropdown width

Co-authored-by: Leo Thomas <leoweb2010@gmail.com>
2022-05-06 13:58:17 +05:30
Sumesh Pradhan
5e92d48037
Add healthcheck to docker (#13154) 2022-05-06 11:45:56 +05:30
Abhijeet
ad4772f5ea
fix: Improve git error logging (#13580)
* Add appropriate error type

* Fix warnings

* Update repo not found exception
2022-05-06 10:57:35 +05:30
Abhijeet
ecb3904680
chore: Add analytics event for SSH key generation (#13505) 2022-05-05 15:52:30 +00:00
Vishnu Gp
f23077285b
Merge pull request #13570 from appsmithorg/feat/analytics-events-for-authentication-methods
Chore: Functional breakdown for authentication analytics feature
2022-05-05 20:14:48 +05:30