From b2c0bcc0905ebe140e24fddf8819dd8084d71d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20G=C3=BCran?= Date: Wed, 25 Jan 2023 14:56:06 +0100 Subject: [PATCH] Adjust activity port names on server request and response --- .../modules/activity-definitions/services/api.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/designer/elsa-workflows-designer/src/modules/activity-definitions/services/api.ts b/src/designer/elsa-workflows-designer/src/modules/activity-definitions/services/api.ts index 79fdbced4..61a0562de 100644 --- a/src/designer/elsa-workflows-designer/src/modules/activity-definitions/services/api.ts +++ b/src/designer/elsa-workflows-designer/src/modules/activity-definitions/services/api.ts @@ -13,6 +13,8 @@ import { import {getVersionOptionsString, serializeQueryString} from "../../../utils"; import {PagedList} from "../../../models"; import {ElsaClientProvider} from "../../../services"; +import { removeGuidsFromPortNames, addGuidsToPortNames } from '../../../utils/graph'; +import { cloneDeep } from '@antv/x6/lib/util/object/object'; @Service() export class ActivityDefinitionsApi { @@ -41,8 +43,15 @@ export class ActivityDefinitionsApi { } async post(request: SaveActivityDefinitionRequest): Promise { + //TODO: Written as a workaround for different server and client models. + //To be deleted after the port model on backend is updated. + const requestClone = cloneDeep(request); + removeGuidsFromPortNames(requestClone.root); + const httpClient = await this.provider.getHttpClient(); - const response = await httpClient.post('activity-definitions', request); + const response = await httpClient.post('activity-definitions', requestClone); + + addGuidsToPortNames(response.data.root); return response.data; } @@ -128,6 +137,11 @@ export class ActivityDefinitionsApi { }); const activityDefinition = response.data; + + //TODO: Written as a workaround for different server and client models. + //To be deleted after the connection model on backend is updated. + addGuidsToPortNames(activityDefinition.root); + return {activityDefinition: activityDefinition}; }