Merge branch 'updates-for-meastro' into responsive-for-meastro

Author: annahileta

.env.example

@@ -16,4 +16,4 @@ DS_CLIENT_ID={YOUR_DS_CLIENT_ID} # An Integration key of your app. Located on th
 DS_CLIENT_SECRET={YOUR_DS_CLIENT_SECRET}
 TARGET_ACCOUNT_ID=false # If you have your accound id set here, if not it's false by default.
 SESSION_SECRET={YOUR_SESSION_SECRET} # A unique string of your choice that is used to encrypt the session cookie.
-MAESTRO_API=https://apps-d.docusign.com/api/maestro/v1 # Maestro API, which is used for maestro functionality
+MAESTRO_API=https://api-d.docusign.com/v1 # Maestro API, which is used for maestro functionality

client/src/components/TriggerForm/TriggerForm.jsx

@@ -49,14 +49,7 @@ const TriggerForm = ({ workflowId, templateType }) => {
       case "-":
         try {
           api.workflows.getWorkflowTriggerRequirements(workflowId).then(data => {
-            const result = Object.values(data.data.workflowDefinition.trigger.input.payload)
-                .filter(entry => entry.propertyName !== "id" && entry.propertyName !== "dacId")
-                .map(entry => ({
-                  field_name: entry.propertyName,
-                  field_data_type: entry.type
-                }));
-
-            setRelevantFormFields(generateDynamicForm(result, 'Custom'));
+            setRelevantFormFields(generateDynamicForm(data.data.trigger_input_schema, 'Custom'));
           });
         } catch (error) {
           console.error("Failed to fetch trigger requirements:", error);
@@ -104,7 +97,7 @@ const TriggerForm = ({ workflowId, templateType }) => {
     }
 
     const { data: triggeredWorkflow } = await api.workflows.triggerWorkflow(workflowId, templateType, body);
-    setWorkflowInstanceUrl(triggeredWorkflow.workflowInstanceUrl);
+    setWorkflowInstanceUrl(triggeredWorkflow.instance_url);
 
     // Update workflowDefinitions. "...workflow" creates new workflow-object to avoid mutation in redux
     const updatedWorkflowDefinitions = workflows.map(w => {

client/src/pages/TriggerWorkflow/TriggerWorkflow.jsx

@@ -24,7 +24,7 @@ const TriggerWorkflow = () => {
     const getWorkflowDefinitions = async () => {
       setWorkflowListLoading(true);
       const definitionsResponse = await api.workflows.getWorkflowDefinitions();
-      const workflowDefinitions = definitionsResponse.data.value.filter(definition => definition.status !== 'inactive')
+      const workflowDefinitions = definitionsResponse.data.data.workflows.filter(definition => definition.status !== 'inactive')
         .map(definition => {
           if (workflows.length) {
             const foundWorkflow = workflows.find(workflow => workflow.id === definition.id);

server/api/apiFactory.js

@@ -39,12 +39,12 @@ const createMaestroApi = (axios, basePath, accountId, accessToken) => {
   const api = createAPI(axios, accessToken);
 
   const getWorkflowDefinitions = async params => {
-    const response = await api.get(`${basePath}/accounts/${accountId}/management/workflow_definitions`, { params });
+    const response = await api.get(`${basePath}/accounts/${accountId}/workflows`, { params });
     return response.data;
   };
 
   const getTriggerRequirements = async workflowId => {
-    const response = await api.get(`${basePath}/accounts/${accountId}/management/workflow_definitions/${workflowId}`);
+    const response = await api.get(`${basePath}/accounts/${accountId}/workflows/${workflowId}/trigger-requirements`);
     return response.data;
   };
 

server/controllers/workflowsController.js

@@ -15,6 +15,7 @@ const docusign = require('docusign-esign');
 const config = require('../config');
 const WorkflowsService = require('../services/workflowsService');
 const createPrefixedLogger = require('../utils/logger');
+const { getPayloadBySchema } = require('../utils/utils');
 
 const oAuth = docusign.ApiClient.OAuth;
 const restApi = docusign.ApiClient.RestApi;
@@ -75,7 +76,8 @@ class WorkflowsController {
 
     try {
       const triggerRequirements = await WorkflowsService.getWorkflowTriggerRequirements(args);
-      const result = await WorkflowsService.triggerWorkflowInstance(args, body, triggerRequirements);
+      const payload = getPayloadBySchema(body, triggerRequirements.trigger_input_schema);
+      const result = await WorkflowsService.triggerWorkflowInstance(args, payload, triggerRequirements);
       res.status(200).send(result);
     } catch (error) {
       this.handleErrorResponse(error, res);

server/services/workflowsService.js

@@ -31,11 +31,10 @@ class WorkflowsService {
   static triggerWorkflowInstance = async (args, payload, triggerRequirements) => {
     const api = initMaestroApi(args.accountId, args.basePath, args.accessToken);
     const triggerPayload = {
-      participant: {},
-      metadata: {},
-      payload,
+      instance_name: '',
+      trigger_inputs: payload,
     };
-    const triggerResponse = await api.triggerWorkflow(triggerPayload, triggerRequirements.triggerUrl);
+    const triggerResponse = await api.triggerWorkflow(triggerPayload, triggerRequirements.trigger_http_config.url);
 
     return triggerResponse;
   };

server/utils/utils.js

@@ -15,4 +15,14 @@ const extractPortFromUrl = url => {
   return null;
 };
 
-module.exports = { getParameterValueFromUrl, extractPortFromUrl };
+const getPayloadBySchema = (data, schema) => {
+  return schema.reduce((acc, field) => {
+    const fieldName = field.field_name;
+    if (fieldName in data) {
+      acc[fieldName] = data[fieldName];
+    }
+    return acc;
+  }, {});
+};
+
+module.exports = { getParameterValueFromUrl, extractPortFromUrl, getPayloadBySchema };