XIVY-14417 Fix condition in embedded sub

axonivy · Feb 19, 2025 · b75e115 · b75e115
1 parent 5e079d5
commit b75e115
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/inscription-view/src/components/parts/condition/condition.test.ts b/packages/inscription-view/src/components/parts/condition/condition.test.ts
@@ -83,4 +83,21 @@ describe('Condition', () => {
   test('to', () => {
     expect(Condition.to(conditions)).toEqual(altConditions);
   });
+
+  const embeddedConditions: Condition[] = [
+    { fid: 'S0-f1', expression: 'false' },
+    { fid: 'S0-f8', expression: '' }
+  ];
+
+  test('embedded condition', () => {
+    const ref: ConnectorRef = {
+      name: 'flow',
+      pid: 'asdf-S0-f8',
+      source: { name: 'alternative', pid: 'f5', type: altType },
+      target: { name: 'end', pid: 'f7', type: altType }
+    };
+    const expected = cloneObject(embeddedConditions);
+    expected[1].target = ref.target;
+    expect(Condition.replace(cloneObject(embeddedConditions), ref)).toEqual(expected);
+  });
 });
diff --git a/packages/inscription-view/src/utils/pid.test.ts b/packages/inscription-view/src/utils/pid.test.ts
@@ -13,7 +13,7 @@ describe('PID', () => {
   test('field guid', () => {
     expect(PID.fieldId(pid)).toEqual('');
     expect(PID.fieldId(pid + '-f01')).toEqual('f01');
-    expect(PID.fieldId(pid + '-S01-f01')).toEqual('f01');
+    expect(PID.fieldId(pid + '-S01-f01')).toEqual('S01-f01');
   });
 
   test('create child', () => {

diff --git a/packages/inscription-view/src/utils/pid.ts b/packages/inscription-view/src/utils/pid.ts
@@ -10,7 +10,7 @@ export namespace PID {
   }
 
   export function fieldId(pid: string): string {
-    const lastSeparator = pid.lastIndexOf(SEPARATOR);
+    const lastSeparator = pid.indexOf(SEPARATOR);
     if (lastSeparator === -1) {
       return '';
     }