Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
11,293 Commits 1 Branch 0 Tags 507 MiB
2139382928
Commit Graph

1647 Commits

Author SHA1 Message Date
Nayan
4431c79e75
fix: Custom theme not copied when creating new branch (#14680) 
When a new branch is created where source branch has a custom theme, theme is not copied.
 2022-06-21 02:30:46 +00:00
Trisha Anand
437224b856
fix: Fix migration for overwriting recently used workspaces (#14634) 2022-06-17 15:01:52 +05:30
Trisha Anand
c307fc686b
hotfix: Adding workspaceId when missing (#14617) 2022-06-17 12:21:56 +05:30
Abhijeet
ebc4090b53
chore: Enable serialisation for JsonIgnore fields during export flow to avoid adding intermediate fields in DTO (#14120) 
* Add separate DTO for import export to serialise JsonIgnored fields

* Move remove unwanted field method for app in aaplication class

* Refactor sanitise objects before export

* Write migrations as per updated serialization implementation

* Fix migration

* Fix NPE during import

* Refactor

* Fix partial import scenario

* Fix testcases for DSLActionDTO

* Remove unwanted testcase

* Fix testcases for orgId to workspaceId migration

* Fix empty repo import testcase
 2022-06-17 10:09:28 +05:30
sidhantgoel
15559d0048
fix: for Running an API query returns a missing organization ID error for an unsaved datasource (existing apps) 2022-06-16 18:24:03 +05:30
Pawan Kumar
a6c8e03702
fix: Theming is not applied to Table's 'Delete' & JSONForm's 'Reset & Update' buttons in Crud template (#14316) 
* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
 2022-06-16 16:43:39 +05:30
Sidhant Goel
0f5e371ad7
added migration 2022-06-16 13:04:28 +05:30
Anagh Hegde
32f9adef21
test: Fixing test failures for git file utils (#14582) 2022-06-16 09:00:36 +05:30
Ankita Kinger
9b7944e7ee
feat: migrate organisation to workspace (#13863) 
* migration from organization to workspace on code level

* updated a few more files

* fixed runtime errors

* update org settings URL

* Renamed organizationId in domain objects

* changed field named from organization to workspace

* Reverted AppsmithRole changes

* fixed migrations

* recreating indexes

* migration update

* seed data runs before migration, undo changes

* mock commit

* seedmongo to populate upgraded data, datasource upgrade

* fixed two test cases

* updated migrations

* updated prop name

* Upgraded AclPermission

* comment

* migrated AppsmithRole

* more changes

* final set of changes

* variable name changes

* update cypress variable name

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java

* Update app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java

Co-authored-by: Trisha Anand <trisha@appsmith.com>

* reverting encryption handler change

* migrated a few missed out org to workspace

* migrated a few missed out org to workspace

* migration changes

* Removed Permission import

* fixed AppsmithRole

* mongodb version update

* fixed compile error

* fixed compile issue

* fixed some tests

* simplified embedded mongodb config

* updated a cypress test

Co-authored-by: Sidhant Goel <sidhant@appsmith.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Sidhant Goel <sidhant@hexcod.in>
 2022-06-15 21:07:41 +05:30
Aravind
595da2d9ef
fix: Redirection after login does not work for Google and Github (#14268) 
* Fix for issue #9819

Security.STATE_PARAMETER_ORIGIN is already set to "origin="

* removing redundant variable 

Refactoring code
 2022-06-15 17:59:56 +05:30
sidhantgoel
0ccc1aee93
fix: Fixes issue where CI was not executing all tests (#14338) 
* made test classes public

* added surefire compatible with junit 4

* Revert the changes of tests class accessibility

* Fix test failures

* test case fixes

* fixed NPE

* Fixed failing tests

Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
 2022-06-15 12:04:28 +05:30
Vishnu Gp
74ac6b9a1c
Resolved the issue of actionCollection updatedAt field not getting updated (#14323) 2022-06-11 10:03:26 +05:30
Anagh Hegde
c64784646a
Update the delete app flow for git connected apps (#14399) 2022-06-10 18:39:00 +05:30
Ankita Kinger
3b62e3f26a
Refactor code for RBAC feature (#14426) 2022-06-10 07:35:30 +05:30
Shrikant Sharat Kandula
6fafbf58df
Fix okhttp dependency (#14421) 2022-06-09 16:36:45 +05:30
Aswath K
a88618d17d
chore: Adds feature flag for Property pane grouping (#14311) 
* Adds feature flag for Property pane grouping

* changes assertion logic
 2022-06-09 11:16:00 +05:30
Ankita Kinger
442b849d9e
Refactor code for RBAC feature (#14362) 2022-06-08 18:48:15 +05:30
Abhijeet
6778af219c
chore: Improve the import application flow performance (#14364) 
* Use saveAll instead of save in import flow
 2022-06-08 13:53:50 +05:30
Nayan
51744a6727
feat: Return recently used templates first (#13996) 
If user has recently used templates set, those should come first in the response of get templates API
 2022-06-08 13:25:00 +06:00
Nayan
da2455bb5c
feat: Import an template inside an existing Application (#12507) 
This PR adds the feature to import a template inside an application.
 2022-06-08 13:24:37 +06:00
Somangshu Goswami
cdf0454db5
Merge branch 'master' into release 2022-06-08 11:08:30 +05:30
sidhantgoel
bacb0ab640
organization export permission in seed data (#14335) 
Signed-off-by: Sidhant Goel <sidhant@appsmith.com>
 2022-06-07 17:31:15 +05:30
Nayan
722aa11be2
Add custom slug along with auto generated slug for pages (#14065) 
Adding custom slugs for pages that can be set by the user.
 2022-06-05 00:48:25 +06:00
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
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
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
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
Aishwarya-U-R
be926e3b22
Merge branch 'master' into release-v1.7.2 2022-06-01 11:50: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
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
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
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
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
Nidhi
dc70220a2f
fix: Throw error when trying to import a cURL command that has a subshell in it (#13558) 2022-05-05 11:08:17 +05:30
Vishnu Gp
21f5447e40 Functional breakdown for authentication analytics feature 2022-05-04 20:39:03 +05:30
Abhijeet
9fc9f7a774
chore: Commit application files during the connect flow (#12288) 
* Commit application files during the connect flow

* Refactor detach remote method name

* updating connectToGitRepo method

* fix git tests

* Update default dsl to remove uncommitted changes for bottomRow and pathlist

* updating git cypress tests

* fixed git bug spec cypress test

* enabled other test case

* with store test

* fixed comment

* closing git sync modal

* updated test logic

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Parthvi12 <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: haojin111 <haojin828@outlook.com>
 2022-05-04 12:27:07 +05:30
Vishnu Gp
acca123872
Merge pull request #13462 from appsmithorg/feat/analytics-events-for-authentication-methods 
Feat: Added analytics events for GitHub and Google Auth
 2022-05-03 19:51:39 +05:30
Arpit Mohan
80516658b4
Release v1.6.24 2022-05-03 16:14:15 +02:00
Anagh Hegde
75a326470c
fix: Add null check for createdAt field in analytics event (#13491) 
* Add null check for createdAt field

* send empty value
 2022-05-03 11:42:34 +05:30
Anagh Hegde
d274fa3974
fix: Optimize flow to maintain page order during export-import (#13401) 
* Use map isntead of sorting list

* Refactor

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
 2022-05-03 11:42:22 +05:30
Nayan
e9b1108e47
fix: Set default theme when application is exported (#13321) 
When application is exported and it does not have a theme set, a NullPointerException was raised in that case. This PR fixes that by returning the default theme when theme is missing.
 2022-04-30 01:41:08 +06:00
Vishnu Gp
a8fa0b7465 Added analytics events for GitHub and Google Auth 2022-04-29 19:18:24 +05:30
Anagh Hegde
3e3a32604a
fix: Git connected Application forking should use default branch application (#13255) 
* Application forking use default branch application

* refactor changes

* Update the permission
 2022-04-29 19:05:23 +05:30
Anagh Hegde
0653f657cf
Merge pull request #13262 from appsmithorg/bug/duplicate-app-git-connected 
fix: For git connected apps duplicate should use default branch resources
 2022-04-29 15:01:50 +05:30
Nayan
501fb1c1ed
feat: Delete theme when application is deleted (#13252) 
This PR archives the related themes when an application is deleted aka archived.
 2022-04-29 12:38:09 +06:00
Anagh Hegde
4a19f83a42 Merge branch 'release' into bug/duplicate-app-git-connected 2022-04-29 11:43:45 +05:30
Anagh Hegde
aa4c3fe953 fix: Unable to see apps in home page after git connect fails (#13387) 2022-04-28 17:17:50 +05:30
Anagh Hegde
2c484d5538
fix: Unable to see apps in home page after git connect fails (#13387) 2022-04-28 16:43:53 +05:30
Pawan Kumar
0aec29d837 update theming config 2022-04-28 16:00:03 +05:30
Pawan Kumar
6052600d0b update theming config 2022-04-28 15:58:51 +05:30
Anagh Hegde
a768bb5eb7 Merge branch 'release' into bug/duplicate-app-git-connected 2022-04-27 12:31:23 +05:30
Anagh Hegde
456b5b94ef
fix: Page order sequence for git import (#13126) 
* Added page sequence to metadata

* Update test resources

* Add null check for the pageOrder List

* FIx NPE

* Add logic to handle page order for deployed version

* Add tests for the page order

* Add null check for published pages

* Fix unpublished page names getting added in the order list for published

* update the variable name

* Use published page order in tests for published view

* Fix NPE
 2022-04-27 11:45:40 +05:30
Nidhi
10f83ef698
fix: Throw error on trying to access non-existent unpublished action (#13210) 
* fix: Throw error on trying to access non-existent unpublished action

* Fixed NPE at copy policies from page to action
 2022-04-26 20:04:14 +05:30
Rimil Dey
0da092baa7
Merge branch 'master' into promotion-release-1-6-22 2022-04-26 17:55:31 +05:30
Sumit Kumar
7e9eb58f03
fix: fix action objects missing plugin id and plugin type info in database (#13263) 
* add plugin id and type info to action object if found missing
* this fix is currently added to the read and update action flows
 2022-04-26 16:51:30 +05:30
Abhijeet
b88cdacc7d
Fix npe and duplication for JSObject during clone application (#13297) 2022-04-26 13:13:58 +05:30
Nidhi
21b6936f86 fix: Fixed compile time errors 2022-04-25 14:44:58 +05:30
Anagh Hegde
838b45a8f5 Add branchName check for the clone 2022-04-25 14:24:04 +05:30
Anagh Hegde
94ba542606 use default branch app for clone operation 2022-04-25 14:18:17 +05:30
Abhijeet
56998d77d5 Add index for git (#13133) 2022-04-22 18:31:52 +05:30
Nayan
0a038e714f
feat: added page names to the templates meta data (#12786) 
Adds page names to templates meta data
 2022-04-22 12:58:35 +06:00
Nayan
c4ee44de15
feat: log template app name to analytics service when template is forked (#12972) 
Logs application template name to analytics service when template is forked.
 2022-04-22 11:40:32 +06:00
Vishnu Gp
534bdd93b2
fix: Add validation for Git URLs on server (#13182) 
This PR adds a backend validation for git URLs on the backend side. Plus added some more test cases for URLs
 2022-04-22 07:23:13 +05:30
Nayan
6889882088
feat: updated download template App API to download from cloud services (#12311) 
Update download json file API so that it downloads via cloud services
 2022-04-22 00:19:46 +06:00
Nayan
15394207a5
feat: Add API to get template filters (#12969) 
Adds a new API to get available filters for application templates from Appsmith cloud services. It acts as a proxy to the API.
 2022-04-21 15:52:27 +06:00
Abhijeet
3a22cda148
Add index for git (#13133) 2022-04-21 11:10:41 +05:30
Vishnu Gp
cfb7fc4b94
fix: git remote SSH url for Azure | BE (#12933) 
Users were not able to add Git SSH URLs from some providers. This fixes the BE aspects of this issue.
 2022-04-20 14:47:02 +05:30
Pawan Kumar
a5e32c8083
chore: Update theming default themes configs (#13117) 
* theming config update

* add progress bar

Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
 2022-04-20 12:08:35 +05:30
Anagh Hegde
ecb08a4918
Add logic to change default branch for git connected application (#11549) 
We are opening the appsmith default application when the user clicks on edit. But when the app is connected to git we should always bring up the default application of the default branch.
 2022-04-19 19:43:23 +05:30
Abhijeet
cebccc5401
Fix issues in git flows when pages don't have reference in application object (#13040) 
As a part of git-directory update we have introduced a bug where if the entity names includes the - we were not able to filter the entities in the individual page directory. This commit introduces a new name-seperator to avoid such issues.
 2022-04-19 17:25:11 +05:30
Anagh Hegde
f9fee48c14
Remove feature flag for git import (#12909) 2022-04-18 16:36:59 +05:30
Anagh Hegde
4b8646dd05
Handle logic to delete the application during git delete branch flow (#12986) 2022-04-18 15:24:40 +05:30
Abhijeet
a12750b536
feat: Update directory structure for git-sync to mimic UI (#11705) 
* File migration for git

* Testcases added

* Comments added

* Update the action file names to keep unique constraints

* Separate out the theme from metadata

* Update server version to convey the file migration
 2022-04-14 23:35:08 +05:30
Vishnu Gp
c7a4ac7353
fix: Organization name can be empty 
fix: Organization name can be empty
 2022-04-13 17:36:32 +05:30
Anagh Hegde
5c17422956
fix: Connection timeout for git connect when the git repo is behind a firewall (#12819) 
* Use non blocking IO for checking the repo status

* Cache the results

* Update tests for the util class method
 2022-04-13 10:33:28 +00:00
Vishnu Gp
ccc25f35f5 code refactoring for empty organization name fix 2022-04-13 11:17:35 +05:30
Nayan
4819907a34
feat: Add analytics events to track user activation (#12611) 
Adds some attributes to existing analytics events to track user activation.
 2022-04-12 20:09:03 +06:00
Nidhi
e36b352a42
fix: Conversion logic for expires in field (#12781) 2022-04-11 11:27:24 +00:00
Vishnu Gp
2c24050bf9 Added comments and test case for empty organization name fix 2022-04-11 16:27:31 +05:30
Anagh Hegde
f9df59f02b
Handle empty repo during git import with proper error message (#12752) 2022-04-11 12:29:18 +05:30
Abhijeet
8dd6bc8d4c
fix: After cloning the page with JSObject creating a new branch copies all the JSObject in a single page (#12743) 2022-04-11 07:42:09 +02:00
Vishnu Gp
1826f3dfef Fix empty organization name 2022-04-11 10:53:38 +05:30
Abhijeet
75cfe8df5b
fix: Fix clone page issue where JSObjects are not showing up in destination page when application is connected to git (#12723) 2022-04-09 13:53:28 +00:00
Anagh Hegde
e386c594fe
fix: Maintain page order during file import (#12698) 
* Add logic to order page after creating

* Add test to check if the page order is same as the json file during the import
 2022-04-09 11:15:45 +05:30
Anagh Hegde
f9f689af69
fix: Current branch delete exception in delete branch API (#12699) 
* Handle current branch delete exception

* Updated error message

* Update error message
 2022-04-08 18:28:43 +00:00
Anagh Hegde
737680bb9b
fix: Reset of isPublic flag during git merge operation (#12703) 
* do not update the isPublic flag during git operation

* Add tests

* update the comments
 2022-04-08 14:35:20 +05:30
arunvjn
fabfb65a4f
chore: Parallelise feature flags and user info API (#12263) 2022-04-07 23:27:32 +05:30
Nikhil Nandagopal
1d27c951de
Reverted to older template file 2022-04-07 12:14:41 +05:30
Nikhil Nandagopal
73b3a54e08
chore: Update crud template (#12634) 2022-04-07 11:36:55 +05:30
Pawan Kumar
cf425249ca
chore: update theming stylesheet config (#12645) - skipChangeLog 
Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
 2022-04-07 11:28:45 +05:30
Nikhil Nandagopal
2539d6ec12 Updated Template 2022-04-06 19:44:23 +05:30
Nikhil Nandagopal
8dd700f663 Updated Template 2022-04-06 19:41:30 +05:30
Nikhil Nandagopal
a9ccfab55b Updated Template 2022-04-06 19:41:28 +05:30
Nikhil Nandagopal
a6fe504768
feat: Updated CRUD Template (#12579) 
* Updated Template

* Updated Template

* Updated Template

* updated xpaths for gemeratePage

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
 2022-04-06 15:46:36 +05:30
Nidhi
79a63d535d
fix: Only add missing user set actions to scheduling order (#12601) 2022-04-06 12:04:41 +05:30
Nidhi
981c618420
fix: Using form url encoded content type for token requests (#12597) 
* fix: Using form url encoded content type for token requests

* fix: Using form url encoded content type for cc as well

* fix: Conversion logic for expires in field
 2022-04-05 17:47:44 +00:00
Anagh Hegde
e3c7d2b3f2
fix: While importing the application page sequence does not match with the source application (#12539) 
* Add logic to maintain page order while exporting the app

* Add test for the page order during export
 2022-04-04 23:24:42 +05:30
Abhijeet
ffd0595330
fix: Fix importing datasource with same name but different plugin issue (#12512) 
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
 2022-04-04 13:23:00 +05:30
Nayan
797f1c0788
chore: removed feature flag for app template (#12485) 
Removed feature flag for templates as we're planning to go live
 2022-04-03 10:07:59 +06:00
Sumit Kumar
c2f39f4eda
feat: [server side change only] convert Mongo's form data to raw / native query (#10058) 2022-04-01 18:44:32 +05:30
Anagh Hegde
f03a163a38
feat: Export application with datasource configuration for sample apps and templates (#12310) 
* Expose a way to export crdentials for sample apps and templates

* Export application with creds if marked as exportableWithCred in application object

* Fix and add testcases

* Add comments

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
 2022-03-31 21:56:18 +05:30
Nayan
085b4a3a15
fix: Update admin settings permission from users when they are added or re… (#11770) 
Update user permission when email address is added as admin email from settings page.
 2022-03-31 20:17:47 +06:00
Trisha Anand
f51da7019d
chore: Adding delete endpoint in ConfigService (#12450) 2022-03-31 19:02:54 +05:30
Shrikant Sharat Kandula
72ee8e7296
Add UsagePulse API, create-only (#12340) 
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
 2022-03-31 06:00:11 +05:30
Abhijeet
d9b2a747df
chore: Add git discard and pull documentation url for status API response (#11869) 
* Added discard doc url for status API response
 2022-03-30 13:10:38 +00:00
Anagh Hegde
98c69868f1
fix: Fix binding for APIs during git import (#12357) 
* Add org id for the actions during git import

* Updated the test resource
 2022-03-30 12:44:09 +05:30
Nikhil Nandagopal
b80e536a71
Update crud template (#12298) 
* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
 2022-03-28 18:59:46 +05:30
Abhijeet
b13cf320f0
chore: Add manual and auto update fields within application object to distinguish between the migration related changes (#12099) 2022-03-26 10:40:59 +05:30
arunvjn
69c09c03aa
feat: adding slug names in urls (#10957) 
* Init commit clean urls

* Changes to builder route

* Refactored URLs

* Remove default params from url builder functions.

* Fixed more urls

* Changed selector name

* Minor url correction

* Type fixes

* Jest fixes

* Fixed routing for old published apps

* Fixed url slug replace

* page-1 -> page1 as default page slug name

* Remove application id from init editor calls

* Use default page slug

* Added comments and placeholder values for slug names

* variable rename

* Removed redirection and added back the old routes

* Prevent page slug name recompute

* Fixed home page load in view mode

* Added null checks

* Fixed jest test

* Fixed jest test

* Update URL slugs when app/page name changes

* Added unit tests and updates types

* Removed unused code

* * Removed duplication fetch page call.
* Fixes #11354
* Fixed sign up flow

* Refactored initializeEditorSaga

* Fixed warnings

* Fixed integrations screen URL bugs

* Cypress fixes

* Fixed slug names in copy/move operations and pages screen

* Minor refactor

* Fixed page highlight bug in published apps

* Added new url factory and middleware to store url params

* Changed store to default export and fix unit tests

* Fixed slugs unit test

* Minor fixes

* Fixes #11379

* Fixed set as home page feature

* Updated types

* app id adjustments for cypress

* Fixed bad merge

* Refactored routes to functional component

* * Fixed EE active entity highlight.
* Remove unused code in editor router.

* jest fix

* Mock history to prevent security errors

* constant rename

* Removed console logs

* Fixed page id regex

* Do not check for /pages in url

* Fixed missing pageId on quick edit/deploy clicks

* Missed files from previous commit

* Fixed warnings

* Fixed jest test

* New api integration

* feat: Add applicationVersion property to Application (#11626)

Added a new property to Application object - applicationVersion. This property can be used to identity when there is a breaking change and can not be solved with migration. FE will use this property to detect such conditions. Another API is added to migrate the applicationVersion to latest version when user migrates the breaking changes.

* Added manual upgrade modal.

* Test fix

* Fixed jest test

* function rename

* Fix deploy error

* Added null check

* Changes to persist URL search params when redirecting

* Added updates tooltip

* More unit test cases

* Fixed git url redirection

* Fix warning

* Fixed evaluation on upgrade

* Fixed warnings

* File rename

* Added cypress for clean urls

* Fixed import/export/fork cypress

* Cypress api server fixes

* Fixed mongo spec

* Fixed replay spec

* Fixed comments spec

* More cypress fixes

* Fixed tooltip in update btn

* Text size changes

* Minor fixes

* Jest test fix

* Fixed type error

* Fixed warnings

* Fixed todo comments

* Moved description to constants file

* Fixed cypress CI run crash

* Fixes git cypress failures

* Import/Export cypress test fixes

* Import export fork cypress fixes

* Explorer test fix

* Switch branch test fix

* Added applicationVersion in export app json

* Calls plugin forms in parallel

* Fixed warnings

* Fixed warning

* Import export CI fixes

* Reverts previous changes

* Fixes import export

* Fixed import export cypress URL verification

* Pass applicationVersion when duplicating application

* Cypress fix

* Dummy commit

Co-authored-by: Nayan <nayan@appsmith.com>
 2022-03-25 16:13:26 +05:30
Nayan
468ed8454f
chore: Send test email error message to client (#11968) 
Passes error message from server to client when there is error in send test email
 2022-03-24 14:52:51 +06:00
Sumit Kumar
47ad7cc9b1
feat: add JSON smart substitution feature to Firestore plugin actions 
* This PR adds the JSON smart substitution feature to Firestore plugin actions.
* This smart substitution will work exactly the same way as it works for REST API actions.
* Currently, smart substitution only gets applied to the body section of Create, Set, Add or Update commands as this is the only input field that expects a JSON input type.
* It can be toggled On/Off via the Settings tab.
* It is set to On by default. However, data migration has been added to set it to Off for all existing Firestore actions so that they are not impacted by this PR's changes.
 2022-03-24 13:02:54 +05:30
Anagh Hegde
fae7fc6e7c
fix: App visibility of git connected application is reset after git merge (#11890) 
* Fix issue with policies being overridden during hydration from file system to db

* Fix tests

* Update the policies for the branched application

* Add test cases for the visibility changes for git connected applications

* Remove the visibility flag from application object while committing to git repo
 2022-03-24 07:01:28 +00:00
Abhijeet
b4dfb6919f
fix: Archived pages are getting copied in forked application (#12050) 
* Filter cloning archived pages in application fork action
 2022-03-23 17:34:42 +05:30
Anagh Hegde
e44a81e031
fix: Reconnect application showing for existing datasources due to missing flag value (#12034) 
* Add migration to fix the reconnect application showing for existing datasources

* Changes per review

* Check the invalids before adding the configured flag

* Fix NPE in migration

* Refactor

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
 2022-03-23 09:03:39 +05:30
Nidhi
1ca9fd803a
fix: S3 formData path for bucket name (#12049) 2022-03-22 12:56:42 +01:00
Nidhi
608e7b4fa0
chore: Updated Template for form/json mode for Firestore, S3 and Mongo (#12021) 
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
 2022-03-21 16:13:52 +05:30
Nidhi
dddb85abbf
Null map values (#12018) 2022-03-21 15:37:04 +05:30
Nidhi
079689951d
Null map values (#12017) 2022-03-21 15:19:55 +05:30
Nidhi
aef4001fde
chore: Ignore actions that are already migrated (#12013) 
* Ignore actions that are already migrated

* Logging exception
 2022-03-21 14:47:55 +05:30
Nidhi
ac3cdc7325
Added null checks for formData keys (#12010) 2022-03-21 14:15:19 +05:30
Nidhi
9912aac4c6
Added null checks for formData (#12009) 2022-03-21 13:52:16 +05:30
Shrikant Sharat Kandula
1d916e1c3c
Fix NPE in form-data migration (#12006) 2022-03-21 13:14:32 +05:30
Nidhi
c97b7e31e7
chore: Migrations to enable JSON and form mode (#11534) 
* feat: added new component to perform generic json raw toggle functionality

* chore: Migration to convert formData references

* fix: Redid migration for per plugin changes, fixed consumption

* fix: Added JSON migration for git import

* Added JSON migration as well

* Reverted client side changes

* fix: Modified plugin config aggregation logic

* Merge conflict fixes

* different paths for different commands

* Whoopsie

* Modified usage to different paths

* Reverting env change

* Config changes to show json mode

* Test fixes

* Migrated body,path,next,prev

* Cypress test fixes

* Modified dynamic binding replacement

* Changed view type

* Reverted json form mode display

* Modified structure of JSON mmigrations

Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
 2022-03-21 11:22:14 +05:30
Anagh Hegde
f869930c92
chore: Update error message for checkout remote branch flow (#11891) 
* Update error message for checkout remote branch flow

* Changes per review
 2022-03-21 11:19:55 +05:30