From 85c2e03b88ac0a551f90c72c5a61a7e937d2b56e Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Wed, 17 Aug 2022 16:01:33 -0400
Subject: [PATCH] correlation key names can be edited w/ burnettk cullerton

---
 .../propertiesPanel/DataObjectArray.js        |  2 +-
 app/spiffworkflow/messages/MessageHelpers.js  | 19 ++---
 .../propertiesPanel/CorrelationKeysArray.js   | 80 ++++++++++++++-----
 3 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/app/spiffworkflow/DataObject/propertiesPanel/DataObjectArray.js b/app/spiffworkflow/DataObject/propertiesPanel/DataObjectArray.js
index 7934c3a..d24cf54 100644
--- a/app/spiffworkflow/DataObject/propertiesPanel/DataObjectArray.js
+++ b/app/spiffworkflow/DataObject/propertiesPanel/DataObjectArray.js
@@ -136,7 +136,7 @@ function DataObjectTextField(props) {
     }
   };
 
-  const getValue = (parameter) => {
+  const getValue = () => {
     return dataObject.id;
   };
 
diff --git a/app/spiffworkflow/messages/MessageHelpers.js b/app/spiffworkflow/messages/MessageHelpers.js
index 760dd29..4e11d15 100644
--- a/app/spiffworkflow/messages/MessageHelpers.js
+++ b/app/spiffworkflow/messages/MessageHelpers.js
@@ -135,15 +135,16 @@ export function findCorrelationKeys(businessObject) {
       const currentKeys = rootElement.correlationKeys;
       for (const correlationKey in currentKeys) {
         const currentCorrelation = rootElement.correlationKeys[correlationKey];
-        const currentProperty = {};
-        currentProperty.name = currentCorrelation.name;
-        currentProperty.refs = [];
-        for (const correlationProperty in currentCorrelation.correlationPropertyRef) {
-          currentProperty.refs.push(
-            currentCorrelation.correlationPropertyRef[correlationProperty]
-          );
-        }
-        correlationKeys.push(currentProperty);
+        correlationKeys.push(currentCorrelation);
+        // const currentProperty = {};
+        // currentProperty.name = currentCorrelation.name;
+        // currentProperty.refs = [];
+        // for (const correlationProperty in currentCorrelation.correlationPropertyRef) {
+        //   currentProperty.refs.push(
+        //     currentCorrelation.correlationPropertyRef[correlationProperty]
+        //   );
+        // }
+        // correlationKeys.push(currentProperty);
       }
     }
   }
diff --git a/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js b/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js
index fd54492..e39289f 100644
--- a/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js
+++ b/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js
@@ -1,5 +1,5 @@
 import { useService } from 'bpmn-js-properties-panel';
-import { SimpleEntry } from '@bpmn-io/properties-panel';
+import { SimpleEntry, TextFieldEntry } from '@bpmn-io/properties-panel';
 import { findCorrelationKeys, getRoot } from '../MessageHelpers';
 
 /**
@@ -10,17 +10,17 @@ import { findCorrelationKeys, getRoot } from '../MessageHelpers';
 export function CorrelationKeysArray(props) {
   const { element, moddle, commandStack } = props;
 
-  const correlationProperties = findCorrelationKeys(element.businessObject);
-  const items = correlationProperties.map((correlationProperty, _index) => {
-    const id = `correlationGroup-${correlationProperty.name}`;
+  const correlationKeys = findCorrelationKeys(element.businessObject);
+  const items = correlationKeys.map((correlationKey, index) => {
+    const id = `correlationGroup-${index}`;
     return {
       id,
-      correlationProperty,
-      label: correlationProperty.name,
+      label: correlationKey.name,
       entries: correlationGroup({
         id,
         element,
-        correlationProperty,
+        correlationKey,
+        commandStack,
       }),
       autoFocusEntry: id,
     };
@@ -48,38 +48,74 @@ export function CorrelationKeysArray(props) {
   return { items, add };
 }
 
-// <bpmn:correlationKey name="lover"> <--- The CorrelationKeyGroup
+// <bpmn:correlationKey name="lover"> <--- The correlationGroup
 //   <bpmn:correlationPropertyRef>lover_name</bpmn:correlationPropertyRef>
 //   <bpmn:correlationPropertyRef>lover_instrument</bpmn:correlationPropertyRef>
 // </bpmn:correlationKey>
 // <bpmn:correlationKey name="singer" />
 function correlationGroup(props) {
-  const { correlationProperty } = props;
-  const id = `correlation-${correlationProperty.name}`;
-  return correlationProperty.refs.map((cpRef, _index) => {
-    return {
-      id: `${id}-${cpRef.id}-group`,
+  const { correlationKey, commandStack } = props;
+  const id = `correlation-${correlationKey.name}`;
+  const entries = [
+    {
+      id: `${id}-${correlationKey.name}-key`,
       component: CorrelationKeyTextField,
-      correlationProperty,
-      cpRef,
-    };
-  });
+      correlationKey,
+      commandStack,
+    },
+  ];
+  (correlationKey.correlationPropertyRef || []).forEach(
+    (correlationProperty) => {
+      entries.push({
+        id: `${id}-${correlationProperty.id}-group`,
+        component: CorrelationPropertyText,
+        correlationProperty,
+      });
+    }
+  );
+  return entries;
 }
 
 function CorrelationKeyTextField(props) {
-  const { id, parameter, cpRef } = props;
+  const { id, element, correlationKey, commandStack } = props;
+
+  const debounce = useService('debounceInput');
+  const setValue = (value) => {
+    commandStack.execute('element.updateModdleProperties', {
+      element,
+      moddleElement: correlationKey,
+      properties: {
+        name: value,
+      },
+    });
+  };
+
+  const getValue = () => {
+    return correlationKey.name;
+  };
+
+  return TextFieldEntry({
+    element,
+    id: `${id}-textField`,
+    getValue,
+    setValue,
+    debounce,
+  });
+}
+
+function CorrelationPropertyText(props) {
+  const { id, parameter, correlationProperty } = props;
 
   const debounce = useService('debounceInput');
 
-  const getValue = (_parameter) => {
-    return cpRef.id;
+  const getValue = () => {
+    return correlationProperty.id;
   };
 
   return SimpleEntry({
     element: parameter,
     id: `${id}-textField`,
-    label: cpRef.id,
-    editable: false,
+    label: correlationProperty.id,
     getValue,
     disabled: true,
     debounce,