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

Sync improvements #7098

Merged
merged 6 commits into from
Feb 21, 2024
Merged

Sync improvements #7098

merged 6 commits into from
Feb 21, 2024

Conversation

gatzjames
Copy link
Contributor

@gatzjames gatzjames commented Feb 20, 2024 •
edited
Loading

Highlights:

  • Improve UX of sync conflicts modal
  • Improve error handling for staging modal
  • Clean up workspace loader logic and data structures
  • Display unsynced files in the project view
  • Display unsynced files in command palette

@gatzjames gatzjames requested a review from a team February 20, 2024 10:15
@gatzjames gatzjames self-assigned this Feb 20, 2024
@gatzjames gatzjames force-pushed the feat/sync-improvements branch from 03a660c to f4b8d49 Compare February 20, 2024 11:28
@gatzjames gatzjames marked this pull request as ready for review February 20, 2024 14:13
jackkav
jackkav reviewed Feb 20, 2024
View reviewed changes
packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx
@@ -30,13 +27,10 @@ import { SvgIcon } from '../svg-icon';

interface Props {
workspace: Workspace;
workspaceMeta: WorkspaceMeta;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

@gatzjames gatzjames force-pushed the feat/sync-improvements branch from 0d8461c to 449880b Compare February 21, 2024 10:45
filfreire
filfreire approved these changes Feb 21, 2024
View reviewed changes
Copy link
Member

@filfreire filfreire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM tried it locally

@gatzjames gatzjames merged commit a7125a2 into Kong:develop Feb 21, 2024
7 checks passed
@gatzjames gatzjames deleted the feat/sync-improvements branch February 21, 2024 16:45
jackkav pushed a commit to jackkav/insomnia that referenced this pull request Mar 13, 2024
@gatzjames @jackkav
Sync improvements (Kong#7098)
db77903 
* Conflict modal

* Better error handling for staging modal

* move pull dropdown items to project view

* add unsynced files to command palette

* add scratchpad check

* loading indicator for pulling remote projects on palette
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackkav jackkav jackkav left review comments

@filfreire filfreire filfreire approved these changes

Assignees

@gatzjames gatzjames

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gatzjames @jackkav @filfreire