Fixed issue when a filter is required and no default value is set and you want...

Fixed issue when a filter is required and no default value is set and you want to set the default value.

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Contact Search Output is now also able to create smart groups and send bulk mails (with a hidden smarty group). See #32.
 * Fixed issue with Field Filter on relationship type and also made relationship type a non required filter on the data source.
 * Improved performance by caching the API entities and actions configured by a data processor output. (Previously during an api call all actions and entities where retrieved from the database)
+* Fixed issue when a filter is required and no default value is set and you want to set the default value.
 
 # Version 1.21
 

CRM/Dataprocessor/Form/FilterValue.php

@@ -57,7 +57,11 @@ class CRM_Dataprocessor_Form_FilterValue extends CRM_Core_Form {
     $this->filter = civicrm_api3('DataProcessorFilter', 'getsingle', array('id' => $this->id));
     $this->filterTypeClass = $factory->getFilterByName($this->filter['type']);
     $this->filterTypeClass->setDataProcessor($this->dataProcessorClass);
-    $this->filterTypeClass->initialize($this->filter);
+    try {
+      $this->filterTypeClass->initialize($this->filter);
+    } catch (\Civi\DataProcessor\Exception\FilterRequiredException $ex) {
+      // Do nothing.
+    }
 
     $title = E::ts('Data Processor Default Filter Value');
     CRM_Utils_System::setTitle($title);

Civi/DataProcessor/Exception/FilterRequiredException.php

+<?php
+/**
+ * @author Jaap Jansma <jaap.jansma@civicoop.org>
+ * @license AGPL-3.0
+ */
+
+namespace Civi\DataProcessor\Exception;
+
+class FilterRequiredException extends \Exception {
+
+}
\ No newline at end of file

Civi/DataProcessor/FilterHandler/AbstractFilterHandler.php

@@ -7,6 +7,7 @@
 namespace Civi\DataProcessor\FilterHandler;
 
 use Civi\DataProcessor\DataSpecification\FieldSpecification;
+use Civi\DataProcessor\Exception\FilterRequiredException;
 use Civi\DataProcessor\ProcessorType\AbstractProcessorType;
 
 use CRM_Dataprocessor_ExtensionUtil as E;
@@ -371,7 +372,7 @@ abstract class AbstractFilterHandler {
       }
     }
     if ($this->isRequired() && !$isFilterSet) {
-      throw new \Exception('Field ' . $filterSpec->title . ' is required');
+      throw new FilterRequiredException('Field ' . $filterSpec->title . ' is required');
     }
   }
 

Civi/DataProcessor/Source/File/FileSource.php

@@ -122,11 +122,11 @@ class FileSource extends AbstractCivicrmEntitySource {
     $entityDataFlowDataDescription = new DataFlowDescription($this->entityFileDataFlow, $join);
 
     // Create the subquery data flow
-    $entityDataFlow = new SubqueryDataFlow($this->getSourceName(), $this->getTable(), $this->getSourceName());
-    $entityDataFlow->addSourceDataFlow($fileDataDescription);
-    $entityDataFlow->addSourceDataFlow($entityDataFlowDataDescription);
+    $this->entityDataFlow = new SubqueryDataFlow($this->getSourceName(), $this->getTable(), $this->getSourceName());
+    $this->entityDataFlow->addSourceDataFlow($fileDataDescription);
+    $this->entityDataFlow->addSourceDataFlow($entityDataFlowDataDescription);
 
-    return $entityDataFlow;
+    return $this->entityDataFlow;
   }
 
   /**