Skip to content

Commit

Permalink
#988, #1003: Removed debug and redundant code.
Browse files Browse the repository at this point in the history
  • Loading branch information
mattRedBox committed Jun 23, 2020
1 parent 65c8118 commit 407a343
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 24 deletions.
1 change: 0 additions & 1 deletion src/renderer/frictionlessDataPackage.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ function auditResourceRequirements (hot, requiredMessages) {
requiredMessages.push(`Column property names cannot be empty - set a Header Row`)
}
for (const nextColumn of columnProperties) {
console.dir(nextColumn)
checkReservedWordsForPropertyList(nextColumn, requiredMessages, 'column', 'customs')
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/renderer/partials/ColumnProperties.vue
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@ export default {
mounted: function () {
let self = this
this.$subscribeTo(allTablesAllColumnNames$, function (result) {
console.log('inside all tables all column names...')
self.updateAllTablesAllColumnsNames(result)
})
allTablesAllColumnNames$.next(this.getAllHotTablesColumnNames())
Expand Down Expand Up @@ -619,7 +618,6 @@ export default {
let getter = this.getter(hotId, key)
let property = this.getHotColumnProperty(getter)
if (typeof property === 'undefined') {
console.log(`couldn't get column properties, so trying preferences...`)
property = this.setPreferencesAsDefault(key, this.setProperty)
}
return property
Expand Down
23 changes: 2 additions & 21 deletions src/renderer/partials/Customs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -149,22 +149,10 @@ export default {
},
created: async function () {
const self = this
console.log('created.')
this.$subscribeTo(hotIdFromTab$, function (hotId) {
console.log('returning customs here')
self.customs = self.getPropertyGivenHotId('customs', hotId) || self.getProperty('customs') || []
})
let hotId = await this.currentHotId()
// console.log(`hot id is ${hotId}`)
this.$subscribeTo(allTablesAllColumnNames$, function (result) {
console.log('returning customs in columns sub here')
console.log(`current hot id is ${self.activeCurrentHotId}`)
self.customs = self.getPropertyGivenHotId('customs', self.activeCurrentHotId) || self.getProperty('customs') || []
})
preferenceUpdate$.pipe(filter(key => key === 'customs')).subscribe(function (key) {
const parent = self.parentName
if (!_.isEmpty(parent) && parent !== 'preferences') {
console.log('merging into store...')
self.mergeDefaultPreferencesIntoStore()
}
})
Expand Down Expand Up @@ -206,21 +194,15 @@ export default {
asyncComputed: {
getCustoms: {
async get () {
// const self = this
// console.log('returning customs')
// if (!this.isChildOfPreferences()) {
// const hotId = await this.currentHotId
// }
console.log('returning customs after')
this.mergeDefaultPreferencesIntoStore()
this.customs = this.getProperty('customs') || []
return this.customs
},
watch () {
let temp0 = this.customs
// let temp0 = this.customs
let temp = this.getActiveTab
let temp2 = this.cIndex
let temp3 = this.allTablesAllColumns
// let temp3 = this.allTablesAllColumns
}
},
isChildOfPreferences: {
Expand All @@ -246,7 +228,6 @@ export default {
let storeCustom = _.find(storeCustoms, function (nextCustom) { return nextCustom.name === custom['name'] })
_.set(custom, 'value', _.get(storeCustom, 'value'))
})
console.log('and setting property...')
this.setProperty('customs', mergedCustoms)
},
removeOnError: function (errorId, index) {
Expand Down

0 comments on commit 407a343

Please sign in to comment.