emdebbing the workflow in case when the trigger type is URL

Author: annahileta

client/src/assets/text.json

@@ -72,7 +72,8 @@
   },
   "pageTitles": {
     "manageWorkflow": "Manage workflows",
-    "triggerWorkflow": "Trigger a workflow instance"
+    "triggerWorkflow": "Trigger a workflow instance",
+    "completeWorkflow": "Complete the workflow"
   },
   "popups": {
     "workflowTriggered": {
@@ -90,7 +91,7 @@
     "triggerNewWorkflow": "Trigger new workflow ->",
     "getStarted": "Get started",
     "moreInfo": "More info",
-    "backHome": "← Back to home"
+    "backHome": "← Back to workflows"
   },
   "links": {
     "github": "https://github.com/docusign/sample-app-maestro-node",

client/src/components/TriggerForm/TriggerForm.jsx

@@ -8,7 +8,7 @@ import { ROUTE, TemplateType } from '../../constants.js';
 import { api } from '../../api';
 import { openPopupWindow, closePopupWindow, updateWorkflowDefinitions } from '../../store/actions';
 
-const TriggerForm = ({ workflowId, templateType }) => {
+const TriggerForm = ({ workflowId, templateType, triggerType }) => {
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const isPopupOpened = useSelector(state => state.popup.isOpened);
@@ -49,7 +49,14 @@ const TriggerForm = ({ workflowId, templateType }) => {
       case "-":
         try {
           api.workflows.getWorkflowTriggerRequirements(workflowId).then(data => {
-            setRelevantFormFields(generateDynamicForm(data.data.trigger_input_schema, 'Custom'));
+            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'));
           });
         } catch (error) {
           console.error("Failed to fetch trigger requirements:", error);
@@ -80,35 +87,45 @@ const TriggerForm = ({ workflowId, templateType }) => {
   const handleSubmit = async event => {
     event.preventDefault();
 
-    const body = relevantFormFields.reduce((acc, current) => {
+    let body = relevantFormFields.reduce((acc, current) => {
       acc[current.fieldName] = current.value;
       return acc;
     }, {});
 
-    if (!Object.keys(body).length) {
+    if (!Object.keys(body).length && relevantFormFields.length) {
       navigate(ROUTE.TRIGGER);
       return;
     }
 
     setDataSending(true);
+
+    if(!relevantFormFields.length) {
+      body = {};
+    }
+
     const { data: triggeredWorkflow } = await api.workflows.triggerWorkflow(workflowId, templateType, body);
-    setWorkflowInstanceUrl(triggeredWorkflow.instance_url);
-
-    // Update workflowDefinitions. "...workflow" creates new workflow-object to avoid mutation in redux
-    const updatedWorkflowDefinitions = workflows.map(w => {
-      if (w.id !== workflowId) return { ...w };
-
-      return {
-        ...w,
-        instanceId: triggeredWorkflow.instanceId,
-        isTriggered: true,
-      };
-    });
-
-    dispatch(updateWorkflowDefinitions(updatedWorkflowDefinitions));
-    setDataSending(false);
-    dispatch(openPopupWindow());
+    setWorkflowInstanceUrl(triggeredWorkflow.workflowInstanceUrl);
+
+    if(triggerType === "Url") {
+      navigate(`${ROUTE.TRIGGERFORM}/${workflowId}?type=${templateType}&triggerType=${triggerType}&triggerUrl=${triggeredWorkflow.workflowInstanceUrl}`)
+    } else {
+      // Update workflowDefinitions. "...workflow" creates new workflow-object to avoid mutation in redux
+      const updatedWorkflowDefinitions = workflows.map(w => {
+        if (w.id !== workflowId) return { ...w };
+
+        return {
+          ...w,
+          instanceId: triggeredWorkflow.instanceId,
+          isTriggered: true,
+        };
+      });
+
+      dispatch(updateWorkflowDefinitions(updatedWorkflowDefinitions));
+      setDataSending(false);
+      dispatch(openPopupWindow());
+    }
   };
+
   if (!relevantFormFields.length)
     return (
       <div className={styles.formContainer}>

client/src/components/WorkflowDescription/WorkflowDescription.jsx

@@ -1,9 +1,16 @@
+import { Link } from 'react-router-dom';
 import styles from './WorkflowDescription.module.css';
 import textContent from '../../assets/text.json';
 
-const WorkflowDescription = ({ title, behindTheScenesComponent }) => {
+const WorkflowDescription = ({ title, behindTheScenesComponent, backRoute }) => {
   return (
     <div className={styles.descriptionContainer}>
+      {backRoute && (
+        <Link to={backRoute}>
+          <button className={styles.backButton}>{textContent.buttons.backHome}</button>
+        </Link>
+      )}
+      
       <h2>{title}</h2>
       <div className={`dropdown ${styles.dropDown}`}>
         <button

client/src/components/WorkflowDescription/WorkflowDescription.module.css

@@ -3,7 +3,7 @@
   justify-content: flex-start;
   align-items: center;
   margin-left: -20px;
-  width: 200px;
+  width: 300px;
   height: 40px;
   background-color: transparent;
   color: var(--secondary-main);

client/src/components/WorkflowList/WorkflowList.jsx

@@ -48,7 +48,7 @@ const WorkflowList = ({ items, interactionType, isLoading }) => {
               </div>
 
               {interactionType === WorkflowItemsInteractionType.TRIGGER && (
-                <button className={styles.cell3} onClick={() => navigate(`${ROUTE.TRIGGERFORM}/${item.id}?type=${item.type}`)}>
+                <button className={styles.cell3} onClick={() => navigate(`${ROUTE.TRIGGERFORM}/${item.id}?type=${item.type}&triggerType=${item.triggerType}`)}>
                   {textContent.buttons.triggerWorkflow}
                 </button>
               )}

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.value.filter(definition => definition.status !== 'inactive')
         .map(definition => {
           if (workflows.length) {
             const foundWorkflow = workflows.find(workflow => workflow.id === definition.id);
@@ -41,13 +41,15 @@ const TriggerWorkflow = () => {
               id: definition.id,
               name: definition.name,
               type: "-",
+              triggerType: definition.triggerType
             };
           }
 
           return {
             id: definition.id,
             name: `${TemplateType[foundKey]?.name}`,
             type: TemplateType[foundKey]?.type,
+            triggerType: definition.triggerType
           };
         })
         .filter(definition => !!definition);

client/src/pages/TriggerWorkflowForm/TriggerWorkflowForm.jsx

@@ -7,13 +7,37 @@ import withAuth from '../../hocs/withAuth/withAuth.jsx';
 import WorkflowDescription from '../../components/WorkflowDescription/WorkflowDescription.jsx';
 import TriggerBehindTheScenes from '../../components/WorkflowDescription/BehindTheScenes/TriggerBehindTheScenes.jsx';
 import TriggerForm from '../../components/TriggerForm/TriggerForm.jsx';
+import { ROUTE } from '../../constants.js';
 
 const TriggerWorkflowForm = () => {
   const { workflowId } = useParams();
 
   const location = useLocation();
   const searchParams = new URLSearchParams(location.search);
   const type = searchParams.get('type');
+  const triggerType = searchParams.get('triggerType');
+  const triggerUrl = searchParams.get('triggerUrl');
+
+  if(triggerUrl !== null){
+    return (
+      <div className="page-box">
+        <Header />
+        <div className={styles.contentContainer}>
+          <WorkflowDescription
+            title={textContent.pageTitles.completeWorkflow}
+            behindTheScenesComponent={<TriggerBehindTheScenes />}
+            backRoute={ROUTE.TRIGGER}
+          />
+
+          <div className={styles.formContainer}>
+            <iframe src={triggerUrl} width="800" height="600">
+            </iframe>
+          </div>
+        </div>
+        <Footer withContent={false} />
+      </div>
+    );
+  }
 
   return (
     <div className="page-box">
@@ -22,8 +46,9 @@ const TriggerWorkflowForm = () => {
         <WorkflowDescription
           title={textContent.pageTitles.triggerWorkflow}
           behindTheScenesComponent={<TriggerBehindTheScenes />}
+          backRoute={ROUTE.TRIGGER}
         />
-        <TriggerForm workflowId={workflowId} templateType={type} />
+        <TriggerForm workflowId={workflowId} templateType={type} triggerType={triggerType} />
       </div>
       <Footer withContent={false} />
     </div>

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}/workflows`, { params });
+    const response = await api.get(`${basePath}/accounts/${accountId}/management/workflow_definitions`, { params });
     return response.data;
   };
 
   const getTriggerRequirements = async workflowId => {
-    const response = await api.get(`${basePath}/accounts/${accountId}/workflows/${workflowId}/trigger-requirements`);
+    const response = await api.get(`${basePath}/accounts/${accountId}/management/workflow_definitions/${workflowId}`);
     return response.data;
   };
 

server/controllers/workflowsController.js

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

server/services/workflowsService.js

@@ -35,7 +35,7 @@ class WorkflowsService {
       metadata: {},
       payload,
     };
-    const triggerResponse = await api.triggerWorkflow(triggerPayload, triggerRequirements.trigger_http_config.url);
+    const triggerResponse = await api.triggerWorkflow(triggerPayload, triggerRequirements.triggerUrl);
 
     return triggerResponse;
   };