mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force env editor to refresh on sync change (Closes #563)

Browse Source
This commit is contained in:
Gregory Schier 2017-11-10 12:29:18 +01:00
parent 99a7d6fe60
commit e0bed8c114
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/common/database.js
View File

@ -40,7 +40,11 @@ function getDBFilePath (modelType) {
* @param forceReset
* @returns {null}
*/
export async function init (types: Array<string>, config: Object = {}, forceReset: boolean = false) {
export async function init (
types: Array<string>,
config: Object = {},
forceReset: boolean = false
) {
if (forceReset) {
changeListeners = [];
db = {};
@ -240,8 +244,10 @@ export function insert<T: BaseModel> (doc: T, fromSync: boolean = false): Promis
return reject(err);
}
notifyOfChange(CHANGE_INSERT, newDoc, fromSync);
resolve(newDoc);
// NOTE: This needs to be after we resolve
notifyOfChange(CHANGE_INSERT, newDoc, fromSync);
});
});
}
@ -254,9 +260,10 @@ export function update<T: BaseModel> (doc: T, fromSync: boolean = false): Promis
return reject(err);
}
notifyOfChange(CHANGE_UPDATE, docWithDefaults, fromSync);
resolve(docWithDefaults);
// NOTE: This needs to be after we resolve
notifyOfChange(CHANGE_UPDATE, docWithDefaults, fromSync);
});
});
}
@ -311,7 +318,10 @@ export async function docUpdate<T: BaseModel> (originalDoc: T, patch: Object = {
return update(doc);
}
export async function docCreate<T: BaseModel> (type: string, ...patches: Array<Object>): Promise<T> {
export async function docCreate<T: BaseModel> (
type: string,
...patches: Array<Object>
): Promise<T> {
const doc = await initModel(
type,
...patches,

34
app/ui/components/modals/workspace-environments-edit-modal.js
View File

@ -17,6 +17,7 @@ import {trackEvent} from '../../../analytics/index';
import {DEBOUNCE_MILLIS} from '../../../common/constants';
import type {Workspace} from '../../../models/workspace';
import type {Environment} from '../../../models/environment';
import * as db from '../../../common/database';
type Props = {
activeEnvironment: Environment | null,
@ -43,6 +44,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
colorChangeTimeout: any;
saveTimeout: any;
modal: Modal;
editorKey: number;
constructor (props: Props) {
super(props);
@ -55,6 +57,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
};
this.colorChangeTimeout = null;
this.editorKey = 0;
}
hide () {
@ -212,6 +215,26 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
this._handleChangeEnvironmentColor(environment, null);
}
componentDidMount () {
db.onChange(async changes => {
const {selectedEnvironmentId} = this.state;
for (const change of changes) {
const [
_, // eslint-disable-line no-unused-vars
doc,
fromSync
] = change;
// Force an editor refresh if any changes from sync come in
if (doc._id === selectedEnvironmentId && fromSync) {
this.editorKey = doc.modified;
await this._load(this.state.workspace);
}
}
});
}
async _handleClickColorChange (environment: Environment) {
let el = document.querySelector('#env-color-picker');
@ -244,7 +267,14 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
return;
}
const data = this.environmentEditorRef.getValue();
let data;
try {
data = this.environmentEditorRef.getValue();
} catch (err) {
// Invalid JSON probably
return;
}
const activeEnvironment = this._getActiveEnvironment();
if (activeEnvironment) {
@ -385,7 +415,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
editorKeyMap={editorKeyMap}
lineWrapping={lineWrapping}
ref={this._setEditorRef}
key={activeEnvironment ? activeEnvironment._id : 'n/a'}
key={`${this.editorKey}::${activeEnvironment ? activeEnvironment._id : 'n/a'}`}
environment={activeEnvironment ? activeEnvironment.data : {}}
didChange={this._didChange}
render={render}