From 014207da3f3b8d9ca03a479bdc578686dc4d38d1 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Wed, 25 Sep 2019 12:54:46 +0200 Subject: [PATCH] Prep for 2.0.1 --- CHANGELOG.md | 6 ++++++ feature/feature.xml | 2 +- feature/pom.xml | 2 +- p2/category.xml | 2 +- p2/pom.xml | 2 +- plugin/META-INF/MANIFEST.MF | 2 +- plugin/pom.xml | 2 +- plugin/src/main/nodes/pharmacophores/pharmacophores.js | 9 +++------ pom.xml | 2 +- targetplatform/pom.xml | 2 +- tests/META-INF/MANIFEST.MF | 2 +- tests/pom.xml | 2 +- 12 files changed, 19 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd1b0a5..d1df686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ The file is formatted as described on http://keepachangelog.com/. Workflows using v1 molviewer nodes will need to replace them with the v2 molviewer nodes. +## [2.0.1] - 2019-09-25 + +### Fixed + +- Pharmacphore viewer gave syntax error + ## [2.0.0] - 2019-09-24 ### Changed diff --git a/feature/feature.xml b/feature/feature.xml index 52b2c45..65f881e 100644 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/feature/pom.xml b/feature/pom.xml index ba62195..771d229 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -5,7 +5,7 @@ nl.esciencecenter.e3dchem.knime.molviewer nl.esciencecenter.e3dchem.knime.molviewer - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT nl.esciencecenter.e3dchem.knime.molviewer.feature diff --git a/p2/category.xml b/p2/category.xml index ee04fb9..5f76b61 100644 --- a/p2/category.xml +++ b/p2/category.xml @@ -1,6 +1,6 @@ - + diff --git a/p2/pom.xml b/p2/pom.xml index d8bacd8..388d8b7 100644 --- a/p2/pom.xml +++ b/p2/pom.xml @@ -4,7 +4,7 @@ nl.esciencecenter.e3dchem.knime.molviewer nl.esciencecenter.e3dchem.knime.molviewer - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT nl.esciencecenter.e3dchem.knime.molviewer.p2 eclipse-repository diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF index 321f2da..2188a64 100644 --- a/plugin/META-INF/MANIFEST.MF +++ b/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: MolViewer Nodes Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.molviewer.plugin;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Netherlands eScience Center Require-Bundle: org.eclipse.core.runtime, diff --git a/plugin/pom.xml b/plugin/pom.xml index 8245e52..b492a6d 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ nl.esciencecenter.e3dchem.knime.molviewer nl.esciencecenter.e3dchem.knime.molviewer - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT nl.esciencecenter.e3dchem.knime.molviewer.plugin eclipse-plugin diff --git a/plugin/src/main/nodes/pharmacophores/pharmacophores.js b/plugin/src/main/nodes/pharmacophores/pharmacophores.js index 6db7530..0657d23 100644 --- a/plugin/src/main/nodes/pharmacophores/pharmacophores.js +++ b/plugin/src/main/nodes/pharmacophores/pharmacophores.js @@ -1,9 +1,6 @@ window.molviewerPharmacophores = function () { const MolviewerPharmacophores = {}; MolviewerPharmacophores.init = function (representation, value, modules) { - debugger - // const Molviewer = modules[0]; - const div = document.createElement('div'); div.setAttribute('id', 'viewport'); document.body.append(div); @@ -105,8 +102,8 @@ window.molviewerPharmacophores = function () { const initialSelection = { selectionMethod: "selection", changeSet: { - added: this.app.store.getState().pharmacophores.filter(m => m.visible).map(m => m.id), - removed: this.app.store.getState().pharmacophores.filter(m => !m.visible).map(m => m.id) + added: this.app.store.getState().pharmacophores.items.filter(m => m.visible).map(m => m.id), + removed: this.app.store.getState().pharmacophores.items.filter(m => !m.visible).map(m => m.id) } }; knimeService.publishSelection(tableId, initialSelection, true) @@ -119,7 +116,7 @@ window.molviewerPharmacophores = function () { MolviewerPharmacophores.getComponentValue = function () { const state = this.app.store.getState(); const selection = {}; - state.pharmacophores.forEach(m => { + state.pharmacophores.items.forEach(m => { selection[m.id] = m.visible; }); this.value.outColumns = { diff --git a/pom.xml b/pom.xml index 346a329..b92c290 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.molviewer nl.esciencecenter.e3dchem.knime.molviewer - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT pom diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index 9d280c5..2558c67 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -20,7 +20,7 @@ Contributors: nl.esciencecenter.e3dchem.knime.molviewer nl.esciencecenter.e3dchem.knime.molviewer - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index 65de835..0ab1141 100644 --- a/tests/META-INF/MANIFEST.MF +++ b/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.molviewer.tests -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.12.0", org.knime.core;bundle-version="[4.0.0,5.0.0)", diff --git a/tests/pom.xml b/tests/pom.xml index 7a90bc2..26700e5 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ nl.esciencecenter.e3dchem.knime.molviewer nl.esciencecenter.e3dchem.knime.molviewer - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT nl.esciencecenter.e3dchem.knime.molviewer.tests