From 407a3432f27b6d03df5e813b5a63f539c56f364b Mon Sep 17 00:00:00 2001 From: mattRedBox Date: Wed, 24 Jun 2020 00:09:23 +1000 Subject: [PATCH] #988, #1003: Removed debug and redundant code. --- src/renderer/frictionlessDataPackage.js | 1 - src/renderer/partials/ColumnProperties.vue | 2 -- src/renderer/partials/Customs.vue | 23 ++-------------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/renderer/frictionlessDataPackage.js b/src/renderer/frictionlessDataPackage.js index 5bd703a5e..15bba6818 100644 --- a/src/renderer/frictionlessDataPackage.js +++ b/src/renderer/frictionlessDataPackage.js @@ -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') } } diff --git a/src/renderer/partials/ColumnProperties.vue b/src/renderer/partials/ColumnProperties.vue index d9b20457f..c0da56f80 100644 --- a/src/renderer/partials/ColumnProperties.vue +++ b/src/renderer/partials/ColumnProperties.vue @@ -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()) @@ -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 diff --git a/src/renderer/partials/Customs.vue b/src/renderer/partials/Customs.vue index 9589e86f4..ec8e13192 100644 --- a/src/renderer/partials/Customs.vue +++ b/src/renderer/partials/Customs.vue @@ -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() } }) @@ -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: { @@ -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) {