mirror of
https://github.com/Kong/insomnia
synced 2024-11-08 23:00:30 +00:00
0a616fba6b
* VCS proof of concept underway! * Stuff * Some things * Replace deprecated Electron makeSingleInstance * Rename `window` variables so not to be confused with window object * Don't unnecessarily update request when URL does not change * Regenerate package-lock * Fix tests + ESLint * Publish - insomnia-app@1.0.49 - insomnia-cookies@0.0.12 - insomnia-httpsnippet@1.16.18 - insomnia-importers@2.0.13 - insomnia-libcurl@0.0.23 - insomnia-prettify@0.1.7 - insomnia-url@0.1.6 - insomnia-xpath@1.0.9 - insomnia-plugin-base64@1.0.6 - insomnia-plugin-cookie-jar@1.0.8 - insomnia-plugin-core-themes@1.0.5 - insomnia-plugin-default-headers@1.1.9 - insomnia-plugin-file@1.0.7 - insomnia-plugin-hash@1.0.7 - insomnia-plugin-jsonpath@1.0.12 - insomnia-plugin-now@1.0.11 - insomnia-plugin-os@1.0.13 - insomnia-plugin-prompt@1.1.9 - insomnia-plugin-request@1.0.18 - insomnia-plugin-response@1.0.16 - insomnia-plugin-uuid@1.0.10 * Broken but w/e * Some tweaks * Big refactor. Create local snapshots and push done * POC merging and a lot of improvements * Lots of work done on initial UI/UX * Fix old tests * Atomic writes and size-based batches * Update StageEntry definition once again to be better * Factor out GraphQL query logic * Merge algorithm, history modal, other minor things * Fix test * Merge, checkout, revert w/ user changes now work * Force UI to refresh when switching branches changes active request * Rough draft pull() and some cleanup * E2EE stuff and some refactoring * Add ability to share project with team and fixed tests * VCS now created in root component and better remote project handling * Remove unused definition * Publish - insomnia-account@0.0.2 - insomnia-app@1.1.1 - insomnia-cookies@0.0.14 - insomnia-httpsnippet@1.16.20 - insomnia-importers@2.0.15 - insomnia-libcurl@0.0.25 - insomnia-prettify@0.1.9 - insomnia-sync@0.0.2 - insomnia-url@0.1.8 - insomnia-xpath@1.0.11 - insomnia-plugin-base64@1.0.8 - insomnia-plugin-cookie-jar@1.0.10 - insomnia-plugin-core-themes@1.0.7 - insomnia-plugin-file@1.0.9 - insomnia-plugin-hash@1.0.9 - insomnia-plugin-jsonpath@1.0.14 - insomnia-plugin-now@1.0.13 - insomnia-plugin-os@1.0.15 - insomnia-plugin-prompt@1.1.11 - insomnia-plugin-request@1.0.20 - insomnia-plugin-response@1.0.18 - insomnia-plugin-uuid@1.0.12 * Move some deps around * Fix Flow errors * Update package.json * Fix eslint errors * Fix tests * Update deps * bootstrap insomnia-sync * TRy fixing appveyor * Try something else * Bump lerna * try powershell * Try again * Fix imports * Fixed errors * sync types refactor * Show remote projects in workspace dropdown * Improved pulling of non-local workspaces * Loading indicators and some tweaks * Clean up sync staging modal * Some sync improvements: - No longer store stage - Upgrade Electron - Sync UI/UX improvements * Fix snyc tests * Upgraded deps and hot loader tweaks (it's broken for some reason) * Fix tests * Branches dialog, network refactoring, some tweaks * Fixed merging when other branch is empty * A bunch of small fixes from real testing * Fixed pull merge logic * Fix tests * Some bug fixes * A few small tweaks * Conflict resolution and other improvements * Fix tests * Add revert changes * Deal with duplicate projects per workspace * Some tweaks and accessibility improvements * Tooltip accessibility * Fix API endpoint * Fix tests * Remove jest dep from insomnia-importers
80 lines
1.9 KiB
JavaScript
80 lines
1.9 KiB
JavaScript
// @flow
|
|
import * as React from 'react';
|
|
import autobind from 'autobind-decorator';
|
|
import VCS from '../../sync/vcs';
|
|
import { showError } from './modals';
|
|
|
|
type Props = {
|
|
vcs: VCS,
|
|
branch: string,
|
|
onPull: Function,
|
|
disabled?: boolean,
|
|
className?: string,
|
|
children?: React.Node,
|
|
};
|
|
|
|
type State = {
|
|
loading: boolean,
|
|
};
|
|
|
|
@autobind
|
|
class SyncPullButton extends React.PureComponent<Props, State> {
|
|
_timeout: TimeoutID;
|
|
state = {
|
|
loading: false,
|
|
};
|
|
|
|
async _handleClick() {
|
|
const { vcs, onPull, branch } = this.props;
|
|
|
|
this.setState({ loading: true });
|
|
const newVCS = vcs.newInstance();
|
|
const oldBranch = await newVCS.getBranch();
|
|
|
|
let failed = false;
|
|
try {
|
|
// Clone old VCS so we don't mess anything up while working on other projects
|
|
await newVCS.checkout([], branch);
|
|
await newVCS.pull([]);
|
|
} catch (err) {
|
|
showError({
|
|
title: 'Pull Error',
|
|
message: 'Failed to pull ' + branch,
|
|
error: err,
|
|
});
|
|
failed = true;
|
|
} finally {
|
|
// We actually need to checkout the old branch again because the VCS
|
|
// stores it on the filesystem. We should probably have a way to not
|
|
// have to do this hack
|
|
await newVCS.checkout([], oldBranch);
|
|
}
|
|
|
|
// Do this a bit later so the loading doesn't seem to stop too early
|
|
this._timeout = setTimeout(() => {
|
|
this.setState({ loading: false });
|
|
}, 400);
|
|
|
|
if (!failed) {
|
|
onPull && onPull();
|
|
}
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
clearTimeout(this._timeout);
|
|
}
|
|
|
|
render() {
|
|
const { className, children, disabled } = this.props;
|
|
const { loading } = this.state;
|
|
return (
|
|
<button className={className} onClick={this._handleClick} disabled={disabled}>
|
|
{loading && <i className="fa fa-spin fa-refresh space-right" />}
|
|
{children || 'Pull'}
|
|
</button>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default SyncPullButton;
|