From 3961786b5c995104b1e5e98f37629234fc5ecfca Mon Sep 17 00:00:00 2001
From: Abdul Ahad <abdul9ahad@gmail.com>
Date: Wed, 18 Sep 2024 14:48:52 +0200
Subject: [PATCH] fix: empty whitespaces label in group

Closes #2231
---
 lib/util/LabelUtil.js                          |  5 ++++-
 test/spec/features/modeling/UpdateLabel.bpmn   | 12 ++++++++----
 test/spec/features/modeling/UpdateLabelSpec.js | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/lib/util/LabelUtil.js b/lib/util/LabelUtil.js
index 0b2a033486..5f68972b4b 100644
--- a/lib/util/LabelUtil.js
+++ b/lib/util/LabelUtil.js
@@ -251,7 +251,10 @@ export function setLabel(element, text) {
   if (attr) {
 
     if (attr === 'categoryValueRef') {
-      semantic['categoryValueRef'].value = text;
+      if (!semantic[attr]) {
+        return;
+      }
+      semantic[attr].value = text;
     } else {
       semantic[attr] = text;
     }
diff --git a/test/spec/features/modeling/UpdateLabel.bpmn b/test/spec/features/modeling/UpdateLabel.bpmn
index 24ebdd282d..973367b3e1 100644
--- a/test/spec/features/modeling/UpdateLabel.bpmn
+++ b/test/spec/features/modeling/UpdateLabel.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.10.0">
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.25.0">
   <bpmn:process id="Process_1" isExecutable="false">
     <bpmn:startEvent id="StartEvent_1" name="Foo" />
     <bpmn:startEvent id="StartEvent_2" />
@@ -10,6 +10,7 @@
       <bpmn:text></bpmn:text>
     </bpmn:textAnnotation>
     <bpmn:group id="Group_1" categoryValueRef="CategoryValue_1" />
+    <bpmn:group id="Empty_Label_Group" />
   </bpmn:process>
   <bpmn:category id="Category_1">
     <bpmn:categoryValue id="CategoryValue_1" />
@@ -32,15 +33,18 @@
         <dc:Bounds x="460" y="80" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_1_di" bpmnElement="TextAnnotation_1">
-        <dc:Bounds x="426" y="220" width="100" height="30" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_13podyk_di" bpmnElement="Subprocess_1">
         <dc:Bounds x="600" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_1_di" bpmnElement="TextAnnotation_1">
+        <dc:Bounds x="426" y="220" width="100" height="30" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Group_1_di" bpmnElement="Group_1">
         <dc:Bounds x="165" y="190" width="150" height="120" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Group_1txvenf_di" bpmnElement="Empty_Label_Group">
+        <dc:Bounds x="490" y="190" width="150" height="115" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram id="BPMNDiagram_0zyhy6y">
diff --git a/test/spec/features/modeling/UpdateLabelSpec.js b/test/spec/features/modeling/UpdateLabelSpec.js
index d31660beaa..b4a7585d86 100644
--- a/test/spec/features/modeling/UpdateLabelSpec.js
+++ b/test/spec/features/modeling/UpdateLabelSpec.js
@@ -165,6 +165,20 @@ describe('features/modeling - update label', function() {
   ));
 
 
+  it('should not set a value if only whitespace is provided', inject(function(modeling, elementRegistry) {
+
+    // given
+    var group = elementRegistry.get('Empty_Label_Group');
+
+    // when
+    modeling.updateLabel(group, null);
+
+    // then
+    expect(group.businessObject.categoryValueRef).to.not.exist;
+    expect(group.label).to.not.exist;
+  }));
+
+
   it('should change value of group', inject(function(modeling, elementRegistry) {
 
     // given