Merge branch 'master' into NIFI-1267

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml

@@ -23,7 +23,6 @@
     </servlet>
     <servlet-mapping>
         <servlet-name>NiFiCanvas</servlet-name>
-        <!--<url-pattern>/token</url-pattern>-->
         <url-pattern>/canvas</url-pattern>
     </servlet-mapping>
     

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

@@ -349,8 +349,8 @@ nf.CanvasToolbox = (function () {
         });
 
         // adjust the grid canvas now that its been rendered
-        grid.setSelectedRows([0]);
         grid.resizeCanvas();
+        grid.setSelectedRows([0]);
     };
 
     /**
@@ -884,6 +884,17 @@ nf.CanvasToolbox = (function () {
                 addToolboxIcon(config.type.template, toolbox, 'template-icon', 'template-icon-hover', 'template-icon-drag', promptForTemplate);
                 addToolboxIcon(config.type.label, toolbox, 'label-icon', 'label-icon-hover', 'label-icon-drag', createLabel);
 
+                // define the function for filtering the list
+                $('#processor-type-filter').focus(function () {
+                    if ($(this).hasClass(config.styles.filterList)) {
+                        $(this).removeClass(config.styles.filterList).val('');
+                    }
+                }).blur(function () {
+                    if ($(this).val() === '') {
+                        $(this).addClass(config.styles.filterList).val(config.filterText);
+                    }
+                }).addClass(config.styles.filterList).val(config.filterText);
+
                 // initialize the processor type table
                 var processorTypesColumns = [
                     {id: 'type', name: 'Type', field: 'label', sortable: true, resizable: true},
@@ -931,6 +942,7 @@ nf.CanvasToolbox = (function () {
                         var processorType = processorTypesGrid.getDataItem(processorTypeIndex);
 
                         // set the processor type description
+                        if (nf.Common.isDefinedAndNotNull(processorType)) {
                             if (nf.Common.isBlank(processorType.description)) {
                                 $('#processor-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
                             } else {
@@ -942,6 +954,7 @@ nf.CanvasToolbox = (function () {
                             $('#selected-processor-name').text(processorType.label);
                             $('#selected-processor-type').text(processorType.type);
                         }
+                    }
                 });
 
                 // wire up the dataview to the grid
@@ -1006,17 +1019,6 @@ nf.CanvasToolbox = (function () {
                     });
                 }).fail(nf.Common.handleAjaxError);
 
-                // define the function for filtering the list
-                $('#processor-type-filter').focus(function () {
-                    if ($(this).hasClass(config.styles.filterList)) {
-                        $(this).removeClass(config.styles.filterList).val('');
-                    }
-                }).blur(function () {
-                    if ($(this).val() === '') {
-                        $(this).addClass(config.styles.filterList).val(config.filterText);
-                    }
-                }).addClass(config.styles.filterList).val(config.filterText);
-
                 // configure the new processor dialog
                 $('#new-processor-dialog').modal({
                     headerText: 'Add Processor',

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

@@ -414,6 +414,7 @@ nf.Settings = (function () {
                 var controllerServiceType = controllerServiceTypesGrid.getDataItem(controllerServiceTypeIndex);
 
                 // set the controller service type description
+                if (nf.Common.isDefinedAndNotNull(controllerServiceType)) {
                     if (nf.Common.isBlank(controllerServiceType.description)) {
                         $('#controller-service-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
                     } else {
@@ -428,6 +429,7 @@ nf.Settings = (function () {
                     // show the selected controller service
                     $('#controller-service-description-container').show();
                 }
+            }
         });
         controllerServiceTypesGrid.onDblClick.subscribe(function (e, args) {
             var controllerServiceType = controllerServiceTypesGrid.getDataItem(args.row);
@@ -1110,6 +1112,7 @@ nf.Settings = (function () {
                 var reportingTaskType = reportingTaskTypesGrid.getDataItem(reportingTaskTypeIndex);
 
                 // set the reporting task type description
+                if (nf.Common.isDefinedAndNotNull(reportingTaskType)) {
                     if (nf.Common.isBlank(reportingTaskType.description)) {
                         $('#reporting-task-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
                     } else {
@@ -1124,6 +1127,7 @@ nf.Settings = (function () {
                     // show the selected reporting task
                     $('#reporting-task-description-container').show();
                 }
+            }
         });
         reportingTaskTypesGrid.onDblClick.subscribe(function (e, args) {
             var reportingTaskType = reportingTaskTypesGrid.getDataItem(args.row);