insomnia/packages/insomnia-app/app/ui/components/modals/sync-merge-modal.js
Gregory Schier 0a616fba6b
Version Control (beta) (#1439)
* 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
2019-04-17 17:50:03 -07:00

126 lines
3.5 KiB
JavaScript

// @flow
import * as React from 'react';
import autobind from 'autobind-decorator';
import Modal from '../base/modal';
import ModalBody from '../base/modal-body';
import ModalHeader from '../base/modal-header';
import type { Workspace } from '../../../models/workspace';
import VCS from '../../../sync/vcs';
import type { DocumentKey, MergeConflict, StatusCandidate } from '../../../sync/types';
import ModalFooter from '../base/modal-footer';
type Props = {
workspace: Workspace,
vcs: VCS,
syncItems: Array<StatusCandidate>,
};
type State = {
conflicts: Array<MergeConflict>,
};
@autobind
class SyncMergeModal extends React.PureComponent<Props, State> {
modal: ?Modal;
_handleDone: (Array<MergeConflict>) => void;
state = {
conflicts: [],
};
_setModalRef(n: ?Modal) {
this.modal = n;
}
_handleOk() {
this._handleDone(this.state.conflicts);
this.hide();
}
_handleToggleSelect(key: DocumentKey, e: SyntheticEvent<HTMLInputElement>) {
const conflicts = this.state.conflicts.map(c => {
if (c.key !== key) {
return c;
}
return { ...c, choose: e.currentTarget.value };
});
this.setState({ conflicts });
}
async show(options: {
conflicts: Array<MergeConflict>,
handleDone: (Array<MergeConflict>) => void,
}) {
this.modal && this.modal.show();
this._handleDone = options.handleDone;
this.setState({
conflicts: options.conflicts,
});
}
hide() {
this.modal && this.modal.hide();
}
render() {
const { conflicts } = this.state;
return (
<Modal ref={this._setModalRef}>
<ModalHeader key="header">Resolve Conflicts</ModalHeader>
<ModalBody key="body" className="pad text-center" noScroll>
<table className="table--fancy table--outlined">
<thead>
<tr>
<th>Name</th>
<th>Description</th>
<th style={{ width: '10rem' }}>Choose</th>
</tr>
</thead>
<tbody>
{conflicts.map(conflict => (
<tr key={conflict.key}>
<td className="text-left">{conflict.name}</td>
<td className="text-left">{conflict.message}</td>
<td className="no-wrap">
<label className="no-pad">
Mine{' '}
<input
type="radio"
name="choice"
value={conflict.mineBlob}
checked={conflict.choose === conflict.mineBlob}
onChange={e => this._handleToggleSelect(conflict.key, e)}
/>
</label>
<label className="no-pad margin-left">
Theirs{' '}
<input
type="radio"
name="choice"
value={conflict.theirsBlob}
checked={conflict.choose === conflict.theirsBlob}
onChange={e => this._handleToggleSelect(conflict.key, e)}
/>
</label>
</td>
</tr>
))}
</tbody>
</table>
</ModalBody>
<ModalFooter>
<button className="btn" onClick={this._handleOk}>
Submit Resolutions
</button>
</ModalFooter>
</Modal>
);
}
}
export default SyncMergeModal;