NIFI-3502: Upgrading D3 version

nifi-assembly/LICENSE

@@ -232,6 +232,37 @@ The source is available under an MIT LICENSE.
     THE SOFTWARE.
 
 This product bundles 'Javascript D3 Library' which is available under a 
+"3-clause BSD" license.
+
+    Copyright 2010-2017 Mike Bostock
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of the author nor the names of contributors may be used to
+      endorse or promote products derived from this software without specific prior
+      written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This product bundles 'Javascript D3 Selection Multi Library' which is available under a
 "3-clause BSD" license.
 
     Copyright (c) 2010-2016, Michael Bostock

nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE

@@ -261,6 +261,37 @@ licenses.
     THE SOFTWARE.
 
 This product bundles 'Javascript D3 Library' which is available under a
+"3-clause BSD" license.
+
+    Copyright 2010-2017 Mike Bostock
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of the author nor the names of contributors may be used to
+      endorse or promote products derived from this software without specific prior
+      written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This product bundles 'Javascript D3 Selection Multi Library' which is available under a
 "3-clause BSD" license.
 
     Copyright (c) 2010-2016, Michael Bostock

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml

@@ -151,8 +151,11 @@
                                     <filtering>false</filtering>
                                     <includes>
                                         <!-- D3 -->
-                                        <include>d3/d3.min.js*</include>
+                                        <include>d3/build/d3.min.js*</include>
                                         <include>d3/LICENSE</include>
+                                        <!-- D3 selection multi -->
+                                        <include>d3-selection-multi/build/d3-selection-multi.min.js*</include>
+                                        <include>d3-selection-multi/LICENSE</include>
                                         <!-- angular -->
                                         <include>angular/angular.min.js*</include>
                                         <include>angular/LICENSE.md</include>
@@ -895,7 +898,6 @@
                                 <exclude>nbactions.xml</exclude>
                                 <exclude>src/main/frontend/package.json</exclude>
                                 <exclude>src/main/webapp/js/jquery/jquery.base64.js</exclude>
-                                <exclude>src/main/webapp/js/d3/d3.min.js</exclude>
                                 <exclude>src/main/webapp/js/codemirror/</exclude>
                                 <exclude>src/main/webapp/fonts/**/*</exclude>
                             </excludes>

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json

@@ -14,7 +14,8 @@
     "jsonlint": "1.6.2",
     "JSON2": "0.1.0",
     "reset.css": "2.0.2",
-    "d3": "3.5.17",
+    "d3": "4.13.0",
+    "d3-selection-multi": "1.0.1",
     "url-search-params": "0.6.1"
   },
   "description": "Apache NiFi 3rd party client side resources.",

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE

@@ -209,6 +209,37 @@ subcomponents is subject to the terms and conditions of the following
 licenses. 
 
 This product bundles 'Javascript D3 Library' which is available under a 
+"3-clause BSD" license.
+
+    Copyright 2010-2017 Mike Bostock
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of the author nor the names of contributors may be used to
+      endorse or promote products derived from this software without specific prior
+      written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This product bundles 'Javascript D3 Selection Multi Library' which is available under a
 "3-clause BSD" license.
 
     Copyright (c) 2010-2016, Michael Bostock

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp

@@ -46,7 +46,8 @@
         </script>
         <script type="text/javascript" src="assets/url-search-params/build/url-search-params.js"></script>
         <script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script>
-        <script type="text/javascript" src="assets/d3/d3.min.js"></script>
+        <script type="text/javascript" src="assets/d3/build/d3.min.js"></script>
+        <script type="text/javascript" src="assets/d3-selection-multi/build/d3-selection-multi.min.js"></script>
         <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script>
         <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script>
         <script type="text/javascript" src="js/jquery/jquery.base64.js"></script>

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp

@@ -33,7 +33,8 @@
         <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
         <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" />
         <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
-        <script type="text/javascript" src="assets/d3/d3.min.js"></script>
+        <script type="text/javascript" src="assets/d3/build/d3.min.js"></script>
+        <script type="text/javascript" src="assets/d3-selection-multi/build/d3-selection-multi.min.js"></script>
         <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script>
         <script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
         <script type="text/javascript" src="js/jquery/jquery.center.js"></script>

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp

@@ -39,7 +39,6 @@
         <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" />
         <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
         <script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script>
-        <script type="text/javascript" src="assets/d3/d3.min.js"></script>
         <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script>
         <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script>
         <script type="text/javascript" src="js/jquery/jquery.base64.js"></script>

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp

@@ -32,7 +32,6 @@
         <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" />
         <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
         <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
-        <script type="text/javascript" src="assets/d3/d3.min.js"></script>
         <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script>
         <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script>
         <script type="text/javascript" src="js/jquery/jquery.base64.js"></script>

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css

@@ -150,7 +150,7 @@ g.component.connectable-destination rect.border {
     stroke-width: 3;
 }
 
-rect.selection, rect.drag-selection, rect.label-drag {
+rect.component-selection, rect.drag-selection, rect.label-drag {
     stroke: #444444;
     stroke-opacity: 0.5;
     fill: transparent;

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/navigation.css

@@ -225,7 +225,7 @@ div.button-spacer-large {
     border: 1px solid #e5ebed;
 }
 
-.brush .extent {
+.brush .selection {
     stroke: #666;
     fill-opacity: .125;
     shape-rendering: crispEdges;

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css

@@ -167,7 +167,7 @@ div.legend-label {
     stroke-width: 2.5px;
 }
 
-.brush .extent {
+.brush .selection {
     stroke: #666;
     fill-opacity: .125;
     shape-rendering: crispEdges;

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-navigate-controller.js

@@ -35,7 +35,7 @@
 }(this, function (nfCanvasUtils, nfContextMenu) {
     'use strict';
 
-    return function () {
+    return function ($timeout) {
         'use strict';
 
         function NavigateCtrl() {
@@ -44,66 +44,42 @@
              * Zoom in on the canvas.
              */
             this.zoomIn = function () {
-                nfCanvasUtils.zoomCanvasViewIn();
-
-                // hide the context menu
-                nfContextMenu.hide();
-
-                // refresh the canvas
-                nfCanvasUtils.refreshCanvasView({
-                    transition: true
-                });
+                $timeout(function () {
+                    nfCanvasUtils.zoomInCanvas();
+                }, 0);
             };
 
             /**
              * Zoom out on the canvas.
              */
             this.zoomOut = function () {
-                nfCanvasUtils.zoomCanvasViewOut();
-
-                // hide the context menu
-                nfContextMenu.hide();
-
-                // refresh the canvas
-                nfCanvasUtils.refreshCanvasView({
-                    transition: true
-                });
+                $timeout(function () {
+                    nfCanvasUtils.zoomOutCanvas();
+                }, 0);
             };
 
             /**
              * Zoom fit on the canvas.
              */
             this.zoomFit = function () {
-                nfCanvasUtils.fitCanvasView();
-
-                // hide the context menu
-                nfContextMenu.hide();
-
-                // refresh the canvas
-                nfCanvasUtils.refreshCanvasView({
-                    transition: true
-                });
+                $timeout(function () {
+                    nfCanvasUtils.fitCanvas();
+                }, 0);
             };
 
             /**
              * Zoom actual size on the canvas.
              */
             this.zoomActualSize = function () {
-                nfCanvasUtils.actualSizeCanvasView();
-
-                // hide the context menu
-                nfContextMenu.hide();
-
-                // refresh the canvas
-                nfCanvasUtils.refreshCanvasView({
-                    transition: true
-                });
+                $timeout(function () {
+                    nfCanvasUtils.actualSizeCanvas();
+                }, 0);
             };
         }
 
         NavigateCtrl.prototype = {
             constructor: NavigateCtrl
-        }
+        };
 
         var navigateCtrl = new NavigateCtrl();
         return navigateCtrl;

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js

@@ -130,8 +130,8 @@
                         nfContextMenu.hide();
                     },
                     stop: function (e, ui) {
-                        var translate = nfCanvasUtils.translateCanvasView();
-                        var scale = nfCanvasUtils.scaleCanvasView();
+                        var translate = nfCanvasUtils.getCanvasTranslate();
+                        var scale = nfCanvasUtils.getCanvasScale();
 
                         var mouseX = e.originalEvent.pageX;
                         var mouseY = e.originalEvent.pageY - nfCanvasUtils.getCanvasOffset();

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js

@@ -512,7 +512,7 @@
                                 text: 'all groups',
                                 value: ''
                             }];
-                            groups.forEach(function (group) {
+                            groups.each(function (group) {
                                 options.push({
                                     text: group,
                                     value: group

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js

@@ -493,11 +493,6 @@
 
                 // center on the component
                 nfCanvasUtils.centerBoundingBox(box);
-
-                // refresh the canvas
-                nfCanvasUtils.refreshCanvasView({
-                    transition: true
-                });
             }
         },
 
@@ -996,7 +991,7 @@
                             });
 
                             // remove all the non connections in the snippet first
-                            components.forEach(function (type, ids) {
+                            components.each(function (ids, type) {
                                 if (type !== 'Connection') {
                                     nfCanvasUtils.getComponentByType(type).remove(ids);
                                 }
@@ -1709,8 +1704,8 @@
         paste: function (selection, evt) {
             if (nfCommon.isDefinedAndNotNull(evt)) {
                 // get the current scale and translation
-                var scale = nfCanvasUtils.scaleCanvasView();
-                var translate = nfCanvasUtils.translateCanvasView();
+                var scale = nfCanvasUtils.getCanvasScale();
+                var translate = nfCanvasUtils.getCanvasTranslate();
 
                 var mouseX = evt.pageX;
                 var mouseY = evt.pageY - nfCanvasUtils.getCanvasOffset();