From 9801dea0d927c2638a55e4501ba6947f23437f82 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <Giancarlo Panichi@panichipc>
Date: Thu, 18 Jun 2020 16:23:48 +0200
Subject: [PATCH] ref 19161: Disable Zoom for charts

https://support.d4science.org/issues/18964

Disabled Zoom for charts
---
 .classpath                                                  | 6 +++---
 .settings/org.eclipse.wst.common.component                  | 5 +----
 CHANGELOG.md                                                | 3 +++
 changelog.xml                                               | 1 +
 pom.xml                                                     | 2 +-
 .../client/application/mainarea/report/chartjs/Chart.java   | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.classpath b/.classpath
index 5c0febd..b638363 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.1/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.1/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -50,5 +50,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/accounting-dashboard-1.2.0/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/accounting-dashboard-1.2.1/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 31d6f91..675aa74 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="accounting-dashboard-1.2.0">
+    <wb-module deploy-name="accounting-dashboard-1.2.1">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="detachedres-library-1.1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/detachedres-library/detachedres-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="java-output-path" value="/cmems-importer/target/cmems-importer-1.0.0-SNAPSHOT/WEB-INF/classes"/>
         <property name="context-root" value="accounting-dashboard"/>
     </wb-module>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16e51c..4ace3cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@
 
 - Updated to support new detachedres-library [#19440]
 
+### Fixes
+
+- Disabled Zoom for charts [#19161]
 
 
 ## [v1.2.0] - 2020-04-08
diff --git a/changelog.xml b/changelog.xml
index 869a639..073f87d 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -2,6 +2,7 @@
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-1"
 		date="2020-06-18">
 		<Change>Updated to support new detachedres-library [#19440]</Change>
+		<Change>Disabled Zoom for charts [#19161]</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-0"
 		date="2020-04-08">
diff --git a/pom.xml b/pom.xml
index 67d03c6..379ea60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>accounting-dashboard</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<name>accounting-dashboard</name>
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java
index 5b7d011..6bab50c 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java
@@ -372,7 +372,7 @@ public class Chart extends HTMLPanel {
 
 					},
 					zoom : {
-						enabled : true,
+						enabled : false,
 						mode : 'xy',
 						limits : {
 							max : 20,
@@ -381,7 +381,7 @@ public class Chart extends HTMLPanel {
 					}
 				}
 			});
-
+			
 			chart.update();
 			console.log('Canvas offset: left=' + canvas.offsetLeft + ', top='
 					+ canvas.offsetTop);