Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Task] Git mod - Components - Discard flow #37807

Closed
brayn003 opened this issue Nov 29, 2024 · 1 comment · Fixed by #38136
Closed

[Task] Git mod - Components - Discard flow #37807

brayn003 opened this issue Nov 29, 2024 · 1 comment · Fixed by #38136
Assignees
@brayn003
Labels
Packages & Git Pod All issues belonging to Packages and Git Packages Pod issues that belong to the packages pod Task A simple Todo

Comments

@brayn003
Copy link
Contributor

No description provided.

@brayn003 brayn003 added the Packages Pod issues that belong to the packages pod label Nov 29, 2024
@Nikhil-Nandagopal Nikhil-Nandagopal added the Task A simple Todo label Nov 29, 2024
@github-actions GitHub Actions
Copy link

We have found issues that are potential duplicates:

  • [[Task] Git mod - Components - Connect modal #37802] [Task] Git mod - Components - Connect modal (85%)
    If any of the issues listed above are a duplicate, please consider closing this issue & upvoting the original one.
    Alternatively, if neither of the listed issues addresses your feature/bug, keep this issue open.

@github-actions github-actions bot added potential-duplicate This label marks issues that are potential duplicates of already open issues Packages & Git Pod All issues belonging to Packages and Git labels Nov 29, 2024
@brayn003 brayn003 removed the potential-duplicate This label marks issues that are potential duplicates of already open issues label Dec 2, 2024
@brayn003 brayn003 self-assigned this Dec 2, 2024
@brayn003 brayn003 mentioned this issue Dec 12, 2024
Merged
2 tasks
github-actions bot pushed a commit to Zeral-Zhang/appsmith that referenced this issue Feb 7, 2025
@brayn003
chore: git mod - adding git ops modal (appsmithorg#38136)
a029ab7 
## Description
- Adds git modal
- Adds pull saga
- Adds ability to commit
- Adds ability to merge
- Adds ability to see status
- Adds ability to discard
- Improves on saga error handling

Fixes appsmithorg#37826 
Fixes appsmithorg#37803 
Fixes appsmithorg#37804 
Fixes appsmithorg#37807

## Automation

/ok-to-test tags="@tag.Git"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/12319147488>
> Commit: ec461fd
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12319147488&attempt=2"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Git`
> Spec:
> <hr>Fri, 13 Dec 2024 17:27:36 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **New Features**
- Introduced new components for managing Git operations, including
`ConflictErrorView`, `OpsModal`, `TabDeploy`, `TabMerge`, and
`StatusChanges`.
- Added loading and error handling components such as `StatusLoader` and
`DiscardFailedError`.
- Enhanced the `StatusTree` component for displaying hierarchical status
changes.
- **Bug Fixes**
	- Improved error handling across various sagas and components.
- **Refactor**
	- Renamed several modal toggle functions for clarity and consistency.
	- Updated prop types for improved type safety in components.
- **Chores**
	- Removed unused component `GitTest`.
	- Updated imports and exports for better organization.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@brayn003 brayn003

Labels
Packages & Git Pod All issues belonging to Packages and Git Packages Pod issues that belong to the packages pod Task A simple Todo
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

chore: git mod - adding git ops modal appsmithorg/appsmith
2 participants
@Nikhil-Nandagopal @brayn003