feat(hit-policy): allow to clear aggregation from dropdown

Closes #370 Closes #389
bpmn-io · Nov 5, 2019 · 6fc458d · 6fc458d
1 parent 2916654
commit 6fc458d
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 9 deletions.
diff --git a/...n-js-decision-table/src/features/hit-policy/editor/components/HitPolicyCellContextMenu.js b/...n-js-decision-table/src/features/hit-policy/editor/components/HitPolicyCellContextMenu.js
@@ -12,7 +12,10 @@ const HIT_POLICIES = [
   'OUTPUT ORDER'
 ];
 
+const DEFAULT_AGGREGATION = 'NO LIST AGGREGATION';
+
 const LIST_FUNCTIONS = [
+  DEFAULT_AGGREGATION,
   'SUM',
   'MIN',
   'MAX',
@@ -34,12 +37,8 @@ export default class HitPolicyCellContextMenu extends Component {
     this._modeling.editHitPolicy(hitPolicy, undefined);
   }
 
-  onAggregationChange(value) {
-    let aggregation = value === ''
-      ? undefined
-      : value;
-
-    this._modeling.editHitPolicy('COLLECT', aggregation);
+  onAggregationChange(aggregation) {
+    this._modeling.editHitPolicy('COLLECT', aggregation || undefined);
   }
 
   onElementsChanged() {
@@ -88,8 +87,8 @@ export default class HitPolicyCellContextMenu extends Component {
 
     const aggregationOptions = LIST_FUNCTIONS.map(l => {
       return {
-        label: l === 'NONE' ? '-' : l,
-        value: l
+        label: l,
+        value: l === DEFAULT_AGGREGATION ? undefined : l
       };
     });
 

diff --git a/packages/dmn-js-decision-table/test/spec/features/hit-policy/HitPolicyEditingSpec.js b/packages/dmn-js-decision-table/test/spec/features/hit-policy/HitPolicyEditingSpec.js
@@ -117,6 +117,44 @@ describe('features/hit-policy - editor', function() {
       }));
 
 
+      it('should remove aggregation when input is empty', function() {
+
+        // given
+        triggerInputSelectChange(inputSelect, 'COLLECT');
+
+        const aggregationInputSelect = domQuery(
+          '.hit-policy-edit-operator-select',
+          testContainer
+        );
+
+        const input = domQuery('.dms-input', aggregationInputSelect);
+
+        // when
+        triggerInputEvent(input, '');
+
+        // then
+        expect(root.businessObject.aggregation).to.not.exist;
+      });
+
+
+      it('should remove aggregation when NO LIST AGGREGATION is selected', function() {
+
+        // given
+        triggerInputSelectChange(inputSelect, 'COLLECT');
+
+        const aggregationInputSelect = domQuery(
+          '.hit-policy-edit-operator-select',
+          testContainer
+        );
+
+        // when
+        triggerInputSelectChange(aggregationInputSelect);
+
+        // then
+        expect(root.businessObject.aggregation).to.not.exist;
+      });
+
+
       it('should edit aggregation - select', inject(function(sheet) {
 
         // given

diff --git a/packages/dmn-js-shared/test/util/EventUtil.js b/packages/dmn-js-shared/test/util/EventUtil.js
@@ -77,7 +77,10 @@ export function triggerKeyEvent(element, event, optionsOrCode) {
 export function triggerInputSelectChange(inputSelect, value, testContainer) {
   triggerClick(inputSelect);
 
-  const option = domQuery(`.option[data-value="${ value }"]`, testContainer);
+  const optionQuery = value ?
+    `.option[data-value="${ value }"]` : '.option:not([data-value])';
+
+  const option = domQuery(optionQuery, testContainer);
 
   return triggerClick(option);
 }