Merge branch 'main' into main

Signed-off-by: Anna Hileta <[email protected]>

Author: annahileta

client/src/components/TriggerForm/TriggerForm.jsx

@@ -49,10 +49,10 @@ const TriggerForm = ({ workflowId, templateType }) => {
       case "-":
         try {
           api.workflows.getWorkflowTriggerRequirements(workflowId).then(data => {
-            const result = Object.values(data.data.trigger_input_schema)
-              .filter(entry => entry.field_name !== "startDate")
+            const result = Object.values(data.data.triggerInputSchema)
+              .filter(entry => entry.fieldName !== "startDate")
               .map(entry => ({
-                field_name: entry.field_name,
+                fieldName: entry.fieldName,
               }));
 
             setRelevantFormFields(generateDynamicForm(result, 'Custom'));
@@ -66,8 +66,8 @@ const TriggerForm = ({ workflowId, templateType }) => {
 
   const generateDynamicForm = (fieldNames) => {
     return fieldNames.map((field) => ({
-      fieldHeader: field.field_name,
-      fieldName: field.field_name,
+      fieldHeader: field.fieldName,
+      fieldName: field.fieldName,
       value: '',
     }));
   };
@@ -103,10 +103,10 @@ const TriggerForm = ({ workflowId, templateType }) => {
     }
 
     const { data: triggeredWorkflow } = await api.workflows.triggerWorkflow(workflowId, templateType, body);
-    setWorkflowInstanceUrl(triggeredWorkflow.instance_url);
+    setWorkflowInstanceUrl(triggeredWorkflow.instanceUrl);
 
-    if (triggeredWorkflow.instance_url !== undefined) {
-      navigate(`${ROUTE.TRIGGERFORM}/${workflowId}?type=${templateType}&triggerUrl=${encodeURIComponent(triggeredWorkflow.instance_url)}`)
+    if (triggeredWorkflow.instanceUrl !== undefined) {
+      navigate(`${ROUTE.TRIGGERFORM}/${workflowId}?type=${templateType}&triggerUrl=${encodeURIComponent(triggeredWorkflow.instanceUrl)}`)
     }
 
     if (triggeredWorkflow === WorkflowTriggerResponse.TRIGGER_ISSUE) {

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.data.workflows.filter(definition => definition.status !== 'inactive')
+      const workflowDefinitions = definitionsResponse.data.data.filter(definition => definition.status !== 'inactive')
         .map(definition => {
           if (workflows.length) {
             const foundWorkflow = workflows.find(workflow => workflow.id === definition.id);

server/api/apiFactory.js

@@ -2,37 +2,42 @@
  * @file
  * This file handles work with docusign maestro and esign services.
  * Scenarios implemented:
- * - Workflow definition creation.
- * - Workflow definition publishing.
  * - Workflow definition triggering, which create workflow instance.
- * - Workflow instance cancellation.
- * - Workflow instance fetching.
+ * - Workflow definitions fetching.
+ * - Workflow trigger requirements fetching.
  */
 
-const { initMaestroApi } = require('../api');
+const iam = require('@docusign/iam-sdk');
 
 class WorkflowsService {
   static getWorkflowDefinitions = async args => {
-    const api = initMaestroApi(args.accountId, args.basePath, args.accessToken);
-    const definitions = await api.getWorkflowDefinitions({});
+    const client = new iam.IamClient({ accessToken: args.accessToken });
+    const definitions = await client.maestro.workflows.getWorkflowsList({ accountId: args.accountId });
 
     return definitions;
   };
 
   static getWorkflowTriggerRequirements = async args => {
-    const api = initMaestroApi(args.accountId, args.basePath, args.accessToken);
-    const triggerRequirements = await api.getTriggerRequirements(args.workflowId);
+    const client = new iam.IamClient({ accessToken: args.accessToken });
+    const triggerRequirements = await client.maestro.workflows.getWorkflowTriggerRequirements({
+      accountId: args.accountId,
+      workflowId: args.workflowId,
+    });
 
     return triggerRequirements;
   };
 
-  static triggerWorkflowInstance = async (args, payload, triggerRequirements) => {
-    const api = initMaestroApi(args.accountId, args.basePath, args.accessToken);
+  static triggerWorkflowInstance = async (args, payload) => {
+    const client = new iam.IamClient({ accessToken: args.accessToken });
     const triggerPayload = {
-      instance_name: 'test',
-      trigger_inputs: payload,
+      instanceName: 'test',
+      triggerInputs: payload,
     };
-    const triggerResponse = await api.triggerWorkflow(triggerPayload, triggerRequirements.trigger_http_config.url);
+    const triggerResponse = await client.maestro.workflows.triggerWorkflow({
+      accountId: args.accountId,
+      workflowId: args.workflowId,
+      triggerWorkflow: triggerPayload,
+    });
 
     return triggerResponse;
   };