Prep for 2.0.1

3D-e-Chem · Sep 25, 2019 · 014207d · 014207d
1 parent d22a47e
commit 014207d
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 16 deletions.
diff --git 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
@@ -2,7 +2,7 @@
 <feature
       id="nl.esciencecenter.e3dchem.knime.molviewer.feature"
       label="MolViewer nodes for KNIME"
-      version="2.0.0.qualifier"
+      version="2.0.1.qualifier"
       provider-name="Netherlands eScience Center">
 
    <description url="https://github.com/3D-e-Chem/knime-molviewer">

diff --git a/feature/pom.xml b/feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.knime.molviewer</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.molviewer</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.knime.molviewer.feature</artifactId>

diff --git a/p2/category.xml b/p2/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/nl.esciencecenter.e3dchem.knime.molviewer.feature-2.0.0.qualifier.jar" id="nl.esciencecenter.e3dchem.knime.molviewer.feature" version="2.0.0.qualifier">
+   <feature url="features/nl.esciencecenter.e3dchem.knime.molviewer.feature-2.0.1.qualifier.jar" id="nl.esciencecenter.e3dchem.knime.molviewer.feature" version="2.0.1.qualifier">
       <category name="nl.esciencecenter.3D-e-Chem"/>
    </feature>
     <category-def name="nl.esciencecenter.3D-e-Chem" label="KNIME 3D-e-Chem Contributions">

diff --git a/p2/pom.xml b/p2/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>nl.esciencecenter.e3dchem.knime.molviewer</artifactId>
         <groupId>nl.esciencecenter.e3dchem.knime.molviewer</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>nl.esciencecenter.e3dchem.knime.molviewer.p2</artifactId>
     <packaging>eclipse-repository</packaging>

diff --git 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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.knime.molviewer</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.molviewer</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>nl.esciencecenter.e3dchem.knime.molviewer.plugin</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git 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
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.esciencecenter.e3dchem.knime.molviewer</groupId>
 	<artifactId>nl.esciencecenter.e3dchem.knime.molviewer</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<scm>

diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
@@ -20,7 +20,7 @@ Contributors:
 	<parent>
 		<artifactId>nl.esciencecenter.e3dchem.knime.molviewer</artifactId>
 		<groupId>nl.esciencecenter.e3dchem.knime.molviewer</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 </project>
diff --git 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
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.knime.molviewer</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.knime.molviewer</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.knime.molviewer.tests</artifactId>