Nidhi
66f3dfe790
chore: Move to Jupiter JUnit5 ( #17083 )
...
* Upgrading to Jupiter tests for everything but plugins
* Whoops, too soon
* Fixed failing tests
* Imports fixed
* Removed PowerMock dep and JUnit4 from interfaces
* Woohoo! That's testcontainers
* Added maven enforcer to disallow junit4
* Update app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* Update app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* Update app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* Update app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* Weird formatting and version upgrades
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-09-29 08:54:07 +05:30
Anagh Hegde
1fb4cac6f5
chore: Update text message for git remote url placeholder ( #15553 )
...
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2022-08-02 12:55:51 +05:30
Shrikant Sharat Kandula
bba78afc3b
chore: Upgrade dependencies reported by Dependabot ( #13735 )
...
Upgrades vulnerable dependencies in all plugins except for MySQL. That one is still failing and I'll fix it in a separate PR. Issue #14475
Co-authored-by: Nayan <nayan@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
2022-07-19 10:23:27 +05:30
Anagh Hegde
317f340421
feat: fetch branch speific refs from the remote repo ( #15067 )
...
* fetch branch specific refs from the remote repo
2022-07-08 11:29:16 +05:30
Abhijeet
1c03266d31
fix: Fix backward compatibility related to v1 git file format ( #14770 )
...
* Fix backward compatibility for v1 git file format
* Add testcase
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-06-24 09:59:18 +05:30
Anagh Hegde
14eb9b4cb5
feat: Add API for git docs and supported shh keys ( #14641 )
2022-06-22 21:50:04 +05:30
Vishnu Gp
63205dce27
Merge pull request #14184 from appsmithorg/feat/git-delete-only-removed-resources
...
Feat: Perform file ops only when the resource is updated
2022-06-22 10:53:45 +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
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
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
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
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
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
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
Abhijeet
28e071b339
fix: Update serialization for map datatype to have predictable order for committing to git ( #12373 )
...
* Update serialization for map datatype to have a predictable order
* Refactor
2022-03-31 18:36:40 +05:30
Abhijeet
cdf06cb773
feat: API to discard changes for git connected applications ( #11362 )
...
* Add discard changes functionality for git
* Recover deleted resources from the file system and refactor
* Remove untracked files, remove unwanted actions
* Testcases added for discard changes
* Added comments
2022-03-02 19:54:09 +00:00
Anagh Hegde
231cb34199
Add check for yml CI files in git connect ( #11431 )
2022-02-25 17:51:45 +05:30
Anagh Hegde
9992a9ae3c
feat: Add api to check the git connection after the key is regenerated ( #11144 )
...
* Add api to check the git connection
* Add analytics event for test connection api
2022-02-16 22:25:38 +05:30
Abhijeet
6f7691b6aa
fix: Update error handling for git connect ( #11070 )
...
* Update error handling for git connect
* Add testcase for git generic error
2022-02-11 16:17:02 +05:30
Abhijeet
860318e0fe
chore: Add stopwatch to log execution time by process name ( #11069 )
...
* Add stopwatch to log execution time by process name
* Refactor
2022-02-10 16:59:26 +05:30
Abhijeet
fa0e900f3f
fix: Sort unordered set elements before committing to git repo so as to have same serialised output string for identical set of elements ( #10933 )
2022-02-08 00:48:20 +05:30
Anagh Hegde
fa06473d63
fix: Delete the pages post merge operation from application when they are removed from file system ( #10810 )
...
* Delete the pages post merge operation from application if they are removed from file system
* Changes per review
* Add tests
* changes per review
* Use string utils for null check
* Change per review
* Fix tests
* Fix tcs
2022-02-04 12:07:07 +05:30
Abhijeet
e356fd039f
chore: Commit only unpublished resources to git repo which includes queries, JSObjects, pages to avoid data duplication ( #10776 )
...
* Commit only unpublished resources to avoid resolving merge conflicts twice
* Added TCs
* Update directory names, fix pull issue in JSObjects
2022-02-03 11:47:57 +00:00
Abhijeet
8d93d06317
feat: Add reference doc url for error responses for git APIs ( #10620 )
...
* Added reference doc urls for pull conflicts
* Update TCs
2022-01-27 13:08:21 +05:30
Shrikant Sharat Kandula
6accb9e364
fix: Use CDN for all assets ( #10417 )
...
Co-authored-by: Nayan <nayan@appsmith.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2022-01-26 02:19:43 +05:30
Anagh Hegde
31f02df54f
Use the authorName as committer to avoid the inconsistency with name in git clients ( #10518 )
2022-01-20 19:49:36 +05:30
Abhijeet
62b720ab00
feat: Add documentation URL alongwith the error response to offer more info about the exception ( #10325 )
...
* Add doc url param in error response
* Modify TCs
* Update error codes to follow the sequence
2022-01-20 02:48:43 +00:00
Anagh Hegde
2469d21c51
fix: ssh to http url conversion ( #10173 )
...
* fix ssh to http url conversion
* fix sync branch issue
* changes per review
* changes per review
* fix error message
2022-01-10 11:00:36 +05:30
Abhijeet
4bc86a906f
chore: Update default local git repo path as per docker-volume requirements ( #9804 )
...
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-17 14:30:54 +00:00
Anagh Hegde
e216dad15b
feat: Refactor APIs to include branch name in the request header ( #9679 )
...
* refactor api's to include branchName for git
* Check for updating Ids for move action
* Added check for global profile
* Fix bad merge
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2021-12-14 15:09:30 +00:00
Anagh Hegde
a7b1902afd
feat: handle error messages for merge action ( #9030 )
...
* Handle merge conflicts
* Fix test failures
* Move branch name from request params to body for merge operation
* Use request body for branchNames
2021-11-12 10:04:29 +00:00
Anagh Hegde
2ad6a382ea
feat: checkout remote branch ( #8827 )
...
* Add API to checkout remote branch
* Create a new application on fetch
* Create a new application on checking out remote branch
* Add tests
* Change per review comments
* Changes per review comments
2021-11-09 14:04:00 +00:00
Anagh Hegde
b951d8db21
Get default branch from DB instead of remote to save time ( #8844 )
2021-10-29 09:32:02 +00:00
Anagh Hegde
4717b4bcf0
feat: git merge status ( #8692 )
...
* git merge status
2021-10-22 12:31:13 +00:00
Anagh Hegde
6faaa33936
feat: Git version control functionality with connect to remote, commit, push flows ( #8403 )
...
* core workflows of git - branch, clone, commit, pull, merge, status, log
* Rehydrate file system before merge operation
* Add logic to handle merge conflict for merge and pull flow
* Add defaultBranch to listBranch API
* Add Unit tests for git commands
* Upgrade JGit dependencies to fix the security issue
* Git command tests
* Revert unwanted changes and update delete application flow
* Disable git feature until the FE changes are merged
Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
2021-10-20 09:47:34 +00:00
Nayan
6247b6a3a5
feat: Generate and store ssh key to git meta data of application ( #7184 )
...
- Added new API that generates a new ssh key pair and stores that inside the git meta data of an application. The key is generated in open ssh format. The private key is stored as encrypted in DB.
2021-09-08 20:54:20 +06:00
Abhijeet
168000be92
[skip_changelog] Feature/directory structure for version control ( #6757 )
...
* Insert git application metadata to application object, for git sync/version control feature there is a need to save the application in the structured format
* Added changelog to index application collection with git branch and remoteurl
* Rehydrate and dehydrate applications among different instances
* Added serailisation purpose while exporting the application to make distinction between version control and regular import-export flow
* Git file operations moved to appsmith-git module
* Delete json reference from directory for deleted resource in DB
* Added git authentication in application metadata
* Replace String with Path to handle file path in git file structure
2021-09-06 18:18:18 +05:30
Anagh Hegde
078ad25613
feat: Create interface for git service and add all the required classes ( #6903 )
...
* Create interface for git service and add all the requireq classes
* Fix name of the service class
* Fix name of the service class as per review
2021-08-27 14:17:35 +05:30
