From acd2fe520b3cdb2144f3918511a3c35513ac2a5a Mon Sep 17 00:00:00 2001
From: Niklas Kiefer <niklas.kiefer@camunda.com>
Date: Wed, 24 Oct 2018 13:43:34 +0200
Subject: [PATCH] feat(draw): render group names

Closes #844
---
 lib/draw/BpmnRenderer.js                | 20 ++++++++++++++++++-
 test/fixtures/bpmn/draw/group-name.bpmn | 26 +++++++++++++++++++++++++
 test/spec/draw/BpmnRendererSpec.js      | 17 ++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/bpmn/draw/group-name.bpmn

diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js
index c29e5cd7..84253669 100644
--- a/lib/draw/BpmnRenderer.js
+++ b/lib/draw/BpmnRenderer.js
@@ -1577,12 +1577,30 @@ export default function BpmnRenderer(
       return outer;
     },
     'bpmn:Group': function(parentGfx, element) {
-      return drawRect(parentGfx, element.width, element.height, TASK_BORDER_RADIUS, {
+      var semantic = getSemantic(element),
+          di = getDi(element);
+
+      var group = drawRect(parentGfx, element.width, element.height, TASK_BORDER_RADIUS, {
         strokeWidth: 1,
         strokeDasharray: '8,3,1,3',
         fill: 'none',
         pointerEvents: 'none'
       });
+
+      var categoryValueRef = semantic.categoryValueRef || {};
+
+      if (categoryValueRef.value) {
+        var box = di.label ? di.label.bounds : element;
+
+        renderLabel(parentGfx, categoryValueRef.value, {
+          box: box,
+          style: {
+            fill: getStrokeColor(element, defaultStrokeColor)
+          }
+        });
+      }
+
+      return group;
     },
     'label': function(parentGfx, element) {
       return renderExternalLabel(parentGfx, element);
diff --git a/test/fixtures/bpmn/draw/group-name.bpmn b/test/fixtures/bpmn/draw/group-name.bpmn
new file mode 100644
index 00000000..835131fb
--- /dev/null
+++ b/test/fixtures/bpmn/draw/group-name.bpmn
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:signavio="http://www.signavio.com" id="sid-0fcc2144-457b-4505-9e44-ff673663e3bc" targetNamespace="http://www.signavio.com/bpmn20" exporter="Camunda Modeler" exporterVersion="2.0.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL http://www.omg.org/spec/BPMN/2.0/20100501/BPMN20.xsd">
+  <category id="Category_1">
+    <categoryValue id="CategoryValue_1" value="my group" />
+  </category>
+  <process id="Process_1" processType="None" isExecutable="false">
+    <extensionElements>
+      <signavio:signavioDiagramMetaData metaKey="revisionid" metaValue="64982a7ff2f14bcea04a5d016bd89e49" />
+    </extensionElements>
+    <group id="Group_1" categoryValueRef="CategoryValue_1">
+      <extensionElements>
+        <signavio:signavioMetaData metaKey="userstory" metaValue="" />
+      </extensionElements>
+    </group>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane1" bpmnElement="Process_1">
+      <bpmndi:BPMNShape id="Group_1di" bpmnElement="Group_1">
+        <omgdc:Bounds x="180" y="105" width="188" height="154" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="184" y="107" width="58.28571319580078" height="15" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>
diff --git a/test/spec/draw/BpmnRendererSpec.js b/test/spec/draw/BpmnRendererSpec.js
index d94a271f..8c9acf88 100644
--- a/test/spec/draw/BpmnRendererSpec.js
+++ b/test/spec/draw/BpmnRendererSpec.js
@@ -123,6 +123,23 @@ describe('draw - bpmn renderer', function() {
   });
 
 
+  it('should render group name', function(done) {
+    var xml = require('../../fixtures/bpmn/draw/group-name.bpmn');
+
+    bootstrapViewer(xml).call(this, function(err) {
+
+      inject(function(elementRegistry) {
+
+        var groupGfx = elementRegistry.getGraphics('Group_1');
+
+        expect(domQuery('.djs-label', groupGfx)).to.exist;
+
+        done(err);
+      })();
+    });
+  });
+
+
   it('should render message marker', function(done) {
     var xml = require('../../fixtures/bpmn/draw/message-marker.bpmn');
     bootstrapViewer(xml).call(this, checkErrors(done));