@pxp-nd/flow 1.0.54 → 1.0.56

package/dist/controllers/Flow.js

@@ -439,7 +439,7 @@ let Flow = class Flow extends core_1.Controller {
                 const newNode = manager.create(Node_1.default, {
                     nodeId: undefined,
                     flowId: params.flowId,
-                    isInit: 'N',
+                    isInit: 'Y',
                     actionId: params.actionId
                 });
                 const saveNode = await manager.save(newNode);

package/dist/controllers/Node.js

@@ -81,31 +81,37 @@ let Node = class Node extends core_1.Controller {
         };
     }
     async getParameterizedNode(params, manager) {
+        console.log('getParameterizedNode llega');
         lodash_1.default.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
         const { nodeId, flowId, substitutionsSchemaJson = {} } = params;
+        const tNodeData = (0, core_1.__)(Node_1.default.findOne(nodeId));
+        const nodeData = await tNodeData;
         const tNodeOrigin = await (0, core_1.__)(Node_1.default.findOne({
             relations: ['action'],
             where: {
-                flowId: flowId,
+                flowId: nodeData.flowId,
                 isInit: 'Y',
                 action: {
                     originName: (0, typeorm_1.Not)((0, typeorm_1.IsNull)())
                 }
             }
         }));
-        const tNodeData = (0, core_1.__)(Node_1.default.findOne(nodeId));
         const tFieldMapData = (0, core_1.__)(manager.createQueryBuilder(FieldMap_1.default, 'fm')
             .innerJoin(OriginName_1.default, 'on', 'on.originNameId = fm.originNameId')
             .where("on.name = :n ", { n: tNodeOrigin.action.originName })
             .getMany());
         //const nodeOrigin = await tNodeOrigin; todo
-        const nodeData = await tNodeData;
         const fieldMapData = await tFieldMapData;
         /*const [nodeData, fieldMapData] = await Promise.all([
           tNodeData,
           tFieldMapData
         ]);*/
         const { actionConfigJson, action: { schemaJson, configJsonTemplate, actionType: { schemaJson: schemaJsonFromActionType } } } = nodeData;
+        console.log('nodeData actionConfigJson', actionConfigJson);
+        console.log('action schemaJson', schemaJson);
+        console.log('action configJsonTemplate', configJsonTemplate);
+        console.log('actionType schemaJsonFromActionType', schemaJsonFromActionType);
+        console.log('actionType fieldMapData', fieldMapData);
         const actionConfigJsonObject = actionConfigJson ? JSON.parse(actionConfigJson) : {};
         const configJsonTemplateObject = configJsonTemplate ? JSON.parse(configJsonTemplate) : {};
         let schemaJsonFromActionTypeObject = schemaJsonFromActionType ? JSON.parse(lodash_1.default.template(schemaJsonFromActionType)(substitutionsSchemaJson)) : {};
@@ -184,6 +190,7 @@ let Node = class Node extends core_1.Controller {
             }
             return undefined;
         };
+        console.log('mergeValues', mergeValues);
         for (const [nameKey, value] of Object.entries(mergeValues)) {
             if (schemaJsonObject[nameKey]) {
                 const descValue = await (0, core_1.__)(findFieldInConfigForComponent(schemaJsonObject[nameKey], value));
@@ -195,15 +202,17 @@ let Node = class Node extends core_1.Controller {
                 };
             }
         }
-        Object.entries(schemaJsonObject)
-            .filter(([, value]) => value.initialValue === undefined && value.fromFieldMap === undefined && value.fieldMappingType)
+        console.log('111 schemaJsonObject', schemaJsonObject);
+        /*Object.entries(schemaJsonObject)
+            .filter(([, value]: [nameKey: string, value: any]) => value.initialValue === undefined && value.fromFieldMap === undefined && value.fieldMappingType)
             .forEach(([nameKey]) => {
-            const hasUniqueByTypeInMappingData = findFieldMapUniqueByType(schemaJsonObject[nameKey].fieldMappingType);
-            schemaJsonObject[nameKey] = {
+              const hasUniqueByTypeInMappingData = findFieldMapUniqueByType(schemaJsonObject[nameKey].fieldMappingType);
+              schemaJsonObject[nameKey] = {
                 ...schemaJsonObject[nameKey],
                 ...(hasUniqueByTypeInMappingData && { fromFieldMap: true, ...hasUniqueByTypeInMappingData }),
-            };
-        });
+              };
+            })*/
+        console.log('222 schemaJsonObject', schemaJsonObject);
         return {
             actionConfigJsonObject,
             configJsonTemplateObject,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pxp-nd/flow",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "Workflow module for pxp-nd framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",