Commit Graph

19 Commits

Author SHA1 Message Date
f0c1s
7a3985f962
feat: git discard changes (#11835)
* feat: git discard changes
* fixed cypress test in git connection
* feat: add discardDocUrl and update casing
* chore: update tests
* chore: fix review comment

Co-authored-by: haojin111 <haojin828@outlook.com>
2022-05-06 10:14:24 +05:30
f0c1s
736c2e024e
feat: git delete branch (#12681) 2022-04-13 15:33:23 +05:30
haojin111
9cfca0518f
feat: 9754 import work flow (#10453)
* updated import application modal design as v2

* updated import flow

* added title, description, uploadIcon on filepicker ads component for custom file picker

* adding modal of add credential for git import

* added "Git Import" modal

* added generating ssh key for importing flow

* fixed issue of merging

* chore: fix import

* chore: show old import modal based on feature flag

* seperated import api from connect

* added datasource list on reconnect credential modal

* chore: minor changes

* chore: move ssh keys to git sync reducer from applications reducer

* chore: minor fixes

* chore: fetch datasource config for import

* for pulling

* for review of displaying of datasource

* added reconnect datasources after git import

* fix: initialize datasource with default values

* fix: initialise redux for after updating datasource with default values

* fixed issue of git connection init when importing

* if there is a datasource config missing in import, reconnect modal should be opened

* updated logic for unconfigured datasources

* commented unnecessary code

* fixed issue of successful import

* updated import app error logic

* Add un-configured datasources to Import via file response

* Add test

* fix

* chore: refactors

* change per review

* fix: reset ssh keys / url

* Fix issue with newly created datasources not sent

* fix

* chore: minor updates

* chore: minor fix

* WIP

* added saas and rest api datasource form

* feat: fixes and updates for file import flow

* chore: close on upload

* Refactor logic ofr finding unconfigured datasources

* fix: minor fixes

* Fix issue with IsPartialImport

* fix

* Add PartialImport flag for ImportExport service

* refactoring of datasource editor form for both of importing app and editing app

* fixed collapse config

* Fix tests

* Handle redirection back to the /applications for oAuth type

* Show reconnect button on the datasources pages if the datasource configuration is skipped

* added analytic events for reconnecting datasource modal

* Fix the repo limit check for git import

* updated test of importing app from json as new work flow

* updated exported app json while testing automatically

* Add isImport flag for handling OAuth redirection in import flow

* WIP

* updated card UI for import from git title and message in import app modal

* chore: cleanup

* chore: lint

* fix: add is import query param to get token for oauth

* fix

* When the user imports the application there should not be any uncommitted changes displayed on the commit icon

* Add flag to identify OAuth redirection for git import

* Update the variable name

* refactoring reconnect datasource modal

* close git import modal when repo limit error responded

* fixed issue of restoring draft data of datasource form without save on reconnect datasource modal

* chore: update query

* updated query name of oauth redirection url

* Fix duplicate name issue in git import

* fixed rest api reconnect issue on reconnect modal

* init datasources and plugins after imported app, updated reconnect modal as new design

* added unconfigured datasource list logic when importing and updated rest api form delete button visible

* removed put default config of datasource and fixed issue on it

* Add logic to check isCOnfugred in datasource API

* Expose API to get un configured datasources for git import

* added fetch unconfigured datasource list api when redirecting form OAuth

* Remove sensitive fields from application json during export

* update put call response to check for datasourceConfig

* chore: use @appsmith for constants/messages

* chore: use download icon and Import for Importing application label

* chore: move import application text up a bit

* Fix bad merge

* chore: update skip to application tooltip text

* fixed tooltip content of skip to application CTA

* init values of datasource when importing

* updated ui of git import modal as figma design

* fixing padding issue of reconnect datasource modal

* fixed cursor issue on import app modal

* Fix issue with datasource config

* chore: make code compile

* chore: sort lines

* fixed save button issue of dbform on reconnecting modal

* fixed style of import application modal

* Fix iisue with wrong value updated to flag

* reverted from reconnection form style

* fix: update design as per slack discussions on 2022.02.23

* fix: move modal close button to the left

* Remove check for the flag and use the one from db

* Set siCOnfigured as true for mockdata sets

* updated creating datasource with isConfigured as false

* Fix NPE while importing

* fixed scrollbar issue and text alignment on reconnect datasource modal

* fixed style of form container in reconnect datasource and redirecting to app if all are configured

* remove unwanted fields from application json

* FIx NPE for file import

* fix: move close button up in import modal

* remove delete button on reconnect datasource modal

* Add isConfigured false while creating datasources

* fix: add a gap and update color

gap between git import dialog title and subtitle
update color of subtext to GREY_800

* fix: use git import feature flag

* fix: do not use older modal

* updated selecting logic of unconfigured datasource in reconnect modal

* cleanup: auto format

* cleanup: refactor react component

* cleanup: refactor some more

* cleanup: autoformat

* Fix reconnect flag for mockdatasource

* During git import set the isConfigured to false for datasources

* Remove decrypted field from the applicationJson file

* Remove decrypted field from the applicationJson file

* Add app slug to remote repo

* fixed cypress test related with git

* updated json while testing

* Changes per review

* Update the method name

* fixed cypress test related with git

* fixed migration cypress test

* set is configured field as true on tour app

* Fix issue with datasource creation for welcome tour

* fixed issue of replay_editor cypress test

Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Anubhav <anubhav@appsmith.com>
Co-authored-by: f0c1s <iamanubhavsaini+git@gmail.com>
2022-03-17 15:58:54 +05:30
Rishabh Saxena
7a0715af7c
chore: update error handling for git sync flows (#9998) 2021-12-27 12:25:54 +05:30
Rishabh Saxena
5ec308ce90
fix: git config updates (#9818) 2021-12-21 19:16:37 +05:30
Rishabh Saxena
2821ac2d75
fix: git sync updates (#9623)
Co-authored-by: haojin111 <haojin828@outlook.com>
2021-12-15 00:30:59 +08:00
haojin111
d701f8dfb1
fix: misc git sync fixes / ui polish (#9229)
Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com>
2021-12-07 07:59:32 +00:00
haojin111
616a1fac16
feat: progress, loading and error states for git flows, pull button and minor misc changes (#9052)
Co-authored-by: Rishabh Rathod <rishabh.rathod@appsmith.com>
Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
2021-11-16 15:54:38 +05:30
haojin111
d3c3707ad3
feat: git sync - add error, progress states to connect and merge tabs (#9007)
Co-authored-by: Rishabh Rathod <rishabh.rathod@appsmith.com>
2021-11-09 15:21:18 +05:30
Rishabh Rathod
1235e5a7a5
fix: git merge (#8892)
* fix git merge
2021-11-04 20:48:40 +00:00
Rishabh Saxena
e944d005c1
fix: fixes related to switch branches (#8864) 2021-11-02 07:33:12 +00:00
Rishabh Rathod
6b0259fe01
fix: Git sync common UI (#8768)
* fix git branches and modal ui fixes
* fix deploy preview UI
* Add Merge API
* fix: udpate key to branchName
* add messages to constant/messages.ts

Co-authored-by: rishabh saxena <rishabh.robben@gmail.com>
2021-10-25 19:57:58 +00:00
Rishabh Rathod
258189cc3f
fix: git sync ui fixes (#8133) 2021-10-20 07:38:17 +00:00
Rishabh Saxena
31476092cc
chore: refactors for supporting git branches (#7695) 2021-10-18 19:33:44 +05:30
Rishabh Rathod
90a275a502
fix: On connect Tab Switch error (#7740)
fix: On connect Tab Switch error
Add Git local config API
2021-09-23 08:47:09 +00:00
Rishabh Rathod
48dabf9efd
feat: Add Git push API & UI Updates (#7704)
Add Git push API & UI Updates
-  Add Global Config fetch in git connection
-  Add Success Toast Msg for commit and push API
-  Fix generate and fetch SSHKey API
-  Fix Close button UI
-  Add Tick Icon when SSH Key is copied
- Add Direct Deploy option
-  Hide Merge Tab
- Add Commit success and push success msg
- Add the Latest Deploy Preview option
2021-09-23 00:18:50 +05:30
Rishabh Rathod
373f64c9ca
feat: git sync ui update (#7486)
- fix commit & push functionality
- Add Link to docs
- Add user settings toggle

Co-authored-by: Rishabh Saxena <rishabh.robben@gmail.com>
2021-09-17 22:28:04 +05:30
Rishabh Saxena
819f0c2753
feat: add git config to user profile settings (#7538) 2021-09-17 16:18:38 +05:30
Rishabh Rathod
a6c2a63ce9
feat: Git connection (#7269)
Add git connection UI

Co-authored-by: Rishabh Saxena <rishabh.robben@gmail.com>
2021-09-13 18:56:24 +05:30