mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix

Browse Source
This commit is contained in:
Gregory Schier 2016-11-10 14:34:55 -08:00
parent 2172df2d40
commit 26cf1bc50b
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/analytics/index.js
View File

@ -14,11 +14,13 @@ export function initAnalytics(accountId) {
}
export function trackEvent (...args) {
google.trackEvent(...args)
google.trackEvent(...args);
console.log(`[analytics] track ${args.join(', ')}`);
}
export function setAccountId (accountId) {
google.setAccountId(accountId);
console.log(`[analytics] account Id ${accountId}`);
}
export function trackLegacyEvent (event, properties) {

27
app/sync/index.js
View File

@ -118,21 +118,27 @@ export async function pushActiveDirtyResources (resourceGroupId = null) {
for (const {id, version} of updated) {
const resource = await store.getResourceByDocId(id);
await store.updateResource(resource, {version, dirty: false});
// logger.debug(`Push updated ${id}`);
}
if (updated.length) {
logger.debug(`Push updated ${updated.length} resources`);
}
// Update all resource versions with the ones that were returned
for (const {id, version} of created) {
const resource = await store.getResourceByDocId(id);
await store.updateResource(resource, {version, dirty: false});
// logger.debug(`Push created ${id}`);
}
if (created.length) {
logger.debug(`Push created ${created.length} resources`);
}
// Update all resource versions with the ones that were returned
for (const {id, version} of removed) {
const resource = await store.getResourceByDocId(id);
await store.updateResource(resource, {version, dirty: false});
// logger.debug(`Push removed ${id}`);
}
if (removed.length) {
logger.debug(`Push removed ${removed.length} resources`);
}
// Resolve conflicts
@ -345,6 +351,13 @@ export async function getOrCreateConfig (resourceGroupId) {
}
}
export async function ensureConfigExists (resourceGroupId, syncMode) {
const config = await store.getConfig(resourceGroupId);
if (!config) {
await store.insertConfig({resourceGroupId, syncMode});
}
}
export async function createOrUpdateConfig (resourceGroupId, syncMode) {
const config = await store.getConfig(resourceGroupId);
const patch = {resourceGroupId, syncMode};
@ -438,7 +451,9 @@ function _fetchResourceGroup (resourceGroupId) {
// Also make sure a config exists when we first fetch it.
// TODO: This exists in multiple places, so move it to one place.
createOrUpdateConfig(resourceGroupId, store.SYNC_MODE_OFF);
const config = await getOrCreateConfig(resourceGroupId);
const syncMode = config ? config.syncMode : store.SYNC_MODE_OFF;
createOrUpdateConfig(resourceGroupId, syncMode);
}
// Bust cached promise because we're done with it.
@ -534,7 +549,7 @@ async function _createResourceGroup (name = '') {
}
// Create a config for it
await createOrUpdateConfig(resourceGroup.id, store.SYNC_MODE_OFF);
await ensureConfigExists(resourceGroup.id, store.SYNC_MODE_OFF);
logger.debug(`Created ResourceGroup ${resourceGroup.id}`);
return resourceGroup;
@ -568,7 +583,7 @@ async function _createResourceForDoc (doc) {
if (!workspaceResource) {
const workspaceResourceGroup = await _createResourceGroup(workspace.name);
await createOrUpdateConfig(workspaceResourceGroup.id, store.SYNC_MODE_OFF);
await ensureConfigExists(workspaceResourceGroup.id, store.SYNC_MODE_OFF);
workspaceResource = await _createResource(workspace, workspaceResourceGroup.id);
}

5
app/ui/components/modals/SyncModal.js
View File

@ -45,8 +45,7 @@ class SyncModal extends Component {
trackEvent('Sync', 'Push');
}
async _handleSyncModeChange (syncData, e) {
const syncMode = e.target.value;
async _handleSyncModeChange (syncData, syncMode) {
const {resourceGroupId} = syncData.resource;
await sync.createOrUpdateConfig(resourceGroupId, syncMode);
@ -169,7 +168,7 @@ class SyncModal extends Component {
<select name="sync-type"
id="sync-type"
value={syncMode}
onChange={this._handleSyncModeChange.bind(this, syncData)}>
onChange={e => this._handleSyncModeChange(syncData, e.target.value)}>
<option value={syncStorage.SYNC_MODE_ON}>Automatic</option>
<option value={syncStorage.SYNC_MODE_OFF}>Manual</option>
</select>