Skip to content

feat(Insomnia-Sync): Add diff view#7152

Merged
jackkav merged 10 commits intoKong:developfrom
gatzjames:feat/sync-diff
Mar 8, 2024
Merged

feat(Insomnia-Sync): Add diff view#7152
jackkav merged 10 commits intoKong:developfrom
gatzjames:feat/sync-diff

Conversation

@gatzjames
Copy link
Contributor

@gatzjames gatzjames commented Mar 7, 2024

Adds a diff view for comparing changes for Insomnia-Sync.

Highlights:

  • Revamped UX in commit modal to stage/unstage changes and compare them before commiting
  • Snapshot -> Commit cleanup in UI
  • Shows an indicator of the change type (modified, untracked, deleted)
  • Staged changes should be stored per workspace

Next steps:

  • Use the diff view in conflict resolution
  • Discard all changes and discard changed files one by one
  • Introduce the diff view for Git-Sync
image

Closes INS-3527

@gatzjames gatzjames self-assigned this Mar 7, 2024
@gatzjames gatzjames requested a review from a team March 7, 2024 10:39
@gatzjames gatzjames marked this pull request as ready for review March 8, 2024 12:59
@gatzjames gatzjames force-pushed the feat/sync-diff branch 2 times, most recently from f96fdce to 4e6da03 Compare March 8, 2024 16:12
@jackkav jackkav merged commit 83fde55 into Kong:develop Mar 8, 2024
jackkav pushed a commit to jackkav/insomnia that referenced this pull request Mar 13, 2024
* diff view

* wip

* fully works

* stage items per workspace

* Add indicators for the type of change

* cleanup code

* clean up ui

* fix type issue

* rm todo

* fix snapshot issue and update tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants