fix: integrate DRD find

client/src/app/tabs/cloud-dmn/DmnEditor.js

@@ -406,6 +406,7 @@ export class DmnEditor extends CachedComponent {
         defaultUndoRedo: inputActive,
         distribute: selectionLength > 2,
         editLabel: !inputActive && !!selectionLength,
+        find: !inputActive,
         lassoTool: !inputActive,
         moveCanvas: !inputActive,
         moveSelection: !inputActive && !!selectionLength,

client/src/app/tabs/cloud-dmn/__tests__/DmnEditorSpec.js

@@ -34,6 +34,7 @@ import {
   getCanvasEntries,
   getAlignDistributeEntries,
   getCopyCutPasteEntries,
+  getDiagramFindEntries,
   getSelectionEntries,
   getToolEntries,
   getUndoRedoEntries
@@ -707,6 +708,27 @@ describe('<DmnEditor>', function() {
         });
 
 
+        it('should provide find entries', async function() {
+
+          // given
+          const changedSpy = (state) => {
+
+            const editMenuEntries = getDiagramFindEntries(state);
+
+            // then
+            expect(state.editMenu).to.deep.include(editMenuEntries);
+
+          };
+
+          const { instance } = await renderEditor(diagramXML, {
+            onChanged: changedSpy
+          });
+
+          // when
+          instance.handleChanged();
+        });
+
+
         it('should provide canvas entries', async function() {
 
           // given
@@ -799,6 +821,31 @@ describe('<DmnEditor>', function() {
           instance.handleChanged();
         });
 
+
+        it('should NOT provide find entries', async function() {
+
+          // given
+          const changedSpy = sinon.spy();
+
+          const { instance } = await renderEditor(diagramXML, {
+            onChanged: changedSpy
+          });
+
+          changedSpy.resetHistory();
+
+          // when
+          const modeler = instance.getModeler();
+
+          modeler.open({ type: 'decisionTable' });
+          instance.handleChanged();
+
+          // then
+          expect(changedSpy).to.be.calledOnce;
+
+          const state = changedSpy.firstCall.args[0];
+          expect(hasMenuEntry(state.editMenu, 'Find')).to.be.false;
+        });
+
       });
 
 
@@ -830,6 +877,31 @@ describe('<DmnEditor>', function() {
           expect(getMenuEntry(state.editMenu, 'Remove Selected').role).to.equal('delete');
         });
 
+
+        it('should NOT provide find entries', async function() {
+
+          // given
+          const changedSpy = sinon.spy();
+
+          const { instance } = await renderEditor(diagramXML, {
+            onChanged: changedSpy
+          });
+
+          changedSpy.resetHistory();
+
+          // when
+          const modeler = instance.getModeler();
+
+          modeler.open({ type: 'literalExpression' });
+          instance.handleChanged();
+
+          // then
+          expect(changedSpy).to.be.calledOnce;
+
+          const state = changedSpy.firstCall.args[0];
+          expect(hasMenuEntry(state.editMenu, 'Find')).to.be.false;
+        });
+
       });
 
     });

client/src/app/tabs/dmn/DmnEditor.js

@@ -406,6 +406,7 @@ export class DmnEditor extends CachedComponent {
         defaultUndoRedo: inputActive,
         distribute: selectionLength > 2,
         editLabel: !inputActive && !!selectionLength,
+        find: !inputActive,
         lassoTool: !inputActive,
         moveCanvas: !inputActive,
         moveSelection: !inputActive && !!selectionLength,

client/src/app/tabs/dmn/__tests__/DmnEditorSpec.js

@@ -34,6 +34,7 @@ import {
   getCanvasEntries,
   getAlignDistributeEntries,
   getCopyCutPasteEntries,
+  getDiagramFindEntries,
   getSelectionEntries,
   getToolEntries,
   getUndoRedoEntries
@@ -708,6 +709,27 @@ describe('<DmnEditor>', function() {
         });
 
 
+        it('should provide find entries', async function() {
+
+          // given
+          const changedSpy = (state) => {
+
+            const editMenuEntries = getDiagramFindEntries(state);
+
+            // then
+            expect(state.editMenu).to.deep.include(editMenuEntries);
+
+          };
+
+          const { instance } = await renderEditor(diagramXML, {
+            onChanged: changedSpy
+          });
+
+          // when
+          instance.handleChanged();
+        });
+
+
         it('should provide canvas entries', async function() {
 
           // given
@@ -800,6 +822,31 @@ describe('<DmnEditor>', function() {
           instance.handleChanged();
         });
 
+
+        it('should NOT provide find entries', async function() {
+
+          // given
+          const changedSpy = sinon.spy();
+
+          const { instance } = await renderEditor(diagramXML, {
+            onChanged: changedSpy
+          });
+
+          changedSpy.resetHistory();
+
+          // when
+          const modeler = instance.getModeler();
+
+          modeler.open({ type: 'decisionTable' });
+          instance.handleChanged();
+
+          // then
+          expect(changedSpy).to.be.calledOnce;
+
+          const state = changedSpy.firstCall.args[0];
+          expect(hasMenuEntry(state.editMenu, 'Find')).to.be.false;
+        });
+
       });
 
 
@@ -831,6 +878,31 @@ describe('<DmnEditor>', function() {
           expect(getMenuEntry(state.editMenu, 'Remove Selected').role).to.equal('delete');
         });
 
+
+        it('should NOT provide find entries', async function() {
+
+          // given
+          const changedSpy = sinon.spy();
+
+          const { instance } = await renderEditor(diagramXML, {
+            onChanged: changedSpy
+          });
+
+          changedSpy.resetHistory();
+
+          // when
+          const modeler = instance.getModeler();
+
+          modeler.open({ type: 'literalExpression' });
+          instance.handleChanged();
+
+          // then
+          expect(changedSpy).to.be.calledOnce;
+
+          const state = changedSpy.firstCall.args[0];
+          expect(hasMenuEntry(state.editMenu, 'Find')).to.be.false;
+        });
+
       });
 
     });

client/src/app/tabs/dmn/getDmnEditMenu.js

@@ -1,89 +1,91 @@
-/**
- * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
- * under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright
- * ownership.
- *
- * Camunda licenses this file to you under the MIT; you may not use this file
- * except in compliance with the MIT License.
- */
-
-import {
-  getCanvasEntries,
-  getCopyCutPasteEntries,
-  getAlignDistributeEntries,
-  getDefaultCopyCutPasteEntries,
-  getSelectionEntries,
-  getToolEntries,
-  getUndoRedoEntries
-} from '../getEditMenu';
-
-function getDecisionTableEntries({
-  hasSelection,
-  inputActive
-}) {
-  return [
-    [
-      {
-        label: 'Select Cell Above',
-        accelerator: 'Shift + Enter',
-        enabled: hasSelection,
-        action: 'selectCellAbove',
-        role: inputActive && 'selectCellAbove'
-      },
-      {
-        label: 'Select Cell Below',
-        accelerator: 'Enter',
-        enabled: hasSelection,
-        action: 'selectCellBelow',
-        role: inputActive && 'selectCellBelow'
-      }
-    ]
-  ];
-}
-
-export function getDmnDrdEditMenu(state) {
-  const { defaultCopyCutPaste } = state;
-
-  const copyCutPasteEntries = defaultCopyCutPaste
-    ? getDefaultCopyCutPasteEntries(true)
-    : getCopyCutPasteEntries(state);
-
-  return [
-    getUndoRedoEntries(state),
-    copyCutPasteEntries,
-    getToolEntries(state),
-    getAlignDistributeEntries(state),
-    getCanvasEntries(state),
-    getSelectionEntries(state)
-  ];
-}
-
-export function getDmnDecisionTableEditMenu(state) {
-  const { defaultCopyCutPaste } = state;
-
-  const copyCutPasteEntries = defaultCopyCutPaste
-    ? getDefaultCopyCutPasteEntries(true)
-    : getCopyCutPasteEntries(state);
-
-  return [
-    getUndoRedoEntries(state),
-    copyCutPasteEntries,
-    getSelectionEntries(state),
-    ...getDecisionTableEntries(state)
-  ];
-}
-
-export function getDmnLiteralExpressionEditMenu(state) {
-  const { defaultCopyCutPaste } = state;
-
-  const copyCutPasteEntries = defaultCopyCutPaste
-    ? getDefaultCopyCutPasteEntries(true)
-    : getCopyCutPasteEntries(state);
-
-  return [
-    getUndoRedoEntries(state),
-    copyCutPasteEntries,
-    getSelectionEntries(state)
-  ];
-}
+/**
+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+ * under one or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * Camunda licenses this file to you under the MIT; you may not use this file
+ * except in compliance with the MIT License.
+ */
+
+import {
+  getCanvasEntries,
+  getCopyCutPasteEntries,
+  getAlignDistributeEntries,
+  getDefaultCopyCutPasteEntries,
+  getDiagramFindEntries,
+  getSelectionEntries,
+  getToolEntries,
+  getUndoRedoEntries
+} from '../getEditMenu';
+
+function getDecisionTableEntries({
+  hasSelection,
+  inputActive
+}) {
+  return [
+    [
+      {
+        label: 'Select Cell Above',
+        accelerator: 'Shift + Enter',
+        enabled: hasSelection,
+        action: 'selectCellAbove',
+        role: inputActive && 'selectCellAbove'
+      },
+      {
+        label: 'Select Cell Below',
+        accelerator: 'Enter',
+        enabled: hasSelection,
+        action: 'selectCellBelow',
+        role: inputActive && 'selectCellBelow'
+      }
+    ]
+  ];
+}
+
+export function getDmnDrdEditMenu(state) {
+  const { defaultCopyCutPaste } = state;
+
+  const copyCutPasteEntries = defaultCopyCutPaste
+    ? getDefaultCopyCutPasteEntries(true)
+    : getCopyCutPasteEntries(state);
+
+  return [
+    getUndoRedoEntries(state),
+    copyCutPasteEntries,
+    getToolEntries(state),
+    getAlignDistributeEntries(state),
+    getDiagramFindEntries(state),
+    getCanvasEntries(state),
+    getSelectionEntries(state)
+  ];
+}
+
+export function getDmnDecisionTableEditMenu(state) {
+  const { defaultCopyCutPaste } = state;
+
+  const copyCutPasteEntries = defaultCopyCutPaste
+    ? getDefaultCopyCutPasteEntries(true)
+    : getCopyCutPasteEntries(state);
+
+  return [
+    getUndoRedoEntries(state),
+    copyCutPasteEntries,
+    getSelectionEntries(state),
+    ...getDecisionTableEntries(state)
+  ];
+}
+
+export function getDmnLiteralExpressionEditMenu(state) {
+  const { defaultCopyCutPaste } = state;
+
+  const copyCutPasteEntries = defaultCopyCutPaste
+    ? getDefaultCopyCutPasteEntries(true)
+    : getCopyCutPasteEntries(state);
+
+  return [
+    getUndoRedoEntries(state),
+    copyCutPasteEntries,
+    getSelectionEntries(state)
+  ];
+}