glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

attempt to fix import problems (#852)

Browse source
This commit is contained in:
Devin Howard 2016-10-26 20:34:22 +08:00 committed by GitHub
parent 175a3ee73e
commit 7b4a072fd8
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/Metamaps/Import.js
View file

@ -90,7 +90,7 @@ const Import = {
if (window.confirm('Are you sure you want to create ' + topics.length + if (window.confirm('Are you sure you want to create ' + topics.length +
' new topics and ' + synapses.length + ' new synapses?')) { ' new topics and ' + synapses.length + ' new synapses?')) {
self.importTopics(topics) self.importTopics(topics)
self.importSynapses(synapses) window.setTimeout(() => self.importSynapses(synapses), 5000)
} // if } // if
} // if } // if
}, },
@ -224,7 +224,7 @@ const Import = {
importTopics: function (parsedTopics) { importTopics: function (parsedTopics) {
var self = Import var self = Import
parsedTopics.forEach(function (topic) { parsedTopics.forEach(topic => {
let coords = { x: topic.x, y: topic.y } let coords = { x: topic.x, y: topic.y }
if (!coords.x || !coords.y) { if (!coords.x || !coords.y) {
coords = AutoLayout.getNextCoord({ mappings: Metamaps.Mappings }) coords = AutoLayout.getNextCoord({ mappings: Metamaps.Mappings })
@ -257,7 +257,7 @@ const Import = {
var topic1 = Metamaps.Topics.get(self.cidMappings[synapse.topic1]) var topic1 = Metamaps.Topics.get(self.cidMappings[synapse.topic1])
if (!topic1) topic1 = Metamaps.Topics.findWhere({ name: synapse.topic1 }) if (!topic1) topic1 = Metamaps.Topics.findWhere({ name: synapse.topic1 })
var topic2 = Metamaps.Topics.get(self.cidMappings[synapse.topic2]) var topic2 = Metamaps.Topics.get(self.cidMappings[synapse.topic2])
if (!topic1) topic1 = Metamaps.Topics.findWhere({ name: synapse.topic1 }) if (!topic2) topic2 = Metamaps.Topics.findWhere({ name: synapse.topic2 })
if (!topic1 || !topic2) { if (!topic1 || !topic2) {
console.error("One of the two topics doesn't exist!") console.error("One of the two topics doesn't exist!")
@ -265,17 +265,10 @@ const Import = {
return // next return // next
} }
// ensure imported topics have a chance to get a real id attr before creating synapses self.createSynapseWithParameters(
const topic1Promise = $.Deferred() synapse.desc, synapse.category, synapse.permission,
topic1.once('sync', () => topic1Promise.resolve()) topic1, topic2
const topic2Promise = $.Deferred() )
topic2.once('sync', () => topic2Promise.resolve())
$.when(topic1Promise, topic2Promise).done(() => {
self.createSynapseWithParameters(
synapse.desc, synapse.category, synapse.permission,
topic1, topic2
)
})
}) })
}, },