Skip to content

Commit

Permalink
Merge branch 'release/1.2.3-beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
mattRedBox committed Jul 15, 2020
2 parents c726e7a + 63b7f0b commit 3646c9a
Show file tree
Hide file tree
Showing 7 changed files with 961 additions and 855 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@




[![Unit Test Coverage Status](https://coveralls.io/repos/github/qcif/data-curator/badge.svg?branch=ci)](https://coveralls.io/github/qcif/data-curator?branch=ci)
[![Github All Releases](https://img.shields.io/github/downloads/qcif/data-curator/total.svg)](https://github.com/qcif/data-curator/releases)
[![Github Releases](https://img.shields.io/github/downloads/qcif/data-curator/latest/total.svg?label=Latest%20version%20downloads)](https://github.com/qcif/data-curator/releases/latest)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "DataCurator",
"version": "1.2.2-beta",
"version": "1.2.3-beta",
"author": " <matt@redboxresearchdata.com.au>",
"description": "Data Curator is a simple desktop CSV editor to help describe, validate and share usable open data",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/main/loadFrictionless.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export async function loadPackageJson (source) {
async function loadPackageDescriptor (dataPackageJson) {
let packageProperties = _.assign({}, dataPackageJson.descriptor)
_.unset(packageProperties, 'resources')
focusMainWindow().webContents.send('resetPackagePropertiesToObject', packageProperties)
focusMainWindow().webContents.send('resetPackageAndCustomPackagePropertiesToObject', packageProperties)
}

async function loadPackageResourcesAndData (dataPackageJson, dataFunc) {
Expand Down
8 changes: 6 additions & 2 deletions src/renderer/components/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,8 @@ export default {
ipc.on('closeLoadingScreen', function (event) {
self.closeLoadingScreen()
})
ipc.on('resetPackagePropertiesToObject', function (event, packageProperties) {
self.resetPackagePropertiesToObject(packageProperties)
ipc.on('resetPackageAndCustomPackagePropertiesToObject', function (event, packageProperties) {
self.resetPackageAndCustomPackagePropertiesToObject(packageProperties)
})
ipc.on('okToCloseTab', function (event, targetTabId) {
self.removeTab(targetTabId)
Expand Down Expand Up @@ -805,6 +805,10 @@ export default {
this.closeLoadingScreen()
}
},
resetPackageAndCustomPackagePropertiesToObject: function (packageProperties) {
this.createCustomPropertiesForType(packageProperties, 'package')
this.resetPackagePropertiesToObject(packageProperties)
},
storeResetCallback: function (allProperties) {
const self = this
this.createCustomPropertiesForType(allProperties.package, 'package')
Expand Down
Loading

0 comments on commit 3646c9a

Please sign in to comment.